summaryrefslogtreecommitdiff
path: root/network/openntpd/patches
diff options
context:
space:
mode:
authorLEVAI Daniel <leva@ecentrum.hu>2015-01-20 21:50:45 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2015-01-20 21:50:45 +0700
commit1f6a6bccec2c3d251900ec4ff3e29316666ca577 (patch)
tree1978d9f953eb88f86f6cfbe40b436c27d95c42fd /network/openntpd/patches
parenta740ebf2dc1b300343c0f8086450661cdc83b408 (diff)
downloadslackbuilds-1f6a6bccec2c3d251900ec4ff3e29316666ca577.tar.gz
network/openntpd: Updated for version 5.7p2.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'network/openntpd/patches')
-rw-r--r--network/openntpd/patches/01-ntpctl_rename.diff16
-rw-r--r--network/openntpd/patches/02-ntpd_8_clean.diff16
-rw-r--r--network/openntpd/patches/02-ntpd_conf_5_clean.diff8
3 files changed, 13 insertions, 27 deletions
diff --git a/network/openntpd/patches/01-ntpctl_rename.diff b/network/openntpd/patches/01-ntpctl_rename.diff
index acf5c7186a..ee3f6e8f96 100644
--- a/network/openntpd/patches/01-ntpctl_rename.diff
+++ b/network/openntpd/patches/01-ntpctl_rename.diff
@@ -1,5 +1,5 @@
---- a/ntpd.c.orig 2015-01-08 10:43:16.834158734 +0100
-+++ b/ntpd.c 2015-01-08 10:46:24.943458619 +0100
+--- 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)
{
extern char *__progname;
@@ -12,17 +12,17 @@
else
fprintf(stderr, "usage: %s [-dnSsv] [-f file] [-p file]\n",
__progname);
-@@ -124,7 +125,7 @@ main(int argc, char *argv[])
- extern char *__progname;
- time_t start_time;
+@@ -128,7 +129,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);
/* NOTREACHED */
}
-@@ -605,7 +606,7 @@ ctl_main(int argc, char *argv[])
- usage();
+@@ -624,7 +625,7 @@ ctl_main(int argc, char *argv[])
+ /* NOTREACHED */
if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
- err(1, "ntpctl: socket");
@@ -30,7 +30,7 @@
bzero(&sa, sizeof(sa));
sa.sun_family = AF_UNIX;
-@@ -650,7 +651,7 @@ ctl_main(int argc, char *argv[])
+@@ -669,7 +670,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 5133f5bc56..75382a8ca5 100644
--- a/network/openntpd/patches/02-ntpd_8_clean.diff
+++ b/network/openntpd/patches/02-ntpd_8_clean.diff
@@ -1,14 +1,6 @@
---- a/ntpd.8.orig 2015-01-08 07:57:55.000000000 +0100
-+++ b/ntpd.8 2015-01-08 11:35:04.889368624 +0100
-@@ -1,7 +1,3 @@
--.\" $OpenBSD: ntpd.8,v 1.36 2013/10/04 14:28:16 phessler Exp $
--.\"
--.\" Copyright (c) 2003, 2004, 2006 Henning Brauer <henning@openbsd.org>
--.\"
- .\" Permission to use, copy, modify, and distribute this software for any
- .\" purpose with or without fee is hereby granted, provided that the above
- .\" copyright notice and this permission notice appear in all copies.
-@@ -99,19 +95,6 @@ adjusts the clock frequency using the
+--- a/ntpd.8.orig 2015-01-20 03:30:41.000000000 +0100
++++ b/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.
.Pp
@@ -28,7 +20,7 @@
When
.Nm
starts up, it reads settings from its configuration file,
-@@ -144,8 +127,6 @@ Socket file for communication with
+@@ -148,8 +135,6 @@ Socket file for communication with
.Xr adjtime 2 ,
.Xr ntpd.conf 5 ,
.Xr ntpctl 8 ,
diff --git a/network/openntpd/patches/02-ntpd_conf_5_clean.diff b/network/openntpd/patches/02-ntpd_conf_5_clean.diff
index 7a6e7cfdb5..e616a7ed8b 100644
--- a/network/openntpd/patches/02-ntpd_conf_5_clean.diff
+++ b/network/openntpd/patches/02-ntpd_conf_5_clean.diff
@@ -1,12 +1,6 @@
--- 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
-@@ -1,5 +1,3 @@
--.\" $OpenBSD: ntpd.conf.5,v 1.23 2011/09/21 15:41:30 phessler Exp $
--.\"
- .\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
- .\"
- .\" Permission to use, copy, modify, and distribute this software for any
-@@ -196,9 +194,3 @@ The
+@@ -196,9 +196,3 @@ The
.Nm
file format first appeared in
.Ox 3.6 .