Skip to contentSkip to conversation

dhcpcd: upgrade 10.3.2 -> 10.5.0

PATCH New Jaipaul Cheernam 1 participant 1 message Aug 6

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dhcpcd: upgrade 10.3.2 -> 10.5.0

ChangeLog: https://github.com/NetworkConfiguration/dhcpcd/releases/tag/v10.5.0

Compare with 10.3.2 to 10.5.0: https://github.com/NetworkConfiguration/dhcpcd/compare/v10.3.2...v10.5.0

Drop backported CVE patches (now included upstream):
CVE-2026-56113
CVE-2026-56114
CVE-2026-56116
CVE-2026-56117

This upgrade contains below CVE fix:
CVE-2026-14258

---
 .../{dhcpcd_10.3.2.bb => dhcpcd_10.5.0.bb}    |   6 +-
 ...mprove-the-sitation-of-working-with-.patch |  14 +-
 ...-conflict-error-when-enable-multilib.patch |   6 +-
 ...e-INCLUDEDIR-to-prevent-build-issues.patch |  10 +-
 .../dhcpcd/files/CVE-2026-56113.patch         |  92 ----------
 .../dhcpcd/files/CVE-2026-56114.patch         |  34 ----
 .../dhcpcd/files/CVE-2026-56116.patch         |  31 ----
 .../dhcpcd/files/CVE-2026-56117.patch         | 167 ------------------
 8 files changed, 16 insertions(+), 344 deletions(-)
 rename meta/recipes-connectivity/dhcpcd/{dhcpcd_10.3.2.bb => dhcpcd_10.5.0.bb} (91%)
 delete mode 100644 meta/recipes-connectivity/dhcpcd/files/CVE-2026-56113.patch
 delete mode 100644 meta/recipes-connectivity/dhcpcd/files/CVE-2026-56114.patch
 delete mode 100644 meta/recipes-connectivity/dhcpcd/files/CVE-2026-56116.patch
 delete mode 100644 meta/recipes-connectivity/dhcpcd/files/CVE-2026-56117.patch
meta/recipes-connectivity/dhcpcd/dhcpcd_10.5.0.bb renamed from meta/recipes-connectivity/dhcpcd/dhcpcd_10.3.2.bb +1 -5
similarity index 91%
rename from meta/recipes-connectivity/dhcpcd/dhcpcd_10.3.2.bb
rename to meta/recipes-connectivity/dhcpcd/dhcpcd_10.5.0.bb
index cc12b4a005..73f55969cd 100644
@@ -15,13 +15,9 @@ SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=ma
            file://dhcpcd.service \
            file://[email protected] \
            file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \
-           file://CVE-2026-56113.patch \
-           file://CVE-2026-56114.patch \
-           file://CVE-2026-56116.patch \
-           file://CVE-2026-56117.patch \
            "
 
-SRCREV = "243ad84ac67a87d631ff7eb83b2eed2727acebb5"
+SRCREV = "1d608519abb398006b77f11c7b720147adf4cfcc"
 
 # Doesn't use automake so we can't do out-of-tree builds
 inherit pkgconfig autotools-brokensep systemd useradd
meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch +7 -7
index 7e04b5c303..04c1d92897 100644
@@ -1,4 +1,4 @@
-From c91f9cdc0ef56fa64f6ffdd811cc5b0e41991b2e Mon Sep 17 00:00:00 2001
+From a3e397d3764fdb779e2f995b690ba365956612f5 Mon Sep 17 00:00:00 2001
 From: Chen Qi <[email protected]>
 Date: Wed, 9 Nov 2022 16:33:18 +0800
 Subject: [PATCH] 20-resolv.conf: improve the sitation of working with systemd
@@ -27,10 +27,10 @@ Signed-off-by: Chen Qi <[email protected]>
  1 file changed, 13 insertions(+), 4 deletions(-)
 
 diff --git a/hooks/20-resolv.conf b/hooks/20-resolv.conf
-index bd0b0df5..9c7721de 100644
+index 6aae9cc1..0fbcc9e8 100644
 --- a/hooks/20-resolv.conf
 +++ b/hooks/20-resolv.conf
