Version bump.

(Portage version: 2.2_rc30/cvs/Linux x86_64)

3 files changed, 113 insertions, 1 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/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
+}