commit: 6709a4dd32310b2280e4e90e37c4000fa9c13e27 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon Oct 31 21:28:26 2016 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon Oct 31 22:38:53 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6709a4dd
app-arch/libarchive: Removed old. Package-Manager: portage-2.3.2 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> app-arch/libarchive/Manifest | 1 - .../files/libarchive-3.1.2-CVE-2013-0211.patch | 32 ------ .../files/libarchive-3.1.2-CVE-2016-1541.patch | 67 ----------- .../files/libarchive-3.1.2-outofsource.patch | 29 ----- app-arch/libarchive/libarchive-3.1.2-r1.ebuild | 91 --------------- app-arch/libarchive/libarchive-3.1.2-r2.ebuild | 93 --------------- app-arch/libarchive/libarchive-3.1.2-r3.ebuild | 121 -------------------- app-arch/libarchive/libarchive-3.1.2-r4.ebuild | 121 -------------------- app-arch/libarchive/libarchive-3.1.2-r5.ebuild | 125 --------------------- 9 files changed, 680 deletions(-) diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest index 258b3dc..778eae3 100644 --- a/app-arch/libarchive/Manifest +++ b/app-arch/libarchive/Manifest @@ -1,3 +1,2 @@ -DIST libarchive-3.1.2.tar.gz 4527540 SHA256 eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e SHA512 1f3c2a675031f93c7d42ae2ed06742b0b1e2236ff57d9117791d62fb8ae77d6cafffbcb5d45b5bd98daa908bd18c576cf82e01a9b1eba699705e23eff3688114 WHIRLPOOL b90f336afb5264be91fb17d7dae3d5697e3f84e24d276af1d5ac076fe15ef6f5756488f09506fabe470473becb5449cd1f34865309dcf8a914e6e83506e8695f DIST libarchive-3.2.1.tar.gz 5448888 SHA256 72ee1a4e3fd534525f13a0ba1aa7b05b203d186e0c6072a8a4738649d0b3cfd2 SHA512 a5d43cb0bf36b687fabfbc874e7adc1fa94c563e7f073e107db8d4e79e8d0d8146cb985809f8115fbb882fc2d8a2a477d0a7364e93e6df62f292bb5e9865ec5c WHIRLPOOL 1dd79ec3d7cf53be237d6730476c6a47c0722a5a7d0f2adc347aa491ba95ba7c77342a39a9e3d0fbff64111b552bb558cb571aa74dd6c18e6c60987bf0f41d7c DIST libarchive-3.2.2.tar.gz 5458241 SHA256 691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f SHA512 a67920c37d49cf9478032d77fc4fa21827cebb96e9b83d9ecb8466328834052e4ab3d3a9bc4e2edf405d6cb14ffd648c9fa100b578257f6e5842c99bbea558a7 WHIRLPOOL 8fdc2e9245db27a7da3cfdeecb6283b170a25fc6ea8201fe5a414b4c1b523ae6b05745246f867f24062d91b7a040780b687b1a44a95503c4e252f9836218ffef diff --git a/app-arch/libarchive/files/libarchive-3.1.2-CVE-2013-0211.patch b/app-arch/libarchive/files/libarchive-3.1.2-CVE-2013-0211.patch deleted file mode 100644 index 78427ce..00000000 --- a/app-arch/libarchive/files/libarchive-3.1.2-CVE-2013-0211.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 22531545514043e04633e1c015c7540b9de9dbe4 Mon Sep 17 00:00:00 2001 -From: Tim Kientzle <[email protected]> -Date: Fri, 22 Mar 2013 23:48:41 -0700 -Subject: [PATCH] Limit write requests to at most INT_MAX. This prevents a - certain common programming error (passing -1 to write) from leading to other - problems deeper in the library. - ---- - libarchive/archive_write.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c -index eede5e0..be85621 100644 ---- a/libarchive/archive_write.c -+++ b/libarchive/archive_write.c -@@ -673,8 +673,13 @@ static ssize_t - _archive_write_data(struct archive *_a, const void *buff, size_t s) - { - struct archive_write *a = (struct archive_write *)_a; -+ const size_t max_write = INT_MAX; -+ - archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC, - ARCHIVE_STATE_DATA, "archive_write_data"); -+ /* In particular, this catches attempts to pass negative values. */ -+ if (s > max_write) -+ s = max_write; - archive_clear_error(&a->archive); - return ((a->format_write_data)(a, buff, s)); - } --- -1.8.1 - diff --git a/app-arch/libarchive/files/libarchive-3.1.2-CVE-2016-1541.patch b/app-arch/libarchive/files/libarchive-3.1.2-CVE-2016-1541.patch deleted file mode 100644 index 63c6a74..00000000 --- a/app-arch/libarchive/files/libarchive-3.1.2-CVE-2016-1541.patch +++ /dev/null @@ -1,67 +0,0 @@ -From d0331e8e5b05b475f20b1f3101fe1ad772d7e7e7 Mon Sep 17 00:00:00 2001 -From: Tim Kientzle <[email protected]> -Date: Sun, 24 Apr 2016 17:13:45 -0700 -Subject: [PATCH] Issue #656: Fix CVE-2016-1541, VU#862384 - -When reading OS X metadata entries in Zip archives that were stored -without compression, libarchive would use the uncompressed entry size -to allocate a buffer but would use the compressed entry size to limit -the amount of data copied into that buffer. Since the compressed -and uncompressed sizes are provided by data in the archive itself, -an attacker could manipulate these values to write data beyond -the end of the allocated buffer. - -This fix provides three new checks to guard against such -manipulation and to make libarchive generally more robust when -handling this type of entry: - 1. If an OS X metadata entry is stored without compression, - abort the entire archive if the compressed and uncompressed - data sizes do not match. - 2. When sanity-checking the size of an OS X metadata entry, - abort this entry if either the compressed or uncompressed - size is larger than 4MB. - 3. When copying data into the allocated buffer, check the copy - size against both the compressed entry size and uncompressed - entry size. ---- - libarchive/archive_read_support_format_zip.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c -index 0f8262c..0a0be96 100644 ---- a/libarchive/archive_read_support_format_zip.c -+++ b/libarchive/archive_read_support_format_zip.c -@@ -2778,6 +2778,11 @@ zip_read_mac_metadata(struct archive_read *a, struct archive_entry *entry, - - switch(rsrc->compression) { - case 0: /* No compression. */ -+ if (rsrc->uncompressed_size != rsrc->compressed_size) { -+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, -+ "Malformed OS X metadata entry: inconsistent size"); -+ return (ARCHIVE_FATAL); -+ } - #ifdef HAVE_ZLIB_H - case 8: /* Deflate compression. */ - #endif -@@ -2798,6 +2803,12 @@ zip_read_mac_metadata(struct archive_read *a, struct archive_entry *entry, - (intmax_t)rsrc->uncompressed_size); - return (ARCHIVE_WARN); - } -+ if (rsrc->compressed_size > (4 * 1024 * 1024)) { -+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, -+ "Mac metadata is too large: %jd > 4M bytes", -+ (intmax_t)rsrc->compressed_size); -+ return (ARCHIVE_WARN); -+ } - - metadata = malloc((size_t)rsrc->uncompressed_size); - if (metadata == NULL) { -@@ -2836,6 +2847,8 @@ zip_read_mac_metadata(struct archive_read *a, struct archive_entry *entry, - bytes_avail = remaining_bytes; - switch(rsrc->compression) { - case 0: /* No compression. */ -+ if ((size_t)bytes_avail > metadata_bytes) -+ bytes_avail = metadata_bytes; - memcpy(mp, p, bytes_avail); - bytes_used = (size_t)bytes_avail; - metadata_bytes -= bytes_used; diff --git a/app-arch/libarchive/files/libarchive-3.1.2-outofsource.patch b/app-arch/libarchive/files/libarchive-3.1.2-outofsource.patch deleted file mode 100644 index 6545c61..00000000 --- a/app-arch/libarchive/files/libarchive-3.1.2-outofsource.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/Makefile.am 2013-02-09 12:23:03.000000000 -0500 -+++ b/Makefile.am 2016-01-08 16:43:00.868186895 -0500 -@@ -508,7 +508,7 @@ - # Building it automatically provides a sanity-check on libarchive_test_SOURCES - # above. - libarchive/test/list.h: Makefile -- cat $(top_srcdir)/libarchive/test/test_*.c | grep DEFINE_TEST > libarchive/test/list.h -+ mkdir -p libarchive/test && cat $(top_srcdir)/libarchive/test/test_*.c | grep DEFINE_TEST > libarchive/test/list.h - - libarchive_TESTS_ENVIRONMENT= LIBARCHIVE_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/libarchive/test LRZIP=NOCONFIG - -@@ -835,7 +835,7 @@ - $(PLATFORMCPPFLAGS) - - tar/test/list.h: Makefile -- cat $(top_srcdir)/tar/test/test_*.c | grep DEFINE_TEST > tar/test/list.h -+ mkdir -p tar/test && cat $(top_srcdir)/tar/test/test_*.c | grep DEFINE_TEST > tar/test/list.h - - if BUILD_BSDTAR - bsdtar_test_programs= bsdtar_test -@@ -975,7 +975,7 @@ - bsdcpio_test_LDADD=libarchive_fe.la - - cpio/test/list.h: Makefile -- cat $(top_srcdir)/cpio/test/test_*.c | grep DEFINE_TEST > cpio/test/list.h -+ mkdir -p cpio/test && cat $(top_srcdir)/cpio/test/test_*.c | grep DEFINE_TEST > cpio/test/list.h - - if BUILD_BSDCPIO - bsdcpio_test_programs= bsdcpio_test diff --git a/app-arch/libarchive/libarchive-3.1.2-r1.ebuild b/app-arch/libarchive/libarchive-3.1.2-r1.ebuild deleted file mode 100644 index ce57a80..00000000 --- a/app-arch/libarchive/libarchive-3.1.2-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils libtool multilib toolchain-funcs - -DESCRIPTION="BSD tar command" -HOMEPAGE="http://www.libarchive.org/"; -SRC_URI="http://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 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux +lzma lzo nettle static-libs xattr +zlib" - -RDEPEND="dev-libs/openssl:0 - acl? ( virtual/acl ) - bzip2? ( app-arch/bzip2 ) - expat? ( dev-libs/expat ) - !expat? ( dev-libs/libxml2 ) - iconv? ( virtual/libiconv ) - kernel_linux? ( - xattr? ( sys-apps/attr ) - ) - lzma? ( app-arch/xz-utils ) - lzo? ( >=dev-libs/lzo-2 ) - nettle? ( dev-libs/nettle ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - kernel_linux? ( - virtual/os-headers - e2fsprogs? ( sys-fs/e2fsprogs ) - )" - -DOCS="NEWS README" - -src_prepare() { - epatch "${FILESDIR}"/${P}-CVE-2013-0211.patch - elibtoolize -} - -src_configure() { - export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 - - # We disable lzmadec because we support the newer liblzma from xz-utils - # and not liblzmadec with this version. - econf \ - $(use_enable static-libs static) \ - --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) \ - --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) \ - $(use_enable xattr) \ - $(use_enable acl) \ - $(use_with zlib) \ - $(use_with bzip2 bz2lib) \ - --without-lzmadec \ - $(use_with iconv) \ - $(use_with lzma) \ - $(use_with lzo lzo2) \ - $(use_with nettle) \ - $(use_with !expat xml2) \ - $(use_with expat) -} - -src_test() { - # Replace the default src_test so that it builds tests in parallel - emake check -} - -src_install() { - default - - # Libs.private: should be used from libarchive.pc instead - prune_libtool_files - - # Create tar symlink for FreeBSD - if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then - dosym bsdtar /usr/bin/tar - echo '.so bsdtar.1' > "${T}"/tar.1 - doman "${T}"/tar.1 - # We may wish to switch to symlink bsdcpio to cpio too one day - fi -} - -pkg_preinst() { - preserve_old_lib /usr/$(get_libdir)/${PN}$(get_libname 12) -} - -pkg_postinst() { - preserve_old_lib_notify /usr/$(get_libdir)/${PN}$(get_libname 12) -} diff --git a/app-arch/libarchive/libarchive-3.1.2-r2.ebuild b/app-arch/libarchive/libarchive-3.1.2-r2.ebuild deleted file mode 100644 index 5b56888..00000000 --- a/app-arch/libarchive/libarchive-3.1.2-r2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils libtool multilib toolchain-funcs - -DESCRIPTION="BSD tar command" -HOMEPAGE="http://www.libarchive.org/"; -SRC_URI="http://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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl +lzma lzo nettle static-libs xattr +zlib" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - acl? ( virtual/acl ) - bzip2? ( app-arch/bzip2 ) - expat? ( dev-libs/expat ) - !expat? ( dev-libs/libxml2 ) - iconv? ( virtual/libiconv ) - kernel_linux? ( - xattr? ( sys-apps/attr ) - ) - lzma? ( app-arch/xz-utils ) - lzo? ( >=dev-libs/lzo-2 ) - nettle? ( dev-libs/nettle ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - kernel_linux? ( - virtual/os-headers - e2fsprogs? ( sys-fs/e2fsprogs ) - )" - -DOCS="NEWS README" - -src_prepare() { - epatch "${FILESDIR}"/${P}-CVE-2013-0211.patch - elibtoolize -} - -src_configure() { - export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 - - # We disable lzmadec because we support the newer liblzma from xz-utils - # and not liblzmadec with this version. - econf \ - $(use_enable static-libs static) \ - --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) \ - --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) \ - $(use_enable xattr) \ - $(use_enable acl) \ - $(use_with zlib) \ - $(use_with bzip2 bz2lib) \ - --without-lzmadec \ - $(use_with iconv) \ - $(use_with lzma) \ - $(use_with lzo lzo2) \ - $(use_with nettle) \ - $(use_with !expat xml2) \ - $(use_with expat) -} - -src_test() { - # Replace the default src_test so that it builds tests in parallel - emake check -} - -src_install() { - default - - # Libs.private: should be used from libarchive.pc instead - prune_libtool_files - - # Create tar symlink for FreeBSD - if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then - dosym bsdtar /usr/bin/tar - echo '.so bsdtar.1' > "${T}"/tar.1 - doman "${T}"/tar.1 - # We may wish to switch to symlink bsdcpio to cpio too one day - fi -} - -pkg_preinst() { - preserve_old_lib /usr/$(get_libdir)/${PN}$(get_libname 12) -} - -pkg_postinst() { - preserve_old_lib_notify /usr/$(get_libdir)/${PN}$(get_libname 12) -} diff --git a/app-arch/libarchive/libarchive-3.1.2-r3.ebuild b/app-arch/libarchive/libarchive-3.1.2-r3.ebuild deleted file mode 100644 index 53b45fd..00000000 --- a/app-arch/libarchive/libarchive-3.1.2-r3.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit autotools eutils multilib-minimal toolchain-funcs - -DESCRIPTION="BSD tar command" -HOMEPAGE="http://www.libarchive.org/"; -SRC_URI="http://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 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl +lzma lzo nettle static-libs xattr +zlib" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - acl? ( virtual/acl[${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}] ) - ) - lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] ) - lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) - nettle? ( dev-libs/nettle[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - kernel_linux? ( - virtual/os-headers - e2fsprogs? ( sys-fs/e2fsprogs ) - )" - -DOCS=( NEWS README ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-CVE-2013-0211.patch - epatch "${FILESDIR}"/${P}-outofsource.patch - eautoreconf -} - -multilib_src_configure() { - export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 - - local myconf=() - myconf=( - $(use_enable static-libs static) - $(use_enable xattr) - $(use_enable acl) - $(use_with zlib) - $(use_with bzip2 bz2lib) - $(use_with iconv) - $(use_with lzma) - $(use_with lzo lzo2) - $(use_with nettle) - $(use_with !expat xml2) - $(use_with expat) - ) - if multilib_is_native_abi ; then myconf+=( - --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) - --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) - ); else myconf+=( - --disable-bsdtar - --disable-bsdcpio - ); fi - - # We disable lzmadec because we support the newer liblzma from xz-utils - # and not liblzmadec with this version. - myconf+=( - --without-lzmadec - ) - - 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 - - # Libs.private: should be used from libarchive.pc instead - prune_libtool_files - - # Create tar symlink for FreeBSD - if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then - dosym bsdtar /usr/bin/tar - echo '.so bsdtar.1' > "${T}"/tar.1 - doman "${T}"/tar.1 - # We may wish to switch to symlink bsdcpio to cpio too one day - fi - else - emake DESTDIR="${D}" \ - install-includeHEADERS \ - install-libLTLIBRARIES \ - install-pkgconfigDATA - - # Libs.private: should be used from libarchive.pc instead - prune_libtool_files - fi -} - -multilib_src_install_all() { - cd "${S}" || die - dodoc "${DOCS[@]}" -} diff --git a/app-arch/libarchive/libarchive-3.1.2-r4.ebuild b/app-arch/libarchive/libarchive-3.1.2-r4.ebuild deleted file mode 100644 index 9452b43..00000000 --- a/app-arch/libarchive/libarchive-3.1.2-r4.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit autotools eutils multilib-minimal toolchain-funcs - -DESCRIPTION="BSD tar command" -HOMEPAGE="http://www.libarchive.org/"; -SRC_URI="http://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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl +lzma lzo nettle static-libs xattr +zlib" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - acl? ( virtual/acl[${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}] ) - ) - lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] ) - lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) - nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - kernel_linux? ( - virtual/os-headers - e2fsprogs? ( sys-fs/e2fsprogs ) - )" - -DOCS=( NEWS README ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-CVE-2013-0211.patch - epatch "${FILESDIR}"/${P}-outofsource.patch - eautoreconf -} - -multilib_src_configure() { - export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 - - local myconf=() - myconf=( - $(use_enable static-libs static) - $(use_enable xattr) - $(use_enable acl) - $(use_with zlib) - $(use_with bzip2 bz2lib) - $(use_with iconv) - $(use_with lzma) - $(use_with lzo lzo2) - $(use_with nettle) - $(use_with !expat xml2) - $(use_with expat) - ) - if multilib_is_native_abi ; then myconf+=( - --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) - --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) - ); else myconf+=( - --disable-bsdtar - --disable-bsdcpio - ); fi - - # We disable lzmadec because we support the newer liblzma from xz-utils - # and not liblzmadec with this version. - myconf+=( - --without-lzmadec - ) - - 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 - - # Libs.private: should be used from libarchive.pc instead - prune_libtool_files - - # Create tar symlink for FreeBSD - if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then - dosym bsdtar /usr/bin/tar - echo '.so bsdtar.1' > "${T}"/tar.1 - doman "${T}"/tar.1 - # We may wish to switch to symlink bsdcpio to cpio too one day - fi - else - emake DESTDIR="${D}" \ - install-includeHEADERS \ - install-libLTLIBRARIES \ - install-pkgconfigDATA - - # Libs.private: should be used from libarchive.pc instead - prune_libtool_files - fi -} - -multilib_src_install_all() { - cd "${S}" || die - dodoc "${DOCS[@]}" -} diff --git a/app-arch/libarchive/libarchive-3.1.2-r5.ebuild b/app-arch/libarchive/libarchive-3.1.2-r5.ebuild deleted file mode 100644 index 7d43f90..00000000 --- a/app-arch/libarchive/libarchive-3.1.2-r5.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit autotools eutils multilib-minimal toolchain-funcs - -DESCRIPTION="BSD tar command" -HOMEPAGE="http://www.libarchive.org/"; -SRC_URI="http://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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl +lzma lzo nettle static-libs xattr +zlib" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - acl? ( virtual/acl[${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}] ) - ) - lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] ) - lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) - nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - kernel_linux? ( - virtual/os-headers - e2fsprogs? ( sys-fs/e2fsprogs ) - )" - -DOCS=( NEWS README ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-CVE-2013-0211.patch - epatch "${FILESDIR}"/${P}-outofsource.patch - epatch "${FILESDIR}"/${P}-CVE-2016-1541.patch - eautoreconf -} - -multilib_src_configure() { - export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 - - local myconf=() - # acl: libarchive has tight integration with OSX, disabling acl - # breaks the code for it knows it is there and assumes hence is - # enabled - myconf=( - $(use_enable static-libs static) - $(use_enable xattr) - $([[ ${CHOST} != *-darwin* ]] && use_enable acl) - $(use_with zlib) - $(use_with bzip2 bz2lib) - $(use_with iconv) - $(use_with lzma) - $(use_with lzo lzo2) - $(use_with nettle) - $(use_with !expat xml2) - $(use_with expat) - ) - if multilib_is_native_abi ; then myconf+=( - --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) - --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) - ); else myconf+=( - --disable-bsdtar - --disable-bsdcpio - ); fi - - # We disable lzmadec because we support the newer liblzma from xz-utils - # and not liblzmadec with this version. - myconf+=( - --without-lzmadec - ) - - 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 - - # Libs.private: should be used from libarchive.pc instead - prune_libtool_files - - # Create tar symlink for FreeBSD - if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then - dosym bsdtar /usr/bin/tar - echo '.so bsdtar.1' > "${T}"/tar.1 - doman "${T}"/tar.1 - # We may wish to switch to symlink bsdcpio to cpio too one day - fi - else - emake DESTDIR="${D}" \ - install-includeHEADERS \ - install-libLTLIBRARIES \ - install-pkgconfigDATA - - # Libs.private: should be used from libarchive.pc instead - prune_libtool_files - fi -} - -multilib_src_install_all() { - cd "${S}" || die - dodoc "${DOCS[@]}" -}
