1.1 --- a/jabberd/jabberd.patch Tue Aug 28 18:30:35 2012 +0200
1.2 +++ b/jabberd/jabberd.patch Tue Aug 28 18:30:40 2012 +0200
1.3 @@ -1,7 +1,8 @@
1.4 +diff -Nau etc/c2s.xml.dist.in.orig etc/c2s.xml.dist.in
1.5 Index: etc/c2s.xml.dist.in
1.6 ---- etc/c2s.xml.dist.in.orig 2009-06-30 11:38:16 +0200
1.7 -+++ etc/c2s.xml.dist.in 2009-06-30 20:45:22 +0200
1.8 -@@ -50,18 +50,16 @@
1.9 +--- etc/c2s.xml.dist.in.orig 2012-05-22 22:27:51.000000000 +0200
1.10 ++++ etc/c2s.xml.dist.in 2012-08-27 13:44:20.119445160 +0200
1.11 +@@ -50,13 +50,13 @@
1.12 </router>
1.13
1.14 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
1.15 @@ -17,14 +18,9 @@
1.16 + <!-- <facility>local3</facility> -->
1.17
1.18 <!-- If logging to file, this is the filename of the logfile -->
1.19 -- <!--
1.20 - <file>@localstatedir@/jabberd/log/c2s.log</file>
1.21 -- -->
1.22 - </log>
1.23 -
1.24 - <!-- Local network configuration -->
1.25 -@@ -137,7 +135,7 @@
1.26 - <id password-change='true' /> -->
1.27 + <!--
1.28 +@@ -154,7 +154,7 @@
1.29 + <id password-change='mu' /> -->
1.30
1.31 <!-- IP address to bind to (default: 0.0.0.0) -->
1.32 - <ip>0.0.0.0</ip>
1.33 @@ -32,7 +28,7 @@
1.34
1.35 <!-- Port to bind to, or 0 to disable unencrypted access to the
1.36 server (default: 5222) -->
1.37 -@@ -331,7 +329,7 @@
1.38 +@@ -370,7 +370,7 @@
1.39 <path>@pkglibdir@</path>
1.40
1.41 <!-- Backend module to use -->
1.42 @@ -41,11 +37,12 @@
1.43
1.44 <!-- Available authentication mechanisms -->
1.45 <mechanisms>
1.46 +diff -Nau etc/router.xml.dist.in.orig etc/router.xml.dist.in
1.47 Index: etc/router.xml.dist.in
1.48 ---- etc/router.xml.dist.in.orig 2009-06-30 11:38:16 +0200
1.49 -+++ etc/router.xml.dist.in 2009-06-30 20:45:06 +0200
1.50 -@@ -8,24 +8,22 @@
1.51 - <pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile>
1.52 +--- etc/router.xml.dist.in.orig 2012-05-04 18:24:36.000000000 +0200
1.53 ++++ etc/router.xml.dist.in 2012-08-27 13:47:20.357743449 +0200
1.54 +@@ -8,13 +8,13 @@
1.55 + <pidfile>@localstatedir@/@package@/pid/router.pid</pidfile>
1.56
1.57 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
1.58 - <log type='syslog'>
1.59 @@ -60,11 +57,8 @@
1.60 + <!-- <facility>local3</facility> -->
1.61
1.62 <!-- If logging to file, this is the filename of the logfile -->
1.63 -- <!--
1.64 - <file>@localstatedir@/jabberd/log/router.log</file>
1.65 -- -->
1.66 - </log>
1.67 -
1.68 + <!--
1.69 +@@ -30,7 +30,7 @@
1.70 <!-- Local network configuration -->
1.71 <local>
1.72 <!-- IP address to bind to (default: 0.0.0.0) -->
1.73 @@ -73,10 +67,11 @@
1.74
1.75 <!-- Port to bind to (default: 5347) -->
1.76 <port>5347</port>
1.77 +diff -Nau etc/s2s.xml.dist.in.orig etc/s2s.xml.dist.in
1.78 Index: etc/s2s.xml.dist.in
1.79 ---- etc/s2s.xml.dist.in.orig 2009-06-30 11:38:16 +0200
1.80 -+++ etc/s2s.xml.dist.in 2009-06-30 20:45:06 +0200
1.81 -@@ -60,25 +60,23 @@
1.82 +--- etc/s2s.xml.dist.in.orig 2012-08-06 20:18:46.000000000 +0200
1.83 ++++ etc/s2s.xml.dist.in 2012-08-27 13:45:50.771011934 +0200
1.84 +@@ -60,13 +60,13 @@
1.85 </router>
1.86
1.87 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
1.88 @@ -92,12 +87,8 @@
1.89 + <!-- <facility>local3</facility> -->
1.90
1.91 <!-- if logging to file, this is the filename of the logfile -->
1.92 -- <!--
1.93 - <file>@localstatedir@/jabberd/log/s2s.log</file>
1.94 -- -->
1.95 - </log>
1.96 -
1.97 - <!-- Local network configuration -->
1.98 + <!--
1.99 +@@ -83,7 +83,7 @@
1.100 <local>
1.101 <!-- IP and port to listen for incoming s2s connections on
1.102 (default: 0.0.0.0, 5269) -->
1.103 @@ -106,9 +97,10 @@
1.104 <port>5269</port>
1.105
1.106 <!-- Multihomed machines (with more than one interface and IP address)
1.107 +diff -Nau etc/sm.xml.dist.in.orig etc/sm.xml.dist.in
1.108 Index: etc/sm.xml.dist.in
1.109 ---- etc/sm.xml.dist.in.orig 2009-06-30 11:38:16 +0200
1.110 -+++ etc/sm.xml.dist.in 2009-06-30 20:45:36 +0200
1.111 +--- etc/sm.xml.dist.in.orig 2012-05-04 18:24:36.000000000 +0200
1.112 ++++ etc/sm.xml.dist.in 2012-08-27 13:41:59.772838992 +0200
1.113 @@ -50,13 +50,13 @@
1.114 </router>
1.115
1.116 @@ -126,7 +118,7 @@
1.117
1.118 <!-- If logging to file, this is the filename of the logfile -->
1.119 <!--
1.120 -@@ -85,7 +85,7 @@
1.121 +@@ -90,7 +90,7 @@
1.122 <path>@pkglibdir@</path>
1.123
1.124 <!-- By default, we use the SQLite driver for all storage -->
1.125 @@ -135,9 +127,10 @@
1.126
1.127 <!-- Its also possible to explicitly list alternate drivers for
1.128 specific data types. -->
1.129 +diff -Nau sm/mod_iq_time.c.orig sm/mod_iq_time.c
1.130 Index: sm/mod_iq_time.c
1.131 ---- sm/mod_iq_time.c.orig 2009-06-30 11:38:15 +0200
1.132 -+++ sm/mod_iq_time.c 2009-06-30 20:45:06 +0200
1.133 +--- sm/mod_iq_time.c.orig 2011-10-22 21:56:00.000000000 +0200
1.134 ++++ sm/mod_iq_time.c 2012-08-27 13:41:59.773059371 +0200
1.135 @@ -39,6 +39,7 @@
1.136 static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pkt_t pkt)
1.137 {
1.138 @@ -156,10 +149,11 @@
1.139 #else
1.140 snprintf(buf, 64, "%+03d:%02d", (int) tm->tm_gmtoff/(60*60), (int) tm->tm_gmtoff%(60*60));
1.141 #endif
1.142 +diff -Nau sm/mod_roster.c.orig sm/mod_roster.c
1.143 Index: sm/mod_roster.c
1.144 ---- sm/mod_roster.c.orig 2009-06-30 11:38:15 +0200
1.145 -+++ sm/mod_roster.c 2009-06-30 20:45:06 +0200
1.146 -@@ -635,6 +635,9 @@
1.147 +--- sm/mod_roster.c.orig 2012-02-12 22:36:18.000000000 +0100
1.148 ++++ sm/mod_roster.c 2012-08-27 13:41:59.773438877 +0200
1.149 +@@ -717,6 +717,9 @@
1.150 if(user->sessions == NULL)
1.151 return mod_PASS;
1.152
1.153 @@ -169,9 +163,10 @@
1.154 /* build a new packet to push out to everyone */
1.155 pkt = pkt_create(user->sm, "iq", "set", NULL, NULL);
1.156 pkt_id_new(pkt);
1.157 +diff -Nau util/util.h.orig util/util.h
1.158 Index: util/util.h
1.159 ---- util/util.h.orig 2009-06-30 11:38:16 +0200
1.160 -+++ util/util.h 2009-06-30 20:45:06 +0200
1.161 +--- util/util.h.orig 2012-08-22 08:03:58.000000000 +0200
1.162 ++++ util/util.h 2012-08-27 13:41:59.773719964 +0200
1.163 @@ -30,6 +30,8 @@
1.164 #include <time.h>
1.165 #include <errno.h>
