From: Richard Purdie Date: Sat, 15 Mar 2025 07:08:57 +0000 (+0000) Subject: dhcpcd: upgrade 10.1.0 -> 10.2.2 X-Git-Tag: yocto-5.2~160 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=718e4efa4f6f595b17e2438a15fc57c2c88ae9f1;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git dhcpcd: upgrade 10.1.0 -> 10.2.2 License-Update: Copyright years change only Drop a backported patch Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.1.0.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.2.bb similarity index 91% rename from meta/recipes-connectivity/dhcpcd/dhcpcd_10.1.0.bb rename to meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.2.bb index 99b72852bf3..0b4345e7fa4 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.1.0.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.2.bb @@ -7,7 +7,7 @@ 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=d296c4bec306f351e676705aaf237c8c" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4dda5beb433a809f2e0aeffbf9da3d91" SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=master \ file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ @@ -15,10 +15,9 @@ SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=ma file://dhcpcd.service \ file://dhcpcd@.service \ file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \ - file://0001-linux-Allow-the-__NR_rt_sigprocmask-syscall.patch \ " -SRCREV = "57c3506a5622e199cf0e3fc1ef26a71cdedc9521" +SRCREV = "f6983c18dbf7989f43a2838beeaf62a54c53ff1d" S = "${WORKDIR}/git" inherit pkgconfig autotools-brokensep systemd useradd diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch b/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch index 8d1ed6671a5..4f687b0292e 100644 --- a/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch +++ b/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch @@ -1,4 +1,4 @@ -From 02acc4d875ee81e6fd19ef66d69c9f55b4b4a7e7 Mon Sep 17 00:00:00 2001 +From 33710a648a805d96abf49d5adf6ca55b89f9c858 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 9 Nov 2022 16:33:18 +0800 Subject: [PATCH] 20-resolv.conf: improve the sitation of working with systemd @@ -77,6 +77,3 @@ index 7c29e276..becc019f 100644 "$resolvconf" -d "$ifname" -f else if [ -e "$resolv_conf_dir/$ifname" ]; then --- -2.17.1 - diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch b/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch index b958110ef1c..484b84f94ae 100644 --- a/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch +++ b/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch @@ -1,4 +1,4 @@ -From 1115784dfdf2e7095cf599f9becef705ac57f80e Mon Sep 17 00:00:00 2001 +From e9b1376c59b15e7b03611429187d9d89167154b5 Mon Sep 17 00:00:00 2001 From: Lei Maohui Date: Fri, 10 Mar 2023 03:48:46 +0000 Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib. @@ -29,7 +29,7 @@ Signed-off-by: Lei Maohui 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in -index 04bf7d90..9cf10d24 100644 +index 91fdde2c..b467dc3b 100644 --- a/src/dhcpcd.8.in +++ b/src/dhcpcd.8.in @@ -826,7 +826,7 @@ Configuration file for dhcpcd. diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-linux-Allow-the-__NR_rt_sigprocmask-syscall.patch b/meta/recipes-connectivity/dhcpcd/files/0001-linux-Allow-the-__NR_rt_sigprocmask-syscall.patch deleted file mode 100644 index 7058330165f..00000000000 --- a/meta/recipes-connectivity/dhcpcd/files/0001-linux-Allow-the-__NR_rt_sigprocmask-syscall.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e9e40400003db2e4f12dba85acabbaf2212a520f Mon Sep 17 00:00:00 2001 -From: Scott Shambarger -Date: Sat, 7 Dec 2024 16:37:28 +0000 -Subject: [PATCH] linux: Allow the __NR_rt_sigprocmask syscall - -Fixes recent glibc changes to getrandom() used by arc4random(). -Fixes #421. - -Upstream-Status: Backport -See details in https://github.com/NetworkConfiguration/dhcpcd/issues/421 - -Signed-off-by: Scott Shambarger ---- - src/privsep-linux.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/privsep-linux.c b/src/privsep-linux.c -index 8357904c9c9a..e3485a2efdfc 100644 ---- a/src/privsep-linux.c -+++ b/src/privsep-linux.c -@@ -409,6 +409,9 @@ static struct sock_filter ps_seccomp_filter[] = { - #ifdef __NR_recvmsg - SECCOMP_ALLOW(__NR_recvmsg), - #endif -+#ifdef __NR_rt_sigprocmask -+ SECCOMP_ALLOW(__NR_rt_sigprocmask), -+#endif - #ifdef __NR_rt_sigreturn - SECCOMP_ALLOW(__NR_rt_sigreturn), - #endif diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch b/meta/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch index 8890c2d7dc6..fd3fae7e7e0 100644 --- a/meta/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch +++ b/meta/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch @@ -1,4 +1,4 @@ -From 69babef33b0ee4c60d8821797777b9affedd47da Mon Sep 17 00:00:00 2001 +From c2ebc32112e0cd29390b4dc951b65efae36d607b Mon Sep 17 00:00:00 2001 From: Stefano Cappa Date: Sun, 13 Jan 2019 01:50:52 +0100 Subject: [PATCH] remove INCLUDEDIR to prevent build issues @@ -11,7 +11,7 @@ Signed-off-by: Stefano Cappa 1 file changed, 5 deletions(-) diff --git a/configure b/configure -index 1a772b02..0f915b39 100755 +index a60da137..3673de8b 100755 --- a/configure +++ b/configure @@ -26,7 +26,6 @@ BUILD=