Add various fixes from upstream.

Package-Manager: portage-2.1.2_pre1-r4

8 files changed, 125 insertions, 14 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index fa1a15ec47d8..6907f42ba7dc 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.74 2006/09/28 10:01:29 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.75 2006/09/28 11:05:10 nelchael Exp $
+
+  28 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/jabberd-1.4.4-genhash.c-rev1253.patch,
+  +files/jabberd-1.4.4-mio-bug-rev1291.patch,
+  +files/jabberd-1.4.4-str.c-rev1103.patch,
+  +files/jabberd-1.4.4-xdb_file.c-rev1107.patch,
+  +files/jabberd-1.4.4-xdb_sql.c-rev1211.patch, jabberd-1.4.4-r3.ebuild:
+  Add various fixes from upstream.
 
   28 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   jabberd-1.4.4-r3.ebuild:
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index db7224386725..a78482f1dbc3 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -33,10 +33,30 @@ AUX jabber.rc6-r8 800 RMD160 99fe1b8af7a4293af04b08c4b32b77173a46c7f1 SHA1 fe427
 MD5 078528dc08a082b7a0534d4f6c5c5f5e files/jabber.rc6-r8 800
 RMD160 99fe1b8af7a4293af04b08c4b32b77173a46c7f1 files/jabber.rc6-r8 800
 SHA256 1ee99a10af00a518cfd74fa0279fcb7937d00f4d24633b67ea6974a19e2a505a files/jabber.rc6-r8 800
+AUX jabberd-1.4.4-genhash.c-rev1253.patch 392 RMD160 e78d8a7edaaf65e2057c39ab5a564c926ea4b5d1 SHA1 abc212773b9d469c308bf57c6558f331c73f574d SHA256 f6c49a1e5a788c300c87912553b9d2ba4295c395c58b81bfac0bdce6d10a78ea
+MD5 da03862bd6e85156860dda87ed726b1c files/jabberd-1.4.4-genhash.c-rev1253.patch 392
+RMD160 e78d8a7edaaf65e2057c39ab5a564c926ea4b5d1 files/jabberd-1.4.4-genhash.c-rev1253.patch 392
+SHA256 f6c49a1e5a788c300c87912553b9d2ba4295c395c58b81bfac0bdce6d10a78ea files/jabberd-1.4.4-genhash.c-rev1253.patch 392
+AUX jabberd-1.4.4-mio-bug-rev1291.patch 499 RMD160 7d50054ca0c3304d47b530a604c68d2e2b5d4c5f SHA1 6ae07090112cb9f4ba5d84e1ba798e20b59cb2bf SHA256 8aef4a6bedaeaad668b4df57a42dc3ece8ad7b91789dcff1e942af819b582841
+MD5 15d1ed12f5a4d1849f2c3c050aa4e7d4 files/jabberd-1.4.4-mio-bug-rev1291.patch 499
+RMD160 7d50054ca0c3304d47b530a604c68d2e2b5d4c5f files/jabberd-1.4.4-mio-bug-rev1291.patch 499
+SHA256 8aef4a6bedaeaad668b4df57a42dc3ece8ad7b91789dcff1e942af819b582841 files/jabberd-1.4.4-mio-bug-rev1291.patch 499
 AUX jabberd-1.4.4-openssl-0.9.8.patch 485 RMD160 d320a884f318640521ee5934b92a00440b067eff SHA1 55d7e2fd660931ffe171c2234bce135f8afe55c5 SHA256 ede42894807ca3eece8c5e52a771870233317e5bc6cb3ddfe749a372a08270bc
 MD5 b223acb6e59434654550a7564a0a5762 files/jabberd-1.4.4-openssl-0.9.8.patch 485
 RMD160 d320a884f318640521ee5934b92a00440b067eff files/jabberd-1.4.4-openssl-0.9.8.patch 485
 SHA256 ede42894807ca3eece8c5e52a771870233317e5bc6cb3ddfe749a372a08270bc files/jabberd-1.4.4-openssl-0.9.8.patch 485
