Fix building with glibc-2.10+ wrt #275809, thanks to Alexis Ballier.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 117 insertions, 3 deletions

diff --git a/media-sound/peercast/ChangeLog b/media-sound/peercast/ChangeLog
index 12de9e54a099..4303a959d6ac 100644
--- a/media-sound/peercast/ChangeLog
+++ b/media-sound/peercast/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/peercast
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/peercast/ChangeLog,v 1.22 2009/06/10 19:36:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/peercast/ChangeLog,v 1.23 2009/07/27 07:49:43 ssuominen Exp $
+
+  27 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  peercast-0.1218-r2.ebuild, +files/peercast-0.1218-glibc-2.10.patch:
+  Fix building with glibc-2.10+ wrt #275809, thanks to Alexis Ballier.
 
   10 Jun 2009; Markus Meier <maekke@gentoo.org> peercast-0.1218-r2.ebuild:
   amd64/x86 stable, bug #272836
diff --git a/media-sound/peercast/files/peercast-0.1218-glibc-2.10.patch b/media-sound/peercast/files/peercast-0.1218-glibc-2.10.patch
new file mode 100644
index 000000000000..3f290578dd50
--- /dev/null
+++ b/media-sound/peercast/files/peercast-0.1218-glibc-2.10.patch
@@ -0,0 +1,109 @@
+Index: work/core/common/common.h
+===================================================================
+--- work.orig/core/common/common.h
++++ work/core/common/common.h
+@@ -274,7 +274,7 @@ inline int strToID(char *str)
+ }
+ 
+ // -----------------------------------
+-char *getCGIarg(const char *str, const char *arg);
++const char *getCGIarg(const char *str, const char *arg);
+ bool cmpCGIarg(char *str, char *arg, char *value);
+ bool hasCGIarg(char *str, char *arg);
+ 
+Index: work/core/common/html.cpp
+===================================================================
+--- work.orig/core/common/html.cpp
++++ work/core/common/html.cpp
+@@ -103,7 +103,7 @@ void HTML::writeVariable(Stream &s,const
+ 			r = true;

+ 		}else if (varName.startsWith("loop.hit."))

+ 		{

+-			char *idstr = getCGIarg(tmplArgs,"id=");

++			const char *idstr = getCGIarg(tmplArgs,"id=");

+ 			if (idstr)

+ 			{

+ 				GnuID id;

+@@ -136,7 +136,7 @@ void HTML::writeVariable(Stream &s,const
+ 	{

+ 		if (varName.startsWith("page.channel."))

+ 		{

+-			char *idstr = getCGIarg(tmplArgs,"id=");

++			const char *idstr = getCGIarg(tmplArgs,"id=");

+ 			if (idstr)

+ 			{

+ 				GnuID id;

+@@ -150,7 +150,7 @@ void HTML::writeVariable(Stream &s,const
+ 

+ 			String v = varName+5;

+ 			v.append('=');

+-			char *a = getCGIarg(tmplArgs,v);

++			const char *a = getCGIarg(tmplArgs,v);

+ 			if (a)

+ 			{

+ 				s.writeString(a);		

+Index: work/core/common/sys.cpp
+===================================================================
+--- work.orig/core/common/sys.cpp
++++ work/core/common/sys.cpp
+@@ -740,12 +740,12 @@ void LogBuffer::write(const char *str, T
+ }
+ 
+ // -----------------------------------
+-char *getCGIarg(const char *str, const char *arg)
++const char *getCGIarg(const char *str, const char *arg)
+ {
+ 	if (!str)
+ 		return NULL;
+ 
+-	char *s = strstr(str,arg);
++	const char *s = strstr(str,arg);
+ 
+ 	if (!s)
+ 		return NULL;
+Index: work/core/common/servhs.cpp
+===================================================================
+--- work.orig/core/common/servhs.cpp
++++ work/core/common/servhs.cpp
+@@ -150,10 +150,10 @@ void Servent::handshakeHTTP(HTTP &http, 
+ 			if (!isAllowed(ALLOW_BROADCAST))
+ 				throw HTTPException(HTTP_SC_UNAVAILABLE,503);

+ 
+-			char *pwdArg = getCGIarg(fn,"pass=");
+-			char *songArg = getCGIarg(fn,"song=");
+-			char *mountArg = getCGIarg(fn,"mount=");
+-			char *urlArg = getCGIarg(fn,"url=");
++			const char *pwdArg = getCGIarg(fn,"pass=");
++			const char *songArg = getCGIarg(fn,"song=");
++			const char *mountArg = getCGIarg(fn,"mount=");
++			const char *urlArg = getCGIarg(fn,"url=");
+ 
+ 			if (pwdArg && songArg)
+ 			{
+@@ -560,7 +560,7 @@ bool Servent::handshakeAuth(HTTP &http,c
+ 	char user[64],pass[64];

+ 	user[0] = pass[0] = 0;

+ 

+-	char *pwd  = getCGIarg(args, "pass=");

++	const char *pwd  = getCGIarg(args, "pass=");

+ 

+ 	if ((pwd) && strlen(servMgr->password))

+ 	{

+@@ -671,7 +671,7 @@ void Servent::handshakeCMD(char *cmd)
+ 	{
+ 		if (cmpCGIarg(cmd,"cmd=","redirect"))
+ 		{
+-			char *j = getCGIarg(cmd,"url=");
++			const char *j = getCGIarg(cmd,"url=");
+ 			if (j)
+ 			{
+ 				termArgs(cmd);
+@@ -1079,7 +1079,7 @@ void Servent::handshakeCMD(char *cmd)
+ 					index++;
+ 				}
+ 
+-				char *findArg = getCGIarg(cmd,"keywords=");
++				const char *findArg = getCGIarg(cmd,"keywords=");
+ 
+ 				if (hasCGIarg(cmd,"relay"))
+ 				{
diff --git a/media-sound/peercast/peercast-0.1218-r2.ebuild b/media-sound/peercast/peercast-0.1218-r2.ebuild
index d0468760a06c..e0202789b7cc 100644
--- a/media-sound/peercast/peercast-0.1218-r2.ebuild
+++ b/media-sound/peercast/peercast-0.1218-r2.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/media-sound/peercast/peercast-0.1218-r2.ebuild,v 1.2 2009/06/10 19:36:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/peercast/peercast-0.1218-r2.ebuild,v 1.3 2009/07/27 07:49:43 ssuominen Exp $
 
 EAPI=2
 inherit eutils flag-o-matic toolchain-funcs
@@ -22,7 +22,8 @@ S=${WORKDIR}
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-CVE-2008-2040.patch \
 		"${FILESDIR}"/${PN}-0.1216-makefile.patch \
-		"${FILESDIR}"/${PN}-0.1216-amd64.patch
+		"${FILESDIR}"/${PN}-0.1216-amd64.patch \
+		"${FILESDIR}"/${P}-glibc-2.10.patch
 }
 
 src_compile() {