summaryrefslogtreecommitdiff
path: root/net-im/jabberd
Side-by-side diff
Diffstat (limited to 'net-im/jabberd') (more/less context) (ignore whitespace changes)
-rw-r--r--net-im/jabberd/Manifest56
-rw-r--r--net-im/jabberd/files/digest-jabberd-1.4.4-r33
-rw-r--r--net-im/jabberd/files/digest-jabberd-2.1.43
-rw-r--r--net-im/jabberd/files/jabberd-1.4.4-crypt.patch11
-rw-r--r--net-im/jabberd/files/jabberd-1.4.4-genhash.c-rev1253.patch11
-rw-r--r--net-im/jabberd/files/jabberd-1.4.4-mio-bug-rev1291.patch16
-rw-r--r--net-im/jabberd/files/jabberd-1.4.4-openssl-0.9.8.patch11
-rw-r--r--net-im/jabberd/files/jabberd-1.4.4-str.c-rev1103.patch11
-rw-r--r--net-im/jabberd/files/jabberd-1.4.4-xdb_file.c-rev1107.patch13
-rw-r--r--net-im/jabberd/files/jabberd-1.4.4-xdb_sql.c-rev1211.patch24
-rw-r--r--net-im/jabberd/files/jabberd-1.4.4.init29
-rw-r--r--net-im/jabberd/files/jabberd-2.1.4-configure.in.patch13
-rw-r--r--net-im/jabberd/jabberd-1.4.4-r3.ebuild115
-rw-r--r--net-im/jabberd/jabberd-2.1.4.ebuild98
14 files changed, 0 insertions, 414 deletions
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index 813f08e..6c94774 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,80 +1,24 @@
-AUX jabberd-1.4.4-crypt.patch 605 RMD160 62763a71dfeb13763cd6e2cb47a2ec36a942fd42 SHA1 3befde7962b643050e61d04bd87483ed192483a1 SHA256 0a96fea2745058546bada3b234be4a803df836ba2b65052737b000867e932eca
-MD5 3de1d023b07d0bf247a71329eb70355d files/jabberd-1.4.4-crypt.patch 605
-RMD160 62763a71dfeb13763cd6e2cb47a2ec36a942fd42 files/jabberd-1.4.4-crypt.patch 605
-SHA256 0a96fea2745058546bada3b234be4a803df836ba2b65052737b000867e932eca files/jabberd-1.4.4-crypt.patch 605
-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
-SHA256 769e4ee4e193a1d63fe4839f923fb2a6339489a677595ba75986e19cb1ba39ac files/jabberd-1.4.4.init 554
AUX jabberd-2.1.11.init 1404 RMD160 d93784cc30f573f20cd411a1a18578db46121b26 SHA1 ce0e735adbf539c809568aa2c1d3ee49f565600c SHA256 e9d004e8d83cc59f964b49c44aaf64445593ba8157d4b51df83e5e50f4625094
MD5 eacd752c3b8eb5f2d4914ca8b3580893 files/jabberd-2.1.11.init 1404
RMD160 d93784cc30f573f20cd411a1a18578db46121b26 files/jabberd-2.1.11.init 1404
SHA256 e9d004e8d83cc59f964b49c44aaf64445593ba8157d4b51df83e5e50f4625094 files/jabberd-2.1.11.init 1404
AUX jabberd-2.1.11.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b
MD5 ab77cef855566260d6a779d8d77bc78c files/jabberd-2.1.11.pamd 158
RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 files/jabberd-2.1.11.pamd 158
SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b files/jabberd-2.1.11.pamd 158
-AUX jabberd-2.1.4-configure.in.patch 396 RMD160 86c99a761a23e55ebce98bdffba060e18073826f SHA1 59d16a3ce6f30bdea79c67fe9051a6c4624ddac9 SHA256 afa527ce6e4abedf097a92dc73046b8bacd851bf75ea309bd706937c8080aa5f
-MD5 0d6acfc3d4a22d09d4d17ffd202d38d8 files/jabberd-2.1.4-configure.in.patch 396
-RMD160 86c99a761a23e55ebce98bdffba060e18073826f files/jabberd-2.1.4-configure.in.patch 396
-SHA256 afa527ce6e4abedf097a92dc73046b8bacd851bf75ea309bd706937c8080aa5f files/jabberd-2.1.4-configure.in.patch 396
-DIST jabberd-1.4.4.tar.gz 613479 RMD160 3273d0711fb6f0f6b95749d8bdb1ac5004aed074 SHA1 5fa5b561740720591997ed189609403af8c796c2 SHA256 72e23766e737588ed8d77ca7565a8f4b2bba73967c02e9b7ee4d2122d198a0af
DIST jabberd-2.1.11.tar.bz2 1034039 RMD160 540f9f510351c369938005acb7013ea41d77f5b8 SHA1 528df89fd1fc638590811bb4f14b2d0d8a498a56 SHA256 e99a70102896ce28e5e427234ddaa852aacd8a38700264741a40f5781919bea8
-DIST jabberd-2.1.4.tar.bz2 843796 RMD160 1f8ab0b8ab51508ff89085f3fe1342fdd9b54204 SHA1 c1c4b3f74bf1220e9957d0260772d0d2148f2f0c SHA256 e9823c78505c233cc228146a181614a8f191f523948480f78a716fff2921385a
-EBUILD jabberd-1.4.4-r3.ebuild 3066 RMD160 f17931e3958c08c395419c718c009578929c7b23 SHA1 1d235e8d0574e83ebe870566d409f1ae937c3de9 SHA256 c240575c4deccbef864c3415397b913252321ff291d4c1291a8fb327bbe5d057
-MD5 703d5ba2de35a3258c9fa81b9ff5fc96 jabberd-1.4.4-r3.ebuild 3066
-RMD160 f17931e3958c08c395419c718c009578929c7b23 jabberd-1.4.4-r3.ebuild 3066
-SHA256 c240575c4deccbef864c3415397b913252321ff291d4c1291a8fb327bbe5d057 jabberd-1.4.4-r3.ebuild 3066
EBUILD jabberd-2.1.11.ebuild 2675 RMD160 19e6aa86491d5ea21a858b1028d523107c497fa2 SHA1 98a8577ed9b6a4beef05d3e0635a09eb03cd4e91 SHA256 c74804e1955e58c5359dbba72afa5ce065ba4fce4ebc6b178b57c0b3f5449c26
MD5 d94132822cf3296f897f2c708e7d3ccc jabberd-2.1.11.ebuild 2675
RMD160 19e6aa86491d5ea21a858b1028d523107c497fa2 jabberd-2.1.11.ebuild 2675
SHA256 c74804e1955e58c5359dbba72afa5ce065ba4fce4ebc6b178b57c0b3f5449c26 jabberd-2.1.11.ebuild 2675
-EBUILD jabberd-2.1.4.ebuild 2330 RMD160 771bae5fbdb463758d5816c660f5ffbce196cdef SHA1 81a4d6185a55366e58127f9e6470d3a32879053b SHA256 da88c8d53aa364528d0933765cc7c687d67abed13839c3cf6f54e64ef3aeb146
-MD5 13725474b621926e462d78e105919942 jabberd-2.1.4.ebuild 2330
-RMD160 771bae5fbdb463758d5816c660f5ffbce196cdef jabberd-2.1.4.ebuild 2330
-SHA256 da88c8d53aa364528d0933765cc7c687d67abed13839c3cf6f54e64ef3aeb146 jabberd-2.1.4.ebuild 2330
MISC ChangeLog 15464 RMD160 bac8facc410dced776f4b5d9f0c4b051100f9409 SHA1 2ed0d2fa838de3b4e1d720f577116af6eba842ec SHA256 7ea8ffdf9c099ca3fc43ccb381100ce6b519de8f6bb582305535491373fb8830
MD5 e71dbcd3a38fc84fc22dac39a6019359 ChangeLog 15464
RMD160 bac8facc410dced776f4b5d9f0c4b051100f9409 ChangeLog 15464
SHA256 7ea8ffdf9c099ca3fc43ccb381100ce6b519de8f6bb582305535491373fb8830 ChangeLog 15464
-MISC bug 46 RMD160 9a8b102b732b3c3b39eccb9f6347d6cf7bec122b SHA1 f6559d5ed5015f880bcf3f2189b58f78b1868716 SHA256 b6390a5c94c2bf9f3fe4e1297acd915e330d189125a17ac60117e36d9df61ef9
-MD5 d15af49122242ec74cc849146b70b622 bug 46
-RMD160 9a8b102b732b3c3b39eccb9f6347d6cf7bec122b bug 46
-SHA256 b6390a5c94c2bf9f3fe4e1297acd915e330d189125a17ac60117e36d9df61ef9 bug 46
MISC metadata.xml 399 RMD160 e223c713f74619996bc47a70298aa535f6addf09 SHA1 dc9bc290a5ed00f7101aabd3a40b346112eb40eb SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377
MD5 be8887bde84aab1d4ff9d5a0f5d50141 metadata.xml 399
RMD160 e223c713f74619996bc47a70298aa535f6addf09 metadata.xml 399
SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377 metadata.xml 399
-MD5 6608e1126e4f091819d2c41a1a8843a5 files/digest-jabberd-1.4.4-r3 241
-RMD160 0c09cceb4332b70a38db717adb4bd1d244337b72 files/digest-jabberd-1.4.4-r3 241
-SHA256 05c069ff9a60336785d0d1049dc28c727a5b4cc2f9a40c0f5304f98f2343cb9b files/digest-jabberd-1.4.4-r3 241
MD5 c07f7b9a6581fa2f5ea895378ce7f7de files/digest-jabberd-2.1.11 250
RMD160 cb7aaed13753b29cc9f5a1bce8487647ae3a39f2 files/digest-jabberd-2.1.11 250
SHA256 6d1563e8ca5a90c87768d01e273bfd6cfbe11c93ff70249fb71eeb074b090a39 files/digest-jabberd-2.1.11 250
-MD5 25a5e186c9891488b376450459f220b0 files/digest-jabberd-2.1.4 244
-RMD160 5821ca628801138bd4a32a32e10d6a513c14fa02 files/digest-jabberd-2.1.4 244
-SHA256 145d54a062e7bc260393ab78b287789593e3d6a6a7473c9543b89d2393826d7c files/digest-jabberd-2.1.4 244
diff --git a/net-im/jabberd/files/digest-jabberd-1.4.4-r3 b/net-im/jabberd/files/digest-jabberd-1.4.4-r3
deleted file mode 100644
index 612cb5d..0000000
--- a/net-im/jabberd/files/digest-jabberd-1.4.4-r3
+++ b/dev/null
@@ -1,3 +0,0 @@
-MD5 395f814a6627436ba7bd235509adcbc7 jabberd-1.4.4.tar.gz 613479
-RMD160 3273d0711fb6f0f6b95749d8bdb1ac5004aed074 jabberd-1.4.4.tar.gz 613479
-SHA256 72e23766e737588ed8d77ca7565a8f4b2bba73967c02e9b7ee4d2122d198a0af jabberd-1.4.4.tar.gz 613479
diff --git a/net-im/jabberd/files/digest-jabberd-2.1.4 b/net-im/jabberd/files/digest-jabberd-2.1.4
deleted file mode 100644
index 05015b1..0000000
--- a/net-im/jabberd/files/digest-jabberd-2.1.4
+++ b/dev/null
@@ -1,3 +0,0 @@
-MD5 88096f8be9c02ad424b6dc75fb29ae6f jabberd-2.1.4.tar.bz2 843796
-RMD160 1f8ab0b8ab51508ff89085f3fe1342fdd9b54204 jabberd-2.1.4.tar.bz2 843796
-SHA256 e9823c78505c233cc228146a181614a8f191f523948480f78a716fff2921385a jabberd-2.1.4.tar.bz2 843796
diff --git a/net-im/jabberd/files/jabberd-1.4.4-crypt.patch b/net-im/jabberd/files/jabberd-1.4.4-crypt.patch
deleted file mode 100644
index 257fe45..0000000
--- a/net-im/jabberd/files/jabberd-1.4.4-crypt.patch
+++ b/dev/null
@@ -1,11 +0,0 @@
-diff -ru jabberd-1.4.4.vanilla/jsm/Makefile.am jabberd-1.4.4/jsm/Makefile.am
---- jabberd-1.4.4.vanilla/jsm/Makefile.am 2006-10-03 14:07:22.000000000 +0200
-+++ jabberd-1.4.4/jsm/Makefile.am 2006-10-03 14:27:12.000000000 +0200
-@@ -7,6 +7,6 @@
-
- libjabberdsm_la_SOURCES = authreg.c deliver.c jsm.c modules.c offline.c server.c sessions.c users.c util.c
- libjabberdsm_la_LIBADD = $(top_builddir)/jsm/modules/libjabberdsmmods.la $(top_builddir)/jabberd/libjabberd.la
--libjabberdsm_la_LDFLAGS = @LDFLAGS@ -module
-+libjabberdsm_la_LDFLAGS = -lcrypt @LDFLAGS@ -module
-
- INCLUDES = -I../jabberd -I../jabberd/lib
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
deleted file mode 100644
index edb85bb..0000000
--- a/net-im/jabberd/files/jabberd-1.4.4-genhash.c-rev1253.patch
+++ b/dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 338369c..0000000
--- a/net-im/jabberd/files/jabberd-1.4.4-mio-bug-rev1291.patch
+++ b/dev/null
@@ -1,16 +0,0 @@
---- 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-openssl-0.9.8.patch b/net-im/jabberd/files/jabberd-1.4.4-openssl-0.9.8.patch
deleted file mode 100644
index 12df5df..0000000
--- a/net-im/jabberd/files/jabberd-1.4.4-openssl-0.9.8.patch
+++ b/dev/null
@@ -1,11 +0,0 @@
-diff -Nru --exclude=tags jabberd-1.4.4/jabberd/mio_ssl.c jabberd-1.4.4.fixed/jabberd/mio_ssl.c
---- jabberd-1.4.4/jabberd/mio_ssl.c 2005-04-16 00:07:23.000000000 +0200
-+++ jabberd-1.4.4.fixed/jabberd/mio_ssl.c 2006-09-12 18:23:35.000000000 +0200
-@@ -103,6 +103,7 @@
-
- log_debug2(ZONE, LOGT_INIT|LOGT_CONFIG, "Handling configuration using: %s", xmlnode2str(x));
- /* Generic SSL Inits */
-+ SSL_library_init();
- OpenSSL_add_all_algorithms();
- SSL_load_error_strings();
-
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
deleted file mode 100644
index 4500a55..0000000
--- a/net-im/jabberd/files/jabberd-1.4.4-str.c-rev1103.patch
+++ b/dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index a664349..0000000
--- a/net-im/jabberd/files/jabberd-1.4.4-xdb_file.c-rev1107.patch
+++ b/dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index 75f0a01..0000000
--- a/net-im/jabberd/files/jabberd-1.4.4-xdb_sql.c-rev1211.patch
+++ b/dev/null
@@ -1,24 +0,0 @@
---- 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/files/jabberd-1.4.4.init b/net-im/jabberd/files/jabberd-1.4.4.init
deleted file mode 100644
index a25ac84..0000000
--- a/net-im/jabberd/files/jabberd-1.4.4.init
+++ b/dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabberd-1.4.4.init,v 1.1 2006/09/27 22:31:36 nelchael Exp $
-
-depend() {
-
- need net
- provide jabber-server
-
-}
-
-start() {
-
- ebegin "Starting Jabber Server"
- start-stop-daemon --start \
- -c jabber:jabber \
- -x /usr/bin/jabberd -- -B -c /etc/jabber/jabberd.xml
- eend $?
-
-}
-
-stop() {
-
- ebegin "Stopping Jabber Server"
- start-stop-daemon --stop -x /usr/bin/jabberd
- eend $?
-
-}
diff --git a/net-im/jabberd/files/jabberd-2.1.4-configure.in.patch b/net-im/jabberd/files/jabberd-2.1.4-configure.in.patch
deleted file mode 100644
index 64a6697..0000000
--- a/net-im/jabberd/files/jabberd-2.1.4-configure.in.patch
+++ b/dev/null
@@ -1,13 +0,0 @@
-diff -Nru jabberd-2.0s11.vanilla/configure.in jabberd-2.0s11/configure.in
---- jabberd-2.0s11.vanilla/configure.in 2006-10-04 23:14:07.000000000 +0200
-+++ jabberd-2.0s11/configure.in 2006-10-04 23:19:58.000000000 +0200
-@@ -758,9 +758,6 @@
- dnl finishing up
- dnl
-
--dnl put our config in its own subdir
--sysconfdir="$sysconfdir/jabberd"
--
- dnl done!
- AC_OUTPUT(Makefile \
- etc/Makefile \
diff --git a/net-im/jabberd/jabberd-1.4.4-r3.ebuild b/net-im/jabberd/jabberd-1.4.4-r3.ebuild
deleted file mode 100644
index dbd7b63..0000000
--- a/net-im/jabberd/jabberd-1.4.4-r3.ebuild
+++ b/dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2007 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.13 2007/02/05 00:44:01 jer Exp $
-
-inherit eutils
-
-DESCRIPTION="Open-source Jabber server"
-HOMEPAGE="http://www.jabber.org"
-SRC_URI="http://download.jabberd.org/jabberd14/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 hppa ~ppc sparc x86"
-IUSE="debug ipv6 mysql postgres ssl"
-
-DEPEND=">=net-im/jabber-base-0.01
- >=dev-libs/pth-1.4.0
- dev-libs/expat
- net-dns/libidn
- dev-util/pkgconfig
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql )
- ssl? ( >=dev-libs/openssl-0.9.6i )"
-
-pkg_setup() {
-
- if use ipv6; then
- ewarn "Without full ipv6 support, jabberd will show the error:"
- ewarn ' "mio unable to listen"'
- ewarn "To fix this, emerge jabberd without the ipv6 USE flag."
- fi
-
-}
-
-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"
- epatch "${FILESDIR}/${P}-crypt.patch"
-
-}
-
-src_compile() {
-
- unset LC_ALL LC_CTYPE
-
- # Broken configure script - can't use "use_enable"
- local myconf=
- use debug && myconf="${myconf} --enable-debug --enable-pool-debug"
- use ipv6 && myconf="${myconf} --enable-ipv6"
- use ssl && myconf="${myconf} --enable-ssl"
-
- econf \
- --sysconfdir=/etc/jabber \
- ${myconf} \
- $(use_with mysql) \
- $(use_with postgres postgresql) \
- || die "econf failed"
-
- # Broken parallel build
- emake -j1 || die "emake failed"
-
-}
-
-src_install() {
-
- make DESTDIR="${D}" install || die "make install failed"
-
- newinitd "${FILESDIR}"/${P}.init jabber || die "newinitd failed"
-
- # net-im/jabber-base provides needed directories
- rm -rf "${D}/var"
- mv "${D}/etc/jabber/jabber.xml" "${D}/etc/jabber/jabberd.xml"
- mv "${D}/etc/jabber/jabber.xml.dist" "${D}/etc/jabber/jabberd.xml.dist"
-
- sed -i \
- -e 's,/var/lib/spool/jabberd,/var/spool/jabber,g' \
- -e 's,/var/lib/log/jabberd,/var/log/jabber,g' \
- -e 's,/var/lib/run/jabberd,/var/run/jabber,g' \
- -e 's,jabber.pid,jabberd14.pid,g' \
- "${D}"/etc/jabber/jabberd.xml{,.dist} \
- || die "sed failed"
-
-}
-
-pkg_postinst() {
-
- echo
- einfo 'The various IM transports for jabber are now separate packages,'
- einfo 'which you will need to install separately if you want them:'
- einfo ' net-im/jit - ICQ transport'
- einfo ' net-im/pymsn-t - MSN transport'
- einfo ' net-im/jud - Jabber User Directory'
- einfo ' net-im/yahoo-transport - Yahoo IM system'
- einfo ' net-im/mu-conference - Jabber multi user conference'
- echo
- ewarn 'If upgrading from an older version, please stop jabberd BEFORE'
- ewarn 'updating the init.d script, or you will end with a "dead" server.'
- echo
- ewarn 'The configuration filename has changed:'
- ewarn ' Configure your server in /etc/jabber/jabberd.xml'
- echo
- ebeep
-
-}
diff --git a/net-im/jabberd/jabberd-2.1.4.ebuild b/net-im/jabberd/jabberd-2.1.4.ebuild
deleted file mode 100644
index 4ecfc5b..0000000
--- a/net-im/jabberd/jabberd-2.1.4.ebuild
+++ b/dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="none"
-inherit autotools eutils versionator
-
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://jabberd2.xiaoka.com/"
-SRC_URI="http://ftp.xiaoka.com/${PN}2/releases/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug memdebug ipv6 ldap mysql pam pipe postgres sqlite ssl idn berkdb anon fs"
-
-RDEPEND=">=net-im/jabber-base-0.01
- ssl? ( >=dev-libs/openssl-0.9.6b )
- idn? ( net-dns/libidn )
- ldap? ( net-nds/openldap )
- berkdb? ( >=sys-libs/db-4.1.25 )
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql )
- sqlite? ( =dev-db/sqlite-3* )
- dev-libs/expat
- dev-libs/cyrus-sasl"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${P}-configure.in.patch"
- eautoreconf
-}
-
-src_compile() {
-
- local localconf=
- if use debug; then
- localconf="${localconf} --enable-debug"
- use memdebug && localconf="${localconf} --enable-nad-debug --enable-pool-debug"
- else
- if use memdebug; then
- ewarn
- ewarn '"memdebug" requires "debug" enabled.'
- ewarn
- fi
- fi
-
- econf \
- --localstatedir=/var \
- --sysconfdir=/etc/jabber \
- --enable-db \
- ${localconf} \
- $(use_enable anon) \
- $(use_enable fs) \
- $(use_enable berkdb db) \
- $(use_enable idn) \
- $(use_enable ipv6) \
- $(use_enable ldap) \
- $(use_enable mysql) \
- $(use_enable pam) \
- $(use_enable pipe) \
- $(use_enable postgres pgsql) \
- $(use_enable sqlite) \
- $(use_enable ssl) \
- || die "econf failed"
- emake || die "make failed"
-
-}
-
-src_install() {
-
- make DESTDIR="${D}" install || die "make install failed"
-
- fowners jabber:jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
- fperms 750 /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
-
- newinitd "${FILESDIR}/jabberd-${PV}.init" jabberd || die "newinitd failed"
-
- dodoc AUTHORS PROTOCOL README
- docinto tools
- for i in db-* migrate.pl pipe-auth.pl; do
- dodoc tools/${i}
- done
-
- cd "${D}/etc/jabber/"
- sed -i \
- -e 's,/var/jabberd/pid/,/var/run/jabber/,g' \
- -e 's,/var/jabberd/log/,/var/log/jabber/,g' \
- -e 's,/var/jabberd/db,/var/spool/jabber/,g' \
- *.xml *.xml.dist || die "sed failed"
- use berkdb && sed -i \
- -e 's,<module>mysql</module>,<module>db</module>,' \
- c2s.xml*
-
-}