fix false positives against xz-5 (bug 343829), remove 2.8.0 since the tests can fail for the fuzzer (fixed in later versions)

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

7 files changed, 75 insertions, 100 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index 67868035366d..5111187ee0a7 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/libarchive
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.84 2010/12/18 01:42:13 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.85 2010/12/31 09:18:01 ferringb Exp $
+
+  31 Dec 2010; Brian Harring <ferringb@gentoo.org> libarchive-2.7.1-r1.ebuild,
+  -libarchive-2.8.0.ebuild, libarchive-2.8.3.ebuild, libarchive-2.8.4.ebuild,
+  +files/libarchive-disable-lzma-size-test.patch:
+  Disable false-positive test failure against xz-5 (bug #343829), remove 2.8.0
+  since there are a few bugs the fuzz tester spots in that version.
 
   18 Dec 2010; Mart Raudsepp <leio@gentoo.org> libarchive-2.8.4.ebuild:
   Add ~mips keyword - required by new cmake-2.8.3
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 898351323530..270c29329cd3 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,10 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libarchive-disable-lzma-size-test.patch 1780 RMD160 b7e62759b0821b6787155d9c8a283f1883aade6d SHA1 eb0402cb9537a32015b3937d1a82884e8fce04ec SHA256 aa5fb82ae1996c8cf98bdffb46d70390d6e40332b076fcc48fcba11eb9a834e6
 DIST libarchive-2.7.1.tar.gz 1248222 RMD160 7a0b5747569452f015e94e54afa90ca85dfd7cca SHA1 3810ded09b2d248eab9754d008f0cf144f27848d SHA256 a7e066ef857d3db0211e2d916ca14aafc48a4776c4fa108fd67092ce862a7ba8
-DIST libarchive-2.8.0.tar.gz 1437217 RMD160 e49abd391e58ccbdc441670bb1a59752ecba406b SHA1 b29d47aac4efd66d89e581585e17644a3c77c5cf SHA256 e5be324c94e885e449b8ffb30a843372d557966547efff3f1d5f69eb5a119769
 DIST libarchive-2.8.3.tar.gz 1438099 RMD160 7c77a87cdfc096417f67182bfc74141eab61aea4 SHA1 e0634a326cce2b46c8dc637de84d7556257e59e0 SHA256 16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a
 DIST libarchive-2.8.4.tar.gz 1502828 RMD160 4df65456c9026cdcf05b285db33518f4ff734c6e SHA1 b9cc3bbd20bd71f996be9ec738f19fda8653f7af SHA256 86cffa3eaa28d3116f5d0b20284026c3762cf4a2b52b9844df2b494d4a89f688
-EBUILD libarchive-2.7.1-r1.ebuild 2473 RMD160 8735c985d4f958308b9ff0c18f84b6f4d65c93d7 SHA1 26e296be2bd9c98d856962c0c7e483614f0b6ad5 SHA256 3c3f4f1f3171acfa11b78f506983e42f653ea0ec23bd05ee2c27bcd870460719
-EBUILD libarchive-2.8.0.ebuild 2598 RMD160 d5a448151eea4c3c79c25b18879203d5af4b2095 SHA1 db18ebc05ac981c334091fd085dcf6d3a1e0b3fd SHA256 bd2317e935d295d68fddd722bdecbf9262a8946e231049bef343b2aad001f492
-EBUILD libarchive-2.8.3.ebuild 2598 RMD160 f408695f3f08f1ea4c05007d43178d8e0159af3c SHA1 a87fdde9bc8c4cff2531e207365028ad0e5cd8a0 SHA256 beb720054a47116fd3214d52e905500f979b0a7eb552b06525d1bab7dacb7475
-EBUILD libarchive-2.8.4.ebuild 2604 RMD160 b2edf50591cf57259cc20b68ef2976330deb7615 SHA1 dceb9794e774bad27d3ae6e69c6ef88d6645c940 SHA256 32e958915ab708ba969f05b9145174fd9f15e5afdd37c54b16e25bc1b3280293
-MISC ChangeLog 26061 RMD160 5e245f3433d2cac8290854c85806dbc8b35056e6 SHA1 2fdd6c1290dccad88b0052daa0a5ab698a51e63d SHA256 62bdb204790e67c9dba812f6ca3f0e88ef011ae0fe07a3dfe34fbf431d450048
+EBUILD libarchive-2.7.1-r1.ebuild 2537 RMD160 75c73b310d81b40fa4c734fbdbd543fb96ce3c8c SHA1 a707050438136643a5a0d701ede86e1763b87bf5 SHA256 778c0f5efa9284100da01f195d86d2128793a4f9f7bc62426e45dc08488d53cd
+EBUILD libarchive-2.8.3.ebuild 2662 RMD160 c22df36f9143e15cfe5f8b2033f6f72faeef761f SHA1 3d4e665197eaf2c95ee140d893b79888beb7d91d SHA256 79f6bd19206e6b316cd233784dff2124b3a91f1234343af08b6afdeffe37f41e
+EBUILD libarchive-2.8.4.ebuild 2668 RMD160 33e40a8f039a92e00ebe4c32a75fbdcac9f13594 SHA1 03568abe6fc7cb13280f16778090d1290564aa21 SHA256 2b9c78cb6f2ebb32d242050cb295c2013944970b5d1c4344bf57e6e9966c9ca3
+MISC ChangeLog 26420 RMD160 5f552c69a114ac72aa76623c5d9f87a8af5b45d5 SHA1 b6402a2e272e4d8220bb2e2de25ae09bc7791d4f SHA256 f8a2ae27d8d4be7bb49829fb21450b7e94b40150ac885055b87889233ff46e17
 MISC metadata.xml 1216 RMD160 337435107c616573f847037641dd542c7a24015c SHA1 3da011edda7fc72969758d40647db2b3923bd654 SHA256 e29b8e1de7ad22e681df9eb149ace27215e5bf222fda9b2096f1449ffbaa68fb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0dn+oACgkQsiLx3HvNzgfDcwCfclpDrHr9LJC7y//+lFw3jXT0
+DOsAn3OtSzhNOg5EL5+Ofu8f6RSdCBpT
+=Rlxq
+-----END PGP SIGNATURE-----
diff --git a/app-arch/libarchive/files/libarchive-disable-lzma-size-test.patch b/app-arch/libarchive/files/libarchive-disable-lzma-size-test.patch
new file mode 100644
index 000000000000..4929685a2eb7
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-disable-lzma-size-test.patch
@@ -0,0 +1,47 @@
+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.7.1-r1.ebuild b/app-arch/libarchive/libarchive-2.7.1-r1.ebuild
index 0ec6f8d0a5a2..6d8f7aaff2e2 100644
--- a/app-arch/libarchive/libarchive-2.7.1-r1.ebuild
+++ b/app-arch/libarchive/libarchive-2.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.7.1-r1.ebuild,v 1.10 2010/11/14 13:42:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.7.1-r1.ebuild,v 1.11 2010/12/31 09:18:02 ferringb Exp $
 
 EAPI="2"
 
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 		virtual/os-headers )"
 
 src_prepare() {
+	epatch "$FILESDIR"/libarchive-disable-lzma-size-test.patch
 	elibtoolize
 	epunt_cxx
 }
