[OE-core] [PATCH 03/22] dhcpcd: upgrade 10.0.8 -> 10.0.10

wangmy
2024-09-03T08:33:18Z

License-Update: Copyright year updated to 2024.

0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch
0001-remove-INCLUDEDIR-to-prevent-build-issues.patch
refreshed for 10.0.10

Changelog:
==========
- configure: add --enable-ntp
- Force dumplease to parse stdin
- holmanb authored and rsmarples committed
- Improve and document prior.
- linux: Prefer local over address when both in netlink RTA
- IPv6: DUPLICATED could be announced by RTM_DELADDR
- Fix prior patch which might also fix #333
- IPv6: Delay for LL address before delay for start
- IPv6: make more readable (nfc)
- DHCP6: Don't remove delegated prefix addresses on start or fail
- privsep: Sweep ELE_ERROR away for BPF
- DHCP6: Add commentary around why we read leases
- linux: allow roaming without IFF_DORMANT
- DHCP: Remove an assertation in get_lease if ia is NULL
- DHCP6: Persist configuration on confirm/rebind failure
- DHCP6: Don't remove state in DISCOVER
- IPv4LL: Restart ARP probling on address conflict
- DHCP: Handle option 108 correctly when receiving 0.0.0.0 OFFER
- taoyl-g and rsmarples committed on Jul 25
- DHCP: No longer set interface mtu
- IPv4LL: If we are not configuring, abort if address does not exist
- IPv4LL: Harden the noconfigure option.
- DHCP6: Remove the dhcp6_pd_addr packed struct
- Update privsep-linux.c to allow statx

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
.../dhcpcd/{dhcpcd_10.0.8.bb => dhcpcd_10.0.10.bb} | 4 ++--
...hcpcd.8-Fix-conflict-error-when-enable-multilib.patch | 7 +++----
.../0001-remove-INCLUDEDIR-to-prevent-build-issues.patch | 9 ++++-----
3 files changed, 9 insertions(+), 11 deletions(-)
rename meta/recipes-connectivity/dhcpcd/{dhcpcd_10.0.8.bb => dhcpcd_10.0.10.bb} (94%)

diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.8.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.10.bb
similarity index 94%
rename from meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.8.bb
rename to meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.10.bb
index 43de279cfd..0ae9db911c 100644
--- a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.8.bb
+++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.10.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=ba9c7e534853aaf3de76c905b2410ffd"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d296c4bec306f351e676705aaf237c8c"

SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=master \
file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \
@@ -17,7 +17,7 @@ SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=ma
file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \
"

-SRCREV = "a15ba1987c264eaa06c2655ddd0891aa5ac48c09"
+SRCREV = "ab5ec18e755c1bb450c74d3a4657ea48d0f7f314"
S = "${WORKDIR}/git"

inherit pkgconfig autotools-brokensep systemd useradd
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 461d04bd1d..b958110ef1 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 5d5ba8a2b8010db6bee68bd712f829cb737c9ac1 Mon Sep 17 00:00:00 2001
+From 1115784dfdf2e7095cf599f9becef705ac57f80e Mon Sep 17 00:00:00 2001
From: Lei Maohui <leimaohui@fujitsu.com>
Date: Fri, 10 Mar 2023 03:48:46 +0000
Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib.
@@ -24,16 +24,15 @@ versions.

Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
-
---
src/dhcpcd.8.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in
-index 93232840..09930a31 100644
+index 04bf7d90..9cf10d24 100644
--- a/src/dhcpcd.8.in
+++ b/src/dhcpcd.8.in
-@@ -824,7 +824,7 @@ Configuration file for dhcpcd.
+@@ -826,7 +826,7 @@ Configuration file for dhcpcd.
If you always use the same options, put them here.
.It Pa @SCRIPT@
Bourne shell script that is run to configure or de-configure an interface.
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 c54942be4b..8890c2d7dc 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 ec9fc4e6086e1dbe0ac2f94a8a088a571596a581 Mon Sep 17 00:00:00 2001
+From 69babef33b0ee4c60d8821797777b9affedd47da Mon Sep 17 00:00:00 2001
From: Stefano Cappa <stefano.cappa.ks89@gmail.com>
Date: Sun, 13 Jan 2019 01:50:52 +0100
Subject: [PATCH] remove INCLUDEDIR to prevent build issues
@@ -6,13 +6,12 @@ Subject: [PATCH] remove INCLUDEDIR to prevent build issues
Upstream-Status: Pending

Signed-off-by: Stefano Cappa <stefano.cappa.ks89@gmail.com>
-
---
configure | 5 -----
1 file changed, 5 deletions(-)

diff --git a/configure b/configure
-index 5237b0e2..7220718b 100755
+index 1a772b02..0f915b39 100755
--- a/configure
+++ b/configure
@@ -26,7 +26,6 @@ BUILD=
@@ -23,7 +22,7 @@ index 5237b0e2..7220718b 100755
DEBUG=
FORK=
STATIC=
-@@ -86,7 +85,6 @@ for x do
+@@ -89,7 +88,6 @@ for x do
--mandir) MANDIR=$var;;
--datadir) DATADIR=$var;;
--with-ccopts|CFLAGS) CFLAGS=$var;;
@@ -31,7 +30,7 @@ index 5237b0e2..7220718b 100755
CC) CC=$var;;
CPPFLAGS) CPPFLAGS=$var;;
PKG_CONFIG) PKG_CONFIG=$var;;
-@@ -343,9 +341,6 @@ if [ -n "$CPPFLAGS" ]; then
+@@ -346,9 +344,6 @@ if [ -n "$CPPFLAGS" ]; then
echo "CPPFLAGS=" >>$CONFIG_MK
echo "CPPFLAGS+= $CPPFLAGS" >>$CONFIG_MK
fi
--
2.34.1