OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 18-Jul-2003 13:24:35
Branch: HEAD Handle: 2003071812243301
Modified files:
openpkg-src/openldap openldap.spec rc.openldap
openpkg-web news.txt
Log:
%status and pidfile handling, polish config
Summary:
Revision Changes Path
1.81 +6 -1 openpkg-src/openldap/openldap.spec
1.11 +17 -2 openpkg-src/openldap/rc.openldap
1.5638 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.80 -r1.81 openldap.spec
--- openpkg-src/openldap/openldap.spec 17 Jul 2003 15:32:58 -0000 1.80
+++ openpkg-src/openldap/openldap.spec 18 Jul 2003 11:24:34 -0000 1.81
@@ -33,7 +33,7 @@
Group: Database
License: GPL
Version: 2.1.22
-Release: 20030717
+Release: 20030718
# package options
%option with_fsl yes
@@ -117,6 +117,11 @@
%{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT"
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*.default
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*/*.default
+
+ # remove CVS information from config file
+ %{l_shtool} subst \
+ -e '/\$OpenLDAP: .*slapd\.conf,v/d' \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf
# install run-command script
%{l_shtool} mkdir -f -p -m 755 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/rc.openldap
============================================================================
$ cvs diff -u -r1.10 -r1.11 rc.openldap
--- openpkg-src/openldap/rc.openldap 17 Jul 2003 21:34:53 -0000 1.10
+++ openpkg-src/openldap/rc.openldap 18 Jul 2003 11:24:34 -0000 1.11
@@ -11,17 +11,32 @@
openldap_log_minsize="1M"
openldap_log_complevel="9"
+%common
+ openldap_pidfile="@l_prefix@/var/openldap/slapd.pid"
+ openldap_signal () {
+ [ -f $openldap_pidfile ] && kill -$1 `cat $openldap_pidfile`
+ }
+
+%status -p 200 -u @l_susr@ -o
+ openldap_usable="unknown"
+ openldap_active="no"
+ opService openldap enable yes && \
+ openldap_signal 0 && openldap_active="yes"
+ echo "openldap_enable=\"$openldap_enable\""
+ echo "openldap_usable=\"$openldap_usable\""
+ echo "openldap_active=\"$openldap_active\""
+
%start -p 200 -u @l_susr@
opService openldap enable yes || exit 0
@l_prefix@/libexec/openldap/slapd
%stop -p 200 -u @l_susr@
opService openldap enable yes || exit 0
- kill -INT `cat @l_prefix@/var/openldap/slapd.pid`
+ openldap_signal INT
%restart -u @l_susr@
opService openldap enable yes || exit 0
- kill -INT `cat @l_prefix@/var/openldap/slapd.pid`
+ openldap_signal INT
sleep 2
@l_prefix@/libexec/openldap/slapd
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5637 -r1.5638 news.txt
--- openpkg-web/news.txt 18 Jul 2003 10:34:35 -0000 1.5637
+++ openpkg-web/news.txt 18 Jul 2003 11:24:33 -0000 1.5638
@@ -1,3 +1,4 @@
+18-Jul-2003: Upgraded package: P<openldap-2.1.22-20030718>
18-Jul-2003: Upgraded package: P<portsentry-1.1-20030718>
18-Jul-2003: Upgraded package: P<ircd-2.10.3p3-20030718>
18-Jul-2003: Upgraded package: P<imapd-2.1.14-20030718>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
