diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2020-12-30 16:07:32 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-31 11:56:38 +0000 |
commit | abb05cbfd954775decbd6556d3d5f036ebb01fe3 (patch) | |
tree | a28552b6097730a3666dcbe37ba6b0a2ae58dfb2 | |
parent | 10728035a606483ea67f6cb8ba5779558856593a (diff) | |
download | openembedded-core-contrib-abb05cbfd954775decbd6556d3d5f036ebb01fe3.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
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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.patch | 29 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcpcd/files/0001-privsep-Fix-Linux-i386-for-SECCOMP-as-it-just-uses-s.patch | 57 |
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/" SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ - file://0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch \ - file://0001-privsep-Fix-Linux-i386-for-SECCOMP-as-it-just-uses-s.patch \ file://dhcpcd.service \ file://dhcpcd@.service \ " -SRC_URI[sha256sum] = "5c823a0b981b52e7e0fd3183ae220422d6fcc3aa511af31dcb1a7ee6cb0f1c39" +SRC_URI[sha256sum] = "41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513" inherit pkgconfig autotools-brokensep systemd useradd 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 @@ -From e7c22336461ee345a5668eed6158e935cd4cdf1a Mon Sep 17 00:00:00 2001 -From: Mikhail Efremov <sem@altlinux.org> -Date: Tue, 8 Dec 2020 16:15:28 +0000 -Subject: [PATCH] Linux: Fix privsep build by including sys/termios.h for all - platforms - -Upstream-Status: Backport -[https://roy.marples.name/cgit/dhcpcd.git/commit/?id=e7c22336461ee345a5668eed6158e935cd4cdf1a] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - src/privsep-linux.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/privsep-linux.c b/src/privsep-linux.c -index e588ecd7..1fbe97fa 100644 ---- a/src/privsep-linux.c -+++ b/src/privsep-linux.c -@@ -29,6 +29,7 @@ - #include <sys/ioctl.h> - #include <sys/prctl.h> - #include <sys/syscall.h> -+#include <sys/termios.h> /* For TCGETS */ - - #include <linux/audit.h> - #include <linux/filter.h> --- -2.25.1 - 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 @@ -From 12cdb2be46e25e1ab99df18324b787ad8749dff7 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Sat, 12 Dec 2020 22:12:54 +0000 -Subject: [PATCH] privsep: Fix Linux i386 for SECCOMP as it just uses - socketcall - -Rather than accept(2), recv(2), etc..... which is horrible! - -Thanks to Steve Hirsch <stevehirsch49@msn.com> for testing. - -Upstream-Status: Backport -[https://roy.marples.name/cgit/dhcpcd.git/commit/?id=12cdb2be46e25e1ab99df18324b787ad8749dff7] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - src/privsep-linux.c | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/src/privsep-linux.c b/src/privsep-linux.c -index 050a30cf..d31d720d 100644 ---- a/src/privsep-linux.c -+++ b/src/privsep-linux.c -@@ -34,6 +34,7 @@ - - #include <linux/audit.h> - #include <linux/filter.h> -+#include <linux/net.h> - #include <linux/seccomp.h> - #include <linux/sockios.h> - -@@ -311,6 +312,23 @@ static struct sock_filter ps_seccomp_filter[] = { - #ifdef __NR_sendto - SECCOMP_ALLOW(__NR_sendto), - #endif -+#ifdef __NR_socketcall -+ /* i386 needs this and demonstrates why SECCOMP -+ * is poor compared to OpenBSD pledge(2) and FreeBSD capsicum(4) -+ * as this is soooo tied to the kernel API which changes per arch -+ * and likely libc as well. */ -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT4), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_LISTEN), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_GETSOCKOPT), /* overflow */ -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECV), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVFROM), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVMSG), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SEND), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDMSG), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDTO), -+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SHUTDOWN), -+#endif - #ifdef __NR_shutdown - SECCOMP_ALLOW(__NR_shutdown), - #endif --- -2.25.1 - |