-@@ -11,8 +11,12 @@ nocarrier_roaming_dir="$state_dir/roaming"
+@@ -14,8 +14,12 @@ nocarrier_roaming_dir="$state_dir/roaming"
  NL="
  "
  : ${resolvconf:=resolvconf}
@@ -43,9 +43,9 @@ index bd0b0df5..9c7721de 100644
  else
  	have_resolvconf=false
  fi
-@@ -69,8 +73,13 @@ build_resolv_conf()
+@@ -72,8 +76,13 @@ build_resolv_conf()
  	else
- 		echo "# /etc/resolv.conf.tail can replace this line" >> "$cf"
+ 		printf '%s\n' "# /etc/resolv.conf.tail can replace this line" >> "$cf"
  	fi
 -	if change_file /etc/resolv.conf "$cf"; then
 -		chmod 644 /etc/resolv.conf
@@ -59,7 +59,7 @@ index bd0b0df5..9c7721de 100644
  	fi
  	rm -f "$cf"
  }
-@@ -179,7 +188,7 @@ add_resolv_conf()
+@@ -182,7 +191,7 @@ add_resolv_conf()
  	for x in ${new_domain_name_servers}; do
  		conf="${conf}nameserver $x$NL"
  	done
@@ -68,7 +68,7 @@ index bd0b0df5..9c7721de 100644
  		[ -n "$ifmetric" ] && export IF_METRIC="$ifmetric"
  		printf %s "$conf" | "$resolvconf" -a "$ifname"
  		return $?
-@@ -195,7 +204,7 @@ add_resolv_conf()
+@@ -198,7 +207,7 @@ add_resolv_conf()
  
  remove_resolv_conf()
  {
meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch +3 -3
index 9d3065a48b..c2afb83b54 100644
@@ -1,4 +1,4 @@
-From dd892eba0147120efdcae923746c444a9d2a76d2 Mon Sep 17 00:00:00 2001
+From d3e517be04e660d72233cde91b44c3cf705126e2 Mon Sep 17 00:00:00 2001
 From: Lei Maohui <[email protected]>
 Date: Fri, 10 Mar 2023 03:48:46 +0000
 Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib.
@@ -29,10 +29,10 @@ Signed-off-by: Lei Maohui <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in
-index ebbf06c0..c7ffee6b 100644
+index 26d37772..1b13dc4e 100644
 --- a/src/dhcpcd.8.in
 +++ b/src/dhcpcd.8.in
-@@ -826,7 +826,7 @@ Configuration file for dhcpcd.
+@@ -825,7 +825,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.
meta/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch +5 -5
index bebc79831d..69ebc6026f 100644
@@ -1,4 +1,4 @@
-From 0775eb1b965bbf9b0efb0b1c42c3adf3d8cd31cb Mon Sep 17 00:00:00 2001
+From 278ef78e007ab74c701961e108262d9d733a3975 Mon Sep 17 00:00:00 2001
 From: Stefano Cappa <[email protected]>
 Date: Sun, 13 Jan 2019 01:50:52 +0100
 Subject: [PATCH] remove INCLUDEDIR to prevent build issues
@@ -11,10 +11,10 @@ Signed-off-by: Stefano Cappa <[email protected]>
  1 file changed, 5 deletions(-)
 
 diff --git a/configure b/configure
-index e9c08f18..3f0770b7 100755
+index 32bf96ef..ab4aa901 100755
 --- a/configure
 +++ b/configure
-@@ -26,7 +26,6 @@ BUILD=
+@@ -29,7 +29,6 @@ BUILD=
  HOST=
  HOSTCC=
  TARGET=
@@ -22,7 +22,7 @@ index e9c08f18..3f0770b7 100755
  DEBUG=
  FORK=
  STATIC=
-@@ -89,7 +88,6 @@ for x do
+@@ -93,7 +92,6 @@ for x do
  	--mandir) MANDIR=$var;;
  	--datadir) DATADIR=$var;;
  	--with-ccopts|CFLAGS) CFLAGS=$var;;
