author | Michael Krelin <hacker@klever.net> | 2007-04-22 23:23:39 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-04-22 23:23:39 (UTC) |
commit | d63aa3793906423bd3bffe6ab55578c162bfbbda (patch) (unidiff) | |
tree | 575b6dd5d44cf5166d42b62b59f7c0623c614fc6 /net-im/jabberd/files | |
parent | 4243b8fe439f0f819b797d908345bd8ffc067ead (diff) | |
download | misc-d63aa3793906423bd3bffe6ab55578c162bfbbda.zip misc-d63aa3793906423bd3bffe6ab55578c162bfbbda.tar.gz misc-d63aa3793906423bd3bffe6ab55578c162bfbbda.tar.bz2 |
net-im/jabberd: imported from portage
-rw-r--r-- | net-im/jabberd/files/digest-jabberd-1.4.4-r3 | 3 | ||||
-rw-r--r-- | net-im/jabberd/files/digest-jabberd-2.0.11-r1 | 3 | ||||
-rw-r--r-- | net-im/jabberd/files/jabberd-1.4.4-crypt.patch | 11 | ||||
-rw-r--r-- | net-im/jabberd/files/jabberd-1.4.4-genhash.c-rev1253.patch | 11 | ||||
-rw-r--r-- | net-im/jabberd/files/jabberd-1.4.4-mio-bug-rev1291.patch | 16 | ||||
-rw-r--r-- | net-im/jabberd/files/jabberd-1.4.4-openssl-0.9.8.patch | 11 | ||||
-rw-r--r-- | net-im/jabberd/files/jabberd-1.4.4-str.c-rev1103.patch | 11 | ||||
-rw-r--r-- | net-im/jabberd/files/jabberd-1.4.4-xdb_file.c-rev1107.patch | 13 | ||||
-rw-r--r-- | net-im/jabberd/files/jabberd-1.4.4-xdb_sql.c-rev1211.patch | 24 | ||||
-rw-r--r-- | net-im/jabberd/files/jabberd-1.4.4.init | 29 | ||||
-rw-r--r-- | net-im/jabberd/files/jabberd-2.0.11-configure.in.patch | 13 | ||||
-rw-r--r-- | net-im/jabberd/files/jabberd-2.0.11.init | 80 |
12 files changed, 225 insertions, 0 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 new file mode 100644 index 0000000..612cb5d --- a/dev/null +++ b/net-im/jabberd/files/digest-jabberd-1.4.4-r3 | |||
@@ -0,0 +1,3 @@ | |||
1 | MD5 395f814a6627436ba7bd235509adcbc7 jabberd-1.4.4.tar.gz 613479 | ||
2 | RMD160 3273d0711fb6f0f6b95749d8bdb1ac5004aed074 jabberd-1.4.4.tar.gz 613479 | ||
3 | SHA256 72e23766e737588ed8d77ca7565a8f4b2bba73967c02e9b7ee4d2122d198a0af jabberd-1.4.4.tar.gz 613479 | ||
diff --git a/net-im/jabberd/files/digest-jabberd-2.0.11-r1 b/net-im/jabberd/files/digest-jabberd-2.0.11-r1 new file mode 100644 index 0000000..351198e --- a/dev/null +++ b/net-im/jabberd/files/digest-jabberd-2.0.11-r1 | |||
@@ -0,0 +1,3 @@ | |||
1 | MD5 67d1663ed97a5ba707d5d145b1d19c55 jabberd-2.0s11.tar.gz 777466 | ||
2 | RMD160 7e89790abb5ff4e84a0a38ac5afbc0c365d60b3d jabberd-2.0s11.tar.gz 777466 | ||
3 | SHA256 0ef0f668f5d86b8c22ce0ae2366bff0be9d4c961d6f48b7b849ebe749bdb213a jabberd-2.0s11.tar.gz 777466 | ||
diff --git a/net-im/jabberd/files/jabberd-1.4.4-crypt.patch b/net-im/jabberd/files/jabberd-1.4.4-crypt.patch new file mode 100644 index 0000000..257fe45 --- a/dev/null +++ b/net-im/jabberd/files/jabberd-1.4.4-crypt.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | diff -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 new file mode 100644 index 0000000..edb85bb --- a/dev/null +++ b/net-im/jabberd/files/jabberd-1.4.4-genhash.c-rev1253.patch | |||
@@ -0,0 +1,11 @@ | |||
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 new file mode 100644 index 0000000..338369c --- a/dev/null +++ b/net-im/jabberd/files/jabberd-1.4.4-mio-bug-rev1291.patch | |||
@@ -0,0 +1,16 @@ | |||
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 new file mode 100644 index 0000000..12df5df --- a/dev/null +++ b/net-im/jabberd/files/jabberd-1.4.4-openssl-0.9.8.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | diff -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 new file mode 100644 index 0000000..4500a55 --- a/dev/null +++ b/net-im/jabberd/files/jabberd-1.4.4-str.c-rev1103.patch | |||
@@ -0,0 +1,11 @@ | |||
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 new file mode 100644 index 0000000..a664349 --- a/dev/null +++ b/net-im/jabberd/files/jabberd-1.4.4-xdb_file.c-rev1107.patch | |||
@@ -0,0 +1,13 @@ | |||
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 new file mode 100644 index 0000000..75f0a01 --- a/dev/null +++ b/net-im/jabberd/files/jabberd-1.4.4-xdb_sql.c-rev1211.patch | |||
@@ -0,0 +1,24 @@ | |||
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 new file mode 100644 index 0000000..a25ac84 --- a/dev/null +++ b/net-im/jabberd/files/jabberd-1.4.4.init | |||
@@ -0,0 +1,29 @@ | |||
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 | |||
6 | depend() { | ||
7 | |||
8 | need net | ||
9 | provide jabber-server | ||
10 | |||
11 | } | ||
12 | |||
13 | start() { | ||
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 | |||
23 | stop() { | ||
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.0.11-configure.in.patch b/net-im/jabberd/files/jabberd-2.0.11-configure.in.patch new file mode 100644 index 0000000..64a6697 --- a/dev/null +++ b/net-im/jabberd/files/jabberd-2.0.11-configure.in.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | diff -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 \ | ||
diff --git a/net-im/jabberd/files/jabberd-2.0.11.init b/net-im/jabberd/files/jabberd-2.0.11.init new file mode 100644 index 0000000..fee8d2e --- a/dev/null +++ b/net-im/jabberd/files/jabberd-2.0.11.init | |||
@@ -0,0 +1,80 @@ | |||
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-2.0.11.init,v 1.3 2007/01/09 10:38:59 nelchael Exp $ | ||
5 | |||
6 | depend() { | ||
7 | need net | ||
8 | use mysql postgresql slapd | ||
9 | provide jabber-server | ||
10 | } | ||
11 | |||
12 | function stopJabberServices() { | ||
13 | |||
14 | eindent | ||
15 | for pidfile in /var/run/jabber/*.pid; do | ||
16 | if [[ -f "${pidfile}" ]]; then | ||
17 | service=$(basename ${pidfile/.pid/}) | ||
18 | ebegin "Stopping ${service}" | ||
19 | start-stop-daemon \ | ||
20 | --stop \ | ||
21 | --pidfile ${pidfile} | ||
22 | eend $? | ||
23 | fi | ||
24 | done | ||
25 | eoutdent | ||
26 | |||
27 | } | ||
28 | |||
29 | start() { | ||
30 | |||
31 | einfo "Starting Jabber Server ..." | ||
32 | local services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}') | ||
33 | local tempPidHack=/var/run/jabber/start_stop_daemon.pid | ||
34 | eindent | ||
35 | for service in ${services}; do | ||
36 | |||
37 | cfgfile=${service/*:/} | ||
38 | service=${service/:*/} | ||
39 | if [[ ! -f "${cfgfile}" ]]; then | ||
40 | if [[ -f "/etc/jabber/${service}.xml" ]]; then | ||
41 | cfgfile="/etc/jabber/${service}.xml" | ||
42 | else | ||
43 | eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml" | ||
44 | stopJabberServices | ||
45 | return 1 | ||
46 | fi | ||
47 | fi | ||
48 | |||
49 | executable=/usr/bin/${service} | ||
50 | |||
51 | if [[ ! -f "${executable}" ]]; then | ||
52 | eerror "Can't find executable: ${executable}" | ||
53 | stopJabberServices | ||
54 | return 1 | ||
55 | fi | ||
56 | |||
57 | rm -f ${tempPidHack} &> /dev/null | ||
58 | ebegin "Starting ${service} (${cfgfile})" | ||
59 | start-stop-daemon \ | ||
60 | --background \ | ||
61 | --start \ | ||
62 | --chuid jabber:jabber \ | ||
63 | --exec /usr/bin/${service} \ | ||
64 | --pid ${tempPidHack} \ | ||
65 | --make-pidfile \ | ||
66 | -- -c ${cfgfile} | ||
67 | eend $? | ||
68 | rm -f ${tempPidHack} &> /dev/null | ||
69 | |||
70 | done | ||
71 | eoutdent | ||
72 | |||
73 | } | ||
74 | |||
75 | stop() { | ||
76 | |||
77 | einfo "Stopping Jabber Server" | ||
78 | stopJabberServices | ||
79 | |||
80 | } | ||