From 8ddd46eb492e373ce5b78330edcd523f9ad31f8f Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Sun, 15 Mar 2026 07:12:35 +0000
Subject: [PATCH] dpkg: upgrade 1.23.5 -> 1.23.7

---
 .../dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch     | 6 +++---
 .../0001-build.c-ignore-return-of-1-from-tar-cf.patch    | 5 +----
 .../dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch      | 6 +++---
 ...pkg-options-dirs.c-set_rootfs-was-not-checking-.patch | 5 +----
 .../dpkg/dpkg/0001-script.c-avoid-use-of-chroot.patch    | 5 +----
 ...-to-linux-wrs-kernel-version-which-has-characte.patch | 5 +----
 ...utimes-function-doesn-t-work-properly-for-all-s.patch | 5 +----
 .../dpkg/0006-add-musleabi-to-known-target-tripets.patch | 6 +++---
 ...-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch | 5 +----
 .../dpkg/dpkg/add_armeb_triplet_entry.patch              | 4 ++--
 meta/recipes-devtools/dpkg/dpkg/arch_pm.patch            | 5 +----
 meta/recipes-devtools/dpkg/dpkg/noman.patch              | 4 ++--
 .../dpkg/dpkg/remove-tar-no-timestamp.patch              | 9 +++------
 .../dpkg/{dpkg_1.23.5.bb => dpkg_1.23.7.bb}              | 2 +-
 14 files changed, 24 insertions(+), 48 deletions(-)
 rename meta/recipes-devtools/dpkg/{dpkg_1.23.5.bb => dpkg_1.23.7.bb} (95%)

diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch b/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch
index 8943f6c2f0..75bc79aaf8 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch
@@ -1,4 +1,4 @@
-From 5c332c2a4625519a2b6065b9d9fc724e84c9b6d6 Mon Sep 17 00:00:00 2001
+From a8f011d37481786b154f8c853ebdaa9c7bc9c924 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 29 Apr 2020 22:02:23 -0700
 Subject: [PATCH] Add support for riscv32 CPU
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  2 files changed, 2 insertions(+)
 
 diff --git a/data/cputable b/data/cputable
-index 575c008e3..7a801a03a 100644
+index 0da0281c3..14cb42f2e 100644
 --- a/data/cputable
 +++ b/data/cputable
 @@ -43,6 +43,7 @@ powerpc		powerpc		(powerpc|ppc)		32	big
@@ -23,7 +23,7 @@ index 575c008e3..7a801a03a 100644
  s390		s390		s390			32	big
  s390x		s390x		s390x			64	big
 diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
-index edf94bc19..d76f97494 100644
+index 15f0840f8..5d462caad 100644
 --- a/scripts/Dpkg/Vendor/Debian.pm
 +++ b/scripts/Dpkg/Vendor/Debian.pm
 @@ -216,6 +216,7 @@ sub set_build_features {
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
index 1660597422..d0832c65a2 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
@@ -1,4 +1,4 @@
-From 5014728695639f33895feff9cabad199b0612c45 Mon Sep 17 00:00:00 2001
+From fd3c5423b637e534a11845afb5e776f1aa51db73 Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <paul.eggleton@microsoft.com>
 Date: Sun, 8 Feb 2026 21:34:54 -0800
 Subject: [PATCH] build.c: ignore return of 1 from tar -cf
@@ -53,6 +53,3 @@ index f7a0156f1..67e758185 100644
  }
  
  static intmax_t
--- 
-2.49.0
-
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch b/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch
index 67fce89d80..40786a1d6a 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch
@@ -1,4 +1,4 @@
-From df6c641e3fc248d0c864e4e752c4609412067df7 Mon Sep 17 00:00:00 2001
+From f124509856dca2526d5f3112490f971b549fdbf7 Mon Sep 17 00:00:00 2001
 From: sweeaun <swee.aun.khor@intel.com>
 Date: Sun, 10 Sep 2017 00:14:15 -0700
 Subject: [PATCH] dpkg: Support muslx32 build
@@ -13,7 +13,7 @@ Signed-off-by: sweeaun <swee.aun.khor@intel.com>
  2 files changed, 2 insertions(+)
 
 diff --git a/data/ostable b/data/ostable
-index 860355774..28779beca 100644
+index edfa2e0b2..a40f7c7fa 100644
 --- a/data/ostable
 +++ b/data/ostable
 @@ -21,6 +21,7 @@ base-uclibc-linux	linux-uclibc		linux[^-]*-uclibc
@@ -25,7 +25,7 @@ index 860355774..28779beca 100644
  eabi-gnu-linux		linux-gnueabi		linux[^-]*-gnueabi
  abin32-gnu-linux	linux-gnuabin32		linux[^-]*-gnuabin32
 diff --git a/data/tupletable b/data/tupletable
