summaryrefslogtreecommitdiff
path: root/source/n/dhcpcd/patches
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/n/dhcpcd/patches
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/n/dhcpcd/patches')
-rw-r--r--source/n/dhcpcd/patches/dhcpcd.conf-Don-t-invoke-wpa_supplicant-by-default.patch29
-rw-r--r--source/n/dhcpcd/patches/dhcpcd.conf-request_ntp_server_by_default.patch12
-rw-r--r--source/n/dhcpcd/patches/use-hostname_short-in-dhcpcd.conf.patch12
3 files changed, 31 insertions, 22 deletions
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
index 464d54bd..061d5c0f 100644
--- 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
@@ -1,26 +1,11 @@
-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
+diff -Nur dhcpcd-7.0.0.orig/src/dhcpcd.conf dhcpcd-7.0.0/src/dhcpcd.conf
+--- dhcpcd-7.0.0.orig/src/dhcpcd.conf 2018-01-01 05:17:56.000000000 -0600
++++ dhcpcd-7.0.0/src/dhcpcd.conf 2018-01-02 04:15:43.026058268 -0600
+@@ -39,3 +39,7 @@
+ #slaac hwaddr
+ # OR generate Stable Private IPv6 Addresses based from the DUID
+ slaac private
+
+# 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/source/n/dhcpcd/patches/dhcpcd.conf-request_ntp_server_by_default.patch b/source/n/dhcpcd/patches/dhcpcd.conf-request_ntp_server_by_default.patch
new file mode 100644
index 00000000..10589e43
--- /dev/null
+++ b/source/n/dhcpcd/patches/dhcpcd.conf-request_ntp_server_by_default.patch
@@ -0,0 +1,12 @@
+diff -Nur dhcpcd-7.0.0.orig/src/dhcpcd.conf dhcpcd-7.0.0/src/dhcpcd.conf
+--- dhcpcd-7.0.0.orig/src/dhcpcd.conf 2018-01-01 05:17:56.000000000 -0600
++++ dhcpcd-7.0.0/src/dhcpcd.conf 2018-01-02 04:19:53.997148193 -0600
+@@ -30,7 +30,7 @@
+ option interface_mtu
+
+ # Most distributions have NTP support.
+-#option ntp_servers
++option ntp_servers
+
+ # A ServerID is required by RFC2131.
+ require dhcp_server_identifier
diff --git a/source/n/dhcpcd/patches/use-hostname_short-in-dhcpcd.conf.patch b/source/n/dhcpcd/patches/use-hostname_short-in-dhcpcd.conf.patch
new file mode 100644
index 00000000..077aa17b
--- /dev/null
+++ b/source/n/dhcpcd/patches/use-hostname_short-in-dhcpcd.conf.patch
@@ -0,0 +1,12 @@
+diff -Nur dhcpcd-7.0.0.orig/src/dhcpcd.conf dhcpcd-7.0.0/src/dhcpcd.conf
+--- dhcpcd-7.0.0.orig/src/dhcpcd.conf 2018-01-01 05:17:56.000000000 -0600
++++ dhcpcd-7.0.0/src/dhcpcd.conf 2018-01-02 04:14:37.026484155 -0600
+@@ -5,7 +5,7 @@
+ #controlgroup wheel
+
+ # Inform the DHCP server of our hostname for DDNS.
+-hostname
++hostname_short
+
+ # Use the hardware address of the interface for the Client ID.
+ #clientid