Changes 4.6.21:

* Fix a bug where mutex contention in database environments configured for
  hybrid mutex support could result in performance degradation.
* Fix a bug where closing a database handle after aborting a transaction
  which included a failed open of that database handle could result in
  application failure.
* Fix multiple MVCC bugs including a race which could result in incorrect
  data being returned to the application.
* Fix a bug where a database store into a Hash database could self-deadlock
  in a database environment configured for the Berkeley DB Concurrent Data
  Store product and with a free-threaded DB_ENV or DB handle.
* Fix an installation bug where Berkeley DB's PHP header file was not installed
  in the correct place.

3 files changed, 32 insertions, 31 deletions

diff --git a/databases/db4/patches/patch-aa b/databases/db4/patches/patch-aa
index a27eaf5bb3f..0679de162bd 100644
--- a/databases/db4/patches/patch-aa
+++ b/databases/db4/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.12 2007/06/08 12:23:51 wiz Exp $
+$NetBSD: patch-aa,v 1.13 2008/01/10 21:55:53 adam Exp $
 
---- dist/Makefile.in.orig	2006-09-13 16:22:38.000000000 +0000
+--- dist/Makefile.in.orig	2007-07-05 20:35:02.000000000 +0200
 +++ dist/Makefile.in
 @@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@
  bindir=	@bindir@
@@ -59,7 +59,7 @@ $NetBSD: patch-aa,v 1.12 2007/06/08 12:23:51 wiz Exp $
  libtso=		$(libtso_base)-$(LIBVERSION)@MODSUFFIX@
  libtso_static=	$(libtso_base)-$(LIBVERSION).a
  libtso_target=	$(libtso_base)-$(LIBVERSION).la
-@@ -723,8 +723,7 @@ install_include:
+@@ -738,8 +738,7 @@ install_include:
  	    ($(MKDIR) -p $(DESTDIR)$(includedir) && \
  	    $(CHMOD) $(dmode) $(DESTDIR)$(includedir))
  	@cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT)
@@ -69,7 +69,7 @@ $NetBSD: patch-aa,v 1.12 2007/06/08 12:23:51 wiz Exp $
  
  uninstall_include:
  	@cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT)
-@@ -735,7 +734,7 @@ install_lib:
+@@ -750,7 +749,7 @@ install_lib:
  	    ($(MKDIR) -p $(DESTDIR)$(libdir) && \
  	    $(CHMOD) $(dmode) $(DESTDIR)$(libdir))
  	@cd $(DESTDIR)$(libdir) && $(RM) -f $(LIB_INSTALL_FILE_LIST)
@@ -78,14 +78,14 @@ $NetBSD: patch-aa,v 1.12 2007/06/08 12:23:51 wiz Exp $
  	@(cd $(DESTDIR)$(libdir) && \
  	    test -f $(libso) && $(LN) -s $(libso) $(libso_default); \
  	    test -f $(libso) && $(LN) -s $(libso) $(libso_major); \
-@@ -759,11 +758,8 @@ install_utilities:
+@@ -774,11 +773,8 @@ install_utilities:
  	    ($(MKDIR) -p $(DESTDIR)$(bindir) && \
  	    $(CHMOD) $(dmode) $(DESTDIR)$(bindir))
  	@for i in $(UTIL_PROGS); do \
 -		test -f $$i.exe && i=$$i.exe || i=$$i; \
 -		$(RM) -f $(DESTDIR)$(bindir)/$$i; \
 -		$(INSTALLER) $$i $(DESTDIR)$(bindir)/$$i; \
--		test "$(STRIP)" = "none" || $(STRIP) $(DESTDIR)$(bindir)/$$i; \
+-		$(STRIP) $(DESTDIR)$(bindir)/$$i; \
 -		$(CHMOD) $(emode) $(DESTDIR)$(bindir)/$$i; \
 +		target="${DESTDIR}${bindir}/`echo $$i | sed '${transform}'`"; \
 +		libtool --mode=install ${BSD_INSTALL_PROGRAM} $$i $$target; \
diff --git a/databases/db4/patches/patch-ab b/databases/db4/patches/patch-ab
index 75399c98cd9..c2f1cf7d83b 100644
--- a/databases/db4/patches/patch-ab
+++ b/databases/db4/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.16 2007/06/08 12:23:51 wiz Exp $
+$NetBSD: patch-ab,v 1.17 2008/01/10 21:55:53 adam Exp $
 
---- dist/configure.orig	2006-09-20 20:07:20.000000000 +0000
+--- dist/configure.orig	2007-09-27 17:32:04.000000000 +0200
 +++ dist/configure
-@@ -6288,6 +6288,7 @@ db_cv_gxx_except=no;
+@@ -5938,6 +5938,7 @@ db_cv_gxx_except=no;
  if test "$GXX" = "yes"; then
  	GXX_VERSION=`${MAKEFILE_CXX} --version`
  	case ${GXX_VERSION} in
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.16 2007/06/08 12:23:51 wiz Exp $
  	1.*|2.[01234567].*|*-1.*|*-2.[01234567].*)
  		db_cv_gxx_except=yes;;
  	esac
