diff --git a/meta/recipes-extended/libarchive/libarchive/0003-archive_read-register_bidder-Allow-ARCHIVE_STATE_HEADER.patch b/meta/recipes-extended/libarchive/libarchive/0003-archive_read-register_bidder-Allow-ARCHIVE_STATE_HEADER.patch index cc8f2896a2..c9ecb0edbb 100644 --- a/meta/recipes-extended/libarchive/libarchive/0003-archive_read-register_bidder-Allow-ARCHIVE_STATE_HEADER.patch +++ b/meta/recipes-extended/libarchive/libarchive/0003-archive_read-register_bidder-Allow-ARCHIVE_STATE_HEADER.patch @@ -1,6 +1,6 @@ -From 84b6ba6f4ac5f00e70d66bb7c765dd487147d83b Mon Sep 17 00:00:00 2001 +From de3e8eb0219dbe21c805cc03f1aa25b4f19dcb8a Mon Sep 17 00:00:00 2001 From: Davide Beatrici -Date: Mon, 25 Aug 2026 22:39:08 +0000 +Date: Tue, 25 Aug 2026 22:39:08 +0000 Subject: [PATCH] __archive_read_register_bidder(): Allow ARCHIVE_STATE_HEADER This allows formats to apply filters when they know what they need. @@ -9,16 +9,15 @@ In the case of RPM, that's after parsing the (uncompressed) header. Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/2846 commit 84b6ba6f4ac5] Signed-off-by: Jaipaul Cheernam - --- libarchive/archive_read.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c -index 2f006fb..5c51df5 100644 +index 6235d66..66bd4e8 100644 --- a/libarchive/archive_read.c +++ b/libarchive/archive_read.c -@@ -1297,7 +1297,8 @@ __archive_read_register_bidder(struct archive_read *a, +@@ -1325,7 +1325,8 @@ __archive_read_register_bidder(struct archive_read *a, int i, number_slots; archive_check_magic(&a->archive, ARCHIVE_READ_MAGIC, diff --git a/meta/recipes-extended/libarchive/libarchive/0004-Convert-RPM-reader-into-a-proper-format.patch b/meta/recipes-extended/libarchive/libarchive/0004-Convert-RPM-reader-into-a-proper-format.patch index 34c0cf415e..0344919b63 100644 --- a/meta/recipes-extended/libarchive/libarchive/0004-Convert-RPM-reader-into-a-proper-format.patch +++ b/meta/recipes-extended/libarchive/libarchive/0004-Convert-RPM-reader-into-a-proper-format.patch @@ -1,6 +1,6 @@ -From dcda938b907d3b99e012b52ea1250d01fb0c8546 Mon Sep 17 00:00:00 2001 +From 970b16c3468dbdf6d4caec9363dbb19279944852 Mon Sep 17 00:00:00 2001 From: Davide Beatrici -Date: Mon, 25 Aug 2026 23:47:31 +0000 +Date: Tue, 25 Aug 2026 23:47:31 +0000 Subject: [PATCH] Convert RPM reader into a proper format, supporting both stripped CPIO and SVR4 @@ -27,11 +27,11 @@ Signed-off-by: Jaipaul Cheernam .../test_read_format_cpio_svr4_bzip2_rpm.c | 4 +- .../test_read_format_cpio_svr4_gzip_rpm.c | 4 +- libarchive/test/test_read_format_huge_rpm.c | 13 +- - 14 files changed, 1154 insertions(+), 14 deletions(-) + 14 files changed, 1155 insertions(+), 13 deletions(-) create mode 100644 libarchive/archive_read_support_format_rpm.c diff --git a/Makefile.am b/Makefile.am -index 8bc70c5..487bef3 100644 +index c171c24..0c150c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -212,6 +212,7 @@ libarchive_la_SOURCES= \ @@ -67,7 +67,7 @@ index ac039c1..34ba173 100644 archive_read_support_format_warc.c archive_read_support_format_xar.c diff --git a/libarchive/archive.h b/libarchive/archive.h -index 19b316a..f04a747 100644 +index 2c13908..64dbdaa 100644 --- a/libarchive/archive.h +++ b/libarchive/archive.h @@ -316,7 +316,9 @@ typedef const char *archive_passphrase_callback(struct archive *, @@ -80,7 +80,7 @@ index 19b316a..f04a747 100644 #define ARCHIVE_FILTER_LZIP 9 #define ARCHIVE_FILTER_LRZIP 10 #define ARCHIVE_FILTER_LZOP 11 -@@ -387,6 +389,7 @@ typedef const char *archive_passphrase_callback(struct archive *, +@@ -389,6 +391,7 @@ typedef const char *archive_passphrase_callback(struct archive *, #define ARCHIVE_FORMAT_7ZIP 0xE0000 #define ARCHIVE_FORMAT_WARC 0xF0000 #define ARCHIVE_FORMAT_RAR_V5 0x100000 @@ -88,7 +88,7 @@ index 19b316a..f04a747 100644 /* * Codes returned by archive_read_format_capabilities(). -@@ -480,7 +483,9 @@ __LA_DECL int archive_read_support_filter_program(struct archive *, +@@ -482,7 +485,9 @@ __LA_DECL int archive_read_support_filter_program(struct archive *, __LA_DECL int archive_read_support_filter_program_signature (struct archive *, const char * /* cmd */, const void * /* match */, size_t); @@ -98,7 +98,7 @@ index 19b316a..f04a747 100644 __LA_DECL int archive_read_support_filter_uu(struct archive *); __LA_DECL int archive_read_support_filter_xz(struct archive *); __LA_DECL int archive_read_support_filter_zstd(struct archive *); -@@ -501,6 +506,7 @@ __LA_DECL int archive_read_support_format_mtree(struct archive *); +@@ -503,6 +508,7 @@ __LA_DECL int archive_read_support_format_mtree(struct archive *); __LA_DECL int archive_read_support_format_rar(struct archive *); __LA_DECL int archive_read_support_format_rar5(struct archive *); __LA_DECL int archive_read_support_format_raw(struct archive *); @@ -149,11 +149,11 @@ index f086773..cc5c2b2 100644 archive_read_support_filter_lrzip(a); /* Lzop decompress falls back to "lzop -d" command-line. */ diff --git a/libarchive/archive_read_support_filter_by_code.c b/libarchive/archive_read_support_filter_by_code.c -index 4c8b6cb..d3c7d21 100644 +index 6c18421..7a30c49 100644 --- a/libarchive/archive_read_support_filter_by_code.c +++ b/libarchive/archive_read_support_filter_by_code.c -@@ -49,8 +49,10 @@ archive_read_support_filter_by_code(struct archive *a, int filter_code) - return archive_read_support_filter_xz(a); +@@ -50,8 +50,10 @@ archive_read_support_filter_by_code(struct archive *a, int filter_code) + case ARCHIVE_FILTER_B64: case ARCHIVE_FILTER_UU: return archive_read_support_filter_uu(a); +#if ARCHIVE_VERSION_NUMBER < 4000000 diff --git a/meta/recipes-extended/libarchive/libarchive/0005-Disable-RPM-filter-auto-bidding.patch b/meta/recipes-extended/libarchive/libarchive/0005-Disable-RPM-filter-auto-bidding.patch index 86eb48a804..3a4f7368df 100644 --- a/meta/recipes-extended/libarchive/libarchive/0005-Disable-RPM-filter-auto-bidding.patch +++ b/meta/recipes-extended/libarchive/libarchive/0005-Disable-RPM-filter-auto-bidding.patch @@ -1,4 +1,4 @@ -From b367b31b5b764e15c8d484a75c790b6ffa1e20d8 Mon Sep 17 00:00:00 2001 +From 82ccfb45b0aacb275b0228ec3b3dd2522e5393e9 Mon Sep 17 00:00:00 2001 From: Sumanth Gavini Date: Tue, 11 Aug 2026 12:02:31 -0700 Subject: [PATCH] libarchive: Disable RPM filter auto-bidding diff --git a/meta/recipes-extended/libarchive/libarchive_3.8.10.bb b/meta/recipes-extended/libarchive/libarchive_3.8.11.bb similarity index 97% rename from meta/recipes-extended/libarchive/libarchive_3.8.10.bb rename to meta/recipes-extended/libarchive/libarchive_3.8.11.bb index 747a6b9969..034aeab7eb 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.8.10.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.8.11.bb @@ -37,7 +37,7 @@ SRC_URI = "https://libarchive.org/downloads/libarchive-${PV}.tar.gz \ " UPSTREAM_CHECK_URI = "https://www.libarchive.org/" -SRC_URI[sha256sum] = "a1bffbe5152cfe869751179e7b16648c87c461cb8c46eee75062efbe164cc57c" +SRC_URI[sha256sum] = "900fe9fc7237c2b04f090f3c3648de8fe597525771f5035016537ce2d667d12b" inherit autotools update-alternatives pkgconfig ptest