-index 82ae3604e..707d85bdb 100644
+index 6168027dc..42162bc93 100644
 --- a/data/tupletable
 +++ b/data/tupletable
 @@ -26,6 +26,7 @@ base-uclibc-linux-<cpu>		uclibc-linux-<cpu>
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-lib-dpkg-options-dirs.c-set_rootfs-was-not-checking-.patch b/meta/recipes-devtools/dpkg/dpkg/0001-lib-dpkg-options-dirs.c-set_rootfs-was-not-checking-.patch
index 34060c7463..1676c94e03 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0001-lib-dpkg-options-dirs.c-set_rootfs-was-not-checking-.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0001-lib-dpkg-options-dirs.c-set_rootfs-was-not-checking-.patch
@@ -1,4 +1,4 @@
-From c036cfa1ee53a900b4ed45bc91e45a0792547eea Mon Sep 17 00:00:00 2001
+From a37631a3570e9188589807190218f979ae1102a3 Mon Sep 17 00:00:00 2001
 From: Mark Hatle <mark.hatle@kernel.crashing.org>
 Date: Sat, 17 Jan 2026 20:20:23 +0000
 Subject: [PATCH] lib/dpkg/options-dirs.c: set_rootfs was not checking
@@ -41,6 +41,3 @@ index 9b7a122fe..34869d792 100644
  	dpkg_db_set_dir(db_dir);
  	free(db_dir);
  }
--- 
-2.30.2
-
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-script.c-avoid-use-of-chroot.patch b/meta/recipes-devtools/dpkg/dpkg/0001-script.c-avoid-use-of-chroot.patch
index ffa10142dd..9272953b3a 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0001-script.c-avoid-use-of-chroot.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0001-script.c-avoid-use-of-chroot.patch
@@ -1,4 +1,4 @@
-From 756513b01ba2d4f0ecfc95955dbe598591ad2d9e Mon Sep 17 00:00:00 2001
+From 3ec9e5df3eabfe72ec40258cf92a55e971c75ebb Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Sun, 8 Feb 2026 21:17:43 -0800
 Subject: [PATCH] script.c: avoid use of chroot
@@ -92,6 +92,3 @@ index dd3f3a4bb..9782d0140 100644
  }
  
  /**
--- 
-2.49.0
-
diff --git a/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch b/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch
index a4f0eb7d82..eb266f1006 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch
@@ -1,4 +1,4 @@
-From 3d27ccbc3409c473a4acba56df15e6b7e71f83fb Mon Sep 17 00:00:00 2001
+From 2af390a719391a97bf389b89073fbd22c8d890cc Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Sun, 8 Feb 2026 21:11:56 -0800
 Subject: [PATCH] Adapt to linux-wrs kernel version, which has character '_'
@@ -40,6 +40,3 @@ index 307b7705a..82713c008 100644
  			return dpkg_put_warn(err, _("invalid character in revision number"));
  	}
  
--- 
-2.49.0
-
diff --git a/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch b/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch
index 9e063fa961..7747dc84da 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch
@@ -1,4 +1,4 @@
-From 541260d2d954d53b2fddd20863cf473d53017de2 Mon Sep 17 00:00:00 2001
+From 2d29fce9f094d8d9513de4224895abe5447581d4 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Sun, 8 Feb 2026 21:21:43 -0800
 Subject: [PATCH] The lutimes function doesn't work properly for all systems.
@@ -29,6 +29,3 @@ index b5c6f0356..6db2c712c 100644
  #endif
  	} else {
  		if (utimes(path, tv))
--- 
-2.49.0
-
diff --git a/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch b/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch
index 4f60a89a56..e801951a5d 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch
@@ -1,4 +1,4 @@
-From e3dc69aa987b379e247dde3fce479e43be6c81aa Mon Sep 17 00:00:00 2001
+From 1ad5655cee23e651d749d2ebcfeb893cd1cbe028 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 30 Dec 2015 23:05:41 +0000
 Subject: [PATCH] add musleabi to known target tripets
@@ -17,7 +17,7 @@ Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
  2 files changed, 2 insertions(+)
 
 diff --git a/data/ostable b/data/ostable
-index 64f424490..860355774 100644
+index 5e7490fb4..edfa2e0b2 100644
 --- a/data/ostable
 +++ b/data/ostable
 @@ -19,6 +19,7 @@
@@ -29,7 +29,7 @@ index 64f424490..860355774 100644
  eabihf-gnu-linux	linux-gnueabihf		linux[^-]*-gnueabihf
  eabi-gnu-linux		linux-gnueabi		linux[^-]*-gnueabi
 diff --git a/data/tupletable b/data/tupletable
-index 7436f8056..82ae3604e 100644
+index bc1fcc5ab..6168027dc 100644
 --- a/data/tupletable
 +++ b/data/tupletable
 @@ -24,6 +24,7 @@
diff --git a/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch b/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch
index 6d39e43c5f..f23a493458 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch
@@ -1,4 +1,4 @@
-From 5c9c44274ecf0e704e1aadb1001d6df9f3ce403a Mon Sep 17 00:00:00 2001
+From 9b1f0771406f68b7e6c92995168d6964f9b64b02 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Sun, 8 Feb 2026 21:25:06 -0800
 Subject: [PATCH] dpkg-deb/build.c: Remove usage of --clamp-mtime in tar
@@ -43,6 +43,3 @@ index 259c6251c..f7a0156f1 100644
  		                 NULL);
  		/* Mode might become a positional argument, pass it
  		 * before -T. */
