Version bump.

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

4 files changed, 127 insertions, 2 deletions

diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index a4ebae04ee64..7c6de3666d33 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/libarchive
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.48 2009/04/12 20:50:35 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.49 2009/04/16 22:58:27 flameeyes Exp $
+
+*libarchive-2.7.0 (16 Apr 2009)
+
+  16 Apr 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/libarchive-2.7.0-fortified-sources.patch, +libarchive-2.7.0.ebuild:
+  Version bump.
 
   12 Apr 2009; Friedrich Oslage <bluebird@gentoo.org>
   libarchive-2.6.1.ebuild:
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 4c37646ad82c..3654e58cd2f4 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,10 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libarchive-2.6.0-nolibs.patch 1104 RMD160 1c753db6a19e73307fdc7c43e781b3713526bde2 SHA1 92136bb9721c13553e8ccf466eef001d295d1564 SHA256 1040029f59302f5d147ba09021820ad06f171488abdb6467173c36e5c1afb98b
 AUX libarchive-2.6.1-headers.patch 635 RMD160 d6d2e7f1dfda2c352fac08b1b48fea611543ab17 SHA1 04fc37daef70f40aafeeadcd627432551533b505 SHA256 a5167e9cc721f3e946ba36e5d2beb35310facea8360c5582adf3d6fa142c2c22
+AUX libarchive-2.7.0-fortified-sources.patch 1057 RMD160 66f769ff31e29399f71f23f972026d46516cac5d SHA1 5187d93686eff8c1f3d8eca8f6389dc0b3cdfdc6 SHA256 78d8bd768e621d91e988570dbff907c37f06895649706aaaa4ccd5e56f0899cf
 DIST libarchive-2.6.0.tar.gz 948077 RMD160 2eb439ffd367052e1917652dbcff616861f93fef SHA1 8288d79c00cea65b73aad7f9e0090257227b4edb SHA256 6b924c2dc7d6584792ac5a90866edaded6a7695080de89b9880f42bcabf1fa03
 DIST libarchive-2.6.1.tar.gz 948450 RMD160 577d88c26047cdcdef0477fae61c54bc12122eb4 SHA1 f0fa90645afce1ff1d8c5f5e21a1ce986d58e376 SHA256 4d0ad4e5c33aa9725c7d92a42ae605815781372db949cd9906945e6c0d85c179
 DIST libarchive-2.6.2.tar.gz 948569 RMD160 a32ea45632b2704b13cf04ec5ffba44258c85fa4 SHA1 56be9601877f467369cc7792f1319f0271becd1c SHA256 48c27c0ce12e1363e6f7dd87ee5cf65aaad6ebbaa502791e9aa548d1523ebbb1
+DIST libarchive-2.7.0.tar.gz 1243793 RMD160 997f2809cb91eb84707714cb58f4840dee0a9ea0 SHA1 625347766797929873a8e31819a14c405bcb2275 SHA256 ae21ffc8160241001ecbc7af0751ff65cfc5ceffae8a1b9cf6822328f4c0474e
 EBUILD libarchive-2.6.0.ebuild 1918 RMD160 1b91013a5c1543d238bb0e8818fead95dfceefb8 SHA1 9d84abe8d80b75b6ae12deaf0a7dd3bcba6d6210 SHA256 4d3a72604e3e36e85f76b413e9faffa461e79a1e4f817a0e5f4fcc9cf0b2bcb9
 EBUILD libarchive-2.6.1.ebuild 1928 RMD160 14d6b5328f85275c21ae18ed0424894bc5392da2 SHA1 dbb0dddfc7013e54a2b3f1110ed445ee89612a90 SHA256 5595309ea655599054d31340b92a52c329d31ac10c12abf96ed377b4a2affd18
 EBUILD libarchive-2.6.2.ebuild 1892 RMD160 3056e03c1f8443233207b92b000dcc5565c52514 SHA1 a8923a0c15a4c03fbefc80f0f8fdabafd64eddc9 SHA256 bd9276fb0dd0a3e500225473e765f48049a0aed9f4cdc1978a2e905f645725d8
