summaryrefslogtreecommitdiffstats
path: root/source/n/dhcpcd
diff options
context:
space:
mode:
Diffstat (limited to 'source/n/dhcpcd')
-rwxr-xr-xsource/n/dhcpcd/dhcpcd.SlackBuild4
-rw-r--r--source/n/dhcpcd/patches/38befd4e867583002b96ec39df733585d74c4ff5.patch25
-rw-r--r--source/n/dhcpcd/patches/645c32dd1a511527b7eb88443a28dfe7704d5f52.patch24
3 files changed, 52 insertions, 1 deletions
diff --git a/source/n/dhcpcd/dhcpcd.SlackBuild b/source/n/dhcpcd/dhcpcd.SlackBuild
index 82a9b44fb..3baf677d0 100755
--- a/source/n/dhcpcd/dhcpcd.SlackBuild
+++ b/source/n/dhcpcd/dhcpcd.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=dhcpcd
VERSION=${VERSION:-$(echo dhcpcd-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# By default, Slackware builds dhcpcd with privilege separation, which improves
# security by ensuring that any security vulnerabilies such as buffer overflows
@@ -85,6 +85,8 @@ find . \
patch -p1 --verbose < $CWD/patches/dhcpcd.conf-Don-t-invoke-wpa_supplicant-by-default.patch || exit 1
patch -p1 --verbose < $CWD/patches/use-hostname_short-in-dhcpcd.conf.patch || exit 1
patch -p1 --verbose < $CWD/patches/dhcpcd.conf-request_ntp_server_by_default.patch || exit 1
+patch -p1 --verbose < $CWD/patches/645c32dd1a511527b7eb88443a28dfe7704d5f52.patch || exit 1
+patch -p1 --verbose < $CWD/patches/38befd4e867583002b96ec39df733585d74c4ff5.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
diff --git a/source/n/dhcpcd/patches/38befd4e867583002b96ec39df733585d74c4ff5.patch b/source/n/dhcpcd/patches/38befd4e867583002b96ec39df733585d74c4ff5.patch
new file mode 100644
index 000000000..93f6d1b86
--- /dev/null
+++ b/source/n/dhcpcd/patches/38befd4e867583002b96ec39df733585d74c4ff5.patch
@@ -0,0 +1,25 @@
+From 38befd4e867583002b96ec39df733585d74c4ff5 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Fri, 26 Aug 2022 09:24:50 +0100
+Subject: [PATCH] privsep: Allow newfstatat syscall as well
+
+Allows newer glibc variants to work apparently.
+As reported in #84 and #89.
+---
+ src/privsep-linux.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/privsep-linux.c b/src/privsep-linux.c
+index 4d5c195d..66aeb490 100644
+--- a/src/privsep-linux.c
++++ b/src/privsep-linux.c
+@@ -353,6 +353,9 @@ static struct sock_filter ps_seccomp_filter[] = {
+ #ifdef __NR_nanosleep
+ SECCOMP_ALLOW(__NR_nanosleep), /* XXX should use ppoll instead */
+ #endif
++#ifdef __NR_newfstatat
++ SECCOMP_ALLOW(__NR_newfstatat),
++#endif
+ #ifdef __NR_ppoll
+ SECCOMP_ALLOW(__NR_ppoll),
+ #endif
diff --git a/source/n/dhcpcd/patches/645c32dd1a511527b7eb88443a28dfe7704d5f52.patch b/source/n/dhcpcd/patches/645c32dd1a511527b7eb88443a28dfe7704d5f52.patch
new file mode 100644
index 000000000..c61920309
--- /dev/null
+++ b/source/n/dhcpcd/patches/645c32dd1a511527b7eb88443a28dfe7704d5f52.patch
@@ -0,0 +1,24 @@
+From 645c32dd1a511527b7eb88443a28dfe7704d5f52 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Fri, 26 Aug 2022 09:08:36 +0100
+Subject: [PATCH] privsep: Allow getrandom sysctl for newer glibc
+
+Fixes #120
+---
+ src/privsep-linux.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/privsep-linux.c b/src/privsep-linux.c
+index c2de54ba..4d5c195d 100644
+--- a/src/privsep-linux.c
++++ b/src/privsep-linux.c
+@@ -325,6 +325,9 @@ static struct sock_filter ps_seccomp_filter[] = {
+ #ifdef __NR_getpid
+ SECCOMP_ALLOW(__NR_getpid),
+ #endif
++#ifdef __NR_getrandom
++ SECCOMP_ALLOW(__NR_getrandom),
++#endif
+ #ifdef __NR_getsockopt
+ /* For route socket overflow */
+ SECCOMP_ALLOW_ARG(__NR_getsockopt, 1, SOL_SOCKET),