# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1257012183 -3600
# Node ID a01e65d9774388cda5ac5df35037e6b7b6e42f78
# Parent  29b273d638358a0f8c72e166af21ebb8460fbf85
Use sqlite and new muc by default, enable debug, don't erase SQL files.

diff -r 29b273d63835 -r a01e65d97743 jabberd/jabberd.patch
--- a/jabberd/jabberd.patch	Sat Oct 31 19:00:00 2009 +0100
+++ b/jabberd/jabberd.patch	Sat Oct 31 19:03:03 2009 +0100
@@ -32,15 +32,6 @@
  
      <!-- Port to bind to, or 0 to disable unencrypted access to the
           server (default: 5222) -->
-@@ -331,7 +329,7 @@
-     <path>@pkglibdir@</path>
- 
-     <!-- Backend module to use -->
--    <module>sqlite</module>
-+    <module>db</module>
- 
-     <!-- Available authentication mechanisms -->
-     <mechanisms>
 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
@@ -126,15 +117,6 @@
  
      <!-- If logging to file, this is the filename of the logfile -->
      <!--
-@@ -85,7 +85,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. -->
 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
@@ -181,3 +163,33 @@
  
  #include <expat.h>
  
+Index: tools/jabberd.in
+--- tools/jabberd.in.orig	2009-10-31 17:51:42.857115000 +0100
++++ tools/jabberd.in	2009-10-31 18:07:52.095812899 +0100
+@@ -63,7 +63,7 @@
+ 
+ 
+ #-----------------------------------------------------------------------------
+-# Setup the jobs: router, sm, c2s, s2s
++# Setup the jobs: router, sm, c2s, s2s, mu-conference
+ #-----------------------------------------------------------------------------
+ $jobs{jabberd}->{prefix}  = "JBRD";
+ 
+@@ -83,12 +83,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 -r 29b273d63835 -r a01e65d97743 jabberd/jabberd.spec
--- a/jabberd/jabberd.spec	Sat Oct 31 19:00:00 2009 +0100
+++ b/jabberd/jabberd.spec	Sat Oct 31 19:03:03 2009 +0100
@@ -24,6 +24,7 @@
 #   package version
 %define       V_major 2.2
 %define       V_minor 9
+%define       V_mucon 0.8
 
 #   package information
 Name:         jabberd
@@ -36,17 +37,19 @@
 Group:        InstantMessaging
 License:      JOSL/GPL
 Version:      %{V_major}.%{V_minor}
-Release:      20090707
+Release:      20091028
 
 #   package options
-%option       with_sqlite no
+%option       with_mucon  yes
+%option       with_sqlite yes
 %option       with_mysql  no
 %option       with_pgsql  no
 %option       with_pam    no
 
 #   list of sources
 Source0:      http://codex.xiaoka.com/pub/jabberd2/releases/jabberd-%{version}.tar.gz
-Source1:      rc.jabberd
+Source1:      http://download.gna.org/mu-conference/mu-conference_%{V_mucon}.tar.gz
+Source2:      rc.jabberd
 Patch0:       jabberd.patch
 
 #   build information
@@ -56,6 +59,10 @@
 PreReq:       OpenPKG, openpkg >= 20060823, perl
 BuildPreReq:  db, expat, libiconv, libidn, gpg-error, gcrypt, libgsasl, openssl, udns
 PreReq:       db, expat, libiconv, libidn, gpg-error, gcrypt, libgsasl, openssl, udns
+%if "%{with_mucon}" == "yes"
+BuildPreReq:  glib2
+PreReq:       glib2
+%endif
 %if "%{with_sqlite}" == "yes"
 BuildPreReq:  sqlite
 PreReq:       sqlite
@@ -88,13 +95,40 @@
         url       = http://codex.xiaoka.com/pub/jabberd2/releases/
         regex     = jabberd-(\d+\.\d+(\.\d+)*)\.tar\.gz
     }
+    prog jabberd:mucon = {
+        version   = %{V_mucon}
+        url       = http://download.gna.org/mu-conference/
+        regex     = mu-conference_(__VER__)\.tar\.gz
+    }
 
 %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
