diff --git a/srcpkgs/dhcp/files/003_cross_fix.patch b/srcpkgs/dhcp/files/003_cross_fix.patch deleted file mode 100644 index 60bb5ed436a..00000000000 --- a/srcpkgs/dhcp/files/003_cross_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/export/dns/Makefile.in.orig 2011-05-17 01:47:16.000000000 +0200 -+++ lib/export/dns/Makefile.in 2015-03-28 19:34:39.143820772 +0100 -@@ -166,7 +166,8 @@ code.h: gen - ./gen -s ${srcdir} > code.h - - gen: ${srcdir}/gen.c -- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS} -+ ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \ -+ ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS} - - #We don't need rbtdb64 for this library - #rbtdb64.@O@: rbtdb.c diff --git a/srcpkgs/dhcp/template b/srcpkgs/dhcp/template index 4a921f845b3..5ad463e3b69 100644 --- a/srcpkgs/dhcp/template +++ b/srcpkgs/dhcp/template @@ -1,7 +1,7 @@ # Template file for 'dhcp' pkgname=dhcp -version=4.3.4 -revision=5 +version=4.3.5 +revision=1 build_style=gnu-configure disable_parallel_build=yes hostmakedepends="perl" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="ISC" homepage="https://www.isc.org/software/dhcp" distfiles="http://ftp.isc.org/isc/dhcp/${version}/dhcp-${version}.tar.gz" -checksum=f5115aee3dd3e6925de4ba47b80ab732ba48b481c8364b6ebade2d43698d607e +checksum=eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954 pre_configure() { local _args=" --sbindir=/usr/bin --enable-paranoia @@ -22,9 +22,6 @@ pre_configure() { --with-randomdev=/dev/random" local cargs="$(echo $configure_args | tr '\n' ' ')" - # patching bind Makefile to patch with a cross fix while building (WTF?!) - sed -i "s#./configure#patch -p0 < $FILESDIR/003_cross_fix.patch \&\& ./configure --with-randomdev=/dev/random $cargs#" bind/Makefile.in - # set real configure_args export configure_args+="${_args}" }