summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-09 15:28:56 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-09 15:28:56 +0000
commit00fd00cc2f109f601332c7ade9c23dc4f557fbe7 (patch)
tree3890642b79a826b7a109d1160682b3d7646d22c3 /net-p2p/mutella
parentFix building with GLIBC 2.10+ wrt #276719. (diff)
downloadgentoo-2-00fd00cc2f109f601332c7ade9c23dc4f557fbe7.tar.gz
gentoo-2-00fd00cc2f109f601332c7ade9c23dc4f557fbe7.tar.bz2
gentoo-2-00fd00cc2f109f601332c7ade9c23dc4f557fbe7.zip
Fix building with GLIBC 2.10+ wrt #273856, thanks to Arttu Valo for patch.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'net-p2p/mutella')
-rw-r--r--net-p2p/mutella/ChangeLog8
-rw-r--r--net-p2p/mutella/files/mutella-0.4.5-glibc-2.10.patch26
-rw-r--r--net-p2p/mutella/mutella-0.4.5.ebuild8
3 files changed, 36 insertions, 6 deletions
diff --git a/net-p2p/mutella/ChangeLog b/net-p2p/mutella/ChangeLog
index cae0e352a54d..4ef239e812e2 100644
--- a/net-p2p/mutella/ChangeLog
+++ b/net-p2p/mutella/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-p2p/mutella
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mutella/ChangeLog,v 1.25 2009/02/24 02:21:11 dirtyepic Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mutella/ChangeLog,v 1.26 2009/08/09 15:28:56 ssuominen Exp $
+
+ 09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> mutella-0.4.5.ebuild,
+ +files/mutella-0.4.5-glibc-2.10.patch:
+ Fix building with GLIBC 2.10+ wrt #273856, thanks to Arttu Valo for patch.
24 Feb 2009; Ryan Hill <dirtyepic@gentoo.org>
+files/mutella-0.4.5-gcc43.patch, mutella-0.4.5.ebuild:
diff --git a/net-p2p/mutella/files/mutella-0.4.5-glibc-2.10.patch b/net-p2p/mutella/files/mutella-0.4.5-glibc-2.10.patch
new file mode 100644
index 000000000000..0ef88b6470e2
--- /dev/null
+++ b/net-p2p/mutella/files/mutella-0.4.5-glibc-2.10.patch
@@ -0,0 +1,26 @@
+diff -ur mutella-0.4.5.old/mutella/uiremote.cpp mutella-0.4.5/mutella/uiremote.cpp
+--- mutella-0.4.5.old/mutella/uiremote.cpp 2009-07-09 04:38:28.583840188 +0300
++++ mutella-0.4.5/mutella/uiremote.cpp 2009-07-09 04:40:48.955839846 +0300
+@@ -575,11 +575,11 @@
+ {
+ // login -- HTTP-Basic so far
+ bool bLoginOK = false;
+- char * pszAuth = NULL;
++ const char * pszAuth = NULL;
+ if ( (pszAuth = strstr(szHandshake, "Authorization:")) )
+ {
+ // extract authorization line
+- char * pRN = strstr(pszAuth, "\r\n");
++ const char * pRN = strstr(pszAuth, "\r\n");
+ CString sAuthLine(pszAuth + strlen("Authorization:"), pRN-pszAuth-strlen("Authorization:"));
+ int nPos = sAuthLine.find("Basic");
+ if (nPos>=0)
+@@ -616,7 +616,7 @@
+ const char* pszCookie;
+ if( (pszCookie = strstr(szHandshake, "Cookie:")) )
+ {
+- char * pRN = strstr(pszCookie, "\r\n");
++ const char * pRN = strstr(pszCookie, "\r\n");
+ CString sCookieLine(pszCookie + strlen("Cookie:"), pRN-pszCookie-strlen("Cookie:"));
+ // we will split the line by "; " combination
+ list<CString> Cookies;
diff --git a/net-p2p/mutella/mutella-0.4.5.ebuild b/net-p2p/mutella/mutella-0.4.5.ebuild
index 1a2dc9bd6f7d..706c25607809 100644
--- a/net-p2p/mutella/mutella-0.4.5.ebuild
+++ b/net-p2p/mutella/mutella-0.4.5.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/net-p2p/mutella/mutella-0.4.5.ebuild,v 1.8 2009/02/24 02:21:11 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mutella/mutella-0.4.5.ebuild,v 1.9 2009/08/09 15:28:56 ssuominen Exp $
inherit eutils
@@ -16,9 +16,9 @@ DEPEND="sys-libs/readline"
src_unpack() {
unpack ${A}
cd "${S}"
-
- epatch "${FILESDIR}/${P}-gcc41.patch"
+ epatch "${FILESDIR}"/${P}-gcc41.patch
epatch "${FILESDIR}"/${P}-gcc43.patch
+ epatch "${FILESDIR}"/${P}-glibc-2.10.patch
}
src_compile() {
@@ -29,5 +29,5 @@ src_compile() {
src_install() {
emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog COPYING INSTALL LICENSE KNOWN-BUGS README TODO
+ dodoc AUTHORS ChangeLog KNOWN-BUGS README TODO
}