diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-03-05 08:59:26 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-03-05 08:59:26 +0000 |
| commit | 2025d8aea2932c36467581d96f3dc2966e9b4389 (patch) | |
| tree | 6c9e292dc54c2f4b1094f8706041096deec3d9d3 /app-arch/libarchive | |
| parent | Due to security bug #406655, remove offending versions. (diff) | |
| download | gentoo-2-2025d8aea2932c36467581d96f3dc2966e9b4389.tar.gz gentoo-2-2025d8aea2932c36467581d96f3dc2966e9b4389.tar.bz2 gentoo-2-2025d8aea2932c36467581d96f3dc2966e9b4389.zip | |
Fix building with USE="-zlib" wrt #403733 by Ben Kohler
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Diffstat (limited to 'app-arch/libarchive')
| -rw-r--r-- | app-arch/libarchive/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/libarchive/files/libarchive-3.0.3-nozlib.patch | 34 | ||||
| -rw-r--r-- | app-arch/libarchive/libarchive-3.0.3.ebuild | 6 |
3 files changed, 44 insertions, 2 deletions
diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog index b3c96432f4de..9b886a95bda1 100644 --- a/app-arch/libarchive/ChangeLog +++ b/app-arch/libarchive/ChangeLog @@ -1,6 +1,10 @@ # 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.116 2012/02/25 15:03:31 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.117 2012/03/05 08:59:26 ssuominen Exp $ + + 05 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> libarchive-3.0.3.ebuild, + +files/libarchive-3.0.3-nozlib.patch: + Fix building with USE="-zlib" wrt #403733 by Ben Kohler 25 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> libarchive-3.0.3.ebuild: ppc64 stable wrt #403173 diff --git a/app-arch/libarchive/files/libarchive-3.0.3-nozlib.patch b/app-arch/libarchive/files/libarchive-3.0.3-nozlib.patch new file mode 100644 index 000000000000..16caa153faf1 --- /dev/null +++ b/app-arch/libarchive/files/libarchive-3.0.3-nozlib.patch @@ -0,0 +1,34 @@ +http://code.google.com/p/libarchive/issues/detail?id=242 +http://bugs.gentoo.org/403733 + +--- a/libarchive/archive_write_set_format_7zip.c ++++ b/libarchive/archive_write_set_format_7zip.c +@@ -1585,7 +1585,8 @@ file_init_register_empty(struct _7zip *zip) + zip->empty_list.last = &(zip->empty_list.first); + } + +-#if !defined(HAVE_BZLIB_H) || !defined(BZ_CONFIG_ERROR) || !defined(HAVE_LZMA_H) ++#if !defined(HAVE_ZLIB_H) || !defined(HAVE_BZLIB_H) ||\ ++ !defined(BZ_CONFIG_ERROR) || !defined(HAVE_LZMA_H) + static int + compression_unsupported_encoder(struct archive *a, + struct la_zstream *lastrm, const char *name) + +--- a/libarchive/test/test_write_compress_program.c ++++ b/libarchive/test/test_write_compress_program.c +@@ -40,6 +40,15 @@ DEFINE_TEST(test_write_compress_program) + skipping("Cannot run 'gzip'"); + return; + } ++ /* NOTE: Setting blocksize=1024 will cause gunzip failure because ++ * it add extra bytes that gunzip ignores with its warning and ++ * exit code 1. So we should set blocksize=1 in order not to ++ * yield the extra bytes when using gunzip. */ ++ assert((a = archive_read_new()) != NULL); ++ r = archive_read_support_filter_gzip(a); ++ if (r != ARCHIVE_OK && canGunzip()) ++ blocksize = 1; ++ assertEqualInt(ARCHIVE_OK, archive_read_free(a)); + + /* Create a new archive in memory. */ + /* Write it through an external "gzip" program. */ diff --git a/app-arch/libarchive/libarchive-3.0.3.ebuild b/app-arch/libarchive/libarchive-3.0.3.ebuild index a7d84fb2529e..592653592b57 100644 --- a/app-arch/libarchive/libarchive-3.0.3.ebuild +++ b/app-arch/libarchive/libarchive-3.0.3.ebuild @@ -1,6 +1,6 @@ # 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.3.ebuild,v 1.8 2012/02/25 15:03:31 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-3.0.3.ebuild,v 1.9 2012/03/05 08:59:26 ssuominen Exp $ EAPI=4 inherit eutils multilib @@ -34,6 +34,10 @@ DEPEND="${RDEPEND} DOCS="NEWS README" +src_prepare() { + epatch "${FILESDIR}"/${P}-nozlib.patch +} + src_configure() { export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 |