dhcp: Update to 4.4.1

[people/stevee/ipfire-3.x.git] / dhcp / patches / 0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch

diff --git a/dhcp/patches/0005-dhcp-release-by-ifup.patch b/dhcp/patches/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch
similarity index 75%
rename from dhcp/patches/0005-dhcp-release-by-ifup.patch
rename to dhcp/patches/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch
index 677eb5c752f0713bac56e01e83f972d911e5e2a1..34301d936796e81c90c4e6542498723ee1839ab0 100644 (file)
--- a/dhcp/patches/0005-dhcp-release-by-ifup.patch
+++ b/dhcp/patches/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch
@@ -1,10 +1,21 @@
-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);
+From 692fd8b16ef6f12a57596351e930c65c68597bac 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/21] 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) {
+                               }
+                       }
+                       fclose(pidfd);
 +              } else {
 +                      /* handle release for interfaces requested with Red Hat
 +                       * /sbin/ifup - pidfile will be /var/run/dhclient-$interface.pid
@@ -75,11 +86,13 @@ diff -up dhcp-4.3.0a1/client/dhclient.c.ifup dhcp-4.3.0a1/client/dhclient.c
 +              if (dhc_running) {
 +                      log_fatal("dhclient(%u) is already running - exiting. ", dhcpid);
 +                      return(1);
-               }
-       }
- 
+               }
+       }
+
 +      write_client_pid_file();
 +
-       if (!quiet) {
-               log_info("%s %s", message, PACKAGE_VERSION);
-               log_info(copyright);
+       if (!quiet) {
+               log_info("%s %s", message, PACKAGE_VERSION);
+               log_info(copyright);
+--
+2.14.5