+%if "%{with_mucon}" == "yes"
+    %{l_shtool} subst \
+        -e 's;^\(CFLAGS\ *:=.*pkg-config --cflags glib-2.0\);\1 libidn;' \
+        -e 's;^\(LIBS\ *:=.*\);\1 $(LOCLIBS);' \
+        mu-conference_%{V_mucon}/src/Makefile
+    %{l_shtool} subst \
+        -e 's;mu-conference.log;muc.log;g' \
+        mu-conference_%{V_mucon}/src/jcomp/jcr_log.c
+    %{l_shtool} subst \
+        -e 's;<port>[0-9][0-9]*</port>;<port>5347</port>;' \
+        -e 's;<spool>.*</spool>;<spool>%{l_prefix}/var/jabberd/spool/rooms</spool>;' \
+        -e 's;<logdir>\./syslogs</logdir>;<logdir>%{l_prefix}/var/jabberd/log</logdir>;' \
+        -e 's;<logdir>\./logs/</logdir>;<logdir>%{l_prefix}/var/jabberd/spool/logs</logdir>;' \
+        -e 's;<pidfile>.*</pidfile>;<pidfile>%{l_prefix}/var/jabberd/pid/muc.pid</pidfile>;' \
+        -e 's;<URL>.*</URL>;<URL>http://name.host.tld/</URL>;' \
+        -e 's;<stylesheet>.*</stylesheet>;<stylesheet>%{l_prefix}/share/jabberd/style.css</stylesheet>;' \
+        mu-conference_%{V_mucon}/muc-default.xml
+    echo \
+        'muc         @sysconfdir@/muc.xml' \
+        >>etc/jabberd.cfg.dist.in
+%endif
 
 %build
     #   configure program
@@ -124,6 +158,7 @@
         --enable-fs \
         --enable-pipe \
         --enable-ssl \
+        --enable-debug \
         --with-sasl=gsasl \
 %if "%{with_sqlite}" == "yes"
         --enable-sqlite \
@@ -150,7 +185,19 @@
         --enable-shared
 
     #   build program
-    %{l_make} %{l_mflags}
+    %{l_make} %{l_mflags -O}
+
+%if "%{with_mucon}" == "yes"
+    loclibs=''
+    case "%{l_platform -t}" in
+        *-sunos* )
+            loclibs='-lsocket -lnsl'
+            ;;
+    esac
+    ( cd mu-conference_%{V_mucon}
+      %{l_make} %{l_mflags -O} LOCLIBS=$loclibs
+    ) || exit $?
+%endif
 
 %install
     #   create installation filesystem structure
@@ -164,9 +211,29 @@
         $RPM_BUILD_ROOT%{l_prefix}/var/jabberd/pid \
         $RPM_BUILD_ROOT%{l_prefix}/var/jabberd/log
 
-    #   install components
+    #   install required components
     %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
 
+    #   install optional components
+%if "%{with_mucon}" == "yes"
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/share/jabberd \
+        $RPM_BUILD_ROOT%{l_prefix}/var/jabberd/spool/logs \
+        $RPM_BUILD_ROOT%{l_prefix}/var/jabberd/spool/rooms
+    %{l_shtool} install -c -m 644 \
+        mu-conference_%{V_mucon}/muc-default.xml \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/jabberd/muc.xml
+    %{l_shtool} install -c \
+        mu-conference_%{V_mucon}/src/mu-conference \
+        $RPM_BUILD_ROOT%{l_prefix}/bin/
+    %{l_shtool} install -c \
+        mu-conference_%{V_mucon}/style.css \
+        $RPM_BUILD_ROOT%{l_prefix}/share/jabberd
+%endif
+
+    #   strip installation
+    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+
     #   remove unnecessary files
     rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/jabberd/*.dist
     rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/jabberd/templates/*.dist
@@ -174,6 +241,9 @@
 
     #   install run-command script
     %{l_shtool} install -c -m 755 %{l_value -s -a} \
+%if "%{with_mucon}" == "yes"
+        -e 's;\(jabberd_daemons\s*=.*\)\s\s*\(\w\w*\);\1 mucon\2;' \
+%endif
         %{SOURCE rc.jabberd} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
@@ -181,6 +251,7 @@
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
         '%config %{l_prefix}/etc/jabberd/*' \
+        '%config %{l_prefix}/var/jabberd/db/*' \
         '%dir %attr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/jabberd' \
         '%dir %attr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/jabberd/*'
 
diff -r 29b273d63835 -r a01e65d97743 jabberd/rc.jabberd
--- a/jabberd/rc.jabberd	Sat Oct 31 19:00:00 2009 +0100
+++ b/jabberd/rc.jabberd	Sat Oct 31 19:03:03 2009 +0100
@@ -6,7 +6,7 @@
 %config
     jabberd_enable="$openpkg_rc_def"
     jabberd_hostname=`hostname`
-    jabberd_daemons="c2s resolver router s2s sm"
+    jabberd_daemons="c2s router s2s sm"
     jabberd_cfgfile="@l_prefix@/etc/jabberd/jabberd.cfg"
     jabberd_log_prolog="true"
     jabberd_log_epilog="true"