app-arch/libarchive: Clean old up

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 950a2d7f2cf95db2dd6b2e89ad3d9513b5bfe773..1570763e6a118a61889a67b23575e142d6338f66 100644 (file)
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,3 +1,2 @@
-DIST libarchive-3.2.2.tar.gz 5458241 BLAKE2B 99a3f01e780a3cac1142645887f31fc4d68c9a60a3539c259745274ea612373b41a7e93d95c27739c87c6050a0304ff069a0f1435fdbf0a13d47935209547c20 SHA512 a67920c37d49cf9478032d77fc4fa21827cebb96e9b83d9ecb8466328834052e4ab3d3a9bc4e2edf405d6cb14ffd648c9fa100b578257f6e5842c99bbea558a7
 DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164
 DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4

diff --git a/app-arch/libarchive/files/CVE-2017-5601.patch b/app-arch/libarchive/files/CVE-2017-5601.patch
deleted file mode 100644 (file)
index 4ba85ff..0000000
--- a/app-arch/libarchive/files/CVE-2017-5601.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 98dcbbf0bf4854bf987557e55e55fff7abbf3ea9 Mon Sep 17 00:00:00 2001
-From: Martin Matuska <martin@matuska.org>
-Date: Thu, 19 Jan 2017 22:00:18 +0100
-Subject: [PATCH] Fail with negative lha->compsize in lha_read_file_header_1()
- Fixes a heap buffer overflow reported in Secunia SA74169
-
----
- libarchive/archive_read_support_format_lha.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c
-index 52a5531..d77a7c2 100644
---- a/libarchive/archive_read_support_format_lha.c
-+++ b/libarchive/archive_read_support_format_lha.c
-@@ -924,6 +924,9 @@ lha_read_file_header_1(struct archive_read *a, struct lha *lha)
-       /* Get a real compressed file size. */
-       lha->compsize -= extdsize - 2;
- 
-+      if (lha->compsize < 0)
-+              goto invalid;   /* Invalid compressed file size */
-+
-       if (sum_calculated != headersum) {
-               archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-                   "LHa header sum error");

diff --git a/app-arch/libarchive/libarchive-3.2.2-r1.ebuild b/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
deleted file mode 100644 (file)
index 34485b1..0000000
--- a/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils libtool 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 ~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}"/CVE-2017-5601.patch
-)
-
-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=()
-       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
-}