drop vulnerable copy

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 15 insertions, 132 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index 8e36a2245f0b..5ac0c8dbae69 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/libarchive
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.154 2013/04/05 18:11:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.155 2013/05/07 10:46:23 ssuominen Exp $
+
+  07 May 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -libarchive-3.0.4-r1.ebuild,
+  -files/libarchive-3.0.4-handle-unsupported-acl-types.patch:
+  old
 
   05 Apr 2013; Agostino Sarubbo <ago@gentoo.org> libarchive-3.1.2-r1.ebuild:
   Stable for ppc64, wrt bug #463632
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 3dd1e0ae356e..0b203efba15b 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,28 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX libarchive-3.0.4-handle-unsupported-acl-types.patch 788 SHA256 c555174c835d29bf8c6e99a3bce1603d127108dc4de0727f203ef17a3766e463 SHA512 6c6a47aaf6c7863c1b449b06547322d1265c8f2849f281c3c4d8a5a9cd6447905de1aac9b0d1dead12ae7ae864319091b23606bd7e3ea6d16bdd646109b0eba3 WHIRLPOOL c3312100cd52e7081de88a2889a2b80f18324cf1e069994885a33285dfa1bc9b36d172873ade92c0c5ceb98416e0d9be55eb34d35890e99b95dbe0ba162397c1
 AUX libarchive-3.1.2-CVE-2013-0211.patch 1087 SHA256 6e9940a1b148f3ceb43bb172416b332ba922bb951e7832193ff997c2d9026bb4 SHA512 38ef32b30b3eb5a7c68e31086da64b871bae70002600080541ea6d0ea3680f68f9e65760f803a0e96d233e1a21858a83946c1fd63fd67d5eb030120940896c7a WHIRLPOOL 6c9a8586e011a7f392a925261adb9a5b5f8b5a9725b322bd6f8dd56fb3f2bee15b7651c0e6dd3c0a23ddc76c22b84fb6ab041215116076f015ba68aa12ededbe
-DIST libarchive-3.0.4.tar.gz 3632806 SHA256 76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac SHA512 7287881977cc08430baa2b755f579849f2419e0446df124bd31eb1ffa3920938235808a8fc5162f140d9c2231a8ab83974ce10bdb5b1a71540687d0be24c75fc WHIRLPOOL 2ebf2ba83ce69084769bc764b44f2a4d0b3f9df0f8acebd615de90109efb73ff6114ad83b659235eb93d03e900e0db67ea25c4abbf12a73ce4cd2b453ebc9947
 DIST libarchive-3.1.2.tar.gz 4527540 SHA256 eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e SHA512 1f3c2a675031f93c7d42ae2ed06742b0b1e2236ff57d9117791d62fb8ae77d6cafffbcb5d45b5bd98daa908bd18c576cf82e01a9b1eba699705e23eff3688114 WHIRLPOOL b90f336afb5264be91fb17d7dae3d5697e3f84e24d276af1d5ac076fe15ef6f5756488f09506fabe470473becb5449cd1f34865309dcf8a914e6e83506e8695f
-EBUILD libarchive-3.0.4-r1.ebuild 2470 SHA256 49291fa09df9a0bc12e54f8b6107f8d9bd9f8c09e5633b49ed3023629e3f6f0c SHA512 3a4511ca6dd596667ec65141470b813c370bac013aa047eb52541aff1fbf306c07f1a4d9ad97df5f66ed927bcd38f6159db71c6db2557c42677ced7f2b16da3b WHIRLPOOL 326aaf8ed5d67675b67fd422afc207e289053a852347374f8b4dbcf1eb8461d37640fb92ff2614b09f95977f5042d3ae01526cab81bcd5523f4e4a9e27be4c1b
 EBUILD libarchive-3.1.2-r1.ebuild 2490 SHA256 828ea4d9cffe52c7fd8e057fc97f41d90b89bd4af8abee0ea5e510dbac9ab1b0 SHA512 3e0faccc83e9c9c53d746df6f91f3f70991fedfa3ea99569e51280f0d672232e1d863e3a636828c5729fd3440dad059b623dc3150d325c502b43e3891ad24c72 WHIRLPOOL 7131d1822886f138c035b62ab1bac40b8c484d90912ee4e635579ba34e63c27bc63cdc98eec59e2466c39be85015b748325696a49d2ddd9502f5fea033a73b83
