# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1347902162 -7200
# Node ID 165d980aa5f15b5c0911ea7ce949c77bfe153290
# Parent  67831a9de1683c871f8f482c29ad154bb0b1a34d
Include forgotten patch logic and multiuser conference, and improve
default configuration to log services in appropriate paths.

diff -r 67831a9de168 -r 165d980aa5f1 jabberd/jabberd.patch
--- a/jabberd/jabberd.patch	Mon Sep 17 19:13:34 2012 +0200
+++ b/jabberd/jabberd.patch	Mon Sep 17 19:16:02 2012 +0200
@@ -2,7 +2,7 @@
 Index: etc/c2s.xml.dist.in
 --- 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 @@
+@@ -50,18 +50,16 @@
    </router>
  
    <!-- Log configuration - type is "syslog", "file" or "stdout" -->
@@ -18,8 +18,13 @@
 +    <!-- <facility>local3</facility> -->
  
      <!-- If logging to file, this is the filename of the logfile -->
+-    <!--
+     <file>@localstatedir@/@package@/log/c2s.log</file>
+-    -->
+ 
+     <!-- Filename of the debug logfile -->
      <!--
-@@ -154,7 +154,7 @@
+@@ -154,7 +152,7 @@
      <id password-change='mu' /> -->
  
      <!-- IP address to bind to (default: 0.0.0.0) -->
@@ -28,20 +33,11 @@
  
      <!-- Port to bind to, or 0 to disable unencrypted access to the
           server (default: 5222) -->
-@@ -370,7 +370,7 @@
-     <path>@pkglibdir@</path>
- 
-     <!-- Backend module to use -->
--    <module>sqlite</module>
-+    <module>db</module>
- 
-     <!-- 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	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 @@
+@@ -8,18 +8,16 @@
    <pidfile>@localstatedir@/@package@/pid/router.pid</pidfile>
  
    <!-- Log configuration - type is "syslog", "file" or "stdout" -->
@@ -57,8 +53,13 @@
 +    <!-- <facility>local3</facility> -->
  
      <!-- If logging to file, this is the filename of the logfile -->
+-    <!--
+     <file>@localstatedir@/@package@/log/router.log</file>
+-    -->
+ 
+     <!-- Filename of the debug logfile -->
      <!--
-@@ -30,7 +30,7 @@
+@@ -30,7 +28,7 @@
    <!-- Local network configuration -->
    <local>
      <!-- IP address to bind to (default: 0.0.0.0) -->
@@ -71,7 +72,7 @@
 Index: etc/s2s.xml.dist.in
 --- 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 @@
+@@ -60,18 +60,16 @@
    </router>
  
    <!-- Log configuration - type is "syslog", "file" or "stdout" -->
@@ -87,8 +88,13 @@
 +    <!-- <facility>local3</facility> -->
  
      <!-- if logging to file, this is the filename of the logfile -->
+-    <!--
+     <file>@localstatedir@/@package@/log/s2s.log</file>
+-    -->
+ 
+     <!-- Filename of the debug logfile -->
      <!--
-@@ -83,7 +83,7 @@
+@@ -83,7 +81,7 @@
    <local>
      <!-- IP and port to listen for incoming s2s connections on
                                             (default: 0.0.0.0, 5269) -->
@@ -118,15 +124,6 @@
  
      <!-- If logging to file, this is the filename of the logfile -->
      <!--
-@@ -90,7 +90,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. -->
 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	2011-10-22 21:56:00.000000000 +0200
@@ -163,6 +160,37 @@
      /* build a new packet to push out to everyone */
      pkt = pkt_create(user->sm, "iq", "set", NULL, NULL);
      pkt_id_new(pkt);
+diff -Nau tools/jabberd.in.orig tools/jabberd.in
+Index: tools/jabberd.in
+--- tools/jabberd.in.orig	2012-02-12 22:38:25.000000000 +0100
++++ tools/jabberd.in	2012-09-16 11:21:49.325189601 +0200
+@@ -65,7 +65,7 @@
+ 
+ 
+ #-----------------------------------------------------------------------------
+-# Setup the jobs: router, sm, c2s, s2s
++# Setup the jobs: router, sm, c2s, s2s, mu-conference
+ #-----------------------------------------------------------------------------
+ $jobs{jabberd}->{prefix}  = "JBRD";
+ 
+@@ -85,12 +85,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
+ {
 diff -Nau util/util.h.orig util/util.h
 Index: util/util.h
 --- util/util.h.orig	2012-08-22 08:03:58.000000000 +0200
diff -r 67831a9de168 -r 165d980aa5f1 jabberd/jabberd.spec
--- a/jabberd/jabberd.spec	Mon Sep 17 19:13:34 2012 +0200
+++ b/jabberd/jabberd.spec	Mon Sep 17 19:16:02 2012 +0200
@@ -40,7 +40,7 @@
 Release:      20120800
 
 #   package options
-%option       with_sqlite no
+%option       with_sqlite yes
 %option       with_mysql  no
 %option       with_pgsql  no
 %option       with_pam    no
@@ -100,6 +100,7 @@
 %prep
     %setup -q -n jabberd-%{version}
     %setup -q -D -T -a 1
+    %{l_sed} <%{PATCH0} -e 's;@l_prefix@;%{l_prefix};g' | %{l_patch} -p0 -b
     %{l_shtool} subst \
         -e 's;exec perl;exec %{l_prefix}/bin/perl;' \
         tools/jabberd.in