diff --git a/app-arch/libarchive/libarchive-2.8.0.ebuild b/app-arch/libarchive/libarchive-2.8.0.ebuild
deleted file mode 100644
index a4d0390b6664..000000000000
--- a/app-arch/libarchive/libarchive-2.8.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.0.ebuild,v 1.3 2010/11/14 13:42:00 jlec 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 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="static static-libs acl xattr kernel_linux +bzip2 +lzma +zlib"
-
-COMPRESS_LIBS_DEPEND="lzma? ( app-arch/xz-utils )
-		bzip2? ( app-arch/bzip2 )
-		zlib? ( sys-libs/zlib )"
-
-RDEPEND="!dev-libs/libarchive
-	dev-libs/openssl
-	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() {
-	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) \
-		--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-2.8.3.ebuild b/app-arch/libarchive/libarchive-2.8.3.ebuild
index 51809e805ac6..4ed8ba4e04c0 100644
--- a/app-arch/libarchive/libarchive-2.8.3.ebuild
+++ b/app-arch/libarchive/libarchive-2.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.3.ebuild,v 1.3 2010/11/14 13:42:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.3.ebuild,v 1.4 2010/12/31 09:18:02 ferringb Exp $
 
 EAPI="2"
 
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 		virtual/os-headers )"
 
 src_prepare() {
+	epatch "$FILESDIR"/libarchive-disable-lzma-size-test.patch
 	elibtoolize
 	epunt_cxx
 }
diff --git a/app-arch/libarchive/libarchive-2.8.4.ebuild b/app-arch/libarchive/libarchive-2.8.4.ebuild
index ca270847ab3a..5e9e839dcf88 100644
--- a/app-arch/libarchive/libarchive-2.8.4.ebuild
+++ b/app-arch/libarchive/libarchive-2.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.ebuild,v 1.3 2010/12/18 01:42:13 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.4.ebuild,v 1.4 2010/12/31 09:18:02 ferringb Exp $
 
 EAPI="2"
 
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 		virtual/os-headers )"
 
 src_prepare() {
+	epatch "$FILESDIR"/libarchive-disable-lzma-size-test.patch
 	elibtoolize
 	epunt_cxx
 }