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 546626b..3aebfc6 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,4 +1,4 @@ -From 943b27f54be7bc2bfd890b7062b44202a6147ee8 Mon Sep 17 00:00:00 2001 +From 23bd483c6f15ae1237eb7764110590706f13c108 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 @@ -37,5 +37,5 @@ index 1d982d6..e717d69 100644 if (p->rtable != -1 && setsockopt(p->query->fd, SOL_SOCKET, SO_RTABLE, -- -2.4.3.573.g4eafbef +2.4.5 diff --git a/patches/0002-EAI_NODATA-does-not-exist-everywhere.patch b/patches/0002-EAI_NODATA-does-not-exist-everywhere.patch index 141c9ed..239f0ca 100644 --- a/patches/0002-EAI_NODATA-does-not-exist-everywhere.patch +++ b/patches/0002-EAI_NODATA-does-not-exist-everywhere.patch @@ -1,4 +1,4 @@ -From 8eaf10387df7014a20285e329455eda86e0c4dc9 Mon Sep 17 00:00:00 2001 +From 68baaf4eb14d9e6a1ce6c289580a561a878285f5 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 @@ -36,5 +36,5 @@ index 3945405..8c1baa2 100644 log_warnx("could not parse \"%s\": %s", s, gai_strerror(error)); -- -2.4.3.573.g4eafbef +2.4.5 diff --git a/patches/0003-Use-LOG_NTP-syslog-facility-if-it-is-available.patch b/patches/0003-Use-LOG_NTP-syslog-facility-if-it-is-available.patch index 9624574..6732a1a 100644 --- a/patches/0003-Use-LOG_NTP-syslog-facility-if-it-is-available.patch +++ b/patches/0003-Use-LOG_NTP-syslog-facility-if-it-is-available.patch @@ -1,4 +1,4 @@ -From aa3a56f2688a9dc12a97eaed4fe45acbafe780d8 Mon Sep 17 00:00:00 2001 +From 34d5195a0a360967ebf3694467512ada27f81650 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 12 Jan 2015 21:16:54 -0600 Subject: [PATCH 03/12] Use LOG_NTP syslog facility if it is available @@ -51,5 +51,5 @@ index 1d8304b..5d34709 100644 tzset(); } -- -2.4.3.573.g4eafbef +2.4.5 diff --git a/patches/0004-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch b/patches/0004-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch index 4c9fc76..2a67215 100644 --- a/patches/0004-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch +++ b/patches/0004-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch @@ -1,4 +1,4 @@ -From c42162dc31ccb9703fdf668052057bf53797583b Mon Sep 17 00:00:00 2001 +From 3537c0e956f9f67085fa9e76f303689df8753d2e Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 30 Dec 2014 09:02:50 -0600 Subject: [PATCH 04/12] conditionally fill in sin_len/sin6_len if they exist @@ -49,5 +49,5 @@ index 8c1baa2..2e39604 100644 res->ai_addr)->sin6_addr, sizeof(struct in6_addr)); } -- -2.4.3.573.g4eafbef +2.4.5 diff --git a/patches/0005-check-if-rdomain-support-is-available.patch b/patches/0005-check-if-rdomain-support-is-available.patch index b341691..04d99d0 100644 --- a/patches/0005-check-if-rdomain-support-is-available.patch +++ b/patches/0005-check-if-rdomain-support-is-available.patch @@ -1,4 +1,4 @@ -From e476ea0fbf67062c3c63ea5393fb58e9c2f6a097 Mon Sep 17 00:00:00 2001 +From 2e02b774dc28b1db74bd9c1837fd056c57234080 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 30 Dec 2014 09:05:46 -0600 Subject: [PATCH 05/12] check if rdomain support is available. @@ -43,7 +43,7 @@ index e717d69..2be1f93 100644 for (cmsg = CMSG_FIRSTHDR(&somsg); cmsg != NULL; cmsg = CMSG_NXTHDR(&somsg, cmsg)) { diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h -index de4cd84..1402d74 100644 +index de4cd84..5bdd7a7 100644 --- a/src/usr.sbin/ntpd/ntpd.h +++ b/src/usr.sbin/ntpd/ntpd.h @@ -41,6 +41,12 @@ @@ -143,5 +143,5 @@ index ef448d3..618cd8f 100644 if (bind(la->fd, (struct sockaddr *)&la->sa, SA_LEN((struct sockaddr *)&la->sa)) == -1) { -- -2.4.3.573.g4eafbef +2.4.5 diff --git a/patches/0006-update-ntpd.conf-to-indicate-OS-dependent-options.patch b/patches/0006-update-ntpd.conf-to-indicate-OS-dependent-options.patch index 15c4d80..9fbfa90 100644 --- a/patches/0006-update-ntpd.conf-to-indicate-OS-dependent-options.patch +++ b/patches/0006-update-ntpd.conf-to-indicate-OS-dependent-options.patch @@ -1,4 +1,4 @@ -From 23f0bcc51a983e3f4f64e8eba69aab02b700a846 Mon Sep 17 00:00:00 2001 +From 48d02d4b495a95851b1f709ea38d51c61f1be4e1 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 30 Dec 2014 09:20:03 -0600 Subject: [PATCH 06/12] update ntpd.conf to indicate OS-dependent options @@ -49,5 +49,5 @@ index 65b51b0..5dd584d 100644 .Xr ntpd 8 will use each given sensor that actually exists. -- -2.4.3.573.g4eafbef +2.4.5 diff --git a/patches/0007-allow-overriding-default-user-and-file-locations.patch b/patches/0007-allow-overriding-default-user-and-file-locations.patch index 936d036..c1fecd7 100644 --- a/patches/0007-allow-overriding-default-user-and-file-locations.patch +++ b/patches/0007-allow-overriding-default-user-and-file-locations.patch @@ -1,4 +1,4 @@ -From f01d4ae55c737bdda0c4ae1c9c3749781fa7f421 Mon Sep 17 00:00:00 2001 +From 8f37bf27e304caa46054962b6c285ad0ce0e050c Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Thu, 1 Jan 2015 07:18:11 -0600 Subject: [PATCH 07/12] allow overriding default user and file locations @@ -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 1402d74..295d2b4 100644 +index 5bdd7a7..5172c45 100644 --- a/src/usr.sbin/ntpd/ntpd.h +++ b/src/usr.sbin/ntpd/ntpd.h @@ -36,10 +36,20 @@ @@ -35,7 +35,7 @@ index 1402d74..295d2b4 100644 +#define DRIFTFILE LOCALSTATEDIR "/db/ntpd.drift" +#define CTLSOCKET LOCALSTATEDIR "/run/ntpd.sock" - #if defined(SO_SETFIB) + #if defined(SO_SETFIB) && defined(FREEBSD_SO_RTABLE_ENABLED) #define SO_RTABLE SO_SETFIB @@ -88,7 +98,9 @@ #define CONSTRAINT_PORT "443" /* HTTPS port */ @@ -48,5 +48,5 @@ index 1402d74..295d2b4 100644 enum client_state { STATE_NONE, -- -2.4.3.573.g4eafbef +2.4.5 diff --git a/patches/0008-add-p-option-to-create-a-pid-file.patch b/patches/0008-add-p-option-to-create-a-pid-file.patch index c940ae5..04edf4c 100644 --- a/patches/0008-add-p-option-to-create-a-pid-file.patch +++ b/patches/0008-add-p-option-to-create-a-pid-file.patch @@ -1,4 +1,4 @@ -From 7576c1d2fdd7203e92635724d2a10d451737dff9 Mon Sep 17 00:00:00 2001 +From 5e7e9b21cbc8ed49aed22e67cf6315477a76db4d Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Wed, 31 Dec 2014 08:26:41 -0600 Subject: [PATCH 08/12] add -p option to create a pid file @@ -134,7 +134,7 @@ index 045bdd4..c7935bf 100644 timeout = INFTIM; break; diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h -index 295d2b4..2b7b672 100644 +index 5172c45..f31d9f8 100644 --- a/src/usr.sbin/ntpd/ntpd.h +++ b/src/usr.sbin/ntpd/ntpd.h @@ -239,6 +239,7 @@ struct ntpd_conf { @@ -146,5 +146,5 @@ index 295d2b4..2b7b672 100644 struct ctl_show_status { -- -2.4.3.573.g4eafbef +2.4.5 diff --git a/patches/0009-initialize-setproctitle-where-needed.patch b/patches/0009-initialize-setproctitle-where-needed.patch index a1c97a5..e3a6caf 100644 --- a/patches/0009-initialize-setproctitle-where-needed.patch +++ b/patches/0009-initialize-setproctitle-where-needed.patch @@ -1,4 +1,4 @@ -From 95ef91133c920f51d96a3878096cccc9f604671e Mon Sep 17 00:00:00 2001 +From 4a432aeecaeab8e3504cfad7c9cbab65cfbb07c5 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 12 Jan 2015 06:18:31 -0600 Subject: [PATCH 09/12] initialize setproctitle where needed @@ -48,5 +48,5 @@ index c7935bf..44caa80 100644 switch (ch) { case 'd': -- -2.4.3.573.g4eafbef +2.4.5 diff --git a/patches/0010-document-SIGUSR1-fallback-if-SIGINFO-is-not-implemen.patch b/patches/0010-document-SIGUSR1-fallback-if-SIGINFO-is-not-implemen.patch index 8236580..1f7c2ba 100644 --- a/patches/0010-document-SIGUSR1-fallback-if-SIGINFO-is-not-implemen.patch +++ b/patches/0010-document-SIGUSR1-fallback-if-SIGINFO-is-not-implemen.patch @@ -1,4 +1,4 @@ -From 72e069c446e2924fbcdaa3ef60655e84fceaaf10 Mon Sep 17 00:00:00 2001 +From f706e8544dd183e8d32979f0029e408bc6b64468 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 12 Jan 2015 21:17:35 -0600 Subject: [PATCH 10/12] document SIGUSR1 fallback if SIGINFO is not @@ -26,5 +26,5 @@ index b11b5ca..24f08e0 100644 .Sh FILES .Bl -tag -width "/var/db/ntpd.driftXXX" -compact -- -2.4.3.573.g4eafbef +2.4.5 diff --git a/patches/0011-Notify-the-user-when-constraint-support-is-disabled.patch b/patches/0011-Notify-the-user-when-constraint-support-is-disabled.patch index 636ea70..4cf9996 100644 --- a/patches/0011-Notify-the-user-when-constraint-support-is-disabled.patch +++ b/patches/0011-Notify-the-user-when-constraint-support-is-disabled.patch @@ -1,4 +1,4 @@ -From 3ee0940c80c203f7a3af452dca243d365b128e84 Mon Sep 17 00:00:00 2001 +From 73702698d7f337b008d58a8db6d93e8a7556a425 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Fri, 27 Mar 2015 23:14:15 -0500 Subject: [PATCH 11/12] Notify the user when constraint support is disabled. @@ -64,5 +64,5 @@ index 5dd584d..7b09932 100644 .It Ic constraint from Ar url Specify the URL, IP address or the hostname of an HTTPS server to -- -2.4.3.573.g4eafbef +2.4.5 diff --git a/patches/0012-add-a-method-for-updating-the-realtime-clock-on-sync.patch b/patches/0012-add-a-method-for-updating-the-realtime-clock-on-sync.patch index 43b7752..da4ad0b 100644 --- a/patches/0012-add-a-method-for-updating-the-realtime-clock-on-sync.patch +++ b/patches/0012-add-a-method-for-updating-the-realtime-clock-on-sync.patch @@ -1,4 +1,4 @@ -From bbd4389dbe2934d8c36d22a70d3b473c33e9bbf6 Mon Sep 17 00:00:00 2001 +From af468fcc4de3c1bfa280c1ec90a89d27d9ce9cda Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 4 May 2015 04:27:29 -0500 Subject: [PATCH 12/12] add a method for updating the realtime clock on sync @@ -29,5 +29,5 @@ index 44caa80..fb9a8df 100644 } -- -2.4.3.573.g4eafbef +2.4.5