summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcpcd
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2020-12-30 16:07:32 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-31 11:56:41 +0000
commitb9a5c512bcec764cc7e82ae6a6cfbb05c1c89012 (patch)
tree47c68119caf668d41eb56cac08923281c6998efb /meta/recipes-connectivity/dhcpcd
parent372136468a8c803d5c4f9e1829c335e13ebf49f8 (diff)
downloadpoky-b9a5c512bcec764cc7e82ae6a6cfbb05c1c89012.tar.gz
dhcpcd: upgrade 9.3.4 -> 9.4.0
Drop backported patches: 0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch 0001-privsep-Fix-Linux-i386-for-SECCOMP-as-it-just-uses-s.patch (From OE-Core rev: abb05cbfd954775decbd6556d3d5f036ebb01fe3) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcpcd')
-rw-r--r--meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb (renamed from meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.4.bb)4
-rw-r--r--meta/recipes-connectivity/dhcpcd/files/0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch29
-rw-r--r--meta/recipes-connectivity/dhcpcd/files/0001-privsep-Fix-Linux-i386-for-SECCOMP-as-it-just-uses-s.patch57
3 files changed, 1 insertions, 89 deletions
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.4.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb
index 69a07760b4..56fcf5cc0b 100644
--- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.4.bb
+++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb
@@ -13,13 +13,11 @@ UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/"
13 13
14SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ 14SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \
15 file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ 15 file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \
16 file://0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch \
17 file://0001-privsep-Fix-Linux-i386-for-SECCOMP-as-it-just-uses-s.patch \
18 file://dhcpcd.service \ 16 file://dhcpcd.service \
19 file://dhcpcd@.service \ 17 file://dhcpcd@.service \
20 " 18 "
21 19
22SRC_URI[sha256sum] = "5c823a0b981b52e7e0fd3183ae220422d6fcc3aa511af31dcb1a7ee6cb0f1c39" 20SRC_URI[sha256sum] = "41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513"
23 21
24inherit pkgconfig autotools-brokensep systemd useradd 22inherit pkgconfig autotools-brokensep systemd useradd
25 23
diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch b/meta/recipes-connectivity/dhcpcd/files/0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch
deleted file mode 100644
index 095e3eb409..0000000000
--- a/meta/recipes-connectivity/dhcpcd/files/0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From e7c22336461ee345a5668eed6158e935cd4cdf1a Mon Sep 17 00:00:00 2001
2From: Mikhail Efremov <sem@altlinux.org>
3Date: Tue, 8 Dec 2020 16:15:28 +0000
4Subject: [PATCH] Linux: Fix privsep build by including sys/termios.h for all
5 platforms
6
7Upstream-Status: Backport
8[https://roy.marples.name/cgit/dhcpcd.git/commit/?id=e7c22336461ee345a5668eed6158e935cd4cdf1a]
9
10Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
11---
12 src/privsep-linux.c | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/src/privsep-linux.c b/src/privsep-linux.c
16index e588ecd7..1fbe97fa 100644
17--- a/src/privsep-linux.c
18+++ b/src/privsep-linux.c
19@@ -29,6 +29,7 @@
20 #include <sys/ioctl.h>
21 #include <sys/prctl.h>
22 #include <sys/syscall.h>
23+#include <sys/termios.h> /* For TCGETS */
24
25 #include <linux/audit.h>
26 #include <linux/filter.h>
27--
282.25.1
29
diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-privsep-Fix-Linux-i386-for-SECCOMP-as-it-just-uses-s.patch b/meta/recipes-connectivity/dhcpcd/files/0001-privsep-Fix-Linux-i386-for-SECCOMP-as-it-just-uses-s.patch
deleted file mode 100644
index b79d5f04ce..0000000000
--- a/meta/recipes-connectivity/dhcpcd/files/0001-privsep-Fix-Linux-i386-for-SECCOMP-as-it-just-uses-s.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From 12cdb2be46e25e1ab99df18324b787ad8749dff7 Mon Sep 17 00:00:00 2001
2From: Roy Marples <roy@marples.name>
3Date: Sat, 12 Dec 2020 22:12:54 +0000
4Subject: [PATCH] privsep: Fix Linux i386 for SECCOMP as it just uses
5 socketcall
6
7Rather than accept(2), recv(2), etc..... which is horrible!
8
9Thanks to Steve Hirsch <stevehirsch49@msn.com> for testing.
10
11Upstream-Status: Backport
12[https://roy.marples.name/cgit/dhcpcd.git/commit/?id=12cdb2be46e25e1ab99df18324b787ad8749dff7]
13
14Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
15---
16 src/privsep-linux.c | 18 ++++++++++++++++++
17 1 file changed, 18 insertions(+)
18
19diff --git a/src/privsep-linux.c b/src/privsep-linux.c
20index 050a30cf..d31d720d 100644
21--- a/src/privsep-linux.c
22+++ b/src/privsep-linux.c
23@@ -34,6 +34,7 @@
24
25 #include <linux/audit.h>
26 #include <linux/filter.h>
27+#include <linux/net.h>
28 #include <linux/seccomp.h>
29 #include <linux/sockios.h>
30
31@@ -311,6 +312,23 @@ static struct sock_filter ps_seccomp_filter[] = {
32 #ifdef __NR_sendto
33 SECCOMP_ALLOW(__NR_sendto),
34 #endif
35+#ifdef __NR_socketcall
36+ /* i386 needs this and demonstrates why SECCOMP
37+ * is poor compared to OpenBSD pledge(2) and FreeBSD capsicum(4)
38+ * as this is soooo tied to the kernel API which changes per arch
39+ * and likely libc as well. */
40+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT),
41+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT4),
42+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_LISTEN),
43+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_GETSOCKOPT), /* overflow */
44+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECV),
45+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVFROM),
46+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVMSG),
47+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SEND),
48+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDMSG),
49+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDTO),
50+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SHUTDOWN),
51+#endif
52 #ifdef __NR_shutdown
53 SECCOMP_ALLOW(__NR_shutdown),
54 #endif
55--
562.25.1
57