-MISC ChangeLog 20713 RMD160 043fde4c78530ec1dad4b4bf90b0e1933cd59eae SHA1 1e17f8a8a28c38bff60e5bc51f0b5738d5269ef5 SHA256 5d76f5cf2a5103718d117eb3467ebaa49d2588c6e369d9d71f0fd1a40485e0fe
+EBUILD libarchive-2.7.0.ebuild 2045 RMD160 eb3e6359dc0fdef5d8ed8881aad8cb727d552342 SHA1 98b3066e10dd9b6c08363caaa4f2d9575304942f SHA256 99965505a0925e4bd5a3a49ee58ebfc592e4c146762bbc58d17a6bd1727b0ede
+MISC ChangeLog 20897 RMD160 a0dbece9d91a3ec58f76f20e34b5ff7ba88df4c8 SHA1 f647a0e3039a28213653458e515808c84dc08835 SHA256 8ef16615f627df334d41afa3c0a358acbb46e59609320242ba9faad2834d6f10
 MISC metadata.xml 872 RMD160 895e9e13d46da8427f2695bc24aaefb16a5d8195 SHA1 e64e4be1a494de7e45305a7085b82b4b551c9c6f SHA256 c736f7829f1a1571706230bd5ec245389317faa2888300a1b74f440307f2c6e9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknnuBkACgkQAiZjviIA2Xg9FgCgyp1bf3uNvy46Zs5R5afusrrV
+CdUAoJRy3Dbu/zH58VlAHN4LGc5JYwd9
+=J5aP
+-----END PGP SIGNATURE-----
diff --git a/app-arch/libarchive/files/libarchive-2.7.0-fortified-sources.patch b/app-arch/libarchive/files/libarchive-2.7.0-fortified-sources.patch
new file mode 100644
index 000000000000..34c7b844905f
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-2.7.0-fortified-sources.patch
@@ -0,0 +1,27 @@
+From 8f08a4f3c67746fce484f0666e1828988ef72303 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Fri, 17 Apr 2009 00:47:02 +0200
+Subject: [PATCH 2/2] Make sure to use the mode parameter of open(2).
+
+With _FORTIFY_SOURCE=2 on recent glibc versions, using open(2) with O_CREAT
+and no mode parameter causes a build failure. Avoid this.
+---
+ libarchive/test/test_write_disk_failures.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libarchive/test/test_write_disk_failures.c b/libarchive/test/test_write_disk_failures.c
+index c0e1f8f..c9dc824 100644
+--- a/libarchive/test/test_write_disk_failures.c
++++ b/libarchive/test/test_write_disk_failures.c
+@@ -48,7 +48,7 @@ DEFINE_TEST(test_write_disk_failures)
+ 	assertEqualInt(0, mkdir("dir", 0555));
+ 
+ 	/* Can we? */
+-	fd = open("dir/testfile", O_WRONLY | O_CREAT);
++	fd = open("dir/testfile", O_WRONLY | O_CREAT, 0777);
+ 	if (fd >= 0) {
+ 	  /* Apparently, we can, so the test below won't work. */
+ 	  close(fd);
+-- 
+1.6.2.3
+
diff --git a/app-arch/libarchive/libarchive-2.7.0.ebuild b/app-arch/libarchive/libarchive-2.7.0.ebuild
new file mode 100644
index 000000000000..45f2187fa326
--- /dev/null
+++ b/app-arch/libarchive/libarchive-2.7.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.7.0.ebuild,v 1.1 2009/04/16 22:58:27 flameeyes Exp $
+
+EAPI=1
+
+inherit eutils libtool toolchain-funcs
+
+DESCRIPTION="BSD tar command"
+HOMEPAGE="http://people.freebsd.org/~kientzle/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 ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="static acl xattr kernel_linux +bzip2 +lzma +zlib"
+
+COMPRESS_LIBS_DEPEND="lzma? ( app-arch/lzma-utils )
+		bzip2? ( app-arch/bzip2 )
+		zlib? ( sys-libs/zlib )"
+
+RDEPEND="!dev-libs/libarchive
+	kernel_linux? (
+		acl? ( sys-apps/acl )
+		xattr? ( sys-apps/attr )
+	)
+	!static? ( ${COMPRESS_LIBS_DEPEND} )"
+DEPEND="${RDEPEND}
+	${COMPRESS_LIBS_DEPEND}
+	kernel_linux? ( sys-fs/e2fsprogs
+		virtual/os-headers )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-fortified-sources.patch
+
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	local myconf
+
+	if ! use static ; then
+		myconf="--enable-bsdtar=shared --enable-bsdcpio=shared"
+	fi
+
+	# We disable lzma because we don't have liblzma (not liblzmadec!)
+	# currently.
+	econf --bindir=/bin \
+		--enable-bsdtar --enable-bsdcpio \
+		$(use_enable acl) $(use_enable xattr) \
+		$(use_with zlib) \
+		$(use_with bzip2 bz2lib) $(use_with lzma lzmadec) \
+		--without-lzma \
+		${myconf} \
+		--disable-dependency-tracking || die "econf failed."
+
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	# 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
+}