Fix building with GLIBC 2.10+ wrt #277174.

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 29 insertions, 7 deletions

diff --git a/app-shells/localshell/ChangeLog b/app-shells/localshell/ChangeLog
index ffd32fa18286..88e0e2f26ff6 100644
--- a/app-shells/localshell/ChangeLog
+++ b/app-shells/localshell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/localshell
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/localshell/ChangeLog,v 1.10 2009/01/09 02:33:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/localshell/ChangeLog,v 1.11 2009/08/09 15:14:51 ssuominen Exp $
+
+  09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  localshell-1.3.1.ebuild, +files/localshell-1.3.1-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #277174.
 
   09 Jan 2009; Robin H. Johnson <robbat2@gentoo.org> localshell-1.1.ebuild,
   localshell-1.2.ebuild:
diff --git a/app-shells/localshell/Manifest b/app-shells/localshell/Manifest
index ee4f647010e6..e0cab09068f3 100644
--- a/app-shells/localshell/Manifest
+++ b/app-shells/localshell/Manifest
@@ -1,9 +1,10 @@
 AUX localshell-1.2+gcc-4.3.patch 1616 RMD160 a6b598ffac4f405e525c29c9c0c6b7c8b80e91cc SHA1 9066ec6957f5455219c55b53409820eed1029b30 SHA256 0183919e226abf5ba12a467826c6ec84514bd306a30f556f43470427064f28c4
+AUX localshell-1.3.1-glibc-2.10.patch 549 RMD160 531020be534569e77f86cbf59ec6b0fb103591a0 SHA1 bd8fd97d757349a2d223d42e602c8ffd48bb80a0 SHA256 ee0b4434e37cdf644e4d22130cb53403f400ed4bdb14f576a4aec3487aa17c54
 DIST localshell-1.1.tar.bz2 96494 RMD160 3c8322c5d2aa6c98452187134e983c9e9761a6fc SHA1 7b1decc6bb86a74bdc6fbb7d1a620cb9c704d63b SHA256 9b81327a0831ac3be94c23f2b4be4a38674ace69f202f8f093c34a2b589b7fc3
 DIST localshell-1.2.tar.bz2 96626 RMD160 2a11a462ccfa88858730fcf9ca855dc3c7cbecb8 SHA1 74adb13f2b9a04583a064e5840a5045d48682d0f SHA256 0be22511c4ec6934b30e99cbc5ce9dff27f4e09c527b6046f0569d870c38e746
 DIST localshell-1.3.1.tar.bz2 104746 RMD160 f775adf9968e76ec8528ab5479ef16163246f687 SHA1 c0552325123a905b74da5bc984e888968822f4f7 SHA256 185e21e5a53c8db69b1810fd9c5dea2e1e790bb31f61273360a36467a5e61624
 EBUILD localshell-1.1.ebuild 875 RMD160 a6e34b1940f6c48fedbf924c19008c009cb3b8e9 SHA1 ea83d49d2c83b1a21a4a150698194ced81281ad1 SHA256 e122c067c2ff15daaab27fa5f266c3f3ac21f65c0d1e2b9ebd33ac8055e2d56a
 EBUILD localshell-1.2.ebuild 939 RMD160 61d2a45dec2ded3c400d024ef0e7d33fd0fd86fe SHA1 613aa2078457aef66f64d27329f684c5eeb9d025 SHA256 cae9e778b165d0b4e59fbfd8b14eed1879eae1c69f62bfda94f9cdc956330d62
-EBUILD localshell-1.3.1.ebuild 950 RMD160 998a44b017eadbb9fde975e4a13701d35c0389cb SHA1 5dbc7bfefa44021edd02914fc5ed5d7bb2c4b2cc SHA256 9c4454eaa9f01b196834c0f4faec4277e09e2708290d03ae82cecccd53f66153
-MISC ChangeLog 1535 RMD160 9cc261735e37de0353a78c8d2ccfd5dc46f11578 SHA1 665830fed7ae3b893ae3971175e98faea36e1979 SHA256 5acf00c50b09a3b83e1f6bc72173ab27db0313c669a56c9f29c43f2519da8bcf
+EBUILD localshell-1.3.1.ebuild 1012 RMD160 90f21665cd4568a1adbd2045801a76b79b885d20 SHA1 dec1d10fa6992fa718eab2f5a5f9422bf3889378 SHA256 101e4934e1b5a4b49232f744ec61aa540b7f13f6765f8374f3b306517dce8dde
+MISC ChangeLog 1706 RMD160 99b8706209d060ffa6c1d86030355730b87596db SHA1 5bad34c366a339b196b157dd0d17794b5ef83b9d SHA256 d836aa5c0cd35a4d6829960e97da8b46ccb649fc4cf88e3eca8ce4f7bdb74a26
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
diff --git a/app-shells/localshell/files/localshell-1.3.1-glibc-2.10.patch b/app-shells/localshell/files/localshell-1.3.1-glibc-2.10.patch
new file mode 100644
index 000000000000..7bdd8f9a8d1f
--- /dev/null
+++ b/app-shells/localshell/files/localshell-1.3.1-glibc-2.10.patch
@@ -0,0 +1,12 @@
+diff -ur localshell-1.3.1.orig/src/config.cxx localshell-1.3.1/src/config.cxx
+--- localshell-1.3.1.orig/src/config.cxx	2009-01-09 03:40:11.000000000 +0200
++++ localshell-1.3.1/src/config.cxx	2009-08-09 18:15:17.000000000 +0300
+@@ -121,7 +121,7 @@
+ 	// PRIORITY,SHELL,ALLOWED
+ 	long priority = atol(argvalue);
+ 
+-	char* shell = strstr(argvalue,",");
++	char* shell = const_cast<char*> (strstr(argvalue,","));
+ 	if(NULL == shell || '\0' == shell[1] ) { 
+ 		fprintf(stderr,"%s: badly formatted entry (shell):%s\n",PACKAGE,argvalue); 
+ 		return EINVAL; 
diff --git a/app-shells/localshell/localshell-1.3.1.ebuild b/app-shells/localshell/localshell-1.3.1.ebuild
index 25d1edf21c87..29f3b4bb31e9 100644
--- a/app-shells/localshell/localshell-1.3.1.ebuild
+++ b/app-shells/localshell/localshell-1.3.1.ebuild
@@ -1,18 +1,23 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/localshell/localshell-1.3.1.ebuild,v 1.1 2009/01/09 02:14:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/localshell/localshell-1.3.1.ebuild,v 1.2 2009/08/09 15:14:51 ssuominen Exp $
 
-inherit base
+inherit base eutils
 
 DESCRIPTION="Localshell allows per-user/group local control of shell execution."
 HOMEPAGE="http://oss.orbis-terrarum.net/localshell/"
 SRC_URI="${HOMEPAGE}/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-DEPEND="virtual/libc"
-#RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+}
 
 src_compile() {
 	# this is a shell, it needs to be in /bin