diff options
Diffstat (limited to 'source/n/dhcpcd')
4 files changed, 56 insertions, 36 deletions
diff --git a/source/n/dhcpcd/define-SERVICEstuff-for-Slackware.patch b/source/n/dhcpcd/define-SERVICEstuff-for-Slackware.patch deleted file mode 100644 index ca0273f36..000000000 --- a/source/n/dhcpcd/define-SERVICEstuff-for-Slackware.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 293f23ad36f2c84cf67c483d944157834f4417a6 Mon Sep 17 00:00:00 2001 -From: Robby Workman <rworkman@slackware.com> -Date: Wed, 23 May 2012 21:33:30 -0500 -Subject: [PATCH] configure: Define SERVICE* for Slackware - -Slackware uses /etc/rc.d/rc.$service instead of just $service, -so configure doesn't find those. This patch overrides the -defaults for SERVICEEXISTS, SERVICECMD, and SERVICESTATUS. ---- - configure | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure b/configure -index b334497..e6554ca 100755 ---- a/configure -+++ b/configure -@@ -413,6 +413,12 @@ if [ -z "$SERVICECMD" ]; then - fi - done - fi -+if [ -e /etc/slackware-version ]; then -+ echo "Overriding service status check for Slackware Linux" -+ SERVICEEXISTS="[ -x /etc/rc.d/rc.\$1 ]" -+ SERVICECMD="/etc/rc.d/rc.\$1 \$2" -+ SERVICESTATUS="/etc/rc.d/rc.\$1 status 1>/dev/null 2>&1" -+fi - if [ -e /etc/arch-release ]; then - echo "Overriding service status check for Arch Linux" - SERVICESTATUS="[ -e /var/run/daemons/\$1 ]" --- -1.7.10.1 - diff --git a/source/n/dhcpcd/dhcpcd.SlackBuild b/source/n/dhcpcd/dhcpcd.SlackBuild index 15f14e2fb..f91966586 100755 --- a/source/n/dhcpcd/dhcpcd.SlackBuild +++ b/source/n/dhcpcd/dhcpcd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ VERSION=${VERSION:-$(echo dhcpcd-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -67,13 +67,14 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/patches/Actually-validate-the-search-list.patch || exit 1 +patch -p1 < $CWD/patches/dhcpcd.conf-Don-t-invoke-wpa_supplicant-by-default.patch || exit 1 + # At this point, it should be safe to assume that /var will be mounted by the # time dhcpcd is called, as all non-root local filesystems are mounted from # /etc/rc.d/rc.S, and /var should not be on a network filesystem. As such, # we'll use the FHS layout instead of putting things in /etc/dhcpc -zcat $CWD/define-SERVICEstuff-for-Slackware.patch.gz | patch -p1 || exit 1 - # Yes, /lib/dhcpcd is correct, even on x86_64. CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/n/dhcpcd/patches/Actually-validate-the-search-list.patch b/source/n/dhcpcd/patches/Actually-validate-the-search-list.patch new file mode 100644 index 000000000..3d84a6d61 --- /dev/null +++ b/source/n/dhcpcd/patches/Actually-validate-the-search-list.patch @@ -0,0 +1,25 @@ +From 118b94bdffca7e33a5e0d6b596eb7e51e7109e68 Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@marples.name> +Date: Tue, 6 Aug 2013 12:34:08 +0100 +Subject: [PATCH 1/2] Actually validate the search list. Fixes #280 + +--- + dhcpcd-hooks/20-resolv.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dhcpcd-hooks/20-resolv.conf b/dhcpcd-hooks/20-resolv.conf +index d0dce41..05316c9 100644 +--- a/dhcpcd-hooks/20-resolv.conf ++++ b/dhcpcd-hooks/20-resolv.conf +@@ -115,7 +115,7 @@ add_resolv_conf() + if [ -n "$new_domain_search" -a \ + "$new_domain_search" != "$new_domain_name" ] + then +- if valid_domainname_list; then ++ if valid_domainname_list $new_domain_search; then + conf="${conf}search $new_domain_search$NL" + else + syslog err "Invalid domain name in list: $new_domain_search" +-- +1.8.3.2 + diff --git a/source/n/dhcpcd/patches/dhcpcd.conf-Don-t-invoke-wpa_supplicant-by-default.patch b/source/n/dhcpcd/patches/dhcpcd.conf-Don-t-invoke-wpa_supplicant-by-default.patch new file mode 100644 index 000000000..464d54bd9 --- /dev/null +++ b/source/n/dhcpcd/patches/dhcpcd.conf-Don-t-invoke-wpa_supplicant-by-default.patch @@ -0,0 +1,26 @@ +From d968ff96e1e4354c591e49fe79b4f4ce0e553f61 Mon Sep 17 00:00:00 2001 +From: Robby Workman <rworkman@slackware.com> +Date: Sun, 11 Aug 2013 23:12:57 -0500 +Subject: [PATCH 2/2] dhcpcd.conf: Don't invoke wpa_supplicant by default + +Slackware's network init script (rc.inet1) and/or +NetworkManager itself handles this just fine. +--- + dhcpcd.conf | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/dhcpcd.conf b/dhcpcd.conf +index 349c6f2..30aacca 100644 +--- a/dhcpcd.conf ++++ b/dhcpcd.conf +@@ -30,3 +30,7 @@ require dhcp_server_identifier + # A hook script is provided to lookup the hostname if not set by the DHCP + # server, but it should not be run by default. + nohook lookup-hostname ++ ++# We run wpa_supplicant from rc.inet1 and/or NM handles it on its own ++nohook wpa_supplicant ++ +-- +1.8.3.2 + |