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 10:33:34
Branch: OPENPKG_2_0_SOLID Handle: 2004042109333400
Modified files: (Branch: OPENPKG_2_0_SOLID)
openpkg-src/openldap openldap.spec rc.openldap
Log:
MFC: align spec, conf and rc pid files to fix start/status/stop
Summary:
Revision Changes Path
1.100.2.2 +4 -4 openpkg-src/openldap/openldap.spec
1.20.2.1 +2 -2 openpkg-src/openldap/rc.openldap
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.100.2.1 -r1.100.2.2 openldap.spec
--- openpkg-src/openldap/openldap.spec 18 Feb 2004 14:50:35 -0000
1.100.2.1
+++ openpkg-src/openldap/openldap.spec 21 Apr 2004 08:33:34 -0000
1.100.2.2
@@ -34,7 +34,7 @@
Group: Database
License: GPL
Version: 2.2.5
-Release: 2.0.0
+Release: 2.0.1
# package options
%option with_fsl yes
@@ -166,10 +166,10 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*.default
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*/*.default
- # post adjustment: remove CVS information from config file
+ # post adjustment: enable and correct slurpd.pid (slapd.pid as a precaution,
too)
%{l_shtool} subst \
- -e '/\$OpenLDAP: .*slapd\.conf,v/d' \
- -e 's;^#\(replica-pidfile \);\1;' \
+ -e 's;^[ #]*\(pidfile \).*$;\1 %{l_prefix}/var/openldap/run/slapd.pid;' \
+ -e 's;^[ #]*\(replica-pidfile \).*$;\1
%{l_prefix}/var/openldap/run/slurpd.pid;' \
$RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf
# post adjustment: remove OSSP fsl dependency from libtool files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/rc.openldap
============================================================================
$ cvs diff -u -r1.20 -r1.20.2.1 rc.openldap
--- openpkg-src/openldap/rc.openldap 21 Nov 2003 23:50:38 -0000 1.20
+++ openpkg-src/openldap/rc.openldap 21 Apr 2004 08:33:34 -0000 1.20.2.1
@@ -15,8 +15,8 @@
%common
openldap_slapd_cfgfile="@l_prefix@/etc/openldap/slapd.conf"
- openldap_slapd_pidfile="@l_prefix@/var/openldap/slapd.pid"
- openldap_slurpd_pidfile="@l_prefix@/var/openldap/slurpd.pid"
+ openldap_slapd_pidfile="@l_prefix@/var/openldap/run/slapd.pid"
+ openldap_slurpd_pidfile="@l_prefix@/var/openldap/run/slurpd.pid"
openldap_slapd_signal () {
[ -f $openldap_slapd_pidfile ] && kill -$1 `cat $openldap_slapd_pidfile`
}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
