Bug #349083: Fix a false positive in the Git testsuite, triggered when the portage user had a shell of /bin/false.

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

8 files changed, 70 insertions, 14 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index ed4853ffa9b8..e6e590018092 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.62 2010/12/25 22:42:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.63 2010/12/26 22:40:40 robbat2 Exp $
+
+  26 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.2.ebuild,
+  git-1.7.3.2-r1.ebuild, git-1.7.3.3.ebuild, git-1.7.3.4.ebuild,
+  git-1.7.3.4-r1.ebuild, +files/git-1.7.3.4-avoid-shell-issues.patch:
+  Bug #349083: Fix a false positive in the Git testsuite, triggered when the
+  portage user had a shell of /bin/false.
 
   25 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.2.5.ebuild,
   git-1.7.3.4-r1.ebuild:
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 6e37d6b6d336..6fe2f7d57b32 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -7,6 +7,7 @@ AUX git-1.7.1-interix.patch 2192 RMD160 725c43e056bbaa82e4af1f2aef9dd152214f9d65
 AUX git-1.7.1-noiconv-segfault-fix.patch 1786 RMD160 592f84005bccdfbc020ad79d66c8b17d401e1c51 SHA1 17108275dff771dc919a273540774749f3623875 SHA256 6f50165264078da499329be3b74176aacae85fc48934576ecd37f0fc2de4c2b4
 AUX git-1.7.2-always-install-js.patch 1167 RMD160 36cae52a1dbcb2450a521b60ce66dbd48e58b3a9 SHA1 45f652281e36627f80b2d559a6861e784b8afa75 SHA256 2988513c5a81f446818b850414b4bf7dc8a3177eb1dc32f29e530a80479baa9e
 AUX git-1.7.3.2-interix.patch 2283 RMD160 2c448d5a8bfb9696cbc55a52328e04617de9fcf1 SHA1 b35a35d6b6729c3868482c689a7c629b35c7e414 SHA256 13dc741c481fcba6db060bbc8b54d0e19350c9c2270e113afe5ac3962d78e8b6
+AUX git-1.7.3.4-avoid-shell-issues.patch 1165 RMD160 674c080efe0e9b99fecf4bf19106c15fc0d3510a SHA1 bc4bfab9c0520139a107d0a634c48ce7fa28adf9 SHA256 7dd0eef0b93ed52e1c744d2d1888387c0aafecbdaf2d889c8ad48f45ed68d5d5
 AUX git-daemon.confd 700 RMD160 2dea5af0c6b3aa5304aa5417bb40099bd4cdb45b SHA1 0b7c3078c4d284eb2572a5fb7c1efff5a4837f6e SHA256 9ca387e81ca875d4e543fa64398620451ff74273fa06b122a6af47db1fee1630
 AUX git-daemon.initd 738 RMD160 23de3f02cd33251ce0f66c1b6e1d6a20ee45ee5b SHA1 b6f8e80130ddddf8cbd70a553b31706d570f7d5a SHA256 48e7e1228c9811079dce8fecc560000cf645de5b4bb697f8f8ad3f906906330b
 AUX git-daemon.xinetd 260 RMD160 5bfeca2541488bb955ca349474c1fa3e80913aef SHA1 88d6fc44644c88ed6f2ce54a936f41dc15d2268e SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67
@@ -45,12 +46,11 @@ EBUILD git-1.7.2.3.ebuild 13584 RMD160 61ad28fef1eaea0185f92b35bf87d80fa2cfc9e3
 EBUILD git-1.7.2.4-r1.ebuild 13681 RMD160 fd98454c9b8a44322691d320c006c52e7a224778 SHA1 e3ea03bd24b78b65f74a36c00a7771b5db820fc3 SHA256 7242e4289d83792d08276449c838332248d31eb9d85023d21a7fcf762505a95e
 EBUILD git-1.7.2.4.ebuild 13584 RMD160 6ee33b2f5f7a347a32ac6f6b1e9fca887f5b83ca SHA1 62086ffb6d0ee6b4c74b054f8a738dd60e2ee674 SHA256 a1bdca30d9d93835d9085937d7148b202523f599951e88a5416f0671dad39589
 EBUILD git-1.7.2.5.ebuild 13799 RMD160 48199faf5075fddde47c97ac9074ba0af65e7e59 SHA1 928aa93c65f4479f0c735bf505ad64c1a856d3f5 SHA256 299ef7d72d10ef2aee35552213ebdfa2e6d2ff7cc2d1020c89b5b7127e53aa6b
