Libdb 5.3

.cirrus.yml

@@ -132,7 +132,7 @@ task:
 task:
   name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]'
   macos_brew_addon_script:
-    - brew install boost libevent berkeley-db4 qt miniupnpc ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
+    - brew install ccache libtool automake pkg-config gnu-getopt
   << : *GLOBAL_TASK_TEMPLATE
   osx_instance:
     # Use latest image, but hardcode version to avoid silent upgrades (and breaks)

ci/test/00_setup_env_i686_centos.sh

@@ -11,5 +11,5 @@ export CONTAINER_NAME=ci_i686_centos_7
 export DOCKER_NAME_TAG=centos:7
 export DOCKER_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python36-devel python36-zmq which patch lbzip2 dash"
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports --with-boost-process"
+export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports --with-incompatible-bdb --with-boost-process"
 export CONFIG_SHELL="/bin/dash"

ci/test/00_setup_env_native_msan.sh

@@ -11,13 +11,13 @@ LIBCXX_DIR="${BASE_ROOT_DIR}/ci/scratch/msan/build/"
 export MSAN_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer -g -O1 -fno-optimize-sibling-calls"
 LIBCXX_FLAGS="-nostdinc++ -stdlib=libc++ -L${LIBCXX_DIR}lib -lc++abi -I${LIBCXX_DIR}include -I${LIBCXX_DIR}include/c++/v1 -lpthread -Wl,-rpath,${LIBCXX_DIR}lib -Wno-unused-command-line-argument"
 export MSAN_AND_LIBCXX_FLAGS="${MSAN_FLAGS} ${LIBCXX_FLAGS}"
-export BDB_PREFIX="${BASE_ROOT_DIR}/db4"
+export BDB_PREFIX="${BASE_ROOT_DIR}/db5"
 
 export CONTAINER_NAME="ci_native_msan"
 export PACKAGES="clang-9 llvm-9 cmake"
 export DEP_OPTS="NO_BDB=1 NO_QT=1 CC='clang' CXX='clang++' CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}' boost_cxxflags='-std=c++11 -fvisibility=hidden -fPIC ${MSAN_AND_LIBCXX_FLAGS}' zeromq_cxxflags='-std=c++11 ${MSAN_AND_LIBCXX_FLAGS}'"
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-wallet --with-sanitizers=memory --with-asm=no --prefix=${BASE_ROOT_DIR}/depends/x86_64-pc-linux-gnu/ CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}' BDB_LIBS='-L${BDB_PREFIX}/lib -ldb_cxx-4.8' BDB_CFLAGS='-I${BDB_PREFIX}/include'"
+export BITCOIN_CONFIG="--enable-wallet --with-sanitizers=memory --with-asm=no --prefix=${BASE_ROOT_DIR}/depends/x86_64-pc-linux-gnu/ CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}' BDB_LIBS='-L${BDB_PREFIX}/lib -ldb_cxx-5.3' BDB_CFLAGS='-I${BDB_PREFIX}/include'"
 export USE_MEMORY_SANITIZER="true"
 export RUN_FUNCTIONAL_TESTS="false"
 export CCACHE_SIZE=250M

ci/test/05_before_script.sh

@@ -25,10 +25,10 @@ if [ -n "$XCODE_VERSION" ] && [ ! -f "$OSX_SDK_PATH" ]; then
 fi
 
 if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
-  # Use BDB compiled using install_db4.sh script to work around linking issue when using BDB
+  # Use BDB compiled using install_db5.sh script to work around linking issue when using BDB
   # from depends. See https://github.com/bitcoin/bitcoin/pull/18288#discussion_r433189350 for
   # details.
-  DOCKER_EXEC "contrib/install_db4.sh \$(pwd) --enable-umrw CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
+  DOCKER_EXEC "contrib/install_db5.sh \$(pwd) --enable-umrw CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
 fi
 
 if [ -n "$XCODE_VERSION" ] && [ -f "$OSX_SDK_PATH" ]; then

configure.ac

@@ -652,11 +652,11 @@ case $host in
          dnl It's safe to add these paths even if the functionality is disabled by
          dnl the user (--without-wallet or --without-gui for example).
 
