From 12b1eadd7fe5ef1bf6c3df2d7980eb38b24f90e2 Mon Sep 17 00:00:00 2001 From: cr6git Date: Fri, 2 Mar 2018 03:03:22 +0100 Subject: [PATCH] dhcp: update to 4.3.6P1, add patch iproute2 --- srcpkgs/dhcp/patches/0002-iproute2.patch | 13 +++++++++++++ srcpkgs/dhcp/template | 7 ++++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/dhcp/patches/0002-iproute2.patch diff --git a/srcpkgs/dhcp/patches/0002-iproute2.patch b/srcpkgs/dhcp/patches/0002-iproute2.patch new file mode 100644 index 0000000000..8f7297eac6 --- /dev/null +++ b/srcpkgs/dhcp/patches/0002-iproute2.patch @@ -0,0 +1,13 @@ +diff --git a/client/scripts/linux b/client/scripts/linux +index 5fb16121..c4cef632 100755 +--- client/scripts/linux ++++ client/scripts/linux +@@ -362,7 +362,7 @@ case "$reason" in + interface_up_wait_time=5 + for i in $(seq 0 ${interface_up_wait_time}) + do +- ifconfig ${interface} | grep RUNNING >/dev/null 2>&1 ++ ${ip} link show dev ${interface} | grep -q LOWER_UP 2>&1 + if [ $? -eq 0 ]; then + break; + fi diff --git a/srcpkgs/dhcp/template b/srcpkgs/dhcp/template index 916990e886..542d351d7e 100644 --- a/srcpkgs/dhcp/template +++ b/srcpkgs/dhcp/template @@ -1,7 +1,8 @@ # Template file for 'dhcp' pkgname=dhcp -version=4.3.6 +version=4.3.6P1 revision=1 +wrksrc="dhcp-${version/P/-P}" build_style=gnu-configure disable_parallel_build=yes hostmakedepends="perl" @@ -10,8 +11,8 @@ short_desc="Server from the Internet Software Consortium's implementation of DHC 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=a41eaf6364f1377fe065d35671d9cf82bbbc8f21207819b2b9f33f652aec6f1b +distfiles="http://ftp.isc.org/isc/dhcp/${version/P/-P}/dhcp-${version/P/-P}.tar.gz" +checksum=2fd177bef02856f05fe17713ced9bfcc7d94f14c933c15f2f2fbedc9cc57a3c3 pre_configure() { local _args=" --sbindir=/usr/bin --enable-paranoia