Add upstream patch for buggy chsh behavior, bug 271521

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 44 insertions, 4 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 5806563cb89e..c715879a02dd 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.181 2009/06/03 22:23:07 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.182 2009/06/13 02:48:48 darkside Exp $
+
+*bash-completion-1.0-r5 (13 Jun 2009)
+
+  13 Jun 2009; Jeremy Olexa <darkside@gentoo.org>
+  +files/bash-completion-1.0-shadow-compat.patch,
+  -bash-completion-1.0-r4.ebuild, +bash-completion-1.0-r5.ebuild:
+  Add upstream patch for buggy chsh behavior, bug 271521
 
 *bash-completion-1.0-r4 (03 Jun 2009)
 
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 649a69fc5f56..caab06d9979d 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,9 +1,10 @@
 AUX bash-completion 724 RMD160 dc15f6b02f08a2fa656fa2d0c9ed15d20a7b9dc8 SHA1 d71224475d73b134085bf5f70fb1eb311397cae2 SHA256 6898275f2b0ab67af4b35c8a239d04a233e0c252acb5ed76692fd65881d3be0e
 AUX bash-completion-1.0-bash4.patch 861 RMD160 865e8f745b8cc53125db6903b1954523f99a277e SHA1 503b825408f4a366d1d4795e3ae4f6e51cf500d5 SHA256 e0ecf183746f6b8075ecc7891e265a10b4a3593f6690f66c320fc18b023ac1ca
 AUX bash-completion-1.0-gentoo.patch 2125 RMD160 33682926cca6bcccc971a8c3dde91180cdf858e1 SHA1 e9a5da746221148dcd7661a6a996a9c4ba7ef149 SHA256 8a7bcd782b8980c8f370ca022872b7f894596f8289dbbd800327659b95a9a85a
+AUX bash-completion-1.0-shadow-compat.patch 879 RMD160 77921832e335109df5aa48475eefe6819a6bc108 SHA1 3139a6431bc9506cc4c4f2b80b516c0d365832f9 SHA256 5e877f2ad0c33c3e1bc7766d5389e18515518ac9ff6ffff4855bf7de59cf9297
 AUX bash-completion.sh 1683 RMD160 f5d723122d1a0431af0a19838330e30f6f7e324f SHA1 1d7136206699886bc98d3b2dccfbdb3eff524ceb SHA256 3f742e1296597241b5d01565bc3220db9b1340dcb3d7bca3f0b107b2122791d7
 DIST bash-completion-1.0.tar.gz 143578 RMD160 b590c2633c5c10c3e98b14a74f4e96c910b6177d SHA1 61040795731f5ff509c46e818a1edf0a7a93e11d SHA256 bd96e7d2858f02783046908a984993736f1189d07d82e9ce4b465068dd7187ef
 EBUILD bash-completion-1.0-r3.ebuild 3113 RMD160 0c5fc02f458ecc4a9664f12a97b4551e3b47be7b SHA1 f893cde43dd05006919530899c2b4e1198c3e090 SHA256 c820d181e81f791a933aa2c25e65ecff45d7c97984c64b1015487e91892834ea
-EBUILD bash-completion-1.0-r4.ebuild 3221 RMD160 460d086dbb5cc8c39f5c8db9c3af6acafe5203b9 SHA1 b0e422b302c2c976897c11f95ec38e380c61a0fb SHA256 320003901191021dc85121dbcb238a39f3d263c35fa9e1ad11fcbfeea236a63b
-MISC ChangeLog 32552 RMD160 92781b12440436b3b2ba8e051bf30f7cc0f5b6cf SHA1 5b5f62abd88dcef266e58969cb5d9c2984f96382 SHA256 f1ea144d96f048fce991ca752e17fcc75a07f7b4a52c5fe9fdba82caaf8af9d6
+EBUILD bash-completion-1.0-r5.ebuild 3298 RMD160 aa9403cacb6281c983042b7698e7817287b7b3fa SHA1 ea99c3cb07fc4e05033aac6808c9528ece09891a SHA256 68a6e7ef7f70f94afa7cf4dc7783e658e63f5239ff82af09d63a1bffbf223bbc
+MISC ChangeLog 32815 RMD160 9479244bb210f0f78ec6a5626c21f675883e0008 SHA1 4901e9c56504368ef074c52ab351bdb5a68ac89d SHA256 c6009e34c5670ca82440242242c5fbb8ef9e2fe6f31419056f5a2382227301d2
 MISC metadata.xml 930 RMD160 e6718602012b2cfcb5be5bfc962889bf88f4dc73 SHA1 a585c9cfc0bdb59ee4c7ff1e786bc53d28d36aac SHA256 281bfd91145b2ae2a5c2774802dee741bbe625777b1c4e3eaefdca406e534ba9
diff --git a/app-shells/bash-completion/bash-completion-1.0-r4.ebuild b/app-shells/bash-completion/bash-completion-1.0-r5.ebuild
index e54491647d6b..0e1eeed155d0 100644
--- a/app-shells/bash-completion/bash-completion-1.0-r4.ebuild
+++ b/app-shells/bash-completion/bash-completion-1.0-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-1.0-r4.ebuild,v 1.1 2009/06/03 22:23:07 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-1.0-r5.ebuild,v 1.1 2009/06/13 02:48:48 darkside Exp $
 
 EAPI="2"
 
@@ -31,6 +31,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.0-bash4.patch"
 	# module-init-tools-3.8 changed locations
 	sed -i 's:/sbin/lsmod:/bin/lsmod:' bash_completion
+	# Fixed in next release
+	epatch "${FILESDIR}/${PN}-1.0-shadow-compat.patch"
 
 }
 
diff --git a/app-shells/bash-completion/files/bash-completion-1.0-shadow-compat.patch b/app-shells/bash-completion/files/bash-completion-1.0-shadow-compat.patch
new file mode 100644
index 000000000000..55a9781ebd30
--- /dev/null
+++ b/app-shells/bash-completion/files/bash-completion-1.0-shadow-compat.patch
@@ -0,0 +1,30 @@
+commit 86574164df810ecbd53ae841c15b38e5b06dc068
+Author: Ville Skyttä <ville.skytta@iki.fi>
+Date:   Tue Apr 14 00:46:12 2009 +0300
+
+    Always use /etc/shells for chsh -s completion, don't complete on
+    comment lines in it.
+    
+    Invoking chsh -l does unwanted things on some systems, such as FreeBSD.
+
+diff --git a/bash_completion b/bash_completion
+index e50da69..6f84e31 100644
+--- a/bash_completion
++++ b/bash_completion
+@@ -2569,13 +2569,10 @@ _chsh()
+ 	prev=${COMP_WORDS[COMP_CWORD-1]}
+ 
+ 	if [ "$prev" = "-s" ]; then
+-	  if [ -f /etc/debian_version ]; then
+-	    COMPREPLY=( $( </etc/shells ) )
+-	  else
+-	    COMPREPLY=( $( chsh -l | grep "^$cur" ) )
+-	  fi
++		COMPREPLY=( $( compgen -W '$( grep "^[[:space:]]*/" \
++				/etc/shells 2>/dev/null )' -- $cur ) )
+ 	else
+-	  COMPREPLY=( $( compgen -u -- $cur ) )
++		COMPREPLY=( $( compgen -u -- $cur ) )
+ 	fi
+ 
+ 	return 0