commit:     1ad1e7e4eca20b8715345435a764b2015ce1fe9f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 22:49:41 2017 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 09:30:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ad1e7e4

app-arch/libarchive: Security cleanup (bug #598950)

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3386

 app-arch/libarchive/Manifest                   |   1 -
 app-arch/libarchive/libarchive-3.2.1-r3.ebuild | 125 ------------------------
 app-arch/libarchive/libarchive-3.2.1-r5.ebuild | 127 -------------------------
 3 files changed, 253 deletions(-)

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 778eae3..95662d4 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,2 +1 @@
-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/libarchive-3.2.1-r3.ebuild 
b/app-arch/libarchive/libarchive-3.2.1-r3.ebuild
deleted file mode 100644
index 6d37057..00000000
--- a/app-arch/libarchive/libarchive-3.2.1-r3.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=6
-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 lz4 +lzma lzo 
nettle static-libs xattr +zlib"
-
-RDEPEND="
-       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}] )
-       )
-       !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[${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 )
-       )"
-
-PATCHES=(
-       "${FILESDIR}/${P}-fix-tests-gnu99.patch"
-       "${FILESDIR}/${P}-osx-fix-acl.patch" #587890
-)
-
-src_prepare() {
-       default
-       eautoreconf # 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=()
-       myconf=(
-               $(use_enable acl)
-               $(use_enable static-libs static)
-               $(use_enable xattr)
-               $(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)
-       )
-       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
-
-       # 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
-
-               # Create symlinks for FreeBSD
-               if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
-                       for bin in cat cpio tar; do
-                               dosym bsd${bin} /usr/bin/${bin}
-                               echo '.so bsd${bin}.1' > "${T}"/${bin}.1
-                               doman "${T}"/${bin}.1
-                       done
-               fi
-       else
-               emake DESTDIR="${D}" \
-                       install-includeHEADERS \
-                       install-libLTLIBRARIES \
-                       install-pkgconfigDATA
-       fi
-
-       # Libs.private: should be used from libarchive.pc instead
-       prune_libtool_files
-}
-
-multilib_src_install_all() {
-       cd "${S}" || die
-       einstalldocs
-}

diff --git a/app-arch/libarchive/libarchive-3.2.1-r5.ebuild 
b/app-arch/libarchive/libarchive-3.2.1-r5.ebuild
deleted file mode 100644
index 52b60ff..00000000
--- a/app-arch/libarchive/libarchive-3.2.1-r5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-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 lz4 +lzma lzo 
nettle static-libs +threads xattr +zlib"
-
-RDEPEND="
-       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}] )
-       )
-       !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}] )"
-DEPEND="${RDEPEND}
-       kernel_linux? (
-               virtual/os-headers
-               e2fsprogs? ( sys-fs/e2fsprogs )
-       )"
-
-PATCHES=(
-       "${FILESDIR}/${P}-fix-tests-gnu99.patch"
-       "${FILESDIR}/${P}-osx-fix-acl.patch" #587890
-       "${FILESDIR}/${P}-xz-utils-thread-detection.patch" #589654
-)
-
-src_prepare() {
-       default
-       eautoreconf # 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=()
-       myconf=(
-               $(use_enable acl)
-               $(use_enable static-libs static)
-               $(use_enable xattr)
-               $(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)
-       )
-       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
-
-       # 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
-
-               # 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
-               emake DESTDIR="${D}" \
-                       install-includeHEADERS \
-                       install-libLTLIBRARIES \
-                       install-pkgconfigDATA
-       fi
-
-       # Libs.private: should be used from libarchive.pc instead
-       prune_libtool_files
-}
-
-multilib_src_install_all() {
-       cd "${S}" || die
-       einstalldocs
-}

Reply via email to