Changes 5.2.36:

* Updated the JDBC version shipped with Berkeley DB to support Oracle Java
  Embedded Client.
* Fixed several memory leaks in the Online Backup API.
* Fix a bug in the SQL API when using a blob field with a lot of content and
  multiple concurrent connections to the database.
* Update EID_MASTER to be public static final so that it will be exposed in
  Java docs.
* Fixed a bug where BFile module crashes when using BFile handle for SQL
  expressions interface on 64 bit platforms.
* Fixed a bug where, on systems without FTRUNCATE, db_verify will return an
  error for truncated heap databases.
* Let ADO.NET solution building skip SQLite Designer and Linq by default.
* Fixed a bug that could cause BDB to run out of avaliable mutexes when
  renaming many databases.
* Fixed a bug where the metadata page in hash databases would not be flushed to
  disk.
* Fixed a bug where printlog would fail on in-memory heap databases.
* Fixed a bug that would cause verify to call the wrong compare function if
  there are user defined compare functions used and the database has multilevel
  off page sorted duplicate trees.
* Fixed a bug where two processes accessing the same table and one of those
  drops the table and recreates, the second process can crash.
* Fixed a bug where it was possible to panic a heap database without an error
  message being printed.
* Fixed a bug where it would fail to put records with overflow keys into hash
  duplicate database.
* Fixed a bug where multiple Replication Manager processes would sometimes not
  all conform to replication-group-aware log archiving.
* more...

5 files changed, 41 insertions, 38 deletions

diff --git a/databases/db5/Makefile b/databases/db5/Makefile
index 0edaab3561e..57e1b3b7933 100644
--- a/databases/db5/Makefile
+++ b/databases/db5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/06/15 20:56:04 adam Exp $
+# $NetBSD: Makefile,v 1.6 2011/10/03 10:54:45 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.2.28
+DISTNAME=	db-5.2.36
 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 bd3a477013f..82e692a2686 100644
--- a/databases/db5/PLIST
+++ b/databases/db5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2011/06/15 20:56:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/10/03 10:54:45 adam Exp $
 bin/db5_archive
 bin/db5_checkpoint
 bin/db5_deadlock
@@ -1283,6 +1283,9 @@ share/doc/db5/api_reference/TCL/version.html
 share/doc/db5/articles/inmemory/C/InMemoryDBApplication.pdf
 share/doc/db5/articles/inmemory/C/gettingStarted.css
 share/doc/db5/articles/inmemory/C/index.html
+share/doc/db5/articles/mssgtxt/DBMessageTextReference.pdf
+share/doc/db5/articles/mssgtxt/gettingStarted.css
+share/doc/db5/articles/mssgtxt/index.html
 share/doc/db5/bdb-sql/BDB-SQL-Guide.pdf
 share/doc/db5/bdb-sql/addedpragmas.html
 share/doc/db5/bdb-sql/admin.html
@@ -4011,6 +4014,7 @@ share/doc/db5/gsg_txn/C/architectrecovery.html
 share/doc/db5/gsg_txn/C/autocommit.html
 share/doc/db5/gsg_txn/C/backuprestore.html
 share/doc/db5/gsg_txn/C/blocking_deadlocks.html
+share/doc/db5/gsg_txn/C/deadlock-pdf.jpg
 share/doc/db5/gsg_txn/C/deadlock.jpg
 share/doc/db5/gsg_txn/C/enabletxn.html
 share/doc/db5/gsg_txn/C/envopen.html
@@ -4036,8 +4040,7 @@ share/doc/db5/gsg_txn/C/readmodifywrite.html
 share/doc/db5/gsg_txn/C/recovery-intro.html
 share/doc/db5/gsg_txn/C/recovery.html
 share/doc/db5/gsg_txn/C/reversesplit.html
-share/doc/db5/gsg_txn/C/rwlocks1.jpg
-share/doc/db5/gsg_txn/C/simplelock.jpg
+share/doc/db5/gsg_txn/C/rwlocks1-pdf.jpg
 share/doc/db5/gsg_txn/C/sysfailure.html
 share/doc/db5/gsg_txn/C/txn_ccursor.html
 share/doc/db5/gsg_txn/C/txnconcurrency.html
