From 963c1378eb7c261f04d454e234ec8febacb89d47 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 30 Sep 2024 17:09:34 +0100 Subject: 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. (From OE-Core rev: e093f603963f10dd8a4cfb2a8d3c3f0efb3fb5bf) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../libarchive/libarchive/configurehack.patch | 55 ------------------ .../libarchive/libarchive_3.7.4.bb | 67 ---------------------- .../libarchive/libarchive_3.7.6.bb | 67 ++++++++++++++++++++++ 3 files changed, 67 insertions(+), 122 deletions(-) delete mode 100644 meta/recipes-extended/libarchive/libarchive/configurehack.patch delete mode 100644 meta/recipes-extended/libarchive/libarchive_3.7.4.bb create mode 100644 meta/recipes-extended/libarchive/libarchive_3.7.6.bb diff --git a/meta/recipes-extended/libarchive/libarchive/configurehack.patch b/meta/recipes-extended/libarchive/libarchive/configurehack.patch deleted file mode 100644 index 45fddd9147..0000000000 --- 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 ---- - 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.4.bb deleted file mode 100644 index da85764116..0000000000 --- a/meta/recipes-extended/libarchive/libarchive_3.7.4.bb +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "Support for reading various archive formats" -DESCRIPTION = "C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats" -HOMEPAGE = "http://www.libarchive.org/" -SECTION = "devel" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=d499814247adaee08d88080841cb5665" - -DEPENDS = "e2fsprogs-native" - -PACKAGECONFIG ?= "zlib bz2 xz zstd ${@bb.utils.filter('DISTRO_FEATURES', 'acl xattr', d)}" - -DEPENDS_BZIP2 = "bzip2-replacement-native" -DEPENDS_BZIP2:class-target = "bzip2" - -PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," -PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib," -PACKAGECONFIG[bz2] = "--with-bz2lib,--without-bz2lib,${DEPENDS_BZIP2}," -PACKAGECONFIG[xz] = "--with-lzma,--without-lzma,xz," -PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," -PACKAGECONFIG[libb2] = "--with-libb2,--without-libb2,libb2," -PACKAGECONFIG[libxml2] = "--with-xml2,--without-xml2,libxml2," -PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat," -PACKAGECONFIG[lzo] = "--with-lzo2,--without-lzo2,lzo," -PACKAGECONFIG[nettle] = "--with-nettle,--without-nettle,nettle," -PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," -PACKAGECONFIG[mbedtls] = "--with-mbedtls,--without-mbedtls,mbedtls," -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" - -CVE_STATUS[CVE-2023-30571] = "upstream-wontfix: upstream has documented that reported function is not thread-safe" - -inherit autotools update-alternatives pkgconfig - -CPPFLAGS += "-I${WORKDIR}/extra-includes" - -do_configure[cleandirs] += "${WORKDIR}/extra-includes" -do_configure:prepend() { - # We just need the headers for some type constants, so no need to - # build all of e2fsprogs for the target - cp -R ${STAGING_INCDIR_NATIVE}/ext2fs ${WORKDIR}/extra-includes/ -} - -ALTERNATIVE_PRIORITY = "80" - -PACKAGES =+ "bsdtar" -FILES:bsdtar = "${bindir}/bsdtar" - -ALTERNATIVE:bsdtar = "tar" -ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" -ALTERNATIVE_TARGET[tar] = "${bindir}/bsdtar" - -PACKAGES =+ "bsdcpio" -FILES:bsdcpio = "${bindir}/bsdcpio" - -ALTERNATIVE:bsdcpio = "cpio" -ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio" -ALTERNATIVE_TARGET[cpio] = "${bindir}/bsdcpio" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/libarchive/libarchive_3.7.6.bb b/meta/recipes-extended/libarchive/libarchive_3.7.6.bb new file mode 100644 index 0000000000..de4d1ef764 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive_3.7.6.bb @@ -0,0 +1,67 @@ +SUMMARY = "Support for reading various archive formats" +DESCRIPTION = "C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats" +HOMEPAGE = "http://www.libarchive.org/" +SECTION = "devel" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=d499814247adaee08d88080841cb5665" + +DEPENDS = "e2fsprogs-native" + +PACKAGECONFIG ?= "zlib bz2 xz zstd ${@bb.utils.filter('DISTRO_FEATURES', 'acl xattr', d)}" + +DEPENDS_BZIP2 = "bzip2-replacement-native" +DEPENDS_BZIP2:class-target = "bzip2" + +PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," +PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib," +PACKAGECONFIG[bz2] = "--with-bz2lib,--without-bz2lib,${DEPENDS_BZIP2}," +PACKAGECONFIG[xz] = "--with-lzma,--without-lzma,xz," +PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," +PACKAGECONFIG[libb2] = "--with-libb2,--without-libb2,libb2," +PACKAGECONFIG[libxml2] = "--with-xml2,--without-xml2,libxml2," +PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat," +PACKAGECONFIG[lzo] = "--with-lzo2,--without-lzo2,lzo," +PACKAGECONFIG[nettle] = "--with-nettle,--without-nettle,nettle," +PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," +PACKAGECONFIG[mbedtls] = "--with-mbedtls,--without-mbedtls,mbedtls," +PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd," + +EXTRA_OECONF += "--enable-largefile --without-iconv" + +SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" + +UPSTREAM_CHECK_URI = "http://libarchive.org/" + +SRC_URI[sha256sum] = "b4071807367b15b72777c2eaac80f42c8ea2d20212ab279514a19fe1f6f96ef4" + +CVE_STATUS[CVE-2023-30571] = "upstream-wontfix: upstream has documented that reported function is not thread-safe" + +inherit autotools update-alternatives pkgconfig + +CPPFLAGS += "-I${WORKDIR}/extra-includes" + +do_configure[cleandirs] += "${WORKDIR}/extra-includes" +do_configure:prepend() { + # We just need the headers for some type constants, so no need to + # build all of e2fsprogs for the target + cp -R ${STAGING_INCDIR_NATIVE}/ext2fs ${WORKDIR}/extra-includes/ +} + +ALTERNATIVE_PRIORITY = "80" + +PACKAGES =+ "bsdtar" +FILES:bsdtar = "${bindir}/bsdtar" + +ALTERNATIVE:bsdtar = "tar" +ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" +ALTERNATIVE_TARGET[tar] = "${bindir}/bsdtar" + +PACKAGES =+ "bsdcpio" +FILES:bsdcpio = "${bindir}/bsdcpio" + +ALTERNATIVE:bsdcpio = "cpio" +ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio" +ALTERNATIVE_TARGET[cpio] = "${bindir}/bsdcpio" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf