rebase patches

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

@@ -1,7 +1,7 @@
-From 849ba5c1634d7644fe43f3959b9642a0932c60cc Mon Sep 17 00:00:00 2001
+From ca2ca2f4b7f46c366fde7c4f1b7fc4522d49e142 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/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.

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

@@ -1,7 +1,7 @@
-From 1d9db54c51e9e857da5e8e4ea137fe56a8776d98 Mon Sep 17 00:00:00 2001
+From f9a6fc9728565773c01d0e2f9cfb6f52a5035dae 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/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.
 

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

@@ -1,7 +1,7 @@
-From de7ff570ba05b30305aa8574634fe71942ba56eb Mon Sep 17 00:00:00 2001
+From 56cce5db3e98b241cbd0b6fb589a0ee0472fb1d5 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/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 ++++++++

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

@@ -1,7 +1,7 @@
-From c123b58020c62535178051e11fd1867d4bb83459 Mon Sep 17 00:00:00 2001
+From a59051f8fefda18ed49fb9d12022c6f799fb60c9 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/12] check if rdomain support is available.
+Subject: [PATCH 04/13] check if rdomain support is available.
 
 ---
  src/usr.sbin/ntpd/parse.y  |  2 ++

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

@@ -1,7 +1,7 @@
-From 1a07a2da0857383abc1812913795dad6c0896574 Mon Sep 17 00:00:00 2001
+From 2a04ec132f9ac193e4cb52cc3dbe76ed03e4b624 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/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 <dererk@debian.org>

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

@@ -1,7 +1,7 @@
-From 4bffc797018df06078af909df2ea8af89eaa3a82 Mon Sep 17 00:00:00 2001
+From 9df34babff002bddd4fadfb271b4226d45b007a2 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/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.

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

@@ -1,7 +1,7 @@
-From 04896536acf7a0305de2397afe4f86d3bbf66df7 Mon Sep 17 00:00:00 2001
+From 5c0b2ba4ef077a253a8ce0a11fb536b7f696ddbf 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/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.
 

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

@@ -1,7 +1,7 @@
-From 9a99fbbdf9e1df934f7d6d0b81e3069ca855d9c5 Mon Sep 17 00:00:00 2001
+From 71312c1ff3362948f6593577dfec6e6eded52642 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/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.

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

@@ -1,7 +1,7 @@
-From 9b1a06a5c90941b622f97ecebf41fb14adeabef5 Mon Sep 17 00:00:00 2001
+From 58940edb034bf022031732e76d0481f737614eaf 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/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,7 +27,7 @@ index 87de17a..5a75030 100644
  }
  
 diff --git a/src/usr.sbin/ntpd/constraint.c b/src/usr.sbin/ntpd/constraint.c
-index 18fc3ef..3889085 100644
+index f259b08..46b96ee 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,
@@ -35,12 +35,12 @@ index 18fc3ef..3889085 100644
  		log_warn("could not set priority");
  
 +#ifdef HAVE_LIBTLS
- 	/* Init TLS and load cert before chroot() */
+ 	/* Init TLS and load CA certs before chroot() */
  	if (tls_init() == -1)
  		fatalx("tls_init");
  	if ((conf->ca = tls_load_file(CONSTRAINT_CA,
  	    &conf->ca_len, NULL)) == NULL)
- 		log_warnx("constraint certificate verification turned off");
+ 		fatalx("failed to load constraint ca");
 +#endif
  
  	if (chroot(pw_dir) == -1)

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

@@ -1,7 +1,7 @@
-From 316da4311a4f4020aa5b3b28bd9232b9302e5496 Mon Sep 17 00:00:00 2001
+From 250b304b0dbd81de45d7f147a82fd89d78113a3f 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/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
 ---

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

@@ -1,7 +1,7 @@
-From 1ee4fc6bb354675f9e70df4a4b3c8dea0bf0f87a Mon Sep 17 00:00:00 2001
+From d489be05f5adf4c8c4954ef95808f748bf7878d5 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/12] Deal with missing SO_TIMESTAMP
+Subject: [PATCH 11/13] Deal with missing SO_TIMESTAMP
 
 from Paul B. Henson" <henson@acm.org>
 

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

@@ -1,7 +1,7 @@
-From 84fa6ee10689cc7808f8aacb404b5bc8588ad89b Mon Sep 17 00:00:00 2001
+From 2bed8fd9ab9ad6016e45f91fd2de5de2a6c79fce 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/12] check result of ftello/ftruncate
+Subject: [PATCH 12/13] check result of ftello/ftruncate
 
 ---
  src/usr.sbin/ntpd/ntpd.c | 7 +++++--

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

@@ -1,4 +1,4 @@
-From f6e5d599abe2b7456b3804443eee716160f18d14 Mon Sep 17 00:00:00 2001
+From bb9cd07007cf0e04a6f1ae50dcb9de977353a512 Mon Sep 17 00:00:00 2001
 From: Brent Cook <bcook@openbsd.org>
 Date: Tue, 17 May 2016 08:31:24 -0500
 Subject: [PATCH 13/13] set IPV6_V6ONLY if we are binding to an IPv6 address