diff options
| -rw-r--r-- | network/openntpd/openntpd.SlackBuild | 12 | ||||
| -rw-r--r-- | network/openntpd/openntpd.info | 6 | ||||
| -rw-r--r-- | network/openntpd/patches/01-ntpctl_rename.diff | 20 | ||||
| -rw-r--r-- | network/openntpd/patches/02-ntpd_8_clean.diff | 4 | ||||
| -rw-r--r-- | network/openntpd/patches/02-ntpd_conf_5_clean.diff | 4 |
5 files changed, 23 insertions, 23 deletions
diff --git a/network/openntpd/openntpd.SlackBuild b/network/openntpd/openntpd.SlackBuild index 773e7be19d..b0ac787752 100644 --- a/network/openntpd/openntpd.SlackBuild +++ b/network/openntpd/openntpd.SlackBuild @@ -26,7 +26,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=openntpd -VERSION=${VERSION:-5.7p3} +VERSION=${VERSION:-5.7p4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -90,12 +90,12 @@ for diff in $CWD/patches/*.diff;do done # Prepare the source for renamings, later in the build script -sed -i -r -e 's,^(#define CONFFILE SYSCONFDIR "/)(ntpd)(\.conf")$,\1open\2\3,' ./ntpd.h -sed -i -r -e 's,^(#define DRIFTFILE LOCALSTATEDIR "/db/)(ntpd)(\.drift")$,\1open\2\3,' ./ntpd.h -sed -i -r -e 's,^(#define CTLSOCKET LOCALSTATEDIR "/run/)(ntpd)(\.sock")$,\1open\2\3,' ./ntpd.h +sed -i -r -e 's,^(#define CONFFILE SYSCONFDIR "/)(ntpd)(\.conf")$,\1open\2\3,' ./src/ntpd.h +sed -i -r -e 's,^(#define DRIFTFILE LOCALSTATEDIR "/db/)(ntpd)(\.drift")$,\1open\2\3,' ./src/ntpd.h +sed -i -r -e 's,^(#define CTLSOCKET LOCALSTATEDIR "/run/)(ntpd)(\.sock")$,\1open\2\3,' ./src/ntpd.h sed -i -r -e 's,ntpd,openntpd,;s,NTPD,OPENNTPD,;s,ntpctl,openntpctl,' \ - ./ntpd.8 ./ntpd.conf.5 ./ntpctl.8 ./ntpd.conf -sed -i -r -e 's,adjfreq,adjtime,' ./ntpd.8 + ./src/ntpd.8 ./src/ntpd.conf.5 ./src/ntpctl.8 ./ntpd.conf +sed -i -r -e 's,adjfreq,adjtime,' ./src/ntpd.8 CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/openntpd/openntpd.info b/network/openntpd/openntpd.info index 4dc992335f..2895bb1795 100644 --- a/network/openntpd/openntpd.info +++ b/network/openntpd/openntpd.info @@ -1,8 +1,8 @@ PRGNAM="openntpd" -VERSION="5.7p3" +VERSION="5.7p4" HOMEPAGE="http://www.openntpd.org/portable.html" -DOWNLOAD="http://ftp.OpenBSD.org/pub/OpenBSD/OpenNTPD/openntpd-5.7p3.tar.gz" -MD5SUM="3f085eaca7488286705b0c80bff9e1ea" +DOWNLOAD="http://ftp.OpenBSD.org/pub/OpenBSD/OpenNTPD/openntpd-5.7p4.tar.gz" +MD5SUM="9d818a143fbc5d830203fa2f4b4c6a2a" 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 ee3f6e8f96..5406b5cc35 100644 --- a/network/openntpd/patches/01-ntpctl_rename.diff +++ b/network/openntpd/patches/01-ntpctl_rename.diff @@ -1,27 +1,27 @@ ---- a/ntpd.c.orig 2015-01-20 03:30:41.000000000 +0100 -+++ b/ntpd.c 2015-01-20 10:53:39.968163875 +0100 -@@ -100,8 +100,9 @@ usage(void) +--- 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) { extern char *__progname; - if (strcmp(__progname, "ntpctl") == 0) -- fprintf(stderr, "usage: ntpctl [-s all | peers | Sensors | status]\n"); +- fprintf(stderr, +- "usage: ntpctl -s all | peers | Sensors | status\n"); + if (strcmp(__progname, "openntpctl") == 0) -+ fprintf(stderr, "usage: %s [-s all | peers | Sensors | status]\n", -+ __progname); ++ fprintf(stderr, "usage: %s -s all | peers | Sensors | status\n", __progname); else fprintf(stderr, "usage: %s [-dnSsv] [-f file] [-p file]\n", __progname); -@@ -128,7 +129,7 @@ main(int argc, char *argv[]) +@@ -131,7 +130,7 @@ main(int argc, char *argv[]) struct passwd *pw; extern char *__progname; - if (strcmp(__progname, "ntpctl") == 0) { + if (strcmp(__progname, "openntpctl") == 0) { - ctl_main (argc, argv); + ctl_main(argc, argv); /* NOTREACHED */ } -@@ -624,7 +625,7 @@ ctl_main(int argc, char *argv[]) +@@ -598,7 +597,7 @@ ctl_main(int argc, char *argv[]) /* NOTREACHED */ if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) @@ -30,7 +30,7 @@ bzero(&sa, sizeof(sa)); sa.sun_family = AF_UNIX; -@@ -669,7 +670,7 @@ ctl_main(int argc, char *argv[]) +@@ -643,7 +642,7 @@ ctl_main(int argc, char *argv[]) if ((n = imsg_read(ibuf_ctl)) == -1) err(1, "ibuf_ctl: imsg_read error"); if (n == 0) diff --git a/network/openntpd/patches/02-ntpd_8_clean.diff b/network/openntpd/patches/02-ntpd_8_clean.diff index 75382a8ca5..0c655cd186 100644 --- a/network/openntpd/patches/02-ntpd_8_clean.diff +++ b/network/openntpd/patches/02-ntpd_8_clean.diff @@ -1,5 +1,5 @@ ---- a/ntpd.8.orig 2015-01-20 03:30:41.000000000 +0100 -+++ b/ntpd.8 2015-01-20 10:53:39.970163740 +0100 +--- a/src/ntpd.8.orig 2015-01-20 03:30:41.000000000 +0100 ++++ b/src/ntpd.8 2015-01-20 10:53:39.970163740 +0100 @@ -99,19 +99,6 @@ adjusts the clock frequency using the .Xr adjfreq 2 system call to compensate for systematic drift. diff --git a/network/openntpd/patches/02-ntpd_conf_5_clean.diff b/network/openntpd/patches/02-ntpd_conf_5_clean.diff index e616a7ed8b..e3eecabf21 100644 --- a/network/openntpd/patches/02-ntpd_conf_5_clean.diff +++ b/network/openntpd/patches/02-ntpd_conf_5_clean.diff @@ -1,5 +1,5 @@ ---- a/ntpd.conf.5.orig 2015-01-08 11:35:23.671118459 +0100 -+++ b/ntpd.conf.5 2015-01-08 11:36:10.673989819 +0100 +--- a/src/ntpd.conf.5.orig 2015-01-08 11:35:23.671118459 +0100 ++++ b/src/ntpd.conf.5 2015-01-08 11:36:10.673989819 +0100 @@ -196,9 +196,3 @@ The .Nm file format first appeared in |