rpms/db4/devel patch.4.5.20.1, NONE, 1.1 patch.4.5.20.2, NONE, 1.1 db4.spec, 1.43, 1.44

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/db4/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19283

Modified Files:
	db4.spec 
Added Files:
	patch.4.5.20.1 patch.4.5.20.2 
Log Message:
- apply upstream patches for 4.5.20
  (Java API <-> core API related fixes)



--- NEW FILE patch.4.5.20.1 ---
--- sequence/sequence.c.4.5.20.1	2006-08-24 16:56:16.000000000 +0200
+++ sequence/sequence.c	2006-12-04 09:17:29.000000000 +0100
@@ -227,6 +227,9 @@
 
 	seq->seq_data.ulen = seq->seq_data.size = sizeof(seq->seq_record);
 	seq->seq_rp = &seq->seq_record;
+	
+	if ((ret = __dbt_usercopy(dbenv, keyp)) != 0)
+		goto err;
 
 	memset(&seq->seq_key, 0, sizeof(DBT));
 	if ((ret = __os_malloc(dbenv, keyp->size, &seq->seq_key.data)) != 0)
@@ -365,6 +368,7 @@
 		ret = t_ret;
 
 	ENV_LEAVE(dbenv, ip);
+	__dbt_userfree(dbenv, keyp, NULL, NULL);
 	return (ret);
 }
 
@@ -765,6 +769,10 @@
 {
 	SEQ_ILLEGAL_BEFORE_OPEN(seq, "DB_SEQUENCE->get_key");
 
+	if (F_ISSET(key, DB_DBT_USERCOPY))
+		return (__db_retcopy(seq->seq_dbp->dbenv, key,
+			seq->seq_key.data, seq->seq_key.size, NULL, 0));
+
 	key->data = seq->seq_key.data;
 	key->size = key->ulen = seq->seq_key.size;
 	key->flags = seq->seq_key.flags;


--- NEW FILE patch.4.5.20.2 ---
*** rep/rep_method.c.orig	Fri Oct 20 08:34:06 2006
--- rep/rep_method.c	Fri Oct 27 12:09:04 2006
***************
*** 524,533 ****
  		 * will allow the client to either perform recovery or
  		 * simply join in.
  		 */
! 		if (announce)
  			(void)__rep_send_message(dbenv,
  			    DB_EID_BROADCAST, REP_NEWCLIENT, NULL, dbt, 0, 0);
! 		else
  			(void)__rep_send_message(dbenv,
  			    DB_EID_BROADCAST, REP_ALIVE_REQ, NULL, NULL, 0, 0);
  	}
--- 524,535 ----
  		 * will allow the client to either perform recovery or
  		 * simply join in.
  		 */
! 		if (announce) {
! 			if ((ret = __dbt_usercopy(dbenv, dbt)) != 0)
! 				goto err;
  			(void)__rep_send_message(dbenv,
  			    DB_EID_BROADCAST, REP_NEWCLIENT, NULL, dbt, 0, 0);
! 		} else
  			(void)__rep_send_message(dbenv,
  			    DB_EID_BROADCAST, REP_ALIVE_REQ, NULL, NULL, 0, 0);
  	}
***************
*** 551,556 ****
--- 553,559 ----
  	}
  	if (pending_event != DB_EVENT_NO_SUCH_EVENT)
  		DB_EVENT(dbenv, pending_event, NULL);
+ 	__dbt_userfree(dbenv, dbt, NULL, NULL);
  	return (ret);
  }
  
*** rep/rep_record.c.orig	Fri Oct 20 08:34:06 2006
--- rep/rep_record.c	Mon Nov 13 10:46:29 2006
***************
*** 161,166 ****
--- 161,174 ----
  		return (EINVAL);
  	}
  
+ 	if ((ret = __dbt_usercopy(dbenv, control)) != 0 ||
+  	    (ret = __dbt_usercopy(dbenv, rec)) != 0) {
+  		__dbt_userfree(dbenv, control, rec, NULL);
+  		__db_errx(dbenv,
+  	"DB_ENV->rep_process_message: error retrieving DBT contents");
+  		return ret;
+  	}
+ 
  	ret = 0;
  	db_rep = dbenv->rep_handle;
  	rep = db_rep->region;
***************
*** 619,624 ****
--- 627,633 ----
  			*ret_lsnp = rp->lsn;
  		ret = DB_REP_NOTPERM;
  	}
+ 	__dbt_userfree(dbenv, control, rec, NULL);
  	return (ret);
  }
  


Index: db4.spec
===================================================================
RCS file: /cvs/dist/rpms/db4/devel/db4.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- db4.spec	1 Dec 2006 05:43:18 -0000	1.43
+++ db4.spec	4 Dec 2006 08:39:28 -0000	1.44
@@ -8,7 +8,7 @@
 Summary: The Berkeley DB database library (version 4) for C
 Name: db4
 Version: 4.5.20
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
 Source2: nptl-abi-note.S
@@ -19,6 +19,8 @@
 Patch12: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.3
 Patch13: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.4
 Patch14: db-1.85-errno.patch
+Patch20: http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.1
+Patch21: http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.2
 URL: http://www.oracle.com/database/berkeley-db/
 License: BSD-style
 Group: System Environment/Libraries
@@ -103,15 +105,18 @@
 cat %{_datadir}/aclocal/libtool.m4 >> aclocal.m4
 popd
 pushd db.1.85/PORT/linux
-%patch10 -p0 -b .1
+%patch10 -p0 -b .1.1
 popd
 pushd db.1.85
-%patch11 -p0 -b .1
-%patch12 -p0 -b .2
-%patch13 -p0 -b .3
+%patch11 -p0 -b .1.2
+%patch12 -p0 -b .1.3
+%patch13 -p0 -b .1.4
 %patch14 -p1 -b .errno
 popd
 
+%patch20 -p0 -b .4.5.20.1
+%patch21 -p0 -b .4.5.20.2
+
 # Remove tags files which we don't need.
 find . -name tags | xargs rm -f
 # Define a shell function for fixing HREF references in the docs, which
@@ -347,6 +352,10 @@
 %endif
 
 %changelog
+* Mon Dec  4 2006 Jindrich Novy <jnovy at redhat.com> 4.5.20-4
+- apply upstream patches for 4.5.20
+  (Java API <-> core API related fixes)
+
 * Fri Dec  1 2006 Jindrich Novy <jnovy at redhat.com> 4.5.20-3
 - temporarily remove ppc64 from java arches