fix missed conflict in patches

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

@@ -1,4 +1,4 @@
-From cb6da547c5b532d6e8d241cb993c831605d0d45f Mon Sep 17 00:00:00 2001
+From 4eaf878371b6a3bcba24fcf6ece12a6170d7d983 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
@@ -8,9 +8,9 @@ This is used in both the Gentoo and Debian ports.
 Origin: https://bugs.gentoo.org/show_bug.cgi?id=493082
 ---
  src/usr.sbin/ntpd/ntpd.8 |  4 ++++
- src/usr.sbin/ntpd/ntpd.c | 35 +++++++++++++++++++++++++++++++----
+ src/usr.sbin/ntpd/ntpd.c | 33 ++++++++++++++++++++++++++++-----
  src/usr.sbin/ntpd/ntpd.h |  1 +
- 3 files changed, 36 insertions(+), 4 deletions(-)
+ 3 files changed, 33 insertions(+), 5 deletions(-)
 
 diff --git a/src/usr.sbin/ntpd/ntpd.8 b/src/usr.sbin/ntpd/ntpd.8
 index dcfb6d2..1b885a1 100644
@@ -35,7 +35,7 @@ index dcfb6d2..1b885a1 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 b6eb98e..608e6fd 100644
+index b6eb98e..8dbd51e 100644
 --- a/src/usr.sbin/ntpd/ntpd.c
 +++ b/src/usr.sbin/ntpd/ntpd.c
 @@ -87,6 +87,18 @@ sighdlr(int sig)
@@ -85,16 +85,12 @@ index b6eb98e..608e6fd 100644
  		case 's':
  			lconf.settime = 1;
  			break;
-@@ -191,10 +206,16 @@ main(int argc, char *argv[])
- 	reset_adjtime();
+@@ -192,9 +207,11 @@ main(int argc, char *argv[])
  	if (!lconf.settime) {
  		log_init(lconf.debug, LOG_DAEMON);
-+<<<<<<< 00fff5a8c36c3b3574abf8bd4bb1a558d1f8232d
  		log_verbose(lconf.verbose);
- 		if (!lconf.debug)
-+=======
+-		if (!lconf.debug)
 +		if (!lconf.debug) {
-+>>>>>>> add -p option to create a pid file
  			if (daemon(1, 0))
  				fatal("daemon");
 +			writepid(&lconf);
@@ -102,7 +98,7 @@ index b6eb98e..608e6fd 100644
  	} else
  		timeout = SETTIME_TIMEOUT * 1000;
  
-@@ -273,9 +294,11 @@ main(int argc, char *argv[])
+@@ -273,9 +290,11 @@ main(int argc, char *argv[])
  			log_verbose(lconf.verbose);
  			log_warnx("no reply received in time, skipping initial "
  			    "time setting");
@@ -115,7 +111,7 @@ index b6eb98e..608e6fd 100644
  		}
  
  		if (nfds > 0 && (pfd[PFD_PIPE].revents & POLLOUT))
-@@ -318,6 +341,8 @@ main(int argc, char *argv[])
+@@ -318,6 +337,8 @@ main(int argc, char *argv[])
  	msgbuf_clear(&ibuf->w);
  	free(ibuf);
  	log_info("Terminating");
@@ -124,7 +120,7 @@ index b6eb98e..608e6fd 100644
  	return (0);
  }
  
-@@ -401,9 +426,11 @@ dispatch_imsg(struct ntpd_conf *lconf, const char *pw_dir,
+@@ -401,9 +422,11 @@ dispatch_imsg(struct ntpd_conf *lconf, const char *pw_dir,
  			memcpy(&d, imsg.data, sizeof(d));
  			ntpd_settime(d);
  			/* daemonize now */

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

@@ -1,4 +1,4 @@
-From b3c820711065f53390aa0a82236102deb15442fe Mon Sep 17 00:00:00 2001
+From 0efb3313d88327d01c158c9d4f842888f4710b8e 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
@@ -10,7 +10,7 @@ clobbering them.
  1 file changed, 19 insertions(+)
 
 diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
-index 608e6fd..c416c04 100644
+index 8dbd51e..c90c52f 100644
 --- a/src/usr.sbin/ntpd/ntpd.c
 +++ b/src/usr.sbin/ntpd/ntpd.c
 @@ -117,6 +117,13 @@ usage(void)

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

@@ -1,4 +1,4 @@
-From 09598d4720c5bf6d58b6597d96288b2c0c2ba54a Mon Sep 17 00:00:00 2001
+From dfc8622622b49b4ed919bf07120ad78a6cc62c26 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.

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

@@ -1,4 +1,4 @@
-From 97c083b8d9db34198c98561d3dbc746eb48804ba Mon Sep 17 00:00:00 2001
+From 2cbd6167722989c83f76167dab38dc090b2be15a 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
@@ -9,7 +9,7 @@ from Christian Weisgerber
  1 file changed, 2 insertions(+)
 
 diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
-index c416c04..4d49226 100644
+index c90c52f..af8700e 100644
 --- a/src/usr.sbin/ntpd/ntpd.c
 +++ b/src/usr.sbin/ntpd/ntpd.c
 @@ -55,6 +55,7 @@ const char     *ctl_lookup_option(char *, const char **);
@@ -20,7 +20,7 @@ index c416c04..4d49226 100644
  
  volatile sig_atomic_t	 quit = 0;
  volatile sig_atomic_t	 reconfig = 0;
-@@ -498,6 +499,7 @@ ntpd_adjtime(double d)
+@@ -494,6 +495,7 @@ ntpd_adjtime(double d)
  	else if (!firstadj && olddelta.tv_sec == 0 && olddelta.tv_usec == 0)
  		synced = 1;
  	firstadj = 0;

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

@@ -1,4 +1,4 @@
-From 5c17d3eb5dba72fca49f9285a76d77debcedbbe8 Mon Sep 17 00:00:00 2001
+From 2c75747b9d10183dbec1d680abbfa6f780c738bb 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

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

@@ -1,4 +1,4 @@
-From 7519735f71bb20104b700eb19206279f51d4849a Mon Sep 17 00:00:00 2001
+From e8b7619433a6d6e6ff8f106850a3f1d2808653fb 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
@@ -8,10 +8,10 @@ Subject: [PATCH 12/12] check result of ftello/ftruncate
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
-index 4d49226..781ae7c 100644
+index af8700e..631e4de 100644
 --- a/src/usr.sbin/ntpd/ntpd.c
 +++ b/src/usr.sbin/ntpd/ntpd.c
-@@ -602,6 +602,7 @@ writefreq(double d)
+@@ -598,6 +598,7 @@ writefreq(double d)
  {
  	int r;
  	static int warnonce = 1;
@@ -19,7 +19,7 @@ index 4d49226..781ae7c 100644
  
  	if (freqfp == NULL)
  		return 0;
-@@ -615,8 +616,10 @@ writefreq(double d)
+@@ -611,8 +612,10 @@ writefreq(double d)
  		clearerr(freqfp);
  		return 0;
  	}