From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MKqDF-0002S6-GR for garchives@archives.gentoo.org; Sun, 28 Jun 2009 08:58:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75BC9E03BA; Sun, 28 Jun 2009 08:58:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5669EE03BA for ; Sun, 28 Jun 2009 08:58:12 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 008DE66356 for ; Sun, 28 Jun 2009 08:58:12 +0000 (UTC) Received: from patrick by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MKqDD-0002Zu-L4 for gentoo-commits@lists.gentoo.org; Sun, 28 Jun 2009 08:58:11 +0000 From: "Patrick Lauer (patrick)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, patrick@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-libs/wvstreams/files: wvstreams-4.5-glibc.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: wvstreams-4.5-glibc.patch X-VCS-Directories: net-libs/wvstreams/files X-VCS-Committer: patrick X-VCS-Committer-Name: Patrick Lauer Content-Type: text/plain; charset=utf8 Message-Id: Sender: Patrick Lauer Date: Sun, 28 Jun 2009 08:58:11 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 03f7b760-5a50-4d08-a932-b7f8bc615a22 X-Archives-Hash: d54b1bdb28499c507280a636a9aa0619 patrick 09/06/28 08:58:11 Added: wvstreams-4.5-glibc.patch Log: Adding glibc 2.10 compile fix. Closes #273999 (Portage version: 2.2_rc33/cvs/Linux x86_64) Revision Changes Path 1.1 net-libs/wvstreams/files/wvstreams-4.5-glibc.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams= /files/wvstreams-4.5-glibc.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams= /files/wvstreams-4.5-glibc.patch?rev=3D1.1&content-type=3Dtext/plain Index: wvstreams-4.5-glibc.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff -Nurp wvstreams-4.5.orig/ipstreams/wvaddr.cc wvstreams-4.5/ipstreams= /wvaddr.cc --- wvstreams-4.5.orig/ipstreams/wvaddr.cc 2008-07-14 21:11:35.000000000 = +0200 +++ wvstreams-4.5/ipstreams/wvaddr.cc 2009-06-19 16:39:37.757382441 +0200 @@ -538,7 +538,7 @@ WvIPNet::WvIPNet(const WvIPNet &_net) // If the netmask is not specified, it will default to all 1's. void WvIPNet::string_init(const char string[]) { - char *maskptr; + const char *maskptr; int bits; uint32_t imask; =20 diff -Nurp wvstreams-4.5.orig/utils/strutils.cc wvstreams-4.5/utils/strut= ils.cc --- wvstreams-4.5.orig/utils/strutils.cc 2008-10-21 21:39:21.000000000 +0= 200 +++ wvstreams-4.5/utils/strutils.cc 2009-06-19 16:36:48.959741828 +0200 @@ -315,7 +315,7 @@ WvString url_decode(WvStringParm str, bo =20 const char *iptr; char *optr; - char *idx1, *idx2; + const char *idx1, *idx2; static const char hex[] =3D "0123456789ABCDEF"; WvString in, intmp(str), out; =20 @@ -967,7 +967,7 @@ WvString afterstr(WvStringParm line, WvS if (!line || !a) return WvString::null; =20 - char *loc =3D strstr(line, a); + const char *loc =3D strstr(line, a); if (loc =3D=3D 0) return ""; =20 @@ -984,8 +984,8 @@ WvString beforestr(WvStringParm line, Wv return WvString::null; =20 WvString ret =3D line; - ret.unique(); =20 - char *loc =3D strstr(ret, a); + ret.unique(); + char *loc =3D strstr(ret.edit(), a); =20 if (loc =3D=3D 0) return line; diff -Nurp wvstreams-4.5.orig/utils/verstring.cc wvstreams-4.5/utils/vers= tring.cc --- wvstreams-4.5.orig/utils/verstring.cc 2008-07-14 21:11:35.000000000 += 0200 +++ wvstreams-4.5/utils/verstring.cc 2009-06-19 16:37:02.021698602 +0200 @@ -147,7 +147,7 @@ bool is_new_ver(unsigned int ver) =20 bool is_new_verstr(const char *str) { - char *p =3D strchr(str, '.'); + const char *p =3D strchr(str, '.'); if (p && strchr(p+1, '.')) return true; =20