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: 21-Apr-2004 11:39:09
Branch: OPENPKG_2_0_SOLID Handle: 2004042110390800
Modified files: (Branch: OPENPKG_2_0_SOLID)
openpkg-src/kolab kolab.spec
Log:
MFC: modify slapd.conf.template to recognize relocation of slapd.pid
and slurpd.pid into new run subdir
Summary:
Revision Changes Path
1.24.2.2 +6 -3 openpkg-src/kolab/kolab.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kolab/kolab.spec
============================================================================
$ cvs diff -u -r1.24.2.1 -r1.24.2.2 kolab.spec
--- openpkg-src/kolab/kolab.spec 18 Feb 2004 14:49:43 -0000 1.24.2.1
+++ openpkg-src/kolab/kolab.spec 21 Apr 2004 09:39:08 -0000 1.24.2.2
@@ -41,7 +41,7 @@
Group: Mail
License: GPL
Version: 20040217
-Release: 2.0.0
+Release: 2.0.1
# package options
%option with_genuine no
@@ -55,7 +55,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 2.0.0
-PreReq: OpenPKG, openpkg >= 2.0.0, openldap >= 2.2.5-2.0.0, postfix, imapd,
sasl, apache, proftpd, perl, perl-ldap
+PreReq: OpenPKG, openpkg >= 2.0.0, openldap >= 2.2.5-2.0.1, postfix, imapd,
sasl, apache, proftpd, perl, perl-ldap
PreReq: sasl >= 2.1.15-2.0.0, sasl::with_ldap = yes, sasl::with_login = yes
PreReq: proftpd >= 1.2.9-2.0.0, proftpd::with_ldap = yes
PreReq: gdbm >= 1.8.3-2.0.0, gdbm::with_ndbm = yes
@@ -114,7 +114,7 @@
-e "s;\(>Version \).[^<]*<;\1ei-%{V_ei_maj}.%{V_ei_min}<;" \
admin/kolab/index.php
awk <slapd.conf.template \
- '// { if ($1 == "pidfile") { print $0"\nreplica-pidfile
@@@kolab_prefix@@@/var/openldap/slurpd.pid" } else print }' \
+ '// { if ($1 == "pidfile") { print $0"\nreplica-pidfile
@@@kolab_prefix@@@/var/openldap/run/slurpd.pid" } else print }' \
>slapd.conf.template.NEW && mv slapd.conf.template.NEW slapd.conf.template
%{l_shtool} subst \
-e 's;@@@kolab_prefix@@@;@l_prefix@;g' \
@@ -137,6 +137,9 @@
-e 's;\(system("killall -9 slapd >/dev/null 2>&1")\);#\1;' \
kolab_bootstrap
%endif
+ %{l_shtool} subst \
+ -e 's;var/openldap/\(sl[aur]*pd.pid\);var/openldap/run/\1;' \
+ slapd.conf.template
%build
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
