.dhcp.metadata

@@ -1 +1 @@
-e4338f80bd2118ba1578e4bd3c2c154ec9c12ce0 SOURCES/dhcp-4.4.2b1.tar.gz
+fb0417530e49368fe032cd9722f51c74f93180ac SOURCES/dhcp-4.3.6.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/dhcp-4.4.2b1.tar.gz
+SOURCES/dhcp-4.3.6.tar.gz

SOURCES/0007-Change-paths-to-conform-to-our-standards.patch

@@ -1,54 +0,0 @@
-From ac65289663532db0bc1de449ca2a0eb4c8c2ca6f Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:26:34 +0100
-Subject: [PATCH 07/26] Change paths to conform to our standards
-Cc: pzhukov@redhat.com
-
----
- doc/examples/dhcpd-dhcpv6.conf | 2 +-
- includes/dhcpd.h               | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/doc/examples/dhcpd-dhcpv6.conf b/doc/examples/dhcpd-dhcpv6.conf
-index 448a6a6..2357824 100644
---- a/doc/examples/dhcpd-dhcpv6.conf
-+++ b/doc/examples/dhcpd-dhcpv6.conf
-@@ -43,7 +43,7 @@ option dhcp6.domain-search "test.example.com","example.com";
- option dhcp6.info-refresh-time 21600;
- 
- # The path of the lease file
--dhcpv6-lease-file-name "/usr/local/var/db/dhcpd6.leases";
-+dhcpv6-lease-file-name "/var/lib/dhcpd/dhcpd6.leases";
- 
- # Static definition (must be global)
- host myclient {
-diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index 018fa34..3632a6b 100644
---- a/includes/dhcpd.h
-+++ b/includes/dhcpd.h
-@@ -1545,7 +1545,7 @@ typedef unsigned char option_mask [16];
- #else /* !DEBUG */
- 
- #ifndef _PATH_DHCPD_CONF
--#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
-+#define _PATH_DHCPD_CONF	"/etc/dhcp/dhcpd.conf"
- #endif /* DEBUG */
- 
- #ifndef _PATH_DHCPD_DB
-@@ -1567,11 +1567,11 @@ typedef unsigned char option_mask [16];
- #endif /* DEBUG */
- 
- #ifndef _PATH_DHCLIENT_CONF
--#define _PATH_DHCLIENT_CONF	"/etc/dhclient.conf"
-+#define _PATH_DHCLIENT_CONF	"/etc/dhcp/dhclient.conf"
- #endif
- 
- #ifndef _PATH_DHCLIENT_SCRIPT
--#define _PATH_DHCLIENT_SCRIPT	"/sbin/dhclient-script"
-+#define _PATH_DHCLIENT_SCRIPT	"/usr/sbin/dhclient-script"
- #endif
- 
- #ifndef _PATH_DHCLIENT_PID
--- 
-2.14.5
-

SOURCES/0009-Fix-garbage-in-format-string-error.patch

@@ -1,27 +0,0 @@
-From a0a2186ce52a31357d4eb3c32d7d6887e4603814 Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:28:13 +0100
-Subject: [PATCH 09/26] Fix 'garbage in format string' error
-Cc: pzhukov@redhat.com
-
-RHBZ: 450042
----
- common/tables.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/common/tables.c b/common/tables.c
-index c1aa214..d2294c0 100644
---- a/common/tables.c
-+++ b/common/tables.c
-@@ -215,7 +215,7 @@ static struct option dhcp_options[] = {
- 	{ "name-service-search", "Sa",		&dhcp_universe, 117, 1 },
- #endif
- 	{ "subnet-selection", "I",		&dhcp_universe, 118, 1 },
--	{ "domain-search", "Dc",		&dhcp_universe, 119, 1 },
-+	{ "domain-search", "D",			&dhcp_universe, 119, 1 },
- 	{ "vivco", "Evendor-class.",		&dhcp_universe, 124, 1 },
- 	{ "vivso", "Evendor.",			&dhcp_universe, 125, 1 },
- #if 0
--- 
-2.14.5
-

SOURCES/0010-Handle-null-timeout.patch

@@ -1,32 +0,0 @@
-From ed7610cdb2e8ebdbaee618e477879e7e008d4f29 Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:29:08 +0100
-Subject: [PATCH 10/26] Handle null timeout
-Cc: pzhukov@redhat.com
-
-Handle cases in add_timeout() where the function is called with a NULL
-value for the 'when' parameter
-
-ISC-Bugs: #19867 (rejected)
----
- common/dispatch.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/common/dispatch.c b/common/dispatch.c
-index 0207ad3..d7fe200 100644
---- a/common/dispatch.c
-+++ b/common/dispatch.c
-@@ -209,6 +209,10 @@ void add_timeout (when, where, what, ref, unref)
- 	isc_interval_t interval;
- 	isc_time_t expires;
- 
-+	if (when == NULL) {
-+		return;
-+	}
-+
- 	/* See if this timeout supersedes an existing timeout. */
- 	t = (struct timeout *)0;
- 	for (q = timeouts; q; q = q->next) {
--- 
-2.14.5
-

SOURCES/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch

@@ -1,332 +0,0 @@
-From 3d3e442ed1316930a5360e4d5a56b46a42a29419 Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:35:47 +0100
-Subject: [PATCH 15/26] Add GUID/DUID to dhcpd logs (#1064416)
-Cc: pzhukov@redhat.com
-
----
- client/dhclient.c | 75 ++++++++++++++++++++++++++++++++++++++++++----------
- server/dhcp.c     | 78 +++++++++++++++++++++++++++++++++----------------------
- 2 files changed, 108 insertions(+), 45 deletions(-)
-
-diff --git a/client/dhclient.c b/client/dhclient.c
-index dc9080e..8e57da9 100644
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -1170,6 +1170,26 @@ main(int argc, char **argv) {
- 		}
- 	}
- 
-+	/* We create a backup seed before rediscovering interfaces in order to
-+	   have a seed built using all of the available interfaces
-+	   It's interesting if required interfaces doesn't let us defined
-+	   a really unique seed due to a lack of valid HW addr later
-+	   (this is the case with DHCP over IB)
-+	   We only use the last device as using a sum could broke the
-+	   uniqueness of the seed among multiple nodes
-+	 */
-+	unsigned backup_seed = 0;
-+	for (ip = interfaces; ip; ip = ip -> next) {
-+		int junk;
-+		if ( ip -> hw_address.hlen <= sizeof seed )
-+		  continue;
-+		memcpy (&junk,
-+			&ip -> hw_address.hbuf [ip -> hw_address.hlen -
-+						sizeof seed], sizeof seed);
-+		backup_seed = junk;
-+	}
-+
-+
- 	/* At this point, all the interfaces that the script thinks
- 	   are relevant should be running, so now we once again call
- 	   discover_interfaces(), and this time ask it to actually set
-@@ -1184,14 +1204,36 @@ main(int argc, char **argv) {
- 	   Not much entropy, but we're booting, so we're not likely to
- 	   find anything better. */
- 	seed = 0;
-+	int seed_flag = 0;
- 	for (ip = interfaces; ip; ip = ip->next) {
- 		int junk;
-+		if ( ip -> hw_address.hlen <= sizeof seed )
-+		  continue;
- 		memcpy(&junk,
- 		       &ip->hw_address.hbuf[ip->hw_address.hlen -
- 					    sizeof seed], sizeof seed);
- 		seed += junk;
-+		seed_flag = 1;
- 	}
--	srandom(seed + cur_time + (unsigned)getpid());
-+	if ( seed_flag == 0 ) {
-+		if ( backup_seed != 0 ) {
-+		  seed = backup_seed;
-+		  log_info ("xid: rand init seed (0x%x) built using all"
-+			    " available interfaces",seed);
-+		}
-+		else {
-+		  seed = cur_time^((unsigned) gethostid()) ;
-+		  log_info ("xid: warning: no netdev with useable HWADDR found"
-+			    " for seed's uniqueness enforcement");
-+		  log_info ("xid: rand init seed (0x%x) built using gethostid",
-+			    seed);
-+		}
-+		/* we only use seed and no current time as a broadcast reply */
-+		/* will certainly be used by the hwaddrless interface */
-+		srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid());
-+	}
-+	else
-+	        srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid());
- 
- 	/* Setup specific Infiniband options */
- 	for (ip = interfaces; ip; ip = ip->next) {
-@@ -1746,10 +1788,10 @@ void dhcpack (packet)
- #endif
- 		return;
- 	}
--
--	log_info ("DHCPACK of %s from %s",
--		  inet_ntoa(packet->raw->yiaddr),
--		  piaddr (packet->client_addr));
-+	log_info ("DHCPACK of %s from %s (xid=0x%x)",
-+                  inet_ntoa(packet->raw->yiaddr),
-+                  piaddr (packet -> client_addr),
-+                  ntohl(client -> xid));
- 
- 	lease = packet_to_lease (packet, client);
- 	if (!lease) {
-@@ -2669,7 +2711,7 @@ void dhcpnak (packet)
- 		return;
- 	}
- 
--	log_info ("DHCPNAK from %s", piaddr (packet -> client_addr));
-+	log_info ("DHCPNAK from %s (xid=0x%x)", piaddr (packet -> client_addr), ntohl(client -> xid));
- 
- 	if (!client -> active) {
- #if defined (DEBUG)
-@@ -2802,10 +2844,10 @@ void send_discover (cpp)
- 			  (long)(client -> interval));
- 	} else
- #endif
--	log_info ("DHCPDISCOVER on %s to %s port %d interval %ld",
-+	log_info ("DHCPDISCOVER on %s to %s port %d interval %ld (xid=0x%x)",
- 	      client -> name ? client -> name : client -> interface -> name,
- 	      inet_ntoa (sockaddr_broadcast.sin_addr),
--	      ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval));
-+	      ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval), ntohl(client -> xid));
- 
- 	/* Send out a packet. */
- #if defined(DHCPv6) && defined(DHCP4o6)
-@@ -3108,10 +3150,12 @@ void send_request (cpp)
- 	}
- 
- 	strncpy(rip_buf, rip_str, sizeof(rip_buf)-1);
--	log_info ("DHCPREQUEST for %s on %s to %s port %d", rip_buf,
-+	log_info ("DHCPREQUEST for %s on %s to %s port %d (xid=0x%x)",
-+                  rip_buf,
- 		  client->name ? client->name : client->interface->name,
- 		  inet_ntoa(destination.sin_addr),
--		  ntohs (destination.sin_port));
-+		  ntohs (destination.sin_port),
-+                  ntohl(client -> xid));
- 
- #if defined(DHCPv6) && defined(DHCP4o6)
- 	if (dhcpv4_over_dhcpv6) {
-@@ -3168,11 +3212,13 @@ void send_decline (cpp)
- 		log_info ("DHCPDECLINE");
- 	} else
- #endif
--	log_info ("DHCPDECLINE of %s on %s to %s port %d",
-+	log_info ("DHCPDECLINE of %s on %s to %s port %d (xid=0x%x)",                  
- 		  piaddr(client->requested_address),
- 		  (client->name ? client->name : client->interface->name),
- 		  inet_ntoa(sockaddr_broadcast.sin_addr),
--		  ntohs(sockaddr_broadcast.sin_port));
-+		  ntohs(sockaddr_broadcast.sin_port),
-+                  ntohl(client -> xid));
-+
- 
- 	/* Send out a packet. */
- #if defined(DHCPv6) && defined(DHCP4o6)
-@@ -3231,11 +3277,12 @@ void send_release (cpp)
- 		log_info ("DHCPRELEASE");
- 	} else
- #endif
--	log_info ("DHCPRELEASE of %s on %s to %s port %d",
-+	log_info ("DHCPRELEASE of %s on %s to %s port %d (xid=0x%x)",
- 		  piaddr(client->active->address),
- 		  client->name ? client->name : client->interface->name,
- 		  inet_ntoa (destination.sin_addr),
--		  ntohs (destination.sin_port));
-+		  ntohs (destination.sin_port),
-+                  ntohl(client -> xid));
- 
- #if defined(DHCPv6) && defined(DHCP4o6)
- 	if (dhcpv4_over_dhcpv6) {
-diff --git a/server/dhcp.c b/server/dhcp.c
-index 20f2a62..0582c4c 100644
---- a/server/dhcp.c
-+++ b/server/dhcp.c
-@@ -87,6 +87,42 @@ const int dhcp_type_name_max = ((sizeof dhcp_type_names) / sizeof (char *));
- 
- static TIME leaseTimeCheck(TIME calculated, TIME alternate);
- 
-+char *print_client_identifier_from_packet (packet)
-+	struct packet *packet;
-+{
-+	struct option_cache *oc;
-+	struct data_string client_identifier;
-+	char *ci;
-+
-+	memset (&client_identifier, 0, sizeof client_identifier);
-+
-+	oc = lookup_option (&dhcp_universe, packet -> options,
-+			DHO_DHCP_CLIENT_IDENTIFIER);
-+	if (oc &&
-+	    evaluate_option_cache (&client_identifier,
-+				    packet, (struct lease *)0,
-+				    (struct client_state *)0,
-+				    packet -> options,
-+				    (struct option_state *)0,
-+				    &global_scope, oc, MDL)) {
-+		ci = print_hw_addr (HTYPE_INFINIBAND, client_identifier.len, client_identifier.data);
-+		data_string_forget (&client_identifier, MDL);
-+		return ci;
-+	} else
-+		return "\"no client id\"";
-+}
-+
-+char *print_hw_addr_or_client_id (packet)
-+	struct packet *packet;
-+{
-+	if (packet -> raw -> htype == HTYPE_INFINIBAND)
-+		return print_client_identifier_from_packet (packet);
-+	else
-+		return print_hw_addr (packet -> raw -> htype,
-+				      packet -> raw -> hlen,
-+				      packet -> raw -> chaddr);
-+}
-+
- void
- dhcp (struct packet *packet) {
- 	int ms_nulltp = 0;
-@@ -129,9 +165,7 @@ dhcp (struct packet *packet) {
- 
- 		log_info("%s from %s via %s: %s", s,
- 			 (packet->raw->htype
--			  ? print_hw_addr(packet->raw->htype,
--					  packet->raw->hlen,
--					  packet->raw->chaddr)
-+			  ? print_hw_addr_or_client_id(packet)
- 			  : "<no identifier>"),
- 			 packet->raw->giaddr.s_addr
- 			 ? inet_ntoa(packet->raw->giaddr)
-@@ -328,9 +362,7 @@ void dhcpdiscover (packet, ms_nulltp)
- #endif
- 	snprintf (msgbuf, sizeof msgbuf, "DHCPDISCOVER from %s %s%s%svia %s",
- 		 (packet -> raw -> htype
--		  ? print_hw_addr (packet -> raw -> htype,
--				   packet -> raw -> hlen,
--				   packet -> raw -> chaddr)
-+		  ? print_hw_addr_or_client_id (packet)
- 		  : (lease
- 		     ? print_hex_1(lease->uid_len, lease->uid, 60)
- 		     : "<no identifier>")),
-@@ -542,9 +574,7 @@ void dhcprequest (packet, ms_nulltp, ip_lease)
- 		 "DHCPREQUEST for %s%s from %s %s%s%svia %s",
- 		 piaddr (cip), smbuf,
- 		 (packet -> raw -> htype
--		  ? print_hw_addr (packet -> raw -> htype,
--				   packet -> raw -> hlen,
--				   packet -> raw -> chaddr)
-+		  ? print_hw_addr_or_client_id(packet)
- 		  : (lease
- 		     ? print_hex_1(lease->uid_len, lease->uid, 60)
- 		     : "<no identifier>")),
-@@ -785,9 +815,7 @@ void dhcprelease (packet, ms_nulltp)
- 	if ((oc = lookup_option (&dhcp_universe, packet -> options,
- 				 DHO_DHCP_REQUESTED_ADDRESS))) {
- 		log_info ("DHCPRELEASE from %s specified requested-address.",
--		      print_hw_addr (packet -> raw -> htype,
--				     packet -> raw -> hlen,
--				     packet -> raw -> chaddr));
-+		      print_hw_addr_or_client_id(packet));
- 	}
- 
- 	oc = lookup_option (&dhcp_universe, packet -> options,
-@@ -879,9 +907,7 @@ void dhcprelease (packet, ms_nulltp)
- 		 "DHCPRELEASE of %s from %s %s%s%svia %s (%sfound)",
- 		 cstr,
- 		 (packet -> raw -> htype
--		  ? print_hw_addr (packet -> raw -> htype,
--				   packet -> raw -> hlen,
--				   packet -> raw -> chaddr)
-+		  ? print_hw_addr_or_client_id(packet)
- 		  : (lease
- 		     ? print_hex_1(lease->uid_len, lease->uid, 60)
- 		     : "<no identifier>")),
-@@ -986,9 +1012,7 @@ void dhcpdecline (packet, ms_nulltp)
- 		 "DHCPDECLINE of %s from %s %s%s%svia %s",
- 		 piaddr (cip),
- 		 (packet -> raw -> htype
--		  ? print_hw_addr (packet -> raw -> htype,
--				   packet -> raw -> hlen,
--				   packet -> raw -> chaddr)
-+		  ? print_hw_addr_or_client_id(packet)
- 		  : (lease
- 		     ? print_hex_1(lease->uid_len, lease->uid, 60)
- 		     : "<no identifier>")),
-@@ -1732,8 +1756,7 @@ void dhcpinform (packet, ms_nulltp)
- 	/* Report what we're sending. */
- 	snprintf(msgbuf, sizeof msgbuf, "DHCPACK to %s (%s) via", piaddr(cip),
- 		 (packet->raw->htype && packet->raw->hlen) ?
--			print_hw_addr(packet->raw->htype, packet->raw->hlen,
--				      packet->raw->chaddr) :
-+			print_hw_addr_or_client_id(packet) :
- 			"<no client hardware address>");
- 	log_info("%s %s", msgbuf, gip.len ? piaddr(gip) :
- 					    packet->interface->name);
-@@ -1918,9 +1941,7 @@ void nak_lease (packet, cip, network_group)
- #endif
- 	log_info ("DHCPNAK on %s to %s via %s",
- 	      piaddr (*cip),
--	      print_hw_addr (packet -> raw -> htype,
--			     packet -> raw -> hlen,
--			     packet -> raw -> chaddr),
-+	      print_hw_addr_or_client_id(packet),
- 	      packet -> raw -> giaddr.s_addr
- 	      ? inet_ntoa (packet -> raw -> giaddr)
- 	      : packet -> interface -> name);
-@@ -3936,7 +3957,7 @@ void dhcp_reply (lease)
- 		   ? (state -> offer == DHCPACK ? "DHCPACK" : "DHCPOFFER")
- 		   : "BOOTREPLY"),
- 		  piaddr (lease -> ip_addr),
--		  (lease -> hardware_addr.hlen
-+		  (lease -> hardware_addr.hlen > 1
- 		   ? print_hw_addr (lease -> hardware_addr.hbuf [0],
- 				    lease -> hardware_addr.hlen - 1,
- 				    &lease -> hardware_addr.hbuf [1])
-@@ -4497,10 +4518,7 @@ int find_lease (struct lease **lp,
- 			if (uid_lease) {
- 			    if (uid_lease->binding_state == FTS_ACTIVE) {
- 				log_error ("client %s has duplicate%s on %s",
--					   (print_hw_addr
--					    (packet -> raw -> htype,
--					     packet -> raw -> hlen,
--					     packet -> raw -> chaddr)),
-+					   (print_hw_addr_or_client_id(packet)),
- 					   " leases",
- 					   (ip_lease -> subnet ->
- 					    shared_network -> name));
-@@ -4667,9 +4685,7 @@ int find_lease (struct lease **lp,
- 			log_error("uid lease %s for client %s is duplicate "
- 				  "on %s",
- 				  piaddr(uid_lease->ip_addr),
--				  print_hw_addr(packet->raw->htype,
--						packet->raw->hlen,
--						packet->raw->chaddr),
-+				  print_hw_addr_or_client_id(packet),
- 				  uid_lease->subnet->shared_network->name);
- 
- 			if (!packet -> raw -> ciaddr.s_addr &&
--- 
-2.14.5
-

SOURCES/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch

@@ -1,29 +0,0 @@
-From 6ea56e988df1da51f7d0bdd8984b38e40102c17b Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:41:14 +0100
-Subject: [PATCH 19/26] dhclient: write DUID_LLT even in stateless mode
- (#1156356)
-Cc: pzhukov@redhat.com
-
-(Submitted to dhcp-bugs@isc.org - [ISC-Bugs #38144])
----
- client/dhclient.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/client/dhclient.c b/client/dhclient.c
-index 27fde69..4e5546a 100644
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -1442,6 +1442,9 @@ void run_stateless(int exit_mode, u_int16_t port)
- 			data_string_forget(&default_duid, MDL);
- 
- 		form_duid(&default_duid, MDL);
-+		if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS &&
-+		    duid_type == DUID_LLT)
-+			write_duid(&default_duid);
- 	}
- 
- #ifdef DHCP4o6
--- 
-2.14.5
-

SOURCES/0020-Discover-all-hwaddress-for-xid-uniqueness.patch

@@ -1,101 +0,0 @@
-From 01ce61b8a0331a2f068ca2191bfb897b505c1b9d Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:42:50 +0100
-Subject: [PATCH 20/26] Discover all hwaddress for xid uniqueness
-Cc: pzhukov@redhat.com
-
----
- common/discover.c |  2 ++
- common/lpf.c      | 27 ++++++++++++++++++++++-----
- includes/dhcpd.h  |  3 +++
- 3 files changed, 27 insertions(+), 5 deletions(-)
-
-diff --git a/common/discover.c b/common/discover.c
-index 056342c..e66e1c5 100644
---- a/common/discover.c
-+++ b/common/discover.c
-@@ -648,6 +648,8 @@ discover_interfaces(int state) {
- 			interface_dereference(&tmp, MDL);
- 			tmp = interfaces; /* XXX */
- 		}
-+		if (tmp != NULL)
-+			try_hw_addr(tmp);
- 
- 		if (dhcp_interface_discovery_hook) {
- 			(*dhcp_interface_discovery_hook)(tmp);
-diff --git a/common/lpf.c b/common/lpf.c
-index b732a86..a708a5d 100644
---- a/common/lpf.c
-+++ b/common/lpf.c
-@@ -699,8 +699,22 @@ ioctl_get_ll(char *name)
- 	return sll;
- }
- 
-+// define ? 
-+void try_hw_addr(struct interface_info *info){
-+  get_hw_addr2(info);
-+};
-+
- void
- get_hw_addr(struct interface_info *info)
-+{
-+  if (get_hw_addr2(info) == ISC_R_NOTFOUND){
-+    log_fatal("Unsupported device type for \"%s\"",
-+              info->name);
-+  }
-+}
-+
-+isc_result_t
-+get_hw_addr2(struct interface_info *info)
- {
- 	struct hardware *hw = &info->hw_address;
- 	char *name = info->name;
-@@ -710,7 +724,8 @@ get_hw_addr(struct interface_info *info)
- 	int sll_allocated = 0;
- 	char *dup = NULL;
- 	char *colon = NULL;
--
-+        isc_result_t result = ISC_R_SUCCESS;
-+        
- 	if (getifaddrs(&ifaddrs) == -1)
- 		log_fatal("Failed to get interfaces");
- 
-@@ -794,14 +809,16 @@ get_hw_addr(struct interface_info *info)
- 			hw->hbuf[4] = 0xef;
- 			break;
- #endif
--		default:
--			freeifaddrs(ifaddrs);
--			log_fatal("Unsupported device type %hu for \"%s\"",
--				  sll->sll_hatype, name);
-+        default:
-+          log_error("Unsupported device type %hu for \"%s\"",
-+                      sll->sll_hatype, name);
-+          result = ISC_R_NOTFOUND;
-+
- 	}
- 
- 	if (sll_allocated)
- 		dfree(sll, MDL);
- 	freeifaddrs(ifaddrs);
-+        return result;
- }
- #endif
-diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index 0c1a0aa..635c510 100644
---- a/includes/dhcpd.h
-+++ b/includes/dhcpd.h
-@@ -2637,7 +2637,10 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t);
- #endif
- const char *print_time(TIME);
- 
-+
- void get_hw_addr(struct interface_info *info);
-+void try_hw_addr(struct interface_info *info);
-+isc_result_t get_hw_addr2(struct interface_info *info);
- char *buf_to_hex (const unsigned char *s, unsigned len,
-                    const char *file, int line);
- char *format_lease_id(const unsigned char *s, unsigned len, int format,
--- 
-2.14.5
-

SOURCES/0025-bind-Detect-system-time-changes.patch

@@ -1,197 +0,0 @@
-From ef4f5e80d8a1ea1507829ea6f5214f276478f475 Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Tue, 22 Oct 2019 16:23:24 +0200
-Subject: [PATCH 25/27] bind: Detect system time changes
-Cc: pzhukov@redhat.com
-
----
- bind/bind/lib/isc/include/isc/result.h    |  4 ++-
- bind/bind/lib/isc/include/isc/util.h      |  4 +++
- bind/bind/lib/isc/result.c                |  2 ++
- bind/bind/lib/isc/unix/app.c              | 41 ++++++++++++++++++++++++++++---
- bind/bind/lib/isc/unix/include/isc/time.h | 20 +++++++++++++++
- bind/bind/lib/isc/unix/time.c             | 22 +++++++++++++++++
- 6 files changed, 89 insertions(+), 4 deletions(-)
-
-diff --git a/bind/bind/lib/isc/include/isc/result.h b/bind/bind/lib/isc/include/isc/result.h
-index 0389efa..0e35f98 100644
---- a/bind/bind/lib/isc/include/isc/result.h
-+++ b/bind/bind/lib/isc/include/isc/result.h
-@@ -89,7 +89,9 @@
- #define ISC_R_DISCFULL			67	/*%< disc full */
- #define ISC_R_DEFAULT			68	/*%< default */
- #define ISC_R_IPV4PREFIX		69	/*%< IPv4 prefix */
--#define ISC_R_NRESULTS 			70
-+#define ISC_R_TIMESHIFTED               70      /*%< system time changed */
-+/*% Not a result code: the number of results. */
-+#define ISC_R_NRESULTS 			71
- 
- ISC_LANG_BEGINDECLS
- 
-diff --git a/bind/bind/lib/isc/include/isc/util.h b/bind/bind/lib/isc/include/isc/util.h
-index 973c348..cceeb5e 100644
---- a/bind/bind/lib/isc/include/isc/util.h
-+++ b/bind/bind/lib/isc/include/isc/util.h
-@@ -289,6 +289,10 @@ extern void mock_assert(const int result, const char* const expression,
-  * Time
-  */
- #define TIME_NOW(tp) 	RUNTIME_CHECK(isc_time_now((tp)) == ISC_R_SUCCESS)
-+#ifdef CLOCK_BOOTTIME
-+#define TIME_MONOTONIC(tp) 	RUNTIME_CHECK(isc_time_boottime((tp)) == ISC_R_SUCCESS)
-+#endif
-+
- 
- /*%
-  * Alignment
-diff --git a/bind/bind/lib/isc/result.c b/bind/bind/lib/isc/result.c
-index a9db132..7c04831 100644
---- a/bind/bind/lib/isc/result.c
-+++ b/bind/bind/lib/isc/result.c
-@@ -105,6 +105,7 @@ static const char *description[ISC_R_NRESULTS] = {
- 	"disc full",				/*%< 67 */
- 	"default",				/*%< 68 */
- 	"IPv4 prefix",				/*%< 69 */
-+        "time changed",                         /*%< 70 */
- };
- 
- static const char *identifier[ISC_R_NRESULTS] = {
-@@ -178,6 +179,7 @@ static const char *identifier[ISC_R_NRESULTS] = {
- 	"ISC_R_DISCFULL",
- 	"ISC_R_DEFAULT",
- 	"ISC_R_IPV4PREFIX",
-+        "ISC_R_TIMESHIFTED",
- };
- 
- #define ISC_RESULT_RESULTSET			2
-diff --git a/bind/bind/lib/isc/unix/app.c b/bind/bind/lib/isc/unix/app.c
-index a6e9882..dbd23f7 100644
---- a/bind/bind/lib/isc/unix/app.c
-+++ b/bind/bind/lib/isc/unix/app.c
-@@ -442,15 +442,51 @@ isc__app_ctxonrun(isc_appctx_t *ctx0, isc_mem_t *mctx, isc_task_t *task,
- static isc_result_t
- evloop(isc__appctx_t *ctx) {
- 	isc_result_t result;
-+        isc_time_t now;
-+#ifdef CLOCK_BOOTTIME
-+        isc_time_t monotonic;
-+        uint64_t diff  = 0;
-+#else
-+        isc_time_t prev;
-+        TIME_NOW(&prev);
-+#endif
-+
-+
-+
- 
- 	while (!ctx->want_shutdown) {
- 		int n;
--		isc_time_t when, now;
-+		isc_time_t when;
-+                
- 		struct timeval tv, *tvp;
- 		isc_socketwait_t *swait;
- 		bool readytasks;
- 		bool call_timer_dispatch = false;
- 
-+                uint64_t us; 
-+
-+#ifdef CLOCK_BOOTTIME
-+                // TBD macros for following three lines
-+                TIME_NOW(&now);
-+                TIME_MONOTONIC(&monotonic);
-+                INSIST(now.seconds > monotonic.seconds)
-+                us = isc_time_microdiff (&now, &monotonic);
-+                if (us < diff){ 
-+                  us = diff - us;
-+                  if (us > 1000000){ // ignoring shifts less than one second
-+                    return ISC_R_TIMESHIFTED;
-+                  };
-+                  diff = isc_time_microdiff (&now, &monotonic);
-+                } else {
-+                  diff = isc_time_microdiff (&now, &monotonic);
-+                  // not implemented
-+                }
-+#else
-+                TIME_NOW(&now);
-+                if (isc_time_compare (&now, &prev) < 0)
-+                  return ISC_R_TIMESHIFTED;
-+                TIME_NOW(&prev);
-+#endif                
- 		/*
- 		 * Check the reload (or suspend) case first for exiting the
- 		 * loop as fast as possible in case:
-@@ -475,9 +511,8 @@ evloop(isc__appctx_t *ctx) {
- 			if (result != ISC_R_SUCCESS)
- 				tvp = NULL;
- 			else {
--				uint64_t us;
--
- 				TIME_NOW(&now);
-+
- 				us = isc_time_microdiff(&when, &now);
- 				if (us == 0)
- 					call_timer_dispatch = true;
-diff --git a/bind/bind/lib/isc/unix/include/isc/time.h b/bind/bind/lib/isc/unix/include/isc/time.h
-index b864c29..5dd43c9 100644
---- a/bind/bind/lib/isc/unix/include/isc/time.h
-+++ b/bind/bind/lib/isc/unix/include/isc/time.h
-@@ -132,6 +132,26 @@ isc_time_isepoch(const isc_time_t *t);
-  *\li	't' is a valid pointer.
-  */
- 
-+#ifdef CLOCK_BOOTTIME
-+isc_result_t
-+isc_time_boottime(isc_time_t *t);
-+/*%<
-+ * Set 't' to monotonic time from previous boot
-+ * it's not affected by system time change. It also
-+ * includes the time system was suspended
-+ *
-+ * Requires:
-+ *\li	't' is a valid pointer.
-+ *
-+ * Returns:
-+ *
-+ *\li	Success
-+ *\li	Unexpected error
-+ *		Getting the time from the system failed.
-+ */
-+#endif /* CLOCK_BOOTTIME */
-+ 
-+
- isc_result_t
- isc_time_now(isc_time_t *t);
- /*%<
-diff --git a/bind/bind/lib/isc/unix/time.c b/bind/bind/lib/isc/unix/time.c
-index 8edc9df..fe0bb91 100644
---- a/bind/bind/lib/isc/unix/time.c
-+++ b/bind/bind/lib/isc/unix/time.c
-@@ -498,3 +498,25 @@ isc_time_formatISO8601ms(const isc_time_t *t, char *buf, unsigned int len) {
- 			 t->nanoseconds / NS_PER_MS);
- 	}
- }
-+
-+
-+#ifdef CLOCK_BOOTTIME
-+isc_result_t
-+isc_time_boottime(isc_time_t *t) {
-+  struct timespec ts;
-+  
-+  char strbuf[ISC_STRERRORSIZE];
-+
-+  if (clock_gettime (CLOCK_BOOTTIME, &ts) != 0){
-+    isc__strerror(errno, strbuf, sizeof(strbuf));
-+    UNEXPECTED_ERROR(__FILE__, __LINE__, "%s", strbuf);
-+    return (ISC_R_UNEXPECTED);    
-+  }
-+
-+  t->seconds = ts.tv_sec;
-+  t->nanoseconds = ts.tv_nsec;
-+
-+  return (ISC_R_SUCCESS);
-+  
-+};
-+#endif
--- 
-2.14.5
-

SOURCES/0026-Add-dhclient-5-B-option-description.patch

@@ -1,24 +0,0 @@
-commit 6acfd3125546a0e5db8fae8a9964cd2f88bf68c0
-Author: Pavel Zhukov <pzhukov@redhat.com>
-Date:   Tue Oct 22 16:28:04 2019 +0200
-
-    Add dhclient(5) -B option description
-    
-    Bug-Url: https://bugzilla.redhat.com/1764088
-
-diff --git a/client/dhclient.8 b/client/dhclient.8
-index 0145b9f..5226de5 100644
---- a/client/dhclient.8
-+++ b/client/dhclient.8
-@@ -552,6 +552,11 @@ Path to the network configuration script invoked by
- when it gets a lease.  If unspecified, the default
- .B CLIENTBINDIR/dhclient-script
- is used.  See \fBdhclient-script(8)\fR for a description of this file.
-+.TP
-+.BI \-B
-+Always set the bootp broadcast flag in request packets, so that
-+servers will always broadcast replies. This option is provided as
-+an extension to enable dhclient to work on IBM s390 Linux guests.
- .PP
- .SH PORTS
- During operations the client may use multiple UDP ports

SOURCES/0029-Use-system-getaddrinfo-for-dhcp.patch

@@ -1,118 +0,0 @@
-From 019021caa791c254a319c71b4f634142dc14b37d Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Tue, 22 Jun 2021 06:58:40 +0200
-Subject: [PATCH 29/29] Use system getaddrinfo for dhcp
-Cc: pzhukov@redhat.com
-
----
- bind/bind/lib/irs/include/irs/netdb.h.in | 94 ++++++++++++++++++++++++
- 1 file changed, 94 insertions(+)
-
-diff --git a/bind/bind/lib/irs/include/irs/netdb.h.in b/bind/bind/lib/irs/include/irs/netdb.h.in
-index 23dcd37..f36113d 100644
---- a/bind/bind/lib/irs/include/irs/netdb.h.in
-+++ b/bind/bind/lib/irs/include/irs/netdb.h.in
-@@ -149,6 +149,100 @@ struct addrinfo {
- #define	NI_NUMERICSERV	0x00000008
- #define	NI_DGRAM	0x00000010
- 
-+/*
-+ * Define to map into irs_ namespace.
-+ */
-+
-+#define IRS_NAMESPACE
-+
-+#ifdef IRS_NAMESPACE
-+
-+/*
-+ * Use our versions not the ones from the C library.
-+ */
-+
-+#ifdef getnameinfo
-+#undef getnameinfo
-+#endif
-+#define getnameinfo irs_getnameinfo
-+
-+#ifdef getaddrinfo
-+#undef getaddrinfo
-+#endif
-+#define getaddrinfo irs_getaddrinfo
-+
-+#ifdef freeaddrinfo
-+#undef freeaddrinfo
-+#endif
-+#define freeaddrinfo irs_freeaddrinfo
-+
-+#ifdef gai_strerror
-+#undef gai_strerror
-+#endif
-+#define gai_strerror irs_gai_strerror
-+
-+#endif
-+
-+extern int getaddrinfo (const char *name,
-+			const char *service,
-+			const struct addrinfo *req,
-+			struct addrinfo **pai);
-+extern int getnameinfo (const struct sockaddr *sa,
-+			socklen_t salen, char *host,
-+			socklen_t hostlen, char *serv,
-+			socklen_t servlen, int flags);
-+extern void freeaddrinfo (struct addrinfo *ai);
-+extern const char *gai_strerror (int ecode);
-+
-+/*
-+ * Define to map into irs_ namespace.
-+ */
-+
-+#define IRS_NAMESPACE
-+
-+#ifdef IRS_NAMESPACE
-+
-+/*
-+ * Use our versions not the ones from the C library.
-+ */
-+
-+#ifdef getnameinfo
-+#undef getnameinfo
-+#endif
-+#define getnameinfo irs_getnameinfo
-+
-+#ifdef getaddrinfo
-+#undef getaddrinfo
-+#endif
-+#define getaddrinfo irs_getaddrinfo
-+
-+#ifdef freeaddrinfo
-+#undef freeaddrinfo
-+#endif
-+#define freeaddrinfo irs_freeaddrinfo
-+
-+#ifdef gai_strerror
-+#undef gai_strerror
-+#endif
-+#define gai_strerror irs_gai_strerror
-+
-+int
-+getaddrinfo(const char *hostname, const char *servname,
-+	    const struct addrinfo *hints, struct addrinfo **res);
-+
-+int
-+getnameinfo(const struct sockaddr *sa, IRS_GETNAMEINFO_SOCKLEN_T salen,
-+	    char *host, IRS_GETNAMEINFO_BUFLEN_T hostlen,
-+	    char *serv, IRS_GETNAMEINFO_BUFLEN_T servlen,
-+	    IRS_GETNAMEINFO_FLAGS_T flags);
-+
-+void freeaddrinfo (struct addrinfo *ai);
-+
-+IRS_GAISTRERROR_RETURN_T
-+gai_strerror(int ecode);
-+
-+#endif
-+
- /*
-  * Tell Emacs to use C mode on this file.
-  * Local variables:
--- 
-2.26.3
-

SOURCES/CVE-2021-25220.patch

@@ -1,200 +0,0 @@
-diff --git a/bind/bind-9.11.14/lib/dns/resolver.c b/bind/bind-9.11.14/lib/dns/resolver.c
-index e24499e..969bb9e 100644
---- a/bind/bind-9.11.14/lib/dns/resolver.c
-+++ b/bind/bind-9.11.14/lib/dns/resolver.c
-@@ -63,6 +63,7 @@
- #include <dns/stats.h>
- #include <dns/tsig.h>
- #include <dns/validator.h>
-+#include <dns/zone.h>
- 
- #ifdef WANT_QUERYTRACE
- #define RTRACE(m)       isc_log_write(dns_lctx, \
-@@ -303,6 +304,8 @@ struct fetchctx {
- 	bool			ns_ttl_ok;
- 	uint32_t			ns_ttl;
- 	isc_counter_t *			qc;
-+	dns_fixedname_t			fwdfname;
-+	dns_name_t			*fwdname;
- 
- 	/*%
- 	 * The number of events we're waiting for.
-@@ -3344,6 +3347,7 @@ fctx_getaddresses(fetchctx_t *fctx, bool badcache) {
- 		if (result == ISC_R_SUCCESS) {
- 			fwd = ISC_LIST_HEAD(forwarders->fwdrs);
- 			fctx->fwdpolicy = forwarders->fwdpolicy;
-+			dns_name_copy(domain, fctx->fwdname, NULL);
- 			if (fctx->fwdpolicy == dns_fwdpolicy_only &&
- 			    isstrictsubdomain(domain, &fctx->domain)) {
- 				fcount_decr(fctx);
-@@ -4368,6 +4372,9 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
- 	fctx->restarts = 0;
- 	fctx->querysent = 0;
- 	fctx->referrals = 0;
-+
-+	fctx->fwdname = dns_fixedname_initname(&fctx->fwdfname);
-+
- 	TIME_NOW(&fctx->start);
- 	fctx->timeouts = 0;
- 	fctx->lamecount = 0;
-@@ -4421,8 +4428,10 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
- 		domain = dns_fixedname_initname(&fixed);
- 		result = dns_fwdtable_find2(fctx->res->view->fwdtable, fwdname,
- 					    domain, &forwarders);
--		if (result == ISC_R_SUCCESS)
-+		if (result == ISC_R_SUCCESS) {
- 			fctx->fwdpolicy = forwarders->fwdpolicy;
-+			dns_name_copy(domain, fctx->fwdname, NULL);
-+		}
- 
- 		if (fctx->fwdpolicy != dns_fwdpolicy_only) {
- 			/*
-@@ -6175,6 +6184,112 @@ mark_related(dns_name_t *name, dns_rdataset_t *rdataset,
- 		rdataset->attributes |= DNS_RDATASETATTR_EXTERNAL;
- }
- 
-+/*
-+ * Returns true if 'name' is external to the namespace for which
-+ * the server being queried can answer, either because it's not a
-+ * subdomain or because it's below a forward declaration or a
-+ * locally served zone.
-+ */
-+static inline bool
-+name_external(dns_name_t *name, dns_rdatatype_t type, fetchctx_t *fctx) {
-+	isc_result_t result;
-+	dns_forwarders_t *forwarders = NULL;
-+	dns_fixedname_t fixed, zfixed;
-+	dns_name_t *fname = dns_fixedname_initname(&fixed);
-+	dns_name_t *zfname = dns_fixedname_initname(&zfixed);
-+	dns_name_t *apex = NULL;
-+	dns_name_t suffix;
-+	dns_zone_t *zone = NULL;
-+	unsigned int labels;
-+	dns_namereln_t rel;
-+	/*
-+	 * The following two variables do not influence code flow; they are
-+	 * only necessary for calling dns_name_fullcompare().
-+	 */
-+	int _orderp = 0;
-+	unsigned int _nlabelsp = 0;
-+
-+	apex = ISFORWARDER(fctx->addrinfo) ? fctx->fwdname : &fctx->domain;
-+
-+	/*
-+	 * The name is outside the queried namespace.
-+	 */
-+	rel = dns_name_fullcompare(name, apex, &_orderp, &_nlabelsp);
-+	if (rel != dns_namereln_subdomain && rel != dns_namereln_equal) {
-+		return (true);
-+	}
-+
-+	/*
-+	 * If the record lives in the parent zone, adjust the name so we
-+	 * look for the correct zone or forward clause.
-+	 */
-+	labels = dns_name_countlabels(name);
-+	if (dns_rdatatype_atparent(type) && labels > 1U) {
-+		dns_name_init(&suffix, NULL);
-+		dns_name_getlabelsequence(name, 1, labels - 1, &suffix);
-+		name = &suffix;
-+	} else if (rel == dns_namereln_equal) {
-+		/* If 'name' is 'apex', no further checking is needed. */
-+		return (false);
-+	}
-+
-+	/*
-+	 * If there is a locally served zone between 'apex' and 'name'
-+	 * then don't cache.
-+	 */
-+	LOCK(&fctx->res->view->lock);
-+	if (fctx->res->view->zonetable != NULL) {
-+		unsigned int options = DNS_ZTFIND_NOEXACT;
-+		result = dns_zt_find(fctx->res->view->zonetable, name, options,
-+				     zfname, &zone);
-+		if (zone != NULL) {
-+			dns_zone_detach(&zone);
-+		}
-+		if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) {
-+			if (dns_name_fullcompare(zfname, apex, &_orderp,
-+						 &_nlabelsp) ==
-+			    dns_namereln_subdomain)
-+			{
-+				UNLOCK(&fctx->res->view->lock);
-+				return (true);
-+			}
-+		}
-+	}
-+	UNLOCK(&fctx->res->view->lock);
-+
-+	/*
-+	 * Look for a forward declaration below 'name'.
-+	 */
-+	result = dns_fwdtable_find2(fctx->res->view->fwdtable, name, fname,
-+				    &forwarders);
-+
-+	if (ISFORWARDER(fctx->addrinfo)) {
-+		/*
-+		 * See if the forwarder declaration is better.
-+		 */
-+		if (result == ISC_R_SUCCESS) {
-+			return (!dns_name_equal(fname, fctx->fwdname));
-+		}
-+
-+		/*
-+		 * If the lookup failed, the configuration must have
-+		 * changed: play it safe and don't cache.
-+		 */
-+		return (true);
-+	} else if (result == ISC_R_SUCCESS &&
-+		   forwarders->fwdpolicy == dns_fwdpolicy_only &&
-+		   !ISC_LIST_EMPTY(forwarders->fwdrs))
-+	{
-+		/*
-+		 * If 'name' is covered by a 'forward only' clause then we
-+		 * can't cache this repsonse.
-+		 */
-+		return (true);
-+	}
-+
-+	return (false);
-+}
-+
- static isc_result_t
- check_section(void *arg, dns_name_t *addname, dns_rdatatype_t type,
- 	      dns_section_t section)
-@@ -6201,7 +6316,7 @@ check_section(void *arg, dns_name_t *addname, dns_rdatatype_t type,
- 	result = dns_message_findname(fctx->rmessage, section, addname,
- 				      dns_rdatatype_any, 0, &name, NULL);
- 	if (result == ISC_R_SUCCESS) {
--		external = !dns_name_issubdomain(name, &fctx->domain);
-+		external = name_external(name, type, fctx);
- 		if (type == dns_rdatatype_a) {
- 			for (rdataset = ISC_LIST_HEAD(name->list);
- 			     rdataset != NULL;
-@@ -7071,6 +7186,13 @@ answer_response(fetchctx_t *fctx) {
- 			break;
- 
- 		case dns_namereln_subdomain:
-+			/*
-+			 * Don't accept DNAME from parent namespace.
-+			 */
-+			if (name_external(name, dns_rdatatype_dname, fctx)) {
-+				continue;
-+			}
-+
- 			/*
- 			 * In-scope DNAME records must have at least
- 			 * as many labels as the domain being queried.
-@@ -7299,11 +7421,9 @@ answer_response(fetchctx_t *fctx) {
- 	 */
- 	result = dns_message_firstname(message, DNS_SECTION_AUTHORITY);
- 	while (!done && result == ISC_R_SUCCESS) {
--		bool external;
- 		name = NULL;
- 		dns_message_currentname(message, DNS_SECTION_AUTHORITY, &name);
--		external = !dns_name_issubdomain(name, &fctx->domain);
--		if (!external) {
-+		if (!name_external(name, dns_rdatatype_ns, fctx)) {
- 			/*
- 			 * We expect to find NS or SIG NS rdatasets, and
- 			 * nothing else.

SOURCES/dhcp-4.2.5-expiry_before_renewal_v2.patch

@@ -0,0 +1,31 @@
+diff -up dhcp-4.2.5/client/dhclient.c.orig dhcp-4.2.5/client/dhclient.c
+--- dhcp-4.2.5/client/dhclient.c.orig	2018-11-07 14:21:16.756152614 +0100
++++ dhcp-4.2.5/client/dhclient.c	2018-11-08 17:30:15.754440523 +0100
+@@ -1618,8 +1618,14 @@ void dhcpack (packet)
+ 	} else
+ 			client -> new -> renewal = 0;
+ 
+-	/* If it wasn't specified by the server, calculate it. */
+-	if (!client -> new -> renewal)
++	/* 
++	 * If it wasn't specified by the server, calculate it. Also use expiry
++	 * instead of renewal time when it is shorter. This better follows 
++	 * RFC 2131 (section 4.4.5) when dealing with some DHCP servers.
++	 */
++	
++	if (!client -> new -> renewal ||
++	    client -> new -> renewal > client -> new -> expiry)
+ 		client -> new -> renewal = client -> new -> expiry / 2 + 1;
+ 
+ 	if (client -> new -> renewal <= 0)
+@@ -1645,7 +1651,9 @@ void dhcpack (packet)
+ 	} else
+ 			client -> new -> rebind = 0;
+ 
+-	if (client -> new -> rebind <= 0) {
++	/* Rebinding time must not be longer than expiry. */
++	if (client -> new -> rebind <= 0 ||
++	    client -> new -> rebind > client -> new -> expiry) {
+ 		if (client -> new -> expiry <= TIME_MAX / 7)
+ 			client -> new -> rebind =
+ 					client -> new -> expiry * 7 / 8;

SOURCES/dhcp-4.3.6-isc-util.patch

@@ -0,0 +1,77 @@
+From c37721f799e6b32da156759a830011949311205a Mon Sep 17 00:00:00 2001
+From: Petr Mensik <pemensik@redhat.com>
+Date: Fri, 16 Feb 2018 17:50:40 +0100
+Subject: [PATCH] New bind includes never includes isc/util.h from any public
+ headers. Include them to all compiled files that require it.
+
+---
+ client/dhclient.c   | 1 +
+ common/execute.c    | 1 +
+ common/parse.c      | 1 +
+ common/socket.c     | 1 +
+ omapip/connection.c | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/client/dhclient.c b/client/dhclient.c
+index 228b4fe..014365d 100644
+--- a/client/dhclient.c
++++ b/client/dhclient.c
+@@ -38,6 +38,7 @@
+ #include <sys/wait.h>
+ #include <limits.h>
+ #include <isc/file.h>
++#include <isc/util.h>
+ #include <dns/result.h>
+ 
+ #ifdef HAVE_LIBCAP_NG
+diff --git a/common/execute.c b/common/execute.c
+index fa4e0f8..1ee1e7d 100644
+--- a/common/execute.c
++++ b/common/execute.c
+@@ -28,6 +28,7 @@
+ 
+ #include "dhcpd.h"
+ #include <omapip/omapip_p.h>
++#include <isc/util.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 
+diff --git a/common/parse.c b/common/parse.c
+index d08cd2c..729d442 100644
+--- a/common/parse.c
++++ b/common/parse.c
+@@ -27,6 +27,7 @@
+  */
+ 
+ #include "dhcpd.h"
++#include <isc/util.h>
+ #include <syslog.h>
+ 
+ /* Enumerations can be specified in option formats, and are used for
+diff --git a/common/socket.c b/common/socket.c
+index 2b352a1..94ce334 100644
+--- a/common/socket.c
++++ b/common/socket.c
+@@ -35,6 +35,7 @@
+  */
+ 
+ #include "dhcpd.h"
++#include <isc/util.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>
+ #include <sys/uio.h>
+diff --git a/omapip/connection.c b/omapip/connection.c
+index 9aac0c8..a74becc 100644
+--- a/omapip/connection.c
++++ b/omapip/connection.c
+@@ -30,6 +30,7 @@
+ #include "dhcpd.h"
+ 
+ #include <omapip/omapip_p.h>
++#include <isc/util.h>
+ #include <arpa/inet.h>
+ #include <arpa/nameser.h>
+ #include <errno.h>
+-- 
+2.14.3
+

SOURCES/dhcp-4.3.6-omapi-leak.patch

@@ -0,0 +1,52 @@
+commit ccff9ed69d0b26d33ce9cac8e83dab535b64d627
+Author: Thomas Markwalder <tmark@isc.org>
+Date:   Tue Dec 5 15:12:34 2017 -0500
+
+    [46767] Plugged a socket descriptor leak in OMAPI
+    
+    If disconnect is triggered by the reader closing the socket, while there
+    is data left to write, the socket would be orphaned.
+    
+    omapip/buffer.c
+        omapi_connection_writea() - added logic to recall disconnect once
+        pending data has been written
+    
+    omapip/message.c
+        Removed static declaration from omapi_message_unregister so you can
+        actually compile when DEBUG_PROTOCOL is defined.
+    
+    Added a release note
+
+diff --git a/omapip/buffer.c b/omapip/buffer.c
+index 6e0621b..a21f0a8 100644
+--- a/omapip/buffer.c
++++ b/omapip/buffer.c
+@@ -565,6 +565,15 @@ isc_result_t omapi_connection_writer (omapi_object_t *h)
+ 			omapi_buffer_dereference (&buffer, MDL);
+ 		}
+ 	}
++
++	/* If we had data left to write when we're told to disconnect,
++	* we need recall disconnect, now that we're done writing.
++	* See rt46767. */
++	if (c->out_bytes == 0 && c->state == omapi_connection_disconnecting) {
++		omapi_disconnect (h, 1);
++		return ISC_R_SHUTTINGDOWN;
++	}
++
+ 	return ISC_R_SUCCESS;
+ }
+ 
+diff --git a/omapip/message.c b/omapip/message.c
+index ee15d82..37abbd2 100644
+--- a/omapip/message.c
++++ b/omapip/message.c
+@@ -339,7 +339,7 @@ isc_result_t omapi_message_unregister (omapi_object_t *mo)
+ }
+ 
+ #ifdef DEBUG_PROTOCOL
+-static const char *omapi_message_op_name(int op) {
++const char *omapi_message_op_name(int op) {
+ 	switch (op) {
+ 	case OMAPI_OP_OPEN:    return "OMAPI_OP_OPEN";
+ 	case OMAPI_OP_REFRESH: return "OMAPI_OP_REFRESH";

SOURCES/dhcp-4.3.6-options_overflow.patch

@@ -0,0 +1,41 @@
+diff --git a/common/options.c b/common/options.c
+index 83e0384..8a1deca 100644
+--- a/common/options.c
++++ b/common/options.c
+@@ -1672,7 +1672,8 @@ format_min_length(format, oc)
+ 
+ 
+ /* Format the specified option so that a human can easily read it. */
+-
++/* Maximum pretty printed size */
++#define MAX_OUTPUT_SIZE 32*1024
+ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
+ 	struct option *option;
+ 	const unsigned char *data;
+@@ -1680,8 +1681,9 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
+ 	int emit_commas;
+ 	int emit_quotes;
+ {
+-	static char optbuf [32768]; /* XXX */
+-	static char *endbuf = &optbuf[sizeof(optbuf)];
++	/* We add 128 byte pad so we don't have to add checks everywhere. */
++	static char optbuf [MAX_OUTPUT_SIZE + 128]; /* XXX */
++	static char *endbuf = optbuf + MAX_OUTPUT_SIZE;
+ 	int hunksize = 0;
+ 	int opthunk = 0;
+ 	int hunkinc = 0;
+@@ -2132,7 +2134,14 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
+ 				log_error ("Unexpected format code %c",
+ 					   fmtbuf [j]);
+ 			}
++
+ 			op += strlen (op);
++			if (op >= endbuf) {
++				log_error ("Option data exceeds"
++					   " maximum size %d", MAX_OUTPUT_SIZE);
++					   return ("<error>");
++			}
++
+ 			if (dp == data + len)
+ 				break;
+ 			if (j + 1 < numelem && comma != ':')

SOURCES/dhcp-4.3.6-reference_count_overflow.patch

@@ -0,0 +1,13 @@
+diff --git a/common/options.c b/common/options.c
+index 83e0384..a58c5fc 100644
+--- a/common/options.c
++++ b/common/options.c
+@@ -189,6 +189,8 @@ int parse_option_buffer (options, buffer, length, universe)
+ 
+ 		/* If the length is outrageous, the options are bad. */
+ 		if (offset + len > length) {
++			/* Avoid reference count overflow */
++			option_dereference(&option, MDL);
+ 			reason = "option length exceeds option buffer length";
+ 		      bogus:
+ 			log_error("parse_option_buffer: malformed option "

SOURCES/dhcp-64_bit_lease_parse.patch

@@ -0,0 +1,75 @@
+diff -up dhcp-4.3.0a1/common/parse.c.64-bit_lease_parse dhcp-4.3.0a1/common/parse.c
+--- dhcp-4.3.0a1/common/parse.c.64-bit_lease_parse	2013-12-11 01:25:12.000000000 +0100
++++ dhcp-4.3.0a1/common/parse.c	2013-12-19 15:45:25.990771814 +0100
+@@ -938,8 +938,8 @@ TIME
+ parse_date_core(cfile)
+ 	struct parse *cfile;
+ {
+-	int guess;
+-	int tzoff, year, mon, mday, hour, min, sec;
++	TIME guess;
++	long int tzoff, year, mon, mday, hour, min, sec;
+ 	const char *val;
+ 	enum dhcp_token token;
+ 	static int months[11] = { 31, 59, 90, 120, 151, 181,
+@@ -965,7 +965,7 @@ parse_date_core(cfile)
+ 		}
+ 
+ 		skip_token(&val, NULL, cfile); /* consume number */
+-		guess = atoi(val);
++		guess = atol(val);
+ 
+ 		return((TIME)guess);
+ 	}
+@@ -993,7 +993,7 @@ parse_date_core(cfile)
+ 	   somebody invents a time machine, I think we can safely disregard
+ 	   it.   This actually works around a stupid Y2K bug that was present
+ 	   in a very early beta release of dhcpd. */
+-	year = atoi(val);
++	year = atol(val);
+ 	if (year > 1900)
+ 		year -= 1900;
+ 
+@@ -1039,7 +1039,7 @@ parse_date_core(cfile)
+ 		return((TIME)0);
+ 	}
+ 	skip_token(&val, NULL, cfile); /* consume day of month */
+-	mday = atoi(val);
++	mday = atol(val);
+ 
+ 	/* Hour... */
+ 	token = peek_token(&val, NULL, cfile);
+@@ -1050,7 +1050,7 @@ parse_date_core(cfile)
+ 		return((TIME)0);
+ 	}
+ 	skip_token(&val, NULL, cfile); /* consume hour */
+-	hour = atoi(val);
++	hour = atol(val);
+ 
+ 	/* Colon separating hour from minute... */
+ 	token = peek_token(&val, NULL, cfile);
+@@ -1072,7 +1072,7 @@ parse_date_core(cfile)
+ 		return((TIME)0);
+ 	}
+ 	skip_token(&val, NULL, cfile); /* consume minute */
+-	min = atoi(val);
++	min = atol(val);
+ 
+ 	/* Colon separating minute from second... */
+ 	token = peek_token(&val, NULL, cfile);
+@@ -1094,13 +1094,13 @@ parse_date_core(cfile)
+ 		return((TIME)0);
+ 	}
+ 	skip_token(&val, NULL, cfile); /* consume second */
+-	sec = atoi(val);
++	sec = atol(val);
+ 
+ 	tzoff = 0;
+ 	token = peek_token(&val, NULL, cfile);
+ 	if (token == NUMBER) {
+ 		skip_token(&val, NULL, cfile); /* consume tzoff */
+-		tzoff = atoi(val);
++		tzoff = atol(val);
+ 	} else if (token != SEMI) {
+ 		skip_token(&val, NULL, cfile);
+ 		parse_warn(cfile,

SOURCES/dhcp-CLOEXEC.patch

@@ -1,32 +1,7 @@
-From d2da34706f140101c34f6a9806c258411806a939 Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:27:18 +0100
-Subject: [PATCH 08/26] Make sure all open file descriptors are closed-on-exec
- for SELinux
-Cc: pzhukov@redhat.com
-
-ISC-bug: #19148
----
- client/clparse.c  |  4 ++--
- client/dhclient.c | 28 ++++++++++++++--------------
- common/bpf.c      |  2 +-
- common/dlpi.c     |  2 +-
- common/nit.c      |  2 +-
- common/resolv.c   |  2 +-
- common/upf.c      |  2 +-
- omapip/trace.c    |  6 +++---
- relay/dhcrelay.c  | 10 +++++-----
- server/confpars.c |  2 +-
- server/db.c       |  4 ++--
- server/dhcpd.c    | 14 +++++++-------
- server/ldap.c     |  2 +-
- 13 files changed, 40 insertions(+), 40 deletions(-)
-
-diff --git a/client/clparse.c b/client/clparse.c
-index 39b95a0..44387ed 100644
---- a/client/clparse.c
-+++ b/client/clparse.c
-@@ -288,7 +288,7 @@ int read_client_conf_file (const char *name, struct interface_info *ip,
+diff -up dhcp-4.3.3b1/client/clparse.c.cloexec dhcp-4.3.3b1/client/clparse.c
+--- dhcp-4.3.3b1/client/clparse.c.cloexec	2015-08-10 10:46:20.264755543 +0200
++++ dhcp-4.3.3b1/client/clparse.c	2015-08-10 10:46:20.274755510 +0200
+@@ -247,7 +247,7 @@ int read_client_conf_file (const char *n
  	int token;
  	isc_result_t status;
  
@@ -35,7 +10,7 @@ index 39b95a0..44387ed 100644
  		return uerr2isc (errno);
  
  	cfile = NULL;
-@@ -364,7 +364,7 @@ void read_client_leases ()
+@@ -323,7 +323,7 @@ void read_client_leases ()
  
  	/* Open the lease file.   If we can't open it, just return -
  	   we can safely trust the server to remember our state. */
@@ -44,11 +19,10 @@ index 39b95a0..44387ed 100644
  		return;
  
  	cfile = NULL;
-diff --git a/client/dhclient.c b/client/dhclient.c
-index 2a2e9e6..a86ab9e 100644
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -273,11 +273,11 @@ main(int argc, char **argv) {
+diff -up dhcp-4.3.3b1/client/dhclient.c.cloexec dhcp-4.3.3b1/client/dhclient.c
+--- dhcp-4.3.3b1/client/dhclient.c.cloexec	2015-08-10 10:46:20.260755556 +0200
++++ dhcp-4.3.3b1/client/dhclient.c	2015-08-10 10:46:20.275755506 +0200
+@@ -153,11 +153,11 @@ main(int argc, char **argv) {
  	/* Make sure that file descriptors 0 (stdin), 1, (stdout), and
  	   2 (stderr) are open. To do this, we assume that when we
  	   open a file the lowest available file descriptor is used. */
@@ -63,7 +37,7 @@ index 2a2e9e6..a86ab9e 100644
  	if (fd == 2)
  		log_perror = 0; /* No sense logging to /dev/null. */
  	else if (fd != -1)
-@@ -765,7 +765,7 @@ main(int argc, char **argv) {
+@@ -519,7 +519,7 @@ main(int argc, char **argv) {
  		long temp;
  		int e;
  
@@ -72,7 +46,7 @@ index 2a2e9e6..a86ab9e 100644
  			e = fscanf(pidfd, "%ld\n", &temp);
  			oldpid = (pid_t)temp;
  
-@@ -820,7 +820,7 @@ main(int argc, char **argv) {
+@@ -574,7 +574,7 @@ main(int argc, char **argv) {
  					strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx);
  					sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name);
  
@@ -81,7 +55,7 @@ index 2a2e9e6..a86ab9e 100644
  						e = fscanf(pidfd, "%ld\n", &temp);
  						oldpid = (pid_t)temp;
  
-@@ -845,7 +845,7 @@ main(int argc, char **argv) {
+@@ -599,7 +599,7 @@ main(int argc, char **argv) {
  		int dhc_running = 0;
  		char procfn[256] = "";
  
@@ -90,7 +64,7 @@ index 2a2e9e6..a86ab9e 100644
  			if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) {
  				snprintf(procfn,256,"/proc/%u",dhcpid);
  				dhc_running = (access(procfn, F_OK) == 0);
-@@ -3808,7 +3808,7 @@ void rewrite_client_leases ()
+@@ -3120,7 +3120,7 @@ void rewrite_client_leases ()
  
  	if (leaseFile != NULL)
  		fclose (leaseFile);
@@ -99,7 +73,7 @@ index 2a2e9e6..a86ab9e 100644
  	if (leaseFile == NULL) {
  		log_error ("can't create %s: %m", path_dhclient_db);
  		return;
-@@ -4003,7 +4003,7 @@ write_duid(struct data_string *duid)
+@@ -3313,7 +3313,7 @@ write_duid(struct data_string *duid)
  		return DHCP_R_INVALIDARG;
  
  	if (leaseFile == NULL) {	/* XXX? */
@@ -108,7 +82,7 @@ index 2a2e9e6..a86ab9e 100644
  		if (leaseFile == NULL) {
  			log_error("can't create %s: %m", path_dhclient_db);
  			return ISC_R_IOERROR;
-@@ -4207,7 +4207,7 @@ int write_client_lease (client, lease, rewrite, makesure)
+@@ -3493,7 +3493,7 @@ int write_client_lease (client, lease, r
  		return 1;
  
  	if (leaseFile == NULL) {	/* XXX */
@@ -117,7 +91,7 @@ index 2a2e9e6..a86ab9e 100644
  		if (leaseFile == NULL) {
  			log_error ("can't create %s: %m", path_dhclient_db);
  			return 0;
-@@ -4786,9 +4786,9 @@ void detach ()
+@@ -4011,9 +4011,9 @@ void go_daemon ()
  	(void) close(2);
  
  	/* Reopen them on /dev/null. */
@@ -130,7 +104,7 @@ index 2a2e9e6..a86ab9e 100644
  
  	write_client_pid_file ();
  
-@@ -4806,14 +4806,14 @@ void write_client_pid_file ()
+@@ -4030,14 +4030,14 @@ void write_client_pid_file ()
  		return;
  	}
  
@@ -147,11 +121,10 @@ index 2a2e9e6..a86ab9e 100644
  	if (!pf) {
  		close(pfdesc);
  		log_error ("Can't fdopen %s: %m", path_dhclient_pid);
-diff --git a/common/bpf.c b/common/bpf.c
-index 16076fe..67b6d64 100644
---- a/common/bpf.c
-+++ b/common/bpf.c
-@@ -94,7 +94,7 @@ int if_register_bpf (info)
+diff -up dhcp-4.3.3b1/common/bpf.c.cloexec dhcp-4.3.3b1/common/bpf.c
+--- dhcp-4.3.3b1/common/bpf.c.cloexec	2015-07-30 15:17:16.000000000 +0200
++++ dhcp-4.3.3b1/common/bpf.c	2015-08-10 10:46:20.275755506 +0200
+@@ -95,7 +95,7 @@ int if_register_bpf (info)
  	for (b = 0; 1; b++) {
  		/* %Audit% 31 bytes max. %2004.06.17,Safe% */
  		sprintf(filename, BPF_FORMAT, b);
@@ -160,11 +133,10 @@ index 16076fe..67b6d64 100644
  		if (sock < 0) {
  			if (errno == EBUSY) {
  				continue;
-diff --git a/common/dlpi.c b/common/dlpi.c
-index 3990bf1..a941258 100644
---- a/common/dlpi.c
-+++ b/common/dlpi.c
-@@ -817,7 +817,7 @@ dlpiopen(const char *ifname) {
+diff -up dhcp-4.3.3b1/common/dlpi.c.cloexec dhcp-4.3.3b1/common/dlpi.c
+--- dhcp-4.3.3b1/common/dlpi.c.cloexec	2015-07-30 15:17:16.000000000 +0200
++++ dhcp-4.3.3b1/common/dlpi.c	2015-08-10 10:46:20.275755506 +0200
+@@ -804,7 +804,7 @@ dlpiopen(const char *ifname) {
  	}
  	*dp = '\0';
  	
@@ -173,10 +145,9 @@ index 3990bf1..a941258 100644
  }
  
  /*
-diff --git a/common/nit.c b/common/nit.c
-index d822c15..a9132bc 100644
---- a/common/nit.c
-+++ b/common/nit.c
+diff -up dhcp-4.3.3b1/common/nit.c.cloexec dhcp-4.3.3b1/common/nit.c
+--- dhcp-4.3.3b1/common/nit.c.cloexec	2015-07-30 15:17:16.000000000 +0200
++++ dhcp-4.3.3b1/common/nit.c	2015-08-10 10:46:20.275755506 +0200
 @@ -75,7 +75,7 @@ int if_register_nit (info)
  	struct strioctl sio;
  
@@ -186,11 +157,10 @@ index d822c15..a9132bc 100644
  	if (sock < 0)
  		log_fatal ("Can't open NIT device for %s: %m", info -> name);
  
-diff --git a/common/resolv.c b/common/resolv.c
-index a01f520..b209e3f 100644
---- a/common/resolv.c
-+++ b/common/resolv.c
-@@ -43,7 +43,7 @@ void read_resolv_conf (parse_time)
+diff -up dhcp-4.3.3b1/common/resolv.c.cloexec dhcp-4.3.3b1/common/resolv.c
+--- dhcp-4.3.3b1/common/resolv.c.cloexec	2015-07-30 15:17:16.000000000 +0200
++++ dhcp-4.3.3b1/common/resolv.c	2015-08-10 10:46:20.276755503 +0200
+@@ -44,7 +44,7 @@ void read_resolv_conf (parse_time)
  	struct domain_search_list *dp, *dl, *nd;
  	isc_result_t status;
  
@@ -199,10 +169,9 @@ index a01f520..b209e3f 100644
  		log_error ("Can't open %s: %m", path_resolv_conf);
  		return;
  	}
-diff --git a/common/upf.c b/common/upf.c
-index 9785879..e0a524f 100644
---- a/common/upf.c
-+++ b/common/upf.c
+diff -up dhcp-4.3.3b1/common/upf.c.cloexec dhcp-4.3.3b1/common/upf.c
+--- dhcp-4.3.3b1/common/upf.c.cloexec	2015-07-30 15:17:16.000000000 +0200
++++ dhcp-4.3.3b1/common/upf.c	2015-08-10 10:46:20.276755503 +0200
 @@ -71,7 +71,7 @@ int if_register_upf (info)
  		/* %Audit% Cannot exceed 36 bytes. %2004.06.17,Safe% */
  		sprintf(filename, "/dev/pf/pfilt%d", b);
@@ -212,11 +181,10 @@ index 9785879..e0a524f 100644
  		if (sock < 0) {
  			if (errno == EBUSY) {
  				continue;
-diff --git a/omapip/trace.c b/omapip/trace.c
-index 45bd508..5ea7486 100644
---- a/omapip/trace.c
-+++ b/omapip/trace.c
-@@ -136,10 +136,10 @@ isc_result_t trace_begin (const char *filename,
+diff -up dhcp-4.3.3b1/omapip/trace.c.cloexec dhcp-4.3.3b1/omapip/trace.c
+--- dhcp-4.3.3b1/omapip/trace.c.cloexec	2015-07-30 15:17:16.000000000 +0200
++++ dhcp-4.3.3b1/omapip/trace.c	2015-08-10 10:46:20.276755503 +0200
+@@ -138,10 +138,10 @@ isc_result_t trace_begin (const char *fi
  		return DHCP_R_INVALIDARG;
  	}
  
@@ -229,7 +197,7 @@ index 45bd508..5ea7486 100644
  				     0600);
  	}
  
-@@ -427,7 +427,7 @@ void trace_file_replay (const char *filename)
+@@ -429,7 +429,7 @@ void trace_file_replay (const char *file
  	isc_result_t result;
  	int len;
  
@@ -238,11 +206,10 @@ index 45bd508..5ea7486 100644
  	if (!traceinfile) {
  		log_error("Can't open tracefile %s: %m", filename);
  		return;
-diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
-index d8caaaf..ea1be18 100644
---- a/relay/dhcrelay.c
-+++ b/relay/dhcrelay.c
-@@ -296,11 +296,11 @@ main(int argc, char **argv) {
+diff -up dhcp-4.3.3b1/relay/dhcrelay.c.cloexec dhcp-4.3.3b1/relay/dhcrelay.c
+--- dhcp-4.3.3b1/relay/dhcrelay.c.cloexec	2015-07-30 15:17:16.000000000 +0200
++++ dhcp-4.3.3b1/relay/dhcrelay.c	2015-08-10 10:46:20.276755503 +0200
+@@ -187,11 +187,11 @@ main(int argc, char **argv) {
  	/* Make sure that file descriptors 0(stdin), 1,(stdout), and
  	   2(stderr) are open. To do this, we assume that when we
  	   open a file the lowest available file descriptor is used. */
@@ -257,8 +224,8 @@ index d8caaaf..ea1be18 100644
  	if (fd == 2)
  		log_perror = 0; /* No sense logging to /dev/null. */
  	else if (fd != -1)
-@@ -776,13 +776,13 @@ main(int argc, char **argv) {
- 		/* Create the pid file. */
+@@ -558,13 +558,13 @@ main(int argc, char **argv) {
+ 
  		if (no_pid_file == ISC_FALSE) {
  			pfdesc = open(path_dhcrelay_pid,
 -				      O_CREAT | O_TRUNC | O_WRONLY, 0644);
@@ -273,11 +240,10 @@ index d8caaaf..ea1be18 100644
  				if (!pf)
  					log_error("Can't fdopen %s: %m",
  						  path_dhcrelay_pid);
-diff --git a/server/confpars.c b/server/confpars.c
-index d2cedfe..2743979 100644
---- a/server/confpars.c
-+++ b/server/confpars.c
-@@ -118,7 +118,7 @@ isc_result_t read_conf_file (const char *filename, struct group *group,
+diff -up dhcp-4.3.3b1/server/confpars.c.cloexec dhcp-4.3.3b1/server/confpars.c
+--- dhcp-4.3.3b1/server/confpars.c.cloexec	2015-07-30 15:17:16.000000000 +0200
++++ dhcp-4.3.3b1/server/confpars.c	2015-08-10 10:46:20.277755500 +0200
+@@ -111,7 +111,7 @@ isc_result_t read_conf_file (const char
  	}
  #endif
  
@@ -286,11 +252,19 @@ index d2cedfe..2743979 100644
  		if (leasep) {
  			log_error ("Can't open lease database %s: %m --",
  				   path_dhcpd_db);
-diff --git a/server/db.c b/server/db.c
-index 67e6cc1..6181528 100644
---- a/server/db.c
-+++ b/server/db.c
-@@ -1154,7 +1154,7 @@ int new_lease_file (int test_mode)
+diff -up dhcp-4.3.3b1/server/db.c.cloexec dhcp-4.3.3b1/server/db.c
+--- dhcp-4.3.3b1/server/db.c.cloexec	2015-07-30 15:17:16.000000000 +0200
++++ dhcp-4.3.3b1/server/db.c	2015-08-10 10:47:32.644518358 +0200
+@@ -1072,7 +1072,7 @@ void db_startup (testp)
+ 	}
+ #endif
+ 	if (!testp) {
+-		db_file = fopen (path_dhcpd_db, "a");
++		db_file = fopen (path_dhcpd_db, "ae");
+ 		if (!db_file)
+ 			log_fatal ("Can't open %s for append.", path_dhcpd_db);
+ 		expire_all_pools ();
+@@ -1120,7 +1120,7 @@ int new_lease_file ()
  		     path_dhcpd_db, (int)t) >= sizeof newfname)
  		log_fatal("new_lease_file: lease file path too long");
  
@@ -299,7 +273,7 @@ index 67e6cc1..6181528 100644
  	if (db_fd < 0) {
  		log_error ("Can't create new lease file: %m");
  		return 0;
-@@ -1175,7 +1175,7 @@ int new_lease_file (int test_mode)
+@@ -1141,7 +1141,7 @@ int new_lease_file ()
  	}
  #endif /* PARANOIA */
  
@@ -308,11 +282,10 @@ index 67e6cc1..6181528 100644
  		log_error("Can't fdopen new lease file: %m");
  		close(db_fd);
  		goto fdfail;
-diff --git a/server/dhcpd.c b/server/dhcpd.c
-index 55ffae7..530a923 100644
---- a/server/dhcpd.c
-+++ b/server/dhcpd.c
-@@ -300,11 +300,11 @@ main(int argc, char **argv) {
+diff -up dhcp-4.3.3b1/server/dhcpd.c.cloexec dhcp-4.3.3b1/server/dhcpd.c
+--- dhcp-4.3.3b1/server/dhcpd.c.cloexec	2015-07-30 15:17:16.000000000 +0200
++++ dhcp-4.3.3b1/server/dhcpd.c	2015-08-10 10:46:20.278755497 +0200
+@@ -194,11 +194,11 @@ main(int argc, char **argv) {
          /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
             2 (stderr) are open. To do this, we assume that when we
             open a file the lowest available file descriptor is used. */
@@ -327,7 +300,7 @@ index 55ffae7..530a923 100644
          if (fd == 2)
                  log_perror = 0; /* No sense logging to /dev/null. */
          else if (fd != -1)
-@@ -975,7 +975,7 @@ main(int argc, char **argv) {
+@@ -743,7 +743,7 @@ main(int argc, char **argv) {
  	 * appropriate.
  	 */
  	if (no_pid_file == ISC_FALSE) {
@@ -336,7 +309,7 @@ index 55ffae7..530a923 100644
  		if (i >= 0) {
  			sprintf(pbuf, "%d\n", (int) getpid());
  			IGNORE_RET(write(i, pbuf, strlen(pbuf)));
-@@ -1028,9 +1028,9 @@ main(int argc, char **argv) {
+@@ -787,9 +787,9 @@ main(int argc, char **argv) {
                  (void) close(2);
  
                  /* Reopen them on /dev/null. */
@@ -349,11 +322,10 @@ index 55ffae7..530a923 100644
                  log_perror = 0; /* No sense logging to /dev/null. */
  
         		IGNORE_RET (chdir("/"));
-diff --git a/server/ldap.c b/server/ldap.c
-index 5126d24..555545c 100644
---- a/server/ldap.c
-+++ b/server/ldap.c
-@@ -1446,7 +1446,7 @@ ldap_start (void)
+diff -up dhcp-4.3.3b1/server/ldap.c.cloexec dhcp-4.3.3b1/server/ldap.c
+--- dhcp-4.3.3b1/server/ldap.c.cloexec	2015-07-30 21:03:40.000000000 +0200
++++ dhcp-4.3.3b1/server/ldap.c	2015-08-10 10:46:20.279755493 +0200
+@@ -1442,7 +1442,7 @@ ldap_start (void)
  
    if (ldap_debug_file != NULL && ldap_debug_fd == -1)
      {
@@ -362,6 +334,3 @@ index 5126d24..555545c 100644
                                   S_IRUSR | S_IWUSR)) < 0)
          log_error ("Error opening debug LDAP log file %s: %s", ldap_debug_file,
                     strerror (errno));
--- 
-2.14.5
-

SOURCES/dhcp-CVE-2022-2928.patch

@@ -1,8 +1,8 @@
 diff --git a/common/options.c b/common/options.c
-index a53484e..40238f7 100644
+index ed8ac38..addc65a 100644
 --- a/common/options.c
 +++ b/common/options.c
-@@ -4499,6 +4499,8 @@ add_option(struct option_state *options,
+@@ -4397,6 +4397,8 @@ add_option(struct option_state *options,
  	if (!option_cache_allocate(&oc, MDL)) {
  		log_error("No memory for option cache adding %s (option %d).",
  			  option->name, option_num);
@@ -11,7 +11,7 @@ index a53484e..40238f7 100644
  		return 0;
  	}
  
-@@ -4510,6 +4512,8 @@ add_option(struct option_state *options,
+@@ -4408,6 +4410,8 @@ add_option(struct option_state *options,
  			     MDL)) {
  		log_error("No memory for constant data adding %s (option %d).",
  			  option->name, option_num);
@@ -20,7 +20,7 @@ index a53484e..40238f7 100644
  		option_cache_dereference(&oc, MDL);
  		return 0;
  	}
-@@ -4518,6 +4522,9 @@ add_option(struct option_state *options,
+@@ -4416,6 +4420,9 @@ add_option(struct option_state *options,
  	save_option(&dhcp_universe, options, oc);
  	option_cache_dereference(&oc, MDL);
  

SOURCES/dhcp-CVE-2022-2929.patch

@@ -1,8 +1,8 @@
 diff --git a/common/options.c b/common/options.c
-index 40238f7..11b1961 100644
+index addc65a..3e6383a 100644
 --- a/common/options.c
 +++ b/common/options.c
-@@ -454,16 +454,16 @@ int fqdn_universe_decode (struct option_state *options,
+@@ -435,16 +435,16 @@ int fqdn_universe_decode (struct option_state *options,
  		while (s < &bp -> data[0] + length + 2) {
  			len = *s;
  			if (len > 63) {

SOURCES/dhcp-IPoIB-log-id.patch

@@ -0,0 +1,164 @@
+--- a/server/dhcp.c     2017-07-14 15:32:14.611104590 +0200
++++ b/server/dhcp.c	2017-07-14 15:34:17.508858018 +0200
+@@ -87,6 +87,42 @@
+ 
+ static TIME leaseTimeCheck(TIME calculated, TIME alternate);
+ 
++char *print_client_identifier_from_packet (packet)
++	struct packet *packet;
++{
++	struct option_cache *oc;
++	struct data_string client_identifier;
++	char *ci;
++
++	memset (&client_identifier, 0, sizeof client_identifier);
++
++	oc = lookup_option (&dhcp_universe, packet -> options,
++			DHO_DHCP_CLIENT_IDENTIFIER);
++	if (oc &&
++	    evaluate_option_cache (&client_identifier,
++				    packet, (struct lease *)0,
++				    (struct client_state *)0,
++				    packet -> options,
++				    (struct option_state *)0,
++				    &global_scope, oc, MDL)) {
++		ci = print_hw_addr (HTYPE_INFINIBAND, client_identifier.len, client_identifier.data);
++		data_string_forget (&client_identifier, MDL);
++		return ci;
++	} else
++		return "\"no client id\"";
++}
++
++char *print_hw_addr_or_client_id (packet)
++	struct packet *packet;
++{
++	if (packet -> raw -> htype == HTYPE_INFINIBAND)
++		return print_client_identifier_from_packet (packet);
++	else
++		return print_hw_addr (packet -> raw -> htype,
++				      packet -> raw -> hlen,
++				      packet -> raw -> chaddr);
++}
++
+ void
+ dhcp (struct packet *packet) {
+ 	int ms_nulltp = 0;
+@@ -129,9 +165,7 @@
+ 
+ 		log_info("%s from %s via %s: %s", s,
+ 			 (packet->raw->htype
+-			  ? print_hw_addr(packet->raw->htype,
+-					  packet->raw->hlen,
+-					  packet->raw->chaddr)
++			  ? print_hw_addr_or_client_id(packet)
+ 			  : "<no identifier>"),
+ 			 packet->raw->giaddr.s_addr
+ 			 ? inet_ntoa(packet->raw->giaddr)
+@@ -328,9 +362,7 @@
+ #endif
+ 	snprintf (msgbuf, sizeof msgbuf, "DHCPDISCOVER from %s %s%s%svia %s",
+ 		 (packet -> raw -> htype
+-		  ? print_hw_addr (packet -> raw -> htype,
+-				   packet -> raw -> hlen,
+-				   packet -> raw -> chaddr)
++		  ? print_hw_addr_or_client_id (packet)
+ 		  : (lease
+ 		     ? print_hex_1(lease->uid_len, lease->uid, 60)
+ 		     : "<no identifier>")),
+@@ -542,9 +574,7 @@
+ 		 "DHCPREQUEST for %s%s from %s %s%s%svia %s",
+ 		 piaddr (cip), smbuf,
+ 		 (packet -> raw -> htype
+-		  ? print_hw_addr (packet -> raw -> htype,
+-				   packet -> raw -> hlen,
+-				   packet -> raw -> chaddr)
++		  ? print_hw_addr_or_client_id(packet)
+ 		  : (lease
+ 		     ? print_hex_1(lease->uid_len, lease->uid, 60)
+ 		     : "<no identifier>")),
+@@ -785,9 +815,7 @@
+ 	if ((oc = lookup_option (&dhcp_universe, packet -> options,
+ 				 DHO_DHCP_REQUESTED_ADDRESS))) {
+ 		log_info ("DHCPRELEASE from %s specified requested-address.",
+-		      print_hw_addr (packet -> raw -> htype,
+-				     packet -> raw -> hlen,
+-				     packet -> raw -> chaddr));
++		      print_hw_addr_or_client_id(packet));
+ 	}
+ 
+ 	oc = lookup_option (&dhcp_universe, packet -> options,
+@@ -879,9 +907,7 @@
+ 		 "DHCPRELEASE of %s from %s %s%s%svia %s (%sfound)",
+ 		 cstr,
+ 		 (packet -> raw -> htype
+-		  ? print_hw_addr (packet -> raw -> htype,
+-				   packet -> raw -> hlen,
+-				   packet -> raw -> chaddr)
++		  ? print_hw_addr_or_client_id(packet)
+ 		  : (lease
+ 		     ? print_hex_1(lease->uid_len, lease->uid, 60)
+ 		     : "<no identifier>")),
+@@ -986,9 +1012,7 @@
+ 		 "DHCPDECLINE of %s from %s %s%s%svia %s",
+ 		 piaddr (cip),
+ 		 (packet -> raw -> htype
+-		  ? print_hw_addr (packet -> raw -> htype,
+-				   packet -> raw -> hlen,
+-				   packet -> raw -> chaddr)
++		  ? print_hw_addr_or_client_id(packet)
+ 		  : (lease
+ 		     ? print_hex_1(lease->uid_len, lease->uid, 60)
+ 		     : "<no identifier>")),
+@@ -1707,8 +1731,7 @@
+ 	/* Report what we're sending. */
+ 	snprintf(msgbuf, sizeof msgbuf, "DHCPACK to %s (%s) via", piaddr(cip),
+ 		 (packet->raw->htype && packet->raw->hlen) ?
+-			print_hw_addr(packet->raw->htype, packet->raw->hlen,
+-				      packet->raw->chaddr) :
++			print_hw_addr_or_client_id(packet) :
+ 			"<no client hardware address>");
+ 	log_info("%s %s", msgbuf, gip.len ? piaddr(gip) :
+ 					    packet->interface->name);
+@@ -1886,9 +1909,7 @@
+ #endif
+ 	log_info ("DHCPNAK on %s to %s via %s",
+ 	      piaddr (*cip),
+-	      print_hw_addr (packet -> raw -> htype,
+-			     packet -> raw -> hlen,
+-			     packet -> raw -> chaddr),
++	      print_hw_addr_or_client_id(packet),
+ 	      packet -> raw -> giaddr.s_addr
+ 	      ? inet_ntoa (packet -> raw -> giaddr)
+ 	      : packet -> interface -> name);
+@@ -3897,7 +3918,7 @@
+ 		   ? (state -> offer == DHCPACK ? "DHCPACK" : "DHCPOFFER")
+ 		   : "BOOTREPLY"),
+ 		  piaddr (lease -> ip_addr),
+-		  (lease -> hardware_addr.hlen
++		  (lease -> hardware_addr.hlen > 1
+ 		   ? print_hw_addr (lease -> hardware_addr.hbuf [0],
+ 				    lease -> hardware_addr.hlen - 1,
+ 				    &lease -> hardware_addr.hbuf [1])
+@@ -4450,10 +4471,7 @@
+ 			if (uid_lease) {
+ 			    if (uid_lease->binding_state == FTS_ACTIVE) {
+ 				log_error ("client %s has duplicate%s on %s",
+-					   (print_hw_addr
+-					    (packet -> raw -> htype,
+-					     packet -> raw -> hlen,
+-					     packet -> raw -> chaddr)),
++					   (print_hw_addr_or_client_id(packet)),
+ 					   " leases",
+ 					   (ip_lease -> subnet ->
+ 					    shared_network -> name));
+@@ -4620,9 +4638,7 @@
+ 			log_error("uid lease %s for client %s is duplicate "
+ 				  "on %s",
+ 				  piaddr(uid_lease->ip_addr),
+-				  print_hw_addr(packet->raw->htype,
+-						packet->raw->hlen,
+-						packet->raw->chaddr),
++				  print_hw_addr_or_client_id(packet),
+ 				  uid_lease->subnet->shared_network->name);
+ 
+ 			if (!packet -> raw -> ciaddr.s_addr &&

SOURCES/dhcp-PPP.patch

@@ -1,24 +1,7 @@
-From 234747fbfd6c6429619ba843713d5b39fb4a513d Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:33:06 +0100
-Subject: [PATCH 13/26] DHCPv6 over PPP support (#626514)
-Cc: pzhukov@redhat.com
-
----
- client/dhc6.c     |  3 ++-
- client/dhclient.c | 17 ++++++++++++++---
- common/bpf.c      | 16 ++++++++++++++++
- common/lpf.c      | 16 ++++++++++++++++
- includes/dhcp.h   |  2 ++
- includes/dhcpd.h  |  2 +-
- server/dhcpv6.c   |  3 +++
- 7 files changed, 54 insertions(+), 5 deletions(-)
-
-diff --git a/client/dhc6.c b/client/dhc6.c
-index 16a0838..3171828 100644
---- a/client/dhc6.c
-+++ b/client/dhc6.c
-@@ -5744,7 +5744,8 @@ make_client6_options(struct client_state *client, struct option_state **op,
+diff -up dhcp-4.3.4/client/dhc6.c.PPP dhcp-4.3.4/client/dhc6.c
+--- dhcp-4.3.4/client/dhc6.c.PPP	2016-04-29 12:46:29.824988665 +0200
++++ dhcp-4.3.4/client/dhc6.c	2016-04-29 12:46:29.828988666 +0200
+@@ -5641,7 +5641,8 @@ make_client6_options(struct client_state
  	 */
  	if ((oc = lookup_option(&dhcpv6_universe, *op,
  				D6O_CLIENTID)) == NULL) {
@@ -28,11 +11,10 @@ index 16a0838..3171828 100644
  				  MDL))
  			log_fatal("Failure assembling a DUID.");
  
-diff --git a/client/dhclient.c b/client/dhclient.c
-index 5d3f5bc..301132c 100644
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -1202,8 +1202,8 @@ main(int argc, char **argv) {
+diff -up dhcp-4.3.4/client/dhclient.c.PPP dhcp-4.3.4/client/dhclient.c
+--- dhcp-4.3.4/client/dhclient.c.PPP	2016-04-29 12:46:29.815988664 +0200
++++ dhcp-4.3.4/client/dhclient.c	2016-04-29 12:46:29.830988666 +0200
+@@ -1077,8 +1077,8 @@ main(int argc, char **argv) {
  			if (default_duid.buffer != NULL)
  				data_string_forget(&default_duid, MDL);
  
@@ -43,7 +25,7 @@ index 5d3f5bc..301132c 100644
  		}
  	}
  
-@@ -3956,7 +3956,7 @@ write_options(struct client_state *client, struct option_state *options,
+@@ -3808,7 +3808,7 @@ write_options(struct client_state *clien
   * is not how it is intended.  Upcoming rearchitecting the client should
   * address this "one daemon model."
   */
@@ -52,7 +34,7 @@ index 5d3f5bc..301132c 100644
  form_duid(struct data_string *duid, const char *file, int line)
  {
  	struct interface_info *ip;
-@@ -3969,6 +3969,15 @@ form_duid(struct data_string *duid, const char *file, int line)
+@@ -3821,6 +3821,15 @@ form_duid(struct data_string *duid, cons
  	if (ip == NULL)
  		log_fatal("Impossible condition at %s:%d.", MDL);
  
@@ -68,7 +50,7 @@ index 5d3f5bc..301132c 100644
  	if ((ip->hw_address.hlen == 0) ||
  	    (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf)))
  		log_fatal("Impossible hardware address length at %s:%d.", MDL);
-@@ -4014,6 +4023,8 @@ form_duid(struct data_string *duid, const char *file, int line)
+@@ -3866,6 +3875,8 @@ form_duid(struct data_string *duid, cons
  		log_info("Created duid %s.", str);
  		dfree(str, MDL);
  	}
@@ -77,11 +59,10 @@ index 5d3f5bc..301132c 100644
  }
  
  /* Write the default DUID to the lease store. */
-diff --git a/common/bpf.c b/common/bpf.c
-index 67b6d64..ffbd09a 100644
---- a/common/bpf.c
-+++ b/common/bpf.c
-@@ -650,6 +650,22 @@ get_hw_addr(const char *name, struct hardware *hw) {
+diff -up dhcp-4.3.4/common/bpf.c.PPP dhcp-4.3.4/common/bpf.c
+--- dhcp-4.3.4/common/bpf.c.PPP	2016-04-29 12:46:29.794988660 +0200
++++ dhcp-4.3.4/common/bpf.c	2016-04-29 12:46:29.830988666 +0200
+@@ -599,6 +599,22 @@ get_hw_addr(const char *name, struct har
                          memcpy(&hw->hbuf[1], LLADDR(sa), sa->sdl_alen);
                          break;
  #endif /* IFT_FDDI */
@@ -104,11 +85,10 @@ index 67b6d64..ffbd09a 100644
                  default:
                          log_fatal("Unsupported device type %d for \"%s\"",
                                    sa->sdl_type, name);
-diff --git a/common/lpf.c b/common/lpf.c
-index 82a279b..b0ed01c 100644
---- a/common/lpf.c
-+++ b/common/lpf.c
-@@ -563,6 +563,22 @@ get_hw_addr(const char *name, struct hardware *hw) {
+diff -up dhcp-4.3.4/common/lpf.c.PPP dhcp-4.3.4/common/lpf.c
+--- dhcp-4.3.4/common/lpf.c.PPP	2016-03-22 14:16:51.000000000 +0100
++++ dhcp-4.3.4/common/lpf.c	2016-04-29 12:46:29.830988666 +0200
+@@ -548,6 +548,22 @@ get_hw_addr(const char *name, struct har
  			hw->hbuf[0] = HTYPE_FDDI;
  			memcpy(&hw->hbuf[1], sa->sa_data, 6);
  			break;
@@ -131,24 +111,10 @@ index 82a279b..b0ed01c 100644
  		default:
  			log_fatal("Unsupported device type %ld for \"%s\"",
  				  (long int)sa->sa_family, name);
-diff --git a/includes/dhcp.h b/includes/dhcp.h
-index 95bf539..4cc547a 100644
---- a/includes/dhcp.h
-+++ b/includes/dhcp.h
-@@ -80,6 +80,8 @@ struct dhcp_packet {
- 					 * is no standard for this so we
- 					 * just steal a type            */
- 
-+#define HTYPE_RESERVED	0		/* RFC 5494 */
-+
- /* Magic cookie validating dhcp options field (and bootp vendor
-    extensions field). */
- #define DHCP_OPTIONS_COOKIE	"\143\202\123\143"
-diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index 2ac39ae..faa9251 100644
---- a/includes/dhcpd.h
-+++ b/includes/dhcpd.h
-@@ -3051,7 +3051,7 @@ void client_dns_remove(struct client_state *client, struct iaddr *addr);
+diff -up dhcp-4.3.4/includes/dhcpd.h.PPP dhcp-4.3.4/includes/dhcpd.h
+--- dhcp-4.3.4/includes/dhcpd.h.PPP	2016-04-29 12:46:29.831988667 +0200
++++ dhcp-4.3.4/includes/dhcpd.h	2016-04-29 12:47:13.167995959 +0200
+@@ -2990,7 +2990,7 @@ void client_dns_remove(struct client_sta
  
  void dhcpv4_client_assignments(void);
  void dhcpv6_client_assignments(void);
@@ -157,11 +123,22 @@ index 2ac39ae..faa9251 100644
  
  void dhcp4o6_start(void);
  
-diff --git a/server/dhcpv6.c b/server/dhcpv6.c
-index a7110f9..c5ce7e8 100644
---- a/server/dhcpv6.c
-+++ b/server/dhcpv6.c
-@@ -482,6 +482,9 @@ generate_new_server_duid(void) {
+diff -up dhcp-4.3.4/includes/dhcp.h.PPP dhcp-4.3.4/includes/dhcp.h
+--- dhcp-4.3.4/includes/dhcp.h.PPP	2016-04-29 12:46:29.822988665 +0200
++++ dhcp-4.3.4/includes/dhcp.h	2016-04-29 12:46:29.832988667 +0200
+@@ -81,6 +81,8 @@ struct dhcp_packet {
+ 					 * is no standard for this so we
+ 					 * just steal a type            */
+ 
++#define HTYPE_RESERVED	0		/* RFC 5494 */
++
+ /* Magic cookie validating dhcp options field (and bootp vendor
+    extensions field). */
+ #define DHCP_OPTIONS_COOKIE	"\143\202\123\143"
+diff -up dhcp-4.3.4/server/dhcpv6.c.PPP dhcp-4.3.4/server/dhcpv6.c
+--- dhcp-4.3.4/server/dhcpv6.c.PPP	2016-03-22 14:16:51.000000000 +0100
++++ dhcp-4.3.4/server/dhcpv6.c	2016-04-29 12:46:29.833988667 +0200
+@@ -454,6 +454,9 @@ generate_new_server_duid(void) {
  		if (p->hw_address.hlen > 0) {
  			break;
  		}
@@ -171,6 +148,3 @@ index a7110f9..c5ce7e8 100644
  	}
  	if (p == NULL) {
  		return ISC_R_UNEXPECTED;
--- 
-2.14.5
-

SOURCES/dhcp-add_timeout_when_NULL.patch

@@ -0,0 +1,14 @@
+diff -up dhcp-4.3.0a1/common/dispatch.c.dracut dhcp-4.3.0a1/common/dispatch.c
+--- dhcp-4.3.0a1/common/dispatch.c.dracut	2013-12-11 01:25:12.000000000 +0100
++++ dhcp-4.3.0a1/common/dispatch.c	2013-12-19 15:39:50.350505860 +0100
+@@ -210,6 +210,10 @@ void add_timeout (when, where, what, ref
+ 	isc_interval_t interval;
+ 	isc_time_t expires;
+ 
++	if (when == NULL) {
++		return;
++	}
++
+ 	/* See if this timeout supersedes an existing timeout. */
+ 	t = (struct timeout *)0;
+ 	for (q = timeouts; q; q = q->next) {

SOURCES/dhcp-bind-9.11.patch

@@ -0,0 +1,85 @@
+From ffb24c0bbd4d6f2b4718a1a8f4f2da237cc6ed66 Mon Sep 17 00:00:00 2001
+From: Thomas Markwalder <tmark@isc.org>
+Date: Fri, 14 Sep 2018 13:41:41 -0400
+Subject: [PATCH] [master] Added includes of new BIND9 compatibility headers,
+ updated util/bind.sh
+
+    Merges in rt48072.
+
+(cherry picked from commit 8194daabfd590f17825f0c61e9534bee5c99cc86)
+---
+ includes/omapip/isclib.h |  3 +++
+ includes/omapip/result.h |  1 +
+ server/dhcpv6.c          | 13 +++++++++----
+ 3 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h
+index e2963089..fa5d9ad3 100644
+--- a/includes/omapip/isclib.h
++++ b/includes/omapip/isclib.h
+@@ -48,6 +48,9 @@
+ #include <string.h>
+ #include <netdb.h>
+ 
++#include <isc/boolean.h>
++#include <isc/int.h>
++
+ #include <isc/buffer.h>
+ #include <isc/lex.h>
+ #include <isc/lib.h>
+diff --git a/includes/omapip/result.h b/includes/omapip/result.h
+index ae5f7d6a..9c1fab23 100644
+--- a/includes/omapip/result.h
++++ b/includes/omapip/result.h
+@@ -26,6 +26,7 @@
+ #ifndef DHCP_RESULT_H
+ #define DHCP_RESULT_H 1
+ 
++#include <isc/boolean.h>
+ #include <isc/lang.h>
+ #include <isc/resultclass.h>
+ #include <isc/types.h>
+diff --git a/server/dhcpv6.c b/server/dhcpv6.c
+index 74487667..1a6ff241 100644
+--- a/server/dhcpv6.c
++++ b/server/dhcpv6.c
+@@ -1003,7 +1003,8 @@ void check_pool6_threshold(struct reply_state *reply,
+ 				  shared_name,
+ 				  inet_ntop(AF_INET6, &lease->addr,
+ 					    tmp_addr, sizeof(tmp_addr)),
+-				  used, count);
++				  (long long unsigned)(used),
++				  (long long unsigned)(count));
+ 		}
+ 		return;
+ 	}
+@@ -1035,7 +1036,8 @@ void check_pool6_threshold(struct reply_state *reply,
+ 		  "address: %s; high threshold %d%% %llu/%llu.",
+ 		  shared_name,
+ 		  inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)),
+-		  poolhigh, used, count);
++		  poolhigh, (long long unsigned)(used),
++		  (long long unsigned)(count));
+ 
+ 	/* handle the low threshold now, if we don't
+ 	 * have one we default to 0. */
+@@ -1383,12 +1385,15 @@ pick_v6_address(struct reply_state *reply)
+ 		log_debug("Unable to pick client address: "
+ 			  "no addresses available  - shared network %s: "
+ 			  " 2^64-1 < total, %llu active,  %llu abandoned",
+-			  shared_name, active - abandoned, abandoned);
++			  shared_name, (long long unsigned)(active - abandoned),
++			  (long long unsigned)(abandoned));
+ 	} else {
+ 		log_debug("Unable to pick client address: "
+ 			  "no addresses available  - shared network %s: "
+ 			  "%llu total, %llu active,  %llu abandoned",
+-			  shared_name, total, active - abandoned, abandoned);
++			  shared_name, (long long unsigned)(total),
++			  (long long unsigned)(active - abandoned),
++		          (long long unsigned)(abandoned));
+ 	}
+ 
+ 	return ISC_R_NORESOURCES;
+-- 
+2.14.5

SOURCES/dhcp-capability.patch

@@ -1,38 +1,21 @@
-From 3b37f4b7bb3a17f8bd655be919915a1912062ea6 Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:30:28 +0100
-Subject: [PATCH 11/26] Drop unnecessary capabilities
-Cc: pzhukov@redhat.com
-
-dhclient (#517649, #546765), dhcpd/dhcrelay (#699713)
----
- client/Makefile.am       |  3 ++-
- client/dhclient-script.8 | 10 ++++++++++
- client/dhclient.8        | 29 +++++++++++++++++++++++++++++
- client/dhclient.c        | 24 ++++++++++++++++++++++++
- configure.ac             | 35 +++++++++++++++++++++++++++++++++++
- relay/Makefile.am        |  3 ++-
- relay/dhcrelay.c         | 29 +++++++++++++++++++++++++++++
- 7 files changed, 131 insertions(+), 2 deletions(-)
-
 diff --git a/client/Makefile.am b/client/Makefile.am
-index d177159..0689185 100644
+index b1ecf82..387c097 100644
 --- a/client/Makefile.am
 +++ b/client/Makefile.am
-@@ -17,6 +17,7 @@ dhclient_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
- 		 @BINDLIBIRSDIR@/libirs.@A@ \
- 		 @BINDLIBDNSDIR@/libdns.@A@ \
- 		 @BINDLIBISCCFGDIR@/libisccfg.@A@ \
--		 @BINDLIBISCDIR@/libisc.@A@
-+		 @BINDLIBISCDIR@/libisc.@A@ \
-+		 $(CAPNG_LDADD)
+@@ -15,6 +15,7 @@ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
+ 		   scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
+ 		   scripts/netbsd scripts/nextstep scripts/openbsd \
+ 		   scripts/solaris scripts/openwrt
+-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la $(BIND_LIBS)
++dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
++		 $(CAPNG_LDADD) $(BIND_LIBS)
  man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
  EXTRA_DIST = $(man_MANS)
 diff --git a/client/dhclient-script.8 b/client/dhclient-script.8
-index 0db5516..2eddb8f 100644
+index 3a3aaf7..fec726c 100644
 --- a/client/dhclient-script.8
 +++ b/client/dhclient-script.8
-@@ -243,6 +243,16 @@ repeatedly initialized to the values provided by one server, and then
+@@ -245,6 +245,16 @@ repeatedly initialized to the values provided by one server, and then
  the other.   Assuming the information provided by both servers is
  valid, this shouldn't cause any real problems, but it could be
  confusing.
@@ -50,7 +33,7 @@ index 0db5516..2eddb8f 100644
  dhclient(8), dhcpd(8), dhcrelay(8), dhclient.conf(5) and
  dhclient.leases(5).
 diff --git a/client/dhclient.8 b/client/dhclient.8
-index 6d7fbdb..0145b9f 100644
+index aa2238d..005cda5 100644
 --- a/client/dhclient.8
 +++ b/client/dhclient.8
 @@ -134,6 +134,9 @@ dhclient - Dynamic Host Configuration Protocol Client
@@ -63,7 +46,7 @@ index 6d7fbdb..0145b9f 100644
  .B -B
  ]
  [
-@@ -328,6 +331,32 @@ not to exit when it doesn't find any such interfaces.  The
+@@ -320,6 +323,32 @@ not to exit when it doesn't find any such interfaces.  The
  program can then be used to notify the client when a network interface
  has been added or removed, so that the client can attempt to configure an IP
  address on that interface.
@@ -97,12 +80,12 @@ index 6d7fbdb..0145b9f 100644
  .BI \-n
  Do not configure any interfaces.  This is most likely to be useful in
 diff --git a/client/dhclient.c b/client/dhclient.c
-index a86ab9e..5d3f5bc 100644
+index 09ae09b..2d564ff 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -41,6 +41,10 @@
- #include <sys/wait.h>
- #include <limits.h>
+@@ -40,6 +40,10 @@
+ #include <isc/file.h>
+ #include <dns/result.h>
  
 +#ifdef HAVE_LIBCAP_NG
 +#include <cap-ng.h>
@@ -111,7 +94,7 @@ index a86ab9e..5d3f5bc 100644
  /*
   * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
   * that when building ISC code.
-@@ -266,6 +270,9 @@ main(int argc, char **argv) {
+@@ -239,6 +243,9 @@ main(int argc, char **argv) {
  	int timeout_arg = 0;
  	char *arg_conf = NULL;
  	int arg_conf_len = 0;
@@ -121,18 +104,18 @@ index a86ab9e..5d3f5bc 100644
  
  	/* Initialize client globals. */
  	memset(&default_duid, 0, sizeof(default_duid));
-@@ -665,6 +672,10 @@ main(int argc, char **argv) {
+@@ -548,6 +555,10 @@ main(int argc, char **argv) {
+ 			}
  
  			dhclient_request_options = argv[i];
- 
 +		} else if (!strcmp(argv[i], "-nc")) {
 +#ifdef HAVE_LIBCAP_NG
-+                  keep_capabilities = 1;
++			keep_capabilities = 1;
 +#endif
  		} else if (argv[i][0] == '-') {
  			usage("Unknown command: %s", argv[i]);
  		} else if (interfaces_requested < 0) {
-@@ -725,6 +736,19 @@ main(int argc, char **argv) {
+@@ -608,6 +619,19 @@ main(int argc, char **argv) {
  		path_dhclient_script = s;
  	}
  
@@ -153,10 +136,10 @@ index a86ab9e..5d3f5bc 100644
  	initialize_common_option_spaces();
  
 diff --git a/configure.ac b/configure.ac
-index a797438..15fc0d7 100644
+index adc98a8..8bbe5ca 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -612,6 +612,41 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void foo() __attribute__((noreturn));
+@@ -592,6 +592,41 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void foo() __attribute__((noreturn));
  # Look for optional headers.
  AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
  
@@ -199,21 +182,20 @@ index a797438..15fc0d7 100644
  AC_SEARCH_LIBS(socket, [socket])
  AC_SEARCH_LIBS(inet_ntoa, [nsl])
 diff --git a/relay/Makefile.am b/relay/Makefile.am
-index 2ba5979..8900e0b 100644
+index 316a524..999e543 100644
 --- a/relay/Makefile.am
 +++ b/relay/Makefile.am
-@@ -6,7 +6,8 @@ dhcrelay_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
- 		 @BINDLIBIRSDIR@/libirs.@A@ \
- 		 @BINDLIBDNSDIR@/libdns.@A@ \
- 		 @BINDLIBISCCFGDIR@/libisccfg.@A@ \
--		 @BINDLIBISCDIR@/libisc.@A@
-+		 @BINDLIBISCDIR@/libisc.@A@ \
-+		 $(CAPNG_LDADD)
+@@ -5,7 +5,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
+ sbin_PROGRAMS = dhcrelay
+ dhcrelay_SOURCES = dhcrelay.c
+ dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
+-		 $(BIND_LIBS)
++		 $(CAPNG_LDADD) $(BIND_LIBS)
  man_MANS = dhcrelay.8
  EXTRA_DIST = $(man_MANS)
  
 diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
-index ea1be18..7b4f4f1 100644
+index eac119c..d2ab448 100644
 --- a/relay/dhcrelay.c
 +++ b/relay/dhcrelay.c
 @@ -32,6 +32,11 @@
@@ -228,7 +210,7 @@ index ea1be18..7b4f4f1 100644
  TIME default_lease_time = 43200; /* 12 hours... */
  TIME max_lease_time = 86400; /* 24 hours... */
  struct tree_cache *global_options[256];
-@@ -590,6 +595,10 @@ main(int argc, char **argv) {
+@@ -472,6 +477,10 @@ main(int argc, char **argv) {
  			if (++i == argc)
  				usage(use_noarg, argv[i-1]);
  			dhcrelay_sub_id = argv[i];
@@ -239,7 +221,7 @@ index ea1be18..7b4f4f1 100644
  #endif
  		} else if (!strcmp(argv[i], "-pf")) {
  			if (++i == argc)
-@@ -660,6 +669,17 @@ main(int argc, char **argv) {
+@@ -547,6 +556,17 @@ main(int argc, char **argv) {
  #endif
  	}
  
@@ -257,7 +239,7 @@ index ea1be18..7b4f4f1 100644
  	if (!quiet) {
  		log_info("%s %s", message, PACKAGE_VERSION);
  		log_info(copyright);
-@@ -816,6 +836,15 @@ main(int argc, char **argv) {
+@@ -699,6 +719,15 @@ main(int argc, char **argv) {
  	signal(SIGTERM, dhcp_signal_handler);  /* kill */
  #endif
  
@@ -273,6 +255,3 @@ index ea1be18..7b4f4f1 100644
  	/* Start dispatching packets and timeouts... */
  	dispatch();
  
--- 
-2.14.5
-

SOURCES/dhcp-client-request-release-bind-iface.patch

@@ -1,20 +1,7 @@
-From 193c4d7631fd623efa601f52fdab6018bf8be771 Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:39:36 +0100
-Subject: [PATCH 17/26] Send unicast request/release via correct interface
-Cc: pzhukov@redhat.com
-
-(#800561, #1177351)
-(Submitted to dhcp-bugs@isc.org - [ISC-Bugs #30544])
----
- client/dhclient.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
-diff --git a/client/dhclient.c b/client/dhclient.c
-index ccc98e4..27fde69 100644
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -3171,6 +3171,14 @@ void send_request (cpp)
+diff -up dhcp-4.3.4/client/dhclient.c.bind-iface dhcp-4.3.4/client/dhclient.c
+--- dhcp-4.3.4/client/dhclient.c.bind-iface	2016-04-29 13:06:50.595257108 +0200
++++ dhcp-4.3.4/client/dhclient.c	2016-04-29 13:08:30.237281528 +0200
+@@ -3023,6 +3023,14 @@ void send_request (cpp)
  #endif
  	if (destination.sin_addr.s_addr != INADDR_BROADCAST &&
  	    fallback_interface) {
@@ -29,7 +16,7 @@ index ccc98e4..27fde69 100644
  		result = send_packet(fallback_interface, NULL, &client->packet,
  				     client->packet_length, from, &destination,
  				     NULL);
-@@ -3180,6 +3188,13 @@ void send_request (cpp)
+@@ -3032,6 +3040,13 @@ void send_request (cpp)
  				  client->packet_length,
  				  fallback_interface->name);
  		}
@@ -43,7 +30,7 @@ index ccc98e4..27fde69 100644
          }
  	else {
  		/* Send out a packet. */
-@@ -3297,6 +3312,14 @@ void send_release (cpp)
+@@ -3144,6 +3159,14 @@ void send_release (cpp)
  	} else
  #endif
  	if (fallback_interface) {
@@ -58,7 +45,7 @@ index ccc98e4..27fde69 100644
  		result = send_packet(fallback_interface, NULL, &client->packet,
  				      client->packet_length, from, &destination,
  				      NULL);
-@@ -3306,6 +3329,13 @@ void send_release (cpp)
+@@ -3153,6 +3176,13 @@ void send_release (cpp)
  				  client->packet_length,
  				  fallback_interface->name);
  		}
@@ -72,6 +59,3 @@ index ccc98e4..27fde69 100644
          } else {
  		/* Send out a packet. */
  		result = send_packet(client->interface, NULL, &client->packet,
--- 
-2.14.5
-

SOURCES/dhcp-default-requested-options.patch

@@ -1,19 +1,6 @@
-From a2a3554ff9e05d1a8e2c8aa843f1b6a33fce87e3 Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:24:24 +0100
-Subject: [PATCH 05/26] Change default requested options
-Cc: pzhukov@redhat.com
-
-Add NIS domain, NIS servers, NTP servers, interface-mtu and domain-search
-to the list of default requested DHCP options
----
- client/clparse.c | 27 ++++++++++++++++++++++++++-
- 1 file changed, 26 insertions(+), 1 deletion(-)
-
-diff --git a/client/clparse.c b/client/clparse.c
-index 7212e3a..39b95a0 100644
---- a/client/clparse.c
-+++ b/client/clparse.c
+diff -up dhcp-4.3.4/client/clparse.c.requested dhcp-4.3.4/client/clparse.c
+--- dhcp-4.3.4/client/clparse.c.requested	2016-04-29 12:18:50.157151352 +0200
++++ dhcp-4.3.4/client/clparse.c	2016-04-29 12:19:22.235137243 +0200
 @@ -31,7 +31,7 @@
  
  struct client_config top_level_config;
@@ -55,6 +42,3 @@ index 7212e3a..39b95a0 100644
  	for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
  		if (default_requested_options[code] == NULL)
  			log_fatal("Unable to find option definition for "
--- 
-2.14.5
-

SOURCES/dhcp-dhclient-decline-backoff.patch

@@ -0,0 +1,63 @@
+diff -up dhcp-4.3.4/client/dhclient.c.backoff dhcp-4.3.4/client/dhclient.c
+--- dhcp-4.3.4/client/dhclient.c.backoff	2016-04-29 12:16:26.976245611 +0200
++++ dhcp-4.3.4/client/dhclient.c	2016-04-29 12:16:26.979245609 +0200
+@@ -1423,6 +1423,8 @@ void state_init (cpp)
+ 	void *cpp;
+ {
+ 	struct client_state *client = cpp;
++	enum dhcp_state init_state = client->state;
++	struct timeval tv;
+ 
+ 	ASSERT_STATE(state, S_INIT);
+ 
+@@ -1435,9 +1437,18 @@ void state_init (cpp)
+ 	client -> first_sending = cur_time;
+ 	client -> interval = client -> config -> initial_interval;
+ 
+-	/* Add an immediate timeout to cause the first DHCPDISCOVER packet
+-	   to go out. */
+-	send_discover (client);
++	if (init_state != S_DECLINED) {
++		/* Add an immediate timeout to cause the first DHCPDISCOVER packet
++		   to go out. */
++		send_discover(client);
++	} else {
++		/* We've received an OFFER and it has been DECLINEd by dhclient-script.
++		 * wait for a random time between 1 and backoff_cutoff seconds before
++		 * trying again. */
++		tv . tv_sec = cur_time + ((1 + (random() >> 2)) %  client->config->backoff_cutoff);
++		tv . tv_usec = 0;
++		add_timeout(&tv, send_discover, client, 0, 0);
++	}
+ }
+ 
+ /*
+@@ -1734,5 +1745,6 @@ void bind_lease (client)
+#endif
+ 			exit(2);
+ 		} else {
++			client -> state = S_DECLINED;
+ 			state_init(client);
+ 			return;
+ 		}
+@@ -4626,6 +4638,7 @@ void client_location_changed ()
+ 			      case S_INIT:
+ 			      case S_REBINDING:
+ 			      case S_STOPPED:
++			      case S_DECLINED:
+ 				break;
+ 			}
+ 			client -> state = S_INIT;
+diff -up dhcp-4.3.4/includes/dhcpd.h.backoff dhcp-4.3.4/includes/dhcpd.h
+--- dhcp-4.3.4/includes/dhcpd.h.backoff	2016-04-29 12:16:26.980245609 +0200
++++ dhcp-4.3.4/includes/dhcpd.h	2016-04-29 12:17:30.893203533 +0200
+@@ -1171,7 +1171,8 @@ enum dhcp_state {
+ 	S_BOUND = 5,
+ 	S_RENEWING = 6,
+ 	S_REBINDING = 7,
+-	S_STOPPED = 8
++	S_STOPPED = 8,
++	S_DECLINED = 9
+ };
+ 
+ /* Possible pending client operations. */

SOURCES/dhcp-dhclient-options.patch

@@ -1,20 +1,5 @@
-From a26161b0fd45cdbeed3038ac63ff04e3b727248f Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:19:47 +0100
-Subject: [PATCH 02/26] additional dhclient options
-Cc: pzhukov@redhat.com
-
----
- client/clparse.c    |  10 +-
- client/dhclient.8   |  27 ++++++
- client/dhclient.c   | 271 +++++++++++++++++++++++++++++++++++++++++++++++++++-
- common/conflex.c    |   2 +
- includes/dhcpd.h    |   3 +
- includes/dhctoken.h |   1 +
- 6 files changed, 308 insertions(+), 6 deletions(-)
-
 diff --git a/client/clparse.c b/client/clparse.c
-index eaf48a8..7212e3a 100644
+index 03190c3..2033427 100644
 --- a/client/clparse.c
 +++ b/client/clparse.c
 @@ -189,6 +189,7 @@ isc_result_t read_client_conf ()
@@ -49,7 +34,7 @@ index eaf48a8..7212e3a 100644
  	      default:
  		lose = 0;
 diff --git a/client/dhclient.8 b/client/dhclient.8
-index ebc750f..6d7fbdb 100644
+index 24f8f12..aa2238d 100644
 --- a/client/dhclient.8
 +++ b/client/dhclient.8
 @@ -134,6 +134,33 @@ dhclient - Dynamic Host Configuration Protocol Client
@@ -87,12 +72,12 @@ index ebc750f..6d7fbdb 100644
  .I seconds
  ]
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 825ab00..26a333c 100644
+index dcf3f1a..270a960 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -41,6 +41,12 @@
- #include <sys/wait.h>
- #include <limits.h>
+@@ -40,6 +40,12 @@
+ #include <isc/file.h>
+ #include <dns/result.h>
  
 +/*
 + * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
@@ -103,7 +88,7 @@ index 825ab00..26a333c 100644
  TIME default_lease_time = 43200; /* 12 hours... */
  TIME max_lease_time = 86400; /* 24 hours... */
  
-@@ -110,6 +116,10 @@ char *mockup_relay = NULL;
+@@ -101,6 +107,10 @@ char *mockup_relay = NULL;
  
  char *progname = NULL;
  
@@ -114,27 +99,25 @@ index 825ab00..26a333c 100644
  void run_stateless(int exit_mode, u_int16_t port);
  
  static isc_result_t write_duid(struct data_string *duid);
-@@ -183,8 +193,12 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s";
- "                [-s server-addr] [-cf config-file]\n" \
- "                [-df duid-file] [-lf lease-file]\n" \
- "                [-pf pid-file] [--no-pid] [-e VAR=val]\n" \
--"                [-sf script-file] [interface]*"
--
-+"                [-sf script-file] [interface]*\n" \
-+"                [-C <dhcp-client-identifier>] [-B]\n" \
-+"                [-H <host-name> | -F <fqdn.fqdn>] [--timeout <timeout>]\n" \
-+"                [-V <vendor-class-identifier>]\n" \
-+"                [--request-options <request option list>]"
-+  
- #define DHCLIENT_USAGEH "{--version|--help|-h}"
+@@ -179,7 +189,11 @@ usage(const char *sfmt, const char *sarg)
+ 		  "                [-s server-addr] [-cf config-file]\n"
+ 		  "                [-df duid-file] [-lf lease-file]\n"
+ 		  "                [-pf pid-file] [--no-pid] [-e VAR=val]\n"
+-		  "                [-sf script-file] [interface]*",
++		  "                [-sf script-file] [interface]*\n"
++		  "                [-C <dhcp-client-identifier>] [-B]\n"
++		  "                [-H <host-name> | -F <fqdn.fqdn>] [--timeout <timeout>]\n"
++		  "                [-V <vendor-class-identifier>]\n"
++		  "                [--request-options <request option list>]",
+ 		  isc_file_basename(progname));
+ }
  
- static void
-@@ -243,6 +257,16 @@ main(int argc, char **argv) {
- #else
+@@ -216,6 +230,16 @@ main(int argc, char **argv) {
  	progname = argv[0];
  #endif
-+        char *dhcp_client_identifier_arg = NULL;
-+        char *dhcp_host_name_arg = NULL;
+ 
++	char *dhcp_client_identifier_arg = NULL;
++	char *dhcp_host_name_arg = NULL;
 +	char *dhcp_fqdn_arg = NULL;
 +	char *dhcp_vendor_class_identifier_arg = NULL;
 +	char *dhclient_request_options = NULL;
@@ -146,10 +129,10 @@ index 825ab00..26a333c 100644
  	/* Initialize client globals. */
  	memset(&default_duid, 0, sizeof(default_duid));
  
-@@ -558,6 +582,89 @@ main(int argc, char **argv) {
- 			std_dhcid = 1;
- 		} else if (!strcmp(argv[i], "-v")) {
- 			quiet = 0;
+@@ -442,6 +466,88 @@ main(int argc, char **argv) {
+ 					 strlen(PACKAGE_VERSION)));
+ 			IGNORE_RET(write(STDERR_FILENO, "\n", 1));
+ 			exit(0);
 +		} else if (!strcmp(argv[i], "-C")) {
 +			if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
 +				usage(use_noarg, argv[i-1]);
@@ -232,11 +215,10 @@ index 825ab00..26a333c 100644
 +			}
 +
 +			dhclient_request_options = argv[i];
-+
  		} else if (argv[i][0] == '-') {
  			usage("Unknown command: %s", argv[i]);
  		} else if (interfaces_requested < 0) {
-@@ -754,6 +861,156 @@ main(int argc, char **argv) {
+@@ -641,6 +747,156 @@ main(int argc, char **argv) {
  	/* Parse the dhclient.conf file. */
  	read_client_conf();
  
@@ -393,7 +375,7 @@ index 825ab00..26a333c 100644
  	/* Parse the lease database. */
  	read_client_leases();
  
-@@ -3226,7 +3483,8 @@ void make_discover (client, lease)
+@@ -3092,7 +3348,8 @@ void make_discover (client, lease)
  	client -> packet.xid = random ();
  	client -> packet.secs = 0; /* filled in by send_discover. */
  
@@ -403,7 +385,7 @@ index 825ab00..26a333c 100644
  		client -> packet.flags = 0;
  	else
  		client -> packet.flags = htons (BOOTP_BROADCAST);
-@@ -3311,7 +3569,9 @@ void make_request (client, lease)
+@@ -3177,7 +3434,9 @@ void make_request (client, lease)
  	} else {
  		memset (&client -> packet.ciaddr, 0,
  			sizeof client -> packet.ciaddr);
@@ -414,7 +396,7 @@ index 825ab00..26a333c 100644
  			client -> packet.flags = 0;
  		else
  			client -> packet.flags = htons (BOOTP_BROADCAST);
-@@ -3374,7 +3634,8 @@ void make_decline (client, lease)
+@@ -3240,7 +3499,8 @@ void make_decline (client, lease)
  	client -> packet.hops = 0;
  	client -> packet.xid = client -> xid;
  	client -> packet.secs = 0; /* Filled in by send_request. */
@@ -425,7 +407,7 @@ index 825ab00..26a333c 100644
  	else
  		client -> packet.flags = htons (BOOTP_BROADCAST);
 diff --git a/common/conflex.c b/common/conflex.c
-index 045b655..71c0bf5 100644
+index fe994ac..bdb4a52 100644
 --- a/common/conflex.c
 +++ b/common/conflex.c
 @@ -832,6 +832,8 @@ intern(char *atom, enum dhcp_token dfv) {
@@ -438,10 +420,10 @@ index 045b655..71c0bf5 100644
  	      case 'c':
  		if (!strcasecmp(atom + 1, "ase"))
 diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index 5930e6a..018fa34 100644
+index eab09a6..cfdac23 100644
 --- a/includes/dhcpd.h
 +++ b/includes/dhcpd.h
-@@ -1269,6 +1269,9 @@ struct client_config {
+@@ -1251,6 +1251,9 @@ struct client_config {
  
  	int lease_id_format;		/* format for IDs in lease file,
  					   TOKEN_OCTAL or TOKEN_HEX */
@@ -452,17 +434,16 @@ index 5930e6a..018fa34 100644
  
  /* Per-interface state used in the dhcp client... */
 diff --git a/includes/dhctoken.h b/includes/dhctoken.h
-index 5920f4f..7e7215a 100644
+index 15bbd1c..b312e7a 100644
 --- a/includes/dhctoken.h
 +++ b/includes/dhctoken.h
-@@ -377,6 +377,7 @@ enum dhcp_token {
+@@ -373,7 +373,8 @@ enum dhcp_token {
+ 	TOKEN_BIG_ENDIAN = 675,
+ 	LEASE_ID_FORMAT = 676,
  	TOKEN_HEX = 677,
- 	TOKEN_OCTAL = 678,
- 	KEY_ALGORITHM = 679
-+        BOOTP_BROADCAST_ALWAYS = 680
+-	TOKEN_OCTAL = 678
++	TOKEN_OCTAL = 678,
++	BOOTP_BROADCAST_ALWAYS = 679
  };
  
  #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\
--- 
-2.14.5
-

SOURCES/dhcp-dhclient-preinit6s.patch

@@ -1,20 +1,7 @@
-From 9975d198a2c02e32c31c3e0f43d2aa79dfa7f508 Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 28 Feb 2019 15:30:21 +0100
-Subject: [PATCH 22/26] dhclient: make sure link-local address is ready in
- stateless mode
-Cc: pzhukov@redhat.com
-
-Bug-url: https://bugzilla.redhat.com/1263466
----
- client/dhclient.c | 30 ++++++++++++++++++++----------
- 1 file changed, 20 insertions(+), 10 deletions(-)
-
-diff --git a/client/dhclient.c b/client/dhclient.c
-index 4e5546a..9b65438 100644
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -937,6 +937,12 @@ main(int argc, char **argv) {
+diff -up dhcp-4.3.4/client/dhclient.c.preinit6s dhcp-4.3.4/client/dhclient.c
+--- dhcp-4.3.4/client/dhclient.c.preinit6s	2016-04-29 13:15:10.361379493 +0200
++++ dhcp-4.3.4/client/dhclient.c	2016-04-29 13:17:43.622415423 +0200
+@@ -812,6 +812,12 @@ main(int argc, char **argv) {
  
  	inaddr_any.s_addr = INADDR_ANY;
  
@@ -27,8 +14,8 @@ index 4e5546a..9b65438 100644
  	/* Stateless special case. */
  	if (stateless) {
  		if (release_mode || (wanted_ia_na > 0) ||
-@@ -953,12 +959,6 @@ main(int argc, char **argv) {
- 		finish(0);
+@@ -828,12 +834,6 @@ main(int argc, char **argv) {
+ 		return 0;
  	}
  
 -	/* Discover all the network interfaces. */
@@ -40,7 +27,7 @@ index 4e5546a..9b65438 100644
  	/* Parse any extra command line configuration arguments: */
  	if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) {
  		arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg);
-@@ -1413,20 +1413,30 @@ void run_stateless(int exit_mode, u_int16_t port)
+@@ -1288,20 +1288,30 @@ void run_stateless(int exit_mode, u_int1
  	IGNORE_UNUSED(port);
  #endif
  
@@ -75,6 +62,3 @@ index 4e5546a..9b65438 100644
  
  	/* Parse the lease database. */
  	read_client_leases();
--- 
-2.14.5
-

SOURCES/dhcp-dhclient_ipv6_prefix.patch

@@ -0,0 +1,94 @@
+diff --git a/client/dhc6.c b/client/dhc6.c
+index 5460ee1..fe0057c 100644
+--- a/client/dhc6.c
++++ b/client/dhc6.c
+@@ -148,6 +148,7 @@ static int dhc6_score_lease(struct client_state *client,
+ 
+ extern int onetry;
+ extern int stateless;
++extern int address_prefix_len;
+ 
+ /*
+  * Assign DHCPv6 port numbers as a client.
+@@ -4364,7 +4365,7 @@ dhc6_marshall_values(const char *prefix, struct client_state *client,
+ 				      (unsigned) addr->plen);
+ 		} else {
+ 			client_envadd(client, prefix, "ip6_prefixlen",
+-				      "%d", DHCLIENT_DEFAULT_PREFIX_LEN);
++				      "%d", address_prefix_len);
+ 			client_envadd(client, prefix, "ip6_address",
+ 				      "%s", piaddr(addr->address));
+ 		}
+diff --git a/client/dhclient.c b/client/dhclient.c
+index b61da43..05bfc7e 100644
+--- a/client/dhclient.c
++++ b/client/dhclient.c
+@@ -114,6 +114,7 @@ char *progname = NULL;
+ 
+ int bootp_broadcast_always = 0;
+ 
++int address_prefix_len = DHCLIENT_DEFAULT_PREFIX_LEN;
+ extern struct option *default_requested_options[];
+ 
+ void run_stateless(int exit_mode, u_int16_t port);
+@@ -192,6 +193,7 @@ usage(const char *sfmt, const char *sarg)
+ #endif
+ #else /* DHCPv6 */
+ 		  "[-I1dvrxi] [-nw] [-p <port>] [-D LL|LLT] \n"
++                   "                [--address-prefix-len length]\n"
+ #endif /* DHCPv6 */
+ 		  "                [-s server-addr] [-cf config-file]\n"
+ 		  "                [-df duid-file] [-lf lease-file]\n"
+@@ -392,6 +394,17 @@ main(int argc, char **argv) {
+ 			tmp->next = client_env;
+ 			client_env = tmp;
+ 			client_env_count++;
++		} else if (!strcmp(argv[i], "--address-prefix-len")) {
++			if (++i == argc) {
++				usage(use_noarg, argv[i-1]);
++			}
++			errno = 0;
++			address_prefix_len = (int)strtol(argv[i], &s, 10);
++			if (errno || (*s != '\0') ||
++			    (address_prefix_len < 0)) {
++ 		                usage("Invalid value for"       
++				      " --address-prefix-len: %s", argv[i]);
++                       }
+ #ifdef DHCPv6
+ 		} else if (!strcmp(argv[i], "-S")) {
+ 			if (local_family_set && (local_family == AF_INET)) {
+diff --git a/includes/site.h b/includes/site.h
+index b2f7fd7..aad9711 100644
+--- a/includes/site.h
++++ b/includes/site.h
+@@ -286,7 +286,7 @@
+    is a host address and doesn't include any on-link information.
+    64 indicates that the first 64 bits are the subnet or on-link
+    prefix. */
+-#define DHCLIENT_DEFAULT_PREFIX_LEN 64
++#define DHCLIENT_DEFAULT_PREFIX_LEN 128
+ 
+ /* Enable the gentle shutdown signal handling.  Currently this
+    means that on SIGINT or SIGTERM a client will release its
+diff --git a/client/dhclient.c b/client/dhclient.c
+index 2f29591..6c8b145 100644
+diff --git a/client/dhclient.c b/client/dhclient.c
+index b0bf2bf..f7b1476 100644
+--- a/client/dhclient.c
++++ b/client/dhclient.c
+@@ -193,7 +193,6 @@ usage(const char *sfmt, const char *sarg)
+ #endif
+ #else /* DHCPv6 */
+ 		  "[-I1dvrxi] [-nw] [-p <port>] [-D LL|LLT] \n"
+-                   "                [--address-prefix-len length]\n"
+ #endif /* DHCPv6 */
+ 		  "                [-s server-addr] [-cf config-file]\n"
+ 		  "                [-df duid-file] [-lf lease-file]\n"
+@@ -202,6 +201,7 @@ usage(const char *sfmt, const char *sarg)
+ 		  "                [-C <dhcp-client-identifier>] [-B]\n"
+ 		  "                [-H <host-name> | -F <fqdn.fqdn>] [--timeout <timeout>]\n"
+ 		  "                [-V <vendor-class-identifier>]\n"
++		  "                [--address-prefix-len length]\n"
+ 		  "                [--request-options <request option list>]",
+ 		  isc_file_basename(progname));
+ }

SOURCES/dhcp-dhcp6-vendor-opts.patch

@@ -0,0 +1,12 @@
+diff --git a/common/options.c b/common/options.c
+index 3e6383a..9216ae4 100644
+--- a/common/options.c
++++ b/common/options.c
+@@ -1122,7 +1122,6 @@ store_options6(char *buf, int buflen,
+ 		 */
+ 		if (code == vsio_option_code) {
+ 			vsio_wanted = 1;
+-			continue;
+ 		}
+ 
+ 		/*

SOURCES/dhcp-duid_uuid.patch

@@ -1,19 +1,7 @@
-From 2f6b827e89305adcff45288c632785ac054adb8e Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:36:30 +0100
-Subject: [PATCH 16/26] Turn on creating/sending of DUID
-Cc: pzhukov@redhat.com
-
-as client identifier with DHCPv4 clients (#560361c#40, rfc4361)
----
- client/dhclient.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 70 insertions(+), 4 deletions(-)
-
-diff --git a/client/dhclient.c b/client/dhclient.c
-index 8e57da9..ccc98e4 100644
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -4021,6 +4021,59 @@ write_options(struct client_state *client, struct option_state *options,
+diff -up dhcp-4.3.4/client/dhclient.c.duid_uuid dhcp-4.3.4/client/dhclient.c
+--- dhcp-4.3.4/client/dhclient.c.duid_uuid	2016-04-29 12:58:14.846150838 +0200
++++ dhcp-4.3.4/client/dhclient.c	2016-04-29 12:58:14.851150839 +0200
+@@ -3868,6 +3868,59 @@ write_options(struct client_state *clien
  	}
  }
  
@@ -73,7 +61,7 @@ index 8e57da9..ccc98e4 100644
  /*
   * The "best" default DUID, since we cannot predict any information
   * about the system (such as whether or not the hardware addresses are
-@@ -4041,6 +4094,7 @@ form_duid(struct data_string *duid, const char *file, int line)
+@@ -3888,6 +3941,7 @@ form_duid(struct data_string *duid, cons
  	struct interface_info *ip;
  	int len;
  	char *str;
@@ -81,7 +69,7 @@ index 8e57da9..ccc98e4 100644
  
  	/* For now, just use the first interface on the list. */
  	ip = interfaces;
-@@ -4061,9 +4115,16 @@ form_duid(struct data_string *duid, const char *file, int line)
+@@ -3908,9 +3962,16 @@ form_duid(struct data_string *duid, cons
  	    (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf)))
  		log_fatal("Impossible hardware address length at %s:%d.", MDL);
  
@@ -101,7 +89,7 @@ index 8e57da9..ccc98e4 100644
  	/*
  	 * 2 bytes for the 'duid type' field.
  	 * 2 bytes for the 'htype' field.
-@@ -4074,13 +4135,18 @@ form_duid(struct data_string *duid, const char *file, int line)
+@@ -3921,13 +3982,18 @@ form_duid(struct data_string *duid, cons
  	len = 4 + (ip->hw_address.hlen - 1);
  	if (duid_type == DUID_LLT)
  		len += 4;
@@ -121,6 +109,3 @@ index 8e57da9..ccc98e4 100644
  		putUShort(duid->buffer->data, DUID_LLT);
  		putUShort(duid->buffer->data + 2, ip->hw_address.hbuf[0]);
  		putULong(duid->buffer->data + 4, cur_time - DUID_TIME_EPOCH);
--- 
-2.14.5
-

SOURCES/dhcp-duidv4.patch

@@ -0,0 +1,34 @@
+diff -up dhcp-4.3.1b1/client/dhclient.8.KrJcIv dhcp-4.3.1b1/client/dhclient.8
+--- dhcp-4.3.1b1/client/dhclient.8.KrJcIv	2014-07-10 17:39:25.852763873 +0200
++++ dhcp-4.3.1b1/client/dhclient.8	2014-07-10 17:54:26.841012988 +0200
+@@ -458,6 +458,9 @@ used to construct a RFC4361 style client
+ in the client's messages.  This client id can be overridden by
+ setting a client id in the configuration file.  Overridding the
+ client id in this fashion is discouraged.
++This option is turned on by default, if you want to redefine or turn off
++sending of client id, use send dhcp-client-identifier = "better identifier"
++or send dhcp-client-identifier = "" in /etc/dhcp/dhclient.conf.
+ .TP
+ .BI \-I
+ Use the standard DDNS scheme from RFCs 4701 & 4702.  
+diff -up dhcp-4.3.1b1/client/dhclient.c.KrJcIv dhcp-4.3.1b1/client/dhclient.c
+--- dhcp-4.3.1b1/client/dhclient.c.KrJcIv	2014-07-10 17:54:26.829013157 +0200
++++ dhcp-4.3.1b1/client/dhclient.c	2014-07-10 17:55:50.155835918 +0200
+@@ -73,7 +73,7 @@ struct sockaddr_in sockaddr_broadcast;
+ struct in_addr giaddr;
+ struct data_string default_duid;
+ int duid_type = 0;
+-int duid_v4 = 0;
++int duid_v4 = 1;
+ int std_dhcid = 0;
+ 
+ /* ASSERT_STATE() does nothing now; it used to be
+@@ -1301,7 +1301,7 @@ static void setup_ib_interface(struct in
+ 	}
+ 
+ 	/* No client ID specified */
+-	log_fatal("dhcp-client-identifier must be specified for InfiniBand");
++	//log_fatal("dhcp-client-identifier must be specified for InfiniBand");
+ }
+ 
+ /* Individual States:

SOURCES/dhcp-errwarn-message.patch

@@ -1,18 +1,7 @@
-From 23dfbc560028bf7429196db1a3826f8b80c19d3e Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:09:57 +0100
-Subject: [PATCH 01/26] change bug url
-Cc: pzhukov@redhat.com
-
----
- omapip/errwarn.c | 47 ++++++++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 42 insertions(+), 5 deletions(-)
-
-diff --git a/omapip/errwarn.c b/omapip/errwarn.c
-index e30f8a0..09a3004 100644
---- a/omapip/errwarn.c
-+++ b/omapip/errwarn.c
-@@ -48,6 +48,41 @@ void (*log_cleanup) (void);
+diff -up dhcp-4.3.5/omapip/errwarn.c.errwarn dhcp-4.3.5/omapip/errwarn.c
+--- dhcp-4.3.5/omapip/errwarn.c.errwarn	2016-09-27 21:16:50.000000000 +0200
++++ dhcp-4.3.5/omapip/errwarn.c	2016-11-29 19:44:03.515031147 +0100
+@@ -49,6 +49,41 @@ void (*log_cleanup) (void);
  static char mbuf [CVT_BUF_MAX + 1];
  static char fbuf [CVT_BUF_MAX + 1];
  
@@ -54,7 +43,7 @@ index e30f8a0..09a3004 100644
  /* Log an error message, then exit... */
  
  void log_fatal (const char * fmt, ... )
-@@ -74,11 +109,13 @@ void log_fatal (const char * fmt, ... )
+@@ -75,11 +110,13 @@ void log_fatal (const char * fmt, ... )
    }
  
    log_error ("%s", "");
@@ -73,6 +62,3 @@ index e30f8a0..09a3004 100644
    log_error ("%s", "");
    log_error ("exiting.");
  
--- 
-2.14.5
-

SOURCES/dhcp-garbage-chars.patch

@@ -0,0 +1,12 @@
+diff -up dhcp-4.3.0rc1/common/tables.c.garbage dhcp-4.3.0rc1/common/tables.c
+--- dhcp-4.3.0rc1/common/tables.c.garbage	2014-01-29 10:03:52.132624677 +0100
++++ dhcp-4.3.0rc1/common/tables.c	2014-01-29 10:04:51.413875343 +0100
+@@ -213,7 +213,7 @@ static struct option dhcp_options[] = {
+ 	{ "name-service-search", "Sa",		&dhcp_universe, 117, 1 },
+ #endif
+ 	{ "subnet-selection", "I",		&dhcp_universe, 118, 1 },
+-	{ "domain-search", "Dc",		&dhcp_universe, 119, 1 },
++	{ "domain-search", "D",			&dhcp_universe, 119, 1 },
+ 	{ "vivco", "Evendor-class.",		&dhcp_universe, 124, 1 },
+ 	{ "vivso", "Evendor.",			&dhcp_universe, 125, 1 },
+ #if 0

SOURCES/dhcp-handle_ctx_signals.patch

@@ -0,0 +1,44 @@
+diff --git a/omapip/isclib.c b/omapip/isclib.c
+index 9ec1a0f..42d82ff 100644
+--- a/omapip/isclib.c
++++ b/omapip/isclib.c
+@@ -185,16 +185,6 @@ dhcp_context_create(int flags,
+ 		if (result != ISC_R_SUCCESS)
+ 			goto cleanup;
+ 
+-		result = isc_app_ctxstart(dhcp_gbl_ctx.actx);
+-		if (result != ISC_R_SUCCESS)
+-			return (result);
+-		dhcp_gbl_ctx.actx_started = ISC_TRUE;
+-
+-		/* Not all OSs support suppressing SIGPIPE through socket
+-		 * options, so set the sigal action to be ignore.  This allows
+-		 * broken connections to fail gracefully with EPIPE on writes */
+-		handle_signal(SIGPIPE, SIG_IGN);
+-
+ 		result = isc_taskmgr_createinctx(dhcp_gbl_ctx.mctx,
+ 						 dhcp_gbl_ctx.actx,
+ 						 1, 0,
+@@ -217,6 +207,21 @@ dhcp_context_create(int flags,
+ 		result = isc_task_create(dhcp_gbl_ctx.taskmgr, 0, &dhcp_gbl_ctx.task);
+ 		if (result != ISC_R_SUCCESS)
+ 			goto cleanup;
++
++		result = isc_app_ctxstart(dhcp_gbl_ctx.actx);
++		if (result != ISC_R_SUCCESS)
++			return (result);
++		dhcp_gbl_ctx.actx_started = ISC_TRUE;
++
++		/* Not all OSs support suppressing SIGPIPE through socket
++		 * options, so set the sigal action to be ignore.  This allows
++		 * broken connections to fail gracefully with EPIPE on writes */
++		handle_signal(SIGPIPE, SIG_IGN);
++
++		/* Reset handlers installed by isc_app_ctxstart()
++		 * to default for control-c and kill */
++		handle_signal(SIGINT, SIG_DFL);
++		handle_signal(SIGTERM, SIG_DFL);
+ 	}
+ 
+ #if defined (NSUPDATE)
+

SOURCES/dhcp-honor-expired.patch

@@ -0,0 +1,49 @@
+diff -up dhcp-4.3.0a1/client/dhc6.c.honor-expired dhcp-4.3.0a1/client/dhc6.c
+--- dhcp-4.3.0a1/client/dhc6.c.honor-expired	2013-12-19 16:00:28.062183037 +0100
++++ dhcp-4.3.0a1/client/dhc6.c	2013-12-19 16:00:28.076182842 +0100
+@@ -1351,6 +1351,32 @@ start_info_request6(struct client_state
+ 		go_daemon();
+ }
+ 
++/* Run through the addresses in lease and return true if there's any unexpired.
++ * Return false otherwise.
++ */
++isc_boolean_t
++unexpired_address_in_lease(struct dhc6_lease *lease)
++{
++	struct dhc6_ia *ia;
++	struct dhc6_addr *addr;
++
++	for (ia = lease->bindings ; ia != NULL ; ia = ia->next) {
++		for (addr = ia->addrs ; addr != NULL ; addr = addr->next) {
++			if (addr->flags & DHC6_ADDR_EXPIRED)
++				continue;
++
++			if (addr->starts + addr->max_life > cur_time) {
++				return ISC_TRUE;
++			}
++		}
++	}
++
++	log_info("PRC: Previous lease is devoid of active addresses."
++		 "  Re-initializing.");
++
++	return ISC_FALSE;
++}
++
+ /*
+  * start_confirm6() kicks off an "init-reboot" version of the process, at
+  * startup to find out if old bindings are 'fair' and at runtime whenever
+@@ -1363,8 +1389,10 @@ start_confirm6(struct client_state *clie
+ 
+ 	/* If there is no active lease, there is nothing to check. */
+ 	if ((client->active_lease == NULL) ||
+-	    !active_prefix(client) ||
+-	    client->active_lease->released) {
++		!active_prefix(client) ||
++		client->active_lease->released ||
++		!unexpired_address_in_lease(client->active_lease)) {
++		dhc6_lease_destroy(&client->active_lease, MDL);
+ 		start_init6(client);
+ 		return;
+ 	}

SOURCES/dhcp-improved-xid.patch

@@ -0,0 +1,138 @@
+diff -up dhcp-4.3.4/client/dhclient.c.improved-xid dhcp-4.3.4/client/dhclient.c
+--- dhcp-4.3.4/client/dhclient.c.improved-xid	2016-04-29 12:54:55.997102182 +0200
++++ dhcp-4.3.4/client/dhclient.c	2016-04-29 12:57:25.123139587 +0200
+@@ -1045,6 +1045,26 @@ main(int argc, char **argv) {
+ 		}
+ 	}
+ 
++	/* We create a backup seed before rediscovering interfaces in order to
++	   have a seed built using all of the available interfaces
++	   It's interesting if required interfaces doesn't let us defined
++	   a really unique seed due to a lack of valid HW addr later
++	   (this is the case with DHCP over IB)
++	   We only use the last device as using a sum could broke the
++	   uniqueness of the seed among multiple nodes
++	 */
++	unsigned backup_seed = 0;
++	for (ip = interfaces; ip; ip = ip -> next) {
++		int junk;
++		if ( ip -> hw_address.hlen <= sizeof seed )
++		  continue;
++		memcpy (&junk,
++			&ip -> hw_address.hbuf [ip -> hw_address.hlen -
++						sizeof seed], sizeof seed);
++		backup_seed = junk;
++	}
++
++
+ 	/* At this point, all the interfaces that the script thinks
+ 	   are relevant should be running, so now we once again call
+ 	   discover_interfaces(), and this time ask it to actually set
+@@ -1059,14 +1079,36 @@ main(int argc, char **argv) {
+ 	   Not much entropy, but we're booting, so we're not likely to
+ 	   find anything better. */
+ 	seed = 0;
++	int seed_flag = 0;
+ 	for (ip = interfaces; ip; ip = ip->next) {
+ 		int junk;
++		if ( ip -> hw_address.hlen <= sizeof seed )
++		  continue;
+ 		memcpy(&junk,
+ 		       &ip->hw_address.hbuf[ip->hw_address.hlen -
+ 					    sizeof seed], sizeof seed);
+ 		seed += junk;
++		seed_flag = 1;
+ 	}
+-	srandom(seed + cur_time + (unsigned)getpid());
++	if ( seed_flag == 0 ) {
++		if ( backup_seed != 0 ) {
++		  seed = backup_seed;
++		  log_info ("xid: rand init seed (0x%x) built using all"
++			    " available interfaces",seed);
++		}
++		else {
++		  seed = cur_time^((unsigned) gethostid()) ;
++		  log_info ("xid: warning: no netdev with useable HWADDR found"
++			    " for seed's uniqueness enforcement");
++		  log_info ("xid: rand init seed (0x%x) built using gethostid",
++			    seed);
++		}
++		/* we only use seed and no current time as a broadcast reply */
++		/* will certainly be used by the hwaddrless interface */
++		srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid());
++	}
++	else
++	        srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid());
+ 
+ 	/* Setup specific Infiniband options */
+ 	for (ip = interfaces; ip; ip = ip->next) {
+@@ -1633,7 +1675,7 @@ void dhcpack (packet)
+ 		return;
+ 	}
+ 
+-	log_info ("DHCPACK from %s", piaddr (packet -> client_addr));
++	log_info ("DHCPACK from %s (xid=0x%x)", piaddr (packet -> client_addr), ntohl(client -> xid));
+ 
+ 	lease = packet_to_lease (packet, client);
+ 	if (!lease) {
+@@ -2541,7 +2583,7 @@ void dhcpnak (packet)
+ 		return;
+ 	}
+ 
+-	log_info ("DHCPNAK from %s", piaddr (packet -> client_addr));
++	log_info ("DHCPNAK from %s (xid=0x%x)", piaddr (packet -> client_addr), ntohl(client -> xid));
+ 
+ 	if (!client -> active) {
+ #if defined (DEBUG)
+@@ -2674,10 +2716,10 @@ void send_discover (cpp)
+ 			  (long)(client -> interval));
+ 	} else
+ #endif
+-	log_info ("DHCPDISCOVER on %s to %s port %d interval %ld",
++	log_info ("DHCPDISCOVER on %s to %s port %d interval %ld (xid=0x%x)",
+ 	      client -> name ? client -> name : client -> interface -> name,
+ 	      inet_ntoa (sockaddr_broadcast.sin_addr),
+-	      ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval));
++	      ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval), ntohl(client -> xid));
+ 
+ 	/* Send out a packet. */
+ #if defined(DHCPv6) && defined(DHCP4o6)
+@@ -2962,10 +3004,10 @@ void send_request (cpp)
+ 		log_info ("DHCPREQUEST");
+ 	} else
+ #endif
+-	log_info ("DHCPREQUEST on %s to %s port %d",
++	log_info ("DHCPREQUEST on %s to %s port %d (xid=0x%x)",
+ 	      client -> name ? client -> name : client -> interface -> name,
+ 	      inet_ntoa (destination.sin_addr),
+-	      ntohs (destination.sin_port));
++	      ntohs (destination.sin_port), ntohl(client -> xid));
+ 
+ #if defined(DHCPv6) && defined(DHCP4o6)
+ 	if (dhcpv4_over_dhcpv6) {
+@@ -3022,10 +3064,10 @@ void send_decline (cpp)
+ 		log_info ("DHCPDECLINE");
+ 	} else
+ #endif
+-	log_info ("DHCPDECLINE on %s to %s port %d",
++	log_info ("DHCPDECLINE on %s to %s port %d (xid=0x%x)",
+ 	      client->name ? client->name : client->interface->name,
+ 	      inet_ntoa(sockaddr_broadcast.sin_addr),
+-	      ntohs(sockaddr_broadcast.sin_port));
++	      ntohs(sockaddr_broadcast.sin_port), ntohl(client -> xid));
+ 
+ 	/* Send out a packet. */
+ #if defined(DHCPv6) && defined(DHCP4o6)
+@@ -3084,10 +3126,10 @@ void send_release (cpp)
+ 		log_info ("DHCPRELEASE");
+ 	} else
+ #endif
+-	log_info ("DHCPRELEASE on %s to %s port %d",
++	log_info ("DHCPRELEASE on %s to %s port %d (xid=0x%x)",
+ 	      client -> name ? client -> name : client -> interface -> name,
+ 	      inet_ntoa (destination.sin_addr),
+-	      ntohs (destination.sin_port));
++	      ntohs (destination.sin_port), ntohl(client -> xid));
+ 
+ #if defined(DHCPv6) && defined(DHCP4o6)
+ 	if (dhcpv4_over_dhcpv6) {

SOURCES/dhcp-isc_heap_delete.patch

@@ -0,0 +1,164 @@
+diff --git a/includes/dhcpd.h b/includes/dhcpd.h
+index aac2c108..c83dc9a6 100644
+--- a/includes/dhcpd.h
++++ b/includes/dhcpd.h
+@@ -1622,8 +1622,9 @@ struct iasubopt {
+  */
+ #define EXPIRED_IPV6_CLEANUP_TIME (60*60)
+ 
+-	int heap_index;				/* index into heap, or -1
+-						   (internal use only) */
++	/* index into heaps, or -1 (internal use only) */
++	int active_index;
++	int inactive_index;
+ 
+ 	/*
+ 	 * A pointer to the state of the ddns update for this lease.
+diff --git a/server/mdb6.c b/server/mdb6.c
+index 1a728eb3..418ff606 100644
+--- a/server/mdb6.c
++++ b/server/mdb6.c
+@@ -216,7 +216,8 @@ iasubopt_allocate(struct iasubopt **iasubopt, const char *file, int line) {
+ 
+ 	tmp->refcnt = 1;
+ 	tmp->state = FTS_FREE;
+-	tmp->heap_index = -1;
++	tmp->active_index = -1;
++	tmp->inactive_index = -1;
+ 	tmp->plen = 255;
+ 
+ 	*iasubopt = tmp;
+@@ -604,10 +605,14 @@ lease_older(void *a, void *b) {
+  * Callback when an address's position in the heap changes.
+  */
+ static void
+-lease_index_changed(void *iasubopt, unsigned int new_heap_index) {
+-	((struct iasubopt *)iasubopt)-> heap_index = new_heap_index;
++active_changed(void *iasubopt, unsigned int new_heap_index) {
++	((struct iasubopt *)iasubopt)-> active_index = new_heap_index;
+ }
+ 
++static void
++inactive_changed(void *iasubopt, unsigned int new_heap_index) {
++	((struct iasubopt *)iasubopt)-> inactive_index = new_heap_index;
++}
+ 
+ /*!
+  *
+@@ -660,13 +665,13 @@ ipv6_pool_allocate(struct ipv6_pool **pool, u_int16_t type,
+ 		dfree(tmp, file, line);
+ 		return ISC_R_NOMEMORY;
+ 	}
+-	if (isc_heap_create(dhcp_gbl_ctx.mctx, lease_older, lease_index_changed,
++	if (isc_heap_create(dhcp_gbl_ctx.mctx, lease_older, active_changed,
+ 			    0, &(tmp->active_timeouts)) != ISC_R_SUCCESS) {
+ 		iasubopt_free_hash_table(&(tmp->leases), file, line);
+ 		dfree(tmp, file, line);
+ 		return ISC_R_NOMEMORY;
+ 	}
+-	if (isc_heap_create(dhcp_gbl_ctx.mctx, lease_older, lease_index_changed,
++	if (isc_heap_create(dhcp_gbl_ctx.mctx, lease_older, inactive_changed,
+ 			    0, &(tmp->inactive_timeouts)) != ISC_R_SUCCESS) {
+ 		isc_heap_destroy(&(tmp->active_timeouts));
+ 		iasubopt_free_hash_table(&(tmp->leases), file, line);
+@@ -1361,7 +1366,7 @@ cleanup_lease6(ia_hash_t *ia_table,
+ 	 * Remove the old lease from the active heap and from the hash table
+ 	 * then remove the lease from the IA and clean up the IA if necessary.
+ 	 */
+-	isc_heap_delete(pool->active_timeouts, test_iasubopt->heap_index);
++	isc_heap_delete(pool->active_timeouts, test_iasubopt->active_index);
+ 	pool->num_active--;
+ 	if (pool->ipv6_pond)
+ 		pool->ipv6_pond->num_active--;
+@@ -1434,7 +1439,7 @@ add_lease6(struct ipv6_pool *pool, struct iasubopt *lease,
+ 		if ((test_iasubopt->state == FTS_ACTIVE) ||
+ 		    (test_iasubopt->state == FTS_ABANDONED)) {
+ 			isc_heap_delete(pool->active_timeouts,
+-					test_iasubopt->heap_index);
++					test_iasubopt->active_index);
+ 			pool->num_active--;
+ 			if (pool->ipv6_pond)
+ 				pool->ipv6_pond->num_active--;
+@@ -1446,7 +1451,7 @@ add_lease6(struct ipv6_pool *pool, struct iasubopt *lease,
+ 			}
+ 		} else {
+ 			isc_heap_delete(pool->inactive_timeouts,
+-					test_iasubopt->heap_index);
++					test_iasubopt->inactive_index);
+ 			pool->num_inactive--;
+ 		}
+ 
+@@ -1567,14 +1572,13 @@ lease6_usable(struct iasubopt *lease) {
+ static isc_result_t
+ move_lease_to_active(struct ipv6_pool *pool, struct iasubopt *lease) {
+ 	isc_result_t insert_result;
+-	int old_heap_index;
+ 
+-	old_heap_index = lease->heap_index;
+ 	insert_result = isc_heap_insert(pool->active_timeouts, lease);
+ 	if (insert_result == ISC_R_SUCCESS) {
+        		iasubopt_hash_add(pool->leases, &lease->addr, 
+ 				  sizeof(lease->addr), lease, MDL);
+-		isc_heap_delete(pool->inactive_timeouts, old_heap_index);
++		isc_heap_delete(pool->inactive_timeouts,
++				lease->inactive_index);
+ 		pool->num_active++;
+ 		pool->num_inactive--;
+ 		lease->state = FTS_ACTIVE;
+@@ -1624,16 +1628,16 @@ renew_lease6(struct ipv6_pool *pool, struct iasubopt *lease) {
+ 	if (lease->state == FTS_ACTIVE) {
+ 		if (old_end_time <= lease->hard_lifetime_end_time) {
+ 			isc_heap_decreased(pool->active_timeouts,
+-					   lease->heap_index);
++					   lease->active_index);
+ 		} else {
+ 			isc_heap_increased(pool->active_timeouts,
+-					   lease->heap_index);
++					   lease->active_index);
+ 		}
+ 		return ISC_R_SUCCESS;
+ 	} else if (lease->state == FTS_ABANDONED) {
+ 		char tmp_addr[INET6_ADDRSTRLEN];
+                 lease->state = FTS_ACTIVE;
+-                isc_heap_increased(pool->active_timeouts, lease->heap_index);
++                isc_heap_increased(pool->active_timeouts, lease->active_index);
+ 		log_info("Reclaiming previously abandoned address %s",
+ 			 inet_ntop(AF_INET6, &(lease->addr), tmp_addr,
+ 				   sizeof(tmp_addr)));
+@@ -1655,9 +1659,7 @@ static isc_result_t
+ move_lease_to_inactive(struct ipv6_pool *pool, struct iasubopt *lease, 
+ 		       binding_state_t state) {
+ 	isc_result_t insert_result;
+-	int old_heap_index;
+ 
+-	old_heap_index = lease->heap_index;
+ 	insert_result = isc_heap_insert(pool->inactive_timeouts, lease);
+ 	if (insert_result == ISC_R_SUCCESS) {
+ 		/*
+@@ -1708,7 +1710,7 @@ move_lease_to_inactive(struct ipv6_pool *pool, struct iasubopt *lease,
+ 
+ 		iasubopt_hash_delete(pool->leases, 
+ 				     &lease->addr, sizeof(lease->addr), MDL);
+-		isc_heap_delete(pool->active_timeouts, old_heap_index);
++		isc_heap_delete(pool->active_timeouts, lease->active_index);
+ 		lease->state = state;
+ 		pool->num_active--;
+ 		pool->num_inactive++;
+@@ -1786,7 +1788,7 @@ decline_lease6(struct ipv6_pool *pool, struct iasubopt *lease) {
+ 		pool->ipv6_pond->num_abandoned++;
+ 
+ 	lease->hard_lifetime_end_time = MAX_TIME;
+-	isc_heap_decreased(pool->active_timeouts, lease->heap_index);
++	isc_heap_decreased(pool->active_timeouts, lease->active_index);
+ 	return ISC_R_SUCCESS;
+ }
+ 
+@@ -2059,7 +2061,7 @@ cleanup_old_expired(struct ipv6_pool *pool) {
+ 			break;
+ 		}
+ 
+-		isc_heap_delete(pool->inactive_timeouts, tmp->heap_index);
++		isc_heap_delete(pool->inactive_timeouts, tmp->inactive_index);
+ 		pool->num_inactive--;
+ 
+ 		if (tmp->ia != NULL) {

SOURCES/dhcp-key_algorithm.patch

@@ -0,0 +1,200 @@
+From e6ffc27f24321017a5ad9af3707f4e2e54bbac74 Mon Sep 17 00:00:00 2001
+From: Thomas Markwalder <tmark@isc.org>
+Date: Mon, 11 Dec 2017 07:19:43 -0500
+Subject: [PATCH] [master] Adds key-algorithm statement to omshell
+
+    Merges in rt46771.
+---
+ RELNOTES            |  7 +++++++
+ common/conflex.c    |  2 ++
+ dhcpctl/omshell.1   | 32 ++++++++++++++++++++++++--------
+ dhcpctl/omshell.c   | 38 +++++++++++++++++++++++++++++++++++---
+ includes/dhctoken.h |  3 ++-
+ 5 files changed, 70 insertions(+), 12 deletions(-)
+
+diff --git a/common/conflex.c b/common/conflex.c
+index 8ce024af..045b655d 100644
+--- a/common/conflex.c
++++ b/common/conflex.c
+@@ -1104,6 +1104,8 @@ intern(char *atom, enum dhcp_token dfv) {
+ 		}
+ 		if (!strcasecmp (atom + 1, "ey"))
+ 			return KEY;
++		if (!strcasecmp (atom + 1, "ey-algorithm"))
++			return KEY_ALGORITHM;
+ 		break;
+ 	      case 'l':
+ 		if (!strcasecmp (atom + 1, "case"))
+diff --git a/dhcpctl/omshell.1 b/dhcpctl/omshell.1
+index 4846272a..2f55e965 100644
+--- a/dhcpctl/omshell.1
++++ b/dhcpctl/omshell.1
+@@ -1,7 +1,6 @@
+ .\"	$Id: omshell.1,v 1.6 2009/11/24 02:06:56 sar Exp $
+ .\"
+-.\" Copyright (c) 2012,2014 by Internet Systems Consortium, Inc. ("ISC")
+-.\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
++.\" Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ .\" Copyright (c) 2001-2003 by Internet Software Consortium
+ .\"
+ .\" Permission to use, copy, modify, and distribute this software for any
+@@ -81,7 +80,24 @@ where number is the port that OMAPI listens on.  By default, this is 7911.
+ This specifies the TSIG key to use to authenticate the OMAPI transactions.
+ \fIname\fR is the name of a key defined in \fIdhcpd.conf\fR with the
+ \fBomapi-key\fR statement.  The \fIsecret\fR is the secret key generated from
+-\fBdnssec-keygen\fR or another key generation program.
++\fBdnssec-keygen\fR or another key generation program.  The key algorithm is
++assumed to be HMAC-MD5 key. If a different algorithm was specified in dhcpd.conf
++file for the key, then it must be specified via the \fIkey-algorithm\fR statement.
++.RE
++.PP
++.B key-algorithm \fIalgorithm\fR
++.RS 0.5i
++This specifies the cryptographic algorithm for the key used when authenticating OMAPI
++transactions. Supported values for \fIalgorithm\fR are:
++.nf
++        HMAC-MD5
++        HMAC-SHA1
++        HMAC-SHA224
++        HMAC-SHA256
++        HMAC-SHA384
++        HMAC-SHA512
++fi
++The default is HMAC-MD5. (Value is not case sensitive).
+ .RE
+ .PP
+ .B connect
+@@ -253,7 +269,7 @@ name = "some-host"
+ hardware-address = 00:80:c7:84:b1:94
+ hardware-type = 00:00:00:01
+ ip-address = c0:a8:04:28
+-> 
++>
+ .fi
+ .PP
+ Your dhcpd.leases file would then have an entry like this in it:
+@@ -267,7 +283,7 @@ host some-host {
+ .fi
+ .PP
+ The \fIdynamic;\fR line is to denote that this host entry did not come from
+-dhcpd.conf, but was created dynamically via OMAPI.  
++dhcpd.conf, but was created dynamically via OMAPI.
+ .SH RESETTING ATTRIBUTES
+ .PP
+ If you want to remove an attribute from an object, you can do this with the
+@@ -288,7 +304,7 @@ name = "some-host"
+ hardware-address = 00:80:c7:84:b1:94
+ hardware-type = 00:00:00:01
+ ip-address = <null>
+-> 
++>
+ .fi
+ .SH REFRESHING OBJECTS
+ .PP
+@@ -300,7 +316,7 @@ particularly useful for hosts.
+ .PP
+ Any remote object that can be created can also be destroyed.  This is done by
+ creating a new local object, setting attributes, associating the local and
+-remote object using \fBopen\fR, and then using the \fBremove\fR command. 
++remote object using \fBopen\fR, and then using the \fBremove\fR command.
+ If the host "some-host" from before was created in error, this could be
+ corrected as follows:
+ .nf
+@@ -312,7 +328,7 @@ hardware-type = 00:00:00:01
+ ip-address = c0:a8:04:28
+ > remove
+ obj: <null>
+-> 
++>
+ .fi
+ .SH HELP
+ .PP
+diff --git a/dhcpctl/omshell.c b/dhcpctl/omshell.c
+index c42bab1a..9233f50e 100644
+--- a/dhcpctl/omshell.c
++++ b/dhcpctl/omshell.c
+@@ -321,12 +321,42 @@ main(int argc, char **argv) {
+ 		    }
+ 		    break;
+ 
++		  case KEY_ALGORITHM:
++		    /* Algorithm is optional */
++		    token = next_token (&val, (unsigned *)0, cfile);
++		    if (token != NAME || !is_identifier(token)) {
++			printf ("missing or invalid algorithm name\n");
++			printf ("usage: key-algoritm <algorithm name>\n");
++			skip_to_semi (cfile);
++			break;
++		    }
++
++		    s = dmalloc (strlen (val) + 1, MDL);
++		    if (!s) {
++			printf ("no memory for algorithm name.\n");
++			skip_to_semi (cfile);
++			break;
++		    }
++
++		    strcpy (s, val);
++		    algorithm = s;
++
++		    token = next_token (&val, (unsigned *)0, cfile);
++		    if (token != END_OF_FILE && token != EOL) {
++			    printf ("extra information after %s\n", algorithm);
++			    printf ("usage: key-algorithm <algorithm name>\n");
++			    skip_to_semi (cfile);
++			    break;
++		    }
++
++		    break;
++
+ 		  case KEY:
+ 		    token = peek_token(&val, (unsigned *)0, cfile);
+ 		    if (token == STRING) {
+ 			    token = next_token (&val, (unsigned *)0, cfile);
+ 			    if (!is_identifier (token)) {
+-				    printf ("usage: key <name> <value>\n");
++			            printf ("usage: key <name> <value>\n");
+ 				    skip_to_semi (cfile);
+ 				    break;
+ 			    }
+@@ -340,7 +370,7 @@ main(int argc, char **argv) {
+ 		    } else {
+ 			    s = parse_host_name(cfile);
+ 			    if (s == NULL) {
+-				    printf ("usage: key <name> <value>\n");
++			            printf ("usage: key <name> <value>\n");
+ 				    skip_to_semi(cfile);
+ 				    break;
+ 			    }
+@@ -352,12 +382,14 @@ main(int argc, char **argv) {
+ 			    skip_to_semi (cfile);
+ 			    break;
+ 		    }
++
+ 		    token = next_token (&val, (unsigned *)0, cfile);
+ 		    if (token != END_OF_FILE && token != EOL) {
+-			    printf ("usage: key <name> <secret>\n");
++			    printf ("usage: key <name> <value> {algorithm}\n");
+ 			    skip_to_semi (cfile);
+ 			    break;
+ 		    }
++
+ 		    break;
+ 
+ 		  case CONNECT:
+diff --git a/includes/dhctoken.h b/includes/dhctoken.h
+index 6fc4df3..ca24d4c 100644
+--- a/includes/dhctoken.h
++++ b/includes/dhctoken.h
+@@ -374,8 +374,9 @@ enum dhcp_token {
+ 	LEASE_ID_FORMAT = 676,
+ 	TOKEN_HEX = 677,
+ 	TOKEN_OCTAL = 678,
+-	BOOTP_BROADCAST_ALWAYS = 679,
+-	DESTINATION_DESCRIPTOR = 680
++	KEY_ALGORITHM = 679,
++	BOOTP_BROADCAST_ALWAYS = 680,
++	DESTINATION_DESCRIPTOR = 681
+ };
+ 
+ #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\

SOURCES/dhcp-lpf-ib.patch

@@ -1,33 +1,16 @@
-From 042082b4410f158ec86ca8478689b34bc12518e6 Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:34:21 +0100
-Subject: [PATCH 14/27] IPoIB support (#660681)
-Cc: pzhukov@redhat.com
-
-(Submitted to dhcp-bugs@isc.org - [ISC-Bugs #24249])
----
- client/dhclient.c |  32 ++++++
- common/bpf.c      |  32 ++++++
- common/discover.c |   4 +-
- common/lpf.c      | 276 ++++++++++++++++++++++++++++++++++++++++++----
- common/socket.c   |   8 +-
- includes/dhcpd.h  |   6 +-
- 6 files changed, 329 insertions(+), 29 deletions(-)
-
-diff --git a/client/dhclient.c b/client/dhclient.c
-index 301132c..dc9080e 100644
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -205,6 +205,8 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s";
-   
- #define DHCLIENT_USAGEH "{--version|--help|-h}"
+diff -up dhcp-4.3.4/client/dhclient.c.lpf-ib dhcp-4.3.4/client/dhclient.c
+--- dhcp-4.3.4/client/dhclient.c.lpf-ib	2016-05-02 14:37:36.945128001 +0200
++++ dhcp-4.3.4/client/dhclient.c	2016-05-02 14:37:36.952128005 +0200
+@@ -163,6 +163,8 @@ static const char use_noarg[] = "No argu
+ static const char use_v6command[] = "Command not used for DHCPv4: %s";
+ #endif
  
 +static void setup_ib_interface(struct interface_info *ip);
 +
  static void
  usage(const char *sfmt, const char *sarg)
  {
-@@ -1191,6 +1193,13 @@ main(int argc, char **argv) {
+@@ -1066,6 +1068,13 @@ main(int argc, char **argv) {
  	}
  	srandom(seed + cur_time + (unsigned)getpid());
  
@@ -41,7 +24,7 @@ index 301132c..dc9080e 100644
  
  	/*
  	 * Establish a default DUID.  We always do so for v6 and
-@@ -1486,6 +1495,29 @@ int find_subnet (struct subnet **sp,
+@@ -1361,6 +1370,29 @@ int find_subnet (struct subnet **sp,
  	return 0;
  }
  
@@ -71,13 +54,12 @@ index 301132c..dc9080e 100644
  /* Individual States:
   *
   * Each routine is called from the dhclient_state_machine() in one of
-diff --git a/common/bpf.c b/common/bpf.c
-index ffbd09a..568e3d9 100644
---- a/common/bpf.c
-+++ b/common/bpf.c
-@@ -237,11 +237,43 @@ int dhcp_bpf_relay_filter_len =
- 	sizeof dhcp_bpf_relay_filter / sizeof (struct bpf_insn);
- #endif
+diff -up dhcp-4.3.4/common/bpf.c.lpf-ib dhcp-4.3.4/common/bpf.c
+--- dhcp-4.3.4/common/bpf.c.lpf-ib	2016-05-02 14:37:36.946128001 +0200
++++ dhcp-4.3.4/common/bpf.c	2016-05-02 14:37:36.952128005 +0200
+@@ -198,11 +198,43 @@ struct bpf_insn dhcp_bpf_filter [] = {
+ 	BPF_STMT(BPF_RET+BPF_K, 0),
+ };
  
 +/* Packet filter program for DHCP over Infiniband.
 + *
@@ -119,11 +101,10 @@ index ffbd09a..568e3d9 100644
  #if defined (HAVE_TR_SUPPORT)
  struct bpf_insn dhcp_bpf_tr_filter [] = {
          /* accept all token ring packets due to variable length header */
-diff --git a/common/discover.c b/common/discover.c
-index 6ef8852..65881fc 100644
---- a/common/discover.c
-+++ b/common/discover.c
-@@ -894,7 +894,7 @@ discover_interfaces(int state) {
+diff -up dhcp-4.3.4/common/discover.c.lpf-ib dhcp-4.3.4/common/discover.c
+--- dhcp-4.3.4/common/discover.c.lpf-ib	2016-03-22 14:16:51.000000000 +0100
++++ dhcp-4.3.4/common/discover.c	2016-05-02 14:38:08.257147982 +0200
+@@ -1235,7 +1235,7 @@ discover_interfaces(int state) {
  				if_register_send(tmp);
  			} else {
  				/* get_hw_addr() was called by register. */
@@ -132,7 +113,7 @@ index 6ef8852..65881fc 100644
  			}
  			break;
  #ifdef DHCPv6
-@@ -907,7 +907,7 @@ discover_interfaces(int state) {
+@@ -1248,7 +1248,7 @@ discover_interfaces(int state) {
  				   so now we have to call it explicitly
  				   to not leave the hardware address unknown
  				   (some code expects it cannot be. */
@@ -141,11 +122,10 @@ index 6ef8852..65881fc 100644
  			} else {
  				if_register_linklocal6(tmp);
  			}
-diff --git a/common/lpf.c b/common/lpf.c
-index b0ed01c..a9e19f4 100644
---- a/common/lpf.c
-+++ b/common/lpf.c
-@@ -45,6 +45,17 @@
+diff -up dhcp-4.3.4/common/lpf.c.lpf-ib dhcp-4.3.4/common/lpf.c
+--- dhcp-4.3.4/common/lpf.c.lpf-ib	2016-05-02 14:37:36.947128002 +0200
++++ dhcp-4.3.4/common/lpf.c	2016-05-02 14:37:36.953128006 +0200
+@@ -47,6 +47,17 @@
  #include <sys/ioctl.h>
  #include <sys/socket.h>
  #include <net/if.h>
@@ -163,7 +143,7 @@ index b0ed01c..a9e19f4 100644
  #endif
  
  #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)
-@@ -78,10 +89,20 @@ int if_register_lpf (info)
+@@ -80,10 +91,20 @@ int if_register_lpf (info)
  		struct sockaddr common;
  		} sa;
  	struct ifreq ifr;
@@ -186,7 +166,7 @@ index b0ed01c..a9e19f4 100644
  		if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
  		    errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
  		    errno == EAFNOSUPPORT || errno == EINVAL) {
-@@ -104,6 +125,7 @@ int if_register_lpf (info)
+@@ -106,6 +127,7 @@ int if_register_lpf (info)
  	/* Bind to the interface name */
  	memset (&sa, 0, sizeof sa);
  	sa.ll.sll_family = AF_PACKET;
@@ -194,7 +174,7 @@ index b0ed01c..a9e19f4 100644
  	sa.ll.sll_ifindex = ifr.ifr_ifindex;
  	if (bind (sock, &sa.common, sizeof sa)) {
  		if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
-@@ -120,8 +142,6 @@ int if_register_lpf (info)
+@@ -122,8 +144,6 @@ int if_register_lpf (info)
  
  	}
  
@@ -203,16 +183,16 @@ index b0ed01c..a9e19f4 100644
  	return sock;
  }
  #endif /* USE_LPF_SEND || USE_LPF_RECEIVE */
-@@ -176,6 +196,8 @@ void if_deregister_send (info)
+@@ -178,6 +198,8 @@ void if_deregister_send (info)
     in bpf includes... */
  extern struct sock_filter dhcp_bpf_filter [];
  extern int dhcp_bpf_filter_len;
 +extern struct sock_filter dhcp_ib_bpf_filter [];
 +extern int dhcp_ib_bpf_filter_len;
  
- #if defined(RELAY_PORT)
- extern struct sock_filter dhcp_bpf_relay_filter [];
-@@ -199,11 +221,12 @@ void if_register_receive (info)
+ #if defined (HAVE_TR_SUPPORT)
+ extern struct sock_filter dhcp_bpf_tr_filter [];
+@@ -196,11 +218,12 @@ void if_register_receive (info)
  #ifdef PACKET_AUXDATA
  	{
  	int val = 1;
@@ -230,11 +210,21 @@ index b0ed01c..a9e19f4 100644
  		}
  	}
  	}
-@@ -253,6 +276,18 @@ static void lpf_gen_filter_setup (info)
+@@ -250,15 +273,28 @@ static void lpf_gen_filter_setup (info)
  
  	memset(&p, 0, sizeof(p));
  
+-	/* Set up the bpf filter program structure.    This is defined in
+-	   bpf.c */
+-	p.len = dhcp_bpf_filter_len;
+-	p.filter = dhcp_bpf_filter;
+-
+-        /* Patch the server port into the LPF  program...
+-	   XXX changes to filter program may require changes
+-	   to the insn number(s) used below! XXX */
+-	dhcp_bpf_filter [8].k = ntohs ((short)local_port);
 +	if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++		/* Set up the bpf filter program structure. */
 +		p.len = dhcp_ib_bpf_filter_len;
 +		p.filter = dhcp_ib_bpf_filter;
 +
@@ -243,22 +233,22 @@ index b0ed01c..a9e19f4 100644
 +		   changes to filter program may require changes
 +		   to the insn number(s) used below!
 +		   XXX */
-+		dhcp_ib_bpf_filter[6].k = ntohs (local_port);
++		dhcp_ib_bpf_filter[6].k = ntohs ((short)local_port);
 +	} else {
++		/* Set up the bpf filter program structure.
++		   This is defined in bpf.c */
++		p.len = dhcp_bpf_filter_len;
++		p.filter = dhcp_bpf_filter;
 +
- 	/* Set up the bpf filter program structure.    This is defined in
- 	   bpf.c */
- 	p.len = dhcp_bpf_filter_len;
-@@ -275,6 +310,8 @@ static void lpf_gen_filter_setup (info)
- #endif
- 	dhcp_bpf_filter [8].k = ntohs (local_port);
- 
++		/* Patch the server port into the LPF  program...
++		   XXX changes to filter program may require changes
++		   to the insn number(s) used below! XXX */
++		dhcp_bpf_filter [8].k = ntohs ((short)local_port);
 +	}
-+
+ 
  	if (setsockopt (info -> rfdesc, SOL_SOCKET, SO_ATTACH_FILTER, &p,
  			sizeof p) < 0) {
- 		if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
-@@ -330,6 +367,54 @@ static void lpf_tr_filter_setup (info)
+@@ -315,6 +351,54 @@ static void lpf_tr_filter_setup (info)
  #endif /* USE_LPF_RECEIVE */
  
  #ifdef USE_LPF_SEND
@@ -313,7 +303,7 @@ index b0ed01c..a9e19f4 100644
  ssize_t send_packet (interface, packet, raw, len, from, to, hto)
  	struct interface_info *interface;
  	struct packet *packet;
-@@ -350,6 +435,11 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
+@@ -335,6 +419,11 @@ ssize_t send_packet (interface, packet,
  		return send_fallback (interface, packet, raw,
  				      len, from, to, hto);
  
@@ -325,7 +315,7 @@ index b0ed01c..a9e19f4 100644
  	if (hto == NULL && interface->anycast_mac_addr.hlen)
  		hto = &interface->anycast_mac_addr;
  
-@@ -370,6 +460,42 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
+@@ -355,6 +444,42 @@ ssize_t send_packet (interface, packet,
  #endif /* USE_LPF_SEND */
  
  #ifdef USE_LPF_RECEIVE
@@ -368,7 +358,7 @@ index b0ed01c..a9e19f4 100644
  ssize_t receive_packet (interface, buf, len, from, hfrom)
  	struct interface_info *interface;
  	unsigned char *buf;
-@@ -408,6 +534,10 @@ ssize_t receive_packet (interface, buf, len, from, hfrom)
+@@ -393,6 +518,10 @@ ssize_t receive_packet (interface, buf,
  	};
  #endif /* PACKET_AUXDATA */
  
@@ -379,7 +369,7 @@ index b0ed01c..a9e19f4 100644
  	length = recvmsg (interface->rfdesc, &msg, 0);
  	if (length <= 0)
  		return length;
-@@ -521,11 +651,33 @@ void maybe_setup_fallback ()
+@@ -506,11 +635,33 @@ void maybe_setup_fallback ()
  #endif
  
  #if defined (USE_LPF_RECEIVE) || defined (USE_LPF_HWADDR)
@@ -416,7 +406,7 @@ index b0ed01c..a9e19f4 100644
  
  	if (strlen(name) >= sizeof(tmp.ifr_name)) {
  		log_fatal("Device name too long: \"%s\"", name);
-@@ -539,16 +691,61 @@ get_hw_addr(const char *name, struct hardware *hw) {
+@@ -524,16 +675,61 @@ get_hw_addr(const char *name, struct har
  	memset(&tmp, 0, sizeof(tmp));
  	strcpy(tmp.ifr_name, name);
  	if (ioctl(sock, SIOCGIFHWADDR, &tmp) < 0) {
@@ -481,7 +471,7 @@ index b0ed01c..a9e19f4 100644
  			break;
  		case ARPHRD_IEEE802:
  #ifdef ARPHRD_IEEE802_TR
-@@ -556,18 +753,50 @@ get_hw_addr(const char *name, struct hardware *hw) {
+@@ -541,18 +737,50 @@ get_hw_addr(const char *name, struct har
  #endif /* ARPHRD_IEEE802_TR */
  			hw->hlen = 7;
  			hw->hbuf[0] = HTYPE_IEEE802;
@@ -536,7 +526,7 @@ index b0ed01c..a9e19f4 100644
  			hw->hlen = 0;
  			hw->hbuf[0] = HTYPE_RESERVED;
  			/* 0xdeadbeef should never occur on the wire,
-@@ -580,10 +809,13 @@ get_hw_addr(const char *name, struct hardware *hw) {
+@@ -565,10 +793,13 @@ get_hw_addr(const char *name, struct har
  			break;
  #endif
  		default:
@@ -553,11 +543,10 @@ index b0ed01c..a9e19f4 100644
 +	freeifaddrs(ifaddrs);
  }
  #endif
-diff --git a/common/socket.c b/common/socket.c
-index 483eb9c..6e1caac 100644
---- a/common/socket.c
-+++ b/common/socket.c
-@@ -350,7 +350,7 @@ void if_register_send (info)
+diff -up dhcp-4.3.4/common/socket.c.lpf-ib dhcp-4.3.4/common/socket.c
+--- dhcp-4.3.4/common/socket.c.lpf-ib	2016-03-22 14:16:51.000000000 +0100
++++ dhcp-4.3.4/common/socket.c	2016-05-02 14:37:36.953128006 +0200
+@@ -328,7 +328,7 @@ void if_register_send (info)
  	info->wfdesc = if_register_socket(info, AF_INET, 0, NULL);
  	/* If this is a normal IPv4 address, get the hardware address. */
  	if (strcmp(info->name, "fallback") != 0)
@@ -566,7 +555,7 @@ index 483eb9c..6e1caac 100644
  #if defined (USE_SOCKET_FALLBACK)
  	/* Fallback only registers for send, but may need to receive as
  	   well. */
-@@ -413,7 +413,7 @@ void if_register_receive (info)
+@@ -391,7 +391,7 @@ void if_register_receive (info)
  #endif /* IP_PKTINFO... */
  	/* If this is a normal IPv4 address, get the hardware address. */
  	if (strcmp(info->name, "fallback") != 0)
@@ -575,7 +564,7 @@ index 483eb9c..6e1caac 100644
  
  	if (!quiet_interface_discovery)
  		log_info ("Listening on Socket/%s%s%s",
-@@ -567,7 +567,7 @@ if_register6(struct interface_info *info, int do_multicast) {
+@@ -505,7 +505,7 @@ if_register6(struct interface_info *info
  	if (req_multi)
  		if_register_multicast(info);
  
@@ -584,7 +573,7 @@ index 483eb9c..6e1caac 100644
  
  	if (!quiet_interface_discovery) {
  		if (info->shared_network != NULL) {
-@@ -623,7 +623,7 @@ if_register_linklocal6(struct interface_info *info) {
+@@ -561,7 +561,7 @@ if_register_linklocal6(struct interface_
  	info->rfdesc = sock;
  	info->wfdesc = sock;
  
@@ -593,11 +582,10 @@ index 483eb9c..6e1caac 100644
  
  	if (!quiet_interface_discovery) {
  		if (info->shared_network != NULL) {
-diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index faa9251..0c1a0aa 100644
---- a/includes/dhcpd.h
-+++ b/includes/dhcpd.h
-@@ -485,6 +485,9 @@ struct packet {
+diff -up dhcp-4.3.4/includes/dhcpd.h.lpf-ib dhcp-4.3.4/includes/dhcpd.h
+--- dhcp-4.3.4/includes/dhcpd.h.lpf-ib	2016-05-02 14:37:36.948128002 +0200
++++ dhcp-4.3.4/includes/dhcpd.h	2016-05-02 14:37:36.954128006 +0200
+@@ -482,6 +482,9 @@ struct packet {
  
  #define HARDWARE_ADDR_LEN 20
  
@@ -607,7 +595,7 @@ index faa9251..0c1a0aa 100644
  struct hardware {
  	u_int8_t hlen;
  	u_int8_t hbuf[HARDWARE_ADDR_LEN + 1];
-@@ -1365,6 +1368,7 @@ struct interface_info {
+@@ -1343,6 +1346,7 @@ struct interface_info {
  	struct shared_network *shared_network;
  				/* Networks connected to this interface. */
  	struct hardware hw_address;	/* Its physical address. */
@@ -615,7 +603,7 @@ index faa9251..0c1a0aa 100644
  	struct in_addr *addresses;	/* Addresses associated with this
  					 * interface.
  					 */
-@@ -2633,7 +2637,7 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t);
+@@ -2580,7 +2584,7 @@ void print_dns_status (int, struct dhcp_
  #endif
  const char *print_time(TIME);
  
@@ -624,6 +612,3 @@ index faa9251..0c1a0aa 100644
  char *buf_to_hex (const unsigned char *s, unsigned len,
                     const char *file, int line);
  char *format_lease_id(const unsigned char *s, unsigned len, int format,
--- 
-2.26.2
-

SOURCES/dhcp-manpages.patch

@@ -1,21 +1,38 @@
-From 846779467f7393b19e8d206405116e1e26e16efc Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:25:53 +0100
-Subject: [PATCH 06/26] Various man-page-only fixes
-Cc: pzhukov@redhat.com
-
----
- client/dhclient-script.8 | 22 +++++++++++++++++++++-
- client/dhclient.conf.5   | 14 +++++++++++++-
- common/dhcp-options.5    | 15 +++++++++++++++
- server/dhcpd.conf.5      | 14 +++++++++-----
- 4 files changed, 58 insertions(+), 7 deletions(-)
-
-diff --git a/client/dhclient-script.8 b/client/dhclient-script.8
-index 3553afd..0db5516 100644
---- a/client/dhclient-script.8
-+++ b/client/dhclient-script.8
-@@ -43,7 +43,7 @@ customizations are needed, they should be possible using the enter and
+diff -up dhcp-4.3.5b1/client/dhclient.conf.5.man dhcp-4.3.5b1/client/dhclient.conf.5
+--- dhcp-4.3.5b1/client/dhclient.conf.5.man	2016-08-26 20:19:53.000000000 +0200
++++ dhcp-4.3.5b1/client/dhclient.conf.5	2016-09-12 17:09:23.243313514 +0200
+@@ -228,7 +228,8 @@ responding to the client send the client
+ options.  Only the option names should be specified in the request
+ statement - not option parameters.  By default, the DHCPv4 client
+ requests the subnet-mask, broadcast-address, time-offset, routers,
+-domain-name, domain-name-servers and host-name options while the DHCPv6
++domain-search, domain-name, domain-name-servers, host-name, nis-domain,
++nis-servers, ntp-servers and interface-mtu options while the DHCPv6
+ client requests the dhcp6 name-servers and domain-search options.  Note
+ that if you enter a \'request\' statement, you over-ride these defaults
+ and these options will not be requested.
+@@ -736,6 +737,17 @@ know the DHCP service(s) anycast MAC add
+ client.  The \fIlink-type\fR and \fImac-address\fR parameters are configured
+ in a similar manner to the \fBhardware\fR statement.
+ .PP
++ \fBbootp-broadcast-always;\fR
++.PP
++The
++.B bootp-broadcast-always
++statement instructs dhclient to always set the bootp broadcast flag in
++request packets, so that servers will always broadcast replies.
++This is equivalent to supplying the dhclient -B argument, and has
++the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
++This option is provided as an extension to enable dhclient to work
++on IBM s390 Linux guests.
++.PP
+ .SH SAMPLE
+ The following configuration file was used on a laptop running NetBSD
+ 1.3, though the domains have been modified.
+diff -up dhcp-4.3.5b1/client/dhclient-script.8.man dhcp-4.3.5b1/client/dhclient-script.8
+--- dhcp-4.3.5b1/client/dhclient-script.8.man	2016-08-26 20:19:53.000000000 +0200
++++ dhcp-4.3.5b1/client/dhclient-script.8	2016-09-12 17:08:09.516254385 +0200
+@@ -45,7 +45,7 @@ customizations are needed, they should b
  exit hooks provided (see HOOKS for details).   These hooks will allow the
  user to override the default behaviour of the client in creating a
  .B /etc/resolv.conf
@@ -24,7 +41,7 @@ index 3553afd..0db5516 100644
  .PP
  No standard client script exists for some operating systems, even though
  the actual client may work, so a pioneering user may well need to create
-@@ -87,6 +87,26 @@ present.   The
+@@ -89,6 +89,26 @@ present.   The
  .B ETCDIR/dhclient-exit-hooks
  script can modify the valid of exit_status to change the exit status
  of dhclient-script.
@@ -51,43 +68,10 @@ index 3553afd..0db5516 100644
  .SH OPERATION
  When dhclient needs to invoke the client configuration script, it
  defines a set of variables in the environment, and then invokes
-diff --git a/client/dhclient.conf.5 b/client/dhclient.conf.5
-index fa3b908..566a881 100644
---- a/client/dhclient.conf.5
-+++ b/client/dhclient.conf.5
-@@ -228,7 +228,8 @@ responding to the client send the client its values for the specified
- options.  Only the option names should be specified in the request
- statement - not option parameters.  By default, the DHCPv4 client
- requests the subnet-mask, broadcast-address, time-offset, routers,
--domain-name, domain-name-servers and host-name options while the DHCPv6
-+domain-search, domain-name, domain-name-servers, host-name, nis-domain,
-+nis-servers, ntp-servers and interface-mtu options while the DHCPv6
- client requests the dhcp6 name-servers and domain-search options.  Note
- that if you enter a \'request\' statement, you over-ride these defaults
- and these options will not be requested.
-@@ -735,6 +736,17 @@ broadcast packets transmitted by DHCP clients, but is only useful if you
- know the DHCP service(s) anycast MAC address prior to configuring your
- client.  The \fIlink-type\fR and \fImac-address\fR parameters are configured
- in a similar manner to the \fBhardware\fR statement.
-+.PP
-+ \fBbootp-broadcast-always;\fR
-+.PP
-+The
-+.B bootp-broadcast-always
-+statement instructs dhclient to always set the bootp broadcast flag in
-+request packets, so that servers will always broadcast replies.
-+This is equivalent to supplying the dhclient -B argument, and has
-+the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
-+This option is provided as an extension to enable dhclient to work
-+on IBM s390 Linux guests.
- .PP
- .SH SAMPLE
- The following configuration file was used on a laptop running NetBSD
-diff --git a/common/dhcp-options.5 b/common/dhcp-options.5
-index 33d4804..d9e1197 100644
---- a/common/dhcp-options.5
-+++ b/common/dhcp-options.5
-@@ -1068,6 +1068,21 @@ classless IP routing - it does not include a subnet mask.  Since
+diff -up dhcp-4.3.5b1/common/dhcp-options.5.man dhcp-4.3.5b1/common/dhcp-options.5
+--- dhcp-4.3.5b1/common/dhcp-options.5.man	2016-08-26 20:19:53.000000000 +0200
++++ dhcp-4.3.5b1/common/dhcp-options.5	2016-09-12 17:08:09.517254386 +0200
+@@ -1013,6 +1013,21 @@ classless IP routing - it does not inclu
  classless IP routing is now the most widely deployed routing standard,
  this option is virtually useless, and is not implemented by any of the
  popular DHCP clients, for example the Microsoft DHCP client.
@@ -109,11 +93,10 @@ index 33d4804..d9e1197 100644
  .RE
  .PP
  .nf
-diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
-index 17330d4..89b5540 100644
---- a/server/dhcpd.conf.5
-+++ b/server/dhcpd.conf.5
-@@ -527,6 +527,9 @@ pool {
+diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.man dhcp-4.3.5b1/server/dhcpd.conf.5
+--- dhcp-4.3.5b1/server/dhcpd.conf.5.man	2016-08-26 20:19:53.000000000 +0200
++++ dhcp-4.3.5b1/server/dhcpd.conf.5	2016-09-12 17:10:11.205351980 +0200
+@@ -528,6 +528,9 @@ pool {
  };
  .fi
  .PP
@@ -123,7 +106,7 @@ index 17330d4..89b5540 100644
  The  server currently  does very  little  sanity checking,  so if  you
  configure it wrong, it will just  fail in odd ways.  I would recommend
  therefore that you either do  failover or don't do failover, but don't
-@@ -541,9 +544,9 @@ primary server might look like this:
+@@ -542,9 +545,9 @@ primary server might look like this:
  failover peer "foo" {
    primary;
    address anthrax.rc.example.com;
@@ -135,7 +118,7 @@ index 17330d4..89b5540 100644
    max-response-delay 60;
    max-unacked-updates 10;
    mclt 3600;
-@@ -1323,7 +1326,7 @@ the zone containing PTR records - for ISC BIND, something like this:
+@@ -1246,7 +1249,7 @@ the zone containing PTR records - for IS
  .PP
  .nf
  key DHCP_UPDATER {
@@ -144,7 +127,7 @@ index 17330d4..89b5540 100644
    secret pRP5FapFoJ95JEL06sv4PQ==;
  };
  
-@@ -1346,7 +1349,7 @@ dhcpd.conf file:
+@@ -1269,7 +1272,7 @@ dhcpd.conf file:
  .PP
  .nf
  key DHCP_UPDATER {
@@ -153,7 +136,7 @@ index 17330d4..89b5540 100644
    secret pRP5FapFoJ95JEL06sv4PQ==;
  };
  
-@@ -2912,7 +2915,8 @@ statement
+@@ -2742,7 +2745,8 @@ statement
  The \fInext-server\fR statement is used to specify the host address of
  the server from which the initial boot file (specified in the
  \fIfilename\fR statement) is to be loaded.  \fIServer-name\fR should
@@ -163,6 +146,3 @@ index 17330d4..89b5540 100644
  .RE
  .PP
  The
--- 
-2.14.5
-

SOURCES/dhcp-no-subnet-error2info.patch

@@ -1,19 +1,7 @@
-From 2277d041692b8ebdf6b86d41e3a0bc0381cd1e47 Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:40:51 +0100
-Subject: [PATCH 18/26] No subnet declaration for <iface>' should be info, not
- error.
-Cc: pzhukov@redhat.com
-
----
- common/discover.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/common/discover.c b/common/discover.c
-index 65881fc..056342c 100644
---- a/common/discover.c
-+++ b/common/discover.c
-@@ -801,9 +801,9 @@ discover_interfaces(int state) {
+diff -up dhcp-4.3.0a1/common/discover.c.error2info dhcp-4.3.0a1/common/discover.c
+--- dhcp-4.3.0a1/common/discover.c.error2info	2013-12-20 13:59:15.148553898 +0100
++++ dhcp-4.3.0a1/common/discover.c	2013-12-20 13:59:15.181553438 +0100
+@@ -779,9 +779,9 @@ discover_interfaces(int state) {
  
  		/* We must have a subnet declaration for each interface. */
  		if (!tmp->shared_network && (state == DISCOVER_SERVER)) {
@@ -25,7 +13,7 @@ index 65881fc..056342c 100644
  					  tmp->name, 
  					  (tmp->addresses == NULL) ?
  					   "no IPv4 addresses" :
-@@ -818,26 +818,26 @@ discover_interfaces(int state) {
+@@ -796,26 +796,26 @@ discover_interfaces(int state) {
  				} else {
  					strcpy(abuf, "no IPv6 addresses");
  				}
@@ -58,6 +46,3 @@ index 65881fc..056342c 100644
  				goto next;
  			} else {
  				log_error ("You must write a %s",
--- 
-2.14.5
-

SOURCES/dhcp-omshell-hmac-sha512-support.patch

@@ -1,8 +1,8 @@
 diff --git a/omapip/connection.c b/omapip/connection.c
-index 014ff21..6800514 100644
+index a74becc..56826a5 100644
 --- a/omapip/connection.c
 +++ b/omapip/connection.c
-@@ -44,6 +44,9 @@ extern omapi_array_t *trace_listeners;
+@@ -46,6 +46,9 @@ extern omapi_array_t *trace_listeners;
  #endif
  static isc_result_t omapi_connection_connect_internal (omapi_object_t *);
  
@@ -12,7 +12,7 @@ index 014ff21..6800514 100644
  OMAPI_OBJECT_ALLOC (omapi_connection,
  		    omapi_connection_object_t, omapi_type_connection)
  
-@@ -763,64 +766,41 @@ isc_result_t omapi_connection_reaper (omapi_object_t *h)
+@@ -765,64 +768,41 @@ isc_result_t omapi_connection_reaper (omapi_object_t *h)
  }
  
  static isc_result_t make_dst_key (dst_key_t **dst_key, omapi_object_t *a) {
@@ -102,7 +102,7 @@ index 014ff21..6800514 100644
  
  	return status;
  }
-@@ -1103,3 +1083,50 @@ isc_result_t omapi_connection_stuff_values (omapi_object_t *c,
+@@ -1105,3 +1085,50 @@ isc_result_t omapi_connection_stuff_values (omapi_object_t *c,
  								m -> inner);
  	return ISC_R_SUCCESS;
  }

SOURCES/dhcp-option97-pxe-client-id.patch

@@ -1,27 +1,7 @@
-From 6fd7894ea57791c8eee16c21d19da34b909e016e Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 28 Feb 2019 16:40:38 +0100
-Subject: [PATCH 23/26] option 97 - pxe-client-id
-Cc: pzhukov@redhat.com
-
-Bug-url: https://bugzilla.redhat.com/1058674
-ISC-Bugs #38110
----
- common/options.c        | 27 ++++++++++++++++++++-------
- common/tables.c         |  3 ++-
- includes/dhcp.h         |  1 +
- server/dhcp.c           | 19 +++++++++++++++++++
- server/dhcpd.conf.5     |  9 ++++++---
- server/dhcpleasequery.c | 18 +++++++++++++++---
- server/failover.c       |  3 +++
- server/mdb.c            |  5 +++--
- 8 files changed, 69 insertions(+), 16 deletions(-)
-
-diff --git a/common/options.c b/common/options.c
-index 3034cf0..686dd12 100644
---- a/common/options.c
-+++ b/common/options.c
-@@ -4465,13 +4465,26 @@ int validate_packet(struct packet *packet)
+diff -up dhcp-4.3.5b1/common/options.c.option97 dhcp-4.3.5b1/common/options.c
+--- dhcp-4.3.5b1/common/options.c.option97	2016-09-12 17:17:13.972691041 +0200
++++ dhcp-4.3.5b1/common/options.c	2016-09-12 17:19:17.706790276 +0200
+@@ -4434,13 +4434,26 @@ int validate_packet(struct packet *packe
  				"a future version of ISC DHCP will reject this");
  		}
  	} else {
@@ -55,13 +35,12 @@ index 3034cf0..686dd12 100644
  		}
  	}
  
-diff --git a/common/tables.c b/common/tables.c
-index f1be07d..4419220 100644
---- a/common/tables.c
-+++ b/common/tables.c
+diff -up dhcp-4.3.5b1/common/tables.c.option97 dhcp-4.3.5b1/common/tables.c
+--- dhcp-4.3.5b1/common/tables.c.option97	2016-09-12 17:17:13.927691005 +0200
++++ dhcp-4.3.5b1/common/tables.c	2016-09-12 17:17:13.972691041 +0200
 @@ -196,8 +196,9 @@ static struct option dhcp_options[] = {
  	/* Defined by RFC 4578 */
- 	{ "pxe-system-type", "Sa",		&dhcp_universe,  93, 1 },
+ 	{ "pxe-system-type", "S",		&dhcp_universe,  93, 1 },
  	{ "pxe-interface-id", "BBB",		&dhcp_universe,  94, 1 },
 -	{ "pxe-client-id", "BX",		&dhcp_universe,  97, 1 },
  #endif
@@ -70,11 +49,10 @@ index f1be07d..4419220 100644
  	{ "uap-servers", "t",			&dhcp_universe,  98, 1 },
  #if defined(RFC4776_OPTIONS)
          { "geoconf-civic", "X",                 &dhcp_universe, 99, 1 },
-diff --git a/includes/dhcp.h b/includes/dhcp.h
-index 4cc547a..4eb9791 100644
---- a/includes/dhcp.h
-+++ b/includes/dhcp.h
-@@ -158,6 +158,7 @@ struct dhcp_packet {
+diff -up dhcp-4.3.5b1/includes/dhcp.h.option97 dhcp-4.3.5b1/includes/dhcp.h
+--- dhcp-4.3.5b1/includes/dhcp.h.option97	2016-09-12 17:17:13.936691013 +0200
++++ dhcp-4.3.5b1/includes/dhcp.h	2016-09-12 17:17:13.972691041 +0200
+@@ -159,6 +159,7 @@ struct dhcp_packet {
  #define DHO_AUTHENTICATE			90  /* RFC3118, was 210 */
  #define DHO_CLIENT_LAST_TRANSACTION_TIME	91
  #define DHO_ASSOCIATED_IP			92
@@ -82,22 +60,21 @@ index 4cc547a..4eb9791 100644
  #define DHO_SUBNET_SELECTION			118 /* RFC3011! */
  #define DHO_DOMAIN_SEARCH			119 /* RFC3397 */
  #define DHO_CLASSLESS_STATIC_ROUTES		121 /* RFC3442 */
-diff --git a/server/dhcp.c b/server/dhcp.c
-index 0582c4c..4e86262 100644
---- a/server/dhcp.c
-+++ b/server/dhcp.c
-@@ -222,6 +222,10 @@ dhcp (struct packet *packet) {
- 		if (lease -> uid_len) {
+diff -up dhcp-4.3.5b1/server/dhcp.c.option97 dhcp-4.3.5b1/server/dhcp.c
+--- dhcp-4.3.5b1/server/dhcp.c.option97	2016-09-12 17:17:13.947691021 +0200
++++ dhcp-4.3.5b1/server/dhcp.c	2016-09-12 17:17:13.973691042 +0200
+@@ -221,6 +221,10 @@ dhcp (struct packet *packet) {
  			oc = lookup_option (&dhcp_universe, packet -> options,
  					    DHO_DHCP_CLIENT_IDENTIFIER);
-+			if (!oc)
+ 			if (!oc)
 +				oc = lookup_option (&dhcp_universe,
 +						    packet -> options,
 +						    DHO_PXE_CLIENT_ID);
- 			if (!oc)
++			if (!oc)
  				goto nolease;
  
-@@ -820,6 +824,9 @@ void dhcprelease (packet, ms_nulltp)
+ 			memset (&data, 0, sizeof data);
+@@ -818,6 +822,9 @@ void dhcprelease (packet, ms_nulltp)
  
  	oc = lookup_option (&dhcp_universe, packet -> options,
  			    DHO_DHCP_CLIENT_IDENTIFIER);
@@ -107,7 +84,7 @@ index 0582c4c..4e86262 100644
  	memset (&data, 0, sizeof data);
  	if (oc &&
  	    evaluate_option_cache (&data, packet, (struct lease *)0,
-@@ -1331,6 +1338,9 @@ void dhcpinform (packet, ms_nulltp)
+@@ -1286,6 +1293,9 @@ void dhcpinform (packet, ms_nulltp)
           */
  	oc = lookup_option(&dhcp_universe, packet->options,
  			   DHO_DHCP_CLIENT_IDENTIFIER);
@@ -117,7 +94,7 @@ index 0582c4c..4e86262 100644
  	memset(&d1, 0, sizeof(d1));
  	if (oc &&
  	    evaluate_option_cache(&d1, packet, NULL, NULL,
-@@ -2441,6 +2451,9 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
+@@ -2381,6 +2391,9 @@ void ack_lease (packet, lease, offer, wh
  		   can be used. */
  		oc = lookup_option (&dhcp_universe, packet -> options,
  				    DHO_DHCP_CLIENT_IDENTIFIER);
@@ -127,7 +104,7 @@ index 0582c4c..4e86262 100644
  		if (oc &&
  		    evaluate_option_cache (&d1, packet, lease,
  					   (struct client_state *)0,
-@@ -3033,6 +3046,9 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
+@@ -2962,6 +2975,9 @@ void ack_lease (packet, lease, offer, wh
  		/* Record the uid, if given... */
  		oc = lookup_option (&dhcp_universe, packet -> options,
  				    DHO_DHCP_CLIENT_IDENTIFIER);
@@ -137,7 +114,7 @@ index 0582c4c..4e86262 100644
  		if (oc &&
  		    evaluate_option_cache(&d1, packet, lease, NULL,
  					  packet->options, state->options,
-@@ -4150,6 +4166,9 @@ int find_lease (struct lease **lp,
+@@ -4068,6 +4084,9 @@ int find_lease (struct lease **lp,
  	   specified unique client identifier. */
  	oc = lookup_option (&dhcp_universe, packet -> options,
  			    DHO_DHCP_CLIENT_IDENTIFIER);
@@ -147,11 +124,10 @@ index 0582c4c..4e86262 100644
  	memset (&client_identifier, 0, sizeof client_identifier);
  	if (oc &&
  	    evaluate_option_cache (&client_identifier,
-diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
-index 89b5540..4751a8b 100644
---- a/server/dhcpd.conf.5
-+++ b/server/dhcpd.conf.5
-@@ -1664,10 +1664,12 @@ should be a name identifying the host.  If a \fIhostname\fR option is
+diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.option97 dhcp-4.3.5b1/server/dhcpd.conf.5
+--- dhcp-4.3.5b1/server/dhcpd.conf.5.option97	2016-09-12 17:17:13.885690972 +0200
++++ dhcp-4.3.5b1/server/dhcpd.conf.5	2016-09-12 17:17:13.974691043 +0200
+@@ -1587,10 +1587,12 @@ should be a name identifying the host.
  not specified for the host, \fIhostname\fR is used.
  .PP
  \fIHost\fR declarations are matched to actual DHCP or BOOTP clients
@@ -166,7 +142,7 @@ index 89b5540..4751a8b 100644
  parameter in the \fIhost\fR declaration to the network hardware
  address supplied by the client.  BOOTP clients do not normally
  provide a \fIdhcp-client-identifier\fR, so the hardware address must
-@@ -1679,7 +1681,8 @@ to identify hosts.
+@@ -1602,7 +1604,8 @@ to identify hosts.
  .PP
  Please be aware that
  .B only
@@ -176,11 +152,10 @@ index 89b5540..4751a8b 100644
  used to match a host declaration, or the \fIhost-identifier option\fR
  parameter for DHCPv6 servers.  For example, it is not possible to
  match a host declaration to a \fIhost-name\fR option.  This is
-diff --git a/server/dhcpleasequery.c b/server/dhcpleasequery.c
-index 7be0788..2fee698 100644
---- a/server/dhcpleasequery.c
-+++ b/server/dhcpleasequery.c
-@@ -276,7 +276,7 @@ dhcpleasequery(struct packet *packet, int ms_nulltp) {
+diff -up dhcp-4.3.5b1/server/dhcpleasequery.c.option97 dhcp-4.3.5b1/server/dhcpleasequery.c
+--- dhcp-4.3.5b1/server/dhcpleasequery.c.option97	2016-08-26 20:19:53.000000000 +0200
++++ dhcp-4.3.5b1/server/dhcpleasequery.c	2016-09-12 17:17:13.974691043 +0200
+@@ -273,7 +273,7 @@ dhcpleasequery(struct packet *packet, in
  		 */
  
  		memset(&uid, 0, sizeof(uid));
@@ -189,7 +164,7 @@ index 7be0788..2fee698 100644
  			       &dhcp_universe,
  			       packet,
  			       NULL,
-@@ -286,8 +286,20 @@ dhcpleasequery(struct packet *packet, int ms_nulltp) {
+@@ -283,8 +283,20 @@ dhcpleasequery(struct packet *packet, in
  			       packet->options, 
  			       &global_scope,
  			       DHO_DHCP_CLIENT_IDENTIFIER,
@@ -212,11 +187,10 @@ index 7be0788..2fee698 100644
  			snprintf(dbg_info, 
  				 sizeof(dbg_info), 
  				 "client-id %s",
-diff --git a/server/failover.c b/server/failover.c
-index 72f7b00..40fa691 100644
---- a/server/failover.c
-+++ b/server/failover.c
-@@ -5988,6 +5988,9 @@ int load_balance_mine (struct packet *packet, dhcp_failover_state_t *state)
+diff -up dhcp-4.3.5b1/server/failover.c.option97 dhcp-4.3.5b1/server/failover.c
+--- dhcp-4.3.5b1/server/failover.c.option97	2016-08-26 20:19:53.000000000 +0200
++++ dhcp-4.3.5b1/server/failover.c	2016-09-12 17:17:13.975691044 +0200
+@@ -5957,6 +5957,9 @@ int load_balance_mine (struct packet *pa
  
  	oc = lookup_option(&dhcp_universe, packet->options,
  			   DHO_DHCP_CLIENT_IDENTIFIER);
@@ -226,11 +200,10 @@ index 72f7b00..40fa691 100644
  	memset(&ds, 0, sizeof ds);
  	if (oc &&
  	    evaluate_option_cache(&ds, packet, NULL, NULL,
-diff --git a/server/mdb.c b/server/mdb.c
-index 052df67..8851366 100644
---- a/server/mdb.c
-+++ b/server/mdb.c
-@@ -129,8 +129,9 @@ static int find_uid_statement (struct executable_statement *esp,
+diff -up dhcp-4.3.5b1/server/mdb.c.option97 dhcp-4.3.5b1/server/mdb.c
+--- dhcp-4.3.5b1/server/mdb.c.option97	2016-08-26 20:19:53.000000000 +0200
++++ dhcp-4.3.5b1/server/mdb.c	2016-09-12 17:17:13.975691044 +0200
+@@ -129,8 +129,9 @@ static int find_uid_statement (struct ex
  	    esp -> data.option &&
  	    (esp -> data.option -> option -> universe ==
  	     &dhcp_universe) &&
@@ -242,6 +215,3 @@ index 052df67..8851366 100644
  		if (condp) {
  			log_error ("dhcp client identifier may not be %s",
  				   "specified conditionally.");
--- 
-2.14.5
-

SOURCES/dhcp-paths.patch

@@ -0,0 +1,38 @@
+diff -up dhcp-4.3.0a1/doc/examples/dhcpd-dhcpv6.conf.paths dhcp-4.3.0a1/doc/examples/dhcpd-dhcpv6.conf
+--- dhcp-4.3.0a1/doc/examples/dhcpd-dhcpv6.conf.paths	2013-11-07 20:15:08.000000000 +0100
++++ dhcp-4.3.0a1/doc/examples/dhcpd-dhcpv6.conf	2013-12-19 15:34:16.262247711 +0100
+@@ -42,7 +42,7 @@ option dhcp6.domain-search "test.example
+ option dhcp6.info-refresh-time 21600;
+ 
+ # The path of the lease file
+-dhcpv6-lease-file-name "/usr/local/var/db/dhcpd6.leases";
++dhcpv6-lease-file-name "/var/lib/dhcpd/dhcpd6.leases";
+ 
+ # Static definition (must be global)
+ host myclient {
+diff -up dhcp-4.3.0a1/includes/dhcpd.h.paths dhcp-4.3.0a1/includes/dhcpd.h
+--- dhcp-4.3.0a1/includes/dhcpd.h.paths	2013-12-19 15:34:16.253247840 +0100
++++ dhcp-4.3.0a1/includes/dhcpd.h	2013-12-19 15:34:16.263247697 +0100
+@@ -1429,7 +1429,7 @@ typedef unsigned char option_mask [16];
+ #else /* !DEBUG */
+ 
+ #ifndef _PATH_DHCPD_CONF
+-#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
++#define _PATH_DHCPD_CONF	"/etc/dhcp/dhcpd.conf"
+ #endif /* DEBUG */
+ 
+ #ifndef _PATH_DHCPD_DB
+@@ -1451,11 +1451,11 @@ typedef unsigned char option_mask [16];
+ #endif /* DEBUG */
+ 
+ #ifndef _PATH_DHCLIENT_CONF
+-#define _PATH_DHCLIENT_CONF	"/etc/dhclient.conf"
++#define _PATH_DHCLIENT_CONF	"/etc/dhcp/dhclient.conf"
+ #endif
+ 
+ #ifndef _PATH_DHCLIENT_SCRIPT
+-#define _PATH_DHCLIENT_SCRIPT	"/sbin/dhclient-script"
++#define _PATH_DHCLIENT_SCRIPT	"/usr/sbin/dhclient-script"
+ #endif
+ 
+ #ifndef _PATH_DHCLIENT_PID

SOURCES/dhcp-release-by-ifup.patch

@@ -1,18 +1,7 @@
-From af504e99abde04b881768d18eaa0054b36b16303 Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:21:14 +0100
-Subject: [PATCH 03/26] Handle releasing interfaces requested by /sbin/ifup
-Cc: pzhukov@redhat.com
-
----
- client/dhclient.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 72 insertions(+)
-
-diff --git a/client/dhclient.c b/client/dhclient.c
-index 26a333c..2a2e9e6 100644
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -787,9 +787,81 @@ main(int argc, char **argv) {
+diff -up dhcp-4.3.0a1/client/dhclient.c.ifup dhcp-4.3.0a1/client/dhclient.c
+--- dhcp-4.3.0a1/client/dhclient.c.ifup	2013-12-19 14:53:08.817760677 +0100
++++ dhcp-4.3.0a1/client/dhclient.c	2013-12-19 15:05:16.290518574 +0100
+@@ -521,9 +521,81 @@ main(int argc, char **argv) {
  				}
  			}
  			fclose(pidfd);
@@ -94,6 +83,3 @@ index 26a333c..2a2e9e6 100644
  	if (!quiet) {
  		log_info("%s %s", message, PACKAGE_VERSION);
  		log_info(copyright);
--- 
-2.14.5
-

SOURCES/dhcp-remove-bind.patch

@@ -0,0 +1,351 @@
+From 2698385647a6ebd58b5d25147333e494c3da2409 Mon Sep 17 00:00:00 2001
+From: Petr Mensik <pemensik@redhat.com>
+Date: Fri, 9 Feb 2018 15:24:53 +0100
+Subject: [PATCH] Support for isc-config.sh script on --with-libbind parameter
+
+Move checks only to isc-config section
+
+Fix detection of bind flags from config
+
+Add support for with-libbind=config, Improve help message
+---
+ client/Makefile.am       |  5 ++-
+ client/tests/Makefile.am |  8 ++---
+ common/tests/Makefile.am | 14 +++-----
+ configure.ac             | 84 ++++++++++++++++++++++++++++++++++++++++++------
+ dhcpctl/Makefile.am      |  8 ++---
+ omapip/Makefile.am       |  5 ++-
+ relay/Makefile.am        |  5 ++-
+ server/Makefile.am       |  6 ++--
+ server/tests/Makefile.am |  9 +++---
+ 9 files changed, 98 insertions(+), 46 deletions(-)
+
+diff --git a/client/Makefile.am b/client/Makefile.am
+index 2cb83d8..b85f5d2 100644
+--- a/client/Makefile.am
++++ b/client/Makefile.am
+@@ -4,7 +4,7 @@
+ # production code. Sadly, we are not there yet.
+ SUBDIRS = . tests
+ 
+-BINDLIBDIR = @BINDDIR@/lib
++BIND_LIBS = @BIND_LIBS@
+ 
+ AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
+ 	      -DLOCALSTATEDIR='"$(localstatedir)"'
+@@ -15,7 +15,6 @@ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
+ 		   scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
+ 		   scripts/netbsd scripts/nextstep scripts/openbsd \
+ 		   scripts/solaris scripts/openwrt
+-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
+-		 $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
++dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(BIND_LIBS)
+ man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
+ EXTRA_DIST = $(man_MANS)
+diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am
+index 5031d0c..bb1fda4 100644
+--- a/client/tests/Makefile.am
++++ b/client/tests/Makefile.am
+@@ -1,9 +1,9 @@
+ SUBDIRS = .
+ 
+-BINDLIBDIR = @BINDDIR@/lib
++BIND_LIBS = @BIND_LIBS@
+ 
+ AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
+-AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
++AM_CPPFLAGS += @BIND_CPPFLAGS@ -I$(top_srcdir)
+ AM_CPPFLAGS += -DLOCALSTATEDIR='"."'
+ AM_CPPFLAGS += -DCLIENT_PATH='"."'
+ 
+@@ -18,9 +18,7 @@ info:
+ DHCPSRC = ../clparse.c ../dhc6.c ../dhclient.c
+ 
+ DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a    \
+-          $(top_builddir)/dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \
+-	  $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
+-	  $(BINDLIBDIR)/libisc.a
++          $(top_builddir)/dhcpctl/libdhcpctl.a $(BIND_LIBS)
+ 
+ ATF_TESTS =
+ if HAVE_ATF
+diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
+index f6a43e4..196aa44 100644
+--- a/common/tests/Makefile.am
++++ b/common/tests/Makefile.am
+@@ -1,6 +1,6 @@
+ SUBDIRS = .
+ 
+-BINDLIBDIR = @BINDDIR@/lib
++BIND_LIBS = @BIND_LIBS@
+ 
+ AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes
+ 
+@@ -15,26 +15,22 @@ ATF_TESTS += alloc_unittest dns_unittest misc_unittest ns_name_unittest
+ alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
+ alloc_unittest_LDADD = $(ATF_LDFLAGS)
+ alloc_unittest_LDADD += ../libdhcp.a  \
+-	../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
+-	$(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
++	../../omapip/libomapi.a $(BIND_LIBS)
+ 
+ dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
+ dns_unittest_LDADD = $(ATF_LDFLAGS)
+ dns_unittest_LDADD += ../libdhcp.a  \
+-	../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
+-	$(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
++	../../omapip/libomapi.a $(BIND_LIBS)
+ 
+ misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
+ misc_unittest_LDADD = $(ATF_LDFLAGS)
+ misc_unittest_LDADD += ../libdhcp.a  \
+-	../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
+-	$(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
++	../../omapip/libomapi.a $(BIND_LIBS)
+ 
+ ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c
+ ns_name_unittest_LDADD = $(ATF_LDFLAGS)
+ ns_name_unittest_LDADD += ../libdhcp.a  \
+-	../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
+-	$(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
++	../../omapip/libomapi.a $(BIND_LIBS)
+ 
+ check: $(ATF_TESTS)
+ 	@if test $(top_srcdir) != ${top_builddir}; then \
+diff --git a/configure.ac b/configure.ac
+index cdfa352..ef55f8d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -688,8 +688,12 @@ AC_CHECK_MEMBER(struct tpacket_auxdata.tp_vlan_tci,
+ 
+ BINDDIR=
+ BINDSRCDIR=
++BIND_CONFIG=
++BIND_CPPFLAGS=
++BIND_LIBS=
+ AC_ARG_WITH(libbind,
+-	AS_HELP_STRING([--with-libbind=PATH],[bind includes and libraries are in PATH
++	AS_HELP_STRING([--with-libbind=PATH|config],[bind includes and libraries are in PATH.
++		        Use config to obtain libraries from isc-config.sh.
+ 		        (default is ./bind)]),
+ 	use_libbind="$withval", use_libbind="no")
+ case "$use_libbind" in
+@@ -701,23 +705,85 @@ no)
+ 	BINDDIR="\${top_srcdir}/bind"
+ 	BINDSRCDIR="\${top_srcdir}/bind"
+ 	;;
++config)
++	AC_PATH_PROG(BIND_CONFIG, [isc-config.sh bind9-config])
++	;;
+ *)
+-	BINDDIR="$use_libbind"
+-	if test ! -d "$srcdir/bind"; then
+-		# no bind directory, create it with a fake Makefile.in
+-		# (AC_CONFIG_FILES and top Makefile refer to it so
+-		# it must exits)
+-		mkdir $srcdir/bind
+-		cat > $srcdir/bind/Makefile.in << EOF
++	if test -f "$use_libbind" -a -x "$use_libbind"; then
++		# passed full path of isc-config.sh
++		BIND_CONFIG="$use_libbind"
++	else
++		BINDDIR="$use_libbind"
++		if test ! -d "$srcdir/bind"; then
++			# no bind directory, create it with a fake Makefile.in
++			# (AC_CONFIG_FILES and top Makefile refer to it so
++			# it must exits)
++			mkdir $srcdir/bind
++			cat > $srcdir/bind/Makefile.in << EOF
+ # placeholder
+ all check clean distclean distdir install uninstall:
+ 
+ EOF
++		fi
+ 	fi
+ 	;;
+ esac
++if test -z "$BIND_CONFIG"; then
++	BIND_CPPFLAGS="-I${BINDDIR}/include"
++	BIND_LIBDIR="${BINDDIR}/lib"
++	BIND_LIBS="$(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a"
++else
++	BIND_CPPFLAGS=`$BIND_CONFIG --cflags`
++	BIND_LIBS=`$BIND_CONFIG --libs irs dns isccfg isc`
++
++	# bind is already built
++	AC_CHECKING([Checking bind libraries have no thread support])
++	saved_libs="$LIBS"
++	saved_CPPFLAGS="$CPPFLAGS"
++	CPPFLAGS="${CPPFLAGS} ${BIND_CPPFLAGS}"
++	LIBS="${LIBS} ${BIND_LIBS}"
++AC_TRY_LINK([
++#include <isc/bind9.h>
++#include <isc/lib.h>
++],[
++#ifdef BIND9
++#error Export BIND library has to be used with BIND version up to 9.9
++#endif
++isc_lib_register();
++], [AC_MSG_RESULT(Bind export library found)
++    BIND_EXPORT=yes], [BIND_EXPORT=no]
++)
++
++# Allow build with disabled threads for dhcp
++AC_TRY_LINK([
++#include <isc/platform.h>
++#include <isc/bind9.h>
++#include <isc/lib.h>
++],[
++#ifdef ISC_PLATFORM_USETHREADS
++#error Bind library must not be compiled with threads
++#endif
++isc_lib_register();
++if (isc_bind9 != 0) {}
++], [AC_MSG_RESULT(Bind single thread library found)
++    BIND_SINGLETHREAD=yes], [BIND_SINGLETHREAD=no]
++)
++
++	if test "x$BIND_EXPORT" != xyes -a "x$BIND_SINGLETHREADED" != xyes
++	then
++		AC_MSG_RESULT([BIND_CONFIG=${BIND_CONFIG}])
++		AC_MSG_RESULT([BIND_CPPFLAGS=${BIND_CPPFLAGS}])
++		AC_MSG_RESULT([BIND_LIBS=${BIND_LIBS}])
++		AC_MSG_ERROR([Bind libraries are not useable for dhcp])
++	fi
++	CPPFLAGS="$saved_CPPFLAGS"
++	LIBS="$saved_LIBS"
++fi
++
+ AC_SUBST(BINDDIR)
+ AC_SUBST(BINDSRCDIR)
++AC_SUBST(BIND_CPPFLAGS)
++AC_SUBST(BIND_LIBS)
+ 
+ # OpenLDAP support.
+ AC_ARG_WITH(ldap,
+@@ -795,7 +861,7 @@ fi
+ CFLAGS="$CFLAGS $STD_CWARNINGS"
+ 
+ # Try to add the bind and dhcp include directories
+-CFLAGS="$CFLAGS -I\$(top_srcdir)/includes -I$BINDDIR/include"
++CFLAGS="$CFLAGS -I\$(top_srcdir)/includes $BIND_CPPFLAGS"
+ 
+ case "$host" in
+ *-darwin*)
+diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am
+index ceb0de1..fa20a78 100644
+--- a/dhcpctl/Makefile.am
++++ b/dhcpctl/Makefile.am
+@@ -1,4 +1,4 @@
+-BINDLIBDIR = @BINDDIR@/lib
++BIND_LIBS = @BIND_LIBS@
+ 
+ bin_PROGRAMS = omshell
+ lib_LIBRARIES = libdhcpctl.a
+@@ -8,12 +8,10 @@ EXTRA_DIST = $(man_MANS)
+ 
+ omshell_SOURCES = omshell.c
+ omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
+-	        $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
+-	        $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
++	        $(BIND_LIBS)
+ 
+ libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
+ 
+ cltest_SOURCES = cltest.c
+ cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
+-	       $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
+-               $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
++	       $(BIND_LIBS)
+diff --git a/omapip/Makefile.am b/omapip/Makefile.am
+index 446a594..b0d2680 100644
+--- a/omapip/Makefile.am
++++ b/omapip/Makefile.am
+@@ -1,4 +1,4 @@
+-BINDLIBDIR = @BINDDIR@/lib
++BIND_LIBS = @BIND_LIBS@
+ 
+ lib_LIBRARIES = libomapi.a
+ noinst_PROGRAMS = svtest
+@@ -12,6 +12,5 @@ man_MANS = omapi.3
+ EXTRA_DIST = $(man_MANS)
+ 
+ svtest_SOURCES = test.c
+-svtest_LDADD = libomapi.a $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
+-		$(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
++svtest_LDADD = libomapi.a $(BIND_LIBS)
+ 
+diff --git a/relay/Makefile.am b/relay/Makefile.am
+index 3060eca..c9a1cba 100644
+--- a/relay/Makefile.am
++++ b/relay/Makefile.am
+@@ -1,12 +1,11 @@
+-BINDLIBDIR = @BINDDIR@/lib
++BIND_LIBS = @BIND_LIBS@
+ 
+ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
+ 
+ sbin_PROGRAMS = dhcrelay
+ dhcrelay_SOURCES = dhcrelay.c
+ dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+-		 $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
+-		 $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
++		 $(BIND_LIBS)
+ man_MANS = dhcrelay.8
+ EXTRA_DIST = $(man_MANS)
+ 
+diff --git a/server/Makefile.am b/server/Makefile.am
+index 54feedf..30cf2b1 100644
+--- a/server/Makefile.am
++++ b/server/Makefile.am
+@@ -4,7 +4,7 @@
+ # production code. Sadly, we are not there yet.
+ SUBDIRS = . tests
+ 
+-BINDLIBDIR = @BINDDIR@/lib
++BIND_LIBS = @BIND_LIBS@
+ 
+ AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
+ 
+@@ -16,9 +16,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
+ 
+ dhcpd_CFLAGS = $(LDAP_CFLAGS)
+ dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+-	      ../dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \
+-	      $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
+-	      $(BINDLIBDIR)/libisc.a $(LDAP_LIBS)
++	      ../dhcpctl/libdhcpctl.a $(BIND_LIBS) $(LDAP_LIBS)
+ 
+ man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
+ EXTRA_DIST = $(man_MANS)
+diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
+index a87c5e7..771de06 100644
+--- a/server/tests/Makefile.am
++++ b/server/tests/Makefile.am
+@@ -1,9 +1,10 @@
+ SUBDIRS = .
+ 
+-BINDLIBDIR = @BINDDIR@/lib
++BIND_LIBS = @BIND_LIBS@
++
+ 
+ AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
+-AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
++AM_CPPFLAGS += $(BIND_CPPFLAGS) -I$(top_srcdir)
+ AM_CPPFLAGS += -DLOCALSTATEDIR='"."'
+ 
+ EXTRA_DIST = Atffile
+@@ -20,9 +21,7 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c      \
+           ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c
+ 
+ DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \
+-          $(top_builddir)/dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \
+-	  $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
+-	  $(BINDLIBDIR)/libisc.a
++          $(top_builddir)/dhcpctl/libdhcpctl.a $(BIND_LIBS)
+ 
+ ATF_TESTS =
+ if HAVE_ATF
+-- 
+2.14.3
+

SOURCES/dhcp-replay_file_limit.patch

@@ -1,11 +1,5 @@
-commit 50c2b3ba8ce030a47b55dd707bb8a6ab20444a05
-Author: Pavel Zhukov <pzhukov@redhat.com>
-Date:   Thu Feb 21 10:44:06 2019 +0100
-
-    Load leases DB in non-replay mode only
-
 diff --git a/server/confpars.c b/server/confpars.c
-index 2743979..6b61964 100644
+index d79489b..2b1e393 100644
 --- a/server/confpars.c
 +++ b/server/confpars.c
 @@ -134,6 +134,11 @@ isc_result_t read_conf_file (const char *filename, struct group *group,

SOURCES/dhcp-rfc3442-classless-static-routes.patch

@@ -1,27 +1,6 @@
-From 01b1dcfef129a4eccfaf0f63a216774019f82dca Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:32:35 +0100
-Subject: [PATCH 12/26] RFC 3442 - Classless Static Route Option for DHCPv4
- (#516325)
-Cc: pzhukov@redhat.com
-
-(Submitted to dhcp-bugs@isc.org - [ISC-Bugs #24572])
----
- client/clparse.c      | 13 ++++++++++--
- common/dhcp-options.5 | 43 +++++++++++++++++++++++++++++++++++++++
- common/inet.c         | 54 +++++++++++++++++++++++++++++++++++++++++++++++++
- common/options.c      | 49 +++++++++++++++++++++++++++++++++++++++++++-
- common/parse.c        | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++-
- common/tables.c       |  2 ++
- includes/dhcp.h       |  1 +
- includes/dhcpd.h      |  2 ++
- includes/dhctoken.h   |  5 +++--
- 9 files changed, 219 insertions(+), 6 deletions(-)
-
-diff --git a/client/clparse.c b/client/clparse.c
-index 44387ed..862e4f9 100644
---- a/client/clparse.c
-+++ b/client/clparse.c
+diff -up dhcp-4.3.4/client/clparse.c.rfc3442 dhcp-4.3.4/client/clparse.c
+--- dhcp-4.3.4/client/clparse.c.rfc3442	2016-04-29 12:23:34.192032714 +0200
++++ dhcp-4.3.4/client/clparse.c	2016-04-29 12:24:37.531016317 +0200
 @@ -31,7 +31,7 @@
  
  struct client_config top_level_config;
@@ -56,11 +35,10 @@ index 44387ed..862e4f9 100644
  	for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
  		if (default_requested_options[code] == NULL)
  			log_fatal("Unable to find option definition for "
-diff --git a/common/dhcp-options.5 b/common/dhcp-options.5
-index d9e1197..2343b19 100644
---- a/common/dhcp-options.5
-+++ b/common/dhcp-options.5
-@@ -110,6 +110,26 @@ hexadecimal, separated by colons.  For example:
+diff -up dhcp-4.3.4/common/dhcp-options.5.rfc3442 dhcp-4.3.4/common/dhcp-options.5
+--- dhcp-4.3.4/common/dhcp-options.5.rfc3442	2016-04-29 12:23:34.183032716 +0200
++++ dhcp-4.3.4/common/dhcp-options.5	2016-04-29 12:23:34.237032703 +0200
+@@ -111,6 +111,26 @@ hexadecimal, separated by colons.  For e
  or
    option dhcp-client-identifier 43:4c:49:45:54:2d:46:4f:4f;
  .fi
@@ -87,7 +65,7 @@ index d9e1197..2343b19 100644
  .SH SETTING OPTION VALUES USING EXPRESSIONS
  Sometimes it's helpful to be able to set the value of a DHCP option
  based on some value that the client has sent.  To do this, you can
-@@ -1086,6 +1106,29 @@ dhclient-script will create routes:
+@@ -1031,6 +1051,29 @@ dhclient-script will create routes:
  .RE
  .PP
  .nf
@@ -117,11 +95,10 @@ index d9e1197..2343b19 100644
  .B option \fBstreettalk-directory-assistance-server\fR \fIip-address\fR
                                             [\fB,\fR \fIip-address\fR...]\fB;\fR
  .fi
-diff --git a/common/inet.c b/common/inet.c
-index c4da73c..981fb92 100644
---- a/common/inet.c
-+++ b/common/inet.c
-@@ -519,6 +519,60 @@ free_iaddrcidrnetlist(struct iaddrcidrnetlist **result) {
+diff -up dhcp-4.3.4/common/inet.c.rfc3442 dhcp-4.3.4/common/inet.c
+--- dhcp-4.3.4/common/inet.c.rfc3442	2016-03-22 14:16:51.000000000 +0100
++++ dhcp-4.3.4/common/inet.c	2016-04-29 12:23:34.237032703 +0200
+@@ -519,6 +519,60 @@ free_iaddrcidrnetlist(struct iaddrcidrne
  	return ISC_R_SUCCESS;
  }
  
@@ -182,11 +159,10 @@ index c4da73c..981fb92 100644
  /* piaddr() turns an iaddr structure into a printable address. */
  /* XXX: should use a const pointer rather than passing the structure */
  const char *
-diff --git a/common/options.c b/common/options.c
-index fc0e088..3034cf0 100644
---- a/common/options.c
-+++ b/common/options.c
-@@ -729,7 +729,11 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket,
+diff -up dhcp-4.3.4/common/options.c.rfc3442 dhcp-4.3.4/common/options.c
+--- dhcp-4.3.4/common/options.c.rfc3442	2016-03-22 14:16:51.000000000 +0100
++++ dhcp-4.3.4/common/options.c	2016-04-29 12:23:34.237032703 +0200
+@@ -713,7 +713,11 @@ cons_options(struct packet *inpacket, st
  		 * packet.
  		 */
  		priority_list[priority_len++] = DHO_SUBNET_MASK;
@@ -199,7 +175,7 @@ index fc0e088..3034cf0 100644
  		priority_list[priority_len++] = DHO_DOMAIN_NAME_SERVERS;
  		priority_list[priority_len++] = DHO_HOST_NAME;
  		priority_list[priority_len++] = DHO_FQDN;
-@@ -1804,6 +1808,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
+@@ -1694,6 +1698,7 @@ const char *pretty_print_option (option,
  	unsigned long tval;
  	isc_boolean_t a_array = ISC_FALSE;
  	int len_used;
@@ -207,7 +183,7 @@ index fc0e088..3034cf0 100644
  
  	if (emit_commas)
  		comma = ',';
-@@ -1812,6 +1817,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
+@@ -1702,6 +1707,7 @@ const char *pretty_print_option (option,
  
  	memset (enumbuf, 0, sizeof enumbuf);
  
@@ -215,7 +191,7 @@ index fc0e088..3034cf0 100644
  	/* Figure out the size of the data. */
  	for (l = i = 0; option -> format [i]; i++, l++) {
  		if (l >= sizeof(fmtbuf) - 1)
-@@ -2004,6 +2010,33 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
+@@ -1894,6 +1900,33 @@ const char *pretty_print_option (option,
  	if (numhunk < 0)
  		numhunk = 1;
  
@@ -249,7 +225,7 @@ index fc0e088..3034cf0 100644
  	/* Cycle through the array (or hunk) printing the data. */
  	for (i = 0; i < numhunk; i++) {
  		if ((a_array == ISC_TRUE) && (i != 0) && (numelem > 0)) {
-@@ -2159,6 +2192,20 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
+@@ -2049,6 +2082,20 @@ const char *pretty_print_option (option,
  				strcpy(op, piaddr(iaddr));
  				dp += 4;
  				break;
@@ -270,15 +246,13 @@ index fc0e088..3034cf0 100644
  			      case '6':
  				iaddr.len = 16;
  				memcpy(iaddr.iabuf, dp, 16);
-diff --git a/common/parse.c b/common/parse.c
-index 3ac4ebf..f17bc0b 100644
---- a/common/parse.c
-+++ b/common/parse.c
-@@ -344,6 +344,39 @@ int parse_ip_addr (cfile, addr)
- 	return 0;
+diff -up dhcp-4.3.4/common/parse.c.rfc3442 dhcp-4.3.4/common/parse.c
+--- dhcp-4.3.4/common/parse.c.rfc3442	2016-04-29 12:23:34.220032707 +0200
++++ dhcp-4.3.4/common/parse.c	2016-04-29 12:23:34.238032702 +0200
+@@ -341,6 +341,39 @@ int parse_ip_addr (cfile, addr)
  }	
  
-+/*
+ /*
 + * destination-descriptor :== NUMBER DOT NUMBER |
 + *                            NUMBER DOT NUMBER DOT NUMBER |
 + *                            NUMBER DOT NUMBER DOT NUMBER DOT NUMBER |
@@ -311,10 +285,11 @@ index 3ac4ebf..f17bc0b 100644
 +		return 0;
 +}
 +
- /*
++/*
   * Return true if every character in the string is hexadecimal.
   */
-@@ -724,8 +757,10 @@ unsigned char *parse_numeric_aggregate (cfile, buf,
+ static int
+@@ -720,8 +753,10 @@ unsigned char *parse_numeric_aggregate (
  		if (count) {
  			token = peek_token (&val, (unsigned *)0, cfile);
  			if (token != separator) {
@@ -326,7 +301,7 @@ index 3ac4ebf..f17bc0b 100644
  				if (token != RBRACE && token != LBRACE)
  					token = next_token (&val,
  							    (unsigned *)0,
-@@ -1672,6 +1707,9 @@ int parse_option_code_definition (cfile, option)
+@@ -1668,6 +1703,9 @@ int parse_option_code_definition (cfile,
  	      case IP_ADDRESS:
  		type = 'I';
  		break;
@@ -336,7 +311,7 @@ index 3ac4ebf..f17bc0b 100644
  	      case IP6_ADDRESS:
  		type = '6';
  		break;
-@@ -5101,6 +5139,15 @@ int parse_option_token (rv, cfile, fmt, expr, uniform, lookups)
+@@ -5097,6 +5135,15 @@ int parse_option_token (rv, cfile, fmt,
  		}
  		break;
  
@@ -352,7 +327,7 @@ index 3ac4ebf..f17bc0b 100644
  	      case '6': /* IPv6 address. */
  		if (!parse_ip6_addr(cfile, &addr)) {
  			return 0;
-@@ -5378,6 +5425,13 @@ int parse_option_decl (oc, cfile)
+@@ -5374,6 +5421,13 @@ int parse_option_decl (oc, cfile)
  					goto exit;
  				len = ip_addr.len;
  				dp = ip_addr.iabuf;
@@ -366,11 +341,10 @@ index 3ac4ebf..f17bc0b 100644
  
  			      alloc:
  				if (hunkix + len > sizeof hunkbuf) {
-diff --git a/common/tables.c b/common/tables.c
-index d2294c0..f1be07d 100644
---- a/common/tables.c
-+++ b/common/tables.c
-@@ -45,6 +45,7 @@ HASH_FUNCTIONS (option_code, const unsigned *, struct option,
+diff -up dhcp-4.3.4/common/tables.c.rfc3442 dhcp-4.3.4/common/tables.c
+--- dhcp-4.3.4/common/tables.c.rfc3442	2016-04-29 12:23:34.209032710 +0200
++++ dhcp-4.3.4/common/tables.c	2016-04-29 12:23:34.238032702 +0200
+@@ -45,6 +45,7 @@ HASH_FUNCTIONS (option_code, const unsig
     Format codes:
  
     I - IPv4 address
@@ -386,23 +360,10 @@ index d2294c0..f1be07d 100644
  	{ "vivco", "Evendor-class.",		&dhcp_universe, 124, 1 },
  	{ "vivso", "Evendor.",			&dhcp_universe, 125, 1 },
  #if 0
-diff --git a/includes/dhcp.h b/includes/dhcp.h
-index 0a74137..95bf539 100644
---- a/includes/dhcp.h
-+++ b/includes/dhcp.h
-@@ -158,6 +158,7 @@ struct dhcp_packet {
- #define DHO_ASSOCIATED_IP			92
- #define DHO_SUBNET_SELECTION			118 /* RFC3011! */
- #define DHO_DOMAIN_SEARCH			119 /* RFC3397 */
-+#define DHO_CLASSLESS_STATIC_ROUTES		121 /* RFC3442 */
- #define DHO_VIVCO_SUBOPTIONS			124
- #define DHO_VIVSO_SUBOPTIONS			125
- 
-diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index 3632a6b..2ac39ae 100644
---- a/includes/dhcpd.h
-+++ b/includes/dhcpd.h
-@@ -2951,6 +2951,7 @@ isc_result_t range2cidr(struct iaddrcidrnetlist **result,
+diff -up dhcp-4.3.4/includes/dhcpd.h.rfc3442 dhcp-4.3.4/includes/dhcpd.h
+--- dhcp-4.3.4/includes/dhcpd.h.rfc3442	2016-04-29 12:23:34.186032716 +0200
++++ dhcp-4.3.4/includes/dhcpd.h	2016-04-29 12:23:34.239032702 +0200
+@@ -2894,6 +2894,7 @@ isc_result_t range2cidr(struct iaddrcidr
  			const struct iaddr *lo, const struct iaddr *hi);
  isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result);
  const char *piaddr (struct iaddr);
@@ -410,7 +371,7 @@ index 3632a6b..2ac39ae 100644
  char *piaddrmask(struct iaddr *, struct iaddr *);
  char *piaddrcidr(const struct iaddr *, unsigned int);
  u_int16_t validate_port(char *);
-@@ -3169,6 +3170,7 @@ void parse_client_lease_declaration (struct parse *,
+@@ -3108,6 +3109,7 @@ void parse_client_lease_declaration (str
  int parse_option_decl (struct option_cache **, struct parse *);
  void parse_string_list (struct parse *, struct string_list **, int);
  int parse_ip_addr (struct parse *, struct iaddr *);
@@ -418,22 +379,27 @@ index 3632a6b..2ac39ae 100644
  int parse_ip_addr_with_subnet(struct parse *, struct iaddrmatch *);
  void parse_reject_statement (struct parse *, struct client_config *);
  
-diff --git a/includes/dhctoken.h b/includes/dhctoken.h
-index 7e7215a..b4d93ba 100644
---- a/includes/dhctoken.h
-+++ b/includes/dhctoken.h
-@@ -376,8 +376,9 @@ enum dhcp_token {
+diff -up dhcp-4.3.4/includes/dhcp.h.rfc3442 dhcp-4.3.4/includes/dhcp.h
+--- dhcp-4.3.4/includes/dhcp.h.rfc3442	2016-03-22 14:16:51.000000000 +0100
++++ dhcp-4.3.4/includes/dhcp.h	2016-04-29 12:23:34.239032702 +0200
+@@ -159,6 +159,7 @@ struct dhcp_packet {
+ #define DHO_ASSOCIATED_IP			92
+ #define DHO_SUBNET_SELECTION			118 /* RFC3011! */
+ #define DHO_DOMAIN_SEARCH			119 /* RFC3397 */
++#define DHO_CLASSLESS_STATIC_ROUTES		121 /* RFC3442 */
+ #define DHO_VIVCO_SUBOPTIONS			124
+ #define DHO_VIVSO_SUBOPTIONS			125
+ 
+diff -up dhcp-4.3.4/includes/dhctoken.h.rfc3442 dhcp-4.3.4/includes/dhctoken.h
+--- dhcp-4.3.4/includes/dhctoken.h.rfc3442	2016-04-29 12:23:34.239032702 +0200
++++ dhcp-4.3.4/includes/dhctoken.h	2016-04-29 12:25:07.236008628 +0200
+@@ -374,7 +374,8 @@ enum dhcp_token {
  	LEASE_ID_FORMAT = 676,
  	TOKEN_HEX = 677,
  	TOKEN_OCTAL = 678,
--	KEY_ALGORITHM = 679
--        BOOTP_BROADCAST_ALWAYS = 680
-+	KEY_ALGORITHM = 679,
-+        BOOTP_BROADCAST_ALWAYS = 680,
-+	DESTINATION_DESCRIPTOR = 681
+-	BOOTP_BROADCAST_ALWAYS = 679
++	BOOTP_BROADCAST_ALWAYS = 679,
++	DESTINATION_DESCRIPTOR = 680
  };
  
  #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\
--- 
-2.14.5
-

SOURCES/dhcp-sd_notify.patch

@@ -1,20 +1,7 @@
-From 8d974fd1f667e1b957ad4092fe66a8bb94f5f8fd Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 7 Nov 2019 14:47:45 +0100
-Subject: [PATCH 1/1] Add missed sd notify patch to manage dhcpd with systemd
-Cc: pzhukov@redhat.com
-
----
- configure.ac     | 11 +++++++++++
- relay/dhcrelay.c | 12 ++++++++++++
- server/dhcpd.c   | 12 ++++++++++++
- 3 files changed, 35 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 15fc0d7..0c08000 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1014,6 +1014,17 @@ if test x$ldap = xyes || test x$ldapcrypto = xyes || test x$ldap_gssapi = xyes;
+diff -up dhcp-4.3.4/configure.ac.sd_notify dhcp-4.3.4/configure.ac
+--- dhcp-4.3.4/configure.ac.sd_notify	2016-04-29 13:08:52.813287060 +0200
++++ dhcp-4.3.4/configure.ac	2016-04-29 13:08:52.872287075 +0200
+@@ -832,6 +832,17 @@ if test x$ldap = xyes || test x$ldapcryp
      AC_SUBST(LDAP_CFLAGS, [$LDAP_CFLAGS])
  fi
  
@@ -32,10 +19,9 @@ index 15fc0d7..0c08000 100644
  # Append selected warning levels to CFLAGS before substitution (but after
  # AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) & etc).
  CFLAGS="$CFLAGS $STD_CWARNINGS"
-diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
-index 7b4f4f1..9eb5bfd 100644
---- a/relay/dhcrelay.c
-+++ b/relay/dhcrelay.c
+diff -up dhcp-4.3.4/relay/dhcrelay.c.sd_notify dhcp-4.3.4/relay/dhcrelay.c
+--- dhcp-4.3.4/relay/dhcrelay.c.sd_notify	2016-04-29 13:08:52.814287061 +0200
++++ dhcp-4.3.4/relay/dhcrelay.c	2016-04-29 13:08:52.872287075 +0200
 @@ -37,6 +37,10 @@
     int keep_capabilities = 0;
  #endif
@@ -47,7 +33,7 @@ index 7b4f4f1..9eb5bfd 100644
  TIME default_lease_time = 43200; /* 12 hours... */
  TIME max_lease_time = 86400; /* 24 hours... */
  struct tree_cache *global_options[256];
-@@ -845,6 +849,14 @@ main(int argc, char **argv) {
+@@ -709,6 +713,14 @@ main(int argc, char **argv) {
  	}
  #endif
  
@@ -62,13 +48,12 @@ index 7b4f4f1..9eb5bfd 100644
  	/* Start dispatching packets and timeouts... */
  	dispatch();
  
-diff --git a/server/dhcpd.c b/server/dhcpd.c
-index 4aef16b..778ef8d 100644
---- a/server/dhcpd.c
-+++ b/server/dhcpd.c
-@@ -60,6 +60,10 @@ gid_t set_gid = 0;
- struct class unknown_class;
- struct class known_class;
+diff -up dhcp-4.3.4/server/dhcpd.c.sd_notify dhcp-4.3.4/server/dhcpd.c
+--- dhcp-4.3.4/server/dhcpd.c.sd_notify	2016-04-29 13:08:52.873287075 +0200
++++ dhcp-4.3.4/server/dhcpd.c	2016-04-29 13:12:00.655333096 +0200
+@@ -57,6 +57,10 @@ uid_t set_uid = 0;
+ gid_t set_gid = 0;
+ #endif /* PARANOIA */
  
 +#ifdef HAVE_LIBSYSTEMD
 +#include <systemd/sd-daemon.h>
@@ -77,7 +62,7 @@ index 4aef16b..778ef8d 100644
  struct iaddr server_identifier;
  int server_identifier_matched;
  
-@@ -1057,6 +1061,14 @@ main(int argc, char **argv) {
+@@ -931,6 +935,14 @@ main(int argc, char **argv) {
  	/* Log that we are about to start working */
  	log_info("Server starting service.");
  
@@ -92,6 +77,3 @@ index 4aef16b..778ef8d 100644
  	/*
  	 * Receive packets and dispatch them...
  	 * dispatch() will never return.
--- 
-2.14.5
-

SOURCES/dhcp-sendDecline.patch

@@ -0,0 +1,231 @@
+diff -up dhcp-4.3.4/client/dhc6.c.sendDecline dhcp-4.3.4/client/dhc6.c
+--- dhcp-4.3.4/client/dhc6.c.sendDecline	2016-03-22 14:16:51.000000000 +0100
++++ dhcp-4.3.4/client/dhc6.c	2016-05-02 14:51:57.916578401 +0200
+@@ -115,6 +115,8 @@ void do_select6(void *input);
+ void do_refresh6(void *input);
+ static void do_release6(void *input);
+ static void start_bound(struct client_state *client);
++static void start_decline6(struct client_state *client);
++static void do_decline6(void *input);
+ static void start_informed(struct client_state *client);
+ void informed_handler(struct packet *packet, struct client_state *client);
+ void bound_handler(struct packet *packet, struct client_state *client);
+@@ -2314,6 +2316,7 @@ start_release6(struct client_state *clie
+ 	cancel_timeout(do_select6, client);
+ 	cancel_timeout(do_refresh6, client);
+ 	cancel_timeout(do_release6, client);
++	cancel_timeout(do_decline6, client);
+ 	client->state = S_STOPPED;
+ 
+ 	/*
+@@ -2968,6 +2971,7 @@ dhc6_check_reply(struct client_state *cl
+ 		break;
+ 
+ 	      case S_STOPPED:
++	      case S_DECLINED:
+ 		action = dhc6_stop_action;
+ 		break;
+ 
+@@ -3084,6 +3088,7 @@ dhc6_check_reply(struct client_state *cl
+ 		break;
+ 
+ 	      case S_STOPPED:
++	      case S_DECLINED:
+ 		/* Nothing critical to do at this stage. */
+ 		break;
+ 
+@@ -4214,17 +4219,23 @@ reply_handler(struct packet *packet, str
+ 	cancel_timeout(do_select6, client);
+ 	cancel_timeout(do_refresh6, client);
+ 	cancel_timeout(do_release6, client);
++	cancel_timeout(do_decline6, client);
+ 
+ 	/* If this is in response to a Release/Decline, clean up and return. */
+-	if (client->state == S_STOPPED) {
+-		if (client->active_lease == NULL)
+-			return;
++	if ((client->state == S_STOPPED) ||
++	    (client->state == S_DECLINED)) {
++
++		if (client->active_lease != NULL) {
++			dhc6_lease_destroy(&client->active_lease, MDL);
++			client->active_lease = NULL;
++			/* We should never wait for nothing!? */
++			if (stopping_finished())
++				exit(0);
++		}
++
++		if (client->state == S_DECLINED)
++			start_init6(client);
+ 
+-		dhc6_lease_destroy(&client->active_lease, MDL);
+-		client->active_lease = NULL;
+-		/* We should never wait for nothing!? */
+-		if (stopping_finished())
+-			exit(0);
+ 		return;
+ 	}
+ 
+@@ -4798,7 +4809,11 @@ start_bound(struct client_state *client)
+ 			dhc6_marshall_values("new_", client, lease, ia, addr);
+ 			script_write_requested6(client);
+ 
+-			script_go(client);
++			// when script returns 3, DAD failed
++			if (script_go(client) == 3) {
++				start_decline6(client);
++				return;
++			}
+ 		}
+ 
+ 		/* XXX: maybe we should loop on the old values instead? */
+@@ -4851,6 +4866,149 @@ start_bound(struct client_state *client)
+ 	dhc6_check_times(client);
+ }
+ 
++/*
++ * Decline addresses.
++ */
++void
++start_decline6(struct client_state *client)
++{
++	/* Cancel any pending transmissions */
++	cancel_timeout(do_confirm6, client);
++	cancel_timeout(do_select6, client);
++	cancel_timeout(do_refresh6, client);
++	cancel_timeout(do_release6, client);
++	cancel_timeout(do_decline6, client);
++	client->state = S_DECLINED;
++
++	if (client->active_lease == NULL)
++		return;
++
++	/* Set timers per RFC3315 section 18.1.7. */
++	client->IRT = DEC_TIMEOUT * 100;
++	client->MRT = 0;
++	client->MRC = DEC_MAX_RC;
++	client->MRD = 0;
++
++	dhc6_retrans_init(client);
++	client->v6_handler = reply_handler;
++
++	client->refresh_type = DHCPV6_DECLINE;
++	do_decline6(client);
++}
++
++/*
++ * do_decline6() creates a Decline packet and transmits it.
++ */
++static void
++do_decline6(void *input)
++{
++	struct client_state *client;
++	struct data_string ds;
++	struct timeval elapsed, tv;
++	int send_ret, added;
++
++	client = input;
++
++	if ((client->active_lease == NULL) || !active_prefix(client))
++		return;
++
++	if ((client->MRC != 0) && (client->txcount > client->MRC))  {
++		log_info("Max retransmission count exceeded.");
++		goto decline_done;
++	}
++
++	/*
++	 * Start_time starts at the first transmission.
++	 */
++	if (client->txcount == 0) {
++		client->start_time.tv_sec = cur_tv.tv_sec;
++		client->start_time.tv_usec = cur_tv.tv_usec;
++	}
++
++	/* elapsed = cur - start */
++	elapsed.tv_sec = cur_tv.tv_sec - client->start_time.tv_sec;
++	elapsed.tv_usec = cur_tv.tv_usec - client->start_time.tv_usec;
++	if (elapsed.tv_usec < 0) {
++		elapsed.tv_sec -= 1;
++		elapsed.tv_usec += 1000000;
++	}
++
++	memset(&ds, 0, sizeof(ds));
++	if (!buffer_allocate(&ds.buffer, 4, MDL)) {
++		log_error("Unable to allocate memory for Decline.");
++		goto decline_done;
++	}
++
++	ds.data = ds.buffer->data;
++	ds.len = 4;
++	ds.buffer->data[0] = DHCPV6_DECLINE;
++	memcpy(ds.buffer->data + 1, client->dhcpv6_transaction_id, 3);
++
++	/* Form an elapsed option. */
++	/* Maximum value is 65535 1/100s coded as 0xffff. */
++	if ((elapsed.tv_sec < 0) || (elapsed.tv_sec > 655) ||
++	    ((elapsed.tv_sec == 655) && (elapsed.tv_usec > 350000))) {
++		client->elapsed = 0xffff;
++	} else {
++		client->elapsed = elapsed.tv_sec * 100;
++		client->elapsed += elapsed.tv_usec / 10000;
++	}
++
++	client->elapsed = htons(client->elapsed);
++
++	log_debug("XMT: Forming Decline.");
++	make_client6_options(client, &client->sent_options,
++			     client->active_lease, DHCPV6_DECLINE);
++	dhcpv6_universe.encapsulate(&ds, NULL, NULL, client, NULL,
++				    client->sent_options, &global_scope,
++				    &dhcpv6_universe);
++
++	/* Append IA's (but don't release temporary addresses). */
++	if (wanted_ia_na &&
++	    dhc6_add_ia_na(client, &ds, client->active_lease,
++			   DHCPV6_DECLINE, 0, &added) != ISC_R_SUCCESS) {
++		data_string_forget(&ds, MDL);
++		goto decline_done;
++	}
++	if (wanted_ia_pd &&
++	    dhc6_add_ia_pd(client, &ds, client->active_lease,
++			   DHCPV6_DECLINE, 0, &added) != ISC_R_SUCCESS) {
++		data_string_forget(&ds, MDL);
++		goto decline_done;
++	}
++
++	/* Transmit and wait. */
++	log_info("XMT: Decline on %s, interval %ld0ms.",
++		 client->name ? client->name : client->interface->name,
++		 (long int)client->RT);
++
++	send_ret = send_packet6(client->interface, ds.data, ds.len,
++				&DHCPv6DestAddr);
++	if (send_ret != ds.len) {
++		log_error("dhc6: sendpacket6() sent %d of %d bytes",
++			  send_ret, ds.len);
++	}
++
++	data_string_forget(&ds, MDL);
++
++	/* Wait RT */
++	tv.tv_sec = cur_tv.tv_sec + client->RT / 100;
++	tv.tv_usec = cur_tv.tv_usec + (client->RT % 100) * 10000;
++	if (tv.tv_usec >= 1000000) {
++		tv.tv_sec += 1;
++		tv.tv_usec -= 1000000;
++	}
++	add_timeout(&tv, do_decline6, client, NULL, NULL);
++	dhc6_retrans_advance(client);
++	return;
++
++decline_done:
++	dhc6_lease_destroy(&client->active_lease, MDL);
++	client->active_lease = NULL;
++	start_init6(client);
++	return;
++}
++
+ /* While bound, ignore packets.  In the future we'll want to answer
+  * Reconfigure-Request messages and the like.
+  */

SOURCES/dhcp-sharedlib.patch

@@ -0,0 +1,149 @@
+diff --git a/client/Makefile.am b/client/Makefile.am
+index b85f5d2..b1ecf82 100644
+--- a/client/Makefile.am
++++ b/client/Makefile.am
+@@ -15,6 +15,6 @@ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
+ 		   scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
+ 		   scripts/netbsd scripts/nextstep scripts/openbsd \
+ 		   scripts/solaris scripts/openwrt
+-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(BIND_LIBS)
++dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la $(BIND_LIBS)
+ man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
+ EXTRA_DIST = $(man_MANS)
+diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
+index 196aa44..1ccaa05 100644
+--- a/common/tests/Makefile.am
++++ b/common/tests/Makefile.am
+@@ -15,22 +15,22 @@ ATF_TESTS += alloc_unittest dns_unittest misc_unittest ns_name_unittest
+ alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
+ alloc_unittest_LDADD = $(ATF_LDFLAGS)
+ alloc_unittest_LDADD += ../libdhcp.a  \
+-	../../omapip/libomapi.a $(BIND_LIBS)
++	../../omapip/libomapi.la $(BIND_LIBS)
+ 
+ dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
+ dns_unittest_LDADD = $(ATF_LDFLAGS)
+ dns_unittest_LDADD += ../libdhcp.a  \
+-	../../omapip/libomapi.a $(BIND_LIBS)
++	../../omapip/libomapi.la $(BIND_LIBS)
+ 
+ misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
+ misc_unittest_LDADD = $(ATF_LDFLAGS)
+ misc_unittest_LDADD += ../libdhcp.a  \
+-	../../omapip/libomapi.a $(BIND_LIBS)
++	../../omapip/libomapi.la $(BIND_LIBS)
+ 
+ ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c
+ ns_name_unittest_LDADD = $(ATF_LDFLAGS)
+ ns_name_unittest_LDADD += ../libdhcp.a  \
+-	../../omapip/libomapi.a $(BIND_LIBS)
++	../../omapip/libomapi.la $(BIND_LIBS)
+ 
+ check: $(ATF_TESTS)
+ 	@if test $(top_srcdir) != ${top_builddir}; then \
+diff --git a/configure.ac b/configure.ac
+index f594cfa..adc98a8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,7 +47,8 @@ AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes")
+ # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
+ AC_USE_SYSTEM_EXTENSIONS
+ 
+-AC_PROG_RANLIB
++# Use libtool to simplify building of shared libraries
++AC_PROG_LIBTOOL
+ 
+ AC_PATH_PROG(AR, ar)
+ AC_SUBST(AR)
+diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am
+index fa20a78..dd016e4 100644
+--- a/dhcpctl/Makefile.am
++++ b/dhcpctl/Makefile.am
+@@ -1,17 +1,17 @@
+ BIND_LIBS = @BIND_LIBS@
+ 
+ bin_PROGRAMS = omshell
+-lib_LIBRARIES = libdhcpctl.a
++lib_LTLIBRARIES = libdhcpctl.la
+ noinst_PROGRAMS = cltest
+ man_MANS = omshell.1 dhcpctl.3
+ EXTRA_DIST = $(man_MANS)
+ 
+ omshell_SOURCES = omshell.c
+-omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
++omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
+ 	        $(BIND_LIBS)
+ 
+-libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
++libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c
+ 
+ cltest_SOURCES = cltest.c
+-cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
++cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
+ 	       $(BIND_LIBS)
+diff --git a/omapip/Makefile.am b/omapip/Makefile.am
+index b0d2680..265bcef 100644
+--- a/omapip/Makefile.am
++++ b/omapip/Makefile.am
+@@ -1,9 +1,9 @@
+ BIND_LIBS = @BIND_LIBS@
+ 
+-lib_LIBRARIES = libomapi.a
++lib_LTLIBRARIES = libomapi.la
+ noinst_PROGRAMS = svtest
+ 
+-libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
++libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
+ 		     errwarn.c listener.c dispatch.c generic.c support.c \
+ 		     handle.c message.c convert.c hash.c auth.c inet_addr.c \
+ 		     array.c trace.c toisc.c iscprint.c isclib.c
+@@ -12,5 +12,5 @@ man_MANS = omapi.3
+ EXTRA_DIST = $(man_MANS)
+ 
+ svtest_SOURCES = test.c
+-svtest_LDADD = libomapi.a $(BIND_LIBS)
++svtest_LDADD = libomapi.la $(BIND_LIBS)
+ 
+diff --git a/relay/Makefile.am b/relay/Makefile.am
+index c9a1cba..316a524 100644
+--- a/relay/Makefile.am
++++ b/relay/Makefile.am
+@@ -4,7 +4,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
+ 
+ sbin_PROGRAMS = dhcrelay
+ dhcrelay_SOURCES = dhcrelay.c
+-dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
++dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
+ 		 $(BIND_LIBS)
+ man_MANS = dhcrelay.8
+ EXTRA_DIST = $(man_MANS)
+diff --git a/server/Makefile.am b/server/Makefile.am
+index 30cf2b1..f56f310 100644
+--- a/server/Makefile.am
++++ b/server/Makefile.am
+@@ -15,8 +15,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
+ 		dhcpv6.c mdb6.c ldap.c ldap_casa.c leasechain.c ldap_krb_helper.c
+ 
+ dhcpd_CFLAGS = $(LDAP_CFLAGS)
+-dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+-	      ../dhcpctl/libdhcpctl.a $(BIND_LIBS) $(LDAP_LIBS)
++dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
++	      ../dhcpctl/libdhcpctl.la $(BIND_LIBS) $(LDAP_LIBS)
+ 
+ man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
+ EXTRA_DIST = $(man_MANS)
+diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
+index 771de06..8d8a2c1 100644
+--- a/server/tests/Makefile.am
++++ b/server/tests/Makefile.am
+@@ -20,8 +20,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c      \
+           ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c        \
+           ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c
+ 
+-DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \
+-          $(top_builddir)/dhcpctl/libdhcpctl.a $(BIND_LIBS)
++DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la \
++          $(top_builddir)/dhcpctl/libdhcpctl.la $(BIND_LIBS)
+ 
+ ATF_TESTS =
+ if HAVE_ATF

SOURCES/dhcp-stateless-DUID-LLT.patch

@@ -0,0 +1,13 @@
+diff -up dhcp-4.3.4/client/dhclient.c.stateless-DUID-LLT dhcp-4.3.4/client/dhclient.c
+--- dhcp-4.3.4/client/dhclient.c.stateless-DUID-LLT	2016-04-29 13:13:50.467360008 +0200
++++ dhcp-4.3.4/client/dhclient.c	2016-04-29 13:14:53.389375428 +0200
+@@ -1317,6 +1317,9 @@ void run_stateless(int exit_mode, u_int1
+ 			data_string_forget(&default_duid, MDL);
+ 
+ 		form_duid(&default_duid, MDL);
++		if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS &&
++		    duid_type == DUID_LLT)
++			write_duid(&default_duid);
+ 	}
+ 
+ #ifdef DHCP4o6

SOURCES/dhcp-statement_parser.patch

@@ -1,18 +1,8 @@
-From 02b4ae1953d39f1b6c3f0e63aefb72114039ab50 Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Tue, 22 Jun 2021 06:56:29 +0200
-Subject: [PATCH 28/29] Fix for  CVE-2021-25217
-Cc: pzhukov@redhat.com
-
----
- common/parse.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
 diff --git a/common/parse.c b/common/parse.c
-index f17bc0b..4e8b408 100644
+index e78223c2..656b378b 100644
 --- a/common/parse.c
 +++ b/common/parse.c
-@@ -5587,13 +5587,14 @@ int parse_X (cfile, buf, max)
+@@ -5790,13 +5790,14 @@ int parse_X (cfile, buf, max)
  				skip_to_semi (cfile);
  				return 0;
  			}
@@ -29,6 +19,3 @@ index f17bc0b..4e8b408 100644
  			token = peek_token (&val, (unsigned *)0, cfile);
  			if (token == COLON)
  				token = next_token (&val,
--- 
-2.26.3
-

SOURCES/dhcp-unicast-bootp.patch

@@ -1,19 +1,6 @@
-From 7e8cc8388ac31c5c2b1a423c6b2da0491b19f6f9 Mon Sep 17 00:00:00 2001
-From: Pavel Zhukov <pzhukov@redhat.com>
-Date: Thu, 21 Feb 2019 10:22:41 +0100
-Subject: [PATCH 04/26] Support unicast BOOTP for IBM pSeries systems (and
- maybe others)
-Cc: pzhukov@redhat.com
-
----
- server/bootp.c | 12 +++++++++++-
- server/dhcp.c  | 33 ++++++++++++++++++++++++++-------
- 2 files changed, 37 insertions(+), 8 deletions(-)
-
-diff --git a/server/bootp.c b/server/bootp.c
-index 26a7607..2212f31 100644
---- a/server/bootp.c
-+++ b/server/bootp.c
+diff -up dhcp-4.3.4/server/bootp.c.unicast dhcp-4.3.4/server/bootp.c
+--- dhcp-4.3.4/server/bootp.c.unicast	2016-03-22 14:16:51.000000000 +0100
++++ dhcp-4.3.4/server/bootp.c	2016-05-02 15:09:40.023243008 +0200
 @@ -52,6 +52,7 @@ void bootp (packet)
  	char msgbuf [1024];
  	int ignorep;
@@ -47,11 +34,10 @@ index 26a7607..2212f31 100644
  
  	/* If it comes from a client that already knows its address
  	   and is not requesting a broadcast response, and we can
-diff --git a/server/dhcp.c b/server/dhcp.c
-index 6f3a91f..20f2a62 100644
---- a/server/dhcp.c
-+++ b/server/dhcp.c
-@@ -5224,6 +5224,7 @@ int locate_network (packet)
+diff -up dhcp-4.3.4/server/dhcp.c.unicast dhcp-4.3.4/server/dhcp.c
+--- dhcp-4.3.4/server/dhcp.c.unicast	2016-03-22 14:16:51.000000000 +0100
++++ dhcp-4.3.4/server/dhcp.c	2016-05-02 15:10:13.255267511 +0200
+@@ -5132,6 +5132,7 @@ int locate_network (packet)
  	struct data_string data;
  	struct subnet *subnet = (struct subnet *)0;
  	struct option_cache *oc;
@@ -59,7 +45,7 @@ index 6f3a91f..20f2a62 100644
  
  #if defined(DHCPv6) && defined(DHCP4o6)
  	if (dhcpv4_over_dhcpv6 && (packet->dhcp4o6_response != NULL)) {
-@@ -5245,12 +5246,24 @@ int locate_network (packet)
+@@ -5153,12 +5154,24 @@ int locate_network (packet)
  	   from the interface, if there is one.   If not, fail. */
  	if (!oc && !packet -> raw -> giaddr.s_addr) {
  		if (packet -> interface -> shared_network) {
@@ -89,7 +75,7 @@ index 6f3a91f..20f2a62 100644
  	}
  
  	/* If there's an option indicating link connection, and it's valid,
-@@ -5277,7 +5290,10 @@ int locate_network (packet)
+@@ -5185,7 +5198,10 @@ int locate_network (packet)
  		data_string_forget (&data, MDL);
  	} else {
  		ia.len = 4;
@@ -101,7 +87,7 @@ index 6f3a91f..20f2a62 100644
  	}
  
  	/* If we know the subnet on which the IP address lives, use it. */
-@@ -5285,7 +5301,10 @@ int locate_network (packet)
+@@ -5193,7 +5209,10 @@ int locate_network (packet)
  		shared_network_reference (&packet -> shared_network,
  					  subnet -> shared_network, MDL);
  		subnet_dereference (&subnet, MDL);
@@ -113,6 +99,3 @@ index 6f3a91f..20f2a62 100644
  	}
  
  	/* Otherwise, fail. */
--- 
-2.14.5
-

SOURCES/dhcp.sysusers

@@ -1,3 +0,0 @@
-#Type Name     ID             GECOS                 Home directory Shell
-g     dhcpd    177
-u     dhcpd    177            "DHCP server"         /              /sbin/nologin

SOURCES/dont-drop-bounds-twice.patch

@@ -1,15 +0,0 @@
-diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
-index c4ee5ba..1c6531a 100644
---- a/relay/dhcrelay.c
-+++ b/relay/dhcrelay.c
-@@ -843,8 +843,8 @@ main(int argc, char **argv) {
- #ifdef HAVE_LIBCAP_NG
- 	/* Drop all capabilities */
- 	if (!keep_capabilities) {
--		capng_clear(CAPNG_SELECT_BOTH);
--		capng_apply(CAPNG_SELECT_BOTH);
-+		capng_clear(CAPNG_SELECT_CAPS);
-+		capng_apply(CAPNG_SELECT_CAPS);
- 		log_info ("Dropped all capabilities.");
- 	}
- #endif