commit bac2662de83095e15f8c65a0c6e22e729538f304 Author: Juergen Daubert <jue@jue.li> Date: Thu Nov 22 15:07:41 2018 +0100 openntpd: update to 6.2p3, closes FS#1692 diff --git a/openntpd/.signature b/openntpd/.signature index 870f1ef9c..6f537d557 100644 --- a/openntpd/.signature +++ b/openntpd/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/es7Asf4aBz4banVzqSIfiG4TziQEBdeH+uw3MQNmPt2ZOQPhnBbug074ELc0IJG2re9ZszrXxm9A+XJmInhZQs= -SHA256 (Pkgfile) = 7cc1ff3a78c7f033672382bf836a5e07d953282c2d4c08865537280222d52a75 +RWSE3ohX2g5d/XK1XiorWnEzWYF65yglLclzAqPZMqKUZgEmLEs71zG6Fj6NbFkT1FxgMQIg0+i+azm7XB4KppXDsRbSlctRXw8= +SHA256 (Pkgfile) = 9d6495209b6365a3c783c204353a1807eaab639d9856fa64c938544c67363541 SHA256 (.footprint) = 38e19020fd3cf0be9dc6da17b4e8a9d44c44ca22ded298b6e1b8e804b674d55d -SHA256 (openntpd-6.0p1.tar.gz) = b1ab80094788912adb12b33cb1f251cc58db39294c1b5c6376972f5f7ba577e8 +SHA256 (openntpd-6.2p3.tar.gz) = 7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a SHA256 (ntpd) = ef91ef0b6ac7fe78968ef9de1426fb2c886521e9a311517809af505f2367f0fb -SHA256 (openntpd-paths.patch) = c4f78c483daaf1600ce4bb2e85b75ac47a170f2cfd9506feae573e31f5515acc +SHA256 (openntpd-paths.patch) = 3b813c96f0cb29834e14ee2e692cef97b46c0be55b57c029ef326e6de1a007d2 diff --git a/openntpd/Pkgfile b/openntpd/Pkgfile index 72520a35d..3bf33f926 100644 --- a/openntpd/Pkgfile +++ b/openntpd/Pkgfile @@ -4,8 +4,8 @@ # Packager: Matt Housh, jaeger at morpheus dot net name=openntpd -version=6.0p1 -release=4 +version=6.2p3 +release=1 source=( http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$name-$version.tar.gz ntpd diff --git a/openntpd/openntpd-paths.patch b/openntpd/openntpd-paths.patch index a7dfc96e6..8e50498f1 100644 --- a/openntpd/openntpd-paths.patch +++ b/openntpd/openntpd-paths.patch @@ -1,6 +1,6 @@ -diff -ru openntpd-5.7p4.orig/src/ntpctl.8 openntpd-5.7p4/src/ntpctl.8 ---- openntpd-5.7p4.orig/src/ntpctl.8 2016-01-01 21:37:56.105451771 +0900 -+++ openntpd-5.7p4/src/ntpctl.8 2016-01-01 22:07:10.772159485 +0900 +diff -Nru openntpd-6.2p3.orig/src/ntpctl.8 openntpd-6.2p3/src/ntpctl.8 +--- openntpd-6.2p3.orig/src/ntpctl.8 2018-11-22 14:58:50.905765618 +0100 ++++ openntpd-6.2p3/src/ntpctl.8 2018-11-22 14:59:05.785452744 +0100 @@ -63,8 +63,8 @@ When the median constraint is set, the offset to the local time is displayed. .El @@ -12,38 +12,33 @@ diff -ru openntpd-5.7p4.orig/src/ntpctl.8 openntpd-5.7p4/src/ntpctl.8 Socket file for communication with .Xr ntpd 8 . .El -diff -ru openntpd-5.7p4.orig/src/ntpd.8 openntpd-5.7p4/src/ntpd.8 ---- openntpd-5.7p4.orig/src/ntpd.8 2016-01-01 21:37:56.105451771 +0900 -+++ openntpd-5.7p4/src/ntpd.8 2016-01-01 22:06:42.479471373 +0900 -@@ -122,7 +122,7 @@ +diff -Nru openntpd-6.2p3.orig/src/ntpd.8 openntpd-6.2p3/src/ntpd.8 +--- openntpd-6.2p3.orig/src/ntpd.8 2018-11-22 14:58:50.905765618 +0100 ++++ openntpd-6.2p3/src/ntpd.8 2018-11-22 15:02:19.251396676 +0100 +@@ -120,15 +120,15 @@ typically .Xr ntpd.conf 5 , and its initial clock drift from -.Pa /var/db/ntpd.drift . +.Pa /var/lib/ntp/ntp.drift . Clock drift is periodically written to the drift file thereafter. - .Pp - When -@@ -137,12 +137,12 @@ - it writes its peer and sensor status to - .Xr syslog 3 . .Sh FILES -.Bl -tag -width "/var/db/ntpd.driftXXX" -compact -+.Bl -tag -width "/var/run/openntpd/ntpd.sockXXX" -compact ++.Bl -tag -width "/var/run/openntpd/ntpd.driftXXX" -compact .It Pa /etc/ntpd.conf Default configuration file. -.It Pa /var/db/ntpd.drift -+.It Pa /var/lib/ntp/ntp.drift ++.It Pa /var/lib/ntp//ntpd.drift Drift file. -.It Pa /var/run/ntpd.sock +.It Pa /var/run/openntpd/ntpd.sock Socket file for communication with .Xr ntpctl 8 . .El -diff -ru openntpd-5.7p4.orig/src/ntpd.h openntpd-5.7p4/src/ntpd.h ---- openntpd-5.7p4.orig/src/ntpd.h 2016-01-01 21:37:56.106451771 +0900 -+++ openntpd-5.7p4/src/ntpd.h 2016-01-01 22:06:42.479471373 +0900 -@@ -48,8 +48,8 @@ +diff -Nru openntpd-6.2p3.orig/src/ntpd.h openntpd-6.2p3/src/ntpd.h +--- openntpd-6.2p3.orig/src/ntpd.h 2018-11-22 14:58:50.905765618 +0100 ++++ openntpd-6.2p3/src/ntpd.h 2018-11-22 14:59:05.785452744 +0100 +@@ -47,8 +47,8 @@ #ifndef LOCALSTATEDIR #define LOCALSTATEDIR "/var" #endif