-EBUILD git-1.7.3.2-r1.ebuild 13388 RMD160 7ba00d0898139766f67eb9c9bbd731afebd8cd18 SHA1 c5ed44b7fca3ebcddb9b0fdd774c94b29bd32955 SHA256 e2d4dffd01c2c5a43a6e6fd056c05150d29a47c00aa392507a981d8fcb59b0a0
-EBUILD git-1.7.3.2.ebuild 13114 RMD160 e4a053d56f5624d837a1903e22b5a5e238a3089a SHA1 ea5556521813cdb3972d1be4ffa31cf5d898cfe4 SHA256 a94fc531e3262e5e65545ae547857e117c866f7c200520d844f0c361ef7f1987
-EBUILD git-1.7.3.3.ebuild 13387 RMD160 a04cf9fc1bd372fd662970e1c260d73606b07761 SHA1 2e629cd3a44e7e709a2bfc935aaa701374e805a7 SHA256 8f6c73233804b6738522204236e8bfa7940b4aea9de2324cb104f1ab51f8fe8b
-EBUILD git-1.7.3.4-r1.ebuild 13659 RMD160 faf5e8dc30ae1d98c0693be9f2720b0083666960 SHA1 8f3681dc0ee7212d2e98dba24e7aee47daa3c44a SHA256 c9b952fb2e1cf3556b29a6526fdaa956bc5b6810e1472e368fc1de363c3d6be9
-EBUILD git-1.7.3.4.ebuild 13387 RMD160 b09bd2ff559f8f693d4c56c7fb1cc8d697032623 SHA1 09837bd420a96e42b8c453fb53f406f0632c72e6 SHA256 d1779c2afa6386a6d0a5c9bf1204d62faf0e332f1b4aa926f7a573cfc3ab1ef1
+EBUILD git-1.7.3.2-r1.ebuild 13534 RMD160 cef4b9d47940f31ea13b3644ff0b0cb823692eff SHA1 4b076aa65273ea99312e5d07a5ab0de1d8ad3c34 SHA256 b2a330a3a30c04323cd274f85f10942aa32db959903eb23531cf1f1aa0f14007
+EBUILD git-1.7.3.2.ebuild 13258 RMD160 b5ce802d4a609e8443ca9221ab310481074b5416 SHA1 c7f1a73879e6dad0b33f51bbf8a84421dee4ab21 SHA256 5e2fa6d740a60da484807ac2652a31a84c343d65ebfead23a2864c9f760ff6e2
+EBUILD git-1.7.3.3.ebuild 13531 RMD160 d4ee6537e2211dde6d75056ef32dd925713aa9b8 SHA1 aacf6b2f02fb3976e366119381fcb84d052b59bd SHA256 9e3084681b6f0f697f294f842103b923319bfb713b33014d882c9d69dec7337f
+EBUILD git-1.7.3.4-r1.ebuild 13818 RMD160 5e44e60b39b59915495507285a4669f698065142 SHA1 ac6fdead87cf283d47a6ce56ed4cc950e2e34d8d SHA256 c569ce0698736e2a039bb6345bde5c530d9c75a2cd7c76628e83890d432acb2b
+EBUILD git-1.7.3.4.ebuild 13531 RMD160 a1b5a2ce5a5540e6df5cac45c4a49cee3315e4d9 SHA1 c934dce7ef6a31ecaf65ad6141be7704bb7ad0d2 SHA256 b3a8bd0fb7ce47d564b8764ac612429730414e67ba93519e25e5bb16dac21fde
 EBUILD git-9999.ebuild 13382 RMD160 a5bfe144fc88e4c1808c8ec93ee7f44563b9a6d9 SHA1 699c1320d25dbcafc2aeafc2a1c52eaf9ed39fec SHA256 c1e9a3b0d920729f0740e5a6eef770c892544e752a91255f42d04b71be3a5893
-MISC ChangeLog 74830 RMD160 00607b18185ebf7765df4b77d27840c8d9595081 SHA1 f6fedace1dc312d54ee51f54be88758b9f8fdf7a SHA256 964d2e1d64f7257e87a5ea2862bb9b3a29b222ecfe3ec4fdefbe0b121e0d1735
-MISC git-1.7.2.5.ebuild.orig 13691 RMD160 e5eb51b83d2c3b05909899fae9558d77b1653043 SHA1 b9c46c2952e3fb2fabec205ee0ddb1f3832f9fa9 SHA256 63684146243dfc517d03a241b12dd3784eded45429ae4c6e42cacf7131030a5d
+MISC ChangeLog 75158 RMD160 fe92c3aa918e048017ce63606e429629f37c521e SHA1 21f84ab3e2c289f52717ac668b841bfa95aa3c0d SHA256 f55e2b2e9bb00b819236a6b57e9f8d5533a96deec0a1b1492c0683a646975e49
 MISC metadata.xml 1609 RMD160 80bd2234e48fccd7a442fd6cce3ad9e2f8a05d33 SHA1 0b3b2f486530e009fbe055a87d58a161722f64b1 SHA256 2450bc31e647972be38e76068c6cf27c34e00cd8077f139a137f9d4c14d52a0b