-         if test "x$use_bdb" != xno && $BREW list --versions berkeley-db4 >/dev/null && test "x$BDB_CFLAGS" = "x" && test "x$BDB_LIBS" = "x"; then
-           bdb_prefix=$($BREW --prefix berkeley-db4 2>/dev/null)
-           dnl This must precede the call to BITCOIN_FIND_BDB48 below.
+         if test "x$use_bdb" != xno && $BREW list --versions berkeley-db5 >/dev/null && test "x$BDB_CFLAGS" = "x" && test "x$BDB_LIBS" = "x"; then
+           bdb_prefix=$($BREW --prefix berkeley-db5 2>/dev/null)
+           dnl This must precede the call to BITCOIN_FIND_BDB53 below.
            BDB_CFLAGS="-I$bdb_prefix/include"
-           BDB_LIBS="-L$bdb_prefix/lib -ldb_cxx-4.8"
+           BDB_LIBS="-L$bdb_prefix/lib -ldb_cxx-5.3"
          fi
 
          if test "x$use_sqlite" != xno && $BREW list --versions sqlite3 >/dev/null; then
@@ -1233,7 +1233,15 @@ fi
 
 if test x$enable_wallet != xno; then
     dnl Check for libdb_cxx only if wallet enabled
-    BITCOIN_FIND_BDB48
+    AC_CHECK_HEADERS([db_cxx.h],
+        [berkerley_found_headers=yes; break;])
+
+    AS_IF([test "x$berkerley_found_headers" != "xyes"],
+        [AC_MSG_ERROR([Unable to find the berkerley headers])])
+
+    AS_IF([! ./depends/db_verify 5.3],
+        [AC_MSG_ERROR([Uncompatible berkerley version])])
+
     if test x$suppress_external_warnings != xno ; then
         BDB_CPPFLAGS=SUPPRESS_WARNINGS($BDB_CPPFLAGS)
     fi

contrib/install_db5.sh

@@ -4,7 +4,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-# Install libdb5.1 (Berkeley DB).
+# Install libdb5.3 (Berkeley DB).>>>>>>> d7a8a33b3 (Update DB version to 5.3):contrib/install_db4.sh
 
 export LC_ALL=C
 set -e
@@ -22,8 +22,8 @@ expand_path() {
 }
 
 BDB_PREFIX="$(expand_path ${1})/db5"; shift;
