dhcp: bump to version 4.3.6

Renumber the patch.

Add license hash.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/dhcp/0001-bind-cross-compile.patch b/package/dhcp/0001-bind-cross-compile.patch
new file mode 100644 (file)
index 0000000..f7c42c6
--- /dev/null
+++ b/package/dhcp/0001-bind-cross-compile.patch
@@ -0,0 +1,24 @@
+bind cross compile support integration
+
+Pass system types from dhcp configure to bind configure.
+
+This patch is submitted upstream as part of a cross compiling enhancement
+suggestion to dhcp-suggest@isc.org. Reference ISC-Bugs #41502.
+
+Signed-off-by: Doug Kehn <rdkehn@yahoo.com>
+
+Index: dhcp-4.3.3-P1/bind/Makefile.in
+===================================================================
+--- dhcp-4.3.3-P1.orig/bind/Makefile.in
++++ dhcp-4.3.3-P1/bind/Makefile.in
+@@ -30,7 +30,9 @@ bindconfig = --disable-kqueue --disable-
+       --without-openssl --without-libxml2 --enable-exportlib \
+       --with-gssapi=no --enable-threads=no @BINDCONFIG@ \
+       --with-export-includedir=${binddir}/include \
+-      --with-export-libdir=${binddir}/lib
++      --with-export-libdir=${binddir}/lib \
++      --target=@target_alias@ --host=@host_alias@ \
++      --build=@build_alias@
+ 
+ @BIND_ATF_FALSE@cleandirs = ./lib ./include
+ @BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf

diff --git a/package/dhcp/0002-bind-cross-compile.patch b/package/dhcp/0002-bind-cross-compile.patch
deleted file mode 100644 (file)
index f7c42c6..0000000
--- a/package/dhcp/0002-bind-cross-compile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-bind cross compile support integration
-
-Pass system types from dhcp configure to bind configure.
-
-This patch is submitted upstream as part of a cross compiling enhancement
-suggestion to dhcp-suggest@isc.org. Reference ISC-Bugs #41502.
-
-Signed-off-by: Doug Kehn <rdkehn@yahoo.com>
-
-Index: dhcp-4.3.3-P1/bind/Makefile.in
-===================================================================
---- dhcp-4.3.3-P1.orig/bind/Makefile.in
-+++ dhcp-4.3.3-P1/bind/Makefile.in
-@@ -30,7 +30,9 @@ bindconfig = --disable-kqueue --disable-
-       --without-openssl --without-libxml2 --enable-exportlib \
-       --with-gssapi=no --enable-threads=no @BINDCONFIG@ \
-       --with-export-includedir=${binddir}/include \
--      --with-export-libdir=${binddir}/lib
-+      --with-export-libdir=${binddir}/lib \
-+      --target=@target_alias@ --host=@host_alias@ \
-+      --build=@build_alias@
- 
- @BIND_ATF_FALSE@cleandirs = ./lib ./include
- @BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf

diff --git a/package/dhcp/dhcp.hash b/package/dhcp/dhcp.hash
index 7898aa45d3b771eb09e103424833349c77604138..ce5f995a55bbee9a01179234323f69e556f1771d 100644 (file)
--- a/package/dhcp/dhcp.hash
+++ b/package/dhcp/dhcp.hash
@@ -1,2 +1,4 @@
-# Verified from https://ftp.isc.org/isc/dhcp/4.3.5/dhcp-4.3.5.tar.gz.sha256.asc
-sha256 eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954  dhcp-4.3.5.tar.gz
+# Verified from https://ftp.isc.org/isc/dhcp/4.3.6/dhcp-4.3.6.tar.gz.sha256.asc
+sha256 a41eaf6364f1377fe065d35671d9cf82bbbc8f21207819b2b9f33f652aec6f1b  dhcp-4.3.6.tar.gz
+# Locally calculated
+sha256 dd7ae2201c0c11c3c1e2510d731c67b2f4bc8ba735707d7348ddd65f7b598562  LICENSE

diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 45cae087aae0c90c241cedb5f6a4c9ec67e7f1b1..4e1b24b7001c5111625267f4898ce1b8face2f3a 100644 (file)
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DHCP_VERSION = 4.3.5
+DHCP_VERSION = 4.3.6
 DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
 DHCP_INSTALL_STAGING = YES
 DHCP_LICENSE = ISC