openpkg-packages/jabberd/jabberd.patch

Index: configure
--- configure.orig	2007-09-23 16:18:12 +0200
+++ configure	2007-09-24 08:00:08 +0200
@@ -30157,7 +30157,7 @@
 fi
 
 if test "x-$enable_mysql" = "x-yes" ; then
-        for i in /usr /usr/local /usr/local/mysql ; do
+        for i in /openpkg-dev ; do
                 for j in include include/mysql "" ; do
                         if test -r "$i/$j/mysql.h" ; then
                                 MYSQL_INCLUDE=$i/$j
@@ -30175,7 +30175,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmysqlclient  $LIBS"
+LIBS="-L$MYSQL_LIBDIR -lmysqlclient  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
Index: etc/c2s.xml.dist.in
--- etc/c2s.xml.dist.in.orig	2007-09-21 10:54:46 +0200
+++ etc/c2s.xml.dist.in	2007-09-24 08:00:08 +0200
@@ -51,18 +51,16 @@
   </router>
 
   <!-- Log configuration - type is "syslog", "file" or "stdout" -->
-  <log type='syslog'>
+  <log type='file'>
     <!-- If logging to syslog, this is the log ident -->
-    <ident>jabberd/c2s</ident>
+    <!-- <ident>jabberd/c2s</ident> -->
 
     <!-- If logging to syslog, this is the log facility
          (local0 - local7)                        [default: local3] -->
-    <facility>local3</facility>
+    <!-- <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 -->
@@ -129,7 +127,7 @@
     <id password-change='true' /> -->
 
     <!-- IP address to bind to (default: 0.0.0.0) -->
-    <ip>0.0.0.0</ip>
+    <ip>127.0.0.1</ip>
 
     <!-- Port to bind to, or 0 to disable unencrypted access to the
          server (default: 5222) -->
@@ -282,7 +280,7 @@
     <path>@pkglibdir@</path>
 
     <!-- Backend module to use -->
-    <module>mysql</module>
+    <module>db</module>
 
     <!-- Available authentication mechanisms -->
     <mechanisms>
Index: etc/resolver.xml.dist.in
--- etc/resolver.xml.dist.in.orig	2007-04-09 16:19:52 +0200
+++ etc/resolver.xml.dist.in	2007-09-24 08:00:08 +0200
@@ -51,18 +51,16 @@
   </router>
 
   <!-- Log configuration - type is "syslog", "file" or "stdout" -->
-  <log type='syslog'>
+  <log type='file'>
     <!-- If logging to syslog, this is the log ident -->
-    <ident>jabberd/resolver</ident>
+    <!-- <ident>jabberd/resolver</ident> -->
 
     <!-- If logging to syslog, this is the log facility
          (local0 - local7)                        [default: local3] -->
-    <facility>local3</facility>
+    <!-- <facility>local3</facility> -->
 
     <!-- If logging to file, this is the filename of the logfile -->
-    <!--
     <file>@localstatedir@/jabberd/log/resolver.log</file>
-    -->
   </log>
 
   <!-- SRV records will be resolved in the following order. The first
Index: etc/router.xml.dist.in
--- etc/router.xml.dist.in.orig	2007-04-09 16:19:52 +0200
+++ etc/router.xml.dist.in	2007-09-24 08:00:08 +0200
@@ -9,24 +9,22 @@
   <pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile>
 
   <!-- Log configuration - type is "syslog", "file" or "stdout" -->
-  <log type='syslog'>
+  <log type='file'>
     <!-- If logging to syslog, this is the log ident -->
-    <ident>jabberd/router</ident>
+    <!-- <ident>jabberd/router</ident> -->
 
     <!-- If logging to syslog, this is the log facility
          (local0 - local7)                        [default: local3] -->
-    <facility>local3</facility>
+    <!-- <facility>local3</facility> -->
 
     <!-- If logging to file, this is the filename of the logfile -->
-    <!--
     <file>@localstatedir@/jabberd/log/router.log</file>
-    -->
   </log>
 
   <!-- Local network configuration -->
   <local>
     <!-- IP address to bind to (default: 0.0.0.0) -->