-BDB_VERSION='db-5.1.29.NC'
-BDB_HASH='08238e59736d1aacdd47cfb8e68684c695516c37f4fbe1b8267dde58dc3a576c'
+BDB_VERSION='db-5.3.28.NC'
+BDB_HASH='76a25560d9e52a198d37a31440fd07632b5f1f8f9f2b6d5438f4bc3e7c9013ef'
 BDB_URL="https://download.oracle.com/berkeley-db/${BDB_VERSION}.tar.gz"
 
 check_exists() {
@@ -67,6 +67,7 @@ mkdir -p "${BDB_PREFIX}"
 http_get "${BDB_URL}" "${BDB_VERSION}.tar.gz" "${BDB_HASH}"
 tar -xzvf ${BDB_VERSION}.tar.gz -C "$BDB_PREFIX"
 cd "${BDB_PREFIX}/${BDB_VERSION}/"
+patch -p1 < ../../depends/patches/bdb/clang_cxx_11.patch
 
 cd build_unix/
 
@@ -84,4 +85,4 @@ echo 'When compiling bitcoind, run `./configure` in the following way:'
 echo
 echo "  export BDB_PREFIX='${BDB_PREFIX}'"
 # shellcheck disable=SC2016
-echo '  ./configure BDB_LIBS="-L${BDB_PREFIX}/lib -ldb_cxx-4.8" BDB_CFLAGS="-I${BDB_PREFIX}/include" ...'
+echo '  ./configure BDB_LIBS="-L${BDB_PREFIX}/lib -ldb_cxx-5.3" BDB_CFLAGS="-I${BDB_PREFIX}/include" ...'

depends/db_verify.cpp

@@ -0,0 +1,36 @@
+// Copyright (c) 2012-2021 The Dogecoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+// Method to verify Berkeley DB version
+
+#include <bits/stdc++.h>
+#include <string>
+
+#include <db.h>
+
+using namespace std;
+
+int main(int argc, char* argv[])
+{
+    char *p2 = strtok(argv[1], ".");
+
+    while (p2)
+    {
+        argv[argc++] = p2;
+        p2 = strtok(0, " ");
+    }
+
+    int version_major = stoi(argv[2]);
+    int version_minor = stoi(argv[3]);
+
+    printf("version: %d.%d, and %s.\n", DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_STRING);
+    string latestVersion = std::to_string(DB_VERSION_MAJOR) + "." + std::to_string(DB_VERSION_MINOR);
+
+    if( version_major != DB_VERSION_MAJOR || version_minor != DB_VERSION_MINOR) {
+            printf("Berkeley DB version mismatch\n\texpected: %d.%d\n\tgot: %d.%d\n",
+                    version_major, version_minor, DB_VERSION_MAJOR, DB_VERSION_MINOR);
+            return 1;
+    }
+    return 0;
+}

depends/packages/bdb.mk

@@ -1,8 +1,8 @@
 package=bdb
-$(package)_version=4.8.30
+$(package)_version=5.3.28
 $(package)_download_path=https://download.oracle.com/berkeley-db
 $(package)_file_name=db-$($(package)_version).NC.tar.gz
-$(package)_sha256_hash=12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef
+$(package)_sha256_hash=76a25560d9e52a198d37a31440fd07632b5f1f8f9f2b6d5438f4bc3e7c9013ef
 $(package)_build_subdir=build_unix
 $(package)_patches=clang_cxx_11.patch
 
@@ -25,9 +25,9 @@ define $(package)_config_cmds
 endef
 
 define $(package)_build_cmds
-  $(MAKE) libdb_cxx-4.8.a libdb-4.8.a
+  $(MAKE) libdb_cxx-5.3.a libdb-5.3.a
 endef
 
 define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install_lib install_include
+  $(MAKE) DESTDIR=$($(package)_staging_dir) install
 endef

depends/patches/bdb/clang_cxx_11.patch

@@ -4,19 +4,19 @@ Date:   Mon Aug 17 20:03:56 2020 +0800
 
     Fix C++11 compatibility
 
-diff --git a/dbinc/atomic.h b/dbinc/atomic.h
+diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h
 index 0034dcc..7c11d4a 100644
---- a/dbinc/atomic.h
-+++ b/dbinc/atomic.h
+--- a/src/dbinc/atomic.h
++++ b/src/dbinc/atomic.h
 @@ -70,7 +70,7 @@ typedef struct {
   * These have no memory barriers; the caller must include them when necessary.
   */
  #define	atomic_read(p)		((p)->value)
 -#define	atomic_init(p, val)	((p)->value = (val))
 +#define	atomic_init_db(p, val)	((p)->value = (val))
- 
+
  #ifdef HAVE_ATOMIC_SUPPORT
- 
+
 @@ -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)
@@ -44,12 +44,12 @@ index 0034dcc..7c11d4a 100644
  #else
  #define atomic_inc(env, p)	__atomic_inc(env, p)
  #define atomic_dec(env, p)	__atomic_dec(env, p)
-diff --git a/mp/mp_fget.c b/mp/mp_fget.c
+diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c
 index 5fdee5a..0b75f57 100644
---- a/mp/mp_fget.c
-+++ b/mp/mp_fget.c
+--- a/src/mp/mp_fget.c
++++ b/src/mp/mp_fget.c
 @@ -617,7 +617,7 @@ alloc:		/* Allocate a new buffer header and data space. */
- 
+
  		/* Initialize enough so we can call __memp_bhfree. */
  		alloc_bhp->flags = 0;
 -		atomic_init(&alloc_bhp->ref, 1);
@@ -60,16 +60,16 @@ index 5fdee5a..0b75f57 100644
 @@ -911,7 +911,7 @@ alloc:		/* Allocate a new buffer header and data space. */
  			MVCC_MPROTECT(bhp->buf, mfp->stat.st_pagesize,
  			    PROT_READ);
- 
+
 -		atomic_init(&alloc_bhp->ref, 1);
 +		atomic_init_db(&alloc_bhp->ref, 1);
  		MUTEX_LOCK(env, alloc_bhp->mtx_buf);
  		alloc_bhp->priority = bhp->priority;
  		alloc_bhp->pgno = bhp->pgno;
-diff --git a/mp/mp_mvcc.c b/mp/mp_mvcc.c
+diff --git a/src/mp/mp_mvcc.c b/src/mp/mp_mvcc.c
 index 34467d2..f05aa0c 100644
---- a/mp/mp_mvcc.c
-+++ b/mp/mp_mvcc.c
+--- a/src/mp/mp_mvcc.c
++++ b/src/mp/mp_mvcc.c
 @@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp)
  #else
  	memcpy(frozen_bhp, bhp, SSZA(BH, buf));
