From adf7dfd60bebf121bb525e4a07aeebaba5ac0608 Mon Sep 17 00:00:00 2001
From: Jan Palus <atler@pld-linux.org>
Date: Tue, 25 May 2021 20:16:56 +0200
Subject: [PATCH] remove dhclient_hooks_d and dhclient-decline-backoff patches
 dropped from spec in 3ae1bef

---
 dhclient_hooks_d.patch              | 56 -------------------------
 dhcp-dhclient-decline-backoff.patch | 63 -----------------------------
 2 files changed, 119 deletions(-)
 delete mode 100644 dhclient_hooks_d.patch
 delete mode 100644 dhcp-dhclient-decline-backoff.patch

diff --git a/dhclient_hooks_d.patch b/dhclient_hooks_d.patch
deleted file mode 100644
index 0544373..0000000
--- a/dhclient_hooks_d.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -dur dhcp-4.3.5.orig/client/scripts/linux dhcp-4.3.5/client/scripts/linux
---- dhcp-4.3.5.orig/client/scripts/linux	2016-09-27 21:16:50.000000000 +0200
-+++ dhcp-4.3.5/client/scripts/linux	2017-08-07 13:26:44.000000000 +0200
-@@ -69,24 +69,44 @@
- 
- # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
- exit_with_hooks() {
-+  
-   exit_status=$1
--  if [ -f /etc/dhclient-exit-hooks ]; then
--    . /etc/dhclient-exit-hooks
--  fi
--# probably should do something with exit status of the local script
-+
-+  for i in /etc/dhclient-exit-hooks.d/*[!~,] ; do
-+    [ -f "$i" ] || continue
-+    # Don't run *.{rpmsave,rpmorig,rpmnew,swp} scripts
-+    [ "${i%.rpmsave}" != "${i}" ] && continue
-+    [ "${i%.rpmorig}" != "${i}" ] && continue
-+    [ "${i%.rpmnew}" != "${i}" ] && continue
-+    [ "${i%.swp}" != "${i}" ] && continue
-+    [ "${i%,v}" != "${i}" ] && continue
-+
-+    . ${i}
-+  done
-+
-+  # probably should do something with exit status of the local script
-   exit $exit_status
- }
- 
- # Invoke the local dhcp client enter hooks, if they exist.
--if [ -f /etc/dhclient-enter-hooks ]; then
--  exit_status=0
--  . /etc/dhclient-enter-hooks
-+exit_status=0
-+for i in /etc/dhclient-enter-hooks.d/*[!~,] ; do
-+  [ -f "$i" ] || continue
-+  # Don't run *.{rpmsave,rpmorig,rpmnew,swp} scripts
-+  [ "${i%.rpmsave}" != "${i}" ] && continue
-+  [ "${i%.rpmorig}" != "${i}" ] && continue
-+  [ "${i%.rpmnew}" != "${i}" ] && continue
-+  [ "${i%.swp}" != "${i}" ] && continue
-+  [ "${i%,v}" != "${i}" ] && continue
-+
-+  . ${i}
-+  
-   # allow the local script to abort processing of this state
-   # local script must set exit_status variable to nonzero.
-   if [ $exit_status -ne 0 ]; then
-     exit $exit_status
-   fi
--fi
-+done
- 
- ###
- ### DHCPv4 Handlers
diff --git a/dhcp-dhclient-decline-backoff.patch b/dhcp-dhclient-decline-backoff.patch
deleted file mode 100644
index 645f931..0000000
--- a/dhcp-dhclient-decline-backoff.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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,6 +1745,7 @@ void bind_lease (client)
- 					 "try (declined).  Exiting.");
- 			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. */
-- 
2.44.0