michael@541: diff -Nau etc/c2s.xml.dist.in.orig etc/c2s.xml.dist.in
michael@224: Index: etc/c2s.xml.dist.in
michael@541: --- etc/c2s.xml.dist.in.orig	2012-05-22 22:27:51.000000000 +0200
michael@541: +++ etc/c2s.xml.dist.in	2012-08-27 13:44:20.119445160 +0200
michael@693: @@ -50,18 +50,16 @@
michael@224:    </router>
michael@224:  
michael@224:    <!-- Log configuration - type is "syslog", "file" or "stdout" -->
michael@224: -  <log type='syslog'>
michael@224: +  <log type='file'>
michael@224:      <!-- If logging to syslog, this is the log ident -->
michael@224: -    <ident>jabberd/c2s</ident>
michael@224: +    <!-- <ident>jabberd/c2s</ident> -->
michael@224:  
michael@224:      <!-- If logging to syslog, this is the log facility
michael@224:           (local0 - local7)                        [default: local3] -->
michael@224: -    <facility>local3</facility>
michael@224: +    <!-- <facility>local3</facility> -->
michael@224:  
michael@224:      <!-- If logging to file, this is the filename of the logfile -->
michael@693: -    <!--
michael@693:      <file>@localstatedir@/@package@/log/c2s.log</file>
michael@693: -    -->
michael@693:  
michael@693:      <!-- Filename of the debug logfile -->
michael@541:      <!--
michael@693: @@ -154,7 +152,7 @@
michael@541:      <id password-change='mu' /> -->
michael@224:  
michael@224:      <!-- IP address to bind to (default: 0.0.0.0) -->
michael@224: -    <ip>0.0.0.0</ip>
michael@224: +    <ip>127.0.0.1</ip>
michael@224:  
michael@224:      <!-- Port to bind to, or 0 to disable unencrypted access to the
michael@224:           server (default: 5222) -->
michael@541: diff -Nau etc/router.xml.dist.in.orig etc/router.xml.dist.in
michael@224: Index: etc/router.xml.dist.in
michael@541: --- etc/router.xml.dist.in.orig	2012-05-04 18:24:36.000000000 +0200
michael@541: +++ etc/router.xml.dist.in	2012-08-27 13:47:20.357743449 +0200
michael@693: @@ -8,18 +8,16 @@
michael@541:    <pidfile>@localstatedir@/@package@/pid/router.pid</pidfile>
michael@224:  
michael@224:    <!-- Log configuration - type is "syslog", "file" or "stdout" -->
michael@224: -  <log type='syslog'>
michael@224: +  <log type='file'>
michael@224:      <!-- If logging to syslog, this is the log ident -->
michael@224: -    <ident>jabberd/router</ident>
michael@224: +    <!-- <ident>jabberd/router</ident> -->
michael@224:  
michael@224:      <!-- If logging to syslog, this is the log facility
michael@224:           (local0 - local7)                        [default: local3] -->
michael@224: -    <facility>local3</facility>
michael@224: +    <!-- <facility>local3</facility> -->
michael@224:  
michael@224:      <!-- If logging to file, this is the filename of the logfile -->
michael@693: -    <!--
michael@693:      <file>@localstatedir@/@package@/log/router.log</file>
michael@693: -    -->
michael@693:  
michael@693:      <!-- Filename of the debug logfile -->
michael@541:      <!--
michael@693: @@ -30,7 +28,7 @@
michael@224:    <!-- Local network configuration -->
michael@224:    <local>
michael@224:      <!-- IP address to bind to (default: 0.0.0.0) -->
michael@224: -    <ip>0.0.0.0</ip>
michael@224: +    <ip>127.0.0.1</ip>
michael@224:  
michael@224:      <!-- Port to bind to (default: 5347) -->
michael@224:      <port>5347</port>
michael@541: diff -Nau etc/s2s.xml.dist.in.orig etc/s2s.xml.dist.in
michael@224: Index: etc/s2s.xml.dist.in
michael@541: --- etc/s2s.xml.dist.in.orig	2012-08-06 20:18:46.000000000 +0200
michael@541: +++ etc/s2s.xml.dist.in	2012-08-27 13:45:50.771011934 +0200
michael@693: @@ -60,18 +60,16 @@
michael@224:    </router>
michael@224:  
michael@224:    <!-- Log configuration - type is "syslog", "file" or "stdout" -->
michael@224: -  <log type='syslog'>
michael@224: +  <log type='file'>
michael@224:      <!-- If logging to syslog, this is the log ident -->
michael@224: -    <ident>jabberd/s2s</ident>
michael@224: +    <!-- <ident>jabberd/s2s</ident> -->
michael@224:  
michael@224:      <!-- If logging to syslog, this is the log facility
michael@224:           (local0 - local7)                        [default: local3] -->
michael@224: -    <facility>local3</facility>
michael@224: +    <!-- <facility>local3</facility> -->
michael@224:  
michael@224:      <!-- if logging to file, this is the filename of the logfile -->
michael@693: -    <!--
michael@693:      <file>@localstatedir@/@package@/log/s2s.log</file>
michael@693: -    -->
michael@693:  
michael@693:      <!-- Filename of the debug logfile -->
michael@541:      <!--
michael@693: @@ -83,7 +81,7 @@
michael@224:    <local>
michael@224:      <!-- IP and port to listen for incoming s2s connections on
michael@224:                                             (default: 0.0.0.0, 5269) -->
michael@224: -    <ip>0.0.0.0</ip>
michael@224: +    <ip>127.0.0.1</ip>
michael@224:      <port>5269</port>
michael@224:  
michael@224:      <!-- Multihomed machines (with more than one interface and IP address)
michael@541: diff -Nau etc/sm.xml.dist.in.orig etc/sm.xml.dist.in
michael@224: Index: etc/sm.xml.dist.in
michael@541: --- etc/sm.xml.dist.in.orig	2012-05-04 18:24:36.000000000 +0200
michael@541: +++ etc/sm.xml.dist.in	2012-08-27 13:41:59.772838992 +0200
michael@224: @@ -50,13 +50,13 @@
michael@224:    </router>
michael@224:  
michael@224:    <!-- Log configuration - type is "syslog", "file" or "stdout" -->
michael@224: -  <log type='syslog'>
michael@224: +  <log type='file'>
michael@224:      <!-- If logging to syslog, this is the log ident -->
michael@224: -    <ident>jabberd/sm</ident>
michael@224: +    <!-- <ident>jabberd/sm</ident> -->
michael@224:  
michael@224:      <!-- If logging to syslog, this is the log facility
michael@224:           (local0 - local7)                        [default: local3] -->
michael@224: -    <facility>local3</facility>
michael@224: +    <!-- <facility>local3</facility> -->
michael@224:  
michael@224:      <!-- If logging to file, this is the filename of the logfile -->
michael@224:      <!--
michael@541: diff -Nau sm/mod_iq_time.c.orig sm/mod_iq_time.c
michael@224: Index: sm/mod_iq_time.c
michael@541: --- sm/mod_iq_time.c.orig	2011-10-22 21:56:00.000000000 +0200
michael@541: +++ sm/mod_iq_time.c	2012-08-27 13:41:59.773059371 +0200
michael@224: @@ -39,6 +39,7 @@
michael@224:  static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pkt_t pkt)
michael@224:  {
michael@224:      time_t t;
michael@224: +    time_t tzone;
michael@224:      struct tm *tm;
michael@224:      char buf[64];
michael@224:      char *c;
michael@224: @@ -78,7 +79,8 @@
michael@224:      datetime_out(t, dt_DATETIME, buf, 64);
michael@224:      nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "utc", buf);
michael@224:  #ifdef HAVE_TZSET
michael@224: -    snprintf(buf, 64, "%+03d:%02d", -((int)timezone)/(60*60), -((int)timezone)%(60*60));
michael@224: +    tzone = (time_t)((long)mktime(gmtime(&t)) - (long)t);
michael@224: +    snprintf(buf, 64, "%+03d:%02d", (int) -tzone/(60*60), (int) -tzone%(60*60));
michael@224:  #else
michael@224:      snprintf(buf, 64, "%+03d:%02d", (int) tm->tm_gmtoff/(60*60), (int) tm->tm_gmtoff%(60*60));
michael@224:  #endif
michael@541: diff -Nau sm/mod_roster.c.orig sm/mod_roster.c
michael@224: Index: sm/mod_roster.c
michael@541: --- sm/mod_roster.c.orig	2012-02-12 22:36:18.000000000 +0100
michael@541: +++ sm/mod_roster.c	2012-08-27 13:41:59.773438877 +0200
michael@541: @@ -717,6 +717,9 @@
michael@224:      if(user->sessions == NULL)
michael@224:          return mod_PASS;
michael@224:  
michael@224: +    /* We have to free old packet - Lemming's memory leak fix */
michael@224: +    pkt_free(pkt);
michael@224: +
michael@224:      /* build a new packet to push out to everyone */
michael@224:      pkt = pkt_create(user->sm, "iq", "set", NULL, NULL);
michael@224:      pkt_id_new(pkt);
michael@693: diff -Nau tools/jabberd.in.orig tools/jabberd.in
michael@693: Index: tools/jabberd.in
michael@693: --- tools/jabberd.in.orig	2012-02-12 22:38:25.000000000 +0100
michael@693: +++ tools/jabberd.in	2012-09-16 11:21:49.325189601 +0200
michael@693: @@ -65,7 +65,7 @@
michael@693:  
michael@693:  
michael@693:  #-----------------------------------------------------------------------------
michael@693: -# Setup the jobs: router, sm, c2s, s2s
michael@693: +# Setup the jobs: router, sm, c2s, s2s, mu-conference
michael@693:  #-----------------------------------------------------------------------------
michael@693:  $jobs{jabberd}->{prefix}  = "JBRD";
michael@693:  
michael@693: @@ -85,12 +85,17 @@
michael@693:  $jobs{s2s}->{config} = "$config_dir/s2s.xml";
michael@693:  $jobs{s2s}->{prefix} = "S2S";
michael@693:  
michael@693: +$jobs{muc}->{cmd} = "$Bin/mu-conference";
michael@693: +$jobs{muc}->{config} = "$config_dir/muc.xml";
michael@693: +$jobs{muc}->{prefix} = "MUC";
michael@693: +
michael@693:  if ($config eq "internal")
michael@693:  {
michael@693:      $programs[0] = ["router"];
michael@693:      $programs[1] = ["sm"];
michael@693:      $programs[2] = ["c2s"];
michael@693:      $programs[3] = ["s2s"];
michael@693: +    $programs[4] = ["muc"];
michael@693:  }
michael@693:  else
michael@693:  {
michael@541: diff -Nau util/util.h.orig util/util.h
michael@224: Index: util/util.h
michael@541: --- util/util.h.orig	2012-08-22 08:03:58.000000000 +0200
michael@541: +++ util/util.h	2012-08-27 13:41:59.773719964 +0200
michael@224: @@ -30,6 +30,8 @@
michael@224:  #include <time.h>
michael@224:  #include <errno.h>
michael@224:  #include <assert.h>
michael@224: +#include <sys/types.h>
michael@224: +#include <sys/socket.h>
michael@224:  
michael@224:  #include <expat.h>
michael@224: