Fix from upstream gnulib for sandbox violations with git repos in higher dirs.

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

4 files changed, 61 insertions, 4 deletions

diff --git a/sys-block/parted/ChangeLog b/sys-block/parted/ChangeLog
index 96176de5651b..54ff9266e801 100644
--- a/sys-block/parted/ChangeLog
+++ b/sys-block/parted/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-block/parted
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/ChangeLog,v 1.3 2011/01/29 05:45:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/ChangeLog,v 1.4 2011/02/21 17:09:57 vapier Exp $
+
+  21 Feb 2011; Mike Frysinger <vapier@gentoo.org> parted-2.3-r1.ebuild,
+  +files/parted-2.3-git-version-gen.patch:
+  Fix from upstream gnulib for sandbox violations with git repos in higher
+  dirs.
 
 *parted-2.3-r1 (29 Jan 2011)
 
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 35f09ad1e333..d44a6e18608c 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX parted-2.3-git-version-gen.patch 1275 RMD160 8a0660c118ab584f6a91691318d0415f7a46daaa SHA1 7b9371299803afefdbe8d8beca0c7e3e0c1aa4ed SHA256 42cfd406e5508768987b916b46bcbc7e81ef8ed57f65428fc9a462439eba0896
 DIST parted-2.3.tar.gz 2974168 RMD160 173dabc4c9fabc4246f0a74395a51fce2fb0b730 SHA1 9ef653c1f97c88b52d8e41f26ea3a8e3379f9cd6 SHA256 e81fa140805b5cd029ff6dda5cfa94d223e83ac182ebcae94f841d62ce468829
 DIST parted-2.3.tar.xz 1434420 RMD160 69c35245f465fcb25329eb2ee72851968cf92719 SHA1 ae5795dac1228ff388e514848611673026aa1c76 SHA256 66a080cc7baaf0eb11cc8c2c25f8d89921358b799d92c139aa92716503924b69
-EBUILD parted-2.3-r1.ebuild 1908 RMD160 26a55205348c021e867a565ecc4535ec69faa1c3 SHA1 dbcc23292397dede3f0657c50fc3052b29a8b57e SHA256 34969b919554654c80d2d6d7ebbee5171b239f6c8369e4a05146c2486e7565da
+EBUILD parted-2.3-r1.ebuild 1969 RMD160 80d011b6d869f7e861bd3b919dde029ed317b96a SHA1 8b3e38dd6331aec846a441ab6ce10c79677022ab SHA256 f49b558b44115c52dec115976b3235db866249484a1a16d66dff127cb23a9700
 EBUILD parted-2.3.ebuild 1894 RMD160 f4b86e3a28d8aeaaeb39af291c62279227d61348 SHA1 ef4f4740b1efd7c592ae343eb7393031e13f2e0a SHA256 fcb3b4a9b336f1b6510b6871ca6c05a4be13709d4b7ea680c426a2ec90531214
-MISC ChangeLog 22194 RMD160 0094f0281e7cf5a41853140565ce9a88c842606a SHA1 55a25173e05254158ec4129759e7dca752050663 SHA256 1620751f713af6569d68dbd6345b6f00ca1149f08737e61448406355e4bca66f
+MISC ChangeLog 22396 RMD160 c598b89eb019ccd614b931eacd4a46a740727718 SHA1 5d90a4ad6efc3f1b711e78ba2ed7c05deeab0341 SHA256 f80fbcae2f8a4ae0ee23db576af4075c2527a91a37317b1f1f730f2812037d8c
 MISC metadata.xml 644 RMD160 42deac3c811b5acc573f7811be6d41783b7dd328 SHA1 bc79bf40569046bb560cc84c431e13caa393aa12 SHA256 53ecb92c7d1e15c7b950ca3cd13bb949830f317ad01df6d3f564b7b24a0a02f0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk1inGoACgkQaC/OocHi7Jb2AgEAgG3c1riqZz86Z4enR6RBAjAM
+3GJW3QL04/wvADAoPOgA/jy3DJ5dxb2GNUSUno4oR7ck03bReLTvi9hiJ+YoihD6
+=vlBu
+-----END PGP SIGNATURE-----
diff --git a/sys-block/parted/files/parted-2.3-git-version-gen.patch b/sys-block/parted/files/parted-2.3-git-version-gen.patch
new file mode 100644
index 000000000000..32f85d4bdf54
--- /dev/null
+++ b/sys-block/parted/files/parted-2.3-git-version-gen.patch
@@ -0,0 +1,39 @@
+http://bugs.gentoo.org/355045
+
+[PATCH] git-version-gen: skip "-dirty" check when appropriate
+
+* build-aux/git-version-gen: Don't run any git commands
+when the version comes from .tarball-version.  Prior to this,
+we would run git update-index --refresh even from a just-unpacked
+tarball directory, and that could affect a .git/ directory in a
+parent of the build directory.  Reported by Mike Frysinger.
+
+diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
+index 68c7d64..686f703 100755
+--- a/build-aux/git-version-gen
++++ b/build-aux/git-version-gen
+@@ -124,13 +124,16 @@
+     # Change the first '-' to a '.', so version-comparing tools work properly.
+     # Remove the "g" in git describe's output string, to save a byte.
+     v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
++    v_from_git=1
+ else
+     v=UNKNOWN
++    v_from_git=
+ fi
+ 
+ v=`echo "$v" |sed 's/^v//'`
+ 
+ # Don't declare a version "dirty" merely because a time stamp has changed.
++if test -n "$v_from_git"; then
+ git update-index --refresh > /dev/null 2>&1
+ 
+ dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
+@@ -142,6 +145,7 @@
+ 	  *) v="$v-dirty" ;;
+ 	esac ;;
+ esac
++fi
+ 
+ # Omit the trailing newline, so that m4_esyscmd can use the result directly.
+ echo "$v" | tr -d "$nl"
diff --git a/sys-block/parted/parted-2.3-r1.ebuild b/sys-block/parted/parted-2.3-r1.ebuild
index 194ca38d73dc..bd33da3aefc0 100644
--- a/sys-block/parted/parted-2.3-r1.ebuild
+++ b/sys-block/parted/parted-2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-2.3-r1.ebuild,v 1.1 2011/01/29 05:45:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-2.3-r1.ebuild,v 1.2 2011/02/21 17:09:57 vapier Exp $
 
 EAPI="3"
 
@@ -33,6 +33,8 @@ DEPEND="
 "
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-git-version-gen.patch #355045
+
 	# Remove tests known to FAIL instead of SKIP without OS/userland support
 	sed -i libparted/tests/Makefile.am \
 		-e 's|t3000-symlink.sh||g' || die "sed failed"