update patches, fix incorrect memset size in source addr struct, ok naddy@

ChangeLog

@@ -1,6 +1,10 @@
 For detailed changes, see the changes either in the OpenBSD CVS repository or
 the GitHub mirror.
 
+2017-xx-xx  OpenNTPD 6.2p2
+
+	* Fixed support for 'query from' and clarified usage.
+
 2017-07-13  OpenNTPD 6.2p1
 
 	* Added option "query from <ip>" to ntpd.conf, to specify a local IP

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

@@ -1,4 +1,4 @@
-From 3932b6e3f8a6053d9ce2054c1d4f056d557fc0ef Mon Sep 17 00:00:00 2001
+From 16860984133725f67d1601a180063ff4a2af6282 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/13] Handle IPv6 DNS records on IPv4 networks more liberally
@@ -13,7 +13,7 @@ Original Author: Stefan Praszalowicz <stefan.praszalowicz@avedya.com>
  1 file changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/src/usr.sbin/ntpd/client.c b/src/usr.sbin/ntpd/client.c
-index 3de52685b..aa9fc24c6 100644
+index 3de52685b1..aa9fc24c68 100644
 --- a/src/usr.sbin/ntpd/client.c
 +++ b/src/usr.sbin/ntpd/client.c
 @@ -140,9 +140,16 @@ client_query(struct ntp_peer *p)
@@ -37,5 +37,5 @@ index 3de52685b..aa9fc24c6 100644
  		if (p->addr->ss.ss_family == qa4->sa_family) {
  			if (bind(p->query->fd, qa4, SA_LEN(qa4)) == -1)
 -- 
-2.13.0
+2.14.0
 

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

@@ -1,4 +1,4 @@
-From 25747c0ef42f61f122d73c9c8f7b1d6facd5c437 Mon Sep 17 00:00:00 2001
+From 827a29308ca7b2ce893a0dc5d6717a500ea9e52d 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/13] EAI_NODATA does not exist everywhere
@@ -15,7 +15,7 @@ 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 fcf89ddfc..e3eeed3d6 100644
+index fcf89ddfcc..e3eeed3d67 100644
 --- a/src/usr.sbin/ntpd/config.c
 +++ b/src/usr.sbin/ntpd/config.c
 @@ -133,8 +133,14 @@ host_dns(const char *s, struct ntp_addr **hn)
@@ -36,5 +36,5 @@ index fcf89ddfc..e3eeed3d6 100644
  		log_warnx("could not parse \"%s\": %s", s,
  		    gai_strerror(error));
 -- 
-2.13.0
+2.14.0
 

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

@@ -1,4 +1,4 @@
-From 36eb7d2a2843515b465e36a79b869dc2dd43439f Mon Sep 17 00:00:00 2001
+From 6843d3c05dedd4609b3ad43eb17983b68a85e710 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/13] conditionally fill in sin_len/sin6_len if they exist
@@ -9,7 +9,7 @@ Subject: [PATCH 03/13] conditionally fill in sin_len/sin6_len if they exist
  2 files changed, 13 insertions(+), 3 deletions(-)
 
 diff --git a/src/usr.sbin/ntpd/config.c b/src/usr.sbin/ntpd/config.c
-index e3eeed3d6..a84635ab7 100644
+index e3eeed3d67..a84635ab77 100644
 --- a/src/usr.sbin/ntpd/config.c
 +++ b/src/usr.sbin/ntpd/config.c
 @@ -72,7 +72,9 @@ host_v4(const char *s)
@@ -50,14 +50,15 @@ index e3eeed3d6..a84635ab7 100644
  			    res->ai_addr)->sin6_addr, sizeof(struct in6_addr));
  		}
 diff --git a/src/usr.sbin/ntpd/parse.y b/src/usr.sbin/ntpd/parse.y
-index af4ad1731..8197fe953 100644
+index 41fa9ba1fc..3dbd0b0c8e 100644
 --- a/src/usr.sbin/ntpd/parse.y
 +++ b/src/usr.sbin/ntpd/parse.y
