rpms/openldap/devel .cvsignore, 1.48, 1.49 openldap.spec, 1.152, 1.153 sources, 1.50, 1.51 openldap-2.4.18-ldif-buf-overflow.patch, 1.3, NONE patch.4.7.25.1, 1.1, NONE patch.4.7.25.2, 1.1, NONE patch.4.7.25.3, 1.1, NONE

[Jan Zeleny]

Author: jzeleny

Update of /cvs/extras/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26215

Modified Files:
	.cvsignore openldap.spec sources 
Removed Files:
	openldap-2.4.18-ldif-buf-overflow.patch patch.4.7.25.1 
	patch.4.7.25.2 patch.4.7.25.3 
Log Message:
rebase of both openldap and bdb


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	18 Sep 2009 10:01:45 -0000	1.48
+++ .cvsignore	6 Nov 2009 09:27:11 -0000	1.49
@@ -1,2 +1,2 @@
-openldap-2.4.18.tgz
-db-4.7.25.tar.gz
+db-4.8.24.tar.gz
+openldap-2.4.19.tgz


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- openldap.spec	7 Oct 2009 13:43:58 -0000	1.152
+++ openldap.spec	6 Nov 2009 09:27:11 -0000	1.153
@@ -1,9 +1,9 @@
 # We distribute own version of Berkeley DB to prevent 
 # problems on db4.rpm upgrade - some versions of db4 do
 # not work with some versions of OpenLDAP.
-%define db_version 4.7.25
+%define db_version 4.8.24
 %define ldbm_backend berkeley
-%define version 2.4.18
+%define version 2.4.19
 %define evolution_connector_prefix %{_libdir}/evolution-openldap
 %define evolution_connector_includedir %{evolution_connector_prefix}/include
 %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 4%{?dist}
+Release: 1%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -35,16 +35,10 @@ Patch6: openldap-2.3.19-gethostbyXXXX_r.
 Patch9: openldap-2.3.37-smbk5pwd.patch
 Patch10: openldap-2.4.6-multilib.patch
 Patch11: openldap-2.4.16-doc-cacertdir.patch
-Patch12: openldap-2.4.18-ldif-buf-overflow.patch
 
 # Patches for the evolution library
 Patch200: openldap-2.4.6-evolution-ntlm.patch
 
-# Patches for db4 library
-Patch400: patch.4.7.25.1
-Patch401: patch.4.7.25.2
-Patch402: patch.4.7.25.3
-
 URL: http://www.openldap.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5.6-2, krb5-devel
@@ -125,12 +119,6 @@ programs needed for accessing and modify
 %prep
 %setup -q -c -a 1
 
-pushd db-%{db_version}
-%patch400 -p0 -b .patch1
-%patch401 -p0 -b .patch2
-%patch402 -p0 -b .patch3
-popd
-
 pushd openldap-%{version}
 %patch0 -p1 -b .config
 %patch1 -p1 -b .ldaprc
@@ -142,7 +130,6 @@ pushd openldap-%{version}
 %patch9 -p1 -b .smbk5pwd
 %patch10 -p1 -b .multilib
 %patch11 -p1 -b .cacertdir
-%patch12 -p1 -b .malloc
 
 cp %{_datadir}/libtool/config/config.{sub,guess} build/
 popd
@@ -645,6 +632,10 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Fri Nov 06 2009 Jan Zeleny <jzeleny at redhat.com> - 2.4.19-1
+- rebased openldap to 2.4.19
+- rebased bdb to 4.8.24
+
 * Wed Oct 07 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.18-4
 - updated smbk5pwd patch to be linked with libldap (#526500)
 - the last buffer overflow patch replaced with the one from upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	18 Sep 2009 10:01:45 -0000	1.50
+++ sources	6 Nov 2009 09:27:11 -0000	1.51
@@ -1,2 +1,2 @@
-fecd7a64b6d9a0eb79b817d2562956ed  openldap-2.4.18.tgz
-ec2b87e833779681a0c3a814aa71359e  db-4.7.25.tar.gz
+147afdecf438ff99ade105a5272db158  db-4.8.24.tar.gz
+4a6dab2711fcf141f19bb680bc335887  openldap-2.4.19.tgz


--- openldap-2.4.18-ldif-buf-overflow.patch DELETED ---


--- patch.4.7.25.1 DELETED ---


--- patch.4.7.25.2 DELETED ---


--- patch.4.7.25.3 DELETED ---