From: Ross Burton <ross.burton@arm.com>
Date: Mon, 30 Sep 2024 16:09:34 +0000 (+0100)
Subject: libarchive: upgrade 3.7.4 -> 3.7.6
X-Git-Tag: uninative-4.7~1250
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e093f603963f10dd8a4cfb2a8d3c3f0efb3fb5bf;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

libarchive: upgrade 3.7.4 -> 3.7.6

Drop configurehack.patch, no longer needed

Upstream changes break the python3-libarchive-c test suite, a second
patch follows.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-extended/libarchive/libarchive/configurehack.patch b/meta/recipes-extended/libarchive/libarchive/configurehack.patch
deleted file mode 100644
index 45fddd91475..00000000000
--- a/meta/recipes-extended/libarchive/libarchive/configurehack.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-To work with autoconf 2.73, tweak the macro ordering in configure.in.
-
-Upstream-Status: Pending
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
----
- configure.ac | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 503bb75..e3101da 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -414,6 +414,19 @@ if test "x$with_bz2lib" != "xno"; then
-   esac
- fi
- 
-+# Checks for typedefs, structures, and compiler characteristics.
-+AC_C_CONST
-+# la_TYPE_UID_T defaults to "int", which is incorrect for MinGW
-+# and MSVC. Use a customized version.
-+la_TYPE_UID_T
-+AC_TYPE_MODE_T
-+# AC_TYPE_OFF_T defaults to "long", which limits us to 4GB files on
-+# most systems... default to "long long" instead.
-+AC_CHECK_TYPE(off_t, [long long])
-+AC_TYPE_SIZE_T
-+AC_CHECK_TYPE(id_t, [unsigned long])
-+AC_CHECK_TYPE(uintptr_t, [unsigned int])
-+
- AC_ARG_WITH([libb2],
-   AS_HELP_STRING([--without-libb2], [Don't build support for BLAKE2 through libb2]))
- 
-@@ -678,19 +691,6 @@ fi
- 
- AC_SUBST(DEAD_CODE_REMOVAL)
- 
--# Checks for typedefs, structures, and compiler characteristics.
--AC_C_CONST
--# la_TYPE_UID_T defaults to "int", which is incorrect for MinGW
--# and MSVC. Use a customized version.
--la_TYPE_UID_T
--AC_TYPE_MODE_T
--# AC_TYPE_OFF_T defaults to "long", which limits us to 4GB files on
--# most systems... default to "long long" instead.
--AC_CHECK_TYPE(off_t, [long long])
--AC_TYPE_SIZE_T
--AC_CHECK_TYPE(id_t, [unsigned long])
--AC_CHECK_TYPE(uintptr_t, [unsigned int])
--
- # Check for tm_gmtoff in struct tm
- AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,,
- [
--- 
-2.34.1
-
diff --git a/meta/recipes-extended/libarchive/libarchive_3.7.4.bb b/meta/recipes-extended/libarchive/libarchive_3.7.6.bb
similarity index 95%
rename from meta/recipes-extended/libarchive/libarchive_3.7.4.bb
rename to meta/recipes-extended/libarchive/libarchive_3.7.6.bb
index da857641168..de4d1ef7643 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.7.4.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.7.6.bb
@@ -30,10 +30,10 @@ PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd,"
 EXTRA_OECONF += "--enable-largefile --without-iconv"
 
 SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz"
-SRC_URI += "file://configurehack.patch"
+
 UPSTREAM_CHECK_URI = "http://libarchive.org/"
 
-SRC_URI[sha256sum] = "7875d49596286055b52439ed42f044bd8ad426aa4cc5aabd96bfe7abb971d5e8"
+SRC_URI[sha256sum] = "b4071807367b15b72777c2eaac80f42c8ea2d20212ab279514a19fe1f6f96ef4"
 
 CVE_STATUS[CVE-2023-30571] = "upstream-wontfix: upstream has documented that reported function is not thread-safe"