Changes 5.3.21:

* Fixed incompatibility problems of Java DPL with JDK7, so DPL will now work
  with JDK7.
* Added a flag to allow database locking to be disabled from the SQL API.
* Fixed a bug that could allocate a heap data page in a region after the region
  creation has been undone.
* Redundant whitespaces are now ignored in DB_CONFIG lines pertaining to
  directories, e.g. set_data_dir.
* Fixed a bug that caused DB_ENV->backup to stop early if DB_BACKUP_FILES was
  not set and a non-DB file was in the data directory.
* Fixed a rare race condition that could cause a crash if two processes opened
  the same database at the same time.
* Fixed missing cross compiling capability for the JDBC driver.
* Allow the same system/machine to host both a master and a replica database
  through the use of relative pathnames.
* Fixed a bug in the Java API where EnvironmentConfig.setCreateDir would fail
  to configure the environment.
* Fixed an assert failure in btreeCompare when allocating memory in the wrong
  thread was causing a memory leak.
* Fixed a bug in the Java API where concurrent operations that change the
  database schema could lead to a hang.
* Added JDBC code to the code base and updated the windows build files to
  include the JDBC solution.
* Fixed a bug where the heap's region size was not getting swapped correctly in
  mixed-endian environments.
* Fixed a bug in the db_sql_jdbc project file for vs2010 that was preventing it
  from building correctly.

4 files changed, 34 insertions, 8 deletions

diff --git a/databases/db5/Makefile b/databases/db5/Makefile
index d84b30bcfef..5cc4ae34e74 100644
--- a/databases/db5/Makefile
+++ b/databases/db5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/01/18 13:46:50 adam Exp $
+# $NetBSD: Makefile,v 1.9 2012/05/31 09:37:20 adam Exp $
 #
 # NOTE:
 # When updating this package, a change in the minor (5.n -> 5.(n+1))
@@ -6,7 +6,7 @@
 # ABI depends in buildlink3.mk and bump PKGREVISIONs for all dependencies.
 # In particular, take care to include BDB_ACCEPTED=db5 packages.
 
-DISTNAME=	db-5.3.15
+DISTNAME=	db-5.3.21
 PKGNAME=	${DISTNAME:S/db/db5/}
 CATEGORIES=	databases
 MASTER_SITES=	http://download.oracle.com/berkeley-db/ \
diff --git a/databases/db5/PLIST b/databases/db5/PLIST
index 3fc842d55af..950a0290296 100644
--- a/databases/db5/PLIST
+++ b/databases/db5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/01/18 13:46:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/05/31 09:37:20 adam Exp $
 bin/db5_archive
 bin/db5_checkpoint
 bin/db5_deadlock
@@ -3837,9 +3837,9 @@ share/doc/db5/csharp/scripts/SplitScreen.js
 share/doc/db5/csharp/scripts/highlight.js
 share/doc/db5/csharp/scripts/script_feedBack.js
 share/doc/db5/csharp/scripts/script_manifold.js
+share/doc/db5/csharp/styles/Presentation.css
 share/doc/db5/csharp/styles/Whidbey/presentation.css
 share/doc/db5/csharp/styles/highlight.css
-share/doc/db5/csharp/styles/presentation.css
 share/doc/db5/gsg/C/BerkeleyDB-Core-C-GSG.pdf
 share/doc/db5/gsg/C/CoreCursorUsage.html
 share/doc/db5/gsg/C/CoreDBAdmin.html
@@ -4257,6 +4257,7 @@ share/doc/db5/installation/changelog_5_0.html
 share/doc/db5/installation/changelog_5_1.html
 share/doc/db5/installation/changelog_5_2.html
 share/doc/db5/installation/changelog_5_3.html
+share/doc/db5/installation/cross_compile_unix.html
 share/doc/db5/installation/debug.html
 share/doc/db5/installation/debug_compile.html
 share/doc/db5/installation/debug_printlog.html
diff --git a/databases/db5/distinfo b/databases/db5/distinfo
index 01c2665b6e0..6c975f42cf1 100644
--- a/databases/db5/distinfo
+++ b/databases/db5/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2012/01/18 13:46:50 adam Exp $
+$NetBSD: distinfo,v 1.8 2012/05/31 09:37:20 adam Exp $
 
-SHA1 (db-5.3.15.tar.gz) = 7683b632a01ff3543c379a120809a942ec457738
-RMD160 (db-5.3.15.tar.gz) = 8c7bb36fd85ec99220be6f5c0df8de7d1fcc6040
-Size (db-5.3.15.tar.gz) = 34899186 bytes
+SHA1 (db-5.3.21.tar.gz) = 32e43c4898c8996750c958a90c174bd116fcba83
+RMD160 (db-5.3.21.tar.gz) = 5768a4d835d02020165c6561cc5c406339662fa0
+Size (db-5.3.21.tar.gz) = 35062469 bytes
 SHA1 (patch-aa) = 9450e95f46787ddc1d661beaa239ea0ff4673f20
 SHA1 (patch-ab) = 92cb9722e3bb6cdadbd7a542157b4fee69564d78
 SHA1 (patch-ac) = 0a243583ae2b66290fb83b112c539001bf3feef2
+SHA1 (patch-src_dbinc_atomic.h) = 6d1e97317c20021d13ff5b59f587730301b4a795
diff --git a/databases/db5/patches/patch-src_dbinc_atomic.h b/databases/db5/patches/patch-src_dbinc_atomic.h
new file mode 100644
index 00000000000..c2e8d26992b
--- /dev/null
+++ b/databases/db5/patches/patch-src_dbinc_atomic.h
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_dbinc_atomic.h,v 1.1 2012/05/31 09:37:21 adam Exp $
+
+Avoid 'definition of builtin function' error.
+
+--- src/dbinc/atomic.h.orig	2012-05-30 14:59:06.000000000 +0000
++++ src/dbinc/atomic.h
+@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
+ #define	atomic_inc(env, p)	__atomic_inc(p)
+ #define	atomic_dec(env, p)	__atomic_dec(p)
+ #define	atomic_compare_exchange(env, p, o, n)	\
+-	__atomic_compare_exchange((p), (o), (n))
++	__atomic_compare_exchange_db((p), (o), (n))
+ static inline int __atomic_inc(db_atomic_t *p)
+ {
+ 	int	temp;
+@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic
+  * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
+  * which configure could be changed to use.
+  */
+-static inline int __atomic_compare_exchange(
++static inline int __atomic_compare_exchange_db(
+ 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
+ {
+ 	atomic_value_t was;