From 0e89c51ca475c9076d1081117e07467c8f0739bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Sun, 9 Dec 2018 10:03:43 +0000 Subject: vars/build.vars: updates libarchive{,_host} to v3.3.3 (fixes build failure.) patches/libarchive-3.3.2.local.patch: removes obsolete patch. --- patches/libarchive-3.3.2.local.patch | 48 ------------------------------------ vars/build.vars | 8 +++--- 2 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 patches/libarchive-3.3.2.local.patch diff --git a/patches/libarchive-3.3.2.local.patch b/patches/libarchive-3.3.2.local.patch deleted file mode 100644 index 7bf80662..00000000 --- a/patches/libarchive-3.3.2.local.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/libarchive/archive_openssl_hmac_private.h.orig 2018-03-22 20:47:12 UTC -+++ b/libarchive/archive_openssl_hmac_private.h -@@ -28,7 +28,8 @@ - #include - #include - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - #include /* malloc, free */ - #include /* memset */ - static inline HMAC_CTX *HMAC_CTX_new(void) -From fa7438a0ff4033e4741c807394a9af6207940d71 Mon Sep 17 00:00:00 2001 -From: Joerg Sonnenberger -Date: Tue, 5 Sep 2017 18:12:19 +0200 -Subject: [PATCH] Do something sensible for empty strings to make fuzzers - happy. - ---- - libarchive/archive_read_support_format_xar.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c -index 7a22beb9d..93eeacc5e 100644 ---- a/libarchive/archive_read_support_format_xar.c -+++ b/libarchive/archive_read_support_format_xar.c -@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt) - uint64_t l; - int digit; - -+ if (char_cnt == 0) -+ return (0); -+ - l = 0; - digit = *p - '0'; - while (digit >= 0 && digit < 10 && char_cnt-- > 0) { -@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt) - { - int64_t l; - int digit; -- -+ -+ if (char_cnt == 0) -+ return (0); -+ - l = 0; - while (char_cnt-- > 0) { - if (*p >= '0' && *p <= '7') diff --git a/vars/build.vars b/vars/build.vars index 4b965187..4c227c5c 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -67,8 +67,8 @@ HOST_TOOLS_RPM_MAKEFLAGS_INSTALL_EXTRA="prefix="; HOST_TOOLS_RPM_PACKAGES="libarchive_host libressl_host lmdb_host popt_host rpm_host"; HOST_TOOLS_RPM_PARALLELISE=0; HOST_TOOLS_RPM_PREFIX="${PREFIX}"; -: ${PKG_LIBARCHIVE_HOST_SHA256SUM:=ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce}; -: ${PKG_LIBARCHIVE_HOST_VERSION:=3.3.2}; +: ${PKG_LIBARCHIVE_HOST_SHA256SUM:=ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e}; +: ${PKG_LIBARCHIVE_HOST_VERSION:=3.3.3}; : ${PKG_LIBARCHIVE_HOST_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_HOST_VERSION}.tar.gz}; : ${PKG_LIBRESSL_HOST_SHA256SUM:=917a8779c342177ff3751a2bf955d0262d1d8916a4b408930c45cef326700995}; : ${PKG_LIBRESSL_HOST_VERSION:=2.7.2}; @@ -530,8 +530,8 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python"; : ${PKG_GZIP_CONFIGURE_ARGS:=--host=${DEFAULT_TARGET} --prefix= --target=${DEFAULT_TARGET}}; : ${PKG_GZIP_MAKEFLAGS_BUILD_EXTRA:=OBJA= prefix=}; : ${PKG_GZIP_MAKEFLAGS_INSTALL_EXTRA:="OBJA="}; -: ${PKG_LIBARCHIVE_SHA256SUM:=ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce}; -: ${PKG_LIBARCHIVE_VERSION:=3.3.2}; +: ${PKG_LIBARCHIVE_SHA256SUM:=ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e}; +: ${PKG_LIBARCHIVE_VERSION:=3.3.3}; : ${PKG_LIBARCHIVE_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.gz}; : ${PKG_LIBARCHIVE_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib}; : ${PKG_LIBATOMIC_OPS_URLS_GIT:="libatomic_ops=https://github.com/ivmai/libatomic_ops@master"}; -- cgit v1.2.3