thomas: server/openldap kolab.patch,1.7,1.8

[cvs at kolab.org]

Author: thomas

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

Modified Files:
	kolab.patch 
Log Message:
Use openldap-2.3.27-2.20061018_kolab instead of openldap-2.3.11-2.5.0_kolab
Fixes issue1229, issue1431, CVE-2006-4600 (Bugtraq ID 19832), and more.


Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/openldap/kolab.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolab.patch	9 Dec 2005 15:56:03 -0000	1.7
+++ kolab.patch	20 Oct 2006 15:01:18 -0000	1.8
@@ -1,57 +1,49 @@
---- 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
+--- openldap.spec.orig	2006-10-16 16:31:56.000000000 +0200
++++ openldap.spec	2006-10-17 15:53:36.000000000 +0200
+@@ -33,7 +33,7 @@
+ Group:        LDAP
  License:      GPL
- Version:      2.3.11
--Release:      2.5.0
-+Release:      2.5.0_kolab
+ Version:      2.3.27
+-Release:      2.20061018
++Release:      2.20061018_kolab
  
  #   package options
- %option       with_fsl   yes
-@@ -53,8 +53,8 @@ Prefix:       %{l_prefix}
+ %option       with_fsl      yes
+@@ -53,10 +53,10 @@
+ #   build information
+ Prefix:       %{l_prefix}
  BuildRoot:    %{l_buildroot}
- BuildPreReq:  OpenPKG, openpkg >= 2.5.0, make, gcc
- PreReq:       OpenPKG, openpkg >= 2.5.0
+-BuildPreReq:  OpenPKG, openpkg >= 2.20061018, make, gcc
+-PreReq:       OpenPKG, openpkg >= 2.20061018
 -BuildPreReq:  readline, openssl, db >= 4.2, pth
 -PreReq:       readline, openssl, db >= 4.2, pth
++BuildPreReq:  OpenPKG, openpkg >= 2.5.2, make, gcc
++PreReq:       OpenPKG, openpkg >= 2.5.2
 +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
-@@ -89,8 +89,8 @@ AutoReqProv:  no
-     #   (2. make sure our Berkeley-DB is picked up first)
+@@ -132,13 +132,6 @@
+     LDFLAGS="$LDFLAGS %{l_fsl_ldflags}"
+     LIBS="$LIBS %{l_fsl_libs}"
+ 
+-    #   configuration: force to use GNU pth
+-    CFLAGS="$CFLAGS `%{l_prefix}/bin/pth-config --cflags`"
+-    CPPFLAGS="$CPPFLAGS -I`%{l_prefix}/bin/pth-config --includedir`"
+-    LDFLAGS="$LDFLAGS `%{l_prefix}/bin/pth-config --ldflags`"
+-    LIBS="`%{l_prefix}/bin/pth-config --libs` $LIBS"
+-    ARGS="$ARGS --with-threads=pth"
+-
+     #   configuration: optional overlay support
+ %if "%{with_overlays}" == "yes"
+     ARGS="$ARGS --enable-overlays=yes"
+@@ -177,7 +170,7 @@
+     #   configuration: use hard-links and make sure our Berkeley-DB is picked up first
      %{l_shtool} subst \
          -e 's;ln -s;ln;g' \
--        -e 's;-ldb42;-ldb;g' \
--        -e 's;-ldb43;-ldb;g' \
-+        -e 's;-ldb42;%{l_prefix}/lib/libdb.a;g' \
-+        -e 's;-ldb43;%{l_prefix}/lib/libdb.a;g' \
+-        -e 's;-ldb4[234];-ldb;g' \
++        -e 's;-ldb4[234];%{l_prefix}/lib/libdb.a;g' \
          -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 \
-         --with-proxycache \
--        --with-threads=pth \
-+        --with-threads=auto \
-         --enable-slurpd
  
-     #   build toolkit