diff --git a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb index 6075770bf0..37dad54409 100644 --- a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb +++ b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb @@ -11,7 +11,6 @@ DUMMYPROVIDES = "\ /bin/sh \ /bin/bash \ /usr/bin/env \ - /usr/bin/pkg-config \ libGL.so()(64bit) \ libGL.so \ " diff --git a/meta/recipes-devtools/pkgconf/pkgconf_3.0.5.bb b/meta/recipes-devtools/pkgconf/pkgconf_3.0.5.bb index 79ac3208d3..3343857867 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_3.0.5.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_3.0.5.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://pkgconf.org" BUGTRACKER = "https://github.com/pkgconf/pkgconf/issues" SECTION = "devel" PROVIDES += "pkgconfig" -RPROVIDES:${PN} += "pkgconfig" +RPROVIDES:${PN} += "pkgconfig /usr/bin/pkg-config" # The pkgconf license seems to be functionally equivalent to BSD-2-Clause or # ISC, but has different wording, so needs its own name. 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 29d12bb539..03a207f33f 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 @@ -11,6 +11,14 @@ Without this patch, debuginfod cannot scan RPM 6 packages: libarchive error: cannot open archive from pipe: Unrecognized archive format +The test_read_format_huge_rpm test is updated from upstream PR #2846 +to match the format reader behavior: the format reader opens the +truncated RPM successfully (ARCHIVE_OK), returns ARCHIVE_EOF on +next_header (no valid entries in the crafted file), and correctly +identifies the format as ARCHIVE_FORMAT_RPM. This test requires the +companion 0005 patch (which disables the filter's auto-bidding) so +that the format reader handles the file instead of the filter. + Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/2846] Signed-off-by: Sumanth Gavini @@ -29,7 +37,8 @@ Signed-off-by: Sumanth Gavini libarchive/test/test_archive_read_support.c | 2 +- .../test_read_format_cpio_svr4_bzip2_rpm.c | 4 +- .../test_read_format_cpio_svr4_gzip_rpm.c | 4 +- - 14 files changed, 1162 insertions(+), 15 deletions(-) + libarchive/test/test_read_format_huge_rpm.c | 13 +- + 15 files changed, 1169 insertions(+), 20 deletions(-) create mode 100644 libarchive/archive_read_support_format_rpm.c diff --git a/Makefile.am b/Makefile.am @@ -1398,3 +1407,34 @@ index 6062c48..11dbbb4 100644 assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); +diff --git a/libarchive/test/test_read_format_huge_rpm.c b/libarchive/test/test_read_format_huge_rpm.c +index 51208c7..10c7fb7 100644 +--- a/libarchive/test/test_read_format_huge_rpm.c ++++ b/libarchive/test/test_read_format_huge_rpm.c +@@ -26,6 +26,7 @@ + + DEFINE_TEST(test_read_format_huge_rpm) + { ++ struct archive_entry *ae; + struct archive *a; + const char *name = "test_read_format_huge_rpm.rpm"; + +@@ -33,11 +34,13 @@ DEFINE_TEST(test_read_format_huge_rpm) + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); + extract_reference_file(name); +- /* This archive is truncated -- if it has data, the bid has screwed up */ +- assertEqualIntA(a, ARCHIVE_FATAL, archive_read_open_filename(a, name, 2)); +- assertEqualStringA(a, "Truncated input file " +- "(needed 34359738384 bytes, only 10256 available)", +- archive_error_string(a)); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 2)); ++ ++ /* This archive should have no entries -- if it has entries, the bid has screwed up */ ++ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); ++ ++ /* Verify that the format detection worked. */ ++ assertEqualInt(ARCHIVE_FORMAT_RPM, archive_format(a)); + + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); 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 new file mode 100644 index 0000000000..26a0159908 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/0005-Disable-RPM-filter-auto-bidding.patch @@ -0,0 +1,73 @@ +From 882166d7fa113f0c2108864b8a579d01816e1fce 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 + +RPM is now handled by the format reader (archive_read_support_format_rpm). +Disable the filter's automatic bidding so it never intercepts RPM files +during normal archive opening. The filter remains functional when +explicitly requested via archive_read_append_filter(ARCHIVE_FILTER_RPM). + +This ensures debuginfod and other tools that use archive_read_support_format_all() +will use the new RPM format reader for RPM 6 packages, while maintaining +API compatibility for code that explicitly appends the RPM filter. + +Upstream-Status: Inappropriate [OE specific - keep filter for API compat while format reader handles RPM 6] + +Signed-off-by: Sumanth Gavini +--- + libarchive/archive_read_support_filter_rpm.c | 37 ++++---------------- + 1 file changed, 6 insertions(+), 31 deletions(-) + +diff --git a/libarchive/archive_read_support_filter_rpm.c b/libarchive/archive_read_support_filter_rpm.c +index 01bd1bf..8e90da3 100644 +--- a/libarchive/archive_read_support_filter_rpm.c ++++ b/libarchive/archive_read_support_filter_rpm.c +@@ -79,39 +79,14 @@ static int + rpm_bidder_bid(struct archive_read_filter_bidder *b, + struct archive_read_filter *f) + { +- const unsigned char *p; +- int bits_checked; +- + (void)b; /* UNUSED */ ++ (void)f; /* UNUSED */ + +- p = __archive_read_filter_ahead(f, 8, NULL); +- if (p == NULL) +- return (0); +- +- bits_checked = 0; +- /* +- * Verify Header Magic Bytes : 0XED 0XAB 0XEE 0XDB +- */ +- if (memcmp(p, "\xED\xAB\xEE\xDB", 4) != 0) +- return (0); +- bits_checked += 32; +- /* +- * Check major version. +- */ +- if (p[4] != 3 && p[4] != 4) +- return (0); +- bits_checked += 8; +- /* +- * Check package type; binary or source. +- */ +- if (p[6] != 0) +- return (0); +- bits_checked += 8; +- if (p[7] != 0 && p[7] != 1) +- return (0); +- bits_checked += 8; +- +- return (bits_checked); ++ /* RPM is now handled by the format reader ++ * (archive_read_support_format_rpm). Return 0 so the filter never ++ * wins automatic bidding. The filter still works when explicitly ++ * appended via archive_read_append_filter(ARCHIVE_FILTER_RPM). */ ++ return (0); + } + + static const struct archive_read_filter_vtable +-- +2.49.0 diff --git a/meta/recipes-extended/libarchive/libarchive_3.8.9.bb b/meta/recipes-extended/libarchive/libarchive_3.8.9.bb index 3b3824e778..2eefa28532 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.8.9.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.8.9.bb @@ -36,6 +36,7 @@ SRC_URI = "https://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://0001-append_filter-Verify-that-bidder-and-filter-match.patch \ file://0003-Remove-bidder-name.patch \ file://0004-Convert-RPM-reader-into-a-proper-format.patch \ + file://0005-Disable-RPM-filter-auto-bidding.patch \ " UPSTREAM_CHECK_URI = "https://www.libarchive.org/"