steffen: server/openldap kolab.patch,1.4,1.5

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/openldap
In directory doto:/tmp/cvs-serv31153

Modified Files:
	kolab.patch 
Log Message:
grrr. removed more traces of pth and added db_recover to the rc script

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/openldap/kolab.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolab.patch	26 May 2005 12:34:16 -0000	1.4
+++ kolab.patch	2 Jun 2005 02:12:58 -0000	1.5
@@ -1,14 +1,26 @@
+diff -upr ../openldap.orig/openldap.spec ./openldap.spec
 --- ../openldap.orig/openldap.spec	2005-02-21 18:02:29.000000000 +0100
-+++ openldap.spec	2005-05-26 13:24:41.000000000 +0200
++++ ./openldap.spec	2005-06-02 03:59:04.000000000 +0200
 @@ -34,7 +34,7 @@ Class:        BASE
  Group:        Database
  License:      GPL
  Version:      2.2.23
 -Release:      2.3.0
-+Release:      2.3.0_kolab
++Release:      2.3.0_kolab2
  
  #   package options
  %option       with_fsl   yes
+@@ -54,8 +54,8 @@ Prefix:       %{l_prefix}
+ BuildRoot:    %{l_buildroot}
+ BuildPreReq:  OpenPKG, openpkg >= 2.3.0, make, gcc
+ PreReq:       OpenPKG, openpkg >= 2.3.0
+-BuildPreReq:  readline, openssl, db >= 4.2, pth
+-PreReq:       readline, openssl, db >= 4.2, pth
++BuildPreReq:  readline, openssl, db >= 4.2
++PreReq:       readline, openssl, db >= 4.2
+ %if "%{with_fsl}" == "yes"
+ BuildPreReq:  fsl >= 1.2.0
+ PreReq:       fsl >= 1.2.0
 @@ -90,7 +90,7 @@ AutoReqProv:  no
      #   (2. make sure our Berkeley-DB is picked up first)
      %{l_shtool} subst \
@@ -18,6 +30,21 @@
          -e 's;<db\.h>;"db.h";g' \
          configure
  %if "%{with_sasl}" == "yes"
+@@ -108,10 +108,10 @@ AutoReqProv:  no
+         ;;
+     esac
+     CC="%{l_cc}" \
+-    CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/pth-config --cflags`" \
+-    CPPFLAGS="$cf -I`%{l_prefix}/bin/pth-config --includedir`" \
+-    LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/pth-config --ldflags` %{l_fsl_ldflags}" \
+-    LIBS="`%{l_prefix}/bin/pth-config --libs` %{l_fsl_libs} $LOCLIBS" \
++    CFLAGS="%{l_cflags -O} " \
++    CPPFLAGS="$cf " \
++    LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
++    LIBS="%{l_fsl_libs} $LOCLIBS" \
+     ./configure \
+         --cache-file=./config.cache \
+         --prefix=%{l_prefix} \
 @@ -160,7 +160,7 @@ AutoReqProv:  no
  %endif
          --with-dyngroup \
@@ -27,3 +54,25 @@
          --enable-slurpd
  
      #   build toolkit
+diff -upr ../openldap.orig/rc.openldap ./rc.openldap
+--- ../openldap.orig/rc.openldap	2005-02-21 17:59:42.000000000 +0100
++++ ./rc.openldap	2005-06-02 03:01:25.000000000 +0200
+@@ -27,6 +27,10 @@
+         [ ".`grep '^replogfile' $openldap_slapd_cfgfile`" != . ] && return 0
+         return 1
+     }
++    openldap_db_recover() {
++	dbdir=`sed -n -e 's/^directory\s*\(.*\)$/\1/p' < $openldap_slapd_cfgfile`
++	[ -d $dbdir ] && [ -f $dbdir/DB_CONFIG ] && ( cd $dbdir && db_recover )
++    }
+ 
+ %status -u @l_susr@ -o
+     openldap_usable="unknown"
+@@ -48,6 +52,7 @@
+         if [ $? -ne 0 -a ".$openldap_url" != . ]; then
+             flags="$flags -h \"$openldap_url\""
+         fi
++	openldap_db_recover
+         eval @l_prefix@/libexec/openldap/slapd $flags
+     fi
+     openldap_slurpd_needed || exit 0