punt old, vulnerable, broken

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 6 insertions, 228 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index 6505207ddd1e..a5a2211df731 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/libarchive
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.109 2012/01/22 15:03:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.110 2012/01/22 15:06:29 ssuominen Exp $
+
+  22 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -libarchive-2.8.4-r1.ebuild, -libarchive-3.0.2.ebuild,
+  -files/libarchive-disable-lzma-size-test.patch:
+  old
 
   22 Jan 2012; Raúl Porcel <armin76@gentoo.org> libarchive-2.8.5.ebuild,
   libarchive-3.0.2.ebuild, libarchive-3.0.3.ebuild:
diff --git a/app-arch/libarchive/files/libarchive-disable-lzma-size-test.patch b/app-arch/libarchive/files/libarchive-disable-lzma-size-test.patch
deleted file mode 100644
index 4929685a2eb7..000000000000
--- a/app-arch/libarchive/files/libarchive-disable-lzma-size-test.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: libarchive/test/test_write_compress_lzma.c
-===================================================================
---- libarchive/test/test_write_compress_lzma.c	(revision 2811)
-+++ libarchive/test/test_write_compress_lzma.c	(revision 2812)
-@@ -185,10 +185,15 @@
- 	archive_write_close(a);
- 	assert(0 == archive_write_finish(a));
- 
--	/* Level 0 really does result in larger data. */
-+	/* It would be nice to assert that compression-level=0 produced
-+	 * consistently larger/smaller results than the default compression,
-+	 * but the results here vary a lot depending on the version of liblzma
-+	 * being used. */
-+	/* 
- 	failure("Compression-level=0 wrote %d bytes; default wrote %d bytes",
- 	    (int)used2, (int)used1);
- 	assert(used2 > used1);
-+	*/
- 
- 	assert((a = archive_read_new()) != NULL);
- 	assertA(0 == archive_read_support_format_all(a));
-Index: libarchive/test/test_write_compress_xz.c
-===================================================================
---- libarchive/test/test_write_compress_xz.c	(revision 2811)
-+++ libarchive/test/test_write_compress_xz.c	(revision 2812)
-@@ -193,10 +193,14 @@
- 	archive_write_close(a);
- 	assert(0 == archive_write_finish(a));
- 
--	/* Level 0 really does result in larger data. */
-+	/* I would like to assert that compression-level=0 results in
-+	 * larger data than the default compression, but that's not true
-+	 * for all versions of liblzma. */
-+	/*
- 	failure("Compression-level=0 wrote %d bytes; default wrote %d bytes",
- 	    (int)used2, (int)used1);
- 	assert(used2 > used1);
-+	*/
- 
- 	assert((a = archive_read_new()) != NULL);
- 	assertA(0 == archive_read_support_format_all(a));
-
-Egenskapsändringar för: .
-___________________________________________________________________
-Modified: svn:mergeinfo
-   Merged /trunk:r2811
-
diff --git a/app-arch/libarchive/libarchive-2.8.4-r1.ebuild b/app-arch/libarchive/libarchive-2.8.4-r1.ebuild
deleted file mode 100644
index 406422a1d880..000000000000
--- a/app-arch/libarchive/libarchive-2.8.4-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.4-r1.ebuild,v 1.10 2012/01/10 15:45:53 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils libtool toolchain-funcs flag-o-matic
-
-DESCRIPTION="BSD tar command"
-HOMEPAGE="http://code.google.com/p/libarchive/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz
-	http://people.freebsd.org/~kientzle/libarchive/src/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="static static-libs acl xattr kernel_linux +bzip2 +lzma +zlib expat"
-
-COMPRESS_LIBS_DEPEND="lzma? ( app-arch/xz-utils )
-		bzip2? ( app-arch/bzip2 )
-		zlib? ( sys-libs/zlib )"
-
-RDEPEND="!dev-libs/libarchive
-	dev-libs/openssl
-	!expat? ( dev-libs/libxml2 )
-	expat? ( dev-libs/expat )
-	acl? ( virtual/acl )
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	!static? ( ${COMPRESS_LIBS_DEPEND} )"
-DEPEND="${RDEPEND}
-	${COMPRESS_LIBS_DEPEND}
-	kernel_linux? ( sys-fs/e2fsprogs
-		virtual/os-headers )"
-
-src_prepare() {
-	epatch "$FILESDIR"/libarchive-disable-lzma-size-test.patch
-	elibtoolize
-	epunt_cxx
-}
-
-src_configure() {
-	local myconf
-
-	if ! use static ; then
-		myconf="--enable-bsdtar=shared --enable-bsdcpio=shared"
-	fi
-
-	# force static libs for static binaries
-	if use static && ! use static-libs; then
-		myconf="${myconf} --enable-static"
-	fi
-
-	# Check for need of this in 2.7.1 and later, on 2.7.0, -Werror was
-	# added to the final release, but since it's done in the
-	# Makefile.am we can just work it around this way.
-	append-flags -Wno-error
-
-	# We disable lzmadec because we support the newer liblzma from xz-utils
-	# and not liblzmadec with this version.
-	econf --bindir=/bin \
-		--enable-bsdtar --enable-bsdcpio \
-		$(use_enable acl) $(use_enable xattr) \
-		$(use_with zlib) \
-		$(use_with bzip2 bz2lib) $(use_with lzma) \
-		$(use_enable static-libs static) \
-		$(use_with expat) \
-		$(use_with !expat xml2) \
-		--without-lzmadec \
-		${myconf} \
-		--disable-dependency-tracking
-}
-
-src_test() {
-	# Replace the default src_test so that it builds tests in parallel
-	emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	# remove useless .a and .la files (only for non static compilation)
-	use static-libs || find "${D}" \( -name '*.a' -or -name '*.la' \) -delete
-
-	# Create tar symlink for FreeBSD
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		dosym bsdtar /bin/tar
-		dosym bsdtar.1 /usr/share/man/man1/tar.1
-		# We may wish to switch to symlink bsdcpio to cpio too one day
-	fi
-
-	dodoc NEWS README
-	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)
-	gen_usr_ldscript libarchive.so
-}
diff --git a/app-arch/libarchive/libarchive-3.0.2.ebuild b/app-arch/libarchive/libarchive-3.0.2.ebuild
deleted file mode 100644
index 1367dc41d2e1..000000000000
--- a/app-arch/libarchive/libarchive-3.0.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-3.0.2.ebuild,v 1.5 2012/01/22 15:03:12 armin76 Exp $
-
-EAPI=4
-inherit eutils multilib
-
-DESCRIPTION="BSD tar command"
-HOMEPAGE="http://code.google.com/p/libarchive/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux +lzma nettle static-libs xattr +zlib"
-
-RDEPEND="!dev-libs/libarchive
-	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 )
-		)"
-
-src_configure() {
-	use e2fsprogs || export ac_cv_header_ext2fs_ext2_fs_h=no #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() {
-	emake DESTDIR="${D}" install
-
-	# Libs.private: should be used from libarchive.pc instead
-	rm -f "${ED}"usr/lib*/lib*.la
-
-	# Create tar symlink for FreeBSD
-	if [[ ${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
-
-	dodoc NEWS README
-}
-
-pkg_preinst() {
-	preserve_old_lib /{,usr/}$(get_libdir)/libarchive$(get_libname 2)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /{,usr/}$(get_libdir)/libarchive$(get_libname 2)
-}