@@ -4047,7 +4050,7 @@ share/doc/db5/gsg_txn/C/txnindices.html
 share/doc/db5/gsg_txn/C/txnnowait.html
 share/doc/db5/gsg_txn/C/usingtxns.html
 share/doc/db5/gsg_txn/C/wrapup.html
-share/doc/db5/gsg_txn/C/writeblock.jpg
+share/doc/db5/gsg_txn/C/writeblock-pdf.jpg
 share/doc/db5/gsg_txn/CXX/BerkeleyDB-Core-Cxx-Txn.pdf
 share/doc/db5/gsg_txn/CXX/abortresults.html
 share/doc/db5/gsg_txn/CXX/apireq.html
@@ -4055,6 +4058,7 @@ share/doc/db5/gsg_txn/CXX/architectrecovery.html
 share/doc/db5/gsg_txn/CXX/autocommit.html
 share/doc/db5/gsg_txn/CXX/backuprestore.html
 share/doc/db5/gsg_txn/CXX/blocking_deadlocks.html
+share/doc/db5/gsg_txn/CXX/deadlock-pdf.jpg
 share/doc/db5/gsg_txn/CXX/deadlock.jpg
 share/doc/db5/gsg_txn/CXX/enabletxn.html
 share/doc/db5/gsg_txn/CXX/envopen.html
@@ -4080,8 +4084,7 @@ share/doc/db5/gsg_txn/CXX/readmodifywrite.html
 share/doc/db5/gsg_txn/CXX/recovery-intro.html
 share/doc/db5/gsg_txn/CXX/recovery.html
 share/doc/db5/gsg_txn/CXX/reversesplit.html
-share/doc/db5/gsg_txn/CXX/rwlocks1.jpg
-share/doc/db5/gsg_txn/CXX/simplelock.jpg
+share/doc/db5/gsg_txn/CXX/rwlocks1-pdf.jpg
 share/doc/db5/gsg_txn/CXX/sysfailure.html
 share/doc/db5/gsg_txn/CXX/txn_ccursor.html
 share/doc/db5/gsg_txn/CXX/txnconcurrency.html
@@ -4091,7 +4094,7 @@ share/doc/db5/gsg_txn/CXX/txnindices.html
 share/doc/db5/gsg_txn/CXX/txnnowait.html
 share/doc/db5/gsg_txn/CXX/usingtxns.html
 share/doc/db5/gsg_txn/CXX/wrapup.html
-share/doc/db5/gsg_txn/CXX/writeblock.jpg
+share/doc/db5/gsg_txn/CXX/writeblock-pdf.jpg
 share/doc/db5/gsg_txn/JAVA/BerkeleyDB-Core-JAVA-Txn.pdf
 share/doc/db5/gsg_txn/JAVA/abortresults.html
 share/doc/db5/gsg_txn/JAVA/apireq.html
@@ -4099,6 +4102,7 @@ share/doc/db5/gsg_txn/JAVA/architectrecovery.html
 share/doc/db5/gsg_txn/JAVA/autocommit.html
 share/doc/db5/gsg_txn/JAVA/backuprestore.html
 share/doc/db5/gsg_txn/JAVA/blocking_deadlocks.html
+share/doc/db5/gsg_txn/JAVA/deadlock-pdf.jpg
 share/doc/db5/gsg_txn/JAVA/deadlock.jpg
 share/doc/db5/gsg_txn/JAVA/enabletxn.html
 share/doc/db5/gsg_txn/JAVA/envopen.html
@@ -4124,8 +4128,7 @@ share/doc/db5/gsg_txn/JAVA/readmodifywrite.html
 share/doc/db5/gsg_txn/JAVA/recovery-intro.html
 share/doc/db5/gsg_txn/JAVA/recovery.html
 share/doc/db5/gsg_txn/JAVA/reversesplit.html
