From d620ea3cb03e98582f347512752704c5595f2178 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 26 Nov 2016 09:25:06 +0100
Subject: dhcp: update to 4.3.5, add a buildroot patch

---
 package/dhcp/patches/patch-bind_Makefile_in  | 54 ++++++++++++++++++++++++++++
 package/dhcp/patches/patch-common_discover_c |  6 ++--
 2 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 package/dhcp/patches/patch-bind_Makefile_in

(limited to 'package/dhcp/patches')

diff --git a/package/dhcp/patches/patch-bind_Makefile_in b/package/dhcp/patches/patch-bind_Makefile_in
new file mode 100644
index 000000000..c6ffe3f33
--- /dev/null
+++ b/package/dhcp/patches/patch-bind_Makefile_in
@@ -0,0 +1,54 @@
+--- dhcp-4.3.5.orig/bind/Makefile.in	2016-09-27 21:54:32.000000000 +0200
++++ dhcp-4.3.5/bind/Makefile.in	2016-11-26 07:21:39.000000000 +0100
+@@ -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
+@@ -64,7 +66,7 @@ bind1:
+ 		echo Configuring BIND Export libraries for DHCP. ;      \
+ 		rm -rf ${cleandirs} ${cleanfiles} ;                     \
+ 		(cd ${bindsrcdir} &&                                    \
+-                 ./configure ${bindconfig} > ${binddir}/configure.log); \
++                 GCC_HONOUR_COPTS=s ./configure ${bindconfig}) ;				\
+ 	fi
+ 
+ atf:
+@@ -90,11 +92,11 @@ bind2-noguest:
+ 		echo Building BIND Export libraries - this takes some time. ;\
+ 		(cd ${bindsrcdir}/lib/export ;                               \
+ 		  echo building in `pwd` ;                                   \
+-		  MAKE=${GMAKE} ${GMAKE} >> ${binddir}/build.log) ;          \
++		  GCC_HONOUR_COPTS=s MAKE=${GMAKE} ${GMAKE} ) ;          \
+                                                                              \
+ 		echo Installing BIND Export libraries to ${binddir}. ;       \
+ 		(cd ${bindsrcdir}/lib/export ;                               \
+-		  MAKE=${GMAKE} ${GMAKE} install > ${binddir}/install.log) ; \
++		  GCC_HONOUR_COPTS=s MAKE=${GMAKE} ${GMAKE} install ) ; \
+ 	fi
+ 
+ bind2-hostgen:
+@@ -106,14 +108,14 @@ bind2-hostgen:
+ 		echo Building BIND Export libraries - this takes some time. ;\
+ 		(cd ${bindsrcdir}/lib/export/dns ; \
+ 		 echo building gen using ${BUILD_CC} in `pwd` ; \
+-		 MAKE=${GMAKE} ${GMAKE} CC=${BUILD_CC} CFLAGS=${BUILD_CFLAGS} CPPFLAGS=${BUILD_CPPFLAGS} LDFLAGS=${BUILD_LDFLAGS} LIBS=${BUILD_LIBS} gen >> ${binddir}/build.log) ; \
++		 GCC_HONOUR_COPTS=s MAKE=${GMAKE} ${GMAKE} CC=${BUILD_CC} CFLAGS=${BUILD_CFLAGS} CPPFLAGS=${BUILD_CPPFLAGS} LDFLAGS=${BUILD_LDFLAGS} LIBS=${BUILD_LIBS} gen ) ; \
+ 		(cd ${bindsrcdir}/lib/export ;                               \
+ 		  echo building in `pwd` ;                                   \
+-		  MAKE=${GMAKE} ${GMAKE} >> ${binddir}/build.log) ;          \
++		  GCC_HONOUR_COPTS=s MAKE=${GMAKE} ${GMAKE} ) ;          \
+                                                                              \
+ 		echo Installing BIND Export libraries to ${binddir}. ;       \
+ 		(cd ${bindsrcdir}/lib/export ;                               \
+-		  MAKE=${GMAKE} ${GMAKE} install > ${binddir}/install.log) ; \
++		  GCC_HONOUR_COPTS=s MAKE=${GMAKE} ${GMAKE} install ) ; \
+ 	fi
+ 
+ clean:
diff --git a/package/dhcp/patches/patch-common_discover_c b/package/dhcp/patches/patch-common_discover_c
index 8f74086ff..372ca8e1c 100644
--- a/package/dhcp/patches/patch-common_discover_c
+++ b/package/dhcp/patches/patch-common_discover_c
@@ -1,6 +1,6 @@
---- dhcp-4.1.0.orig/common/discover.c	2008-08-29 19:48:57.000000000 +0200
-+++ dhcp-4.1.0/common/discover.c	2009-06-12 21:18:42.000000000 +0200
-@@ -684,8 +684,8 @@ next_iface6(struct iface_info *info, int
+--- dhcp-4.3.5.orig/common/discover.c	2016-09-27 21:16:50.000000000 +0200
++++ dhcp-4.3.5/common/discover.c	2016-11-26 07:09:35.000000000 +0100
+@@ -692,8 +692,8 @@ next_iface6(struct iface_info *info, int
  	for (i=0; i<16; i++) {
  		unsigned char byte;
                  static const char hex[] = "0123456789abcdef";
-- 
cgit v1.2.3