-@@ -6304,7 +6305,7 @@ fi
+@@ -5954,7 +5955,7 @@ fi
  # we're using.
  case "$host_os" in
  sysv5UnixWare*|sysv5OpenUNIX8*)
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.16 2007/06/08 12:23:51 wiz Exp $
  		CPPFLAGS="$CPPFLAGS -pthread"
  		LDFLAGS="$LDFLAGS -pthread"
  	else
-@@ -21832,7 +21833,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+@@ -21078,7 +21079,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
  
  
  SOFLAGS="-rpath \$(libdir)"
@@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.16 2007/06/08 12:23:51 wiz Exp $
  
  # Set SOSUFFIX and friends
  
-@@ -21924,7 +21924,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6; }
+@@ -21170,7 +21170,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6; }
  INSTALLER="\$(LIBTOOL) --mode=install cp -p"
  
  MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
@@ -36,7 +36,7 @@ $NetBSD: patch-ab,v 1.16 2007/06/08 12:23:51 wiz Exp $
  MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
  MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
  MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
-@@ -22691,7 +22691,7 @@ if test "$_JTOPDIR" != "/usr"; then
+@@ -21937,7 +21937,7 @@ if test "$_JTOPDIR" != "/usr"; then
  	case "$host_os" in
  	aix*)		_JNI_INC_SUBDIRS="aix";;
  	bsdi*)		_JNI_INC_SUBDIRS="bsdos";;
@@ -45,12 +45,12 @@ $NetBSD: patch-ab,v 1.16 2007/06/08 12:23:51 wiz Exp $
  	hp*)		_JNI_INC_SUBDIRS="hp-ux";;
  	linux*)		_JNI_INC_SUBDIRS="linux genunix";;
  	osf*)		_JNI_INC_SUBDIRS="alpha";;
-@@ -31972,7 +31972,7 @@ fi
- #
- # 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.
--if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then
-+if test "$ac_cv_lib_pthread_main" = yes -a "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then
- 	LIBS="$LIBS -lpthread"
+@@ -29859,7 +29859,7 @@ rm -f core conftest.err conftest.$ac_obj
+ 	# 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.
+-	if test "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
++	if test "$ac_cv_lib_pthread_main" = yes -a "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
+ 		LIBS="$LIBS -lpthread"
  
  if test "$cross_compiling" = yes; then
diff --git a/databases/db4/patches/patch-ac b/databases/db4/patches/patch-ac
index 65e84657034..314d81e714c 100644
--- a/databases/db4/patches/patch-ac
+++ b/databases/db4/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.7 2007/06/08 12:23:51 wiz Exp $
+$NetBSD: patch-ac,v 1.8 2008/01/10 21:55:53 adam Exp $
 
---- hmac/sha1.c.orig	2006-09-09 00:45:39.000000000 +0000
+--- hmac/sha1.c.orig	2008-01-09 19:15:23.000000000 +0100
 +++ hmac/sha1.c
-@@ -99,6 +99,63 @@ A million repetitions of "a"
- #define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
- #define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+@@ -98,6 +98,64 @@ A million repetitions of "a"
+ #define	R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+ #define	R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
  
 +typedef union {
 +    unsigned char c[64];
@@ -63,11 +63,12 @@ $NetBSD: patch-ac,v 1.7 2007/06/08 12:23:51 wiz Exp $
 +    nR4(e,a,b,c,d,76); nR4(d,e,a,b,c,77); nR4(c,d,e,a,b,78); nR4(b,c,d,e,a,79);
 +}
 +#endif
- 
++
  #ifdef VERBOSE  /* SAK */
  static void __db_SHAPrintContext __P((SHA1_CTX *, char *));
-@@ -131,10 +188,6 @@ __db_SHA1Transform(state, buffer)
-         unsigned char *buffer;
+ static void
+@@ -129,10 +187,6 @@ __db_SHA1Transform(state, buffer)
+ 	unsigned char *buffer;
  {
  u_int32_t a, b, c, d, e;
 -typedef union {
@@ -75,9 +76,9 @@ $NetBSD: patch-ac,v 1.7 2007/06/08 12:23:51 wiz Exp $
 -    u_int32_t l[16];
 -} CHAR64LONG16;
  CHAR64LONG16* block;
- static int is_bigendian = -1;
+     int is_bigendian;
  #ifdef SHA1HANDSOFF
-@@ -153,6 +206,13 @@ static int is_bigendian = -1;
+@@ -151,6 +205,13 @@ CHAR64LONG16* block;
      c = state[2];
      d = state[3];
      e = state[4];
@@ -91,7 +92,7 @@ $NetBSD: patch-ac,v 1.7 2007/06/08 12:23:51 wiz Exp $
      /* 4 rounds of 20 operations each. Loop unrolled. */
      R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
      R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
-@@ -174,6 +234,8 @@ static int is_bigendian = -1;
+@@ -172,6 +233,8 @@ CHAR64LONG16* block;
      R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
      R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
      R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);