From 85bf75384a60e3db5458153e46dcdeb756d05b47 Mon Sep 17 00:00:00 2001 From: wangmy Date: Mon, 25 Oct 2021 22:26:52 +0800 Subject: [PATCH] dhcpcd: upgrade 9.4.0 -> 9.4.1 0002-src-privsep-linux.c-add-support-for-arc-28.patch removed since it is included in 9.4.1 -License-Update: Copyright year updated to 2021. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../{dhcpcd_9.4.0.bb => dhcpcd_9.4.1.bb} | 5 +- ...ivsep-linux.c-add-support-for-arc-28.patch | 63 ------------------- 2 files changed, 2 insertions(+), 66 deletions(-) rename meta/recipes-connectivity/dhcpcd/{dhcpcd_9.4.0.bb => dhcpcd_9.4.1.bb} (88%) delete mode 100644 meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb similarity index 88% rename from meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb rename to meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb index dbad8c8728..4007a4bd2d 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb @@ -7,18 +7,17 @@ DESCRIPTION = "dhcpcd runs on your machine and silently configures your \ HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9674cc803c5d71306941e6e8b5c002f2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d148485768fe85b9f1072b186a7e9b4d" 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://0002-src-privsep-linux.c-add-support-for-arc-28.patch \ file://dhcpcd.service \ file://dhcpcd@.service \ " -SRC_URI[sha256sum] = "41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513" +SRC_URI[sha256sum] = "819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c" inherit pkgconfig autotools-brokensep systemd useradd diff --git a/meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch b/meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch deleted file mode 100644 index 045f06a9aa..0000000000 --- a/meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 82386110e67cf75c224e9817fce55e6b0f143266 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 8 Feb 2021 07:23:54 +0100 -Subject: [PATCH] src/privsep-linux.c: add support for arc (#28) - -Fix the following build failure: - -privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet" - # error "Platform does not support seccomp filter yet" - ^~~~~ -In file included from privsep-linux.c:36: -privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'? - BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), - ^~~~~~~~~~~~~~~~~~ - -It should be noted that AUDIT_ARCH_{ARCOMPACT,ARCV2} is only defined -since kernel 5.2 and -https://github.com/torvalds/linux/commit/67f2a8a29311841ba6ab9b0e2d1b8f1e9978cd84 - -Detection of arc compact and arc v2 have been "copy/pasted" from -https://github.com/wbx-github/uclibc-ng/commit/afab56958f1cbb47b831ee3ebff231dfbae74af2 - -Fixes: - - http://autobuild.buildroot.org/results/d29083700a80dd647621eed06faeeae03f0587d3 - -Upstream-Status: Backport [https://github.com/NetworkConfiguration/dhcpcd/commit/82386110e67cf75c224e9817fce55e6b0f143266] - -Signed-off-by: Fabrice Fontaine -Signed-off-by: Alexey Brodkin ---- - src/privsep-linux.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/src/privsep-linux.c b/src/privsep-linux.c -index 402667af..21d41a9a 100644 ---- a/src/privsep-linux.c -+++ b/src/privsep-linux.c -@@ -149,6 +149,22 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) - # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_I386 - #elif defined(__x86_64__) - # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_X86_64 -+#elif defined(__arc__) -+# if defined(__A7__) -+# if (BYTE_ORDER == LITTLE_ENDIAN) -+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCOMPACT -+# else -+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCOMPACTBE -+# endif -+# elif defined(__HS__) -+# if (BYTE_ORDER == LITTLE_ENDIAN) -+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCV2 -+# else -+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCV2BE -+# endif -+# else -+# error "Platform does not support seccomp filter yet" -+# endif - #elif defined(__arm__) - # ifndef EM_ARM - # define EM_ARM 40 --- -2.16.2 - -- 2.40.1