dhcp: Update to 4.4.1

[people/pmueller/ipfire-2.x.git] / src / patches / dhcp / dhcp-paths.patch

diff --git a/src/patches/dhcp/dhcp-paths.patch b/src/patches/dhcp/dhcp-paths.patch
deleted file mode 100644 (file)
index 2f43e51..0000000
--- a/src/patches/dhcp/dhcp-paths.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- expanded_org/includes/dhcpd.h      Wed Aug 06 23:35:02 2014
-+++ expanded_patched_51_4_2_0_paths_patch/includes/dhcpd.h     Mon Feb 16 13:22:11 2015
-@@ -1424,15 +1424,15 @@
- #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
--#define _PATH_DHCPD_DB                LOCALSTATEDIR"/db/dhcpd.leases"
-+#define _PATH_DHCPD_DB                LOCALSTATEDIR"/dhcpd/dhcpd.leases"
- #endif
- 
- #ifndef _PATH_DHCPD6_DB
--#define _PATH_DHCPD6_DB               LOCALSTATEDIR"/db/dhcpd6.leases"
-+#define _PATH_DHCPD6_DB               LOCALSTATEDIR"/dhcpd/dhcpd6.leases"
- #endif
- 
- #ifndef _PATH_DHCPD_PID
-@@ -1446,7 +1446,7 @@
- #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
-@@ -1462,11 +1462,11 @@
- #endif
- 
- #ifndef _PATH_DHCLIENT_DB
--#define _PATH_DHCLIENT_DB     LOCALSTATEDIR"/db/dhclient.leases"
-+#define _PATH_DHCLIENT_DB     LOCALSTATEDIR"/dhclient/dhclient.leases"
- #endif
- 
- #ifndef _PATH_DHCLIENT6_DB
--#define _PATH_DHCLIENT6_DB    LOCALSTATEDIR"/db/dhclient6.leases"
-+#define _PATH_DHCLIENT6_DB    LOCALSTATEDIR"/dhclient/dhclient6.leases"
- #endif
- 
- #ifndef _PATH_RESOLV_CONF