Fix _FORTIFY_SOURCE issues wrt #340253 by Kevin McCarthy.

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

4 files changed, 72 insertions, 2 deletions

diff --git a/dev-libs/libtar/ChangeLog b/dev-libs/libtar/ChangeLog
index b023633577da..4ab6605f11cb 100644
--- a/dev-libs/libtar/ChangeLog
+++ b/dev-libs/libtar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libtar
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/ChangeLog,v 1.14 2011/02/10 19:33:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/ChangeLog,v 1.15 2011/02/11 21:10:20 ssuominen Exp $
+
+*libtar-1.2.11-r4 (11 Feb 2011)
+
+  11 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> +libtar-1.2.11-r4.ebuild,
+  +files/libtar-1.2.11-fortify.patch:
+  Fix _FORTIFY_SOURCE issues wrt #340253 by Kevin McCarthy.
 
   10 Feb 2011; Fabian Groffen <grobian@gentoo.org> libtar-1.2.11-r3.ebuild:
   Marked ~amd64-linux, bug #353713
diff --git a/dev-libs/libtar/Manifest b/dev-libs/libtar/Manifest
index 26a0fa3cc1a9..17751be1e86e 100644
--- a/dev-libs/libtar/Manifest
+++ b/dev-libs/libtar/Manifest
@@ -1,6 +1,8 @@
+AUX libtar-1.2.11-fortify.patch 246 RMD160 eb4c7b7219b45748390d8aaa17f3cf6a6360e416 SHA1 6fa3e7ad1b40ff1d59e800692bff9fa9ae01c3ad SHA256 8faa386b4879b5e8855e69708fb77e779629b1d9162b06cc01095b38f187ea26
 AUX libtar-1.2.11-free.patch 337 RMD160 f934fbecd7f601724c59c9ecf621217d594dd247 SHA1 4201c44e53d31f72e8158371227692f42ecd8989 SHA256 ed7c9218c5f2b7f26f41d79ff7e2ede793816bfdeeffd0480ea90f2a818ca1ac
 DIST libtar-1.2.11.tar.gz 145354 RMD160 205d1213ed32f9708fb2135010afdd9e184c430e SHA1 9611f23024b0e89aad1cfea301122186b3c160f8 SHA256 4a2eefb6b7088f41de57356e5059cbf1f917509b4a810f7c614625a378e87bb8
 DIST libtar_1.2.11-6.diff.gz 245511 RMD160 05a7bb41acd6d341b2e79ed6a699585089d3c3c3 SHA1 8ca2905f3f175fb0b15bb37a498ab5815891f50c SHA256 002d067499a94988dfa23a71e3f46d6b9af26fdce266870dc9b7c81d54fc820d
 EBUILD libtar-1.2.11-r3.ebuild 1390 RMD160 68de03c5d2ba9203a515cf4f7b82234dda65e908 SHA1 8e2034963c53556a9c7e9b53876512cc0d01a6ea SHA256 425ea38b8096e2380f8fbec7520ead9251417f631e841da518876ad29e0d1bfa
-MISC ChangeLog 2207 RMD160 6e5ffc0b94aeba7df89124d10272430c7f2dc378 SHA1 fbc218ad3d24dfd2cbb65acff0fc110453c4954c SHA256 fa6164bd0a2e43835d276bc14b01a028c07a1a3e0d0fc75b92a93a1ad91e0b35
+EBUILD libtar-1.2.11-r4.ebuild 1403 RMD160 90faf8f9cdb50ec14a9406692e95e1e6d6e8b9ee SHA1 c1ec0607c30cd0a971509023d1cd62766853c6be SHA256 88095c3d180598666f40eac5bceb920cbb5773278bc0bb6b9f525199e8c54cd4
+MISC ChangeLog 2421 RMD160 3fb464104850167a02f09b5d4b309e53af9e4d4a SHA1 ac07dec49bb7975f2cd84b86fc9daea8f1977971 SHA256 4a7ef8ad260117473b69e0ea59d8376d114345f45deb67caa84d0e3c9c2bdd9b
 MISC metadata.xml 241 RMD160 dbd39e15096a9c09432225b4dee87bcadcb33907 SHA1 1beb1a93e4526085c26b282271027ad508b29059 SHA256 950a704ea9fcebef2e688e8bd6e0f0d292c967e246d58e4778b9955b1d615ab4
diff --git a/dev-libs/libtar/files/libtar-1.2.11-fortify.patch b/dev-libs/libtar/files/libtar-1.2.11-fortify.patch
new file mode 100644
index 000000000000..8b919ad8f4ac
--- /dev/null
+++ b/dev-libs/libtar/files/libtar-1.2.11-fortify.patch
@@ -0,0 +1,11 @@
+--- lib/encode.c
++++ lib/encode.c
+@@ -30,7 +30,7 @@
+ 	int i, sum = 0;
+ 
+ 	if (t->options & TAR_GNU)
+-		strncpy(t->th_buf.magic, "ustar  ", 8);
++		strncpy(t->th_buf.magic, "ustar", 6);
+ 	else
+ 	{
+ 		strncpy(t->th_buf.version, TVERSION, TVERSLEN);
diff --git a/dev-libs/libtar/libtar-1.2.11-r4.ebuild b/dev-libs/libtar/libtar-1.2.11-r4.ebuild
new file mode 100644
index 000000000000..8ecd2c1c0786
--- /dev/null
+++ b/dev-libs/libtar/libtar-1.2.11-r4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/libtar-1.2.11-r4.ebuild,v 1.1 2011/02/11 21:10:20 ssuominen Exp $
+
+EAPI=3
+inherit autotools eutils multilib
+
+p_level=6
+
+DESCRIPTION="C library for manipulating tar archives"
+HOMEPAGE="http://www.feep.net/libtar/ http://packages.qa.debian.org/libt/libtar.html"
+SRC_URI="ftp://ftp.feep.net/pub/software/libtar/${P}.tar.gz
+	mirror://debian/pool/main/libt/${PN}/${PN}_${PV}-${p_level}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="static-libs zlib"
+
+DEPEND="zlib? ( sys-libs/zlib )
+	!zlib? ( app-arch/gzip )"
+
+src_prepare() {
+	epatch "${WORKDIR}"/${PN}_${PV}-${p_level}.diff \
+		"${FILESDIR}"/${P}-f{ree,ortify}.patch
+
+	sed -i \
+		-e '/INSTALL_PROGRAM/s:-s::' \
+		{doc,lib{,tar}}/Makefile.in || die
+
+	sed -i -e "/\/usr\/share\/aclocal/s:/usr:$EPREFIX/usr:" aclocal.m4
+	eautoreconf # reconf for missing config.sub
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with zlib)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc ChangeLog* README TODO
+	newdoc compat/README README.compat
+	newdoc compat/TODO TODO.compat
+	newdoc listhash/TODO TODO.listhash
+	newdoc debian/changelog ChangeLog.debian
+
+	rm -f "${ED}"/usr/$(get_libdir)/${PN}.la
+}