Browse Source

update patches, add missing : in getopt format

OPENBSD_6_1
Brent Cook 8 years ago
parent
commit
ca8e7f797c
7 changed files with 13 additions and 13 deletions
  1. +3
    -3
      patches/0007-add-p-option-to-create-a-pid-file.patch
  2. +3
    -3
      patches/0008-initialize-setproctitle-where-needed.patch
  3. +1
    -1
      patches/0009-Notify-the-user-when-constraint-support-is-disabled.patch
  4. +2
    -2
      patches/0010-add-a-method-for-updating-the-realtime-clock-on-sync.patch
  5. +1
    -1
      patches/0011-Deal-with-missing-SO_TIMESTAMP.patch
  6. +2
    -2
      patches/0012-check-result-of-ftello-ftruncate.patch
  7. +1
    -1
      patches/0013-set-IPV6_V6ONLY-if-we-are-binding-to-an-IPv6-address.patch

+ 3
- 3
patches/0007-add-p-option-to-create-a-pid-file.patch View File

@ -1,4 +1,4 @@
From 409921b7cbfab4690911dae29c75a4120d0deab2 Mon Sep 17 00:00:00 2001
From 3abcf742a75a14d89f7cbea12acb4300f16c51fb Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com> From: Brent Cook <busterb@gmail.com>
Date: Wed, 31 Dec 2014 08:26:41 -0600 Date: Wed, 31 Dec 2014 08:26:41 -0600
Subject: [PATCH 07/13] add -p option to create a pid file Subject: [PATCH 07/13] add -p option to create a pid file
@ -35,7 +35,7 @@ index dcfb6d2..1b885a1 100644
Do not set the time immediately at startup. Do not set the time immediately at startup.
This is the default. This is the default.
diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
index aac5e23..d1599e2 100644
index aac5e23..463600a 100644
--- a/src/usr.sbin/ntpd/ntpd.c --- a/src/usr.sbin/ntpd/ntpd.c
+++ b/src/usr.sbin/ntpd/ntpd.c +++ b/src/usr.sbin/ntpd/ntpd.c
@@ -87,6 +87,18 @@ sighdlr(int sig) @@ -87,6 +87,18 @@ sighdlr(int sig)
@ -71,7 +71,7 @@ index aac5e23..d1599e2 100644
memset(&lconf, 0, sizeof(lconf)); memset(&lconf, 0, sizeof(lconf));
- while ((ch = getopt(argc, argv, "df:nP:sSv")) != -1) { - while ((ch = getopt(argc, argv, "df:nP:sSv")) != -1) {
+ while ((ch = getopt(argc, argv, "df:nPp:sSv")) != -1) {
+ while ((ch = getopt(argc, argv, "df:nP:p:sSv")) != -1) {
switch (ch) { switch (ch) {
case 'd': case 'd':
lconf.debug = 2; lconf.debug = 2;


+ 3
- 3
patches/0008-initialize-setproctitle-where-needed.patch View File

@ -1,4 +1,4 @@
From 235bc89116fdbbf177017c802a6042a82a0fb6bd Mon Sep 17 00:00:00 2001
From c3e7a0b0601b35facd51003441603e0a93cda429 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com> From: Brent Cook <busterb@gmail.com>
Date: Mon, 12 Jan 2015 06:18:31 -0600 Date: Mon, 12 Jan 2015 06:18:31 -0600
Subject: [PATCH 08/13] initialize setproctitle where needed Subject: [PATCH 08/13] initialize setproctitle where needed
@ -10,7 +10,7 @@ clobbering them.
1 file changed, 19 insertions(+) 1 file changed, 19 insertions(+)
diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
index d1599e2..9dac894 100644
index 463600a..70e5ae7 100644
--- a/src/usr.sbin/ntpd/ntpd.c --- a/src/usr.sbin/ntpd/ntpd.c
+++ b/src/usr.sbin/ntpd/ntpd.c +++ b/src/usr.sbin/ntpd/ntpd.c
@@ -117,6 +117,13 @@ usage(void) @@ -117,6 +117,13 @@ usage(void)
@ -50,7 +50,7 @@ index d1599e2..9dac894 100644
+ argv = saved_argv; + argv = saved_argv;
+#endif +#endif
+ +
while ((ch = getopt(argc, argv, "df:nPp:sSv")) != -1) {
while ((ch = getopt(argc, argv, "df:nP:p:sSv")) != -1) {
switch (ch) { switch (ch) {
case 'd': case 'd':
-- --


+ 1
- 1
patches/0009-Notify-the-user-when-constraint-support-is-disabled.patch View File

@ -1,4 +1,4 @@
From e87fd0e43800dbf3fd9781fb4c7bbc2fe7b1d2a4 Mon Sep 17 00:00:00 2001
From 11ad02bf243bed31db3a395e0b639fa4878e0192 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com> From: Brent Cook <busterb@gmail.com>
Date: Fri, 27 Mar 2015 23:14:15 -0500 Date: Fri, 27 Mar 2015 23:14:15 -0500
Subject: [PATCH 09/13] Notify the user when constraint support is disabled. Subject: [PATCH 09/13] Notify the user when constraint support is disabled.


+ 2
- 2
patches/0010-add-a-method-for-updating-the-realtime-clock-on-sync.patch View File

@ -1,4 +1,4 @@
From 23a7c3493c77605a2c00009ce6874a95e4d8ab41 Mon Sep 17 00:00:00 2001
From e0adef935d739f79f2bf25ed314096ac0d7dfeb7 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com> From: Brent Cook <busterb@gmail.com>
Date: Mon, 4 May 2015 04:27:29 -0500 Date: Mon, 4 May 2015 04:27:29 -0500
Subject: [PATCH 10/13] add a method for updating the realtime clock on sync Subject: [PATCH 10/13] add a method for updating the realtime clock on sync
@ -9,7 +9,7 @@ from Christian Weisgerber
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
index 9dac894..99bdecf 100644
index 70e5ae7..1cc7bc1 100644
--- a/src/usr.sbin/ntpd/ntpd.c --- a/src/usr.sbin/ntpd/ntpd.c
+++ b/src/usr.sbin/ntpd/ntpd.c +++ b/src/usr.sbin/ntpd/ntpd.c
@@ -55,6 +55,7 @@ const char *ctl_lookup_option(char *, const char **); @@ -55,6 +55,7 @@ const char *ctl_lookup_option(char *, const char **);


+ 1
- 1
patches/0011-Deal-with-missing-SO_TIMESTAMP.patch View File

@ -1,4 +1,4 @@
From e6dac416156382be9065c684cd17de03e6695175 Mon Sep 17 00:00:00 2001
From 903c33797293f1f5607c77834362870812f7f799 Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org> From: Brent Cook <bcook@openbsd.org>
Date: Sun, 6 Dec 2015 22:35:38 -0600 Date: Sun, 6 Dec 2015 22:35:38 -0600
Subject: [PATCH 11/13] Deal with missing SO_TIMESTAMP Subject: [PATCH 11/13] Deal with missing SO_TIMESTAMP


+ 2
- 2
patches/0012-check-result-of-ftello-ftruncate.patch View File

@ -1,4 +1,4 @@
From b313da219fdd6392095e617cf5f07158c4da21e3 Mon Sep 17 00:00:00 2001
From cb26bc1bcbc250f4493ce1574d095763692b8018 Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org> From: Brent Cook <bcook@openbsd.org>
Date: Mon, 21 Dec 2015 05:53:20 -0600 Date: Mon, 21 Dec 2015 05:53:20 -0600
Subject: [PATCH 12/13] check result of ftello/ftruncate Subject: [PATCH 12/13] check result of ftello/ftruncate
@ -8,7 +8,7 @@ Subject: [PATCH 12/13] check result of ftello/ftruncate
1 file changed, 5 insertions(+), 2 deletions(-) 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
index 99bdecf..35a9797 100644
index 1cc7bc1..4493040 100644
--- a/src/usr.sbin/ntpd/ntpd.c --- a/src/usr.sbin/ntpd/ntpd.c
+++ b/src/usr.sbin/ntpd/ntpd.c +++ b/src/usr.sbin/ntpd/ntpd.c
@@ -592,6 +592,7 @@ writefreq(double d) @@ -592,6 +592,7 @@ writefreq(double d)


+ 1
- 1
patches/0013-set-IPV6_V6ONLY-if-we-are-binding-to-an-IPv6-address.patch View File

@ -1,4 +1,4 @@
From ecb2314601247924fee94550611c9d886fa0f990 Mon Sep 17 00:00:00 2001
From f54f940c62731f2b7049af2e3785b88138bc2d75 Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org> From: Brent Cook <bcook@openbsd.org>
Date: Sat, 13 Aug 2016 14:22:02 -0500 Date: Sat, 13 Aug 2016 14:22:02 -0500
Subject: [PATCH 13/13] set IPV6_V6ONLY if we are binding to an IPv6 address Subject: [PATCH 13/13] set IPV6_V6ONLY if we are binding to an IPv6 address


Loading…
Cancel
Save