From b30947c0a8ff921290ba135fe136d47e4d70a86b Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sat, 5 Nov 2016 13:14:00 -0500 Subject: [PATCH] update patches --- ...records-on-IPv4-networks-more-libera.patch | 8 ++--- ...EAI_NODATA-does-not-exist-everywhere.patch | 6 ++-- ...ll-in-sin_len-sin6_len-if-they-exist.patch | 6 ++-- ...heck-if-rdomain-support-is-available.patch | 10 +++--- ...onf-to-indicate-OS-dependent-options.patch | 6 ++-- ...ding-default-user-and-file-locations.patch | 12 +++---- ...07-add-p-option-to-create-a-pid-file.patch | 32 +++++++++---------- ...initialize-setproctitle-where-needed.patch | 18 +++++------ ...-when-constraint-support-is-disabled.patch | 14 ++++---- ...-updating-the-realtime-clock-on-sync.patch | 10 +++--- .../0011-Deal-with-missing-SO_TIMESTAMP.patch | 8 ++--- ...012-check-result-of-ftello-ftruncate.patch | 12 +++---- ...if-we-are-binding-to-an-IPv6-address.patch | 8 ++--- 13 files changed, 75 insertions(+), 75 deletions(-) diff --git a/patches/0001-Handle-IPv6-DNS-records-on-IPv4-networks-more-libera.patch b/patches/0001-Handle-IPv6-DNS-records-on-IPv4-networks-more-libera.patch index 1e0641a..9615979 100644 --- a/patches/0001-Handle-IPv6-DNS-records-on-IPv4-networks-more-libera.patch +++ b/patches/0001-Handle-IPv6-DNS-records-on-IPv4-networks-more-libera.patch @@ -1,7 +1,7 @@ -From edf77031dabb3d96d8f093d6ea9f46d74b44f5d9 Mon Sep 17 00:00:00 2001 +From 98f3ab8d437edaddf875629702d9b7edf800f253 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 30 Dec 2014 09:10:22 -0600 -Subject: [PATCH 01/12] Handle IPv6 DNS records on IPv4 networks more liberally +Subject: [PATCH 01/13] Handle IPv6 DNS records on IPv4 networks more liberally Rather than fail on IPv4 only networks when seeing an IPv6 DNS record, just give a warning. @@ -13,7 +13,7 @@ Original Author: Stefan Praszalowicz 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/usr.sbin/ntpd/client.c b/src/usr.sbin/ntpd/client.c -index a92382b..7ce3b38 100644 +index ddbb128..3d70317 100644 --- a/src/usr.sbin/ntpd/client.c +++ b/src/usr.sbin/ntpd/client.c @@ -138,9 +138,16 @@ client_query(struct ntp_peer *p) @@ -37,5 +37,5 @@ index a92382b..7ce3b38 100644 if (connect(p->query->fd, sa, SA_LEN(sa)) == -1) { if (errno == ECONNREFUSED || errno == ENETUNREACH || -- -2.9.2 +2.10.1 diff --git a/patches/0002-EAI_NODATA-does-not-exist-everywhere.patch b/patches/0002-EAI_NODATA-does-not-exist-everywhere.patch index 5ee0b76..97f914f 100644 --- a/patches/0002-EAI_NODATA-does-not-exist-everywhere.patch +++ b/patches/0002-EAI_NODATA-does-not-exist-everywhere.patch @@ -1,7 +1,7 @@ -From 45fbc8bdd01d276c3c64bc74dd4980da1164947a Mon Sep 17 00:00:00 2001 +From a1caa67ef58e032ca06012cb3c7f2e00b51be525 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 30 Dec 2014 09:04:08 -0600 -Subject: [PATCH 02/12] EAI_NODATA does not exist everywhere +Subject: [PATCH 02/13] EAI_NODATA does not exist everywhere FreeBSD says it is deprecated #ifdef's it out. @@ -36,5 +36,5 @@ index b2f688e..c0a99b1 100644 log_warnx("could not parse \"%s\": %s", s, gai_strerror(error)); -- -2.9.2 +2.10.1 diff --git a/patches/0003-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch b/patches/0003-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch index 814d251..680f60c 100644 --- a/patches/0003-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch +++ b/patches/0003-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch @@ -1,7 +1,7 @@ -From da848b619bd7721ecc5a17877d87333318d79bf9 Mon Sep 17 00:00:00 2001 +From cdd9f88306fd4b7bcf613ec909a0dfa2947f216b Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 30 Dec 2014 09:02:50 -0600 -Subject: [PATCH 03/12] conditionally fill in sin_len/sin6_len if they exist +Subject: [PATCH 03/13] conditionally fill in sin_len/sin6_len if they exist --- src/usr.sbin/ntpd/config.c | 8 ++++++++ @@ -49,5 +49,5 @@ index c0a99b1..87de17a 100644 res->ai_addr)->sin6_addr, sizeof(struct in6_addr)); } -- -2.9.2 +2.10.1 diff --git a/patches/0004-check-if-rdomain-support-is-available.patch b/patches/0004-check-if-rdomain-support-is-available.patch index d0a21fb..715b259 100644 --- a/patches/0004-check-if-rdomain-support-is-available.patch +++ b/patches/0004-check-if-rdomain-support-is-available.patch @@ -1,7 +1,7 @@ -From d6bf1b5546df84737fb53939d82bd42d52aa749c Mon Sep 17 00:00:00 2001 +From 64086a3dabe677a925ad414ff4a67e86c7fbb48e Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 30 Dec 2014 09:05:46 -0600 -Subject: [PATCH 04/12] check if rdomain support is available. +Subject: [PATCH 04/13] check if rdomain support is available. Handle FreeBSD's calling rdomain 'FIB'. - from naddy@openbsd.org @@ -12,7 +12,7 @@ Handle FreeBSD's calling rdomain 'FIB'. 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h -index 3fddba8..94cc654 100644 +index be13fde..b2a5cd9 100644 --- a/src/usr.sbin/ntpd/ntpd.h +++ b/src/usr.sbin/ntpd/ntpd.h @@ -40,6 +40,12 @@ @@ -47,7 +47,7 @@ index 6d50795..33fe13d 100644 } ; diff --git a/src/usr.sbin/ntpd/server.c b/src/usr.sbin/ntpd/server.c -index fb297d7..2e28b9b 100644 +index b67d274..cbaa115 100644 --- a/src/usr.sbin/ntpd/server.c +++ b/src/usr.sbin/ntpd/server.c @@ -35,11 +35,16 @@ setup_listeners(struct servent *se, struct ntpd_conf *lconf, u_int *cnt) @@ -112,5 +112,5 @@ index fb297d7..2e28b9b 100644 if (bind(la->fd, (struct sockaddr *)&la->sa, SA_LEN((struct sockaddr *)&la->sa)) == -1) { -- -2.9.2 +2.10.1 diff --git a/patches/0005-update-ntpd.conf-to-indicate-OS-dependent-options.patch b/patches/0005-update-ntpd.conf-to-indicate-OS-dependent-options.patch index 22f7646..832d639 100644 --- a/patches/0005-update-ntpd.conf-to-indicate-OS-dependent-options.patch +++ b/patches/0005-update-ntpd.conf-to-indicate-OS-dependent-options.patch @@ -1,7 +1,7 @@ -From 2e648d55b95aebcf30208d13a6cd4ca56d3fb2ab Mon Sep 17 00:00:00 2001 +From 837f944a4bba5b0a3a9262137c86448018029a48 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 30 Dec 2014 09:20:03 -0600 -Subject: [PATCH 05/12] update ntpd.conf to indicate OS-dependent options +Subject: [PATCH 05/13] update ntpd.conf to indicate OS-dependent options Also, clarify listening behavior based on a patch from Dererk @@ -49,5 +49,5 @@ index af11a7e..87f94e8 100644 .Xr ntpd 8 will use each given sensor that actually exists. -- -2.9.2 +2.10.1 diff --git a/patches/0006-allow-overriding-default-user-and-file-locations.patch b/patches/0006-allow-overriding-default-user-and-file-locations.patch index 00117c1..2f09f10 100644 --- a/patches/0006-allow-overriding-default-user-and-file-locations.patch +++ b/patches/0006-allow-overriding-default-user-and-file-locations.patch @@ -1,7 +1,7 @@ -From 7025f8e6993e9a491143fd3538d29bab170c2589 Mon Sep 17 00:00:00 2001 +From 7fa2b6297c72062585ed515a5aa16c4451b7c873 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Thu, 1 Jan 2015 07:18:11 -0600 -Subject: [PATCH 06/12] allow overriding default user and file locations +Subject: [PATCH 06/13] allow overriding default user and file locations Allow the build process to override the default ntpd file paths and default user. @@ -10,7 +10,7 @@ default user. 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h -index 94cc654..375edc1 100644 +index b2a5cd9..f80e23c 100644 --- a/src/usr.sbin/ntpd/ntpd.h +++ b/src/usr.sbin/ntpd/ntpd.h @@ -35,10 +35,20 @@ @@ -45,8 +45,8 @@ index 94cc654..375edc1 100644 #define CONSTRAINT_CA "/etc/ssl/cert.pem" +#endif - enum client_state { - STATE_NONE, + #define PARENT_SOCK_FILENO CONSTRAINT_PASSFD + -- -2.9.2 +2.10.1 diff --git a/patches/0007-add-p-option-to-create-a-pid-file.patch b/patches/0007-add-p-option-to-create-a-pid-file.patch index 85ac43f..30e4b81 100644 --- a/patches/0007-add-p-option-to-create-a-pid-file.patch +++ b/patches/0007-add-p-option-to-create-a-pid-file.patch @@ -1,7 +1,7 @@ -From d7d30f3467758025c4aba9e0ff45bd3178d6ff15 Mon Sep 17 00:00:00 2001 +From 409921b7cbfab4690911dae29c75a4120d0deab2 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Wed, 31 Dec 2014 08:26:41 -0600 -Subject: [PATCH 07/12] add -p option to create a pid file +Subject: [PATCH 07/13] add -p option to create a pid file This is used in both the Gentoo and Debian ports. @@ -35,7 +35,7 @@ index dcfb6d2..1b885a1 100644 Do not set the time immediately at startup. This is the default. diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c -index 43486f0..2377d89 100644 +index aac5e23..d1599e2 100644 --- a/src/usr.sbin/ntpd/ntpd.c +++ b/src/usr.sbin/ntpd/ntpd.c @@ -87,6 +87,18 @@ sighdlr(int sig) @@ -66,18 +66,18 @@ index 43486f0..2377d89 100644 __progname); exit(1); } -@@ -132,7 +144,7 @@ main(int argc, char *argv[]) +@@ -135,7 +147,7 @@ main(int argc, char *argv[]) memset(&lconf, 0, sizeof(lconf)); -- while ((ch = getopt(argc, argv, "df:nsSv")) != -1) { -+ 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) { switch (ch) { case 'd': lconf.debug = 2; -@@ -144,6 +156,9 @@ main(int argc, char *argv[]) - lconf.debug = 2; - lconf.noaction = 1; +@@ -150,6 +162,9 @@ main(int argc, char *argv[]) + case 'P': + pname = optarg; break; + case 'p': + lconf.pid_file = optarg; @@ -85,7 +85,7 @@ index 43486f0..2377d89 100644 case 's': lconf.settime = 1; break; -@@ -192,9 +207,11 @@ main(int argc, char *argv[]) +@@ -217,9 +232,11 @@ main(int argc, char *argv[]) if (!lconf.settime) { log_init(lconf.debug, LOG_DAEMON); log_verbose(lconf.verbose); @@ -98,7 +98,7 @@ index 43486f0..2377d89 100644 } else timeout = SETTIME_TIMEOUT * 1000; -@@ -275,9 +292,11 @@ main(int argc, char *argv[]) +@@ -294,9 +311,11 @@ main(int argc, char *argv[]) log_verbose(lconf.verbose); log_warnx("no reply received in time, skipping initial " "time setting"); @@ -111,7 +111,7 @@ index 43486f0..2377d89 100644 } if (nfds > 0 && (pfd[PFD_PIPE].revents & POLLOUT)) -@@ -320,6 +339,8 @@ main(int argc, char *argv[]) +@@ -335,6 +354,8 @@ main(int argc, char *argv[]) msgbuf_clear(&ibuf->w); free(ibuf); log_info("Terminating"); @@ -120,7 +120,7 @@ index 43486f0..2377d89 100644 return (0); } -@@ -403,9 +424,11 @@ dispatch_imsg(struct ntpd_conf *lconf, const char *pw_dir, +@@ -395,9 +416,11 @@ dispatch_imsg(struct ntpd_conf *lconf, int argc, char **argv) memcpy(&d, imsg.data, sizeof(d)); ntpd_settime(d); /* daemonize now */ @@ -134,10 +134,10 @@ index 43486f0..2377d89 100644 timeout = INFTIM; break; diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h -index 375edc1..e40bf5e 100644 +index f80e23c..fcca519 100644 --- a/src/usr.sbin/ntpd/ntpd.h +++ b/src/usr.sbin/ntpd/ntpd.h -@@ -243,6 +243,7 @@ struct ntpd_conf { +@@ -249,6 +249,7 @@ struct ntpd_conf { u_int constraint_errors; u_int8_t *ca; size_t ca_len; @@ -146,5 +146,5 @@ index 375edc1..e40bf5e 100644 struct ctl_show_status { -- -2.9.2 +2.10.1 diff --git a/patches/0008-initialize-setproctitle-where-needed.patch b/patches/0008-initialize-setproctitle-where-needed.patch index d2c7eb4..b4f06c8 100644 --- a/patches/0008-initialize-setproctitle-where-needed.patch +++ b/patches/0008-initialize-setproctitle-where-needed.patch @@ -1,7 +1,7 @@ -From 5a77ca4ff85fcc7d0c1bb4efd2b979192a857f68 Mon Sep 17 00:00:00 2001 +From 235bc89116fdbbf177017c802a6042a82a0fb6bd Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 12 Jan 2015 06:18:31 -0600 -Subject: [PATCH 08/12] initialize setproctitle where needed +Subject: [PATCH 08/13] initialize setproctitle where needed We need to save a copy of argv and __progname to avoid setproctitle clobbering them. @@ -10,7 +10,7 @@ clobbering them. 1 file changed, 19 insertions(+) diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c -index 2377d89..ccd3a4d 100644 +index d1599e2..9dac894 100644 --- a/src/usr.sbin/ntpd/ntpd.c +++ b/src/usr.sbin/ntpd/ntpd.c @@ -117,6 +117,13 @@ usage(void) @@ -27,16 +27,16 @@ index 2377d89..ccd3a4d 100644 int main(int argc, char *argv[]) { -@@ -135,6 +142,8 @@ main(int argc, char *argv[]) - gid_t pw_gid; - void *newp; +@@ -138,6 +145,8 @@ main(int argc, char *argv[]) + char **argv0 = argv; + char *pname = NULL; + __progname = get_progname(argv[0]); + if (strcmp(__progname, "ntpctl") == 0) { ctl_main(argc, argv); /* NOTREACHED */ -@@ -144,6 +153,16 @@ main(int argc, char *argv[]) +@@ -147,6 +156,16 @@ main(int argc, char *argv[]) memset(&lconf, 0, sizeof(lconf)); @@ -50,9 +50,9 @@ index 2377d89..ccd3a4d 100644 + argv = saved_argv; +#endif + - while ((ch = getopt(argc, argv, "df:np:sSv")) != -1) { + while ((ch = getopt(argc, argv, "df:nPp:sSv")) != -1) { switch (ch) { case 'd': -- -2.9.2 +2.10.1 diff --git a/patches/0009-Notify-the-user-when-constraint-support-is-disabled.patch b/patches/0009-Notify-the-user-when-constraint-support-is-disabled.patch index a7ad662..b29988f 100644 --- a/patches/0009-Notify-the-user-when-constraint-support-is-disabled.patch +++ b/patches/0009-Notify-the-user-when-constraint-support-is-disabled.patch @@ -1,7 +1,7 @@ -From 5a08f6539f3885f15f4245d04ba28a475937b4d7 Mon Sep 17 00:00:00 2001 +From e87fd0e43800dbf3fd9781fb4c7bbc2fe7b1d2a4 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Fri, 27 Mar 2015 23:14:15 -0500 -Subject: [PATCH 09/12] Notify the user when constraint support is disabled. +Subject: [PATCH 09/13] Notify the user when constraint support is disabled. Update the manpage and make a constraint line a fatal error if it is configured but ntpd is built without libtls present. @@ -27,12 +27,12 @@ index 87de17a..5a75030 100644 } diff --git a/src/usr.sbin/ntpd/constraint.c b/src/usr.sbin/ntpd/constraint.c -index 093f29a..008ab4d 100644 +index e19d68e..791a74c 100644 --- a/src/usr.sbin/ntpd/constraint.c +++ b/src/usr.sbin/ntpd/constraint.c -@@ -292,12 +292,14 @@ priv_constraint_child(struct constraint *cstr, struct ntp_addr_msg *am, - if (setpriority(PRIO_PROCESS, 0, 0) == -1) - log_warn("could not set priority"); +@@ -340,12 +340,14 @@ priv_constraint_child(const char *pw_dir, uid_t pw_uid, gid_t pw_gid) + (am = calloc(1, sizeof(*am))) == NULL) + fatal("%s: calloc", __func__); +#ifdef HAVE_LIBTLS /* Init TLS and load CA certs before chroot() */ @@ -64,5 +64,5 @@ index 87f94e8..7f729d2 100644 .It Ic constraint from Ar url Specify the URL, IP address or the hostname of an HTTPS server to -- -2.9.2 +2.10.1 diff --git a/patches/0010-add-a-method-for-updating-the-realtime-clock-on-sync.patch b/patches/0010-add-a-method-for-updating-the-realtime-clock-on-sync.patch index 530a198..0b75f6c 100644 --- a/patches/0010-add-a-method-for-updating-the-realtime-clock-on-sync.patch +++ b/patches/0010-add-a-method-for-updating-the-realtime-clock-on-sync.patch @@ -1,7 +1,7 @@ -From b141c29386bb3ac6e969e868e585ceab3a8c039c Mon Sep 17 00:00:00 2001 +From 23a7c3493c77605a2c00009ce6874a95e4d8ab41 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 4 May 2015 04:27:29 -0500 -Subject: [PATCH 10/12] add a method for updating the realtime clock on sync +Subject: [PATCH 10/13] add a method for updating the realtime clock on sync from Christian Weisgerber --- @@ -9,7 +9,7 @@ from Christian Weisgerber 1 file changed, 2 insertions(+) diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c -index ccd3a4d..dfddd89 100644 +index 9dac894..99bdecf 100644 --- a/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 **); @@ -20,7 +20,7 @@ index ccd3a4d..dfddd89 100644 volatile sig_atomic_t quit = 0; volatile sig_atomic_t reconfig = 0; -@@ -496,6 +497,7 @@ ntpd_adjtime(double d) +@@ -488,6 +489,7 @@ ntpd_adjtime(double d) else if (!firstadj && olddelta.tv_sec == 0 && olddelta.tv_usec == 0) synced = 1; firstadj = 0; @@ -29,5 +29,5 @@ index ccd3a4d..dfddd89 100644 } -- -2.9.2 +2.10.1 diff --git a/patches/0011-Deal-with-missing-SO_TIMESTAMP.patch b/patches/0011-Deal-with-missing-SO_TIMESTAMP.patch index bdc33d0..847afc1 100644 --- a/patches/0011-Deal-with-missing-SO_TIMESTAMP.patch +++ b/patches/0011-Deal-with-missing-SO_TIMESTAMP.patch @@ -1,7 +1,7 @@ -From 53f3f7918ad752f9b25ff44531d78e6577eec8df Mon Sep 17 00:00:00 2001 +From e6dac416156382be9065c684cd17de03e6695175 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 6 Dec 2015 22:35:38 -0600 -Subject: [PATCH 11/12] Deal with missing SO_TIMESTAMP +Subject: [PATCH 11/13] Deal with missing SO_TIMESTAMP from Paul B. Henson" @@ -11,7 +11,7 @@ Fall back to the previous client.c implementation when it is not found. 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/usr.sbin/ntpd/client.c b/src/usr.sbin/ntpd/client.c -index 7ce3b38..edca87c 100644 +index 3d70317..5619454 100644 --- a/src/usr.sbin/ntpd/client.c +++ b/src/usr.sbin/ntpd/client.c @@ -163,10 +163,12 @@ client_query(struct ntp_peer *p) @@ -65,5 +65,5 @@ index 7ce3b38..edca87c 100644 if (T4 < JAN_1970) { client_log_error(p, "recvmsg control format", EBADF); -- -2.9.2 +2.10.1 diff --git a/patches/0012-check-result-of-ftello-ftruncate.patch b/patches/0012-check-result-of-ftello-ftruncate.patch index 702300c..b17f806 100644 --- a/patches/0012-check-result-of-ftello-ftruncate.patch +++ b/patches/0012-check-result-of-ftello-ftruncate.patch @@ -1,17 +1,17 @@ -From b7579f49e46fc09eecd07134c2df5b674699e522 Mon Sep 17 00:00:00 2001 +From b313da219fdd6392095e617cf5f07158c4da21e3 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 21 Dec 2015 05:53:20 -0600 -Subject: [PATCH 12/12] check result of ftello/ftruncate +Subject: [PATCH 12/13] check result of ftello/ftruncate --- src/usr.sbin/ntpd/ntpd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c -index dfddd89..0e8d1c2 100644 +index 99bdecf..35a9797 100644 --- a/src/usr.sbin/ntpd/ntpd.c +++ b/src/usr.sbin/ntpd/ntpd.c -@@ -600,6 +600,7 @@ writefreq(double d) +@@ -592,6 +592,7 @@ writefreq(double d) { int r; static int warnonce = 1; @@ -19,7 +19,7 @@ index dfddd89..0e8d1c2 100644 if (freqfp == NULL) return 0; -@@ -613,8 +614,10 @@ writefreq(double d) +@@ -605,8 +606,10 @@ writefreq(double d) clearerr(freqfp); return 0; } @@ -33,5 +33,5 @@ index dfddd89..0e8d1c2 100644 } -- -2.9.2 +2.10.1 diff --git a/patches/0013-set-IPV6_V6ONLY-if-we-are-binding-to-an-IPv6-address.patch b/patches/0013-set-IPV6_V6ONLY-if-we-are-binding-to-an-IPv6-address.patch index b07f0a0..63610d1 100644 --- a/patches/0013-set-IPV6_V6ONLY-if-we-are-binding-to-an-IPv6-address.patch +++ b/patches/0013-set-IPV6_V6ONLY-if-we-are-binding-to-an-IPv6-address.patch @@ -1,6 +1,6 @@ -From bb9cd07007cf0e04a6f1ae50dcb9de977353a512 Mon Sep 17 00:00:00 2001 +From ecb2314601247924fee94550611c9d886fa0f990 Mon Sep 17 00:00:00 2001 From: Brent Cook -Date: Tue, 17 May 2016 08:31:24 -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 --- @@ -8,7 +8,7 @@ Subject: [PATCH 13/13] set IPV6_V6ONLY if we are binding to an IPv6 address 1 file changed, 9 insertions(+) diff --git a/src/usr.sbin/ntpd/server.c b/src/usr.sbin/ntpd/server.c -index 2e28b9b..1f3a074 100644 +index cbaa115..dd554e6 100644 --- a/src/usr.sbin/ntpd/server.c +++ b/src/usr.sbin/ntpd/server.c @@ -42,6 +42,9 @@ setup_listeners(struct servent *se, struct ntpd_conf *lconf, u_int *cnt) @@ -35,5 +35,5 @@ index 2e28b9b..1f3a074 100644 if (la->rtable != -1 && setsockopt(la->fd, SOL_SOCKET, SO_RTABLE, &la->rtable, -- -2.8.1 +2.10.1