diff --git a/srcpkgs/dhcpcd/patches/dhcpcd-run-hooks_runit_fix.diff b/srcpkgs/dhcpcd/patches/dhcpcd-run-hooks_runit_fix.diff deleted file mode 100644 index 02597cbe29..0000000000 --- a/srcpkgs/dhcpcd/patches/dhcpcd-run-hooks_runit_fix.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- dhcpcd-run-hooks.in.orig 2016-10-09 01:07:17.000000000 -0700 -+++ dhcpcd-run-hooks.in 2016-12-27 15:48:58.515566036 -0800 -@@ -285,11 +285,11 @@ - _service_exists="/usr/sbin/service \$1 $status >/dev/null 2>&1" - _service_cmd="/usr/sbin/service \$1 \$2" - elif [ -x /bin/sv ]; then -- _service_exists="/bin/sv status \1 >/dev/null 2>&1" -- _service_cmd="/bin/sv \$1 \$2" -+ _service_exists="/bin/sv status \$1 >/dev/null 2>&1" -+ _service_cmd="/bin/sv \$2 \$1" - elif [ -x /usr/bin/sv ]; then -- _service_exists="/usr/bin/sv status \1 >/dev/null 2>&1" -- _service_cmd="/usr/bin/sv \$1 \$2" -+ _service_exists="/usr/bin/sv status \$1 >/dev/null 2>&1" -+ _service_cmd="/usr/bin/sv \$2 \$1" - elif [ -e /etc/slackware-version -a -d /etc/rc.d ]; then - _service_exists="[ -x /etc/rc.d/rc.\$1 ]" - _service_cmd="/etc/rc.d/rc.\$1 \$2" diff --git a/srcpkgs/dhcpcd/patches/wpa-hook-stop.patch b/srcpkgs/dhcpcd/patches/wpa-hook-stop.patch index d00fbecf3f..2555efbb00 100644 --- a/srcpkgs/dhcpcd/patches/wpa-hook-stop.patch +++ b/srcpkgs/dhcpcd/patches/wpa-hook-stop.patch @@ -1,5 +1,5 @@ ---- dhcpcd-hooks/10-wpa_supplicant.orig 2014-11-26 16:34:35.000000000 +0100 -+++ dhcpcd-hooks/10-wpa_supplicant 2014-11-28 11:53:48.929217243 +0100 +--- hooks/10-wpa_supplicant.orig 2014-11-26 16:34:35.000000000 +0100 ++++ hooks/10-wpa_supplicant 2014-11-28 11:53:48.929217243 +0100 @@ -114,6 +114,6 @@ then case "$reason" in PREINIT) wpa_supplicant_start;; diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index d65b050be4..407c21fba1 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,7 +1,7 @@ # Template file for 'dhcpcd' pkgname=dhcpcd -version=6.11.5 -revision=5 +version=7.0.0 +revision=1 lib32disabled=yes build_style=configure configure_args="--prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --rundir=/run" @@ -13,11 +13,11 @@ maintainer="Juan RP " license="2-clause-BSD" homepage="http://roy.marples.name/projects/dhcpcd" distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz" -checksum=6f9674dc7e27e936cc787175404a6171618675ecfb6903ab9887b1b66a87d69e +checksum=ab61caedcbbf5aff608f22792f7a89baad0c9f84749b01b7526ca54a9ee620d5 pre_install() { # make wpa_supplicant log to syslog rather than stdout - sed -i 's,-B,& -s,' dhcpcd-hooks/10-wpa_supplicant + sed -i 's,-B,& -s,' hooks/10-wpa_supplicant } post_install() { vsv dhcpcd @@ -26,6 +26,6 @@ post_install() { sed -i 's,^#\(controlgroup.*\),\1,' ${DESTDIR}/etc/dhcpcd.conf ln -sf /usr/share/dhcpcd/hooks/10-wpa_supplicant ${DESTDIR}/usr/libexec/dhcpcd-hooks/ # License - sed 26q control.h > LICENSE + sed 26q src/control.h > LICENSE vlicense LICENSE }