update patches

patches/0001-Handle-IPv6-DNS-records-on-IPv4-networks-more-libera.patch

@@ -1,4 +1,4 @@
-From 1bed0811fcc1b7ed35153ea78876d40a7f0ced0d Mon Sep 17 00:00:00 2001
+From d6a269d214fbb8de854f8b5e7292d5c1fad5f424 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Tue, 30 Dec 2014 09:10:22 -0600
 Subject: [PATCH 01/15] Handle IPv6 DNS records on IPv4 networks more liberally
@@ -37,5 +37,5 @@ index d2e6119e23..98a1eb5825 100644
  		if (p->addr->ss.ss_family == qa4->sa_family) {
  			if (bind(p->query->fd, qa4, SA_LEN(qa4)) == -1)
 -- 
-2.26.0
+2.27.0
 

patches/0002-EAI_NODATA-does-not-exist-everywhere.patch

@@ -1,4 +1,4 @@
-From bb77cb6ffa61b2c9fccba81ffb0c4c3cf252854b Mon Sep 17 00:00:00 2001
+From ccda13569b027cdcc391a6efa83e03793291bf25 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Tue, 30 Dec 2014 09:04:08 -0600
 Subject: [PATCH 02/15] EAI_NODATA does not exist everywhere
@@ -15,10 +15,10 @@ portable software now has to have a special check instead.
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/src/usr.sbin/ntpd/config.c b/src/usr.sbin/ntpd/config.c
-index 9472a4616f..224c913383 100644
+index 0dd2978de3..e243818c25 100644
 --- a/src/usr.sbin/ntpd/config.c
 +++ b/src/usr.sbin/ntpd/config.c
-@@ -98,8 +98,14 @@ host_dns1(const char *s, struct ntp_addr **hn, int notauth)
+@@ -101,8 +101,14 @@ host_dns1(const char *s, struct ntp_addr **hn, int notauth)
  	hints.ai_socktype = SOCK_DGRAM; /* DUMMY */
  	hints.ai_flags = AI_ADDRCONFIG;
  	error = getaddrinfo(s, NULL, &hints, &res0);
@@ -36,5 +36,5 @@ index 9472a4616f..224c913383 100644
  		log_warnx("could not parse \"%s\": %s", s,
  		    gai_strerror(error));
 -- 
-2.26.0
+2.27.0
 

patches/0003-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch

@@ -1,4 +1,4 @@
-From 21ac1d31562ea880952c655602060b537c77104e Mon Sep 17 00:00:00 2001
+From 30d5fa3841facc188d5332d385069cce394b4dcd Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Tue, 30 Dec 2014 09:02:50 -0600
 Subject: [PATCH 03/15] conditionally fill in sin_len/sin6_len if they exist
@@ -8,10 +8,10 @@ Subject: [PATCH 03/15] conditionally fill in sin_len/sin6_len if they exist
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/src/usr.sbin/ntpd/parse.y b/src/usr.sbin/ntpd/parse.y
-index 8d7ab09de3..fa84123903 100644
+index 81d19bbff4..ab87872cfe 100644
 --- a/src/usr.sbin/ntpd/parse.y
 +++ b/src/usr.sbin/ntpd/parse.y
-@@ -141,15 +141,17 @@ main		: LISTEN ON address listen_opts	{
+@@ -140,15 +140,17 @@ main		: LISTEN ON address listen_opts	{
  
  			memset(&sin4, 0, sizeof(sin4));
  			sin4.sin_family = AF_INET;
@@ -33,5 +33,5 @@ index 8d7ab09de3..fa84123903 100644
  				yyerror("invalid IPv4 or IPv6 address: %s\n",
  				    $3);
 -- 
-2.26.0
+2.27.0
 

patches/0004-check-if-rdomain-support-is-available.patch

@@ -1,4 +1,4 @@
-From 5fc49b081e877911de47a621cfd7ee536f08c613 Mon Sep 17 00:00:00 2001
+From b83879413dbdc63ed6745f722ca59cf5942a149f Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Tue, 30 Dec 2014 09:05:46 -0600
 Subject: [PATCH 04/15] check if rdomain support is available.
@@ -29,10 +29,10 @@ index 208d19ccdf..05493ad1b2 100644
  #define	INTERVAL_QUERY_PATHETIC		60
  #define	INTERVAL_QUERY_AGGRESSIVE	5
 diff --git a/src/usr.sbin/ntpd/parse.y b/src/usr.sbin/ntpd/parse.y
-index fa84123903..610bd34731 100644
+index ab87872cfe..4a101bcd6d 100644
 --- a/src/usr.sbin/ntpd/parse.y
 +++ b/src/usr.sbin/ntpd/parse.y
-@@ -480,11 +480,13 @@ weight		: WEIGHT NUMBER	{
+@@ -479,11 +479,13 @@ weight		: WEIGHT NUMBER	{
  			opts.weight = $2;
  		}
  rtable		: RTABLE NUMBER {
@@ -112,5 +112,5 @@ index 123b6939a2..8c18eb7610 100644
  		if (bind(la->fd, (struct sockaddr *)&la->sa,
  		    SA_LEN((struct sockaddr *)&la->sa)) == -1) {
 -- 
-2.26.0
+2.27.0
 

patches/0005-update-ntpd.conf-to-indicate-OS-dependent-options.patch

@@ -1,4 +1,4 @@
-From 4b701bccb4a9e1e8b87a7846f54a4eef06eedae5 Mon Sep 17 00:00:00 2001
+From 52eebc084d17e17870e69937c5c2704126e15384 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Tue, 30 Dec 2014 09:20:03 -0600
 Subject: [PATCH 05/15] update ntpd.conf to indicate OS-dependent options
@@ -11,7 +11,7 @@ Debian bug ID: 575705
  1 file changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/src/usr.sbin/ntpd/ntpd.conf.5 b/src/usr.sbin/ntpd/ntpd.conf.5
-index 2a92c3ba10..775343f400 100644
+index a1f2bb294d..98368d914b 100644
 --- a/src/usr.sbin/ntpd/ntpd.conf.5
 +++ b/src/usr.sbin/ntpd/ntpd.conf.5
 @@ -38,9 +38,14 @@ The basic configuration options are as follows:
@@ -49,5 +49,5 @@ index 2a92c3ba10..775343f400 100644
  .Xr ntpd 8
  will use each given sensor that actually exists.
 -- 
-2.26.0
+2.27.0
 

patches/0006-allow-overriding-default-user-and-file-locations.patch

@@ -1,4 +1,4 @@
-From 3998296544302fe6b35080b26786e8cc5d5f2b1f Mon Sep 17 00:00:00 2001
+From 2359f4e6bc17e2924739cf4af4e21335ddd8508a Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Thu, 1 Jan 2015 07:18:11 -0600
 Subject: [PATCH 06/15] allow overriding default user and file locations
@@ -38,5 +38,5 @@ index 05493ad1b2..98f235be94 100644
  #if defined(SO_SETFIB)
  #define	SO_RTABLE	SO_SETFIB
 -- 
-2.26.0
+2.27.0
 

patches/0007-add-p-option-to-create-a-pid-file.patch

@@ -1,4 +1,4 @@
-From 37e1adef5771473c66ac447dbaa9d7479f8cf06b Mon Sep 17 00:00:00 2001
+From 3275b87581b58ea6ee9d5a774afaad9314c73be0 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Wed, 31 Dec 2014 08:26:41 -0600
 Subject: [PATCH 07/15] add -p option to create a pid file
@@ -146,5 +146,5 @@ index 98f235be94..bd5e7701a0 100644
  
  struct ctl_show_status {
 -- 
-2.26.0
+2.27.0
 

patches/0008-initialize-setproctitle-where-needed.patch

@@ -1,4 +1,4 @@
-From 6c82208423d5a2c452f558eff28b841614dd4c60 Mon Sep 17 00:00:00 2001
+From 34fcb744944e651e0b26b019a3e69cbbc181a1ad Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Mon, 12 Jan 2015 06:18:31 -0600
 Subject: [PATCH 08/15] initialize setproctitle where needed
@@ -55,5 +55,5 @@ index a0da39adf7..7259bb6236 100644
  		switch (ch) {
  		case 'd':
 -- 
-2.26.0
+2.27.0
 

patches/0009-Notify-the-user-when-constraint-support-is-disabled.patch

@@ -1,4 +1,4 @@
-From 6f149a27d07f574cf47a79b30f4f977e21477b1e Mon Sep 17 00:00:00 2001
+From 8e59facf2906e02c93eb63c69342b622836ea384 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Fri, 27 Mar 2015 23:14:15 -0500
 Subject: [PATCH 09/15] Notify the user when constraint support is disabled.
@@ -13,10 +13,10 @@ From Paul B. Henson.
  3 files changed, 14 insertions(+), 2 deletions(-)
 
 diff --git a/src/usr.sbin/ntpd/config.c b/src/usr.sbin/ntpd/config.c
-index 224c913383..8f913d8b1e 100644
+index e243818c25..856c3147cc 100644
 --- a/src/usr.sbin/ntpd/config.c
 +++ b/src/usr.sbin/ntpd/config.c
-@@ -184,6 +184,9 @@ new_constraint(void)
+@@ -187,6 +187,9 @@ new_constraint(void)
  	p->id = ++constraint_maxid;
  	p->fd = -1;
  
@@ -46,7 +46,7 @@ index 6529070d14..f23d363889 100644
  	if (chroot(pw_dir) == -1)
  		fatal("chroot");
 diff --git a/src/usr.sbin/ntpd/ntpd.conf.5 b/src/usr.sbin/ntpd/ntpd.conf.5
-index 775343f400..dadf3dea6d 100644
+index 98368d914b..bd7314c63b 100644
 --- a/src/usr.sbin/ntpd/ntpd.conf.5
 +++ b/src/usr.sbin/ntpd/ntpd.conf.5
 @@ -216,8 +216,15 @@ authenticated constraint,
@@ -68,5 +68,5 @@ index 775343f400..dadf3dea6d 100644
  .It Ic constraint from Ar url [ip...]
  Specify the URL, IP address or the hostname of an HTTPS server to
 -- 
-2.26.0
+2.27.0
 

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

@@ -1,4 +1,4 @@
-From 2dcfd7a12341ae71837622ccc1433dedadbd256d Mon Sep 17 00:00:00 2001
+From fe9855dbbb553d5eccd40d24a7a356c017722f00 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Mon, 4 May 2015 04:27:29 -0500
 Subject: [PATCH 10/15] add a method for updating the realtime clock on sync
@@ -29,5 +29,5 @@ index 7259bb6236..322b337a68 100644
  }
  
 -- 
-2.26.0
+2.27.0
 

patches/0011-Deal-with-missing-SO_TIMESTAMP.patch

@@ -1,4 +1,4 @@
-From 3a3c38a0e696c6a6aa32853fc1fbf72a738b1cab Mon Sep 17 00:00:00 2001
+From d32c974b39575f6c61273459f943eddbdf49169a Mon Sep 17 00:00:00 2001
 From: Brent Cook <bcook@openbsd.org>
 Date: Sun, 6 Dec 2015 22:35:38 -0600
 Subject: [PATCH 11/15] Deal with missing SO_TIMESTAMP
@@ -65,5 +65,5 @@ index 98a1eb5825..9dc131a11e 100644
  	ntp_getmsg((struct sockaddr *)&p->addr->ss, buf, size, &msg);
  
 -- 
-2.26.0
+2.27.0
 

patches/0012-check-result-of-ftello-ftruncate.patch

@@ -1,4 +1,4 @@
-From 02a48411868c16abf48c67c8e514b3893734fbbb Mon Sep 17 00:00:00 2001
+From e75f69a1c7c6000b7a0b51ba4d00455013db80b6 Mon Sep 17 00:00:00 2001
 From: Brent Cook <bcook@openbsd.org>
 Date: Mon, 21 Dec 2015 05:53:20 -0600
 Subject: [PATCH 12/15] check result of ftello/ftruncate
@@ -33,5 +33,5 @@ index 322b337a68..daa077dcda 100644
  }
  
 -- 
-2.26.0
+2.27.0
 

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

@@ -1,4 +1,4 @@
-From c7afac3bec625a2ed9c5a6f52c900ff680ab25bd Mon Sep 17 00:00:00 2001
+From ba37da3170bc54b8bff0a341229d8dd20034f18e Mon Sep 17 00:00:00 2001
 From: Brent Cook <bcook@openbsd.org>
 Date: Sat, 13 Aug 2016 14:22:02 -0500
 Subject: [PATCH 13/15] set IPV6_V6ONLY if we are binding to an IPv6 address
@@ -35,5 +35,5 @@ index 8c18eb7610..9eab1a74bf 100644
  		if (la->rtable != -1 &&
  		    setsockopt(la->fd, SOL_SOCKET, SO_RTABLE, &la->rtable,
 -- 
-2.26.0
+2.27.0
 

patches/0014-use-adjtimex-over-adjtime-check-return-value-and-adj.patch

@@ -1,4 +1,4 @@
-From b0f5ec0bb3f01ae852c3eb2e8e8c1947d2b5235a Mon Sep 17 00:00:00 2001
+From 9c40c5ecbbc4682a5f931a0723754a8340160860 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Sat, 19 Jan 2019 04:25:44 -0600
 Subject: [PATCH 14/15] use adjtimex over adjtime, check return value and
@@ -71,5 +71,5 @@ index daa077dcda..5817fff78a 100644
  	update_time_sync_status(synced);
  	return (synced);
 -- 
-2.26.0
+2.27.0
 

patches/0015-increase-buffer-sizes-potential-truncation.patch

@@ -1,4 +1,4 @@
-From 8701c68a6fb913bd5f7d003943cb0fde616a52ee Mon Sep 17 00:00:00 2001
+From 2b3abb5914e6ee355a7eb42e99acbbecf50ed252 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Sat, 13 Apr 2019 04:45:22 -0500
 Subject: [PATCH 15/15] increase buffer sizes potential truncation
@@ -35,5 +35,5 @@ index be113ba856..65eb9018bb 100644
  	b[0] = 0;
  	if (r > 0)
 -- 
-2.26.0
+2.27.0