rebase patches

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

@@ -1,7 +1,7 @@
 From 23bd483c6f15ae1237eb7764110590706f13c108 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 68baaf4eb14d9e6a1ce6c289580a561a878285f5 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-Use-LOG_NTP-syslog-facility-if-it-is-available.patch

@@ -1,7 +1,7 @@
 From 34d5195a0a360967ebf3694467512ada27f81650 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Mon, 12 Jan 2015 21:16:54 -0600
-Subject: [PATCH 03/12] Use LOG_NTP syslog facility if it is available
+Subject: [PATCH 03/13] Use LOG_NTP syslog facility if it is available
 
 FreeBSD PR:     114191
 Submitted by:   Robert Archer <freebsd@deathbeforedecaf.net>

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

@@ -1,7 +1,7 @@
 From 3537c0e956f9f67085fa9e76f303689df8753d2e Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Tue, 30 Dec 2014 09:02:50 -0600
-Subject: [PATCH 04/12] conditionally fill in sin_len/sin6_len if they exist
+Subject: [PATCH 04/13] conditionally fill in sin_len/sin6_len if they exist
 
 ---
  src/usr.sbin/ntpd/config.c | 8 ++++++++

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

@@ -1,7 +1,7 @@
 From 2e02b774dc28b1db74bd9c1837fd056c57234080 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Tue, 30 Dec 2014 09:05:46 -0600
-Subject: [PATCH 05/12] check if rdomain support is available.
+Subject: [PATCH 05/13] check if rdomain support is available.
 
 Handle FreeBSD's calling rdomain 'FIB'.
  - from naddy@openbsd.org

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

@@ -1,7 +1,7 @@
 From 48d02d4b495a95851b1f709ea38d51c61f1be4e1 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Tue, 30 Dec 2014 09:20:03 -0600
-Subject: [PATCH 06/12] update ntpd.conf to indicate OS-dependent options
+Subject: [PATCH 06/13] update ntpd.conf to indicate OS-dependent options
 
 Also, clarify listening behavior based on a patch from
 Dererk <dererk@debian.org>

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

@@ -1,7 +1,7 @@
 From 8f37bf27e304caa46054962b6c285ad0ce0e050c Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Thu, 1 Jan 2015 07:18:11 -0600
-Subject: [PATCH 07/12] allow overriding default user and file locations
+Subject: [PATCH 07/13] allow overriding default user and file locations
 
 Allow the build process to override the default ntpd file paths and
 default user.

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

@@ -1,7 +1,7 @@
 From 5e7e9b21cbc8ed49aed22e67cf6315477a76db4d Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Wed, 31 Dec 2014 08:26:41 -0600
-Subject: [PATCH 08/12] add -p option to create a pid file
+Subject: [PATCH 08/13] add -p option to create a pid file
 
 This is used in both the Gentoo and Debian ports.
 

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

@@ -1,7 +1,7 @@
 From fd8a742d7e3f2ff92e812cdccfb3477b948340fc Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Mon, 12 Jan 2015 06:18:31 -0600
-Subject: [PATCH 09/12] initialize setproctitle where needed
+Subject: [PATCH 09/13] initialize setproctitle where needed
 
 We need to save a copy of argv and __progname to avoid setproctitle
 clobbering them.

patches/0010-document-SIGUSR1-fallback-if-SIGINFO-is-not-implemen.patch

@@ -1,7 +1,7 @@
 From 60c072f759cadd167a929e035b33877b1f08103a Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Mon, 12 Jan 2015 21:17:35 -0600
-Subject: [PATCH 10/12] document SIGUSR1 fallback if SIGINFO is not
+Subject: [PATCH 10/13] document SIGUSR1 fallback if SIGINFO is not
  implemented.
 
 ---

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

@@ -1,7 +1,7 @@
 From 12e4fcd674dd852fe8838c60fee6168344df8b5f Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Fri, 27 Mar 2015 23:14:15 -0500
-Subject: [PATCH 11/12] Notify the user when constraint support is disabled.
+Subject: [PATCH 11/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.

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

@@ -1,7 +1,7 @@
 From 0ae8358adca5935a76b908938104ef9cb1ee60c1 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Mon, 4 May 2015 04:27:29 -0500
-Subject: [PATCH 12/12] add a method for updating the realtime clock on sync
+Subject: [PATCH 12/13] add a method for updating the realtime clock on sync
 
 from Christian Weisgerber
 ---

patches/0013-Deal-with-missing-SO_TIMESTAMP-by-falling-back-to-cl.patch → patches/0013-Deal-with-missing-SO_TIMESTAMP.patch

@@ -1,9 +1,12 @@
-From f8b926e15aa22ed9b2e82258819d9e3e130ef4b4 Mon Sep 17 00:00:00 2001
-From: "Paul B. Henson" <henson@acm.org>
-Date: Sat, 11 Jul 2015 21:48:53 -0700
-Subject: [PATCH] Deal with missing SO_TIMESTAMP by falling back to
- client.c,v1.84 behavior.
+From 90c47e06db660d4de455769fc291b1580a9f9414 Mon Sep 17 00:00:00 2001
+From: Brent Cook <bcook@openbsd.org>
+Date: Sat, 18 Jul 2015 01:14:55 -0500
+Subject: [PATCH 13/13] Deal with missing SO_TIMESTAMP
 
+from Paul B. Henson" <henson@acm.org>
+
+Fall back to the previous client.c implementation when it is not found.
+SO_TIMESTAMP was added in CVS rev 1.85 by henning@.
 ---
  src/usr.sbin/ntpd/client.c | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
@@ -63,5 +66,5 @@ index 2be1f93..e2076f8 100644
  	if (T4 < JAN_1970) {
  		client_log_error(p, "recvmsg control format", EBADF);
 -- 
-2.0.4
+2.4.5