OpenPKG Specs / changeset

     1.1 --- a/jabberd/jabberd.patch	Tue Aug 28 18:30:25 2012 +0200
     1.2 +++ b/jabberd/jabberd.patch	Tue Aug 28 18:30:35 2012 +0200
     1.3 @@ -23,8 +23,8 @@
     1.4     </log>
     1.5   
     1.6     <!-- Local network configuration -->
     1.7 -@@ -149,7 +147,7 @@
     1.8 -     <id password-change='mu' /> -->
     1.9 +@@ -137,7 +135,7 @@
    1.10 +     <id password-change='true' /> -->
    1.11   
    1.12       <!-- IP address to bind to (default: 0.0.0.0) -->
    1.13  -    <ip>0.0.0.0</ip>
    1.14 @@ -32,6 +32,15 @@
    1.15   
    1.16       <!-- Port to bind to, or 0 to disable unencrypted access to the
    1.17            server (default: 5222) -->
    1.18 +@@ -331,7 +329,7 @@
    1.19 +     <path>@pkglibdir@</path>
    1.20 + 
    1.21 +     <!-- Backend module to use -->
    1.22 +-    <module>sqlite</module>
    1.23 ++    <module>db</module>
    1.24 + 
    1.25 +     <!-- Available authentication mechanisms -->
    1.26 +     <mechanisms>
    1.27  Index: etc/router.xml.dist.in
    1.28  --- etc/router.xml.dist.in.orig	2009-06-30 11:38:16 +0200
    1.29  +++ etc/router.xml.dist.in	2009-06-30 20:45:06 +0200
    1.30 @@ -117,6 +126,15 @@
    1.31   
    1.32       <!-- If logging to file, this is the filename of the logfile -->
    1.33       <!--
    1.34 +@@ -85,7 +85,7 @@
    1.35 +     <path>@pkglibdir@</path>
    1.36 + 
    1.37 +     <!-- By default, we use the SQLite driver for all storage -->
    1.38 +-    <driver>sqlite</driver>
    1.39 ++    <driver>db</driver>
    1.40 + 
    1.41 +     <!-- Its also possible to explicitly list alternate drivers for
    1.42 +          specific data types. -->
    1.43  Index: sm/mod_iq_time.c
    1.44  --- sm/mod_iq_time.c.orig	2009-06-30 11:38:15 +0200
    1.45  +++ sm/mod_iq_time.c	2009-06-30 20:45:06 +0200
    1.46 @@ -141,7 +159,7 @@
    1.47  Index: sm/mod_roster.c
    1.48  --- sm/mod_roster.c.orig	2009-06-30 11:38:15 +0200
    1.49  +++ sm/mod_roster.c	2009-06-30 20:45:06 +0200
    1.50 -@@ -708,6 +708,9 @@
    1.51 +@@ -635,6 +635,9 @@
    1.52       if(user->sessions == NULL)
    1.53           return mod_PASS;
    1.54   
    1.55 @@ -163,33 +181,3 @@
    1.56   
    1.57   #include <expat.h>
    1.58   
    1.59 -Index: tools/jabberd.in
    1.60 ---- tools/jabberd.in.orig	2009-10-31 17:51:42.857115000 +0100
    1.61 -+++ tools/jabberd.in	2009-10-31 18:07:52.095812899 +0100
    1.62 -@@ -63,7 +63,7 @@
    1.63 - 
    1.64 - 
    1.65 - #-----------------------------------------------------------------------------
    1.66 --# Setup the jobs: router, sm, c2s, s2s
    1.67 -+# Setup the jobs: router, sm, c2s, s2s, mu-conference
    1.68 - #-----------------------------------------------------------------------------
    1.69 - $jobs{jabberd}->{prefix}  = "JBRD";
    1.70 - 
    1.71 -@@ -83,12 +83,17 @@
    1.72 - $jobs{s2s}->{config} = "$config_dir/s2s.xml";
    1.73 - $jobs{s2s}->{prefix} = "S2S";
    1.74 - 
    1.75 -+$jobs{muc}->{cmd} = "$Bin/mu-conference";
    1.76 -+$jobs{muc}->{config} = "$config_dir/muc.xml";
    1.77 -+$jobs{muc}->{prefix} = "MUC";
    1.78 -+
    1.79 - if ($config eq "internal")
    1.80 - {
    1.81 -     $programs[0] = ["router"];
    1.82 -     $programs[1] = ["sm"];
    1.83 -     $programs[2] = ["c2s"];
    1.84 -     $programs[3] = ["s2s"];
    1.85 -+    $programs[4] = ["muc"];
    1.86 - }
    1.87 - else
    1.88 - {

     2.1 --- a/jabberd/jabberd.spec	Tue Aug 28 18:30:25 2012 +0200
     2.2 +++ b/jabberd/jabberd.spec	Tue Aug 28 18:30:35 2012 +0200
     2.3 @@ -1,6 +1,6 @@
     2.4  ##
     2.5  ##  jabberd.spec -- OpenPKG RPM Package Specification
     2.6 -##  Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/>
     2.7 +##  Copyright (c) 2000-2011 OpenPKG Foundation e.V. <http://openpkg.net/>
     2.8  ##
     2.9  ##  Permission to use, copy, modify, and distribute this software for
    2.10  ##  any purpose with or without fee is hereby granted, provided that
    2.11 @@ -24,7 +24,6 @@
    2.12  #   package version
    2.13  %define       V_major 2.2
    2.14  %define       V_minor 14
    2.15 -%define       V_mucon 0.8
    2.16  
    2.17  #   package information
    2.18  Name:         jabberd
    2.19 @@ -37,32 +36,24 @@
    2.20  Group:        InstantMessaging
    2.21  License:      JOSL/GPL
    2.22  Version:      %{V_major}.%{V_minor}
    2.23 -Release:      20110914
    2.24 +Release:      20110602
    2.25  
    2.26  #   package options
    2.27 -%option       with_mucon  yes
    2.28 -%option       with_sqlite yes
    2.29 +%option       with_sqlite no
    2.30  %option       with_mysql  no
    2.31  %option       with_pgsql  no
    2.32  %option       with_pam    no
    2.33  
    2.34  #   list of sources
    2.35  Source0:      http://codex.xiaoka.com/pub/jabberd2/releases/jabberd-%{version}.tar.gz
    2.36 -Source1:      http://download.gna.org/mu-conference/mu-conference_%{V_mucon}.tar.gz
    2.37 -Source2:      rc.jabberd
    2.38 +Source1:      rc.jabberd
    2.39  Patch0:       jabberd.patch
    2.40  
    2.41  #   build information
    2.42 -Prefix:       %{l_prefix}
    2.43 -BuildRoot:    %{l_buildroot}
    2.44 -BuildPreReq:  OpenPKG, openpkg >= 20060823, make
    2.45 -PreReq:       OpenPKG, openpkg >= 20060823, perl
    2.46 +BuildPreReq:  OpenPKG, openpkg >= 20100101, make
    2.47 +PreReq:       OpenPKG, openpkg >= 20100101, perl
    2.48  BuildPreReq:  db, expat, libiconv, libidn, gpg-error, gcrypt, libgsasl, openssl, udns
    2.49  PreReq:       db, expat, libiconv, libidn, gpg-error, gcrypt, libgsasl, openssl, udns
    2.50 -%if "%{with_mucon}" == "yes"
    2.51 -BuildPreReq:  glib2
    2.52 -PreReq:       glib2
    2.53 -%endif
    2.54  %if "%{with_sqlite}" == "yes"
    2.55  BuildPreReq:  sqlite
    2.56  PreReq:       sqlite
    2.57 @@ -79,8 +70,6 @@
    2.58  BuildPreReq:  PAM
    2.59  PreReq:       PAM
    2.60  %endif
    2.61 -AutoReq:      no
    2.62 -AutoReqProv:  no
    2.63  
    2.64  %description
    2.65      JabberD is the original server implementation for the Jabber instant
    2.66 @@ -95,43 +84,18 @@
    2.67          url       = http://codex.xiaoka.com/pub/jabberd2/releases/
    2.68          regex     = jabberd-(\d+\.\d+(\.\d+)*)\.tar\.gz
    2.69      }
    2.70 -    prog jabberd:mucon = {
    2.71 -        version   = %{V_mucon}
    2.72 -        url       = http://download.gna.org/mu-conference/
    2.73 -        regex     = mu-conference_(__VER__)\.tar\.gz
    2.74 -    }
    2.75  
    2.76  %prep
    2.77      %setup -q -n jabberd-%{version}
    2.78 -    %setup -q -D -T -a 1
    2.79      %{l_sed} <%{PATCH0} -e 's;@l_prefix@;%{l_prefix};g' | %{l_patch} -p0 -b
    2.80      %{l_shtool} subst \
    2.81          -e 's;exec perl;exec %{l_prefix}/bin/perl;' \
    2.82          tools/jabberd.in
    2.83 -%if "%{with_mucon}" == "yes"
    2.84 -    %{l_shtool} subst \
    2.85 -        -e 's;^\(CFLAGS\ *:=.*pkg-config --cflags glib-2.0\);\1 libidn;' \
    2.86 -        -e 's;^\(LIBS\ *:=.*\);\1 $(LOCLIBS);' \
    2.87 -        mu-conference_%{V_mucon}/src/Makefile
    2.88 -    %{l_shtool} subst \
    2.89 -        -e 's;mu-conference.log;muc.log;g' \
    2.90 -        mu-conference_%{V_mucon}/src/jcomp/jcr_log.c
    2.91 -    %{l_shtool} subst \
    2.92 -        -e 's;<port>[0-9][0-9]*</port>;<port>5347</port>;' \
    2.93 -        -e 's;<spool>.*</spool>;<spool>%{l_prefix}/var/jabberd/spool/rooms</spool>;' \
    2.94 -        -e 's;<logdir>\./syslogs</logdir>;<logdir>%{l_prefix}/var/jabberd/log</logdir>;' \
    2.95 -        -e 's;<logdir>\./logs/</logdir>;<logdir>%{l_prefix}/var/jabberd/spool/logs</logdir>;' \
    2.96 -        -e 's;<pidfile>.*</pidfile>;<pidfile>%{l_prefix}/var/jabberd/pid/muc.pid</pidfile>;' \
    2.97 -        -e 's;<URL>.*</URL>;<URL>http://name.host.tld/</URL>;' \
    2.98 -        -e 's;<stylesheet>.*</stylesheet>;<stylesheet>%{l_prefix}/share/jabberd/style.css</stylesheet>;' \
    2.99 -        mu-conference_%{V_mucon}/muc-default.xml
   2.100 -    echo \
   2.101 -        'muc         @sysconfdir@/muc.xml' \
   2.102 -        >>etc/jabberd.cfg.dist.in
   2.103 -%endif
   2.104  
   2.105  %build
   2.106      #   configure program
   2.107 +    ( echo "ac_cv_func_kqueue=no"
   2.108 +    ) >config.cache
   2.109      export CC="%{l_cc}"
   2.110      export CFLAGS="%{l_cflags -O}"
   2.111      export CPPFLAGS="%{l_cppflags libidn}"
   2.112 @@ -151,6 +115,7 @@
   2.113      CPPFLAGS="$CPPFLAGS %{l_cppflags postgresql}"
   2.114  %endif
   2.115      ./configure \
   2.116 +        --cache-file=./config.cache \
   2.117          --prefix=%{l_prefix} \
   2.118          --sysconfdir=%{l_prefix}/etc/jabberd \
   2.119          --mandir=%{l_prefix}/man \
   2.120 @@ -158,7 +123,6 @@
   2.121          --enable-fs \
   2.122          --enable-pipe \
   2.123          --enable-ssl \
   2.124 -        --enable-debug \
   2.125          --with-sasl=gsasl \
   2.126  %if "%{with_sqlite}" == "yes"
   2.127          --enable-sqlite \
   2.128 @@ -185,23 +149,10 @@
   2.129          --enable-shared
   2.130  
   2.131      #   build program
   2.132 -    %{l_make} %{l_mflags -O}
   2.133 -
   2.134 -%if "%{with_mucon}" == "yes"
   2.135 -    loclibs=''
   2.136 -    case "%{l_platform -t}" in
   2.137 -        *-sunos* )
   2.138 -            loclibs='-lsocket -lnsl'
   2.139 -            ;;
   2.140 -    esac
   2.141 -    ( cd mu-conference_%{V_mucon}
   2.142 -      %{l_make} %{l_mflags -O} LOCLIBS=$loclibs
   2.143 -    ) || exit $?
   2.144 -%endif
   2.145 +    %{l_make} %{l_mflags}
   2.146  
   2.147  %install
   2.148      #   create installation filesystem structure
   2.149 -    rm -rf $RPM_BUILD_ROOT
   2.150      %{l_shtool} mkdir -f -p -m 755 \
   2.151          $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
   2.152          $RPM_BUILD_ROOT%{l_prefix}/etc/jabberd \
   2.153 @@ -211,29 +162,9 @@
   2.154          $RPM_BUILD_ROOT%{l_prefix}/var/jabberd/pid \
   2.155          $RPM_BUILD_ROOT%{l_prefix}/var/jabberd/log
   2.156  
   2.157 -    #   install required components
   2.158 +    #   install components
   2.159      %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
   2.160  
   2.161 -    #   install optional components
   2.162 -%if "%{with_mucon}" == "yes"
   2.163 -    %{l_shtool} mkdir -f -p -m 755 \
   2.164 -        $RPM_BUILD_ROOT%{l_prefix}/share/jabberd \
   2.165 -        $RPM_BUILD_ROOT%{l_prefix}/var/jabberd/spool/logs \
   2.166 -        $RPM_BUILD_ROOT%{l_prefix}/var/jabberd/spool/rooms
   2.167 -    %{l_shtool} install -c -m 644 \
   2.168 -        mu-conference_%{V_mucon}/muc-default.xml \
   2.169 -        $RPM_BUILD_ROOT%{l_prefix}/etc/jabberd/muc.xml
   2.170 -    %{l_shtool} install -c \
   2.171 -        mu-conference_%{V_mucon}/src/mu-conference \
   2.172 -        $RPM_BUILD_ROOT%{l_prefix}/bin/
   2.173 -    %{l_shtool} install -c \
   2.174 -        mu-conference_%{V_mucon}/style.css \
   2.175 -        $RPM_BUILD_ROOT%{l_prefix}/share/jabberd
   2.176 -%endif
   2.177 -
   2.178 -    #   strip installation
   2.179 -    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
   2.180 -
   2.181      #   remove unnecessary files
   2.182      rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/jabberd/*.dist
   2.183      rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/jabberd/templates/*.dist
   2.184 @@ -241,9 +172,6 @@
   2.185  
   2.186      #   install run-command script
   2.187      %{l_shtool} install -c -m 755 %{l_value -s -a} \
   2.188 -%if "%{with_mucon}" == "yes"
   2.189 -        -e 's;\(jabberd_daemons\s*=.*\)\s\s*\(\w\w*\);\1 mucon\2;' \
   2.190 -%endif
   2.191          %{SOURCE rc.jabberd} \
   2.192          $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   2.193  
   2.194 @@ -257,7 +185,6 @@
   2.195  %files -f files
   2.196  
   2.197  %clean
   2.198 -    rm -rf $RPM_BUILD_ROOT
   2.199  
   2.200  %post
   2.201      #   after upgrade, restart service

     3.1 --- a/jabberd/rc.jabberd	Tue Aug 28 18:30:25 2012 +0200
     3.2 +++ b/jabberd/rc.jabberd	Tue Aug 28 18:30:35 2012 +0200
     3.3 @@ -6,7 +6,7 @@
     3.4  %config
     3.5      jabberd_enable="$openpkg_rc_def"
     3.6      jabberd_hostname=`hostname`
     3.7 -    jabberd_daemons="c2s router s2s sm"
     3.8 +    jabberd_daemons="c2s resolver router s2s sm"
     3.9      jabberd_cfgfile="@l_prefix@/etc/jabberd/jabberd.cfg"
    3.10      jabberd_log_prolog="true"
    3.11      jabberd_log_epilog="true"
    3.12 @@ -26,7 +26,7 @@
    3.13          return $retcode
    3.14      }
    3.15  
    3.16 -%status -u @l_susr@ -o
    3.17 +%status -u @l_nusr@ -o
    3.18      jabberd_usable="unknown"
    3.19      jabberd_active="no"
    3.20      rcService jabberd enable yes && \
    3.21 @@ -35,12 +35,12 @@
    3.22      echo "jabberd_usable=\"$jabberd_usable\""
    3.23      echo "jabberd_active=\"$jabberd_active\""
    3.24  
    3.25 -%start -u @l_susr@
    3.26 +%start -u @l_nusr@
    3.27      rcService jabberd enable yes || exit 0
    3.28      rcService jabberd active yes && exit 0
    3.29      @l_prefix@/bin/jabberd -b -c $jabberd_cfgfile
    3.30  
    3.31 -%stop -u @l_susr@
    3.32 +%stop -u @l_nusr@
    3.33      rcService jabberd enable yes || exit 0
    3.34      rcService jabberd active no && exit 0
    3.35      jabberd_signal TERM
    3.36 @@ -49,7 +49,7 @@
    3.37          rm -f @l_prefix@/var/jabberd/pid/${daemons}.pid
    3.38      done
    3.39  
    3.40 -%restart -u @l_susr@
    3.41 +%restart -u @l_nusr@
    3.42      rcService jabberd enable yes || exit 0
    3.43      rcService jabberd active no && exit 0
    3.44      rc jabberd stop