Fix building with GLIBC 2.10+ wrt #274217.

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

4 files changed, 46 insertions, 5 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/Manifest b/net-im/jabberd/Manifest
index 387d7017a71a..f541ef719aba 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -6,6 +6,7 @@ AUX jabberd-1.4.4-str.c-rev1103.patch 302 RMD160 34d5de8b755b5029f91c02030308e90
 AUX jabberd-1.4.4-xdb_file.c-rev1107.patch 539 RMD160 dbfca4d0801291f1b1c10e12ac4040d06a38006f SHA1 593fd01f2e0003aedf6714fc9e384da68e04b511 SHA256 6f532e7f792431072226fea8c032fa3463080b355325a7281317a2764ea6e245
 AUX jabberd-1.4.4-xdb_sql.c-rev1211.patch 882 RMD160 48c9f7ad6f4c10c26c9aa89730434a3632de3f75 SHA1 8519d7920e75c3273efe766f3336c588808e0778 SHA256 5dda2f6b8c86b0b02d569f3436d2d0b23d352926649469b2f4041a94535a6c10
 AUX jabberd-1.4.4.init 554 RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e SHA1 630cd9c50c20a73992b9891051e02350f6abcba9 SHA256 769e4ee4e193a1d63fe4839f923fb2a6339489a677595ba75986e19cb1ba39ac
+AUX jabberd-1.6.1.1-glibc-2.10.patch 1516 RMD160 60c187eee722527eaabf122fe34ba4ee6ffc3b34 SHA1 a2ffdcdb343d5d2d4510836907690e0a3c4b7845 SHA256 aa61e2d9d795875e4f44c2a2c9cbaf5076be5750c90dbd63e3d5d7263d54bc0f
 AUX jabberd-1.6.1.1-gnutls2.2.patch 1698 RMD160 6b3a6a93b85baf477cd0502ec9aeb7cd96f19d23 SHA1 58512abfdb53c16dc598b3ca505da1573f8f3a35 SHA256 c678a2d0fe729ec3a7c6373fc6993b4fbc170c8516f375e3ed260492202535e3
 AUX jabberd-1.6.1.1-libtool2.2.patch 311 RMD160 be0d831c8c2990f29e88abe5cc1da9567edb2bac SHA1 0c8e9a7fa6616d50123539ac146a557e89091a32 SHA256 7199217ba9b28bab8186a5728bac55806ad199b5b1d41f3f3a97d87a4b00650b
 AUX jabberd-1.6.1.1-parallel-make.patch 483 RMD160 eeda213fec4e3861390d69e59dbb54c3cb4db3d7 SHA1 4dc316c5f36b5dc4f0d3eb09dce47038679db419 SHA256 37adc27da7cbce3c77eeb672a64697d3fd6bc51ababdc9269e20fa6e5d1a5f7c
@@ -15,6 +16,6 @@ AUX jabberd-1.6.1.1.init 556 RMD160 4ff905ca3bf4b13c3c1f057fe81ff86c49e994e3 SHA
 DIST jabberd-1.4.4.tar.gz 613479 RMD160 3273d0711fb6f0f6b95749d8bdb1ac5004aed074 SHA1 5fa5b561740720591997ed189609403af8c796c2 SHA256 72e23766e737588ed8d77ca7565a8f4b2bba73967c02e9b7ee4d2122d198a0af
 DIST jabberd14-1.6.1.1.tar.gz 834112 RMD160 0d3df653b6362f8e580c59ae1b4c9c6467b0bee5 SHA1 8b7ba77c9e02e9de7125e898900ff0ba5d65986e SHA256 8bba7f8e8781a088679bdcf0e46348a29da45de3eec2421f73575c5a6b8ddc31
 EBUILD jabberd-1.4.4-r3.ebuild 3075 RMD160 54e0ac3b3e94dd3557a8769168a7a2ad04d9ba12 SHA1 caabc1f97041e8021b3b53a0c1188398b2054499 SHA256 f6865b81c509c93516452378f9e5caf7584a53b2f98a6cbc9beb9e4d79d79c49
-EBUILD jabberd-1.6.1.1-r1.ebuild 3326 RMD160 152b9279ac399cb5c0bfa0e89ee3e2bfc0d2854a SHA1 5b156bbe65a78560cbeba0a1e2d982eb19c1cc9e SHA256 160772dbc2a2900fe58d6a7056fe2cc6091d9f43df5fecfef2502638edac970f
-MISC ChangeLog 19629 RMD160 3de19078a37ecc7f80451e614d6bc8f3b7772754 SHA1 b3d8c14d5e0a8c031b79794b3ee6a3fbfe9131dd SHA256 57f4b98c45b711027f66b66f96271f7ab0598a663a8b6600874b48757f29cec1
+EBUILD jabberd-1.6.1.1-r1.ebuild 3372 RMD160 ca29c0714d43bb949e685728bff4864cdd06e859 SHA1 1445a2a6f2859800bcf6cd8af1521e930302ba43 SHA256 e75117ab90f49525f40eee1b92927fa06179e3e11db8ed9664eb2d962799ce1d
+MISC ChangeLog 19801 RMD160 4f2435812ea5c7b6bd6df587883a462815924984 SHA1 ef81e698fcd788290c8226b2d66ed68439b99961 SHA256 76d17096d51c7f6992fddd6398aa1fd7f17a08c12c9e1f50cdb4cf4f3f9e720d
 MISC metadata.xml 260 RMD160 56e68db9f1752a236762ef10c07b151a463e98fc SHA1 b36ec032a24e4a24a3b5d2ffbb03a47ada32cb6e SHA256 94d461f51fb03779ecc6f60c8bbdc7b9f53eff6a45f8c2278a5bd1bdf412ff40
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"