bh: server/openldap kolab.patch,1.6,1.7 Makefile,1.11,1.12

cvs at intevation.de cvs at intevation.de
Fri Dec 9 16:56:05 CET 2005


Author: bh

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

Modified Files:
	kolab.patch Makefile 
Log Message:
Update to OpenPKG 2.5


Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/openldap/kolab.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolab.patch	22 Jul 2005 22:36:14 -0000	1.6
+++ kolab.patch	9 Dec 2005 15:56:03 -0000	1.7
@@ -1,20 +1,18 @@
-Only in .: kolab.patch
-diff -upr ../openldap.orig/openldap.spec ./openldap.spec
---- ../openldap.orig/openldap.spec	2005-06-15 20:55:42.000000000 +0200
-+++ ./openldap.spec	2005-07-19 01:51:30.000000000 +0200
+--- openldap.spec.orig	Wed Dec  7 15:26:35 2005
++++ openldap.spec	Wed Dec  7 15:26:35 2005
 @@ -33,7 +33,7 @@ Class:        BASE
  Group:        Database
  License:      GPL
- Version:      2.2.27
--Release:      2.4.0
-+Release:      2.4.0_kolab
+ Version:      2.3.11
+-Release:      2.5.0
++Release:      2.5.0_kolab
  
  #   package options
  %option       with_fsl   yes
 @@ -53,8 +53,8 @@ Prefix:       %{l_prefix}
  BuildRoot:    %{l_buildroot}
- BuildPreReq:  OpenPKG, openpkg >= 2.4.0, make, gcc
- PreReq:       OpenPKG, openpkg >= 2.4.0
+ BuildPreReq:  OpenPKG, openpkg >= 2.5.0, make, gcc
+ PreReq:       OpenPKG, openpkg >= 2.5.0
 -BuildPreReq:  readline, openssl, db >= 4.2, pth
 -PreReq:       readline, openssl, db >= 4.2, pth
 +BuildPreReq:  readline, openssl, db >= 4.2
@@ -22,7 +20,7 @@
  %if "%{with_fsl}" == "yes"
  BuildPreReq:  fsl >= 1.2.0
  PreReq:       fsl >= 1.2.0
-@@ -90,8 +90,8 @@ AutoReqProv:  no
+@@ -89,8 +89,8 @@ AutoReqProv:  no
      #   (2. make sure our Berkeley-DB is picked up first)
      %{l_shtool} subst \
          -e 's;ln -s;ln;g' \
@@ -33,7 +31,7 @@
          -e 's;<db\.h>;"db.h";g' \
          configure
  %if "%{with_sasl}" == "yes"
-@@ -109,10 +109,10 @@ AutoReqProv:  no
+@@ -108,10 +108,10 @@ AutoReqProv:  no
          ;;
      esac
      CC="%{l_cc}" \
@@ -48,7 +46,7 @@
      ./configure \
          --cache-file=./config.cache \
          --prefix=%{l_prefix} \
-@@ -161,7 +161,7 @@ AutoReqProv:  no
+@@ -160,7 +160,7 @@ AutoReqProv:  no
  %endif
          --with-dyngroup \
          --with-proxycache \
@@ -57,25 +55,3 @@
          --enable-slurpd
  
      #   build toolkit
-diff -upr ../openldap.orig/rc.openldap ./rc.openldap
---- ../openldap.orig/rc.openldap	2004-12-07 20:57:36.000000000 +0100
-+++ ./rc.openldap	2005-07-19 01:50:46.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

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	22 Jul 2005 22:36:14 -0000	1.11
+++ Makefile	9 Dec 2005 15:56:03 -0000	1.12
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/SRC
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -9,8 +9,8 @@
 endif
 
 PACKAGE=openldap
-VERSION=2.2.27
-RELEASE=2.4.0
+VERSION=2.3.11
+RELEASE=2.5.0
 
 
 RPM=/kolab/bin/openpkg rpm





More information about the commits mailing list