diff options
Diffstat (limited to 'patches/source/dhcpcd/patches')
3 files changed, 62 insertions, 0 deletions
diff --git a/patches/source/dhcpcd/patches/Actually-validate-the-search-list.patch b/patches/source/dhcpcd/patches/Actually-validate-the-search-list.patch new file mode 100644 index 000000000..3d84a6d61 --- /dev/null +++ b/patches/source/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/patches/source/dhcpcd/patches/dhcpcd.conf-Don-t-invoke-wpa_supplicant-by-default.patch b/patches/source/dhcpcd/patches/dhcpcd.conf-Don-t-invoke-wpa_supplicant-by-default.patch new file mode 100644 index 000000000..464d54bd9 --- /dev/null +++ b/patches/source/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 + diff --git a/patches/source/dhcpcd/patches/dhcpcd.dho_optionsoverloaded.dos.patch b/patches/source/dhcpcd/patches/dhcpcd.dho_optionsoverloaded.dos.patch new file mode 100644 index 000000000..77007cf90 --- /dev/null +++ b/patches/source/dhcpcd/patches/dhcpcd.dho_optionsoverloaded.dos.patch @@ -0,0 +1,11 @@ +--- ./dhcp.c.orig 2013-08-02 15:12:22.000000000 -0500 ++++ ./dhcp.c 2014-08-01 15:34:23.681955373 -0500 +@@ -345,7 +345,7 @@ + case DHO_OPTIONSOVERLOADED: + /* Ensure we only get this option once */ + if (!overl) +- overl = p[1]; ++ overl = 0x80 | p[1]; + break; + } + l = *p++; |