OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Dec-2007 17:12:28
Branch: HEAD Handle: 2007122216122700
Modified files:
openpkg-src/openldap fsl.openldap openldap.patch openldap.spec
rc.openldap
Log:
remove all slurpd(8) stuff -- replication (and more) is now done via
syncrepl in slapd(8)
Summary:
Revision Changes Path
1.6 +1 -1 openpkg-src/openldap/fsl.openldap
1.19 +0 -23 openpkg-src/openldap/openldap.patch
1.212 +2 -6 openpkg-src/openldap/openldap.spec
1.27 +0 -16 openpkg-src/openldap/rc.openldap
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/fsl.openldap
============================================================================
$ cvs diff -u -r1.5 -r1.6 fsl.openldap
--- openpkg-src/openldap/fsl.openldap 14 Nov 2003 20:11:11 -0000 1.5
+++ openpkg-src/openldap/fsl.openldap 22 Dec 2007 16:12:27 -0000 1.6
@@ -2,7 +2,7 @@
## fsl.openldap -- OSSP fsl configuration
##
-ident (slap.*|slurp.*)/.+ q{
+ident (slap.*)/.+ q{
prefix(
prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.patch
============================================================================
$ cvs diff -u -r1.18 -r1.19 openldap.patch
--- openpkg-src/openldap/openldap.patch 3 Nov 2007 11:11:09 -0000
1.18
+++ openpkg-src/openldap/openldap.patch 22 Dec 2007 16:12:27 -0000
1.19
@@ -39,26 +39,3 @@
snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", argv[1] );
eval_pv( eval_str, 0 );
-Index: servers/slapd/slapd.conf
---- servers/slapd/slapd.conf.orig 2007-02-13 21:22:22 +0100
-+++ servers/slapd/slapd.conf 2007-11-03 11:57:26 +0100
-@@ -63,3 +63,19 @@
- directory %LOCALSTATEDIR%/openldap-data
- # Indices to maintain
- index objectClass eq
-+
-+#######################################################################
-+# replication via slurpd(8)
-+#######################################################################
-+
-+# master server configuration
-+#replogfile %LOCALSTATEDIR%/openldap-slurp
-+#replica-pidfile %LOCALSTATEDIR%/slurpd.pid
-+#replica host=slave.example.com:389
-+# binddn="cn=admin,dc=example,dc=org"
-+# bindmethod=simple credentials=secret
-+
-+# slave server(s) configuration
-+#updatedn "cn=admin,dc=example,dc=org"
-+#updateref ldap://master.example.org
-+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.211 -r1.212 openldap.spec
--- openpkg-src/openldap/openldap.spec 22 Dec 2007 16:02:04 -0000
1.211
+++ openpkg-src/openldap/openldap.spec 22 Dec 2007 16:12:27 -0000
1.212
@@ -87,7 +87,7 @@
OpenLDAP is an open source implementation of the Lightweight
Directory Access Protocol (LDAP). The suite includes libraries
implementing the LDAP protocol plus a stand-alone LDAP server
- slapd(8) and a stand-alone LDAP replication server slurpd(8).
+ slapd(8).
%track
prog openldap = {
@@ -124,7 +124,6 @@
ARGS="$ARGS --disable-shared"
%if "%{with_server}" == "yes"
ARGS="$ARGS --enable-slapd"
- ARGS="$ARGS --enable-slurpd"
ARGS="$ARGS --disable-modules"
ARGS="$ARGS --enable-local"
ARGS="$ARGS --enable-ldbm"
@@ -142,7 +141,6 @@
ARGS="$ARGS --with-proxycache"
%else
ARGS="$ARGS --disable-slapd"
- ARGS="$ARGS --disable-slurpd"
ARGS="$ARGS --disable-modules"
%endif
@@ -234,11 +232,10 @@
$RPM_BUILD_ROOT%{l_prefix}/var/openldap/openldap-data/DB_CONFIG
%endif
- # post adjustment: enable and correct slurpd.pid (slapd.pid as a
precaution, too)
+ # post adjustment: enable and correct slapd.pid
%if "%{with_server}" == "yes"
%{l_shtool} subst \
-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
%endif
@@ -288,7 +285,6 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/include/slapi-plugin.h
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man5/slap*
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/slap*
- rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/slurp*
%endif
# determine installation files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/rc.openldap
============================================================================
$ cvs diff -u -r1.26 -r1.27 rc.openldap
--- openpkg-src/openldap/rc.openldap 25 Aug 2006 19:17:51 -0000 1.26
+++ openpkg-src/openldap/rc.openldap 22 Dec 2007 16:12:27 -0000 1.27
@@ -16,25 +16,15 @@
%common
openldap_slapd_cfgfile="@l_prefix@/etc/openldap/slapd.conf"
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`
}
- openldap_slurpd_signal () {
- [ -f $openldap_slurpd_pidfile ] && kill -$1 `cat
$openldap_slurpd_pidfile`
- }
- openldap_slurpd_needed () {
- [ ".`grep '^replogfile' $openldap_slapd_cfgfile`" != . ] && return 0
- return 1
- }
%status -u @l_susr@ -o
openldap_usable="unknown"
openldap_active="no"
rcService openldap enable yes && \
openldap_slapd_signal 0 && openldap_active="yes"
- rcService openldap enable yes && openldap_slurpd_needed && \
- openldap_slurpd_signal 0 && openldap_active="yes"
echo "openldap_enable=\"$openldap_enable\""
echo "openldap_usable=\"$openldap_usable\""
echo "openldap_active=\"$openldap_active\""
@@ -50,17 +40,11 @@
fi
eval @l_prefix@/libexec/openldap/slapd $flags || exit $?
fi
- openldap_slurpd_needed || exit 0
- openldap_slurpd_signal 0
- if [ $? -ne 0 ]; then
- @l_prefix@/libexec/openldap/slurpd || exit $?
- fi
%stop -p 700 -u @l_susr@
rcService openldap enable yes || exit 0
rcService openldap active no && exit 0
openldap_slapd_signal INT
- openldap_slurpd_signal INT
sleep 2
%restart -u @l_susr@
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