-MISC ChangeLog 35148 SHA256 86901df9204aa1b83a5eca2127d5b97c43d259bfb64e4fe97e5a7d439c9d52fc SHA512 016fb6142435f89c2ca21ab61a84b228753b9db0da3797fad131b631ef2f2e84e2ffda3a4ff4fff9d036b4a0653f39fe9d353e0bf397ebf8d48a664d5ee5605f WHIRLPOOL 4f2f847980644b43314bedd98b3eaea80f0aa29f74083c2d0972e546a3172035bdcc015a83e7124c9ab5c23695ca69a61efc2593fad19c41b6aa3d631c8b8002
+MISC ChangeLog 35308 SHA256 20e6a3316df3b085d8f84a4ca7382c8507d0678aea159ac34a0f06ed0dc28fce SHA512 398d217c4fb708c37f01682c8b509abbd87b3f90e857360200f4d92554481bf9a8058394c5763e08d0fc737b4742418e9eb5d3ab9dd62cb6c5a21b56a983c1da WHIRLPOOL 51f14e2d125ece853dc40c38c66aa6bed79abec34503889329827bb2e1d651b35623f41c0bb2bd0c412133b782ddb2b4bbd96d483450f3a3838bf33212fc5e78
 MISC metadata.xml 1402 SHA256 4a65c32b25d2a97de2b24e2f40298cef694814d1ff05d7191da5e54c66db5933 SHA512 af66ac92b8b88b183db12b330932771d303b93ff629ae5cdc8f5e00bc9730c4df794d7618a1039cb6c2312dee49dcbbb58dc8a7e61bb3dcde704d8a951e32c87 WHIRLPOOL 5cb7fde05acf8b48311aa4f4bdd12c86555318033055fd43721c5ef1c44ef5e6e564ddb4a384224aff8abe31218216fe423739dbd75427b5ff0c3b052ac0f059
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRXxMwAAoJELp701BxlEWfOiYP/RQS9S6fD48OUPPWhGihePqa
-IXU2q26tsBEmIZJfSUl6eWgmSaAn7/5AOUrSgyMiJl4haveHbltGCv1rVmNLtWoF
-gEO1zaNpVnB3tnAGrvKe9l8eamFxzNJZBrTU5+W+n1AQG3B6j9q/rfOJShLXMkVC
-cX7HfkLY6wsQT0fztd9+2xcuB8cBgnBbMMzdJUFhxsLCVD7g/NZzMyDNF542tMKM
-KMbuNukR/hrfAzSIP47zovRYQ/rPkdDrwSL3nnb/RAKLXTVEnfcOQdMyf9Yih7ts
-7DVutaOl3V2BkrU6CtLG/R7ifyxsfUcwTbJRZtxkWufuGxdDVhpmV0Vom1+iXE//
-vVAzH1qFMyGbwZypfogIUr1S91EERhj2+c0ydvd1hg0ofs+pvDQRiGf9GXYCWIYD
-kLpuvp/6P/3zQhLFn++Yjj9VYCL+SXSULUbGMeJdi/jrq0aqGMRZkQ+cseh0qAZG
-UDFCZ/I/Fgtuh843Rnl6b2Q5geSoLUlFUxFHd0aFYgrFSX1wUmifU5goIZua6ZD5
-SEkUOs2U4/5R7M5RnD04SRLBBMA6huc8/jCyqhxPsv6jmwL1LXHoJYul/DtOS6+t
-HCAcjiA/e5cf8mOjNSxvTdKeKqq18UJl/XoNdYq4uRqZYbegfJhAqQxUsRIuLlKe
-qTTjGX1gV+i6VnXd/iJx
-=bZBx
+iQEcBAEBCAAGBQJRiNtnAAoJEEdUh39IaPFNlsYH/2veb/5wdJsDsBF8XY9miQbo
+Xjsz5ntLLOeR9+ESa7w+VAE1tmxfNZw03JzkYu4ZxQfQRWlks7nQe/486bis2bTN
+uezfiLph0/KoDcI4CD1vQqpJKixOT37TcVBRNsloyRN8+sDjDKg+F/5BP5uG/HcW
+1wWUQkFL5b7L02PSKEp0TrPKCJlEGBqTDpmgEccUxck5QLzy7aTtF//KL05UfUmA
+rqmBn1ozjjUzx37NcIwgNhLg58gRvT/XgKdQOyJldN7Qego740PeI+63c3yzFa1k
+HhoEmvJl/U8V9N4Ke6E1SJ1ieXteEodBfl8elQDi0mfXsEXDiXqRTRMAIISj5Mg=
+=RqDX
 -----END PGP SIGNATURE-----
diff --git a/app-arch/libarchive/files/libarchive-3.0.4-handle-unsupported-acl-types.patch b/app-arch/libarchive/files/libarchive-3.0.4-handle-unsupported-acl-types.patch
deleted file mode 100644
index 5bbd5d6e5d9e..000000000000
--- a/app-arch/libarchive/files/libarchive-3.0.4-handle-unsupported-acl-types.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d8b9dbd6dac0125957b997c2fe8d246237ec9f94 Mon Sep 17 00:00:00 2001
-From: naota <naota@elisp.net>
-Date: Fri, 25 May 2012 13:03:21 +0900
-Subject: [PATCH] Avoid infinite loop when there's unsupported acl type
-
----
- libarchive/archive_read_disk_entry_from_file.c |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
-index 7987fa5..25b1edc 100644
---- a/libarchive/archive_read_disk_entry_from_file.c
-+++ b/libarchive/archive_read_disk_entry_from_file.c
-@@ -584,6 +584,7 @@ static int translate_acl(struct archive_read_disk *a,
- 			break;
- 		default:
- 			/* Skip types that libarchive can't support. */
-+			s = acl_get_entry(acl, ACL_NEXT_ENTRY, &acl_entry);
- 			continue;
- 		}
- 
--- 
-1.7.10
-
diff --git a/app-arch/libarchive/libarchive-3.0.4-r1.ebuild b/app-arch/libarchive/libarchive-3.0.4-r1.ebuild
deleted file mode 100644
index c5295f3e2a2c..000000000000
--- a/app-arch/libarchive/libarchive-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-3.0.4-r1.ebuild,v 1.13 2013/01/06 17:00:02 armin76 Exp $
-
-EAPI=4
-inherit eutils multilib libtool
-
-DESCRIPTION="BSD tar command"
-HOMEPAGE="http://libarchive.github.com/"
-SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-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 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 )
-	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}-handle-unsupported-acl-types.patch"
-	elibtoolize  # to allow building shared libs on Solaris/x64
-}
-
-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=shared \
-		--enable-bsdcpio=shared \
-		$(use_enable xattr) \
-		$(use_enable acl) \
-		$(use_with zlib) \
-		$(use_with bzip2 bz2lib) \
-		--without-lzmadec \
-		$(use_with iconv) \
-		$(use_with lzma) \
-		$(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
-	rm -f "${ED}"usr/lib*/lib*.la
-
-	# 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 2)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /{,usr/}$(get_libdir)/${PN}$(get_libname 2)
-}