-share/doc/db5/gsg_txn/JAVA/rwlocks1.jpg
-share/doc/db5/gsg_txn/JAVA/simplelock.jpg
+share/doc/db5/gsg_txn/JAVA/rwlocks1-pdf.jpg
 share/doc/db5/gsg_txn/JAVA/sysfailure.html
 share/doc/db5/gsg_txn/JAVA/txn_ccursor.html
 share/doc/db5/gsg_txn/JAVA/txnconcurrency.html
@@ -4136,7 +4139,7 @@ share/doc/db5/gsg_txn/JAVA/txnindices.html
 share/doc/db5/gsg_txn/JAVA/txnnowait.html
 share/doc/db5/gsg_txn/JAVA/usingtxns.html
 share/doc/db5/gsg_txn/JAVA/wrapup.html
-share/doc/db5/gsg_txn/JAVA/writeblock.jpg
+share/doc/db5/gsg_txn/JAVA/writeblock-pdf.jpg
 share/doc/db5/index.html
 share/doc/db5/installation/BDB_Installation.pdf
 share/doc/db5/installation/arch_bigpic.gif
diff --git a/databases/db5/distinfo b/databases/db5/distinfo
index ed173322dd6..0c5ab4d9198 100644
--- a/databases/db5/distinfo
+++ b/databases/db5/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2011/06/15 20:56:04 adam Exp $
+$NetBSD: distinfo,v 1.6 2011/10/03 10:54:45 adam Exp $
 
-SHA1 (db-5.2.28.tar.gz) = e6572e3356cf8bc998da4e889db3b12638833435
-RMD160 (db-5.2.28.tar.gz) = b54918e88cfea6584dbe2e4994aa16ec24f04a83
-Size (db-5.2.28.tar.gz) = 33033536 bytes
-SHA1 (patch-aa) = d63b51679a4d948f803a2fbf18e682000ac828dc
-SHA1 (patch-ab) = 700ef52c29238b84cd913b96f42f01c615f67ace
+SHA1 (db-5.2.36.tar.gz) = 1a7997e5bcdf504a439f90d9eaed63864806ed5f
+RMD160 (db-5.2.36.tar.gz) = 6e5746424489ee27d8ca9fcc13511d006c93266b
+Size (db-5.2.36.tar.gz) = 34664337 bytes
+SHA1 (patch-aa) = ea722380c91b819b55e57aa02926d25c20f892b6
+SHA1 (patch-ab) = dde882d7cb9727efdb4612eefad17b188afd636a
 SHA1 (patch-ac) = 0a243583ae2b66290fb83b112c539001bf3feef2
diff --git a/databases/db5/patches/patch-aa b/databases/db5/patches/patch-aa
index 4197cd38d96..8a568938198 100644
--- a/databases/db5/patches/patch-aa
+++ b/databases/db5/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2010/09/16 07:53:32 adam Exp $
+$NetBSD: patch-aa,v 1.3 2011/10/03 10:54:45 adam Exp $
 
---- dist/Makefile.in.orig	2010-08-27 15:08:03.000000000 +0000
+--- dist/Makefile.in.orig	2011-09-14 14:30:11.000000000 +0000
 +++ dist/Makefile.in
-@@ -17,7 +17,7 @@ exec_prefix=@exec_prefix@
+@@ -18,7 +18,7 @@ exec_prefix=@exec_prefix@
  bindir=	@bindir@
  includedir=@includedir@
  libdir=	@libdir@
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2010/09/16 07:53:32 adam Exp $
  
  dmode=	755
  emode=	555
-@@ -54,7 +54,7 @@ INSTALLER=	@INSTALLER@
+@@ -55,7 +55,7 @@ INSTALLER=	@INSTALLER@
  LIBTOOL=	@LIBTOOL@
  
  POSTLINK=	@POSTLINK@
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.2 2010/09/16 07:53:32 adam Exp $
  SOFLAGS=	@SOFLAGS@
  LIBMAJOR=	@DB_VERSION_MAJOR@
  LIBVERSION=	@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
