# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1346171435 -7200
# Node ID 6becb64fe77d81f5f7b203d9d3e5746381167045
# Parent  1b852c64b120df4c656d95d7db43ad33adf77438
Resynchronize with upstream package maintainer version.

diff -r 1b852c64b120 -r 6becb64fe77d jabberd/jabberd.patch
--- a/jabberd/jabberd.patch	Tue Aug 28 18:30:25 2012 +0200
+++ b/jabberd/jabberd.patch	Tue Aug 28 18:30:35 2012 +0200
@@ -23,8 +23,8 @@
    </log>
  
    <!-- Local network configuration -->
-@@ -149,7 +147,7 @@
-     <id password-change='mu' /> -->
+@@ -137,7 +135,7 @@
+     <id password-change='true' /> -->
  
      <!-- IP address to bind to (default: 0.0.0.0) -->
 -    <ip>0.0.0.0</ip>
@@ -32,6 +32,15 @@
  
      <!-- 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
@@ -117,6 +126,15 @@
  
      <!-- 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
@@ -141,7 +159,7 @@
 Index: sm/mod_roster.c
 --- sm/mod_roster.c.orig	2009-06-30 11:38:15 +0200
 +++ sm/mod_roster.c	2009-06-30 20:45:06 +0200
-@@ -708,6 +708,9 @@
+@@ -635,6 +635,9 @@
      if(user->sessions == NULL)
          return mod_PASS;
  
@@ -163,33 +181,3 @@
  
  #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 1b852c64b120 -r 6becb64fe77d jabberd/jabberd.spec
--- a/jabberd/jabberd.spec	Tue Aug 28 18:30:25 2012 +0200
+++ b/jabberd/jabberd.spec	Tue Aug 28 18:30:35 2012 +0200
@@ -1,6 +1,6 @@
 ##
 ##  jabberd.spec -- OpenPKG RPM Package Specification
-##  Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/>
+##  Copyright (c) 2000-2011 OpenPKG Foundation e.V. <http://openpkg.net/>
 ##
 ##  Permission to use, copy, modify, and distribute this software for
 ##  any purpose with or without fee is hereby granted, provided that
@@ -24,7 +24,6 @@
 #   package version
 %define       V_major 2.2
 %define       V_minor 14
-%define       V_mucon 0.8
 
 #   package information
 Name:         jabberd
@@ -37,32 +36,24 @@
 Group:        InstantMessaging
 License:      JOSL/GPL
 Version:      %{V_major}.%{V_minor}
-Release:      20110914
+Release:      20110602
 
 #   package options
-%option       with_mucon  yes
-%option       with_sqlite yes
+%option       with_sqlite no
 %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:      http://download.gna.org/mu-conference/mu-conference_%{V_mucon}.tar.gz
-Source2:      rc.jabberd
+Source1:      rc.jabberd
 Patch0:       jabberd.patch
 
 #   build information
-Prefix:       %{l_prefix}
-BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20060823, make
-PreReq:       OpenPKG, openpkg >= 20060823, perl
+BuildPreReq:  OpenPKG, openpkg >= 20100101, make
+PreReq:       OpenPKG, openpkg >= 20100101, 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
@@ -79,8 +70,6 @@
 BuildPreReq:  PAM
 PreReq:       PAM
 %endif
-AutoReq:      no
-AutoReqProv:  no
 
 %description
     JabberD is the original server implementation for the Jabber instant
@@ -95,43 +84,18 @@
         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
+    ( echo "ac_cv_func_kqueue=no"
+    ) >config.cache
     export CC="%{l_cc}"
     export CFLAGS="%{l_cflags -O}"
     export CPPFLAGS="%{l_cppflags libidn}"
@@ -151,6 +115,7 @@
     CPPFLAGS="$CPPFLAGS %{l_cppflags postgresql}"
 %endif
     ./configure \
+        --cache-file=./config.cache \
         --prefix=%{l_prefix} \
         --sysconfdir=%{l_prefix}/etc/jabberd \
         --mandir=%{l_prefix}/man \
@@ -158,7 +123,6 @@
         --enable-fs \
         --enable-pipe \
         --enable-ssl \
-        --enable-debug \
         --with-sasl=gsasl \
 %if "%{with_sqlite}" == "yes"
         --enable-sqlite \
@@ -185,23 +149,10 @@
         --enable-shared
 
     #   build program
-    %{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
+    %{l_make} %{l_mflags}
 
 %install
     #   create installation filesystem structure
-    rm -rf $RPM_BUILD_ROOT
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
         $RPM_BUILD_ROOT%{l_prefix}/etc/jabberd \
@@ -211,29 +162,9 @@
         $RPM_BUILD_ROOT%{l_prefix}/var/jabberd/pid \
         $RPM_BUILD_ROOT%{l_prefix}/var/jabberd/log
 
-    #   install required components
+    #   install 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
@@ -241,9 +172,6 @@
 
     #   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/
 
@@ -257,7 +185,6 @@
 %files -f files
 
 %clean
-    rm -rf $RPM_BUILD_ROOT
 
 %post
     #   after upgrade, restart service
diff -r 1b852c64b120 -r 6becb64fe77d jabberd/rc.jabberd
--- a/jabberd/rc.jabberd	Tue Aug 28 18:30:25 2012 +0200
+++ b/jabberd/rc.jabberd	Tue Aug 28 18:30:35 2012 +0200
@@ -6,7 +6,7 @@
 %config
     jabberd_enable="$openpkg_rc_def"
     jabberd_hostname=`hostname`
-    jabberd_daemons="c2s router s2s sm"
+    jabberd_daemons="c2s resolver router s2s sm"
     jabberd_cfgfile="@l_prefix@/etc/jabberd/jabberd.cfg"
     jabberd_log_prolog="true"
     jabberd_log_epilog="true"
@@ -26,7 +26,7 @@
         return $retcode
     }
 
-%status -u @l_susr@ -o
+%status -u @l_nusr@ -o
     jabberd_usable="unknown"
     jabberd_active="no"
     rcService jabberd enable yes && \
@@ -35,12 +35,12 @@
     echo "jabberd_usable=\"$jabberd_usable\""
     echo "jabberd_active=\"$jabberd_active\""
 
-%start -u @l_susr@
+%start -u @l_nusr@
     rcService jabberd enable yes || exit 0
     rcService jabberd active yes && exit 0
     @l_prefix@/bin/jabberd -b -c $jabberd_cfgfile
 
-%stop -u @l_susr@
+%stop -u @l_nusr@
     rcService jabberd enable yes || exit 0
     rcService jabberd active no && exit 0
     jabberd_signal TERM
@@ -49,7 +49,7 @@
         rm -f @l_prefix@/var/jabberd/pid/${daemons}.pid
     done
 
-%restart -u @l_susr@
+%restart -u @l_nusr@
     rcService jabberd enable yes || exit 0
     rcService jabberd active no && exit 0
     rc jabberd stop