1.1 --- a/jabberd/jabberd.patch Tue Aug 28 18:30:25 2012 +0200
1.2 +++ b/jabberd/jabberd.patch Tue Aug 28 18:30:35 2012 +0200
1.3 @@ -23,8 +23,8 @@
1.4 </log>
1.5
1.6 <!-- Local network configuration -->
1.7 -@@ -149,7 +147,7 @@
1.8 - <id password-change='mu' /> -->
1.9 +@@ -137,7 +135,7 @@
1.10 + <id password-change='true' /> -->
1.11
1.12 <!-- IP address to bind to (default: 0.0.0.0) -->
1.13 - <ip>0.0.0.0</ip>
1.14 @@ -32,6 +32,15 @@
1.15
1.16 <!-- Port to bind to, or 0 to disable unencrypted access to the
1.17 server (default: 5222) -->
1.18 +@@ -331,7 +329,7 @@
1.19 + <path>@pkglibdir@</path>
1.20 +
1.21 + <!-- Backend module to use -->
1.22 +- <module>sqlite</module>
1.23 ++ <module>db</module>
1.24 +
1.25 + <!-- Available authentication mechanisms -->
1.26 + <mechanisms>
1.27 Index: etc/router.xml.dist.in
1.28 --- etc/router.xml.dist.in.orig 2009-06-30 11:38:16 +0200
1.29 +++ etc/router.xml.dist.in 2009-06-30 20:45:06 +0200
1.30 @@ -117,6 +126,15 @@
1.31
1.32 <!-- If logging to file, this is the filename of the logfile -->
1.33 <!--
1.34 +@@ -85,7 +85,7 @@
1.35 + <path>@pkglibdir@</path>
1.36 +
1.37 + <!-- By default, we use the SQLite driver for all storage -->
1.38 +- <driver>sqlite</driver>
1.39 ++ <driver>db</driver>
1.40 +
1.41 + <!-- Its also possible to explicitly list alternate drivers for
1.42 + specific data types. -->
1.43 Index: sm/mod_iq_time.c
1.44 --- sm/mod_iq_time.c.orig 2009-06-30 11:38:15 +0200
1.45 +++ sm/mod_iq_time.c 2009-06-30 20:45:06 +0200
1.46 @@ -141,7 +159,7 @@
1.47 Index: sm/mod_roster.c
1.48 --- sm/mod_roster.c.orig 2009-06-30 11:38:15 +0200
1.49 +++ sm/mod_roster.c 2009-06-30 20:45:06 +0200
1.50 -@@ -708,6 +708,9 @@
1.51 +@@ -635,6 +635,9 @@
1.52 if(user->sessions == NULL)
1.53 return mod_PASS;
1.54
1.55 @@ -163,33 +181,3 @@
1.56
1.57 #include <expat.h>
1.58
1.59 -Index: tools/jabberd.in
1.60 ---- tools/jabberd.in.orig 2009-10-31 17:51:42.857115000 +0100
1.61 -+++ tools/jabberd.in 2009-10-31 18:07:52.095812899 +0100
1.62 -@@ -63,7 +63,7 @@
1.63 -
1.64 -
1.65 - #-----------------------------------------------------------------------------
1.66 --# Setup the jobs: router, sm, c2s, s2s
1.67 -+# Setup the jobs: router, sm, c2s, s2s, mu-conference
1.68 - #-----------------------------------------------------------------------------
1.69 - $jobs{jabberd}->{prefix} = "JBRD";
1.70 -
1.71 -@@ -83,12 +83,17 @@
1.72 - $jobs{s2s}->{config} = "$config_dir/s2s.xml";
1.73 - $jobs{s2s}->{prefix} = "S2S";
1.74 -
1.75 -+$jobs{muc}->{cmd} = "$Bin/mu-conference";
1.76 -+$jobs{muc}->{config} = "$config_dir/muc.xml";
1.77 -+$jobs{muc}->{prefix} = "MUC";
1.78 -+
1.79 - if ($config eq "internal")
1.80 - {
1.81 - $programs[0] = ["router"];
1.82 - $programs[1] = ["sm"];
1.83 - $programs[2] = ["c2s"];
1.84 - $programs[3] = ["s2s"];
1.85 -+ $programs[4] = ["muc"];
1.86 - }
1.87 - else
1.88 - {