-@@ -137,14 +137,16 @@ main		: LISTEN ON address listen_opts	{
- 			struct sockaddr_in6 sin6;
+@@ -138,15 +138,17 @@ main		: LISTEN ON address listen_opts	{
  
+ 			memset(&sin4, 0, sizeof(sin4));
  			sin4.sin_family = AF_INET;
 -			sin4.sin_len = sizeof(struct sockaddr_in);
+ 			memset(&sin6, 0, sizeof(sin6));
  			sin6.sin6_family = AF_INET6;
 +#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
 +			sin4.sin_len = sizeof(struct sockaddr_in);
@@ -66,13 +67,13 @@ index af4ad1731..8197fe953 100644
  
  			if (inet_pton(AF_INET, $3, &sin4.sin_addr) == 1)
 -				memcpy(&query_addr4, &sin4, sin4.sin_len);
-+				memcpy(&query_addr4, &sin4, sizeof(struct in_addr));
++				memcpy(&query_addr4, &sin4, sizeof(struct sockaddr_in));
  			else if (inet_pton(AF_INET6, $3, &sin6.sin6_addr) == 1)
 -				memcpy(&query_addr6, &sin6, sin6.sin6_len);
-+				memcpy(&query_addr6, &sin6, sizeof(struct in6_addr));
++				memcpy(&query_addr6, &sin6, sizeof(struct sockaddr_in6));
  			else {
  				yyerror("invalid IPv4 or IPv6 address: %s\n",
  				    $3);
 -- 
-2.13.0
+2.14.0
 

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

@@ -1,4 +1,4 @@
-From ee9042fcbe380097c551c5edbcf4d683704c2ab9 Mon Sep 17 00:00:00 2001
+From 547ae2d0dfc8ded1c85af2a8b550c0e769138aa8 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/13] check if rdomain support is available.
@@ -12,7 +12,7 @@ Handle FreeBSD's calling rdomain 'FIB'.
  3 files changed, 22 insertions(+), 1 deletion(-)
 
 diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h
-index 30ef206b4..30f0304dc 100644
+index 30ef206b47..30f0304dcb 100644
 --- a/src/usr.sbin/ntpd/ntpd.h
 +++ b/src/usr.sbin/ntpd/ntpd.h
 @@ -40,6 +40,12 @@
@@ -29,10 +29,10 @@ index 30ef206b4..30f0304dc 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 8197fe953..b6ef08097 100644
+index 3dbd0b0c8e..eb7e9b9e53 100644
 --- a/src/usr.sbin/ntpd/parse.y
 +++ b/src/usr.sbin/ntpd/parse.y
-@@ -434,11 +434,13 @@ weight		: WEIGHT NUMBER	{
+@@ -436,11 +436,13 @@ weight		: WEIGHT NUMBER	{
  			opts.weight = $2;
  		}
  rtable		: RTABLE NUMBER {
@@ -47,7 +47,7 @@ index 8197fe953..b6ef08097 100644
  		}
  		;
 diff --git a/src/usr.sbin/ntpd/server.c b/src/usr.sbin/ntpd/server.c
-index 123b6939a..8c18eb761 100644
+index 123b6939a2..8c18eb7610 100644
 --- a/src/usr.sbin/ntpd/server.c
 +++ b/src/usr.sbin/ntpd/server.c
 @@ -35,11 +35,16 @@ setup_listeners(struct servent *se, struct ntpd_conf *lconf, u_int *cnt)
@@ -112,5 +112,5 @@ index 123b6939a..8c18eb761 100644
  		if (bind(la->fd, (struct sockaddr *)&la->sa,
  		    SA_LEN((struct sockaddr *)&la->sa)) == -1) {
 -- 
-2.13.0
+2.14.0
 

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

@@ -1,4 +1,4 @@
-From 56a53ff670459660f858723115fff391203cc2e2 Mon Sep 17 00:00:00 2001
+From df6414c5b7b55c15cfa5d2eaac1845041031133f 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/13] 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 7e9cc7678..e3c0ddd78 100644
+index 08062bcf28..eee239bf52 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 7e9cc7678..e3c0ddd78 100644
  .Xr ntpd 8
  will use each given sensor that actually exists.
 -- 
-2.13.0
+2.14.0
 

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

@@ -1,4 +1,4 @@
-From 1ba669c02b5e81551dfa3f1ce07fdfb7a00fd3c1 Mon Sep 17 00:00:00 2001
+From e325d0325dc8959374eca27a9dc420b94cf0bafc 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/13] allow overriding default user and file locations
@@ -10,7 +10,7 @@ default user.
  1 file changed, 15 insertions(+), 3 deletions(-)
 
 diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h
-index 30f0304dc..b7ddfee0a 100644
+index 30f0304dcb..b7ddfee0ae 100644
 --- a/src/usr.sbin/ntpd/ntpd.h
 +++ b/src/usr.sbin/ntpd/ntpd.h
 @@ -35,10 +35,20 @@
@@ -48,5 +48,5 @@ index 30f0304dc..b7ddfee0a 100644
  #define PARENT_SOCK_FILENO		CONSTRAINT_PASSFD
  
 -- 
-2.13.0
+2.14.0
 

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

@@ -1,4 +1,4 @@
-From 933fd946afb55fdeaae822b84b0674ee114ad497 Mon Sep 17 00:00:00 2001
+From ecb9f8a24e3d906ecf26ff2eef52a15e62c98e25 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/13] add -p option to create a pid file
@@ -13,7 +13,7 @@ Origin: https://bugs.gentoo.org/show_bug.cgi?id=493082
  3 files changed, 33 insertions(+), 5 deletions(-)
 
 diff --git a/src/usr.sbin/ntpd/ntpd.8 b/src/usr.sbin/ntpd/ntpd.8
-index 689d269c6..fbcfa85b3 100644
+index 689d269c6c..fbcfa85b3f 100644
 --- a/src/usr.sbin/ntpd/ntpd.8
 +++ b/src/usr.sbin/ntpd/ntpd.8
 @@ -25,6 +25,7 @@
@@ -35,7 +35,7 @@ index 689d269c6..fbcfa85b3 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 0ec3ede03..3d9e089b3 100644
+index 0ec3ede03b..3d9e089b3e 100644
 --- a/src/usr.sbin/ntpd/ntpd.c
 +++ b/src/usr.sbin/ntpd/ntpd.c
 @@ -87,6 +87,18 @@ sighdlr(int sig)
@@ -134,7 +134,7 @@ index 0ec3ede03..3d9e089b3 100644
  			timeout = INFTIM;
  			break;
 diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h
-index b7ddfee0a..39b8e7bf4 100644
+index b7ddfee0ae..39b8e7bf43 100644
 --- a/src/usr.sbin/ntpd/ntpd.h
 +++ b/src/usr.sbin/ntpd/ntpd.h
 @@ -253,6 +253,7 @@ struct ntpd_conf {
@@ -146,5 +146,5 @@ index b7ddfee0a..39b8e7bf4 100644
  
  struct ctl_show_status {
 -- 
-2.13.0
+2.14.0
 

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

@@ -1,4 +1,4 @@
-From 4738a7078815a5c98e4ea227e3d9aa58bd076a4f Mon Sep 17 00:00:00 2001
+From 03a66edf986ac0801dcf40eeab147ca54c3afcb9 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/13] initialize setproctitle where needed
@@ -10,7 +10,7 @@ clobbering them.
  1 file changed, 20 insertions(+)
 
 diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
-index 3d9e089b3..57f1f4ff3 100644
+index 3d9e089b3e..57f1f4ff3b 100644
 --- a/src/usr.sbin/ntpd/ntpd.c
 +++ b/src/usr.sbin/ntpd/ntpd.c
 @@ -117,6 +117,13 @@ usage(void)
@@ -55,5 +55,5 @@ index 3d9e089b3..57f1f4ff3 100644
  		switch (ch) {
  		case 'd':
 -- 
-2.13.0
+2.14.0
 

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

@@ -1,4 +1,4 @@
-From e76aeb2f1854ae698325aa03fe1f0b7f7bcbf411 Mon Sep 17 00:00:00 2001
+From 071d21a66c0814efcecdba702a11d886fc1b444e 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/13] Notify the user when constraint support is disabled.
@@ -13,7 +13,7 @@ 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 a84635ab7..430992137 100644
+index a84635ab77..430992137a 100644
 --- a/src/usr.sbin/ntpd/config.c
 +++ b/src/usr.sbin/ntpd/config.c
 @@ -219,6 +219,9 @@ new_constraint(void)
@@ -27,7 +27,7 @@ index a84635ab7..430992137 100644
  }
  
 diff --git a/src/usr.sbin/ntpd/constraint.c b/src/usr.sbin/ntpd/constraint.c
-index 7e259af2d..8a3ddacc1 100644
+index 7e259af2d8..8a3ddacc10 100644
 --- a/src/usr.sbin/ntpd/constraint.c
 +++ b/src/usr.sbin/ntpd/constraint.c
 @@ -336,12 +336,14 @@ priv_constraint_child(const char *pw_dir, uid_t pw_uid, gid_t pw_gid)
@@ -46,7 +46,7 @@ index 7e259af2d..8a3ddacc1 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 e3c0ddd78..4218b811b 100644
+index eee239bf52..5181a9c504 100644
 --- a/src/usr.sbin/ntpd/ntpd.conf.5
 +++ b/src/usr.sbin/ntpd/ntpd.conf.5
 @@ -195,8 +195,15 @@ authenticated constraint,
@@ -68,5 +68,5 @@ index e3c0ddd78..4218b811b 100644
  .It Ic constraint from Ar url
  Specify the URL, IP address or the hostname of an HTTPS server to
 -- 
-2.13.0
+2.14.0
 

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

@@ -1,4 +1,4 @@
-From 3fbb0bef99d10fdacda9583b8c0f80efd82797db Mon Sep 17 00:00:00 2001
+From 6ad4d6a4f65e622c6206484a1a5777368257b40f 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/13] 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 57f1f4ff3..0eb7f573c 100644
+index 57f1f4ff3b..0eb7f573c4 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 **);
@@ -29,5 +29,5 @@ index 57f1f4ff3..0eb7f573c 100644
  }
  
 -- 
