OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Nov-2003 23:08:23
Branch: HEAD Handle: 2003112222082200
Modified files:
openpkg-src/kolab kolab.spec rc.kolab
Log:
tighten requirements; replace killall by rc stop; correct user at
%start
Summary:
Revision Changes Path
1.4 +10 -4 openpkg-src/kolab/kolab.spec
1.3 +1 -1 openpkg-src/kolab/rc.kolab
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kolab/kolab.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 kolab.spec
--- openpkg-src/kolab/kolab.spec 21 Nov 2003 23:51:23 -0000 1.3
+++ openpkg-src/kolab/kolab.spec 22 Nov 2003 22:08:22 -0000 1.4
@@ -66,6 +66,12 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20030103
PreReq: OpenPKG, openpkg >= 20030103, openldap, postfix, imapd, sasl, apache,
proftpd, perl, perl-ldap
+PreReq: sasl >= 2.1.15-20031122, sasl::with_ldap = yes, sasl::with_login = yes
+PreReq: proftpd >= 1.2.9-20031031, proftpd::with_ldap = yes
+PreReq: gdbm >= 1.8.3-20030213, gdbm::with_ndbm = yes
+PreReq: postfix >= 2.0.16-20031028, postfix::with_ldap = yes,
postfix::with_sasl = yes, postfix::with_tls = yes
+PreReq: imapd >= 2.1.16-20031120, imapd::with_group = yes, imapd::with_vhost
= yes
+PreReq: apache >= 1.3.29-20031104, apache::with_gdbm_ndbm = yes,
apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php =
yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes,
apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes,
apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes
AutoReq: no
AutoReqProv: no
@@ -89,17 +95,17 @@
-e 's;@@@l_\([mnrs]\)gid@@@;@l_\1gid@;g' \
kolab_sslcert.sh kolab kolab_bootstrap *.template
%{l_shtool} subst \
- -e 's;libexec/slapd;libexec/openldap/slapd;' \
- -e 's;etc/rc.d/rc.kolab start;etc/rc all start;' \
- kolab_bootstrap
- %{l_shtool} subst \
-e 's;hostname -f;hostname;' \
kolab kolab_bootstrap
%{l_shtool} subst \
-e 's;chown root.root;chown @l_susr@:@l_sgrp@;' \
kolab
%{l_shtool} subst \
+ -e 's;libexec/slapd;libexec/openldap/slapd;' \
+ -e 's;etc/rc.d/rc.kolab start;etc/rc all start;' \
-e 's:print " running:my $cfg; open(FH, "<@l_prefix@/etc/rc.conf") || die;
$cfg .= $_ while (<FH>); close(FH); $cfg =~
s/\\n((openldap_url|sasl_authmech)\\S*=[^\\n]*)/#\\1\\n/sg; $cfg .=
"openldap_url=\\"\\"\\nsasl_authmech=\\"ldap\\"\\n"; open(FH,
">@l_prefix@/etc/rc.conf") || die; print FH $cfg; close(FH); undef $cfg; print "
running:' \
+ -e 's;killall -INT slapd >/dev/null 2>&1;$kolab_prefix/etc/rc slapd stop;' \
+ -e 's;\(system("killall -9 slapd >/dev/null 2>&1")\);#\1;' \
kolab_bootstrap
%build
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kolab/rc.kolab
============================================================================
$ cvs diff -u -r1.2 -r1.3 rc.kolab
--- openpkg-src/kolab/rc.kolab 21 Nov 2003 23:51:23 -0000 1.2
+++ openpkg-src/kolab/rc.kolab 22 Nov 2003 22:08:22 -0000 1.3
@@ -21,7 +21,7 @@
echo "kolab_usable=\"$kolab_usable\""
echo "kolab_active=\"$kolab_active\""
-%start -p 600 -u @l_rusr@
+%start -p 600 -u @l_susr@
rcService kolab enable yes || exit 0
rcService kolab active yes && exit 0
@l_prefix@/etc/kolab/kolab &
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