diff --git a/dev-vcs/git/files/git-1.7.3.4-avoid-shell-issues.patch b/dev-vcs/git/files/git-1.7.3.4-avoid-shell-issues.patch
new file mode 100644
index 000000000000..993f516a1767
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.3.4-avoid-shell-issues.patch
@@ -0,0 +1,26 @@
+Fix false positives in t3404 due to SHELL=/bin/false
+
+If the user's shell in NSS passwd is /bin/false (eg as found during Gentoo's
+package building), the git-rebase exec tests will fail, because they call
+$SHELL around the command, and in the existing testcase, $SHELL was not being
+cleared sufficently.
+
+This lead to false positive failures of t3404 on systems where the package
+build user was locked down as noted above.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar git-1.7.3.4.orig/t/t3404-rebase-interactive.sh git-1.7.3.4/t/t3404-rebase-interactive.sh
+--- git-1.7.3.4.orig/t/t3404-rebase-interactive.sh	2010-12-16 02:52:11.000000000 +0000
++++ git-1.7.3.4/t/t3404-rebase-interactive.sh	2010-12-26 22:30:47.826421313 +0000
+@@ -67,8 +67,8 @@
+ # "exec" commands are ran with the user shell by default, but this may
+ # be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work
+ # to create a file. Unseting SHELL avoids such non-portable behavior
+-# in tests.
+-SHELL=
++# in tests. It must be exported for it to take effect where needed.
++export SHELL=
+ 
+ test_expect_success 'rebase -i with the exec command' '
+ 	git checkout master &&
diff --git a/dev-vcs/git/git-1.7.3.2-r1.ebuild b/dev-vcs/git/git-1.7.3.2-r1.ebuild
index a1b16e695735..d12560a5729e 100644
--- a/dev-vcs/git/git-1.7.3.2-r1.ebuild
+++ b/dev-vcs/git/git-1.7.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.2-r1.ebuild,v 1.4 2010/11/11 03:26:16 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.2-r1.ebuild,v 1.5 2010/12/26 22:40:40 robbat2 Exp $
 
 EAPI=3
 
@@ -195,6 +195,10 @@ src_prepare() {
 	# USE=-iconv causes segfaults, fixed post 1.7.1
 	# Gentoo bug #321895
 	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
+	
+	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
+	# user.
+	epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
 
 	sed -i \
 		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
diff --git a/dev-vcs/git/git-1.7.3.2.ebuild b/dev-vcs/git/git-1.7.3.2.ebuild
index 22628910728f..e92ba4a72577 100644
--- a/dev-vcs/git/git-1.7.3.2.ebuild
+++ b/dev-vcs/git/git-1.7.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.2.ebuild,v 1.4 2010/12/20 07:49:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.2.ebuild,v 1.5 2010/12/26 22:40:40 robbat2 Exp $
 
 EAPI=3
 
@@ -196,6 +196,10 @@ src_prepare() {
 	# USE=-iconv causes segfaults, fixed post 1.7.1
 	# Gentoo bug #321895
 	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
+	
+	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
+	# user.
+	epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
 
 	sed -i \
 		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
diff --git a/dev-vcs/git/git-1.7.3.3.ebuild b/dev-vcs/git/git-1.7.3.3.ebuild
index c585aaf166ff..c728eed6aea4 100644
--- a/dev-vcs/git/git-1.7.3.3.ebuild
+++ b/dev-vcs/git/git-1.7.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.3.ebuild,v 1.1 2010/12/07 07:29:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.3.ebuild,v 1.2 2010/12/26 22:40:40 robbat2 Exp $
 
 EAPI=3
 
@@ -195,6 +195,10 @@ src_prepare() {
 	# USE=-iconv causes segfaults, fixed post 1.7.1
 	# Gentoo bug #321895
 	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
+	
+	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
+	# user.
+	epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
 
 	sed -i \
 		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
diff --git a/dev-vcs/git/git-1.7.3.4-r1.ebuild b/dev-vcs/git/git-1.7.3.4-r1.ebuild
index 71549e00206d..2eb16b76be9d 100644
--- a/dev-vcs/git/git-1.7.3.4-r1.ebuild
+++ b/dev-vcs/git/git-1.7.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v 1.6 2010/12/25 22:42:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v 1.7 2010/12/26 22:40:40 robbat2 Exp $
 
 EAPI=3
 
@@ -195,6 +195,10 @@ src_prepare() {
 	# USE=-iconv causes segfaults, fixed post 1.7.1
 	# Gentoo bug #321895
 	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
+	
+	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
+	# user.
+	epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
 
 	sed -i \
 		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
@@ -434,14 +438,18 @@ src_test() {
 	for i in ${disabled} ; do
 		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
 	done
-	cd "${S}"
+
 	# Now run the tests
+	cd "${S}"
 	einfo "Start test run"
 	git_emake test
 	rc=$?
+
 	# Display nice results
 	cd "${S}/t"
 	git_emake aggregate-results
+
+	# And exit
 	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
 }
 
diff --git a/dev-vcs/git/git-1.7.3.4.ebuild b/dev-vcs/git/git-1.7.3.4.ebuild
index f09311b481fd..55aed21f39b0 100644
--- a/dev-vcs/git/git-1.7.3.4.ebuild
+++ b/dev-vcs/git/git-1.7.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4.ebuild,v 1.1 2010/12/17 18:13:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4.ebuild,v 1.2 2010/12/26 22:40:40 robbat2 Exp $
 
 EAPI=3
 
@@ -195,6 +195,10 @@ src_prepare() {
 	# USE=-iconv causes segfaults, fixed post 1.7.1
 	# Gentoo bug #321895
 	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
+	
+	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
+	# user.
+	epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
 
 	sed -i \
 		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \