rebase patches

patches/0001-be-more-verbose-when-logging-privsep-errors.patch

@@ -1,4 +1,4 @@
-From 04a35c5a5dd28b844727616281ce1f758dca61b2 Mon Sep 17 00:00:00 2001
+From f5c4350929461db34ac5e50472a5f5246c6cb6f6 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Thu, 1 Jan 2015 13:06:38 -0600
 Subject: [PATCH 01/12] be more verbose when logging privsep errors

patches/0002-do-not-allow-privsep-user-to-be-a-privileged-user.patch

@@ -1,4 +1,4 @@
-From 0d10418b24f6cc808c3d57ce787aeddc694f32ec Mon Sep 17 00:00:00 2001
+From e22f798bc68930e81a9303606550a693962ce3fb Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Thu, 1 Jan 2015 13:26:29 -0600
 Subject: [PATCH 02/12] do not allow privsep user to be a privileged user

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

@@ -1,4 +1,4 @@
-From c669e9d6b7470136440bccc4fa49e4cc53360e45 Mon Sep 17 00:00:00 2001
+From a48c8c8a78028f7dc07ceb23c47a4ed31f0dfaa6 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Tue, 30 Dec 2014 09:10:22 -0600
 Subject: [PATCH 03/12] Handle IPv6 DNS records on IPv4 networks more liberally

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

@@ -1,4 +1,4 @@
-From c77077c654c3d8ca31c0090cc02f4b96e33bf921 Mon Sep 17 00:00:00 2001
+From e885aae66f83f69ba38e33ef0ac706e9fe25f609 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Tue, 30 Dec 2014 09:04:08 -0600
 Subject: [PATCH 04/12] EAI_NODATA does not exist everywhere

patches/0005-Use-LOG_NTP-syslog-facility-if-it-is-available.patch

@@ -1,4 +1,4 @@
-From dade0523067059717aa6288ece18d23c5d5b7292 Mon Sep 17 00:00:00 2001
+From 889a119fa8e26239f09c38f55f5570b322793faf Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Mon, 12 Jan 2015 21:16:54 -0600
 Subject: [PATCH 05/12] Use LOG_NTP syslog facility if it is available

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

@@ -1,4 +1,4 @@
-From 79b2bc332cfdaf28db9c91ff3efa59b58399d210 Mon Sep 17 00:00:00 2001
+From 7f1cdb9b4cf9d20c59a3d7adf84cf8aeaaab3b0b Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Tue, 30 Dec 2014 09:02:50 -0600
 Subject: [PATCH 06/12] conditionally fill in sin_len/sin6_len if they exist

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

@@ -1,4 +1,4 @@
-From aff7968cefbc6d9d04f961456324bd352d7af401 Mon Sep 17 00:00:00 2001
+From 991f5af3c5543d4e1870e35392c9eda53ae89dcc Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Tue, 30 Dec 2014 09:05:46 -0600
 Subject: [PATCH 07/12] check if rdomain support is available.

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

@@ -1,4 +1,4 @@
-From 3255340d7b3f3049e52c3887c94541236550fc0e Mon Sep 17 00:00:00 2001
+From 2fc3020dd19b54b7b2da4641304cb7ecdefc13f8 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Tue, 30 Dec 2014 09:20:03 -0600
 Subject: [PATCH 08/12] update ntpd.conf to indicate OS-dependent options

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

@@ -1,4 +1,4 @@
-From c89cf6a3be32c9aaf57c97a5a866936355a59448 Mon Sep 17 00:00:00 2001
+From 84f1acc50280f93c444c8211f4ee384d58002180 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Thu, 1 Jan 2015 07:18:11 -0600
 Subject: [PATCH 09/12] allow overriding default user and file locations

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

@@ -1,4 +1,4 @@
-From 486586cc9977c7d1fc10c47810b1ea6a9479d659 Mon Sep 17 00:00:00 2001
+From b5d9a8e7f8991c6a50992171d836aff3d92b7fea Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Wed, 31 Dec 2014 08:26:41 -0600
 Subject: [PATCH 10/12] add -p option to create a pid file
@@ -35,7 +35,7 @@ index 18b12e8..9eb1fee 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 8ac1d14..af6d74d 100644
+index 052c240..d7efc25 100644
 --- a/src/usr.sbin/ntpd/ntpd.c
 +++ b/src/usr.sbin/ntpd/ntpd.c
 @@ -83,6 +83,18 @@ sighdlr(int sig)
@@ -100,7 +100,7 @@ index 8ac1d14..af6d74d 100644
  
 @@ -223,9 +240,11 @@ main(int argc, char *argv[])
  			log_init(lconf.debug);
- 			log_debug("no reply received in time, skipping initial "
+ 			log_warnx("no reply received in time, skipping initial "
  			    "time setting");
 -			if (!lconf.debug)
 +			if (!lconf.debug) {

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

@@ -1,4 +1,4 @@
-From b0e327e94bee063758356239ecd4d6adb83bb638 Mon Sep 17 00:00:00 2001
+From eb870881c4da0b69676b13a528c40e026e2149f6 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Mon, 12 Jan 2015 06:18:31 -0600
 Subject: [PATCH 11/12] initialize setproctitle where needed
@@ -8,7 +8,7 @@ Subject: [PATCH 11/12] initialize setproctitle where needed
  1 file changed, 16 insertions(+)
 
 diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
-index af6d74d..d8ede39 100644
+index d7efc25..fb870ad 100644
 --- a/src/usr.sbin/ntpd/ntpd.c
 +++ b/src/usr.sbin/ntpd/ntpd.c
 @@ -111,6 +111,11 @@ usage(void)

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

@@ -1,4 +1,4 @@
-From b7279a3996e26ad55f44af044f131339e24b8b40 Mon Sep 17 00:00:00 2001
+From 9eb62464e9d323197ee5f0aee210c70927989e43 Mon Sep 17 00:00:00 2001
 From: Brent Cook <busterb@gmail.com>
 Date: Mon, 12 Jan 2015 21:17:35 -0600
 Subject: [PATCH 12/12] document SIGUSR1 fallback if SIGINFO is not