+AUX jabberd-1.4.4-str.c-rev1103.patch 302 RMD160 34d5de8b755b5029f91c02030308e90e6e38a395 SHA1 4087e906f6b7a354bccd17132b90baeae358ad2b SHA256 929afb2954329eaef703ca985cd9e391002b80aea5e21f0d67933ffaa12db9c3
+MD5 447742a0224ee4557645e17b489abd11 files/jabberd-1.4.4-str.c-rev1103.patch 302
+RMD160 34d5de8b755b5029f91c02030308e90e6e38a395 files/jabberd-1.4.4-str.c-rev1103.patch 302
+SHA256 929afb2954329eaef703ca985cd9e391002b80aea5e21f0d67933ffaa12db9c3 files/jabberd-1.4.4-str.c-rev1103.patch 302
+AUX jabberd-1.4.4-xdb_file.c-rev1107.patch 539 RMD160 dbfca4d0801291f1b1c10e12ac4040d06a38006f SHA1 593fd01f2e0003aedf6714fc9e384da68e04b511 SHA256 6f532e7f792431072226fea8c032fa3463080b355325a7281317a2764ea6e245
+MD5 c3d81de427c5acd5f9e54ce6371adad2 files/jabberd-1.4.4-xdb_file.c-rev1107.patch 539
+RMD160 dbfca4d0801291f1b1c10e12ac4040d06a38006f files/jabberd-1.4.4-xdb_file.c-rev1107.patch 539
+SHA256 6f532e7f792431072226fea8c032fa3463080b355325a7281317a2764ea6e245 files/jabberd-1.4.4-xdb_file.c-rev1107.patch 539
+AUX jabberd-1.4.4-xdb_sql.c-rev1211.patch 882 RMD160 48c9f7ad6f4c10c26c9aa89730434a3632de3f75 SHA1 8519d7920e75c3273efe766f3336c588808e0778 SHA256 5dda2f6b8c86b0b02d569f3436d2d0b23d352926649469b2f4041a94535a6c10
+MD5 9145524db44a8da4ade06cf07811ef75 files/jabberd-1.4.4-xdb_sql.c-rev1211.patch 882
+RMD160 48c9f7ad6f4c10c26c9aa89730434a3632de3f75 files/jabberd-1.4.4-xdb_sql.c-rev1211.patch 882
+SHA256 5dda2f6b8c86b0b02d569f3436d2d0b23d352926649469b2f4041a94535a6c10 files/jabberd-1.4.4-xdb_sql.c-rev1211.patch 882
 AUX jabberd-1.4.4.init 554 RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e SHA1 630cd9c50c20a73992b9891051e02350f6abcba9 SHA256 769e4ee4e193a1d63fe4839f923fb2a6339489a677595ba75986e19cb1ba39ac
 MD5 3b4be327293fb0abc0cdb5dcac80d033 files/jabberd-1.4.4.init 554
 RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e files/jabberd-1.4.4.init 554
@@ -92,10 +112,10 @@ EBUILD jabberd-1.4.4-r2.ebuild 4516 RMD160 cb4c97271971d011638f2a768729d7c46d17a
 MD5 b3f6c93ad36ef0b1f5d52185e70e8ad3 jabberd-1.4.4-r2.ebuild 4516
 RMD160 cb4c97271971d011638f2a768729d7c46d17abce jabberd-1.4.4-r2.ebuild 4516
 SHA256 53e77bf72d3dec4a8eea0ffb92a5c72435ce6ae1e5833e57b50dae4f52dbf313 jabberd-1.4.4-r2.ebuild 4516
