Version bump, and fix fortify overflows #370949 by Diego Elio Pettenò.

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

4 files changed, 96 insertions, 6 deletions

diff --git a/sys-fs/xfsdump/ChangeLog b/sys-fs/xfsdump/ChangeLog
index 0f8bf9490508..68dd1a28514b 100644
--- a/sys-fs/xfsdump/ChangeLog
+++ b/sys-fs/xfsdump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/xfsdump
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/ChangeLog,v 1.79 2011/04/12 17:56:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/ChangeLog,v 1.80 2011/11/06 04:50:58 vapier Exp $
+
+*xfsdump-3.0.6 (06 Nov 2011)
+
+  06 Nov 2011; Mike Frysinger <vapier@gentoo.org> +xfsdump-3.0.6.ebuild,
+  +files/xfsdump-3.0.6-path-overflow.patch:
+  Version bump, and fix fortify overflows #370949 by Diego Elio Pettenò.
 
 *xfsdump-3.0.5 (12 Apr 2011)
 
diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index 109dfd1d3c62..65edc877d3de 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -5,20 +5,23 @@ AUX xfsdump-2.2.42-Makefile-deps.patch 589 RMD160 2856cb63955c1c4feba33601b8916e
 AUX xfsdump-3.0.4-headers.patch 700 RMD160 23301aeff38e1ba073f83f3ac105f8a91efd6e7f SHA1 3142abf51d7facbd1bcee235944f70a3df53bf74 SHA256 6ccd1e059ad17502a97c46f6565eac76bc08d9f723e1cd061faaca47a958f3d8
 AUX xfsdump-3.0.4-no-symlink.patch 721 RMD160 ccc23d20a0289caa1b2972aee963e94082eb84ca SHA1 bd4347ebaec61c5cd81ee9e072150be2c516f1d8 SHA256 b3ccccfce2b7f36263a8b3611724560ae768a3371dcc6e19045abae8df8052a3
 AUX xfsdump-3.0.5-prompt-overflow.patch 333 RMD160 1082d60b364a49338f750fe0d9e27c619800b4a9 SHA1 55d6e9fbd96a0879d18ed8fbd6e567cb9f5acfe4 SHA256 80684664bae903256dd1b6355da9e88b727b8b42a559a6131aa2d24a6ce08428
+AUX xfsdump-3.0.6-path-overflow.patch 818 RMD160 3e94777ad8ba273f9f61e4f8ac3d017dd5c443dd SHA1 a9b522cfea26c3f7d6935b5079318668ba99acb2 SHA256 9afa75c84ca814a0186323a0194c4cca8e21ce39c52576d4775becdc4be7c4f2
 DIST xfsdump-3.0.1.tar.gz 867488 RMD160 9cd52f873d3d6108a1b6f5f468db4d6a27079a52 SHA1 7f7e168e13d8ec2bce7ae19cf3123618b654975a SHA256 ca5dd38a5710c99cb5d84c2ad41d6c6eff57fa5abf4ed271680e2bf63ae6dc7d
 DIST xfsdump-3.0.4.tar.gz 790095 RMD160 cbebdbd3ff46153da46e7f99cf0c585a68c6de40 SHA1 7b127ad608986d4330587b38e666669f914db585 SHA256 d3932f0d482f6f77ec8519ce24c00edbe006262751bfb4ad4b4bc3e219d807d1
 DIST xfsdump-3.0.5.tar.gz 797719 RMD160 ebe3a732ba80f843af4b5262af86cdb3762c8df3 SHA1 c846ae756f947ef68d9d1df38403d9de839ad9d3 SHA256 f3a86b37e268779c940996a7aba93ed1f04ad942cbc1b8d75aae1e447aa762ad
+DIST xfsdump-3.0.6.tar.gz 789635 RMD160 110392eb0f5355a48571f35698625e639ffd4273 SHA1 f86472c87480cc996b26fb46cd7b55f658fec0ca SHA256 d6aa8040f7fe7c4dcb41190b7530c36177b084134e92a2c01e309ff4c18a1829
 DIST xfsdump_2.2.48-1.tar.gz 581376 RMD160 ff877c38ecb75061a2bf6f7d3bbc135ffb346cfb SHA1 bdfffa637efa23329899fd38d6b77119d51ea039 SHA256 381a1015766fccd5f6fc1955a5dd692077c83a75d554f4765e84a001186f7c8f
 EBUILD xfsdump-2.2.48.ebuild 1146 RMD160 1535ed00bf4b16e52069e67c3a3d3c5ecdf12acb SHA1 3dd7dfcd18063596e3495ad6c0c7970d8a87d651 SHA256 7a568f76c76dc69effbd34b5a49371a0f2e9a7c3b6e24a1d4e23d8da074c4596
 EBUILD xfsdump-3.0.1.ebuild 1080 RMD160 4f8e95ce70da0a5181e7c8536fb841d128c06718 SHA1 4ebfb01684a1ecb577fd8396741d154e206e827c SHA256 53334e5a82d428a90bf84ab4df471920e3eadc02e35bf7f2d4335f77167b68ca
 EBUILD xfsdump-3.0.4-r1.ebuild 1189 RMD160 9c3224a6e8ef5b9bc55ee8c9d3527c81361f87c3 SHA1 4611fe2a6b2ee478f40f57767408ac88baa66903 SHA256 d679deb8e380714ed372e3fa5aa9ab68639877e74396e6ff025dd449649cc350
 EBUILD xfsdump-3.0.5.ebuild 1181 RMD160 f5efdf146cb6692a9a75414148c615179e68cbab SHA1 33f92302b9dfbd08b6f2c2627fd9db556a5d8b12 SHA256 c7ec4685fe8919d5cbfd42ac8569c58df103c75b24e7920430f3993d8e55154b