-2.13.0
+2.14.0
 

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

@@ -1,4 +1,4 @@
-From 3d2500746a780d03c48b7dd10e821a5944ae33ed Mon Sep 17 00:00:00 2001
+From 5dabc9efbaf148d8b40bf33df887dca0b6057954 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/13] Deal with missing SO_TIMESTAMP
@@ -11,7 +11,7 @@ Fall back to the previous client.c implementation when it is not found.
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/src/usr.sbin/ntpd/client.c b/src/usr.sbin/ntpd/client.c
-index aa9fc24c6..bb5c4f4c0 100644
+index aa9fc24c68..bb5c4f4c0e 100644
 --- a/src/usr.sbin/ntpd/client.c
 +++ b/src/usr.sbin/ntpd/client.c
 @@ -175,10 +175,12 @@ client_query(struct ntp_peer *p)
@@ -65,5 +65,5 @@ index aa9fc24c6..bb5c4f4c0 100644
  	if (T4 < JAN_1970) {
  		client_log_error(p, "recvmsg control format", EBADF);
 -- 
-2.13.0
+2.14.0
 

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

@@ -1,4 +1,4 @@
-From cf9058ca118785f7e73e163e9c4691cbf726dfcc Mon Sep 17 00:00:00 2001
+From 8a61f073185e262887ed4aef8c2ec4e2f922d708 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/13] check result of ftello/ftruncate
@@ -8,7 +8,7 @@ Subject: [PATCH 12/13] 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 0eb7f573c..de0d750c5 100644
+index 0eb7f573c4..de0d750c57 100644
 --- a/src/usr.sbin/ntpd/ntpd.c
 +++ b/src/usr.sbin/ntpd/ntpd.c
 @@ -586,6 +586,7 @@ writefreq(double d)