@@ -87,19 +87,19 @@ index 34467d2..f05aa0c 100644
 +		atomic_init_db(&alloc_bhp->ref, 1);
  		F_CLR(alloc_bhp, BH_FROZEN);
  	}
- 
-diff --git a/mp/mp_region.c b/mp/mp_region.c
+
+diff --git a/src/mp/mp_region.c b/src/mp/mp_region.c
 index e6cece9..ddbe906 100644
---- a/mp/mp_region.c
-+++ b/mp/mp_region.c
+--- a/src/mp/mp_region.c
++++ b/src/mp/mp_region.c
 @@ -224,7 +224,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg)
  			     MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0)
  				return (ret);
  			SH_TAILQ_INIT(&htab[i].hash_bucket);
 -			atomic_init(&htab[i].hash_page_dirty, 0);
 +			atomic_init_db(&htab[i].hash_page_dirty, 0);
  		}
- 
+
  		/*
 @@ -269,7 +269,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg)
  		hp->mtx_hash = (mtx_base == MUTEX_INVALID) ? MUTEX_INVALID :
@@ -110,25 +110,25 @@ index e6cece9..ddbe906 100644
  #ifdef HAVE_STATISTICS
  		hp->hash_io_wait = 0;
  		hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0;
-diff --git a/mutex/mut_method.c b/mutex/mut_method.c
+diff --git a/src/mutex/mut_method.c b/src/mutex/mut_method.c
 index 2588763..5c6d516 100644
---- a/mutex/mut_method.c
-+++ b/mutex/mut_method.c
+--- a/src/mutex/mut_method.c
++++ b/src/mutex/mut_method.c
 @@ -426,7 +426,7 @@ atomic_compare_exchange(env, v, oldval, newval)
  	MUTEX_LOCK(env, mtx);
  	ret = atomic_read(v) == oldval;
  	if (ret)
 -		atomic_init(v, newval);
 +		atomic_init_db(v, newval);
  	MUTEX_UNLOCK(env, mtx);
- 
+
  	return (ret);
-diff --git a/mutex/mut_tas.c b/mutex/mut_tas.c
+diff --git a/src/mutex/mut_tas.c b/src/mutex/mut_tas.c
 index f3922e0..e40fcdf 100644
---- a/mutex/mut_tas.c
-+++ b/mutex/mut_tas.c
+--- a/src/mutex/mut_tas.c
++++ b/src/mutex/mut_tas.c
 @@ -46,7 +46,7 @@ __db_tas_mutex_init(env, mutex, flags)
- 
+
  #ifdef HAVE_SHARED_LATCHES
  	if (F_ISSET(mutexp, DB_MUTEX_SHARED))
 -		atomic_init(&mutexp->sharecount, 0);

doc/build-freebsd.md

@@ -30,8 +30,8 @@ BerkeleyDB is only necessary for the wallet functionality. To skip this, pass
 `--disable-wallet` to `./configure` and skip to the next section.
 
 ```bash
-./contrib/install_db4.sh `pwd`
-export BDB_PREFIX="$PWD/db4"
+./contrib/install_db5.sh `pwd`
+export BDB_PREFIX="$PWD/db5"
 ```
 
 ## Building Bitcoin Core