From 9eb7afc0952d73fa9bb37a812a054b3990caf219 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Thu, 1 Apr 2021 22:11:05 +0200
Subject: [PATCH] - rediff patches

---
 dhcp-memory.patch          | 34 +++++++++++++++++-----------------
 dhcp-release-by-ifup.patch | 11 ++++++-----
 dhcp-timeouts.patch        | 11 ++++++-----
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/dhcp-memory.patch b/dhcp-memory.patch
index 04cfe17..8461d0a 100644
--- a/dhcp-memory.patch
+++ b/dhcp-memory.patch
@@ -1,22 +1,22 @@
-diff -up dhcp-3.0.6/common/packet.c.memory dhcp-3.0.6/common/packet.c
---- dhcp-3.0.6/common/packet.c.memory	2007-05-01 16:42:55.000000000 -0400
-+++ dhcp-3.0.6/common/packet.c	2007-07-10 11:43:29.000000000 -0400
-@@ -140,6 +140,7 @@ void assemble_udp_ip_header (interface, 
- 	struct ip ip;
- 	struct udphdr udp;
- 
-+	memset( &ip, '\0', sizeof ip);
- 	/* Fill out the IP header */
- 	IP_V_SET (&ip, 4);
- 	IP_HL_SET (&ip, 20);
-diff -up dhcp-3.0.6/common/lpf.c.memory dhcp-3.0.6/common/lpf.c
---- dhcp-3.0.6/common/lpf.c.memory	2007-07-10 11:43:29.000000000 -0400
-+++ dhcp-3.0.6/common/lpf.c	2007-07-10 11:43:29.000000000 -0400
-@@ -246,6 +246,7 @@ static void lpf_tr_filter_setup (info)
+diff -urNp -x '*.orig' dhcp-4.3.5.org/common/lpf.c dhcp-4.3.5/common/lpf.c
+--- dhcp-4.3.5.org/common/lpf.c	2016-09-27 21:16:50.000000000 +0200
++++ dhcp-4.3.5/common/lpf.c	2021-04-01 22:09:12.139265409 +0200
+@@ -247,6 +247,7 @@ static void lpf_gen_filter_setup (info)
  	struct interface_info *info;
  {
  	struct sock_fprog p;
 +	memset(&p,'\0', sizeof(struct sock_fprog));
  
- 	/* Set up the bpf filter program structure.    This is defined in
- 	   bpf.c */
+ 	memset(&p, 0, sizeof(p));
+ 
+diff -urNp -x '*.orig' dhcp-4.3.5.org/common/packet.c dhcp-4.3.5/common/packet.c
+--- dhcp-4.3.5.org/common/packet.c	2016-09-27 21:16:50.000000000 +0200
++++ dhcp-4.3.5/common/packet.c	2021-04-01 22:09:12.139265409 +0200
+@@ -145,6 +145,7 @@ void assemble_udp_ip_header (interface,
+ 
+ 	memset (&ip, 0, sizeof ip);
+ 
++	memset( &ip, '\0', sizeof ip);
+ 	/* Fill out the IP header */
+ 	IP_V_SET (&ip, 4);
+ 	IP_HL_SET (&ip, 20);
diff --git a/dhcp-release-by-ifup.patch b/dhcp-release-by-ifup.patch
index 2091b42..655c04f 100644
--- a/dhcp-release-by-ifup.patch
+++ b/dhcp-release-by-ifup.patch
@@ -1,6 +1,7 @@
---- dhcp-3.0.5/client/dhclient.c.release	2007-03-30 15:30:14.000000000 -0400
-+++ dhcp-3.0.5/client/dhclient.c	2007-03-30 15:29:58.000000000 -0400
-@@ -366,9 +366,81 @@
+diff -urNp -x '*.orig' dhcp-4.3.5.org/client/dhclient.c dhcp-4.3.5/client/dhclient.c
+--- dhcp-4.3.5.org/client/dhclient.c	2016-09-27 21:16:50.000000000 +0200
++++ dhcp-4.3.5/client/dhclient.c	2021-04-01 22:09:11.002580226 +0200
+@@ -556,9 +556,81 @@ main(int argc, char **argv) {
  				}
  			}
  			fclose(pidfd);
@@ -80,5 +81,5 @@
 +	write_client_pid_file();
 +
  	if (!quiet) {
- 		log_info ("%s %s", message, DHCP_VERSION);
- 		log_info (copyright);
+ 		log_info("%s %s", message, PACKAGE_VERSION);
+ 		log_info(copyright);
diff --git a/dhcp-timeouts.patch b/dhcp-timeouts.patch
index 3d91d14..3130105 100644
--- a/dhcp-timeouts.patch
+++ b/dhcp-timeouts.patch
@@ -1,6 +1,7 @@
---- dhcp-3.0.5/common/dispatch.c.ecat	2006-02-22 17:43:27.000000000 -0500
-+++ dhcp-3.0.5/common/dispatch.c	2007-03-30 15:54:15.000000000 -0400
-@@ -195,7 +195,6 @@
+diff -urNp -x '*.orig' dhcp-4.3.5.org/common/dispatch.c dhcp-4.3.5/common/dispatch.c
+--- dhcp-4.3.5.org/common/dispatch.c	2016-09-27 21:16:50.000000000 +0200
++++ dhcp-4.3.5/common/dispatch.c	2021-04-01 22:09:11.449254169 +0200
+@@ -410,7 +410,6 @@ void cancel_timeout (where, what)
  	}
  }
  
@@ -8,8 +9,8 @@
  void cancel_all_timeouts ()
  {
  	struct timeout *t, *n;
-@@ -216,4 +215,3 @@
- 		dfree (t, MDL);
+@@ -432,4 +431,3 @@ void relinquish_timeouts ()
+ 		dfree(t, MDL);
  	}
  }
 -#endif
-- 
2.44.0