Add patch from upstream for sandbox/git misbehavior #355045 by Kyle Milz.

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

4 files changed, 59 insertions, 10 deletions

diff --git a/sys-devel/m4/ChangeLog b/sys-devel/m4/ChangeLog
index 716b3f029648..1d18288a645e 100644
--- a/sys-devel/m4/ChangeLog
+++ b/sys-devel/m4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/m4
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.149 2011/01/09 17:37:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.150 2011/02/22 02:48:32 vapier Exp $
+
+  22 Feb 2011; Mike Frysinger <vapier@gentoo.org> m4-1.4.15.ebuild,
+  +files/m4-1.4.15-git-version-gen.patch:
+  Add patch from upstream for sandbox/git misbehavior #355045 by Kyle Milz.
 
   09 Jan 2011; Raúl Porcel <armin76@gentoo.org> m4-1.4.15.ebuild:
   alpha/ia64/m68k/s390/sh stable wrt #348550
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index d9e38bc451d7..caa93bd961f5 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,11 +1,16 @@
-AUX m4-1.4.14-glibc-2.12.patch 1941 RMD160 ecd68b2eda12fb66b3fd7b356500e7f96c0b29e1 SHA1 7f8223986057827e270d5108f41ca989e13fb81f SHA256 0e8cf2caca722cd9f897da5cdaa80e160931a020d768af6c4aaa1b79b72d948a
-AUX m4-1.4.14-gnulib_spawn.patch 1316 RMD160 ffd509b614c42fb8826ff9a04b9f58c564b8854c SHA1 04402c26d6e685eac0a7f6fdf29fec09dfb5d2ca SHA256 0dbe9373f4844bed1e35ed289ae293d3440421e2d7d1ec92b8c10fcfc4b4fca1
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX m4-1.4.15-git-version-gen.patch 1275 RMD160 8a0660c118ab584f6a91691318d0415f7a46daaa SHA1 7b9371299803afefdbe8d8beca0c7e3e0c1aa4ed SHA256 42cfd406e5508768987b916b46bcbc7e81ef8ed57f65428fc9a462439eba0896
 AUX m4-1.4.15-uclibc-sched_param-def.patch 580 RMD160 2bcea0eb33aaef5ae5f9046a36385af7a9194865 SHA1 e3c94913eaaf8a280e598353f89ef46119dd3f94 SHA256 b111051eaaa15ce6e53ae168d06e0fb9688c70141060abfe0a15c5d1400fbaf9
-DIST m4-1.4.12.tar.lzma 768167 RMD160 0a510ac65fb0a0005a574b6d1dcf4a86718fd7af SHA1 ea93f11df1098e1ced67255c7a66b817bd29daef SHA256 a5caedee843ad8fc418fb5228da057156134ca4132eb850d1e9a3d7838477f46
-DIST m4-1.4.14.tar.bz2 1125670 RMD160 d4145f84b629772d9e5bd8fd893f3633d26071a9 SHA1 f2df9a3db6bb3974f06e5cefe04b9ce3f4bf8b82 SHA256 0885ffa93256353a96b1cf0bcbc4d639ed09953b687e6cc412c4048e656f4dd2
 DIST m4-1.4.15.tar.xz 947068 RMD160 a51516c6e22d3518eabb934083a6d450d85190e2 SHA1 d4c7fe695ddf93c0f05c6435d892520b65f4c0d7 SHA256 ec26b4ef8037286b36bc5af9893f0da63bf8615bbf478a587aa6cab927b0349d
-EBUILD m4-1.4.12.ebuild 1134 RMD160 420b49b4173e23cc02ea717354524485fcbfc7d7 SHA1 291cea0647427b5e0debf395e595f1c3f6fbc98f SHA256 553aac4e1daf6011f1871e4782f752418b2807746a2b1204fd0d65a2488f786d
-EBUILD m4-1.4.14-r1.ebuild 1322 RMD160 a058f7c04034aa97567fa5c810362a75d97f4a9c SHA1 9f586a8e97d0cacce7d2f4b9ad927b342d8f71dc SHA256 268723b65a84390b9360ee152cb7f07e5db2c0e0530448b28f6ad3c26a89faa2
-EBUILD m4-1.4.15.ebuild 1234 RMD160 cfb68dc1411dd962393b0c3569bf82cae6ade89a SHA1 f4d89657e67dc5eb2cc8804c90253eed8222bb39 SHA256 03b604e01d86a32e226ef993d9d3c6363283be13b8acac5073d68fb61c9a9806
-MISC ChangeLog 16674 RMD160 0c2bab4a9cf09e5e5c673be25b9e97c97e546c82 SHA1 1c49e09bdd8805d41c7ea01b5546ebed460cdb72 SHA256 f3d9a30c8cec7a48716972789ab47e099faee1eea25f8ebdc8124ef5ff041f9f
+EBUILD m4-1.4.15.ebuild 1282 RMD160 59f1072471225fe0f7e5334250e802f5c3177bf5 SHA1 5abe7f09506d99cb9bf8ba6709d86d0f1334cf3f SHA256 e472ea03a5e23e7bd1b38f499d6c3cfc9a99354c653fd14b7c5eed40b7647190
+MISC ChangeLog 16860 RMD160 90b252de32c7737d3a23a873756a513190b961e9 SHA1 76189b2a29b353aa28fff778d63b9c4ed01334b6 SHA256 4e27d549b2110ec2007e6bbf3482f65a2436a548e0e22c935ab2138e83c18df5
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk1jJAIACgkQaC/OocHi7JbeMgD+LPb+/04zEzJ4pCmlWUUZWweR
+1kleOmpreHmEIlLd1k4A/RA4+cgONBe6VLRLQbeXkKa0T4o/rRnhSqAAtUB8byFp
+=Pnpx
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/m4/files/m4-1.4.15-git-version-gen.patch b/sys-devel/m4/files/m4-1.4.15-git-version-gen.patch
new file mode 100644
index 000000000000..32f85d4bdf54
--- /dev/null
+++ b/sys-devel/m4/files/m4-1.4.15-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-devel/m4/m4-1.4.15.ebuild b/sys-devel/m4/m4-1.4.15.ebuild
index 37c931316ccc..9d3f02192f23 100644
--- a/sys-devel/m4/m4-1.4.15.ebuild
+++ b/sys-devel/m4/m4-1.4.15.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-devel/m4/m4-1.4.15.ebuild,v 1.10 2011/01/09 17:37:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.15.ebuild,v 1.11 2011/02/22 02:48:32 vapier Exp $
 
 EAPI="3"
 
@@ -21,6 +21,7 @@ RDEPEND=""
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-uclibc-sched_param-def.patch #336484
+	epatch "${FILESDIR}"/${P}-git-version-gen.patch
 }
 
 src_configure() {