rpms/compat-db/devel patch.4.6.21.1, NONE, 1.1 patch.4.6.21.2, NONE, 1.1 .cvsignore, 1.12, 1.13 compat-db.spec, 1.28, 1.29 db-4.5.20-glibc.patch, 1.1, 1.2 sources, 1.12, 1.13 db4-db_load.patch, 1.2, NONE patch.4.2.52.1, 1.1, NONE patch.4.2.52.2, 1.1, NONE patch.4.2.52.3, 1.1, NONE patch.4.2.52.4, 1.1, NONE patch.4.2.52.5, 1.1, NONE

Wed Jul 9 06:40:27 UTC 2008

Author: jnovy

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

Modified Files:
	.cvsignore compat-db.spec db-4.5.20-glibc.patch sources 
Added Files:
	patch.4.6.21.1 patch.4.6.21.2 
Removed Files:
	db4-db_load.patch patch.4.2.52.1 patch.4.2.52.2 patch.4.2.52.3 
	patch.4.2.52.4 patch.4.2.52.5 
Log Message:
* Wed Jul 09 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-1
- move db-4.6.21 to compat-db (#449741)
- remove db-4.2.52
- package db46_codegen
- create symlinks to ease detection for autofoo
- fix license and filelists

--- NEW FILE patch.4.6.21.1 ---
*** dbinc/mp.h	2007-09-28 01:28:25.000000000 +1000
--- dbinc/mp.h	2008-02-14 01:22:09.000000000 +1100
***************
*** 639,644 ****
--- 639,647 ----
   */
  #define	MP_TRUNC_RECOVER	0x01
  
+ /* Private flags to DB_MPOOLFILE->close. */
+ #define	DB_MPOOL_NOLOCK		0x002	/* Already have mpf locked. */
+ 
  #if defined(__cplusplus)
  }
  #endif
*** mp/mp_fopen.c	2007-05-18 03:18:01.000000000 +1000
--- mp/mp_fopen.c	2008-02-12 16:09:42.000000000 +1100
***************
*** 888,894 ****
  	 * when we try to flush them.
  	 */
  	deleted = 0;
! 	MUTEX_LOCK(dbenv, mfp->mutex);
  	if (F_ISSET(dbmfp, MP_MULTIVERSION))
  		--mfp->multiversion;
  	if (--mfp->mpf_cnt == 0 || LF_ISSET(DB_MPOOL_DISCARD)) {
--- 888,895 ----
  	 * when we try to flush them.
  	 */
  	deleted = 0;
! 	if (!LF_ISSET(DB_MPOOL_NOLOCK))
! 		MUTEX_LOCK(dbenv, mfp->mutex);
  	if (F_ISSET(dbmfp, MP_MULTIVERSION))
  		--mfp->multiversion;
  	if (--mfp->mpf_cnt == 0 || LF_ISSET(DB_MPOOL_DISCARD)) {
***************
*** 909,921 ****
  			}
  		}
  		if (mfp->block_cnt == 0) {
  			if ((t_ret =
  			    __memp_mf_discard(dbmp, mfp)) != 0 && ret == 0)
  				ret = t_ret;
  			deleted = 1;
  		}
  	}
! 	if (!deleted)
  		MUTEX_UNLOCK(dbenv, mfp->mutex);
  
  done:	/* Discard the DB_MPOOLFILE structure. */
--- 910,928 ----
  			}
  		}
  		if (mfp->block_cnt == 0) {
+ 			/*
+ 			 * We should never discard this mp file if our caller
+ 			 * is holding the lock on it.  See comment in
+ 			 * __memp_sync_file.
+ 			 */
+ 			DB_ASSERT(dbenv, !LF_ISSET(DB_MPOOL_NOLOCK));
  			if ((t_ret =
  			    __memp_mf_discard(dbmp, mfp)) != 0 && ret == 0)
  				ret = t_ret;
  			deleted = 1;
  		}
  	}
! 	if (!deleted && !LF_ISSET(DB_MPOOL_NOLOCK))
  		MUTEX_UNLOCK(dbenv, mfp->mutex);
  
  done:	/* Discard the DB_MPOOLFILE structure. */
*** mp/mp_sync.c	2007-06-02 04:32:44.000000000 +1000
--- mp/mp_sync.c	2008-02-12 16:09:42.000000000 +1100
***************
*** 755,761 ****
  	 * This is important since we are called with the hash bucket
  	 * locked.  The mfp will get freed via the cleanup pass.
  	 */
! 	if (dbmfp != NULL && (t_ret = __memp_fclose(dbmfp, 0)) != 0 && ret == 0)
  		ret = t_ret;
  
  	--mfp->mpf_cnt;
--- 755,762 ----
  	 * This is important since we are called with the hash bucket
  	 * locked.  The mfp will get freed via the cleanup pass.
  	 */
