From 112e515113e8f33abf5e36adfc6aa6c5a69df216 Mon Sep 17 00:00:00 2001 From: Eivind Uggedal Date: Tue, 9 Dec 2014 22:11:51 +0100 Subject: [PATCH] dhcpcd: update to 6.6.5. --- srcpkgs/dhcpcd/patches/wpa-hook-stop.patch | 36 ---------------------- srcpkgs/dhcpcd/template | 6 ++-- 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/srcpkgs/dhcpcd/patches/wpa-hook-stop.patch b/srcpkgs/dhcpcd/patches/wpa-hook-stop.patch index c5c55b2a32..d00fbecf3f 100644 --- a/srcpkgs/dhcpcd/patches/wpa-hook-stop.patch +++ b/srcpkgs/dhcpcd/patches/wpa-hook-stop.patch @@ -1,39 +1,3 @@ ---- dhcpcd-run-hooks.in.orig 2014-11-26 16:34:35.000000000 +0100 -+++ dhcpcd-run-hooks.in 2014-11-28 11:53:13.712853795 +0100 -@@ -2,13 +2,20 @@ - # dhcpcd client configuration script - - # Handy variables and functions for our hooks to use -+: ${if_up:=false} -+: ${if_down:=false} -+: ${syslog_debug:=false} -+ - case "$reason" in - ROUTERADVERT) - ifsuffix=":ra";; - INFORM6|BOUND6|RENEW6|REBIND6|REBOOT6|EXPIRE6|RELEASE6|STOP6) - ifsuffix=":dhcp6";; -- STOPPED) # This reason should never be processed -- exit 0;; -+ STOPPED) # Only process this reason if iface is down. -+ if [ "$if_up" != "false" -o "$if_down" = "false" ]; then -+ exit 0 -+ fi -+ ;; - *) - ifsuffix=;; - esac -@@ -22,10 +29,6 @@ signature_end="$signature_base_end $from - state_dir=@RUNDIR@/dhcpcd - _detected_init=false - --: ${if_up:=false} --: ${if_down:=false} --: ${syslog_debug:=false} -- - # Ensure that all arguments are unique - uniqify() - { --- 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 @@ -114,6 +114,6 @@ then diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index b8d63c02a7..5f4e1a74b0 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,7 +1,7 @@ # Template file for 'dhcpcd' pkgname=dhcpcd -version=6.6.4 -revision=3 +version=6.6.5 +revision=1 lib32disabled=yes build_options="systemd" build_style=configure @@ -14,7 +14,7 @@ maintainer="Juan RP " license="2-clause-BSD" homepage="http://roy.marples.name/projects/dhcpcd" distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-$version.tar.bz2" -checksum=67ba7cfe96089150da8e12badbcc5853daefce39417364887984948bad0a37d0 +checksum=62efd1c7fa162f7277b8a09089065f726e5d4dd45f426bb5db06e879e068bbe0 pre_install() { # make wpa_supplicant log to syslog rather than stdout