-MISC ChangeLog 11670 RMD160 060de5e9a861f06bc542c06cccde3ab0350f90be SHA1 9ab06d6fb815c47050d9e35cc5b070140f18ec40 SHA256 59d0591189ffb8c2610d0d5e0b3a6c469d8875eaa09e947a1601c45d320c0a32
+EBUILD xfsdump-3.0.6.ebuild 1243 RMD160 157a7920941c2d894591ff1dcbea91d6578d41f1 SHA1 7199a0d10cf6297552ad5229cb085325759ced9b SHA256 48c58ded0f66d5c7e54f5da1c33c1ae80ba85f64800699dd0e2dfe21a727d553
+MISC ChangeLog 11892 RMD160 7b7c357e6799c607d7af6ab7b7bf90ff97f58897 SHA1 e459df3199de43b25da82505fe65a1a2c138b7df SHA256 f25580073d4bbfb5695e46d7b5204c253b763373260739a8a4881e6d5e64490d
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk2kkkEACgkQaC/OocHi7JYuqQD8DjZ21bpVVzW1VwO08EKzLFDS
-xKkvBy+TYokmC2zhf5IA/2DvALE56/Ngilu78+uZDQI9opR33BBpwoy6vBC3K+PY
-=sPrA
+iF4EAREIAAYFAk62EkEACgkQaC/OocHi7JZNQgD8DNPStQ3z8se7F0GPV8iwKNAb
+e5NKIzAY2kO9CAi/jYQA+wbUrFraZT2yjXSXdP46PL8UG6ENRruRm+hSXAiwnw15
+=OcBg
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/xfsdump/files/xfsdump-3.0.6-path-overflow.patch b/sys-fs/xfsdump/files/xfsdump-3.0.6-path-overflow.patch
new file mode 100644
index 000000000000..a6d9f6b82233
--- /dev/null
+++ b/sys-fs/xfsdump/files/xfsdump-3.0.6-path-overflow.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/370949
+
+From 435bad87388821684bb3cd2a33c42787cf970017 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 6 Nov 2011 00:44:57 -0400
+Subject: [PATCH] path: fix 1 byte overflow with empty lists
+
+If pap->pa_cnt is 0, then the local buffer is allocated as 1 byte,
+but the code then writes two bytes to it '/' and '\0'.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ common/path.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/common/path.c b/common/path.c
+index 66320de..ca24f6a 100644
+--- a/common/path.c
++++ b/common/path.c
+@@ -285,6 +285,8 @@ pa_gen( pa_t *pap )
+ 	for ( i = 0 ; i < pap->pa_cnt ; i++ ) {
+ 		sz += strlen( pap->pa_array[ i ] ) + 1;
+ 	}
++	if ( i == 0 )
++		sz++;
+ 	sz++;
+ 
+ 	retp = ( char * )malloc( sz );
+-- 
+1.7.6.1
+
diff --git a/sys-fs/xfsdump/xfsdump-3.0.6.ebuild b/sys-fs/xfsdump/xfsdump-3.0.6.ebuild
new file mode 100644
index 000000000000..7e4315384a90
--- /dev/null
+++ b/sys-fs/xfsdump/xfsdump-3.0.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/xfsdump-3.0.6.ebuild,v 1.1 2011/11/06 04:50:58 vapier Exp $
+
+EAPI="2"
+
+inherit multilib eutils
+
+DESCRIPTION="xfs dump/restore utilities"
+HOMEPAGE="http://oss.sgi.com/projects/xfs"
+SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
+	ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
+IUSE=""
+
+RDEPEND="sys-fs/e2fsprogs
+	!<sys-fs/xfsprogs-3
+	sys-apps/dmapi
+	>=sys-apps/attr-2.4.19"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_prepare() {
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in \
+		|| die
+	epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
+	epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
+	epatch "${FILESDIR}"/${PN}-3.0.6-path-overflow.patch #370949
+}
+
+src_configure() {
+	unset PLATFORM #184564
+	export OPTIMIZER=${CFLAGS}
+	export DEBUG=-DNDEBUG
+
+	econf \
+		--libdir=/$(get_libdir) \
+		--libexecdir=/usr/$(get_libdir) \
+		--sbindir=/sbin
+}
+
+src_install() {
+	emake DIST_ROOT="${D}" install || die
+	prepalldocs
+}