! 	if (dbmfp != NULL &&
! 	    (t_ret = __memp_fclose(dbmfp, DB_MPOOL_NOLOCK)) != 0 && ret == 0)
  		ret = t_ret;
  
  	--mfp->mpf_cnt;



--- NEW FILE patch.4.6.21.2 ---
*** mp/mp_region.c	2007-05-18 03:18:01.000000000 +1000
--- mp/mp_region.c	2008-06-24 13:15:56.000000000 +1000
***************
*** 249,256 ****
  		mtx_base = htab[0].mtx_hash;
  	}
  
  	if (mtx_base != MUTEX_INVALID)
! 		mtx_base += reginfo_off * htab_buckets;
  
  	/* Allocate hash table space and initialize it. */
  	if ((ret = __env_alloc(infop,
--- 249,262 ----
  		mtx_base = htab[0].mtx_hash;
  	}
  
+ 	/*
+ 	 * We preallocated all of the mutexes in a block, so for regions after
+ 	 * the first, we skip mutexes in use in earlier regions.  Each region
+ 	 * has the same number of buckets and there are two mutexes per hash
+ 	 * bucket (the bucket mutex and the I/O mutex).
+ 	 */
  	if (mtx_base != MUTEX_INVALID)
! 		mtx_base += reginfo_off * htab_buckets * 2;
  
  	/* Allocate hash table space and initialize it. */
  	if ((ret = __env_alloc(infop,


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/compat-db/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	13 Aug 2007 12:36:45 -0000	1.12
+++ .cvsignore	9 Jul 2008 06:39:42 -0000	1.13
@@ -1,4 +1,3 @@
-db-4.2.52.tar.gz
-db-4.1.25.tar.gz
 db-4.3.29.tar.gz
 db-4.5.20.tar.gz
+db-4.6.21.tar.gz


Index: compat-db.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-db/devel/compat-db.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- compat-db.spec	25 Feb 2008 05:03:55 -0000	1.28
+++ compat-db.spec	9 Jul 2008 06:39:42 -0000	1.29
@@ -1,28 +1,20 @@
-%define db4_versions 4.2.52 4.3.29 4.5.20
+%define db4_versions 4.3.29 4.5.20 4.6.21
 
 %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.5.20
-Release: 5%{?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
+Version: 4.6.21
+Release: 1%{?dist}
+Source0: http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz
+Source1: http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz
+Source2: http://download.oracle.com/berkeley-db/db-4.6.21.tar.gz
 
-Patch1: db4-db_load.patch
 Patch2: db-4.3.29-64bit.patch
 Patch3: db-4.3.29-sparc64.patch
 Patch4: db-4.5.20-glibc.patch
 
-# Upstream db-4.2.52 patches
-Patch10: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.1
-Patch11: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.2
-Patch12: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.3
-Patch13: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.4
-Patch14: http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.5
-
 # 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
 
@@ -30,13 +22,17 @@
 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
 
+# Upstream db-4.6.21 patches
+Patch40: http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.1
+Patch41: http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.2
+
 Obsoletes: db1, db1-devel
 Obsoletes: db2, db2-devel, db2-utils
 Obsoletes: db3, db3-devel, db3-utils
 Obsoletes: db31, db32, db3x
 Obsoletes: db4 < 4.6, db4-devel < 4.6, db4-utils < 4.6, db4-tcl < 4.6, db4-java < 4.6
 URL: http://www.oracle.com/database/berkeley-db/
-License: BSD-style
+License: BSD
 Group: System Environment/Libraries
 BuildRequires: findutils, libtool, perl, sed, ed
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,18 +46,6 @@
 %prep
 %setup -q -c -a 1 -a 2
 
-%patch1 -p1 -b .db-load
-
-pushd db-4.2.52
-%patch10 -p0
-%patch11 -p0
-%patch12 -p0
-%patch13 -p0
-%patch14 -p0
-%patch2 -p1 -b .64bit
-%patch3 -p1 -b .sparc64
-popd
-
 pushd db-4.3.29
 %patch2 -p1 -b .64bit
 %patch3 -p1 -b .sparc64
@@ -74,6 +58,12 @@
 %patch3 -p1 -b .sparc64
 popd
 
+pushd db-4.6.21
+%patch40 -p0
+%patch41 -p0
+%patch3 -p1 -b .sparc64
+popd
+
 %patch4 -p1 -b .glibc
 
 mkdir docs
@@ -158,11 +148,22 @@
 # Make sure all shared libraries have the execute bit set.
 chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/libdb*.so*
 
+# Make %{_libdir}/db<version>/libdb.so symlinks to ease detection for autofoo
+for version in %{db4_versions} ; do
+	mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/db${version}
+	pushd ${RPM_BUILD_ROOT}/%{_libdir}/db${version}
+	ln -s ../libdb-`echo ${version} | cut -b 1-3`.so libdb.so
+	ln -s ../libdb_cxx-`echo ${version} | cut -b 1-3`.so libdb_cxx.so
+	popd
+done
+
+
 # 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}/
+	mv ${RPM_BUILD_ROOT}%{_libdir}/db* ${RPM_BUILD_ROOT}/%{_lib}/
 fi
 %endif
 
@@ -183,8 +184,11 @@
 %ifos linux
 /%{_lib}/libdb-?.?.so
 /%{_lib}/libdb_cxx-?.?.so
+/%{_lib}/db*
 %else
 %{_libdir}/libdb-?.?.so
+%{_libdir}/libdb_cxx-?.?.so
+%{_libdir}/db*
 %endif
 %{_bindir}/berkeley_db*_svc
 %{_bindir}/db*_archive
@@ -198,9 +202,17 @@
 %{_bindir}/db*_upgrade
 %{_bindir}/db*_verify
 %{_bindir}/db*_hotbackup
+%{_bindir}/db*_codegen
 %{_includedir}/*
 
 %changelog
+* Wed Jul 09 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-1
+- move db-4.6.21 to compat-db (#449741)
+- remove db-4.2.52
+- package db46_codegen
+- create symlinks to ease detection for autofoo
+- fix license and filelists
+
 * Mon Feb 25 2008 Jindrich Novy <jnovy at redhat.com> 4.5.20-5
 - manual rebuild because of gcc-4.3 (#434183)
 

db-4.5.20-glibc.patch:

Index: db-4.5.20-glibc.patch
===================================================================
RCS file: /cvs/extras/rpms/compat-db/devel/db-4.5.20-glibc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- db-4.5.20-glibc.patch	13 Aug 2007 12:36:45 -0000	1.1
+++ db-4.5.20-glibc.patch	9 Jul 2008 06:39:42 -0000	1.2
@@ -364,28 +364,6 @@
  		goto err;
  
  	/* Create the mapping. */
---- compat-db-4.5.20/db-4.2.52/dbm/dbm.c.glibc	2003-01-08 05:34:46.000000000 +0100
-+++ compat-db-4.5.20/db-4.2.52/dbm/dbm.c	2007-08-13 13:46:45.000000000 +0200
-@@ -240,7 +240,7 @@ __db_ndbm_open(file, oflags, mode)
- 	if ((ret = dbp->set_pagesize(dbp, 4096)) != 0 ||
- 	    (ret = dbp->set_h_ffactor(dbp, 40)) != 0 ||
- 	    (ret = dbp->set_h_nelem(dbp, 1)) != 0 ||
--	    (ret = dbp->open(dbp, NULL,
-+	    (ret = (dbp->open)(dbp, NULL,
- 	    path, NULL, DB_HASH, __db_oflags(oflags), mode)) != 0) {
- 		__os_set_errno(ret);
- 		return (NULL);
---- compat-db-4.5.20/db-4.2.52/db185/db185.c.glibc	2007-08-13 13:46:45.000000000 +0200
-+++ compat-db-4.5.20/db-4.2.52/db185/db185.c	2007-08-13 13:46:45.000000000 +0200
-@@ -230,7 +230,7 @@ __db185_open(file, oflags, mode, type, o
- 	dbp->api_internal = db185p;
- 
- 	/* Open the database. */
--	if ((ret = dbp->open(dbp, NULL,
-+	if ((ret = (dbp->open)(dbp, NULL,
- 	    file, NULL, type, __db_oflags(oflags), mode)) != 0)
- 		goto err;
- 
 --- compat-db-4.5.20/db-4.3.29/dbm/dbm.c.glibc	2004-05-12 16:10:59.000000000 +0200
 +++ compat-db-4.5.20/db-4.3.29/dbm/dbm.c	2007-08-13 13:46:45.000000000 +0200
 @@ -235,7 +235,7 @@ __db_ndbm_open(file, oflags, mode)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/compat-db/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 Jul 2007 08:20:12 -0000	1.12
+++ sources	9 Jul 2008 06:39:42 -0000	1.13
@@ -1,3 +1,3 @@
-cbc77517c9278cdb47613ce8cb55779f  db-4.2.52.tar.gz
 13585a20ce32f113b8e8cdb57f52e3bb  db-4.3.29.tar.gz
 b0f1c777708cb8e9d37fb47e7ed3312d  db-4.5.20.tar.gz
+718082e7e35fc48478a2334b0bc4cd11  db-4.6.21.tar.gz


--- db4-db_load.patch DELETED ---


--- patch.4.2.52.1 DELETED ---


--- patch.4.2.52.2 DELETED ---


--- patch.4.2.52.3 DELETED ---


--- patch.4.2.52.4 DELETED ---


--- patch.4.2.52.5 DELETED ---


