svn commit: r376542 - in head/net/openntpd: . files
Christian Weisgerber
naddy at FreeBSD.org
Thu Jan 8 16:11:32 UTC 2015
Author: naddy
Date: Thu Jan 8 16:11:29 2015
New Revision: 376542
URL: https://svnweb.freebsd.org/changeset/ports/376542
QAT: https://qat.redports.org/buildarchive/r376542/
Log:
After a long hiatus, update to 5.7p1.
Major user-visible changes:
* Added ntpctl(8), which allows for querying ntpd(8) at runtime.
* Added support for different routing tables.
Deleted:
head/net/openntpd/files/adjfreq.c
head/net/openntpd/files/compat.h
head/net/openntpd/files/ntpd.conf
head/net/openntpd/files/patch-Makefile
head/net/openntpd/files/patch-log.c
head/net/openntpd/files/patch-ntp.c
head/net/openntpd/files/patch-ntpd.h
head/net/openntpd/files/patch-parse.y
Modified:
head/net/openntpd/Makefile
head/net/openntpd/distinfo
head/net/openntpd/files/patch-ntpd.8 (contents, props changed)
head/net/openntpd/files/patch-ntpd.c (contents, props changed)
head/net/openntpd/files/patch-ntpd.conf.5 (contents, props changed)
head/net/openntpd/pkg-descr
head/net/openntpd/pkg-plist
Modified: head/net/openntpd/Makefile
==============================================================================
--- head/net/openntpd/Makefile Thu Jan 8 15:24:38 2015 (r376541)
+++ head/net/openntpd/Makefile Thu Jan 8 16:11:29 2015 (r376542)
@@ -1,36 +1,31 @@
# $FreeBSD$
PORTNAME= openntpd
-PORTVERSION= 4.6
-PORTREVISION= 3
+PORTVERSION= 5.7p1
PORTEPOCH= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_OPENBSD}
MASTER_SITE_SUBDIR= OpenNTPD
-EXTRACT_SUFX= .tgz
MAINTAINER= naddy at FreeBSD.org
-COMMENT= OpenBSD's Network Time Protocol daemon
+COMMENT= Network Time Protocol (NTP) daemon
+
+LICENSE= ISCL
USERS= _ntp
GROUPS= _ntp
USE_RC_SUBR= openntpd
-WRKSRC= ${WRKDIR}/ntpd
-
-post-extract:
- @${CP} ${FILESDIR}/compat.h ${FILESDIR}/adjfreq.c ${WRKSRC}
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --localstatedir=/var \
+ --disable-silent-rules
pre-build:
${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
- ${WRKSRC}/ntpd.h ${WRKSRC}/ntpd.conf.5 ${WRKSRC}/ntpd.8
+ ${WRKSRC}/ntpd.conf.5 ${WRKSRC}/ntpd.8
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/ntpd ${STAGEDIR}${PREFIX}/sbin
- ${INSTALL_MAN} ${WRKSRC}/ntpd.conf.5 ${STAGEDIR}${PREFIX}/man/man5
- ${INSTALL_MAN} ${WRKSRC}/ntpd.8 ${STAGEDIR}${PREFIX}/man/man8
- ${INSTALL_DATA} ${FILESDIR}/ntpd.conf \
- ${STAGEDIR}${PREFIX}/etc/ntpd.conf.sample
+post-install:
+ cd ${STAGEDIR}${PREFIX}/etc; ${MV} ntpd.conf ntpd.conf.sample
.include <bsd.port.mk>
Modified: head/net/openntpd/distinfo
==============================================================================
--- head/net/openntpd/distinfo Thu Jan 8 15:24:38 2015 (r376541)
+++ head/net/openntpd/distinfo Thu Jan 8 16:11:29 2015 (r376542)
@@ -1,2 +1,2 @@
-SHA256 (openntpd-4.6.tgz) = 724164736f8489a64aedfbc5f8fceaa5eef69c9b8cb26c75a711cfa1b6bab6d7
-SIZE (openntpd-4.6.tgz) = 30472
+SHA256 (openntpd-5.7p1.tar.gz) = 071cfdcfc179c481568a2b8262945243a3123abfc7fa8831da1bbff3729b8307
+SIZE (openntpd-5.7p1.tar.gz) = 400113
Modified: head/net/openntpd/files/patch-ntpd.8
==============================================================================
--- head/net/openntpd/files/patch-ntpd.8 Thu Jan 8 15:24:38 2015 (r376541)
+++ head/net/openntpd/files/patch-ntpd.8 Thu Jan 8 16:11:29 2015 (r376542)
@@ -1,17 +1,6 @@
-$FreeBSD$
---- ntpd.8.orig 2009-02-12 02:33:37.000000000 +0100
-+++ ntpd.8 2009-11-23 21:36:02.000000000 +0100
-@@ -29,8 +29,7 @@
- .Sh DESCRIPTION
- The
- .Nm
--daemon synchronizes the local clock to one or more remote NTP servers
--or local timedelta sensors.
-+daemon synchronizes the local clock to one or more remote NTP servers.
- .Nm
- can also act as an NTP server itself,
- redistributing the local time.
-@@ -52,7 +51,7 @@ Use
+--- ntpd.8.orig 2015-01-08 06:57:55 UTC
++++ ntpd.8
+@@ -53,7 +53,7 @@ Use
.Ar file
as the configuration file,
instead of the default
@@ -20,7 +9,7 @@ $FreeBSD$
.It Fl n
Configtest mode.
Only check the configuration file for validity.
-@@ -91,19 +90,19 @@ will be logged.
+@@ -96,19 +96,19 @@ will be logged.
After the local clock is synchronized,
.Nm
adjusts the clock frequency using the
@@ -32,7 +21,7 @@ $FreeBSD$
is usually started at boot time, and can be enabled by
setting
-.Va ntpd_flags
-+.Va openntpd_enable
++.Va openntpd_flags
in
-.Pa /etc/rc.conf.local .
+.Pa /etc/rc.conf .
@@ -44,12 +33,8 @@ $FreeBSD$
for more information on the boot process
and enabling daemons.
.Pp
-@@ -120,22 +119,22 @@ When
- .Nm
- receives a
- .Dv SIGINFO
--signal, it writes its peer and sensor status to
-+signal, it writes its peer status to
+@@ -129,8 +129,8 @@ receives a
+ signal, it writes its peer and sensor status to
.Xr syslog 3 .
.Sh FILES
-.Bl -tag -width "/var/db/ntpd.driftXXX" -compact
@@ -59,6 +44,7 @@ $FreeBSD$
Default configuration file.
.It Pa /var/db/ntpd.drift
Drift file.
+@@ -140,12 +140,12 @@ Socket file for communication with
.El
.Sh SEE ALSO
.Xr date 1 ,
@@ -67,8 +53,9 @@ $FreeBSD$
+.Xr ntp_adjtime 2 ,
.Xr ntpd.conf 5 ,
+.Xr rc.conf 5 ,
+ .Xr ntpctl 8 ,
.Xr rc 8 ,
-.Xr rc.conf 8 ,
- .Xr rdate 8 ,
- .Xr timed 8
+ .Xr rdate 8
+ .Sh STANDARDS
.Rs
Modified: head/net/openntpd/files/patch-ntpd.c
==============================================================================
--- head/net/openntpd/files/patch-ntpd.c Thu Jan 8 15:24:38 2015 (r376541)
+++ head/net/openntpd/files/patch-ntpd.c Thu Jan 8 16:11:29 2015 (r376542)
@@ -1,23 +1,24 @@
-$FreeBSD$
-
-Drift file in ppm for compatibility with reference ntpd.
-
---- ntpd.c.orig 2009-11-23 20:34:47.000000000 +0100
-+++ ntpd.c 2009-11-23 20:36:38.000000000 +0100
-@@ -457,7 +457,7 @@ readfreq(void)
+--- ntpd.c.orig 2015-01-08 06:57:55 UTC
++++ ntpd.c
+@@ -515,7 +515,11 @@ readfreq(void)
log_warn("adjfreq failed");
else if (current == 0) {
if (fscanf(fp, "%le", &d) == 1)
- ntpd_adjfreq(d, 0);
++ /*
++ * Drift file in ppm for compatibility
++ * with reference ntpd.
++ */
+ ntpd_adjfreq(d / 1e6, 0);
else
log_warnx("can't read %s", DRIFTFILE);
}
-@@ -480,7 +480,7 @@ writefreq(double d)
+@@ -538,7 +542,8 @@ writefreq(double d)
return 0;
}
- fprintf(fp, "%e\n", d);
++ /* Drift file in ppm for compatibility with reference ntpd. */
+ fprintf(fp, "%e\n", d * 1e6);
r = ferror(fp);
if (fclose(fp) != 0 || r != 0) {
Modified: head/net/openntpd/files/patch-ntpd.conf.5
==============================================================================
--- head/net/openntpd/files/patch-ntpd.conf.5 Thu Jan 8 15:24:38 2015 (r376541)
+++ head/net/openntpd/files/patch-ntpd.conf.5 Thu Jan 8 16:11:29 2015 (r376542)
@@ -1,88 +1,6 @@
-$FreeBSD$
---- ntpd.conf.5.orig 2009-11-23 21:03:30.000000000 +0100
-+++ ntpd.conf.5 2009-11-23 21:12:27.000000000 +0100
-@@ -59,62 +59,6 @@ or
- listen on 127.0.0.1
- listen on ::1
- .Ed
--.It Xo Ic sensor Ar device
--.Op Ic correction Ar microseconds
--.Op Ic weight Ar weight-value
--.Op Ic refid Ar string
--.Xc
--Specify a timedelta sensor device
--.Xr ntpd 8
--should use.
--The sensor can be specified multiple times:
--.Xr ntpd 8
--will use each given sensor that actually exists.
--Non-existent sensors are ignored.
--If
--.Sq *
--is given as device name,
--.Xr ntpd 8
--will use all timedelta sensors it finds.
--.Xr ntpd 8
--does not use any timedelta sensor by default.
--For example:
--.Bd -literal -offset indent
--sensor *
--sensor nmea0
--.Ed
--.Pp
--An optional correction in microseconds can be given to compensate
--for the sensor's offset.
--The maximum correction is 127 seconds.
--For example, if a DCF77 receiver is lagging 70ms behind
--actual time:
--.Bd -literal -offset indent
--sensor udcf0 correction 70000
--.Ed
--.Pp
--The optional
--.Ic weight
--keyword permits finer control over the relative importance
--of time sources (servers or sensor devices).
--Weights are specified in the range 1 to 10;
--if no weight is given,
--the default is 1.
--A server with a weight of 5, for example,
--will have five times more influence on time offset calculation
--than a server with a weight of 1.
--.Pp
--An optional reference ID string - up to 4 ASCII characters - can be
--given to publish the sensor type to clients.
--RFC 2030 suggests some common reference identifiers, but new identifiers
--"can be contrived as appropriate."
--If an ID string is not given,
--.Xr ntpd 8
--will use a generic reference ID.
--For example:
--.Bd -literal -offset indent
--sensor nmea0 refid GPS
--.Ed
- .It Xo Ic server Ar address
- .Op Ic weight Ar weight-value
- .Xc
-@@ -139,6 +83,17 @@ server ntp.example.org weight 1
- To provide redundancy, it is good practice to configure multiple servers.
- In general, best accuracy is obtained by using servers that have a low
- network latency.
-+.Pp
-+The optional
-+.Ic weight
-+keyword permits finer control over the relative importance
-+of time sources.
-+Weights are specified in the range 1 to 10;
-+if no weight is given,
-+the default is 1.
-+A server with a weight of 5, for example,
-+will have five times more influence on time offset calculation
-+than a server with a weight of 1.
- .It Xo Ic servers Ar address
- .Op Ic weight Ar weight-value
- .Xc
-@@ -157,15 +112,14 @@ servers pool.ntp.org
+--- ntpd.conf.5.orig 2015-01-08 06:57:55 UTC
++++ ntpd.conf.5
+@@ -182,8 +182,8 @@ servers pool.ntp.org rtable 5
.Ed
.El
.Sh FILES
@@ -93,11 +11,3 @@ $FreeBSD$
default
.Xr ntpd 8
configuration file
- .El
- .Sh SEE ALSO
--.Xr ntpd 8 ,
--.Xr sysctl 8
-+.Xr ntpd 8
- .Sh HISTORY
- The
- .Nm
Modified: head/net/openntpd/pkg-descr
==============================================================================
--- head/net/openntpd/pkg-descr Thu Jan 8 15:24:38 2015 (r376541)
+++ head/net/openntpd/pkg-descr Thu Jan 8 16:11:29 2015 (r376542)
@@ -1,5 +1,3 @@
-OpenBSD's ntpd.
-
The ntpd daemon implements the Simple Network Time Protocol version 4 as
described in RFC 2030 and the Network Time Protocol version 3 as de-
scribed in RFC 1305. It can synchronize the local clock to one or more
Modified: head/net/openntpd/pkg-plist
==============================================================================
--- head/net/openntpd/pkg-plist Thu Jan 8 15:24:38 2015 (r376541)
+++ head/net/openntpd/pkg-plist Thu Jan 8 16:11:29 2015 (r376542)
@@ -1,4 +1,6 @@
@sample etc/ntpd.conf.sample
man/man5/ntpd.conf.5.gz
+man/man8/ntpctl.8.gz
man/man8/ntpd.8.gz
+sbin/ntpctl
sbin/ntpd
More information about the svn-ports-all
mailing list