From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- app-arch/libarchive/Manifest | 5 +- .../libarchive-3.4.0-without_zlib_build_fix.patch | 160 --------------------- app-arch/libarchive/libarchive-3.4.0.ebuild | 135 ----------------- app-arch/libarchive/libarchive-3.4.2.ebuild | 2 +- 4 files changed, 2 insertions(+), 300 deletions(-) delete mode 100644 app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch delete mode 100644 app-arch/libarchive/libarchive-3.4.0.ebuild (limited to 'app-arch/libarchive') diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest index be6b962df259..a4a8a0effd7c 100644 --- a/app-arch/libarchive/Manifest +++ b/app-arch/libarchive/Manifest @@ -1,7 +1,4 @@ AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a0127e43a2d95e0187d566fd371aa7ecc0861d99ab21641e9f2d6800b36155e3b845c1099ec7b1d3dc0f3c0fe2b78c9e273 SHA512 0a8dfd7f30ca450cf253bd475d328a886957257e1c7c6a6c9eace4cacdefd9f1eaeb4de81ad00a2439bb75336a82b08278f98c6143803f6047159036e848aabe -AUX libarchive-3.4.0-without_zlib_build_fix.patch 4850 BLAKE2B 2f4a670afa2ca1ec22036b3544d03b04f7cd5fed4ce9829017c07323c45f4d0eae40555856d26a81345f65f6b65d0cb026ae4fa17ed3c1a42392190e390cf069 SHA512 1ae44704d4fcf5477baec6fdbf518dac6b9f40d3648d1a0447c0311b8388a3ab11fdea3db8b249a1cdfde65fcd27c4f41076d3f50444e67ec9bcec1a801775bc -DIST libarchive-3.4.0.tar.gz 6908093 BLAKE2B 6da5798ceabb542d8b877b3d672f6e6431ed7340ec0160a5d8cef28591b516b55d426002379eddc632a478bfd2f034a358f8552f55c9f066fd7f5c31c218b462 SHA512 2f9e2a551a6bcab56fb1a030b5d656df7299a3d151465aa02f0420d344d2fada49dee4755b3abff9095f62519e14dc9af8afa1695ecc6d5fdb4f0b28e6ede852 DIST libarchive-3.4.2.tar.gz 6979481 BLAKE2B eea90e4751ae487cd1a9b0eecd16598d1b81ffff665ae97a160e3858c8ffe60b82003f081af644f3f32260d0e1d3f3077240125e8279bf8111a79d93c68ac25d SHA512 a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021 -EBUILD libarchive-3.4.0.ebuild 3740 BLAKE2B 04ab8c8883d737e487a7958126f67ce33fee85fe718a1d96f3ecd2973bce9cf88a5b63ae7a2cd92855829e5b7ded008810d19099a1b84103c504be291214ea4a SHA512 3c01e29150aaf15a326bf8e88357520964dc5f171640c2ffe35517bbfee74669345e55f2e3bd399407866fc14042260d121d720a5bf9751da211f27614f069b3 -EBUILD libarchive-3.4.2.ebuild 3687 BLAKE2B e7f1d8e58c55ab50f4bcf6ba6e4843a743b415ac570348ba8045062e4eefb89c0ed89a11c12e69a62e2d738ede0289efaba5c9f98f14c278f0699b1508a95b7f SHA512 63d65186bf7efd972da77779312493f76e2c690ab0f98e50dd1433004b5cca8175641071e6081e35f2a57adae6a06cc7b94e3fcbbbf82aca7468d3cd239304ed +EBUILD libarchive-3.4.2.ebuild 3682 BLAKE2B e933888d38791470063f370bc550105f96a9305d26ae2188f546f57605943658314c6bcfab52f4cde877f9e1eefd0c64c92e19a47502455533e13000b9100017 SHA512 fcca418f5d06b6b0460a69ea26eab3d3792ba7bca0f25d0c700e434664eaed29de81dc9b570e4694cea6570e6c7abda41258a300dd07d3dccac38a287af17c73 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7 diff --git a/app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch b/app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch deleted file mode 100644 index e0a3167390f0..000000000000 --- a/app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch +++ /dev/null @@ -1,160 +0,0 @@ -From 64333cef68d7bcc67bef6ecf177fbeaa549b9139 Mon Sep 17 00:00:00 2001 -From: Martin Matuska -Date: Sat, 29 Jun 2019 00:20:58 +0200 -Subject: [PATCH] Unbreak compilation without zlib - -Fixes #1214 ---- - libarchive/archive_read_support_filter_gzip.c | 54 ++++++++++++------- - libarchive/test/test_read_format_raw.c | 4 ++ - 2 files changed, 39 insertions(+), 19 deletions(-) - -diff --git a/libarchive/archive_read_support_filter_gzip.c b/libarchive/archive_read_support_filter_gzip.c -index 458b6f729..9fa9e2b0d 100644 ---- a/libarchive/archive_read_support_filter_gzip.c -+++ b/libarchive/archive_read_support_filter_gzip.c -@@ -131,12 +131,20 @@ archive_read_support_filter_gzip(struct archive *_a) - */ - static ssize_t - peek_at_header(struct archive_read_filter *filter, int *pbits, -- struct private_data *state) -+#ifdef HAVE_ZLIB_H -+ struct private_data *state -+#else -+ void *state -+#endif -+ ) - { - const unsigned char *p; - ssize_t avail, len; - int bits = 0; - int header_flags; -+#ifndef HAVE_ZLIB_H -+ (void)state; /* UNUSED */ -+#endif - - /* Start by looking at the first ten bytes of the header, which - * is all fixed layout. */ -@@ -153,8 +161,10 @@ peek_at_header(struct archive_read_filter *filter, int *pbits, - bits += 3; - header_flags = p[3]; - /* Bytes 4-7 are mod time in little endian. */ -+#ifdef HAVE_ZLIB_H - if (state) - state->mtime = archive_le32dec(p + 4); -+#endif - /* Byte 8 is deflate flags. */ - /* XXXX TODO: return deflate flags back to consume_header for use - in initializing the decompressor. */ -@@ -171,7 +181,9 @@ peek_at_header(struct archive_read_filter *filter, int *pbits, - - /* Null-terminated optional filename. */ - if (header_flags & 8) { -+#ifdef HAVE_ZLIB_H - ssize_t file_start = len; -+#endif - do { - ++len; - if (avail < len) -@@ -181,11 +193,13 @@ peek_at_header(struct archive_read_filter *filter, int *pbits, - return (0); - } while (p[len - 1] != 0); - -+#ifdef HAVE_ZLIB_H - if (state) { - /* Reset the name in case of repeat header reads. */ - free(state->name); - state->name = strdup((const char *)&p[file_start]); - } -+#endif - } - - /* Null-terminated optional comment. */ -@@ -236,24 +250,6 @@ gzip_bidder_bid(struct archive_read_filter_bidder *self, - return (0); - } - --static int --gzip_read_header(struct archive_read_filter *self, struct archive_entry *entry) --{ -- struct private_data *state; -- -- state = (struct private_data *)self->data; -- -- /* A mtime of 0 is considered invalid/missing. */ -- if (state->mtime != 0) -- archive_entry_set_mtime(entry, state->mtime, 0); -- -- /* If the name is available, extract it. */ -- if (state->name) -- archive_entry_set_pathname(entry, state->name); -- -- return (ARCHIVE_OK); --} -- - #ifndef HAVE_ZLIB_H - - /* -@@ -277,6 +273,24 @@ gzip_bidder_init(struct archive_read_filter *self) - - #else - -+static int -+gzip_read_header(struct archive_read_filter *self, struct archive_entry *entry) -+{ -+ struct private_data *state; -+ -+ state = (struct private_data *)self->data; -+ -+ /* A mtime of 0 is considered invalid/missing. */ -+ if (state->mtime != 0) -+ archive_entry_set_mtime(entry, state->mtime, 0); -+ -+ /* If the name is available, extract it. */ -+ if (state->name) -+ archive_entry_set_pathname(entry, state->name); -+ -+ return (ARCHIVE_OK); -+} -+ - /* - * Initialize the filter object. - */ -@@ -306,7 +320,9 @@ gzip_bidder_init(struct archive_read_filter *self) - self->read = gzip_filter_read; - self->skip = NULL; /* not supported */ - self->close = gzip_filter_close; -+#ifdef HAVE_ZLIB_H - self->read_header = gzip_read_header; -+#endif - - state->in_stream = 0; /* We're not actually within a stream yet. */ - -diff --git a/libarchive/test/test_read_format_raw.c b/libarchive/test/test_read_format_raw.c -index 0dac8bfba..3961723b4 100644 ---- a/libarchive/test/test_read_format_raw.c -+++ b/libarchive/test/test_read_format_raw.c -@@ -36,7 +36,9 @@ DEFINE_TEST(test_read_format_raw) - const char *reffile1 = "test_read_format_raw.data"; - const char *reffile2 = "test_read_format_raw.data.Z"; - const char *reffile3 = "test_read_format_raw.bufr"; -+#ifdef HAVE_ZLIB_H - const char *reffile4 = "test_read_format_raw.data.gz"; -+#endif - - /* First, try pulling data out of an uninterpretable file. */ - extract_reference_file(reffile1); -@@ -119,6 +121,7 @@ DEFINE_TEST(test_read_format_raw) - assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_free(a)); - -+#ifdef HAVE_ZLIB_H - /* Fourth, try with gzip which has metadata. */ - extract_reference_file(reffile4); - assert((a = archive_read_new()) != NULL); -@@ -144,4 +147,5 @@ DEFINE_TEST(test_read_format_raw) - assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_free(a)); -+#endif - } diff --git a/app-arch/libarchive/libarchive-3.4.0.ebuild b/app-arch/libarchive/libarchive-3.4.0.ebuild deleted file mode 100644 index 1c960f7b3326..000000000000 --- a/app-arch/libarchive/libarchive-3.4.0.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit libtool multilib-minimal toolchain-funcs - -DESCRIPTION="Multi-format archive and compression library" -HOMEPAGE="https://www.libarchive.org/" -SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz" - -LICENSE="BSD BSD-2 BSD-4 public-domain" -SLOT="0/13" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd" - -RDEPEND=" - acl? ( virtual/acl[${MULTILIB_USEDEP}] ) - blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] ) - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) - expat? ( dev-libs/expat[${MULTILIB_USEDEP}] ) - !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) - iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) - kernel_linux? ( - xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) - ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) - lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] ) - lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) - nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - kernel_linux? ( - virtual/os-headers - e2fsprogs? ( sys-fs/e2fsprogs ) - )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.3.3-libressl.patch - "${FILESDIR}"/${P}-without_zlib_build_fix.patch #693202 -) - -# Various test problems, starting with the fact that sandbox -# explodes on long paths. https://bugs.gentoo.org/598806 -RESTRICT="test" - -src_prepare() { - default - elibtoolize # is required for Solaris sol2_ld linker fix -} - -multilib_src_configure() { - export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 - - local myconf=( - $(use_enable acl) - $(use_enable static-libs static) - $(use_enable xattr) - $(use_with blake2 libb2) - $(use_with bzip2 bz2lib) - $(use_with expat) - $(use_with !expat xml2) - $(use_with iconv) - $(use_with lz4) - $(use_with lzma) - $(use_with lzo lzo2) - $(use_with nettle) - $(use_with zlib) - $(use_with zstd) - - # Windows-specific - --without-cng - ) - if multilib_is_native_abi ; then - myconf+=( - --enable-bsdcat=$(tc-is-static-only && echo static || echo shared) - --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) - --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) - ) - else - myconf+=( - --disable-bsdcat - --disable-bsdcpio - --disable-bsdtar - ) - fi - - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi ; then - emake - else - emake libarchive.la - fi -} - -multilib_src_test() { - # Replace the default src_test so that it builds tests in parallel - multilib_is_native_abi && emake check -} - -multilib_src_install() { - if multilib_is_native_abi ; then - emake DESTDIR="${D}" install - - # Create symlinks for FreeBSD - if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then - # Exclude cat for the time being #589876 - for bin in cpio tar; do - dosym bsd${bin} /usr/bin/${bin} - echo '.so bsd${bin}.1' > "${T}"/${bin}.1 - doman "${T}"/${bin}.1 - done - fi - else - local install_targets=( - install-includeHEADERS - install-libLTLIBRARIES - install-pkgconfigDATA - ) - emake DESTDIR="${D}" "${install_targets[@]}" - fi - - # Libs.private: should be used from libarchive.pc instead - find "${ED}" -type f -name "*.la" -delete || die -} - -multilib_src_install_all() { - cd "${S}" || die - einstalldocs -} diff --git a/app-arch/libarchive/libarchive-3.4.2.ebuild b/app-arch/libarchive/libarchive-3.4.2.ebuild index 0febd6af539f..d9f9a71caad5 100644 --- a/app-arch/libarchive/libarchive-3.4.2.ebuild +++ b/app-arch/libarchive/libarchive-3.4.2.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz" LICENSE="BSD BSD-2 BSD-4 public-domain" SLOT="0/13" -KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd" RDEPEND=" -- cgit v1.2.3