-@@ -73,7 +73,7 @@ LIBS=		@LIBSO_LIBS@
+@@ -74,7 +74,7 @@ LIBS=		@LIBSO_LIBS@
  TEST_LIBS=	@TEST_LIBS@
  LIBCSO_LIBS=	@LIBCSO_LIBS@ @LIBSO_LIBS@
  
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.2 2010/09/16 07:53:32 adam Exp $
  libdb=		$(libdb_base).a
  libdb_version=	$(libdb_base)-$(LIBVERSION).a
  libso=		$(libdb_base)-$(LIBVERSION)@SOSUFFIX@
-@@ -92,7 +92,7 @@ CXXLINK=	@MAKEFILE_CXXLINK@ @CXXFLAGS@
+@@ -93,7 +93,7 @@ CXXLINK=	@MAKEFILE_CXXLINK@ @CXXFLAGS@
  XSOLINK=	@MAKEFILE_XSOLINK@ @CXXFLAGS@
  LIBXSO_LIBS=	@LIBXSO_LIBS@ @LIBSO_LIBS@
  
@@ -38,9 +38,9 @@ $NetBSD: patch-aa,v 1.2 2010/09/16 07:53:32 adam Exp $
  libcxx=		$(libcxx_base).a
  libcxx_version=	$(libcxx_base)-$(LIBVERSION).a
  libxso=		$(libcxx_base)-$(LIBVERSION)@SOSUFFIX@
-@@ -157,9 +157,9 @@ JAVA_EXDIR=	$(exampledir)/java/src
+@@ -158,9 +158,9 @@ JAVA_EXDIR=	$(exampledir)/java/src
  JAVA_SLEEPYCAT=	$(langdir)/java/src/com/sleepycat
- JAVA_MANIFEST=	$(langdir)/java/jarManifestEntries
+ JAVA_MANIFEST=	$(abs_topdir)/lang/java/jarManifestEntries
  
 -libj_jarfile=	db.jar
 +libj_jarfile=	db5.jar
@@ -50,7 +50,7 @@ $NetBSD: patch-aa,v 1.2 2010/09/16 07:53:32 adam Exp $
  libjso=		$(libjso_base)-$(LIBVERSION)@JMODSUFFIX@
  libjso_static=	$(libjso_base)-$(LIBVERSION).a
  libjso_target=	$(libjso_base)-$(LIBVERSION).la
-@@ -175,7 +175,7 @@ libjso_g=	$(libjso_base)-$(LIBVERSION)_g
+@@ -176,7 +176,7 @@ libjso_g=	$(libjso_base)-$(LIBVERSION)_g
  TCL_INCLUDE_SPEC=	@TCL_INCLUDE_SPEC@
  LIBTSO_LIBS=	@LIBTSO_LIBS@ @LIBSO_LIBS@
  TCL_SRCDIR=	$(langdir)/tcl
@@ -59,7 +59,7 @@ $NetBSD: patch-aa,v 1.2 2010/09/16 07:53:32 adam Exp $
  libtcl=		$(libtcl_base).a
  libtcl_version=	$(libtcl_base)-$(LIBVERSION).a
  libtso=		$(libtcl_base)-$(LIBVERSION)@LIBTSO_MODSUFFIX@
-@@ -1051,8 +1051,7 @@ install_include: $(INCDOT)
+@@ -1085,8 +1085,7 @@ install_include: $(INCDOT)
  	@for f in $(INCDOT); do \
  	    basef=`echo $$f | $(SED) 's,.*/,,'` ; \
  	    $(RM) $(DESTDIR)$(includedir)/$$basef ; \
@@ -69,7 +69,7 @@ $NetBSD: patch-aa,v 1.2 2010/09/16 07:53:32 adam Exp $
  	done
  
  uninstall_include:
-@@ -1067,7 +1066,7 @@ install_lib:
+@@ -1101,7 +1100,7 @@ install_lib:
  	    ($(MKDIR) -p $(DESTDIR)$(libdir) && \
  	    $(CHMOD) $(dmode) $(DESTDIR)$(libdir))
  	@cd $(DESTDIR)$(libdir) && $(RM) $(LIB_INSTALL_FILE_LIST)