-    <ip>0.0.0.0</ip>
+    <ip>127.0.0.1</ip>
 
     <!-- Port to bind to (default: 5347) -->
     <port>5347</port>
Index: etc/s2s.xml.dist.in
--- etc/s2s.xml.dist.in.orig	2007-08-31 02:24:28 +0200
+++ etc/s2s.xml.dist.in	2007-09-24 08:00:08 +0200
@@ -61,25 +61,23 @@
   </router>
 
   <!-- Log configuration - type is "syslog", "file" or "stdout" -->
-  <log type='syslog'>
+  <log type='file'>
     <!-- If logging to syslog, this is the log ident -->
-    <ident>jabberd/s2s</ident>
+    <!-- <ident>jabberd/s2s</ident> -->
 
     <!-- If logging to syslog, this is the log facility
          (local0 - local7)                        [default: local3] -->
-    <facility>local3</facility>
+    <!-- <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 -->
   <local>
     <!-- IP and port to listen for incoming s2s connections on
                                            (default: 0.0.0.0, 5269) -->
-    <ip>0.0.0.0</ip>
+    <ip>127.0.0.1</ip>
     <port>5269</port>
 
     <!-- Helper DNS resolver component - if this component is not
Index: etc/sm.xml.dist.in
--- etc/sm.xml.dist.in.orig	2007-09-07 18:18:44 +0200
+++ etc/sm.xml.dist.in	2007-09-24 08:00:08 +0200
@@ -54,13 +54,13 @@
   </router>
 
   <!-- Log configuration - type is "syslog", "file" or "stdout" -->
-  <log type='syslog'>
+  <log type='file'>
     <!-- If logging to syslog, this is the log ident -->
-    <ident>jabberd/sm</ident>
+    <!-- <ident>jabberd/sm</ident> -->
 
     <!-- If logging to syslog, this is the log facility
          (local0 - local7)                        [default: local3] -->
-    <facility>local3</facility>
+    <!-- <facility>local3</facility> -->
 
     <!-- If logging to file, this is the filename of the logfile -->
     <!--
@@ -74,7 +74,7 @@
     <path>@pkglibdir@</path>
 
     <!-- By default, we use the MySQL driver for all storage -->
-    <driver>mysql</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	2007-09-05 17:05:29 +0200
+++ sm/mod_iq_time.c	2007-09-24 08:08:40 +0200
@@ -39,6 +39,7 @@
 static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pkt_t pkt)
 {
     time_t t;
+    time_t tzone;
     struct tm *tm;
     char buf[64];
     char *c;
@@ -78,7 +79,8 @@
     datetime_out(t, dt_DATETIME, buf, 64);
     nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "utc", buf);
 
-    snprintf(buf, 64, "%+03d:%02d", (int) -timezone/(60*60), (int) -timezone%(60*60));
+    tzone = (time_t)((long)mktime(gmtime(&t)) - (long)t);
+    snprintf(buf, 64, "%+03d:%02d", (int) -tzone/(60*60), (int) -tzone%(60*60));
     nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "tzo", buf);
 
 #ifdef ENABLE_SUPERSEDED
Index: sm/mod_roster.c
--- sm/mod_roster.c.orig	2007-09-05 11:35:42 +0200
+++ sm/mod_roster.c	2007-09-24 08:00:08 +0200
@@ -642,6 +642,9 @@
     if(user->sessions == NULL)
         return mod_PASS;
 
+    /* We have to free old packet - Lemming's memory leak fix */
+    pkt_free(pkt);
+
     /* build a new packet to push out to everyone */
     pkt = pkt_create(user->sm, "iq", "set", NULL, NULL);
     pkt_id_new(pkt);
Index: util/util.h
--- util/util.h.orig	2007-09-21 02:33:08 +0200
+++ util/util.h	2007-09-24 08:00:08 +0200
@@ -30,6 +30,8 @@
 #include <time.h>
 #include <errno.h>
 #include <assert.h>
+#include <sys/types.h>
+#include <sys/socket.h>
 
 #include <expat.h>