diff -r 1b852c64b120 -r 6becb64fe77d jabberd/jabberd.patch
--- a/jabberd/jabberd.patch	Tue Aug 28 18:30:25 2012 +0200
+++ b/jabberd/jabberd.patch	Tue Aug 28 18:30:35 2012 +0200
@@ -23,8 +23,8 @@
    </log>
  
    <!-- Local network configuration -->
-@@ -149,7 +147,7 @@
-     <id password-change='mu' /> -->
+@@ -137,7 +135,7 @@
+     <id password-change='true' /> -->
  
      <!-- IP address to bind to (default: 0.0.0.0) -->
 -    <ip>0.0.0.0</ip>
@@ -32,6 +32,15 @@
  
      <!-- Port to bind to, or 0 to disable unencrypted access to the
           server (default: 5222) -->
+@@ -331,7 +329,7 @@
+     <path>@pkglibdir@</path>
+ 
+     <!-- Backend module to use -->
+-    <module>sqlite</module>
++    <module>db</module>
+ 
+     <!-- Available authentication mechanisms -->
+     <mechanisms>
 Index: etc/router.xml.dist.in
 --- etc/router.xml.dist.in.orig	2009-06-30 11:38:16 +0200
 +++ etc/router.xml.dist.in	2009-06-30 20:45:06 +0200
@@ -117,6 +126,15 @@
  
      <!-- If logging to file, this is the filename of the logfile -->
      <!--
+@@ -85,7 +85,7 @@
+     <path>@pkglibdir@</path>
+ 
+     <!-- By default, we use the SQLite driver for all storage -->
+-    <driver>sqlite</driver>
++    <driver>db</driver>
+ 
+     <!-- Its also possible to explicitly list alternate drivers for
+          specific data types. -->
 Index: sm/mod_iq_time.c
 --- sm/mod_iq_time.c.orig	2009-06-30 11:38:15 +0200
 +++ sm/mod_iq_time.c	2009-06-30 20:45:06 +0200
@@ -141,7 +159,7 @@
 Index: sm/mod_roster.c
 --- sm/mod_roster.c.orig	2009-06-30 11:38:15 +0200
 +++ sm/mod_roster.c	2009-06-30 20:45:06 +0200
-@@ -708,6 +708,9 @@
+@@ -635,6 +635,9 @@
      if(user->sessions == NULL)
          return mod_PASS;
  
@@ -163,33 +181,3 @@
  
  #include <expat.h>
  
-Index: tools/jabberd.in
---- tools/jabberd.in.orig	2009-10-31 17:51:42.857115000 +0100
-+++ tools/jabberd.in	2009-10-31 18:07:52.095812899 +0100
-@@ -63,7 +63,7 @@
- 
- 
- #-----------------------------------------------------------------------------
--# Setup the jobs: router, sm, c2s, s2s
-+# Setup the jobs: router, sm, c2s, s2s, mu-conference
- #-----------------------------------------------------------------------------
- $jobs{jabberd}->{prefix}  = "JBRD";
- 
-@@ -83,12 +83,17 @@
- $jobs{s2s}->{config} = "$config_dir/s2s.xml";
- $jobs{s2s}->{prefix} = "S2S";
- 
-+$jobs{muc}->{cmd} = "$Bin/mu-conference";
-+$jobs{muc}->{config} = "$config_dir/muc.xml";
-+$jobs{muc}->{prefix} = "MUC";
-+
- if ($config eq "internal")
- {
-     $programs[0] = ["router"];
-     $programs[1] = ["sm"];
-     $programs[2] = ["c2s"];
-     $programs[3] = ["s2s"];
-+    $programs[4] = ["muc"];
- }
- else
- {