--- 
-2.49.0
-
diff --git a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
index d1fac2168a..db1ca04c98 100644
--- a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
@@ -1,4 +1,4 @@
-From 8ded32a35287a840de7e505c66e76cccd9edbac6 Mon Sep 17 00:00:00 2001
+From 032e3aae4b49cf9e7ee4416bddea1f1e1f8e3d01 Mon Sep 17 00:00:00 2001
 From: "Krishnanjanappa, Jagadeesh"
  <jagadeesh.krishnanjanappa@caviumnetworks.com>
 Date: Wed, 8 Apr 2015 18:08:14 +0530
@@ -34,7 +34,7 @@ Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/data/tupletable b/data/tupletable
-index ae9f2ddb4..7436f8056 100644
+index 7c306d497..bc1fcc5ab 100644
 --- a/data/tupletable
 +++ b/data/tupletable
 @@ -27,6 +27,7 @@ eabihf-musl-linux-arm		musl-linux-armhf
diff --git a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
index 676e0956cc..1e8da6e897 100644
--- a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
@@ -1,4 +1,4 @@
-From 961482eef79e90f9be6f60f48a063b66221a8ea1 Mon Sep 17 00:00:00 2001
+From d5efe91f4d47b2fb3bb2c095eaa9f4d197516f03 Mon Sep 17 00:00:00 2001
 From: Joe Slater <jslater@windriver.com>
 Date: Sun, 8 Feb 2026 21:06:44 -0800
 Subject: [PATCH] dpkg: fix configuration issue for mips64
@@ -32,6 +32,3 @@ index 3d9e3e975..05c6debc3 100644
                      $debarch_to_debtuple{$da} = $dt;
                      $debtuple_to_debarch{$dt} = $da;
                  }
--- 
-2.49.0
-
diff --git a/meta/recipes-devtools/dpkg/dpkg/noman.patch b/meta/recipes-devtools/dpkg/dpkg/noman.patch
index 3f3e08351c..ef5812dc41 100644
--- a/meta/recipes-devtools/dpkg/dpkg/noman.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/noman.patch
@@ -1,4 +1,4 @@
-From e671b43a52bf5785fe4aad84712dbabc6c86b39e Mon Sep 17 00:00:00 2001
+From fc7550e87e3f5a9e4fe194b1539be8a211a168c6 Mon Sep 17 00:00:00 2001
 From: Chris Larson <kergoth@openedhand.com>
 Date: Tue, 5 Sep 2006 07:24:58 +0000
 Subject: [PATCH] Add dpkg, modified from upstream oe.
@@ -9,7 +9,7 @@ Upstream-Status: Inappropriate [disable feature]
  1 file changed, 1 deletion(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 74f8df197..35e5eee39 100644
+index db480795f..737d8fe98 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -11,7 +11,6 @@ SUBDIRS = \
diff --git a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch b/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch
index 754b4fef17..625f4ce3a6 100644
--- a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch
@@ -1,4 +1,4 @@
-From a559247b71ce44978b7dc49a6fdb51167e22c0bf Mon Sep 17 00:00:00 2001
+From f7127fbb5f807e76e5c9af10eaf3dba406517a9d Mon Sep 17 00:00:00 2001
 From: Constantin Musca <constantinx.musca@intel.com>
 Date: Sun, 8 Feb 2026 21:03:30 -0800
 Subject: [PATCH] busybox-1.19.4 tar utility doesn't support
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/src/deb/extract.c b/src/deb/extract.c
-index e0234726a..e153f72ab 100644
+index 16d559f83..0cc390ce9 100644
 --- a/src/deb/extract.c
 +++ b/src/deb/extract.c
-@@ -353,7 +353,6 @@ extracthalf(const char *debar, const char *dir,
+@@ -371,7 +371,6 @@ extracthalf(const char *debar, const char *dir,
  
  			command_add_arg(&cmd, "-f");
  			command_add_arg(&cmd, "-");
@@ -26,6 +26,3 @@ index e0234726a..e153f72ab 100644
  
  			m_dup2(p2[0], 0);
  			close(p2[0]);
--- 
-2.49.0
-
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.23.5.bb b/meta/recipes-devtools/dpkg/dpkg_1.23.7.bb
similarity index 95%
rename from meta/recipes-devtools/dpkg/dpkg_1.23.5.bb
rename to meta/recipes-devtools/dpkg/dpkg_1.23.7.bb
index 1d8dd66efa..8e838b2d05 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.23.5.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.23.7.bb
@@ -19,4 +19,4 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main;
 
 SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch"
 
-SRCREV = "89f266325cc8b5b7fd1ee417b78d498ee189565b"
+SRCREV = "ef4d59f5925661818484ac666014ee3e665aadcf"
-- 
2.47.1

