rpms/openldap/devel db-4.4.20-1.patch, 1.2, 1.3 db-4.4.20-2.patch, 1.2, 1.3 openldap.spec, 1.96, 1.97 db-4.5.20-jni-include-dir.patch, 1.1, NONE db-4.6.18-glibc.patch, 1.1, NONE

[Jan Šafránek (jsafrane)]

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21131

Modified Files:
	openldap.spec 
Added Files:
	db-4.4.20-1.patch db-4.4.20-2.patch 
Removed Files:
	db-4.5.20-jni-include-dir.patch db-4.6.18-glibc.patch 
Log Message:
BDB 4.4.20 patched added, 4.6.18 removed

db-4.4.20-1.patch:

Index: db-4.4.20-1.patch
===================================================================
RCS file: db-4.4.20-1.patch
diff -N db-4.4.20-1.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ db-4.4.20-1.patch	4 Oct 2007 07:32:36 -0000	1.3
@@ -0,0 +1,31 @@
+Fix a bug that could cause a trap during recovery if multiple 
+operations that could remove the same extent were recovered. [#14061]
+
+
+*** qam/qam_files.c.orig	2005-10-20 11:57:12.000000000 -0700
+--- qam/qam_files.c	2006-01-27 13:38:38.000000000 -0800
+***************
+*** 411,416 ****
+--- 411,422 ----
+  	    DB_APP_DATA, buf, 0, NULL, &real_name)) != 0)
+  		goto err;
+  #endif
++ 
++ 	mpf = array->mpfarray[offset].mpf;
++ 	/* This extent my already be marked for delete and closed. */
++ 	if (mpf == NULL)
++ 		goto err;
++ 
+  	/*
+  	 * The log must be flushed before the file is deleted.  We depend on
+  	 * the log record of the last delete to recreate the file if we crash.
+***************
+*** 418,424 ****
+  	if (LOGGING_ON(dbenv) && (ret = __log_flush(dbenv, NULL)) != 0)
+  		goto err;
+  
+- 	mpf = array->mpfarray[offset].mpf;
+  	(void)__memp_set_flags(mpf, DB_MPOOL_UNLINK, 1);
+  	/* Someone could be real slow, let them close it down. */
+  	if (array->mpfarray[offset].pinref != 0)
+--- 424,429 ----

db-4.4.20-2.patch:

Index: db-4.4.20-2.patch
===================================================================
RCS file: db-4.4.20-2.patch
diff -N db-4.4.20-2.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ db-4.4.20-2.patch	4 Oct 2007 07:32:36 -0000	1.3
@@ -0,0 +1,32 @@
+Fix a bug that could cause traps or hangs if the DB_TXN->set_name function 
+is used in a multithreaded application. [#14033]
+
+
+*** txn/txn.c.orig	Tue Nov  1 06:50:03 2005
+--- txn/txn.c	Tue Jan 31 15:05:13 2006
+***************
+*** 1049,1060 ****
+--- 1049,1062 ----
+  		return (ret);
+  	memcpy(txn->name, name, len);
+  
++ 	TXN_SYSTEM_LOCK(dbenv);
+  	if (td->name != INVALID_ROFF) {
+  		__db_shalloc_free(
+  		    &mgr->reginfo, R_ADDR(&mgr->reginfo, td->name));
+  		td->name = INVALID_ROFF;
+  	}
+  	if ((ret = __db_shalloc(&mgr->reginfo, len, 0, &p)) != 0) {
++ 		TXN_SYSTEM_UNLOCK(dbenv);
+  		__db_err(dbenv,
+  		    "Unable to allocate memory for transaction name");
+  
+***************
+*** 1063,1068 ****
+--- 1065,1071 ----
+  
+  		return (ret);
+  	}
++ 	TXN_SYSTEM_UNLOCK(dbenv);
+  	td->name = R_OFFSET(&mgr->reginfo, p);
+  	memcpy(p, name, len);


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- openldap.spec	4 Oct 2007 07:16:11 -0000	1.96
+++ openldap.spec	4 Oct 2007 07:32:36 -0000	1.97
@@ -58,9 +58,8 @@
 Patch307: MigrationTools-46-unique-hosts.patch
 
 # Patches for db4 library
-Patch400: db-4.3.29-sparc64.patch
-Patch401: db-4.5.20-jni-include-dir.patch
-Patch402: db-4.6.18-glibc.patch
+Patch400: db-4.4.20-1.patch
+Patch401: db-4.4.20-2.patch
 
 URL: http://www.openldap.org/
 BuildRoot: %{_tmppath}/%{name}-%{version_23}-root
@@ -158,9 +157,8 @@
 %setup -q -c -a 1 -a 2 -a 3
 
 pushd db-%{db_version}
-%patch400 -p1 -b .sparc64
-%patch401 -p1 -b .4.5.20.jni
-%patch402 -p1 -b .glibc
+%patch400 -b .patch1
+%patch401 -b .patch2
 popd
 
 pushd openldap-%{version_23}


--- db-4.5.20-jni-include-dir.patch DELETED ---


--- db-4.6.18-glibc.patch DELETED ---