@@ -33,5 +33,5 @@ index 0eb7f573c..de0d750c5 100644
  }
  
 -- 
-2.13.0
+2.14.0
 

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

@@ -1,4 +1,4 @@
-From b00291c2d9c8ecd1b17cb7d33a2e24819e550d26 Mon Sep 17 00:00:00 2001
+From f16fddf3d74779243b0f44072da9fa13d74b7c17 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/13] set IPV6_V6ONLY if we are binding to an IPv6 address
@@ -8,7 +8,7 @@ Subject: [PATCH 13/13] set IPV6_V6ONLY if we are binding to an IPv6 address
  1 file changed, 9 insertions(+)
 
 diff --git a/src/usr.sbin/ntpd/server.c b/src/usr.sbin/ntpd/server.c
-index 8c18eb761..9eab1a74b 100644
+index 8c18eb7610..9eab1a74bf 100644
 --- a/src/usr.sbin/ntpd/server.c
 +++ b/src/usr.sbin/ntpd/server.c
 @@ -42,6 +42,9 @@ setup_listeners(struct servent *se, struct ntpd_conf *lconf, u_int *cnt)
@@ -35,5 +35,5 @@ index 8c18eb761..9eab1a74b 100644
  		if (la->rtable != -1 &&
  		    setsockopt(la->fd, SOL_SOCKET, SO_RTABLE, &la->rtable,
 -- 
-2.13.0
+2.14.0