summaryrefslogtreecommitdiff
path: root/network/openntpd/patches/01-ntpctl_rename.diff
diff options
context:
space:
mode:
Diffstat (limited to 'network/openntpd/patches/01-ntpctl_rename.diff')
-rw-r--r--network/openntpd/patches/01-ntpctl_rename.diff20
1 files changed, 10 insertions, 10 deletions
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)