diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-08-09 17:46:41 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-09 17:46:41 +0000 |
| commit | b956d7e9cd17eca568d79b14cde60c83a383b37c (patch) | |
| tree | cffb8ee46ad90e821284c632bcc1708eabf781c5 /net-im/jabberd | |
| parent | Masking dev-util/sgb for QA removal. (diff) | |
| download | gentoo-2-b956d7e9cd17eca568d79b14cde60c83a383b37c.tar.gz gentoo-2-b956d7e9cd17eca568d79b14cde60c83a383b37c.tar.bz2 gentoo-2-b956d7e9cd17eca568d79b14cde60c83a383b37c.zip | |
Fix building with GLIBC 2.10+ wrt #274217.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'net-im/jabberd')
| -rw-r--r-- | net-im/jabberd/ChangeLog | 8 | ||||
| -rw-r--r-- | net-im/jabberd/files/jabberd-1.6.1.1-glibc-2.10.patch | 35 | ||||
| -rw-r--r-- | net-im/jabberd/jabberd-1.6.1.1-r1.ebuild | 3 |
3 files changed, 43 insertions, 3 deletions
diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog index f05561932967..3b5ba9287f0b 100644 --- a/net-im/jabberd/ChangeLog +++ b/net-im/jabberd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/jabberd -# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.121 2009/02/18 17:09:56 armin76 Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.122 2009/08/09 17:46:40 ssuominen Exp $ + + 09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> + jabberd-1.6.1.1-r1.ebuild, +files/jabberd-1.6.1.1-glibc-2.10.patch: + Fix building with GLIBC 2.10+ wrt #274217. 18 Feb 2009; Raúl Porcel <armin76@gentoo.org> jabberd-1.6.1.1-r1.ebuild: sparc stable wrt #234168 diff --git a/net-im/jabberd/files/jabberd-1.6.1.1-glibc-2.10.patch b/net-im/jabberd/files/jabberd-1.6.1.1-glibc-2.10.patch new file mode 100644 index 000000000000..7d37cf294ed2 --- /dev/null +++ b/net-im/jabberd/files/jabberd-1.6.1.1-glibc-2.10.patch @@ -0,0 +1,35 @@ +diff -ur jabberd14-1.6.1.1.orig/jabberd/lib/xmlnode.cc jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc +--- jabberd14-1.6.1.1.orig/jabberd/lib/xmlnode.cc 2007-04-07 22:43:18.000000000 +0300 ++++ jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc 2009-08-09 20:42:19.000000000 +0300 +@@ -910,8 +910,8 @@ + } + + /* separate this step from the next one, and check for a predicate in this step */ +- start_predicate = strchr(path, '['); +- next_step = strchr(path, '/'); ++ start_predicate = const_cast<char*> (strchr(path, '[')); ++ next_step = const_cast<char*> (strchr(path, '/')); + if (start_predicate == NULL && next_step == NULL) { + this_step = pstrdup(p, path); + } else if (start_predicate == NULL || start_predicate > next_step && next_step != NULL) { +@@ -1833,7 +1833,7 @@ + if (lang != NULL && strchr(lang, '-') != NULL) { + snprintf(general_lang, sizeof(general_lang), "%s", lang); + if (strchr(lang, '-') != NULL) { +- strchr(lang, '-')[0] = 0; ++ const_cast<char*> (strchr(lang, '-'))[0] = 0; + } else { + general_lang[0] = 0; + } +diff -ur jabberd14-1.6.1.1.orig/jabberd/log.cc jabberd14-1.6.1.1/jabberd/log.cc +--- jabberd14-1.6.1.1.orig/jabberd/log.cc 2007-07-20 16:56:59.000000000 +0300 ++++ jabberd14-1.6.1.1/jabberd/log.cc 2009-08-09 20:47:12.000000000 +0300 +@@ -86,7 +86,7 @@ + char *pos, c = '\0'; + if(zone != NULL && debug__zones != NULL) + { +- pos = strchr(zone,'.'); ++ pos = const_cast<char*> (strchr(zone,'.')); + if(pos != NULL) + { + c = *pos; diff --git a/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild b/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild index cbe4a2577668..ea0a23e85e53 100644 --- a/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild +++ b/net-im/jabberd/jabberd-1.6.1.1-r1.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-im/jabberd/jabberd-1.6.1.1-r1.ebuild,v 1.14 2009/02/18 17:09:56 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild,v 1.15 2009/08/09 17:46:41 ssuominen Exp $ WANT_AUTOMAKE="1.9" inherit autotools eutils @@ -39,6 +39,7 @@ pkg_setup() { src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}"/${P}-glibc-2.10.patch #Shamelessly stolen from Freebsd epatch "${FILESDIR}/${P}-gnutls2.2.patch" |