-EBUILD jabberd-1.4.4-r3.ebuild 3018 RMD160 6961ec453f8d1126818569431ea4793f73b87fef SHA1 d6038ad5d7a7908a352a0d46a70189729bbaf601 SHA256 4e4084bca093e2a114fed0836ace87960e1221229ea5000cdd1806953d9e01a3
-MD5 dc952e08fce4f1e3ec6b4b83a268c312 jabberd-1.4.4-r3.ebuild 3018
-RMD160 6961ec453f8d1126818569431ea4793f73b87fef jabberd-1.4.4-r3.ebuild 3018
-SHA256 4e4084bca093e2a114fed0836ace87960e1221229ea5000cdd1806953d9e01a3 jabberd-1.4.4-r3.ebuild 3018
+EBUILD jabberd-1.4.4-r3.ebuild 3284 RMD160 cdb2320d1e3ee0f59c91d08032e33a5055474db6 SHA1 59514abaaf4367bb218f65f36466d7e8e452b49d SHA256 5c11f52b95617b25bb398ee95d195ea2695708b12de2cc07c21ec71b53e08717
+MD5 62e7e589bbaac7a21b8186084409d023 jabberd-1.4.4-r3.ebuild 3284
+RMD160 cdb2320d1e3ee0f59c91d08032e33a5055474db6 jabberd-1.4.4-r3.ebuild 3284
+SHA256 5c11f52b95617b25bb398ee95d195ea2695708b12de2cc07c21ec71b53e08717 jabberd-1.4.4-r3.ebuild 3284
 EBUILD jabberd-2.0.10.ebuild 3494 RMD160 a43d71c49628084c41d02767775c3dde4898018d SHA1 8c5cad380f1c00395dc4ad7d5b3aa4f0e80f4703 SHA256 1cdeac08668b8d609b335f42d8e6c77f8152398f5b940935d2c64678039e6480
 MD5 fb4eb4f8f7c47229416f97a92b0d99d1 jabberd-2.0.10.ebuild 3494
 RMD160 a43d71c49628084c41d02767775c3dde4898018d jabberd-2.0.10.ebuild 3494
@@ -108,10 +128,10 @@ EBUILD jabberd-2.0.9.ebuild 3622 RMD160 249ec6cd2b563d6e3733f44074acb48efa3e817b
 MD5 4cfba42324bea977951cd322a4299d77 jabberd-2.0.9.ebuild 3622
 RMD160 249ec6cd2b563d6e3733f44074acb48efa3e817b jabberd-2.0.9.ebuild 3622
 SHA256 44fad28beb56c42295a9bd4d0b14dafbdab94be0f9114b34b18d235ecb2f0dbe jabberd-2.0.9.ebuild 3622
-MISC ChangeLog 11930 RMD160 60572500beef298489d2dd982c5d10ddba969f40 SHA1 313287c5328baf17fda9963d62e49a99f2427728 SHA256 6b4efb971e08bf95e24a7d0e993c2e07f2e81b769ec240bbd6952772504d07fd
-MD5 dd4aafca1765e307b8a6f6c67a827870 ChangeLog 11930
-RMD160 60572500beef298489d2dd982c5d10ddba969f40 ChangeLog 11930
-SHA256 6b4efb971e08bf95e24a7d0e993c2e07f2e81b769ec240bbd6952772504d07fd ChangeLog 11930
+MISC ChangeLog 12279 RMD160 95b0ad07c78e8a9989f74f66f3a2c3c596d843d2 SHA1 a377e5252f596346f916ab4c32004e1a31d0f6d9 SHA256 c5530a970f72f779366061c9ea632b6b713078388300b8a32da855d27b243c18
+MD5 6e60e3a19f846bf21f79af6db53079d0 ChangeLog 12279
+RMD160 95b0ad07c78e8a9989f74f66f3a2c3c596d843d2 ChangeLog 12279
+SHA256 c5530a970f72f779366061c9ea632b6b713078388300b8a32da855d27b243c18 ChangeLog 12279
 MISC metadata.xml 453 RMD160 bd3a0ba0e9aa3e1652489c731ff97d97ad050bc7 SHA1 74ce3349255a107d4ec18bc3e9639a50b8e7cdbe SHA256 b21a9806e3be38cc94ca812e9864c537237905bdb18347461fae9ba26bb1f690
 MD5 e07ef3d6fc255eee85b6dd3480c8f819 metadata.xml 453
 RMD160 bd3a0ba0e9aa3e1652489c731ff97d97ad050bc7 metadata.xml 453
