rpms/db4/F-9 patch.4.6.21.3,NONE,1.1 db4.spec,1.58,1.59

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/db4/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8510

Modified Files:
	db4.spec 
Added Files:
	patch.4.6.21.3 
Log Message:
* Tue Dec 23 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-7
- replication clients should be able to open a sequence (upstream bz#16406)
- package all documentation in db4-devel



--- NEW FILE patch.4.6.21.3 ---
*** sequence/sequence.c.orig	2007-05-17 10:18:04.000000000 -0700
--- sequence/sequence.c	2008-08-14 12:24:23.000000000 -0700
***************
*** 252,257 ****
--- 252,262 ----
  		if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) ||
  		    !LF_ISSET(DB_CREATE))
  			goto err;
+ 		if (IS_REP_CLIENT(dbenv) &&
+ 		    !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
+ 			ret = __db_rdonly(dbenv, "DB_SEQUENCE->open");
+ 			goto err;
+ 		}
  		ret = 0;
  
  		rp = &seq->seq_record;
***************
*** 304,310 ****
  	 */
  	rp = seq->seq_data.data;
  	if (rp->seq_version == DB_SEQUENCE_OLDVER) {
! oldver:		rp->seq_version = DB_SEQUENCE_VERSION;
  		if (__db_isbigendian()) {
  			if (IS_DB_AUTO_COMMIT(dbp, txn)) {
  				if ((ret =
--- 309,320 ----
  	 */
  	rp = seq->seq_data.data;
  	if (rp->seq_version == DB_SEQUENCE_OLDVER) {
! oldver:		if (IS_REP_CLIENT(dbenv) &&
! 		    !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
! 			ret = __db_rdonly(dbenv, "DB_SEQUENCE->open");
! 			goto err;
! 		}
! 		rp->seq_version = DB_SEQUENCE_VERSION;
  		if (__db_isbigendian()) {
  			if (IS_DB_AUTO_COMMIT(dbp, txn)) {
  				if ((ret =
***************
*** 713,718 ****
--- 723,734 ----
  
  	MUTEX_LOCK(dbenv, seq->mtx_seq);
  
+ 	if (handle_check && IS_REP_CLIENT(dbenv) &&
+ 	    !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
+ 		ret = __db_rdonly(dbenv, "DB_SEQUENCE->get");
+ 		goto err;
+ 	}
+ 
  	if (rp->seq_min + delta > rp->seq_max) {
  		__db_errx(dbenv, "Sequence overflow");
  		ret = EINVAL;


Index: db4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/db4/F-9/db4.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- db4.spec	25 Jun 2008 10:14:35 -0000	1.58
+++ db4.spec	23 Dec 2008 17:03:25 -0000	1.59
@@ -8,12 +8,13 @@
 Summary: The Berkeley DB database library (version 4) for C
 Name: db4
 Version: 4.6.21
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
 Patch1: http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.1
 Patch2: db-4.3.29-sparc64.patch
 Patch3: http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.2
+Patch4: http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.3
 Patch10: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.1
 Patch11: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.2
 Patch12: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.3
@@ -111,6 +112,7 @@
 %patch1 -p0 -b .4.6.21.1
 %patch2 -p1 -b .sparc64
 %patch3 -p0 -b .4.6.21.2
+%patch4 -p0 -b .4.6.21.3
 
 pushd dist
 libtoolize --copy --force
@@ -321,8 +323,7 @@
 
 %files devel
 %defattr(-,root,root)
-%doc	docs/api_c docs/api_cxx docs/api_tcl docs/index.html
-%doc	docs/ref docs/images
+%doc	docs/*
 %doc	examples_c examples_cxx
 %{_libdir}/libdb.so
 %{_libdir}/libdb-%{__soversion}.la
@@ -354,6 +355,10 @@
 %endif
 
 %changelog
+* Tue Dec 23 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-7
+- replication clients should be able to open a sequence (upstream bz#16406)
+- package all documentation in db4-devel
+
 * Wed Jun 25 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-6
 - apply new upstream patch - fixes potentially wrong number of mutexes
   to be allocated