diff options
| -rw-r--r-- | network/openntpd/openntpd.SlackBuild | 5 | ||||
| -rw-r--r-- | network/openntpd/openntpd.info | 6 | ||||
| -rw-r--r-- | network/openntpd/patches/01-ntpctl_rename.diff | 23 | ||||
| -rw-r--r-- | network/openntpd/patches/02-ntpd_8_clean.diff | 9 |
4 files changed, 23 insertions, 20 deletions
diff --git a/network/openntpd/openntpd.SlackBuild b/network/openntpd/openntpd.SlackBuild index 3c17ac6b53891..16e2296ec5f84 100644 --- a/network/openntpd/openntpd.SlackBuild +++ b/network/openntpd/openntpd.SlackBuild @@ -28,9 +28,10 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=openntpd -VERSION=${VERSION:-6.2p3} +VERSION=${VERSION:-6.8p1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} + PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then @@ -141,7 +142,7 @@ mkdir -p $PKG/etc/rc.d install -m 0644 $CWD/rc.openntpd $PKG/etc/rc.d/rc.openntpd.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/openntpd/openntpd.info b/network/openntpd/openntpd.info index d341aada7346b..70ab063e2d921 100644 --- a/network/openntpd/openntpd.info +++ b/network/openntpd/openntpd.info @@ -1,8 +1,8 @@ PRGNAM="openntpd" -VERSION="6.2p3" +VERSION="6.8p1" HOMEPAGE="http://www.openntpd.org/portable.html" -DOWNLOAD="http://ftp.OpenBSD.org/pub/OpenBSD/OpenNTPD/openntpd-6.2p3.tar.gz" -MD5SUM="5b67827f8ce7e24f38c895787036658d" +DOWNLOAD="https://mirrors.mit.edu/pub/OpenBSD/OpenNTPD/openntpd-6.8p1.tar.gz" +MD5SUM="7c68ce2627b2ea13f2b95db1ef4fcfc5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/openntpd/patches/01-ntpctl_rename.diff b/network/openntpd/patches/01-ntpctl_rename.diff index 5406b5cc359f9..c24c6f8bf369b 100644 --- a/network/openntpd/patches/01-ntpctl_rename.diff +++ b/network/openntpd/patches/01-ntpctl_rename.diff @@ -1,6 +1,7 @@ ---- a/src/ntpd.c.orig 2015-03-25 02:18:56.000000000 +0100 -+++ b/src/ntpd.c 2015-03-25 14:55:29.964709538 +0100 -@@ -100,9 +100,8 @@ usage(void) +diff -Nur openntpd-6.8p1.orig/src/ntpd.c openntpd-6.8p1/src/ntpd.c +--- openntpd-6.8p1.orig/src/ntpd.c 2020-12-07 02:20:35.000000000 -0600 ++++ openntpd-6.8p1/src/ntpd.c 2021-07-18 21:33:55.169706930 -0500 +@@ -113,9 +113,8 @@ { extern char *__progname; @@ -10,28 +11,28 @@ + if (strcmp(__progname, "openntpctl") == 0) + fprintf(stderr, "usage: %s -s all | peers | Sensors | status\n", __progname); else - fprintf(stderr, "usage: %s [-dnSsv] [-f file] [-p file]\n", + fprintf(stderr, "usage: %s [-dnv] [-f file] [-p file]\n", __progname); -@@ -131,7 +130,7 @@ main(int argc, char *argv[]) - struct passwd *pw; - extern char *__progname; +@@ -171,7 +170,7 @@ + + __progname = get_progname(argv[0]); - if (strcmp(__progname, "ntpctl") == 0) { + if (strcmp(__progname, "openntpctl") == 0) { ctl_main(argc, argv); /* NOTREACHED */ } -@@ -598,7 +597,7 @@ ctl_main(int argc, char *argv[]) +@@ -736,7 +735,7 @@ /* NOTREACHED */ if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) - err(1, "ntpctl: socket"); + err(1, "openntpctl: socket"); - bzero(&sa, sizeof(sa)); + memset(&sa, 0, sizeof(sa)); sa.sun_family = AF_UNIX; -@@ -643,7 +642,7 @@ ctl_main(int argc, char *argv[]) - if ((n = imsg_read(ibuf_ctl)) == -1) +@@ -784,7 +783,7 @@ + if ((n = imsg_read(ibuf_ctl)) == -1 && errno != EAGAIN) err(1, "ibuf_ctl: imsg_read error"); if (n == 0) - errx(1, "ntpctl: pipe closed"); diff --git a/network/openntpd/patches/02-ntpd_8_clean.diff b/network/openntpd/patches/02-ntpd_8_clean.diff index 8e999afdec534..049806b1f4ba0 100644 --- a/network/openntpd/patches/02-ntpd_8_clean.diff +++ b/network/openntpd/patches/02-ntpd_8_clean.diff @@ -1,6 +1,7 @@ ---- a/src/ntpd.8.orig 2017-10-30 09:57:40.000000000 +0100 -+++ b/src/ntpd.8 2017-10-30 16:40:00.501570572 +0100 -@@ -102,18 +102,6 @@ adjusts the clock frequency using the +diff -Nur openntpd-6.8p1.orig/src/ntpd.8 openntpd-6.8p1/src/ntpd.8 +--- openntpd-6.8p1.orig/src/ntpd.8 2020-12-07 02:20:35.000000000 -0600 ++++ openntpd-6.8p1/src/ntpd.8 2021-07-18 21:34:49.338076927 -0500 +@@ -102,18 +102,6 @@ .Xr adjfreq 2 system call to compensate for systematic drift. .Pp @@ -19,7 +20,7 @@ When .Nm starts up, it reads settings from its configuration file, -@@ -138,8 +126,6 @@ Socket file for communication with +@@ -138,8 +126,6 @@ .Xr adjtime 2 , .Xr ntpd.conf 5 , .Xr ntpctl 8 , |