diff options
Diffstat (limited to 'meta/recipes-extended/libarchive')
| -rw-r--r-- | meta/recipes-extended/libarchive/libarchive/configurehack.patch | 55 | ||||
| -rw-r--r-- | meta/recipes-extended/libarchive/libarchive_3.7.3.bb (renamed from meta/recipes-extended/libarchive/libarchive_3.4.3.bb) | 31 |
2 files changed, 71 insertions, 15 deletions
diff --git a/meta/recipes-extended/libarchive/libarchive/configurehack.patch b/meta/recipes-extended/libarchive/libarchive/configurehack.patch new file mode 100644 index 0000000000..45fddd9147 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/configurehack.patch @@ -0,0 +1,55 @@ +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.4.3.bb b/meta/recipes-extended/libarchive/libarchive_3.7.3.bb index dbfc067b93..bea91b6e97 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.3.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.7.3.bb @@ -3,19 +3,14 @@ DESCRIPTION = "C library and command-line tools for reading and writing tar, cpi HOMEPAGE = "http://www.libarchive.org/" SECTION = "devel" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=fe01f5e02b1f0cc934d593a7b0ddceb6" +LIC_FILES_CHKSUM = "file://COPYING;md5=d499814247adaee08d88080841cb5665" DEPENDS = "e2fsprogs-native" -PACKAGECONFIG ?= "zlib bz2 xz lzo" - -PACKAGECONFIG_append_class-target = "\ - libxml2 \ - ${@bb.utils.filter('DISTRO_FEATURES', 'acl xattr', d)} \ -" +PACKAGECONFIG ?= "zlib bz2 xz zstd ${@bb.utils.filter('DISTRO_FEATURES', 'acl xattr', d)}" DEPENDS_BZIP2 = "bzip2-replacement-native" -DEPENDS_BZIP2_class-target = "bzip2" +DEPENDS_BZIP2:class-target = "bzip2" PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," @@ -23,25 +18,31 @@ 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" +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] = "f27a97bc22ceb996e72502df47dc19f99f9a0f09181ae909f09f3c9eb17b67e2" -SRC_URI[sha256sum] = "ee1e749213c108cb60d53147f18c31a73d6717d7e3d2481c157e1b34c881ea39" +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() { +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/ @@ -50,16 +51,16 @@ do_configure_prepend() { ALTERNATIVE_PRIORITY = "80" PACKAGES =+ "bsdtar" -FILES_bsdtar = "${bindir}/bsdtar" +FILES:bsdtar = "${bindir}/bsdtar" -ALTERNATIVE_bsdtar = "tar" +ALTERNATIVE:bsdtar = "tar" ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" ALTERNATIVE_TARGET[tar] = "${bindir}/bsdtar" PACKAGES =+ "bsdcpio" -FILES_bsdcpio = "${bindir}/bsdcpio" +FILES:bsdcpio = "${bindir}/bsdcpio" -ALTERNATIVE_bsdcpio = "cpio" +ALTERNATIVE:bsdcpio = "cpio" ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio" ALTERNATIVE_TARGET[cpio] = "${bindir}/bsdcpio" |