diff options
Diffstat (limited to 'source/n/dhcpcd')
| -rwxr-xr-x | source/n/dhcpcd/dhcpcd.SlackBuild | 10 | ||||
| -rw-r--r-- | source/n/dhcpcd/patches/Actually-validate-the-search-list.patch | 25 |
2 files changed, 5 insertions, 30 deletions
diff --git a/source/n/dhcpcd/dhcpcd.SlackBuild b/source/n/dhcpcd/dhcpcd.SlackBuild index f91966586..f8b937d3b 100755 --- a/source/n/dhcpcd/dhcpcd.SlackBuild +++ b/source/n/dhcpcd/dhcpcd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2013, 2014 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,7 +29,7 @@ NUMJOBS=${NUMJOBS:-" -j7 "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -40,8 +40,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-dhcpcd -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -67,7 +67,6 @@ 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 @@ -85,6 +84,7 @@ CFLAGS="$SLKCFLAGS" \ --dbdir=/var/lib/dhcpcd \ --libexecdir=/lib/dhcpcd \ --mandir=/usr/man \ + --rundir=/run/dhcpcd \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 diff --git a/source/n/dhcpcd/patches/Actually-validate-the-search-list.patch b/source/n/dhcpcd/patches/Actually-validate-the-search-list.patch deleted file mode 100644 index 3d84a6d61..000000000 --- a/source/n/dhcpcd/patches/Actually-validate-the-search-list.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 - |