@@ -140,7 +160,7 @@ SHA256 e0558a17b5746d48015656ba100b8c828968a785ad35c728696b79c54cd28922 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFG52Kgo/w9rxVVVERAjjiAJ9gUSBg37dMoshOncv4HVdigqI7swCfRM/H
-dGf6f39jdCDuL4n5H4fO0Uo=
-=LHFZ
+iD8DBQFFG6x3go/w9rxVVVERArzKAKCXF+i3E0LjndEaXOwVLoF6QADBEACgqMU8
+51N5CA8oC9skxuh240n+y54=
+=x3Dz
 -----END PGP SIGNATURE-----
diff --git a/net-im/jabberd/files/jabberd-1.4.4-genhash.c-rev1253.patch b/net-im/jabberd/files/jabberd-1.4.4-genhash.c-rev1253.patch
new file mode 100644
index 000000000000..edb85bbca9f3
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-1.4.4-genhash.c-rev1253.patch
@@ -0,0 +1,11 @@
+--- jabberd/lib/genhash.c	2006/06/07 09:17:30	1252
++++ jabberd/lib/genhash.c	2006/06/23 09:24:18	1253
+@@ -148,7 +148,7 @@
+     xht h = (xht)tbl;
+ 
+     for(i = 0; i < h->prime; i++)
+-        for(n = &h->zen[i]; n != NULL; n = n->next)
++        for(n = h->zen[i]; n != NULL; n = n->next)
+             if(n->key != NULL && n->val != NULL)
+                 (*func)(user_data, n->key, n->val);
+ 
diff --git a/net-im/jabberd/files/jabberd-1.4.4-mio-bug-rev1291.patch b/net-im/jabberd/files/jabberd-1.4.4-mio-bug-rev1291.patch
new file mode 100644
index 000000000000..338369c698ce
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-1.4.4-mio-bug-rev1291.patch
@@ -0,0 +1,16 @@
+--- jabberd/mio.c	2006/08/10 14:54:02	1290
++++ jabberd/mio.c	2006/09/02 05:35:46	1291
+@@ -469,6 +469,13 @@
+         return NULL;
+     }
+ 
++    /* do not accept a higher fd than FD_SET, or FD_CLR can handle */
++    if (fd >= FD_SETSIZE) {
++	log_warn(NULL, "could not accept incoming connection, maximum number of connections reached (%i)", FD_SETSIZE);
++	close(fd);
++	return NULL;
++    }
++
+     log_debug2(ZONE, LOGT_IO, "_mio_accept(%X) accepted fd #%d", m, fd);
+ 
+     /* access and rate checks */
diff --git a/net-im/jabberd/files/jabberd-1.4.4-str.c-rev1103.patch b/net-im/jabberd/files/jabberd-1.4.4-str.c-rev1103.patch
new file mode 100644
index 000000000000..4500a553ee42
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-1.4.4-str.c-rev1103.patch
@@ -0,0 +1,11 @@
+--- jabberd/lib/str.c	2005/04/12 11:43:15	1094
++++ jabberd/lib/str.c	2005/04/16 19:54:24	1103
+@@ -417,7 +417,7 @@
+     static char buff[64];
+     int i;
+ 
+-    i = snprintf(buff,63,"%s:%d",file,line);
++    i = snprintf(buff, sizeof(buff), "%s:%d", file, line);
+     buff[i] = '\0';
+ 
+     return buff;
diff --git a/net-im/jabberd/files/jabberd-1.4.4-xdb_file.c-rev1107.patch b/net-im/jabberd/files/jabberd-1.4.4-xdb_file.c-rev1107.patch
new file mode 100644
index 000000000000..a66434974f15
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-1.4.4-xdb_file.c-rev1107.patch
@@ -0,0 +1,13 @@
+--- xdb_file/xdb_file.c	2005/07/08 22:36:46	1106
++++ xdb_file/xdb_file.c	2005/07/11 14:23:27	1107
+@@ -153,8 +153,8 @@
+     
+     /* generate a hash over the filename */
+     bzero(hashedfilename, sizeof(hashedfilename));
+-    bzero(digit01, sizeof(digit01));
+-    bzero(digit23, sizeof(digit23));
++    bzero(digit01, sizeof(char[3]));
++    bzero(digit23, sizeof(char[3]));
+     crc32_r(filename, hashedfilename);
+     log_debug2(ZONE, LOGT_STORAGE, "hash of %s is %s", filename, hashedfilename);
+     memcpy(digit01, hashedfilename+1, 2);
diff --git a/net-im/jabberd/files/jabberd-1.4.4-xdb_sql.c-rev1211.patch b/net-im/jabberd/files/jabberd-1.4.4-xdb_sql.c-rev1211.patch
new file mode 100644
index 000000000000..75f0a0198704
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-1.4.4-xdb_sql.c-rev1211.patch
@@ -0,0 +1,24 @@
+--- xdb_sql/xdb_sql.c	2006/03/15 22:16:37	1210
++++ xdb_sql/xdb_sql.c	2006/04/25 22:01:39	1211
+@@ -269,10 +269,18 @@
+     ret = mysql_query(xq->mysql, query);
+ 
+     /* failed and we need to reconnect? */
+-    if (ret == CR_SERVER_LOST || ret == CR_SERVER_GONE_ERROR) {
+-	xdb_sql_mysql_connect(i, xq);
++    if (ret) {
++	unsigned int query_errno = mysql_errno(xq->mysql);
++	if (query_errno == CR_SERVER_LOST || query_errno == CR_SERVER_GONE_ERROR) {
++	    log_debug2(ZONE, LOGT_STORAGE, "connection lost, trying to reconnect to MySQL server");
++	    xdb_sql_mysql_connect(i, xq);
+ 
+-	ret = mysql_query(xq->mysql, query);
++	    ret = mysql_query(xq->mysql, query);
++
++	    if (ret == 0) {
++		log_notice(i->id, "connection to MySQL server %s:%i had been lost, and has been reestablished", xq->mysql_host , xq->mysql_port);
++	    }
++	}
+     }
+ 
+     /* still an error? log and return */
diff --git a/net-im/jabberd/jabberd-1.4.4-r3.ebuild b/net-im/jabberd/jabberd-1.4.4-r3.ebuild
index a068999f9f0c..bdab0267e28a 100644
--- a/net-im/jabberd/jabberd-1.4.4-r3.ebuild
+++ b/net-im/jabberd/jabberd-1.4.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.3 2006/09/28 10:01:29 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.4 2006/09/28 11:05:10 nelchael Exp $
 
 inherit eutils
 
@@ -43,9 +43,17 @@ src_unpack() {
 
 	unpack "${A}"
 
+	cd "${S}"
+
 	# Resolves bug #147342
 	epatch "${FILESDIR}/${P}-openssl-0.9.8.patch"
 
+	# Various fixes from upstream:
+	epatch "${FILESDIR}/${P}-str.c-rev1103.patch"
+	epatch "${FILESDIR}/${P}-xdb_file.c-rev1107.patch"
+	epatch "${FILESDIR}/${P}-xdb_sql.c-rev1211.patch"
+	epatch "${FILESDIR}/${P}-genhash.c-rev1253.patch"
+
 }
 
 src_compile() {
@@ -54,7 +62,7 @@ src_compile() {
 
 	# Broken configure script - can't use "use_enable"
 	local myconf=
-	use debug && myconf="${myconf} --enable-debug"
+	use debug && myconf="${myconf} --enable-debug --enable-pool-debug"
 	use ipv6  && myconf="${myconf} --enable-ipv6"
 	use ssl   && myconf="${myconf} --enable-ssl"