summaryrefslogtreecommitdiff
path: root/net-im/jabberd/files
Unidiff
Diffstat (limited to 'net-im/jabberd/files') (more/less context) (ignore whitespace changes)
-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
11 files changed, 0 insertions, 145 deletions
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 @@
1MD5 395f814a6627436ba7bd235509adcbc7 jabberd-1.4.4.tar.gz 613479
2RMD160 3273d0711fb6f0f6b95749d8bdb1ac5004aed074 jabberd-1.4.4.tar.gz 613479
3SHA256 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 @@
1MD5 88096f8be9c02ad424b6dc75fb29ae6f jabberd-2.1.4.tar.bz2 843796
2RMD160 1f8ab0b8ab51508ff89085f3fe1342fdd9b54204 jabberd-2.1.4.tar.bz2 843796
3SHA256 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 @@
1diff -ru jabberd-1.4.4.vanilla/jsm/Makefile.am jabberd-1.4.4/jsm/Makefile.am
2 --- jabberd-1.4.4.vanilla/jsm/Makefile.am2006-10-03 14:07:22.000000000 +0200
3 +++ jabberd-1.4.4/jsm/Makefile.am2006-10-03 14:27:12.000000000 +0200
4@@ -7,6 +7,6 @@
5
6 libjabberdsm_la_SOURCES = authreg.c deliver.c jsm.c modules.c offline.c server.c sessions.c users.c util.c
7 libjabberdsm_la_LIBADD = $(top_builddir)/jsm/modules/libjabberdsmmods.la $(top_builddir)/jabberd/libjabberd.la
8-libjabberdsm_la_LDFLAGS = @LDFLAGS@ -module
9+libjabberdsm_la_LDFLAGS = -lcrypt @LDFLAGS@ -module
10
11 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 @@
1 --- jabberd/lib/genhash.c 2006/06/07 09:17:301252
2 +++ jabberd/lib/genhash.c 2006/06/23 09:24:181253
3@@ -148,7 +148,7 @@
4 xht h = (xht)tbl;
5
6 for(i = 0; i < h->prime; i++)
7- for(n = &h->zen[i]; n != NULL; n = n->next)
8+ for(n = h->zen[i]; n != NULL; n = n->next)
9 if(n->key != NULL && n->val != NULL)
10 (*func)(user_data, n->key, n->val);
11
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 @@
1 --- jabberd/mio.c 2006/08/10 14:54:021290
2 +++ jabberd/mio.c 2006/09/02 05:35:461291
3@@ -469,6 +469,13 @@
4 return NULL;
5 }
6
7+ /* do not accept a higher fd than FD_SET, or FD_CLR can handle */
8+ if (fd >= FD_SETSIZE) {
9 +log_warn(NULL, "could not accept incoming connection, maximum number of connections reached (%i)", FD_SETSIZE);
10 +close(fd);
11 +return NULL;
12+ }
13+
14 log_debug2(ZONE, LOGT_IO, "_mio_accept(%X) accepted fd #%d", m, fd);
15
16 /* 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 @@
1diff -Nru --exclude=tags jabberd-1.4.4/jabberd/mio_ssl.c jabberd-1.4.4.fixed/jabberd/mio_ssl.c
2 --- jabberd-1.4.4/jabberd/mio_ssl.c2005-04-16 00:07:23.000000000 +0200
3 +++ jabberd-1.4.4.fixed/jabberd/mio_ssl.c2006-09-12 18:23:35.000000000 +0200
4@@ -103,6 +103,7 @@
5
6 log_debug2(ZONE, LOGT_INIT|LOGT_CONFIG, "Handling configuration using: %s", xmlnode2str(x));
7 /* Generic SSL Inits */
8 +SSL_library_init();
9 OpenSSL_add_all_algorithms();
10 SSL_load_error_strings();
11
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 @@
1 --- jabberd/lib/str.c 2005/04/12 11:43:151094
2 +++ jabberd/lib/str.c 2005/04/16 19:54:241103
3@@ -417,7 +417,7 @@
4 static char buff[64];
5 int i;
6
7- i = snprintf(buff,63,"%s:%d",file,line);
8+ i = snprintf(buff, sizeof(buff), "%s:%d", file, line);
9 buff[i] = '\0';
10
11 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 @@
1 --- xdb_file/xdb_file.c 2005/07/08 22:36:461106
2 +++ xdb_file/xdb_file.c 2005/07/11 14:23:271107
3@@ -153,8 +153,8 @@
4
5 /* generate a hash over the filename */
6 bzero(hashedfilename, sizeof(hashedfilename));
7- bzero(digit01, sizeof(digit01));
8- bzero(digit23, sizeof(digit23));
9+ bzero(digit01, sizeof(char[3]));
10+ bzero(digit23, sizeof(char[3]));
11 crc32_r(filename, hashedfilename);
12 log_debug2(ZONE, LOGT_STORAGE, "hash of %s is %s", filename, hashedfilename);
13 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 @@
1 --- xdb_sql/xdb_sql.c 2006/03/15 22:16:371210
2 +++ xdb_sql/xdb_sql.c 2006/04/25 22:01:391211
3@@ -269,10 +269,18 @@
4 ret = mysql_query(xq->mysql, query);
5
6 /* failed and we need to reconnect? */
7- if (ret == CR_SERVER_LOST || ret == CR_SERVER_GONE_ERROR) {
8 -xdb_sql_mysql_connect(i, xq);
9+ if (ret) {
10 +unsigned int query_errno = mysql_errno(xq->mysql);
11 +if (query_errno == CR_SERVER_LOST || query_errno == CR_SERVER_GONE_ERROR) {
12 + log_debug2(ZONE, LOGT_STORAGE, "connection lost, trying to reconnect to MySQL server");
13 + xdb_sql_mysql_connect(i, xq);
14
15 -ret = mysql_query(xq->mysql, query);
16 + ret = mysql_query(xq->mysql, query);
17+
18 + if (ret == 0) {
19 + log_notice(i->id, "connection to MySQL server %s:%i had been lost, and has been reestablished", xq->mysql_host , xq->mysql_port);
20 + }
21 +}
22 }
23
24 /* 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 @@
1#!/sbin/runscript
2# Copyright 1999-2005 Gentoo Foundation
3# Distributed under the terms of the GNU General Public License v2
4# $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 $
5
6depend() {
7
8 need net
9 provide jabber-server
10
11}
12
13start() {
14
15 ebegin "Starting Jabber Server"
16 start-stop-daemon --start \
17 -c jabber:jabber \
18 -x /usr/bin/jabberd -- -B -c /etc/jabber/jabberd.xml
19 eend $?
20
21}
22
23stop() {
24
25 ebegin "Stopping Jabber Server"
26 start-stop-daemon --stop -x /usr/bin/jabberd
27 eend $?
28
29}
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 @@
1diff -Nru jabberd-2.0s11.vanilla/configure.in jabberd-2.0s11/configure.in
2 --- jabberd-2.0s11.vanilla/configure.in2006-10-04 23:14:07.000000000 +0200
3 +++ jabberd-2.0s11/configure.in2006-10-04 23:19:58.000000000 +0200
4@@ -758,9 +758,6 @@
5 dnl finishing up
6 dnl
7
8-dnl put our config in its own subdir
9-sysconfdir="$sysconfdir/jabberd"
10-
11 dnl done!
12 AC_OUTPUT(Makefile \
13 etc/Makefile \