diff --git a/srcpkgs/dhcp/template b/srcpkgs/dhcp/template index 3ec447fe80c..bd1ea8a591c 100644 --- a/srcpkgs/dhcp/template +++ b/srcpkgs/dhcp/template @@ -1,7 +1,7 @@ # Template file for 'dhcp' pkgname=dhcp version=4.2.3 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="perl" short_desc="Server from the Internet Software Consortium's implementation of DHCP" @@ -11,20 +11,18 @@ homepage="https://www.isc.org/software/dhcp" distfiles="ftp://ftp.isc.org/isc/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz" checksum=505c5754526ba92669bfd64daa8b529c6694c4528b45c3f35743c6fd4bd72897 conf_files="/etc/dhcpd.conf" -_configure_args+="--sbindir=/usr/bin --sysconfdir=/etc --enable-paranoia +_configure_args+=" --enable-paranoia --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases --with-cli-lease-file=/var/lib/dhclient/dhclient.leases --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases" pre_configure() { - if [ "$CROSS_BUILD" ]; then - # assume that there is /dev/random. Fixes cross compiling - sed -i "2i\ac_cv_file__dev_random=yes" configure + # assume that there is /dev/random. Fixes cross compiling + sed -i "2i\ac_cv_file__dev_random=yes" configure - # patching bind Makefile to patch with a cross fix while building (WTF?!) - sed -i "s#./configure#patch -p0 < $FILESDIR/003_cross_fix.patch \&\& ac_cv_file__dev_random=yes ./configure $configure_args#" bind/Makefile - fi + # patching bind Makefile to patch with a cross fix while building (WTF?!) + sed -i "s#./configure#patch -p0 < $FILESDIR/003_cross_fix.patch \&\& ac_cv_file__dev_random=yes ./configure $configure_args#" bind/Makefile # set real configure_args configure_args+="$_configure_args" @@ -40,7 +38,7 @@ dhclient_package() { conf_files="/etc/dhclient.conf" pkg_install() { vmove etc/dhclient.conf - vmove usr/bin/dhclient + vmove usr/sbin/dhclient vmove usr/share/man/man5/dhclient* vmove usr/share/man/man8/dhclient* vsv dhclient