@@ -78,7 +78,7 @@ $NetBSD: patch-aa,v 1.2 2010/09/16 07:53:32 adam Exp $
  	@(cd $(DESTDIR)$(libdir) && \
  	    test -f $(libso) && $(LN) -s $(libso) $(libso_default); \
  	    test -f $(libso) && $(LN) -s $(libso) $(libso_major); \
-@@ -1098,10 +1097,8 @@ install_utilities:
+@@ -1132,10 +1131,8 @@ install_utilities:
  	@for i in $(UTIL_PROGS); do \
  		test -f $$i.exe && i=$$i.exe; \
  		e=`echo $$i | $(SED) '$(transform)'`; \
@@ -91,7 +91,7 @@ $NetBSD: patch-aa,v 1.2 2010/09/16 07:53:32 adam Exp $
  	done
  
  uninstall_utilities:
-@@ -1123,7 +1120,7 @@ install_docs:
+@@ -1157,7 +1154,7 @@ install_docs:
  	    ($(MKDIR) -p $(DESTDIR)$(docdir) && \
  	    $(CHMOD) $(dmode) $(DESTDIR)$(docdir))
  	@cd $(DESTDIR)$(docdir) && $(RM) -r $(DOCLIST)
diff --git a/databases/db5/patches/patch-ab b/databases/db5/patches/patch-ab
index cba77e4fd42..2d4cd4de7ff 100644
--- a/databases/db5/patches/patch-ab
+++ b/databases/db5/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2010/09/16 07:53:32 adam Exp $
+$NetBSD: patch-ab,v 1.3 2011/10/03 10:54:46 adam Exp $
 
---- dist/configure.orig	2010-08-27 15:08:03.000000000 +0000
+--- dist/configure.orig	2011-09-14 14:30:12.000000000 +0000
 +++ dist/configure
-@@ -5131,7 +5131,7 @@ bsdi3*)	CC=${CC-"shlicc2"}
+@@ -5098,7 +5098,7 @@ bsdi3*)	CC=${CC-"shlicc2"}
  	LIBSO_LIBS="$LIBSO_LIBS -lipc";;
  cygwin*)
  	CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";;
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2010/09/16 07:53:32 adam Exp $
  	CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
  	LDFLAGS="$LDFLAGS -pthread";;
  gnu*|k*bsd*-gnu|linux*)
-@@ -6893,7 +6893,7 @@ fi
+@@ -6891,7 +6891,7 @@ fi
  # we're using.
  case "$host_os" in
  sysv5UnixWare*|sysv5OpenUNIX8*)
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.2 2010/09/16 07:53:32 adam Exp $
  		CPPFLAGS="$CPPFLAGS -pthread"
  		LDFLAGS="$LDFLAGS -pthread"
  	else
-@@ -16772,7 +16772,7 @@ LIBTOOL="./libtool"
+@@ -17698,7 +17698,7 @@ LIBTOOL="./libtool"
  INSTALLER="\$(LIBTOOL) --mode=install cp -p"
  
  MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.2 2010/09/16 07:53:32 adam Exp $
  MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
  MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
  MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
-@@ -17505,7 +17505,7 @@ if test "$_JTOPDIR" != "/usr"; then
+@@ -18431,7 +18431,7 @@ if test "$_JTOPDIR" != "/usr"; then
  	aix*)		_JNI_INC_SUBDIRS="aix";;
  	bsdi*)		_JNI_INC_SUBDIRS="bsdos";;
  	cygwin*)	_JNI_INC_SUBDIRS="win32";;
@@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.2 2010/09/16 07:53:32 adam Exp $
  	hp*)		_JNI_INC_SUBDIRS="hp-ux";;
  	linux*)		_JNI_INC_SUBDIRS="linux genunix";;
  	osf*)		_JNI_INC_SUBDIRS="alpha";;
-@@ -19634,7 +19634,7 @@ if test "$db_cv_mutex" = no; then
+@@ -20540,7 +20540,7 @@ if test "$db_cv_mutex" = no; then
  	# If the user specified we use POSIX pthreads mutexes, and we fail to
  	# find the full interface, try and configure for just intra-process
  	# support.