summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-11-26 09:25:06 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2016-11-26 09:25:06 +0100
commitd620ea3cb03e98582f347512752704c5595f2178 (patch)
treee79306f9b2a7ef1890d259af14489cf8229cf898
parent6c89f848df14f4c038079854feb6578c9728fdea (diff)
dhcp: update to 4.3.5, add a buildroot patch
-rw-r--r--package/dhcp/Makefile26
-rw-r--r--package/dhcp/files/dhcpd.init4
-rw-r--r--package/dhcp/patches/patch-bind_Makefile_in54
-rw-r--r--package/dhcp/patches/patch-common_discover_c6
4 files changed, 82 insertions, 8 deletions
diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile
index cab2a6b6a..b777ef252 100644
--- a/package/dhcp/Makefile
+++ b/package/dhcp/Makefile
@@ -4,13 +4,14 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= dhcp
-PKG_VERSION:= 4.1-ESV-R12
+PKG_VERSION:= 4.3.5
PKG_RELEASE:= 1
-PKG_HASH:= 53265d1bf5e2073379df03c73a1a34d38a904307609c0f9cb77223912e753e5f
+PKG_HASH:= eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954
PKG_DESCR:= dhcp server
PKG_SECTION:= net/dns
PKG_URL:= https://www.isc.org/software/dhcp/
PKG_SITES:= ftp://ftp.isc.org/isc/dhcp/${PKG_VERSION}/
+PKG_NOPARALLEL:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
@@ -22,7 +23,26 @@ include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DHCP_RELAY},${PKG_SECTION}))
-CONFIGURE_ENV+= ac_cv_file__dev_random=yes
+MAKE_ENV+= GCC_HONOUR_COPTS=s \
+ BUILD_CC="$(HOST_CC)" \
+ BUILD_CFLAGS="$(HOST_CFLAGS)" \
+ BUILD_CPPFLAGS="$(HOST_CPPFLAGS)" \
+ BUILD_LDFLAGS="$(HOST_LDFLAGS)"
+
+CONFIGURE_ARGS+= --with-randomdev=/dev/random
+ --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
+ --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
+ --with-cli-lease-file=/var/lib/dhcp/dhclient.leases \
+ --with-cli6-lease-file=/var/lib/dhcp/dhclient6.leases \
+ --with-srv-pid-file=/var/run/dhcpd.pid \
+ --with-srv6-pid-file=/var/run/dhcpd6.pid \
+ --with-cli-pid-file=/var/run/dhclient.pid \
+ --with-cli6-pid-file=/var/run/dhclient6.pid \
+ --with-relay-pid-file=/var/run/dhcrelay.pid \
+ --with-relay6-pid-file=/var/run/dhcrelay6.pid
+
+post-extract:
+ cd $(WRKBUILD)/bind; tar -xvf bind.tar.gz
dhcp-relay-install:
${INSTALL_DIR} ${IDIR_DHCP_RELAY}/usr/sbin
diff --git a/package/dhcp/files/dhcpd.init b/package/dhcp/files/dhcpd.init
index 09b816eb0..e6cd7dafe 100644
--- a/package/dhcp/files/dhcpd.init
+++ b/package/dhcp/files/dhcpd.init
@@ -10,8 +10,8 @@ autostart)
exec sh $0 start
;;
start)
- mkdir -p /var/state/dhcp
- touch /var/state/dhcp/dhcpd.leases
+ mkdir -p /var/lib/dhcp
+ touch /var/lib/dhcp/dhcpd.leases
/usr/sbin/dhcpd $dhcpd_flags
;;
autostop|stop)
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";