@@ -30,7 +30,7 @@ index e9c08f18..3f0770b7 100755
  	CC) CC=$var;;
  	CPPFLAGS) CPPFLAGS=$var;;
  	PKG_CONFIG) PKG_CONFIG=$var;;
-@@ -346,9 +344,6 @@ if [ -n "$CPPFLAGS" ]; then
+@@ -356,9 +354,6 @@ if [ -n "$CPPFLAGS" ]; then
  	echo "CPPFLAGS=" >>$CONFIG_MK
  	echo "CPPFLAGS+=	$CPPFLAGS" >>$CONFIG_MK
  fi
meta/recipes-connectivity/dhcpcd/files/CVE-2026-56113.patch deleted +0 -92

92 lines not on this page · raw message

meta/recipes-connectivity/dhcpcd/files/CVE-2026-56114.patch deleted +0 -34
deleted file mode 100644
index a6b8a44515..0000000000
@@ -1,34 +0,0 @@
-From 2e27969699676e664898c8f82e2c047762fc426f Mon Sep 17 00:00:00 2001
-From: Roy Marples <[email protected]>
-Date: Tue, 23 Jun 2026 02:06:55 +0100
-Subject: [PATCH] DHCPv6: Prefix exclude option can be 17 octets (#671)
-
-Well that's a simple off by one error
-
-Reported-by: CuB3y0nd <[email protected]>
-
-(cherry picked from commit 2f00c7bfc408b6582d331932dfa47829c4819029)
-
-CVE: CVE-2026-56114
-Upstream-Status: Backport [https://github.com/NetworkConfiguration/dhcpcd/commit/2f00c7bfc408b6582d331932dfa47829c4819029]
-Signed-off-by: Theo Gaige (Schneider Electric) <[email protected]>
----
- src/dhcp6.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/dhcp6.c b/src/dhcp6.c
-index 8a8a20a0..5e497cfd 100644
---- a/src/dhcp6.c
-+++ b/src/dhcp6.c
-@@ -1093,7 +1093,7 @@ dhcp6_makemessage(struct interface *ifp)
- 
- 				/* RFC6603 Section 4.2 */
- 				if (ap->prefix_exclude_len) {
--					uint8_t exb[16], *ep, u8;
-+					uint8_t exb[17], *ep, u8;
- 					const uint8_t *pp;
- 
- 					n = (size_t)((ap->prefix_exclude_len -
--- 
-2.43.0
-
meta/recipes-connectivity/dhcpcd/files/CVE-2026-56116.patch deleted +0 -31
deleted file mode 100644
index 2d8345cf18..0000000000
@@ -1,31 +0,0 @@
-From ae33c2d8fc7319a2957acd6e8efad99116b68dc6 Mon Sep 17 00:00:00 2001
-From: Roy Marples <[email protected]>
-Date: Tue, 23 Jun 2026 00:34:58 +0100
-Subject: [PATCH] IPv6ND: Free routeinfo when it expires (#670)
-
-Reported-by: CuB3y0nd <[email protected]>
-
-(cherry picked from commit 708b4a56bae080a5b18c2e0c4c6fbe103131a2b0)
-
-CVE: CVE-2026-56116
-Upstream-Status: Backport [https://github.com/NetworkConfiguration/dhcpcd/commit/708b4a56bae080a5b18c2e0c4c6fbe103131a2b0]
-Signed-off-by: Theo Gaige (Schneider Electric) <[email protected]>
----
- src/ipv6nd.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ipv6nd.c b/src/ipv6nd.c
-index ccf71241..557ff50e 100644
---- a/src/ipv6nd.c
-+++ b/src/ipv6nd.c
-@@ -1789,6 +1789,7 @@ ipv6nd_expirera(void *arg)
- 				logwarnx("%s: expired route %s",
- 				    rap->iface->name, rinfo->sprefix);
- 				TAILQ_REMOVE(&rap->rinfos, rinfo, next);
-+				free(rinfo);
- 			}
- 		}
- 
--- 
-2.43.0
-
meta/recipes-connectivity/dhcpcd/files/CVE-2026-56117.patch deleted +0 -167

167 lines not on this page · raw message