diff -r 6becb64fe77d -r 869d6847b13e jabberd/jabberd.patch
--- a/jabberd/jabberd.patch	Tue Aug 28 18:30:35 2012 +0200
+++ b/jabberd/jabberd.patch	Tue Aug 28 18:30:40 2012 +0200
@@ -1,7 +1,8 @@
+diff -Nau etc/c2s.xml.dist.in.orig etc/c2s.xml.dist.in
 Index: etc/c2s.xml.dist.in
---- etc/c2s.xml.dist.in.orig	2009-06-30 11:38:16 +0200
-+++ etc/c2s.xml.dist.in	2009-06-30 20:45:22 +0200
-@@ -50,18 +50,16 @@
+--- etc/c2s.xml.dist.in.orig	2012-05-22 22:27:51.000000000 +0200
++++ etc/c2s.xml.dist.in	2012-08-27 13:44:20.119445160 +0200
+@@ -50,13 +50,13 @@
    </router>
  
    <!-- Log configuration - type is "syslog", "file" or "stdout" -->
@@ -17,14 +18,9 @@
 +    <!-- <facility>local3</facility> -->
  
      <!-- If logging to file, this is the filename of the logfile -->
--    <!--
-     <file>@localstatedir@/jabberd/log/c2s.log</file>
--    -->
-   </log>
- 
-   <!-- Local network configuration -->
-@@ -137,7 +135,7 @@
-     <id password-change='true' /> -->
+     <!--
+@@ -154,7 +154,7 @@
+     <id password-change='mu' /> -->
  
      <!-- IP address to bind to (default: 0.0.0.0) -->
 -    <ip>0.0.0.0</ip>
@@ -32,7 +28,7 @@
  
      <!-- Port to bind to, or 0 to disable unencrypted access to the
           server (default: 5222) -->
-@@ -331,7 +329,7 @@
+@@ -370,7 +370,7 @@
      <path>@pkglibdir@</path>
  
      <!-- Backend module to use -->
@@ -41,11 +37,12 @@
  
      <!-- Available authentication mechanisms -->
      <mechanisms>
+diff -Nau etc/router.xml.dist.in.orig etc/router.xml.dist.in
 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
-@@ -8,24 +8,22 @@
-   <pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile>
+--- etc/router.xml.dist.in.orig	2012-05-04 18:24:36.000000000 +0200
++++ etc/router.xml.dist.in	2012-08-27 13:47:20.357743449 +0200
+@@ -8,13 +8,13 @@
+   <pidfile>@localstatedir@/@package@/pid/router.pid</pidfile>
  
    <!-- Log configuration - type is "syslog", "file" or "stdout" -->
 -  <log type='syslog'>
@@ -60,11 +57,8 @@
 +    <!-- <facility>local3</facility> -->
  
      <!-- If logging to file, this is the filename of the logfile -->
--    <!--
-     <file>@localstatedir@/jabberd/log/router.log</file>
--    -->
-   </log>
- 
+     <!--
+@@ -30,7 +30,7 @@
    <!-- Local network configuration -->
    <local>
      <!-- IP address to bind to (default: 0.0.0.0) -->
@@ -73,10 +67,11 @@
  
      <!-- Port to bind to (default: 5347) -->
      <port>5347</port>
+diff -Nau etc/s2s.xml.dist.in.orig etc/s2s.xml.dist.in
 Index: etc/s2s.xml.dist.in
---- etc/s2s.xml.dist.in.orig	2009-06-30 11:38:16 +0200
-+++ etc/s2s.xml.dist.in	2009-06-30 20:45:06 +0200
-@@ -60,25 +60,23 @@
+--- etc/s2s.xml.dist.in.orig	2012-08-06 20:18:46.000000000 +0200
++++ etc/s2s.xml.dist.in	2012-08-27 13:45:50.771011934 +0200
+@@ -60,13 +60,13 @@
    </router>
  
    <!-- Log configuration - type is "syslog", "file" or "stdout" -->
@@ -92,12 +87,8 @@
 +    <!-- <facility>local3</facility> -->
  
      <!-- if logging to file, this is the filename of the logfile -->
--    <!--
-     <file>@localstatedir@/jabberd/log/s2s.log</file>
--    -->
-   </log>
- 
-   <!-- Local network configuration -->
+     <!--
+@@ -83,7 +83,7 @@
    <local>
      <!-- IP and port to listen for incoming s2s connections on
                                             (default: 0.0.0.0, 5269) -->
@@ -106,9 +97,10 @@
      <port>5269</port>
  
      <!-- Multihomed machines (with more than one interface and IP address)
+diff -Nau etc/sm.xml.dist.in.orig etc/sm.xml.dist.in
 Index: etc/sm.xml.dist.in
---- etc/sm.xml.dist.in.orig	2009-06-30 11:38:16 +0200
-+++ etc/sm.xml.dist.in	2009-06-30 20:45:36 +0200
+--- etc/sm.xml.dist.in.orig	2012-05-04 18:24:36.000000000 +0200
++++ etc/sm.xml.dist.in	2012-08-27 13:41:59.772838992 +0200
 @@ -50,13 +50,13 @@
    </router>
  
@@ -126,7 +118,7 @@
  
      <!-- If logging to file, this is the filename of the logfile -->
      <!--
-@@ -85,7 +85,7 @@
+@@ -90,7 +90,7 @@
      <path>@pkglibdir@</path>
  
      <!-- By default, we use the SQLite driver for all storage -->
@@ -135,9 +127,10 @@
  
      <!-- Its also possible to explicitly list alternate drivers for
           specific data types. -->
+diff -Nau sm/mod_iq_time.c.orig sm/mod_iq_time.c
 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
+--- sm/mod_iq_time.c.orig	2011-10-22 21:56:00.000000000 +0200
++++ sm/mod_iq_time.c	2012-08-27 13:41:59.773059371 +0200
 @@ -39,6 +39,7 @@
  static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pkt_t pkt)
  {
@@ -156,10 +149,11 @@
  #else
      snprintf(buf, 64, "%+03d:%02d", (int) tm->tm_gmtoff/(60*60), (int) tm->tm_gmtoff%(60*60));
  #endif
+diff -Nau sm/mod_roster.c.orig sm/mod_roster.c
 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
-@@ -635,6 +635,9 @@
+--- sm/mod_roster.c.orig	2012-02-12 22:36:18.000000000 +0100
++++ sm/mod_roster.c	2012-08-27 13:41:59.773438877 +0200
+@@ -717,6 +717,9 @@
      if(user->sessions == NULL)
          return mod_PASS;
  
@@ -169,9 +163,10 @@
      /* build a new packet to push out to everyone */
      pkt = pkt_create(user->sm, "iq", "set", NULL, NULL);
      pkt_id_new(pkt);
+diff -Nau util/util.h.orig util/util.h
 Index: util/util.h
---- util/util.h.orig	2009-06-30 11:38:16 +0200
-+++ util/util.h	2009-06-30 20:45:06 +0200
+--- util/util.h.orig	2012-08-22 08:03:58.000000000 +0200
++++ util/util.h	2012-08-27 13:41:59.773719964 +0200
 @@ -30,6 +30,8 @@
  #include <time.h>
  #include <errno.h>