dhcp: Update to 4.3.5b1

[people/arne_f/ipfire-3.x.git] / dhcp / patches / 0010-dhcp-paths.patch

diff --git a/dhcp/patches/dhcp-4.2.4-paths.patch b/dhcp/patches/0010-dhcp-paths.patch
similarity index 57%
rename from dhcp/patches/dhcp-4.2.4-paths.patch
rename to dhcp/patches/0010-dhcp-paths.patch
index 52647ac162c705897c89dd7548667f23ef58b88d..59a711dad7ee4464e026839ed746d0f8fe943639 100644 (file)
--- a/dhcp/patches/dhcp-4.2.4-paths.patch
+++ b/dhcp/patches/0010-dhcp-paths.patch
@@ -1,6 +1,6 @@
-diff -up dhcp-4.2.4-P2/doc/examples/dhcpd-dhcpv6.conf.paths dhcp-4.2.4-P2/doc/examples/dhcpd-dhcpv6.conf
---- dhcp-4.2.4-P2/doc/examples/dhcpd-dhcpv6.conf.paths  2012-08-24 21:11:21.000000000 +0200
-+++ dhcp-4.2.4-P2/doc/examples/dhcpd-dhcpv6.conf        2012-10-26 18:10:08.716560729 +0200
+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;
  
@@ -10,10 +10,10 @@ diff -up dhcp-4.2.4-P2/doc/examples/dhcpd-dhcpv6.conf.paths dhcp-4.2.4-P2/doc/ex
  
  # Static definition (must be global)
  host myclient {
-diff -up dhcp-4.2.4b1/includes/dhcpd.h.paths dhcp-4.2.4b1/includes/dhcpd.h
---- dhcp-4.2.4b1/includes/dhcpd.h.paths        2012-04-18 11:12:34.000000000 +0200
-+++ dhcp-4.2.4b1/includes/dhcpd.h      2012-04-18 11:14:38.541272405 +0200
-@@ -1420,7 +1420,7 @@ typedef unsigned char option_mask [16];
+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
@@ -22,7 +22,7 @@ diff -up dhcp-4.2.4b1/includes/dhcpd.h.paths dhcp-4.2.4b1/includes/dhcpd.h
  #endif /* DEBUG */
  
  #ifndef _PATH_DHCPD_DB
-@@ -1442,11 +1442,11 @@ typedef unsigned char option_mask [16];
+@@ -1451,11 +1451,11 @@ typedef unsigned char option_mask [16];
  #endif /* DEBUG */
  
  #ifndef _PATH_DHCLIENT_CONF