SOURCES: jabberd-default_config.patch, jabberd-delay_jobs.patch, j...
bszx
bszx at pld-linux.org
Tue Jan 22 16:12:16 CET 2008
Author: bszx Date: Tue Jan 22 15:12:16 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- jabberd updated to 2.1.22
---- Files affected:
SOURCES:
jabberd-default_config.patch (1.4 -> 1.5) , jabberd-delay_jobs.patch (1.2 -> 1.3) , jabberd-reconnect.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/jabberd-default_config.patch
diff -u SOURCES/jabberd-default_config.patch:1.4 SOURCES/jabberd-default_config.patch:1.5
--- SOURCES/jabberd-default_config.patch:1.4 Tue Sep 16 13:44:41 2003
+++ SOURCES/jabberd-default_config.patch Tue Jan 22 16:12:10 2008
@@ -1,16 +1,15 @@
-diff -durN jabberd-2.0b1.orig/etc/c2s.xml.dist.in jabberd-2.0b1/etc/c2s.xml.dist.in
---- jabberd-2.0b1.orig/etc/c2s.xml.dist.in Fri Aug 29 12:31:38 2003
-+++ jabberd-2.0b1/etc/c2s.xml.dist.in Mon Sep 15 14:27:36 2003
-@@ -6,7 +6,7 @@
- <!-- The process ID file. comment this out if you don't need to know
- to know the process ID from outside the process (eg for control
- scripts) -->
+--- jabberd-2.1.22/etc/c2s.xml.dist.in.orig 2008-01-21 16:17:03.000000000 +0100
++++ jabberd-2.1.22/etc/c2s.xml.dist.in 2008-01-22 14:38:12.000000000 +0100
+@@ -5,7 +5,7 @@
+
+ <!-- The process ID file. Comment this out if you don't need to know
+ the process ID from outside the process (eg for control scripts) -->
- <pidfile>@localstatedir@/jabberd/pid/c2s.pid</pidfile>
+ <pidfile>@localstatedir@/run/jabber/c2s.pid</pidfile>
<!-- Router connection configuration -->
<router>
-@@ -34,7 +34,7 @@
+@@ -60,7 +60,7 @@
<!-- If logging to file, this is the filename of the logfile -->
<!--
@@ -19,27 +18,35 @@
-->
</log>
-@@ -177,7 +177,7 @@
- <!-- Authentication/registration database configuration -->
- <authreg>
+@@ -292,7 +292,7 @@
+ <path>@pkglibdir@</path>
+
<!-- Backend module to use -->
- <module>mysql</module>
+ <module>db</module>
- <!-- Registration configuration -->
- <register>
-@@ -260,7 +260,7 @@
+ <!-- Available authentication mechanisms -->
+ <mechanisms>
+@@ -391,7 +391,7 @@
+ <!-- SQLite driver configuration -->
+ <sqlite>
+ <!-- Database name -->
+- <dbname>@localstatedir@/jabberd/db/sqlite.db</dbname>
++ <dbname>@localstatedir@/lib/jabberd/sqlite.db</dbname>
+
+ <!-- Transacation support. If this is commented out, transactions
+ will be disabled. This might make database accesses faster,
+@@ -405,7 +405,7 @@
<!-- Berkeley DB module configuration -->
<db>
<!-- Directory to store database files under -->
- <path>@localstatedir@/jabberd/db</path>
+ <path>@localstatedir@/lib/jabberd/db</path>
-
+
<!-- Synchronize the database to disk after each write. If you
disable this, database accesses may be faster, but data may
-diff -durN jabberd-2.0b1.orig/etc/jabberd.cfg.dist.in jabberd-2.0b1/etc/jabberd.cfg.dist.in
---- jabberd-2.0b1.orig/etc/jabberd.cfg.dist.in Wed Aug 13 02:28:12 2003
-+++ jabberd-2.0b1/etc/jabberd.cfg.dist.in Mon Sep 15 14:27:36 2003
+--- jabberd-2.1.22/etc/jabberd.cfg.dist.in.orig 2008-01-22 14:17:57.000000000 +0100
++++ jabberd-2.1.22/etc/jabberd.cfg.dist.in 2008-01-22 14:17:57.000000000 +0100
@@ -15,5 +15,10 @@
@jabberd_router_bin@ @sysconfdir@/router.xml
@jabberd_resolver_bin@ @sysconfdir@/resolver.xml
@@ -52,64 +59,18 @@
+# and proper SRV records are set in DNS uncoment this to enable communication
+# with other Jabber servers
+#@jabberd_s2s_bin@ @sysconfdir@/s2s.xml
-diff -durN jabberd-2.0b1.orig/etc/jabberd.cfg.dist.in.orig jabberd-2.0b1/etc/jabberd.cfg.dist.in.orig
---- jabberd-2.0b1.orig/etc/jabberd.cfg.dist.in.orig Thu Jan 1 01:00:00 1970
-+++ jabberd-2.0b1/etc/jabberd.cfg.dist.in.orig Mon Sep 15 14:27:36 2003
-@@ -0,0 +1,19 @@
-+#
-+# jabberd config file
-+#
-+#
-+# This file tells the jabberd wrapper what programs to launch,
-+# and the config files to launch them with. If the config file
-+# is left out, then the system default will be used.
-+#
-+# To run multiple Session Managers, just list them all seperatly
-+# and provide the path to the appropriate config files.
-+#
-+# program [ path to config file ]
-+#
-+
-+ at jabberd_router_bin@ @sysconfdir@/router.xml
-+ at jabberd_resolver_bin@ @sysconfdir@/resolver.xml
-+ at jabberd_sm_bin@ @sysconfdir@/sm.xml
-+ at jabberd_s2s_bin@ @sysconfdir@/s2s.xml
-+ at jabberd_c2s_bin@ @sysconfdir@/c2s.xml
-diff -durN jabberd-2.0b1.orig/etc/jabberd.cfg.dist.in.rej jabberd-2.0b1/etc/jabberd.cfg.dist.in.rej
---- jabberd-2.0b1.orig/etc/jabberd.cfg.dist.in.rej Thu Jan 1 01:00:00 1970
-+++ jabberd-2.0b1/etc/jabberd.cfg.dist.in.rej Mon Sep 15 14:27:36 2003
-@@ -0,0 +1,18 @@
-+***************
-+*** 15,19 ****
-+ router @sysconfdir@/router.xml.dist.in
-+ resolver @sysconfdir@/resolver.xml.dist.in
-+ sm @sysconfdir@/sm.xml.dist.in
-+- s2s @sysconfdir@/s2s.xml.dist.in
-+ c2s @sysconfdir@/c2s.xml.dist.in
-+--- 15,24 ----
-+ router @sysconfdir@/router.xml.dist.in
-+ resolver @sysconfdir@/resolver.xml.dist.in
-+ sm @sysconfdir@/sm.xml.dist.in
-+ c2s @sysconfdir@/c2s.xml.dist.in
-++
-++
-++ # After sm and c2s are configured to use a fully qualified domain name
-++ # and proper SRV records are set in DNS uncoment this to enable communication
-++ # with other Jabber servers
-++ #s2s @sysconfdir@/s2s.xml.dist.in
-diff -durN jabberd-2.0b1.orig/etc/resolver.xml.dist.in jabberd-2.0b1/etc/resolver.xml.dist.in
---- jabberd-2.0b1.orig/etc/resolver.xml.dist.in Mon Aug 25 23:12:17 2003
-+++ jabberd-2.0b1/etc/resolver.xml.dist.in Mon Sep 15 14:27:36 2003
-@@ -6,7 +6,7 @@
- <!-- The process ID file. comment this out if you don't need to know
- to know the process ID from outside the process (eg for control
- scripts) -->
+--- jabberd-2.1.22/etc/resolver.xml.dist.in.orig 2008-01-21 16:17:03.000000000 +0100
++++ jabberd-2.1.22/etc/resolver.xml.dist.in 2008-01-22 14:33:06.000000000 +0100
+@@ -5,7 +5,7 @@
+
+ <!-- The process ID file. Comment this out if you don't need to know
+ the process ID from outside the process (eg for control scripts) -->
- <pidfile>@localstatedir@/jabberd/pid/resolver.pid</pidfile>
+ <pidfile>@localstatedir@/run/jabber/resolver.pid</pidfile>
<!-- Router connection configuration -->
<router>
-@@ -34,7 +34,7 @@
+@@ -60,7 +60,7 @@
<!-- If logging to file, this is the filename of the logfile -->
<!--
@@ -118,19 +79,18 @@
-->
</log>
-diff -durN jabberd-2.0b1.orig/etc/router.xml.dist.in jabberd-2.0b1/etc/router.xml.dist.in
---- jabberd-2.0b1.orig/etc/router.xml.dist.in Tue Aug 26 03:28:45 2003
-+++ jabberd-2.0b1/etc/router.xml.dist.in Mon Sep 15 14:29:23 2003
-@@ -6,7 +6,7 @@
- <!-- The process ID file. comment this out if you don't need to know
- to know the process ID from outside the process (eg for control
- scripts) -->
+--- jabberd-2.1.22/etc/router.xml.dist.in.orig 2008-01-21 16:17:03.000000000 +0100
++++ jabberd-2.1.22/etc/router.xml.dist.in 2008-01-22 14:33:34.000000000 +0100
+@@ -5,7 +5,7 @@
+
+ <!-- The process ID file. Comment this out if you don't need to know
+ the process ID from outside the process (eg for control scripts) -->
- <pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile>
+ <pidfile>@localstatedir@/run/jabber/router.pid</pidfile>
- <!-- Log configuration - type is either "syslog" or "file" -->
+ <!-- Log configuration - type is "syslog", "file" or "stdout" -->
<log type='syslog'>
-@@ -15,14 +15,14 @@
+@@ -18,14 +18,14 @@
<!-- If logging to file, this is the filename of the logfile -->
<!--
@@ -147,9 +107,9 @@
<!-- Port to bind to (default: 5347) -->
<port>5347</port>
-@@ -123,6 +123,9 @@
+@@ -152,6 +152,9 @@
<!--
- <alias name='msn.domain.com' target='msn-linker'/>
+ <alias name='conference.domain.com' target='muclinker'/>
-->
+ <alias name='jud.localhost' target='jud-linker'/>
+ <alias name='muc.localhost' target='muc-linker'/>
@@ -157,19 +117,18 @@
</aliases>
<!-- Access control information -->
-diff -durN jabberd-2.0b1.orig/etc/s2s.xml.dist.in jabberd-2.0b1/etc/s2s.xml.dist.in
---- jabberd-2.0b1.orig/etc/s2s.xml.dist.in Tue Aug 26 03:37:09 2003
-+++ jabberd-2.0b1/etc/s2s.xml.dist.in Mon Sep 15 14:27:36 2003
-@@ -6,7 +6,7 @@
- <!-- The process ID file. comment this out if you don't need to know
- to know the process ID from outside the process (eg for control
- scripts) -->
+--- jabberd-2.1.22/etc/s2s.xml.dist.in.orig 2008-01-21 16:17:03.000000000 +0100
++++ jabberd-2.1.22/etc/s2s.xml.dist.in 2008-01-22 14:33:51.000000000 +0100
+@@ -5,7 +5,7 @@
+
+ <!-- The process ID file. Comment this out if you don't need to know
+ the process ID from outside the process (eg for control scripts) -->
- <pidfile>@localstatedir@/jabberd/pid/s2s.pid</pidfile>
+ <pidfile>@localstatedir@/run/jabber/s2s.pid</pidfile>
<!-- Router connection configuration -->
<router>
-@@ -44,7 +44,7 @@
+@@ -70,7 +70,7 @@
<!-- if logging to file, this is the filename of the logfile -->
<!--
@@ -178,19 +137,18 @@
-->
</log>
-diff -durN jabberd-2.0b1.orig/etc/sm.xml.dist.in jabberd-2.0b1/etc/sm.xml.dist.in
---- jabberd-2.0b1.orig/etc/sm.xml.dist.in Tue Sep 2 02:03:00 2003
-+++ jabberd-2.0b1/etc/sm.xml.dist.in Mon Sep 15 14:28:16 2003
-@@ -9,7 +9,7 @@
- <!-- The process ID file. comment this out if you don't need to know
- to know the process ID from outside the process (eg for control
- scripts) -->
+--- jabberd-2.1.22/etc/sm.xml.dist.in.orig 2008-01-21 16:17:03.000000000 +0100
++++ jabberd-2.1.22/etc/sm.xml.dist.in 2008-01-22 14:37:53.000000000 +0100
+@@ -8,7 +8,7 @@
+
+ <!-- The process ID file. Comment this out if you don't need to know
+ the process ID from outside the process (eg for control scripts) -->
- <pidfile>@localstatedir@/jabberd/pid/sm.pid</pidfile>
+ <pidfile>@localstatedir@/run/jabber/sm.pid</pidfile>
<!-- Router connection configuration -->
<router>
-@@ -37,14 +37,14 @@
+@@ -63,7 +63,7 @@
<!-- If logging to file, this is the filename of the logfile -->
<!--
@@ -199,15 +157,16 @@
-->
</log>
- <!-- Storage database configuration -->
- <storage>
+@@ -73,7 +73,7 @@
+ <path>@pkglibdir@</path>
+
<!-- By default, we use the MySQL driver for all storage -->
- <driver>mysql</driver>
+ <driver>db</driver>
- <!-- Other storage drivers for specific purposes -->
- <!--
-@@ -96,7 +96,7 @@
+ <!-- Its also possible to explicitly list alternate drivers for
+ specific data types. -->
+@@ -152,7 +152,7 @@
<!-- Berkeley DB driver configuration -->
<db>
<!-- Directory to store database files under -->
@@ -216,9 +175,18 @@
<!-- Synchronize the database to disk after each write. If you
disable this, database accesses may be faster, but data may
-@@ -331,6 +331,8 @@
-
- </items>
+@@ -177,7 +177,7 @@
+ <!-- SQLite driver configuration -->
+ <sqlite>
+ <!-- Database name -->
+- <dbname>@localstatedir@/jabberd/db/sqlite.db</dbname>
++ <dbname>@localstatedir@/lib/jabberd/sqlite.db</dbname>
+
+ <!-- Transacation support. If this is commented out, transactions
+ will be disabled. This might make database accesses faster,
+@@ -532,6 +532,8 @@
+ </serverinfo>
+ -->
+ <browse/>
+
================================================================
Index: SOURCES/jabberd-delay_jobs.patch
diff -u SOURCES/jabberd-delay_jobs.patch:1.2 SOURCES/jabberd-delay_jobs.patch:1.3
--- SOURCES/jabberd-delay_jobs.patch:1.2 Thu Dec 16 08:40:59 2004
+++ SOURCES/jabberd-delay_jobs.patch Tue Jan 22 16:12:11 2008
@@ -1,11 +1,10 @@
-diff -durN jabberd-2.0b1.orig/tools/jabberd.in jabberd-2.0b1/tools/jabberd.in
---- jabberd-2.0b1.orig/tools/jabberd.in Wed Sep 17 07:12:47 2003
-+++ jabberd-2.0b1/tools/jabberd.in Wed Sep 17 07:13:41 2003
-@@ -132,6 +132,7 @@
+--- jabberd-2.1.22/tools/jabberd.in.orig 2008-01-22 14:47:39.000000000 +0100
++++ jabberd-2.1.22/tools/jabberd.in 2008-01-22 14:49:32.000000000 +0100
+@@ -146,6 +146,7 @@
foreach my $job (@programs)
{
- &LaunchJob($job->[0],$job->[1],$job->[2]);
+ &LaunchJob($job->[0],$job->[1]);
+ sleep(1);
}
-
+ unless (!$daemon || $debug)
================================================================
Index: SOURCES/jabberd-reconnect.patch
diff -u SOURCES/jabberd-reconnect.patch:1.1 SOURCES/jabberd-reconnect.patch:1.2
--- SOURCES/jabberd-reconnect.patch:1.1 Thu Feb 16 08:41:36 2006
+++ SOURCES/jabberd-reconnect.patch Tue Jan 22 16:12:11 2008
@@ -1,9 +1,8 @@
-diff -urN jabberd-2.0s10.org/c2s/authreg_mysql.c jabberd-2.0s10/c2s/authreg_mysql.c
---- jabberd-2.0s10.org/c2s/authreg_mysql.c 2005-06-22 22:32:05.000000000 +0200
-+++ jabberd-2.0s10/c2s/authreg_mysql.c 2006-02-16 08:33:03.376431944 +0100
-@@ -526,8 +526,10 @@
- return 1;
- }
+--- jabberd-2.1.22/storage/authreg_mysql.c.orig 2008-01-21 16:16:58.000000000 +0100
++++ jabberd-2.1.22/storage/authreg_mysql.c 2008-01-22 14:57:56.000000000 +0100
+@@ -421,8 +421,10 @@
+
+ mysql_query(conn, "SET NAMES 'utf8'");
- /* Set reconnect flag to 1 (set to 0 by default from mysql 5 on) */
- conn->reconnect = 1;
@@ -14,10 +13,9 @@
ar->user_exists = _ar_mysql_user_exists;
ar->get_password = _ar_mysql_get_password;
-diff -urN jabberd-2.0s10.org/sm/storage_mysql.c jabberd-2.0s10/sm/storage_mysql.c
---- jabberd-2.0s10.org/sm/storage_mysql.c 2005-06-22 22:32:05.000000000 +0200
-+++ jabberd-2.0s10/sm/storage_mysql.c 2006-02-16 08:32:55.702406728 +0100
-@@ -565,8 +565,10 @@
+--- jabberd-2.1.22/storage/storage_mysql.c.orig 2008-01-21 16:16:58.000000000 +0100
++++ jabberd-2.1.22/storage/storage_mysql.c 2008-01-22 14:57:49.000000000 +0100
+@@ -632,8 +632,10 @@
return st_FAILED;
}
@@ -28,5 +26,5 @@
+ mysql_options(conn, MYSQL_OPT_RECONNECT, (char *)&reconnect);
+ }
- data = (drvdata_t) malloc(sizeof(struct drvdata_st));
- memset(data, 0, sizeof(struct drvdata_st));
+ data = (drvdata_t) calloc(1, sizeof(struct drvdata_st));
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/jabberd-default_config.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/jabberd-delay_jobs.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/jabberd-reconnect.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list