rpms/compat-db/devel patch.4.5.20.1, NONE, 1.1 patch.4.5.20.2, NONE, 1.1 compat-db.spec, 1.22, 1.23 sources, 1.11, 1.12

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/compat-db/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6099

Modified Files:
	compat-db.spec sources 
Added Files:
	patch.4.5.20.1 patch.4.5.20.2 
Log Message:
- add 4.5.20 to compat-db
- package db45_hotbackup



--- 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: compat-db.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-db/devel/compat-db.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- compat-db.spec	30 Nov 2006 11:47:29 -0000	1.22
+++ compat-db.spec	31 Jul 2007 08:20:12 -0000	1.23
@@ -1,14 +1,15 @@
-%define db4_versions 4.2.52 4.3.29
+%define db4_versions 4.2.52 4.3.29 4.5.20
 
-%define _libdb_a                libdb-${soversion}.a
-%define _libcxx_a               libdb_cxx-${soversion}.a
+%define _libdb_a	libdb-${soversion}.a
+%define _libcxx_a	libdb_cxx-${soversion}.a
 
 Summary: The Berkeley DB database library for Red Hat Linux 7.x compatibility
 Name: compat-db
-Version: 4.3.29
-Release: 2%{?dist}
+Version: 4.5.20
+Release: 1%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-4.2.52.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz
+Source2: http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz
 
 Patch1: db4-db_load.patch
 Patch2: db-4.3.29-64bit.patch
@@ -24,11 +25,17 @@
 # Upstream db-4.3.29 patches
 Patch20: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.3.29.1
 
+# Upstream db-4.5.20 patches
+Patch30: http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.1
+Patch31: http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.2
+
 Obsoletes: db1, db1-devel
 Obsoletes: db2, db2-devel, db2-utils
 Obsoletes: db3, db3-devel, db3-utils
 Obsoletes: db31, db32, db3x
-Obsoletes: db4 < 4.4, db4-devel < 4.4, db4-utils < 4.4, db4-tcl < 4.4, db4-java < 4.4
+Obsoletes: db4 < 4.6, db4-devel < 4.6, db4-utils < 4.6, db4-tcl < 4.6, db4-java < 4.6
+Provides: db4 = 4.2.52, db4 = 4.3.29, db4 = 4.5.20
+Provides: db4-devel = 4.2.52, db4-devel = 4.3.29, db4-devel = 4.5.20
 URL: http://www.oracle.com/database/berkeley-db/
 License: BSD-style
 Group: System Environment/Libraries
@@ -42,7 +49,7 @@
 previous releases of Red Hat Linux.
 
 %prep
-%setup -q -c -a 1
+%setup -q -c -a 1 -a 2
 
 %patch1 -p1 -b .db-load
 
@@ -60,6 +67,11 @@
 %patch20 -p0
 popd
 
+pushd db-4.5.20
+%patch30 -p0
+%patch31 -p0
+popd
+
 mkdir docs
 for version in %{db4_versions} ; do
 	mkdir docs/db-${version}
@@ -145,8 +157,8 @@
 # On Linux systems, move the shared libraries to lib directory.
 %ifos linux
 if [ "%{_libdir}" != "%{_lib}" ]; then
-        mkdir -p ${RPM_BUILD_ROOT}/%{_lib}
-        mv ${RPM_BUILD_ROOT}%{_libdir}/libdb*?.?.so* ${RPM_BUILD_ROOT}/%{_lib}/
+	mkdir -p ${RPM_BUILD_ROOT}/%{_lib}
+	mv ${RPM_BUILD_ROOT}%{_libdir}/libdb*?.?.so* ${RPM_BUILD_ROOT}/%{_lib}/
 fi
 %endif
 
@@ -181,9 +193,14 @@
 %{_bindir}/db*_stat
 %{_bindir}/db*_upgrade
 %{_bindir}/db*_verify
+%{_bindir}/db*_hotbackup
 %{_includedir}/*
 
 %changelog
+* Mon Jul 30 2007 Jindrich Novy <jnovy at redhat.com> 4.5.20-1
+- add 4.5.20 to compat-db
+- package db45_hotbackup
+
 * Sun Nov 26 2006 Jindrich Novy <jnovy at redhat.com> 4.3.29-2
 - include also headers for db4-4.2.52
 - sync db4 and compat-db licenses to BSD-style as the result of


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/compat-db/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	10 Nov 2006 18:17:05 -0000	1.11
+++ sources	31 Jul 2007 08:20:12 -0000	1.12
@@ -1,2 +1,3 @@
 cbc77517c9278cdb47613ce8cb55779f  db-4.2.52.tar.gz
 13585a20ce32f113b8e8cdb57f52e3bb  db-4.3.29.tar.gz
+b0f1c777708cb8e9d37fb47e7ed3312d  db-4.5.20.tar.gz