Author: ivan
Date: Sat Nov  7 16:15:34 2026
New Revision: 1940162

Log:
Merge 'remove-bdb' branch to trunk.

Remove BDB FS backend.

Discussion:
https://lists.apache.org/thread.html/xxbwf4ltkq3zl04w03kc8o2jsgs5nmfo

* aclocal.m4.in
  (): Do not include build/ac-macros/berkeley-db.m4.

* build.conf
  (options): Remove bdb-test-scripts option.
  (libsvn_fs_base, fs-base-test, strings-reps-test, changes-test,
   bdb): Remove.
  (fs-libs): Remove reference to libsvn_fs_base from libs.
  
* INSTALL
  (Dependency Overview): Remove BDB from dependency list.
  (Berkeley DB): Remove.
  (libtool, CMake, pkg-config): Renumber section names.

* build/ac-macros/berkeley-db.m4: Remove.

* build/generator/gen_base.py
  (GeneratorBase): Remove bdb_scripts, bdb_test_deps, bdb_test_progs.
  (GeneratorBase.__init__): Update comment.
  (TargetExe.add_dependencies): Remove handling for 'bdb-test'.

* build/generator/gen_make.py
  (Generator.write): Remove handling for bdb_scripts, bdb_test_deps and
   bdb_test_progs.

* build/generator/templates/build-outputs.mk.ezt
  (BDB_TEST_DEPS, BDB_TEST_PROGRAMS): Remove.

* build/run_tests.py
  (): Do not mention 'bdb' in help for '--fs-type' option.

* configure.ac
  (): Remove BDB and libsvn_fs_base code.

* Makefile.in
  (SVN_DB_LIBS, bdb_libdir, libsvn_fs_base_LDFLAGS, INSTALL_BDB_LIB): Remove.
  (INCLUDES): Remove @SVN_DB_INCLUDES@ from the list.
  (TESTS): Remove @BDB_TEST_PROGRAMS@ from the list.
  (check, davcheck, davautocheck, svncheck, svnautocheck, svncheck6,
   svnsshcheck): Do not depend on @BDB_TEST_DEPS@.
  (bdbcheck): Remove.
  (check-clean): Do not clean subversion/tests/libsvn_fs_base/test-repo-*.

* subversion/libsvn_fs/fs-loader.c
  (): Do not include '../libsvn_fs_base/fs_init.h'.
  (base_defn): Remove.
  (fsx_defn): Set NEXT member to NULL.
  (synchronized_initialize): Set fsx_defn.next to NULL.

* subversion/libsvn_fs_base/bdb/copies-table.c
* subversion/libsvn_fs_base/bdb/copies-table.h
* subversion/libsvn_fs_base/bdb/dbt.c
* subversion/libsvn_fs_base/bdb/dbt.h
* subversion/libsvn_fs_base/bdb/env.c
* subversion/libsvn_fs_base/bdb/env.h
* subversion/libsvn_fs_base/bdb/lock-tokens-table.c
* subversion/libsvn_fs_base/bdb/lock-tokens-table.h
* subversion/libsvn_fs_base/bdb/locks-table.c
* subversion/libsvn_fs_base/bdb/locks-table.h
* subversion/libsvn_fs_base/bdb/miscellaneous-table.c
* subversion/libsvn_fs_base/bdb/miscellaneous-table.h
* subversion/libsvn_fs_base/bdb/node-origins-table.c
* subversion/libsvn_fs_base/bdb/node-origins-table.h
* subversion/libsvn_fs_base/bdb/nodes-table.c
* subversion/libsvn_fs_base/bdb/nodes-table.h
* subversion/libsvn_fs_base/bdb/reps-table.c
* subversion/libsvn_fs_base/bdb/reps-table.h
* subversion/libsvn_fs_base/bdb/rev-table.c
* subversion/libsvn_fs_base/bdb/rev-table.h
* subversion/libsvn_fs_base/bdb/strings-table.c
* subversion/libsvn_fs_base/bdb/strings-table.h
* subversion/libsvn_fs_base/bdb/txn-table.c
* subversion/libsvn_fs_base/bdb/txn-table.h
* subversion/libsvn_fs_base/bdb/uuids-table.c
* subversion/libsvn_fs_base/bdb/uuids-table.h
* subversion/libsvn_fs_base/dag.c
* subversion/libsvn_fs_base/dag.h
* subversion/libsvn_fs_base/err.c
* subversion/libsvn_fs_base/err.h
* subversion/libsvn_fs_base/fs.c
* subversion/libsvn_fs_base/fs.h
* subversion/libsvn_fs_base/fs_init.h
* subversion/libsvn_fs_base/id.c
* subversion/libsvn_fs_base/id.h
* subversion/libsvn_fs_base/key-gen.c
* subversion/libsvn_fs_base/key-gen.h
* subversion/libsvn_fs_base/lock.c
* subversion/libsvn_fs_base/lock.h
* subversion/libsvn_fs_base/node-rev.c
* subversion/libsvn_fs_base/node-rev.h
* subversion/libsvn_fs_base/notes
* subversion/libsvn_fs_base/notes/fs-history
* subversion/libsvn_fs_base/notes/schema-bdb-1.6.svg
* subversion/libsvn_fs_base/notes/structure
* subversion/libsvn_fs_base/notes/TODO
* subversion/libsvn_fs_base/reps-strings.c
* subversion/libsvn_fs_base/reps-strings.h
* subversion/libsvn_fs_base/revs-txns.c
* subversion/libsvn_fs_base/revs-txns.h
* subversion/libsvn_fs_base/trail.c
* subversion/libsvn_fs_base/trail.h
* subversion/libsvn_fs_base/tree.c
* subversion/libsvn_fs_base/tree.h
* subversion/libsvn_fs_base/util
* subversion/libsvn_fs_base/util/fs_skels.c
* subversion/libsvn_fs_base/util/fs_skels.h
* subversion/libsvn_fs_base/uuid.c
* subversion/libsvn_fs_base/uuid.h
  (): Remove all subversion/libsvn_fs_base/*.

* subversion/libsvn_fs_base/README
  (): Add README file to document what happened to libsvn_fs_base.

* subversion/svn_private_config.hc
  (SVN_FS_WANT_DB_MAJOR, SVN_FS_WANT_DB_MINOR, SVN_FS_WANT_DB_PATCH): Remove.
  (): Do not include <apu_want.h>.

* subversion/tests/cmdline/davautocheck.sh
  (): Remove check for FS_TYPE=bdb and APACHE_MPM=event.

* subversion/tests/cmdline/svnserveautocheck.sh
  (): Use fsfs instead of bdb in command sample.

* subversion/tests/cmdline/svntest/main.py
  (): Do not mention 'bdb' in help for '--fs-type' option.

* subversion/tests/libsvn_fs_base
* subversion/tests/libsvn_fs_base/changes-test.c
* subversion/tests/libsvn_fs_base/fs-base-test.c
* subversion/tests/libsvn_fs_base/strings-reps-test.c
  (): Remove all subversion/tests/libsvn_fs_base*.

* notes/alternate-bdb-version
  (): Remove.

Added:
   subversion/trunk/subversion/libsvn_fs_base/README
      - copied unchanged from r1940158, 
subversion/branches/remove-bdb/subversion/libsvn_fs_base/README
Deleted:
   subversion/trunk/build/ac-macros/berkeley-db.m4
   subversion/trunk/notes/alternate-bdb-version
   subversion/trunk/subversion/libsvn_fs_base/bdb/
   subversion/trunk/subversion/libsvn_fs_base/dag.c
   subversion/trunk/subversion/libsvn_fs_base/dag.h
   subversion/trunk/subversion/libsvn_fs_base/err.c
   subversion/trunk/subversion/libsvn_fs_base/err.h
   subversion/trunk/subversion/libsvn_fs_base/fs.c
   subversion/trunk/subversion/libsvn_fs_base/fs.h
   subversion/trunk/subversion/libsvn_fs_base/fs_init.h
   subversion/trunk/subversion/libsvn_fs_base/id.c
   subversion/trunk/subversion/libsvn_fs_base/id.h
   subversion/trunk/subversion/libsvn_fs_base/key-gen.c
   subversion/trunk/subversion/libsvn_fs_base/key-gen.h
   subversion/trunk/subversion/libsvn_fs_base/lock.c
   subversion/trunk/subversion/libsvn_fs_base/lock.h
   subversion/trunk/subversion/libsvn_fs_base/node-rev.c
   subversion/trunk/subversion/libsvn_fs_base/node-rev.h
   subversion/trunk/subversion/libsvn_fs_base/notes/
   subversion/trunk/subversion/libsvn_fs_base/reps-strings.c
   subversion/trunk/subversion/libsvn_fs_base/reps-strings.h
   subversion/trunk/subversion/libsvn_fs_base/revs-txns.c
   subversion/trunk/subversion/libsvn_fs_base/revs-txns.h
   subversion/trunk/subversion/libsvn_fs_base/trail.c
   subversion/trunk/subversion/libsvn_fs_base/trail.h
   subversion/trunk/subversion/libsvn_fs_base/tree.c
   subversion/trunk/subversion/libsvn_fs_base/tree.h
   subversion/trunk/subversion/libsvn_fs_base/util/
   subversion/trunk/subversion/libsvn_fs_base/uuid.c
   subversion/trunk/subversion/libsvn_fs_base/uuid.h
   subversion/trunk/subversion/tests/libsvn_fs_base/
Modified:
   subversion/trunk/   (props changed)
   subversion/trunk/INSTALL
   subversion/trunk/Makefile.in
   subversion/trunk/aclocal.m4.in
   subversion/trunk/build.conf
   subversion/trunk/build/generator/gen_base.py
   subversion/trunk/build/generator/gen_make.py
   subversion/trunk/build/generator/templates/build-outputs.mk.ezt
   subversion/trunk/build/run_tests.py
   subversion/trunk/configure.ac
   subversion/trunk/subversion/libsvn_fs/fs-loader.c
   subversion/trunk/subversion/svn_private_config.hc
   subversion/trunk/subversion/tests/cmdline/davautocheck.sh
   subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh
   subversion/trunk/subversion/tests/cmdline/svntest/main.py

Modified: subversion/trunk/INSTALL
==============================================================================
--- subversion/trunk/INSTALL    Sat Nov  7 16:15:21 2026        (r1940161)
+++ subversion/trunk/INSTALL    Sat Nov  7 16:15:34 2026        (r1940162)
@@ -97,8 +97,6 @@ I.    INTRODUCTION
       * Python, Perl, Java, Ruby (with py3c for Python) -- the language
         bindings.
       * Apache HTTP Server -- the mod_dav_svn server module.
-      * Berkeley DB -- the deprecated BDB repository backend,
-        to be removed in the future (server).
 
 
   C. Documentation
@@ -844,17 +842,7 @@ IV.   DEPENDENCIES IN DETAIL
           https://github.com/encukou/py3c
 
 
-      18. Berkeley DB  (DEPRECATED, TO BE REMOVED IN THE FUTURE)
-
-      The minimum supported version is 4.0.14.
-
-      Needed only for the deprecated BDB repository backend.  Support for
-      BDB is planned to be removed completely in the future.
-
-      The CMake build system does not support building with BDB.
-
-
-      19. autoconf  (Unix only)
+      18. autoconf  (Unix only)
 
       The minimum supported version is 2.59.
 
@@ -864,7 +852,7 @@ IV.   DEPENDENCIES IN DETAIL
       Generally only developers would be doing this.
 
 
-      20. libtool  (Unix only)
+      19. libtool  (Unix only)
 
       The minimum supported version is 2.0.
 
@@ -874,7 +862,7 @@ IV.   DEPENDENCIES IN DETAIL
       Generally only developers would be doing this.
 
 
-      21. CMake
+      20. CMake
 
       The minimum supported version is 3.20.
 
@@ -882,7 +870,7 @@ IV.   DEPENDENCIES IN DETAIL
       (see section II.B).
 
 
-      22. pkg-config  (Unix only, OPTIONAL)
+      21. pkg-config  (Unix only, OPTIONAL)
 
       Subversion uses pkg-config to find appropriate options used
       at build time.

Modified: subversion/trunk/Makefile.in
==============================================================================
--- subversion/trunk/Makefile.in        Sat Nov  7 16:15:21 2026        
(r1940161)
+++ subversion/trunk/Makefile.in        Sat Nov  7 16:15:34 2026        
(r1940162)
@@ -43,7 +43,6 @@ SCHEMA_DIR = subversion/svn/schema
 SVN_APR_LIBS = @SVN_APR_LIBS@
 SVN_APRUTIL_LIBS = @SVN_APRUTIL_LIBS@
 SVN_APR_MEMCACHE_LIBS = @SVN_APR_MEMCACHE_LIBS@
-SVN_DB_LIBS = @SVN_DB_LIBS@
 SVN_GPG_AGENT_LIBS = @SVN_GPG_AGENT_LIBS@
 SVN_GNOME_KEYRING_LIBS = @SVN_GNOME_KEYRING_LIBS@
 SVN_KWALLET_LIBS = @SVN_KWALLET_LIBS@
@@ -67,7 +66,6 @@ exec_prefix = @exec_prefix@
 libdir = @libdir@
 fsmod_libdir = @libdir@
 ramod_libdir = @libdir@
-bdb_libdir = @libdir@
 gnome_keyring_libdir = @libdir@
 gpg_agent_libdir = @libdir@
 kwallet_libdir = @libdir@
@@ -136,7 +134,7 @@ LT_CXX_LIBADD = @LT_CXX_LIBADD@
 
 INCLUDES = -I$(top_srcdir)/subversion/include -I$(top_builddir)/subversion \
            @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@ 
@SVN_APR_MEMCACHE_INCLUDES@ \
-           @SVN_DB_INCLUDES@ @SVN_GNOME_KEYRING_INCLUDES@ \
+           @SVN_GNOME_KEYRING_INCLUDES@ \
            @SVN_KWALLET_INCLUDES@ @SVN_MAGIC_INCLUDES@ \
            @SVN_SASL_INCLUDES@ @SVN_SERF_INCLUDES@ @SVN_SQLITE_INCLUDES@ \
            @SVN_XML_INCLUDES@ @SVN_ZLIB_INCLUDES@ @SVN_LZ4_INCLUDES@ \
@@ -290,7 +288,6 @@ libsvn_client_LDFLAGS = @libsvn_client_L
 libsvn_delta_LDFLAGS = @libsvn_delta_LDFLAGS@
 libsvn_diff_LDFLAGS = @libsvn_diff_LDFLAGS@
 libsvn_fs_LDFLAGS = @libsvn_fs_LDFLAGS@
-libsvn_fs_base_LDFLAGS = @libsvn_fs_base_LDFLAGS@
 libsvn_fs_fs_LDFLAGS = @libsvn_fs_fs_LDFLAGS@
 libsvn_fs_x_LDFLAGS = @libsvn_fs_x_LDFLAGS@
 libsvn_fs_util_LDFLAGS = @libsvn_fs_util_LDFLAGS@
@@ -321,7 +318,6 @@ INSTALL_LIB = $(LIBTOOL) --mode=install
 INSTALL_FSMOD_LIB = $(INSTALL_LIB)
 INSTALL_RAMOD_LIB = $(INSTALL_LIB)
 INSTALL_APR_MEMCACHE_LIB = $(INSTALL_LIB)
-INSTALL_BDB_LIB = $(INSTALL_LIB)
 INSTALL_GPG_AGENT_LIB = $(INSTALL_LIB)
 INSTALL_GNOME_KEYRING_LIB = $(INSTALL_LIB)
 INSTALL_KWALLET_LIB = $(INSTALL_LIB)
@@ -425,7 +421,7 @@ RDOC = @RDOC@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 
-TESTS = $(TEST_PROGRAMS) @BDB_TEST_PROGRAMS@
+TESTS = $(TEST_PROGRAMS)
 
 all: mkdir-init local-all
 clean: local-clean
@@ -558,7 +554,7 @@ check-svnxx: svnxx-tests
 # "make check CLEANUP=true" will clean up directories for successful tests.
 # "make check TESTS=subversion/tests/cmdline/basic_tests.py"
 #  will perform only basic tests (likewise for other tests).
-check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS) @BDB_TEST_DEPS@
+check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS)
        @if test "$(PYTHON)" != "none"; then                                 \
          if test "$(CLEANUP)" != ""; then                                   \
            flags="--cleanup $$flags";                                       \
@@ -664,40 +660,37 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
 
 # First, set up Apache as documented in
 # subversion/tests/cmdline/README.
-davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod mod_dontdothat
+davcheck: bin $(TEST_DEPS) apache-mod mod_dontdothat
        @$(MAKE) check BASE_URL=http://localhost
 
 # Automatically configure and run Apache httpd on a random port, and then
 # run make check.
-davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod mod_dontdothat
+davautocheck: bin $(TEST_DEPS) apache-mod mod_dontdothat
        @# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the environment.
        @APXS=$(APXS) MAKE=$(MAKE) PYTHON=$(PYTHON) $(SHELL) 
$(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
 
 # First, run:
 #   subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/cmdline
-svncheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@
+svncheck: bin $(TEST_DEPS)
        @$(MAKE) check BASE_URL=svn://127.0.0.1
 
 # 'make svnserveautocheck' runs svnserve for you and kills it.
-svnserveautocheck: svnserve bin $(TEST_DEPS) @BDB_TEST_DEPS@
+svnserveautocheck: svnserve bin $(TEST_DEPS)
        @env PYTHON=$(PYTHON) THREADED=$(THREADED) MAKE=$(MAKE) \
          $(SHELL) $(top_srcdir)/subversion/tests/cmdline/svnserveautocheck.sh
 
 # First, run:
 #   subversion/svnserve/svnserve --listen-host "::1" -d -r 
`pwd`/subversion/tests/cmdline
 
-svncheck6: bin $(TEST_DEPS) @BDB_TEST_DEPS@
+svncheck6: bin $(TEST_DEPS)
        @$(MAKE) check BASE_URL=svn://\[::1\]
 
 # First make sure you can ssh to localhost and that "svnserve" is in
 # the path of the resulting shell.
-svnsshcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@
+svnsshcheck: bin $(TEST_DEPS)
        @$(MAKE) check \
          BASE_URL=svn+ssh://localhost`pwd`/subversion/tests/cmdline
 
-bdbcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@
-       @$(MAKE) check FS_TYPE=bdb
-
 # Produce the clang compilation database as the compile_commands.json file
 # in the srcdir.  This is used by tools such as the YouCompleteMe vim plugin
 # to know the compile flags for various source files so that analysis such
@@ -728,7 +721,6 @@ check-clean: gcov-clean
          rm -rf subversion/tests/cmdline/svn-test-work/*;     \
        fi
        rm -rf subversion/tests/libsvn_fs/test-repo-*          \
-              subversion/tests/libsvn_fs_base/test-repo-*     \
               subversion/tests/libsvn_fs_fs/test-repo-*       \
               subversion/tests/libsvn_fs_x/test-repo-*        \
               subversion/tests/libsvn_ra_local/test-repo-*    \

Modified: subversion/trunk/aclocal.m4.in
==============================================================================
--- subversion/trunk/aclocal.m4.in      Sat Nov  7 16:15:21 2026        
(r1940161)
+++ subversion/trunk/aclocal.m4.in      Sat Nov  7 16:15:34 2026        
(r1940162)
@@ -37,7 +37,6 @@ sinclude(build/ac-macros/aprutil.m4)
 sinclude(build/ac-macros/apr_memcache.m4)
 sinclude(build/ac-macros/ax_boost_base.m4)
 sinclude(build/ac-macros/ax_boost_unit_test_framework.m4)
-sinclude(build/ac-macros/berkeley-db.m4)
 sinclude(build/ac-macros/compiler.m4)
 sinclude(build/ac-macros/svnbrowse.m4)
 sinclude(build/ac-macros/java.m4)

Modified: subversion/trunk/build.conf
==============================================================================
--- subversion/trunk/build.conf Sat Nov  7 16:15:21 2026        (r1940161)
+++ subversion/trunk/build.conf Sat Nov  7 16:15:34 2026        (r1940162)
@@ -98,8 +98,6 @@ private-built-includes =
 test-scripts =
         subversion/tests/cmdline/*_tests.py
 
-bdb-test-scripts =
-
 swig-python-opts = $(SWIG_FEATURES) $(SWIG_PY_OPTS) $(SWIG_PY_FEATURES)
 swig-perl-opts = $(SWIG_FEATURES) -perl $(SWIG_PL_FEATURES) -nopm -noproxy
 swig-ruby-opts = $(SWIG_FEATURES) -ruby $(SWIG_RB_FEATURES)
@@ -290,21 +288,6 @@ add-deps = $(SVN_FS_LIB_DEPS)
 add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS)
 msvc-export = svn_fs.h private/svn_fs_private.h
 
-[libsvn_fs_base]
-description = Subversion Filesystem Base Library
-type = fs-module
-path = subversion/libsvn_fs_base
-sources = *.c bdb/*.c util/*.c
-install = bdb-lib
-libs = libsvn_delta libsvn_subr aprutil apriconv apr bdb libsvn_fs_util
-add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS)
-msvc-export = ../libsvn_fs_base/fs_init.h ../libsvn_fs_base/fs.h
-              ../libsvn_fs_base/id.h ../libsvn_fs_base/key-gen.h
-              ../libsvn_fs_base/lock.h ../libsvn_fs_base/trail.h
-              ../libsvn_fs_base/util/fs_skels.h 
../libsvn_fs_base/bdb/changes-table.h
-              ../libsvn_fs_base/bdb/txn-table.h 
../libsvn_fs_base/bdb/nodes-table.h
-              ../libsvn_fs_base/bdb/strings-table.h 
../libsvn_fs_base/bdb/reps-table.h
-
 [libsvn_fs_fs]
 description = Subversion FSFS Repository Filesystem Library
 type = fs-module
@@ -807,36 +790,6 @@ msvc-static = yes
 undefined-lib-symbols = yes
 
 # ----------------------------------------------------------------------------
-# Tests for libsvn_fs_base
-
-[fs-base-test]
-description = Tests for *public* fs API (svn_fs.h)
-type = exe
-path = subversion/tests/libsvn_fs_base
-sources = fs-base-test.c
-install = bdb-test
-libs = libsvn_test libsvn_wc libsvn_fs libsvn_fs_base libsvn_delta
-       libsvn_fs_util libsvn_subr apriconv apr
-
-[strings-reps-test]
-description = Test strings/reps in libsvn_fs_base
-type = exe
-path = subversion/tests/libsvn_fs_base
-sources = strings-reps-test.c
-install = bdb-test
-libs = libsvn_test libsvn_wc libsvn_fs libsvn_fs_base libsvn_delta
-       libsvn_subr apriconv apr
-
-[changes-test]
-description = Test changes in libsvn_fs_base
-type = exe
-path = subversion/tests/libsvn_fs_base
-sources = changes-test.c
-install = bdb-test
-libs = libsvn_test libsvn_wc libsvn_fs libsvn_fs_base libsvn_delta
-       libsvn_subr apriconv apr
-
-# ----------------------------------------------------------------------------
 # Tests for libsvn_fs_fs
 [fs-fs-pack-test]
 description = Test fsfs packing in libsvn_fs_fs
@@ -1489,10 +1442,6 @@ external-lib = $(SVN_HTTPD_LIBS)
 type = lib
 external-lib = $(SVN_MOD_DAV_LIBS)
 
-[bdb]
-type = lib
-external-lib = $(SVN_DB_LIBS)
-
 [gnome-keyring]
 type = lib
 external-lib = $(SVN_GNOME_KEYRING_LIBS)
@@ -1596,7 +1545,7 @@ libs = libsvn_ra_serf libsvn_ra_local li
 [fs-libs]
 type = lib
 external-lib = $(SVN_FS_LIB_LINK)
-libs = libsvn_fs_base libsvn_fs_fs libsvn_fs_x
+libs = libsvn_fs_fs libsvn_fs_x
 
 [__ALL__]
 type = project

Modified: subversion/trunk/build/generator/gen_base.py
==============================================================================
--- subversion/trunk/build/generator/gen_base.py        Sat Nov  7 16:15:21 
2026        (r1940161)
+++ subversion/trunk/build/generator/gen_base.py        Sat Nov  7 16:15:34 
2026        (r1940162)
@@ -101,8 +101,6 @@ class GeneratorBase:
         parser.get('options', 'private-built-includes').split()
     self.scripts = \
         _collect_paths(parser.get('options', 'test-scripts'))
-    self.bdb_scripts = \
-        _collect_paths(parser.get('options', 'bdb-test-scripts'))
 
     self.include_wildcards = \
       parser.get('options', 'include-wildcards').split()
@@ -117,11 +115,9 @@ class GeneratorBase:
     self.projects = []
 
     # Lists of pathnames of various kinds
-    self.test_deps = []      # Non-BDB dependent items to build for the tests
+    self.test_deps = []      # Items to build for the tests
     self.test_progs = []     # Subset of the above to actually execute
     self.test_helpers = []   # $ {test_deps} \setminus {test_progs} $
-    self.bdb_test_deps = []  # BDB-dependent items to build for the tests
-    self.bdb_test_progs = [] # Subset of the above to actually execute
     self.target_dirs = []    # Directories in which files are built
     self.manpages = []       # Manpages
 
@@ -668,10 +664,6 @@ class TargetExe(TargetLinked):
         self.gen_obj.test_progs.append(self.filename)
       else:
         self.gen_obj.test_helpers.append(self.filename)
-    elif self.install == 'bdb-test':
-      self.gen_obj.bdb_test_deps.append(self.filename)
-      if self.testing != 'skip':
-        self.gen_obj.bdb_test_progs.append(self.filename)
 
     self.gen_obj.manpages.extend(self.manpages.split())
 

Modified: subversion/trunk/build/generator/gen_make.py
==============================================================================
--- subversion/trunk/build/generator/gen_make.py        Sat Nov  7 16:15:21 
2026        (r1940161)
+++ subversion/trunk/build/generator/gen_make.py        Sat Nov  7 16:15:34 
2026        (r1940162)
@@ -138,7 +138,7 @@ class Generator(gen_base.GeneratorBase):
 
     # write a list of directories in which things are built
     #   get all the test scripts' directories
-    script_dirs = list(map(build_path_dirname, self.scripts + 
self.bdb_scripts))
+    script_dirs = list(map(build_path_dirname, self.scripts))
 
     #   remove duplicate directories between targets and tests
     build_dirs = unique(self.target_dirs + script_dirs + self.swig_dirs)
@@ -146,8 +146,6 @@ class Generator(gen_base.GeneratorBase):
 
     # write lists of test files
     # deps = all, progs = not including those marked "testing = skip"
-    data.bdb_test_deps = self.bdb_test_deps + self.bdb_scripts
-    data.bdb_test_progs = self.bdb_test_progs + self.bdb_scripts
     data.test_deps = self.test_deps + self.scripts
     data.test_progs = self.test_progs + self.scripts
     data.test_helpers = self.test_helpers
@@ -410,7 +408,7 @@ class Generator(gen_base.GeneratorBase):
                           fullname=file.filename, dirname=dirname,
                           name=name, filename=fname, when=file.when)
 
-      if area != 'test' and area != 'bdb-test':
+      if area != 'test':
         data.areas.append(ezt_area)
 
         area_var = area.replace('-', '_')

Modified: subversion/trunk/build/generator/templates/build-outputs.mk.ezt
==============================================================================
--- subversion/trunk/build/generator/templates/build-outputs.mk.ezt     Sat Nov 
 7 16:15:21 2026        (r1940161)
+++ subversion/trunk/build/generator/templates/build-outputs.mk.ezt     Sat Nov 
 7 16:15:34 2026        (r1940162)
@@ -31,10 +31,6 @@
 [end]
 BUILD_DIRS =[for build_dirs] [build_dirs][end]
 
-BDB_TEST_DEPS =[for bdb_test_deps] [bdb_test_deps][end]
-
-BDB_TEST_PROGRAMS =[for bdb_test_progs] [bdb_test_progs][end]
-
 TEST_DEPS =[for test_deps] [test_deps][end]
 
 TEST_PROGRAMS =[for test_progs] [test_progs][end]

Modified: subversion/trunk/build/run_tests.py
==============================================================================
--- subversion/trunk/build/run_tests.py Sat Nov  7 16:15:21 2026        
(r1940161)
+++ subversion/trunk/build/run_tests.py Sat Nov  7 16:15:34 2026        
(r1940162)
@@ -1023,7 +1023,7 @@ def create_parser():
   parser.add_option('-u', '--url', action='store',
                     help='Base url to the repos (e.g. svn://localhost)')
   parser.add_option('-f', '--fs-type', action='store',
-                    help='Subversion file system type (fsfs(-v[46]), bdb or 
fsx)')
+                    help='Subversion file system type (fsfs(-v[46]) or fsx)')
   parser.add_option('-g', '--global-scheduler', action='store_true',
                     help='Run tests from all scripts together')
   parser.add_option('--http-library', action='store',

Modified: subversion/trunk/configure.ac
==============================================================================
--- subversion/trunk/configure.ac       Sat Nov  7 16:15:21 2026        
(r1940161)
+++ subversion/trunk/configure.ac       Sat Nov  7 16:15:34 2026        
(r1940162)
@@ -577,41 +577,6 @@ fi
 AC_SUBST(SVN_XML_INCLUDES)
 AC_SUBST(SVN_XML_LIBS)
 
-dnl Berkeley DB -------------------
-
-# Berkeley DB on SCO OpenServer needs -lsocket
-AC_CHECK_LIB(socket, socket)
-
-# Build the BDB filesystem library only if we have an appropriate
-# version of Berkeley DB.
-case "$host" in
-powerpc-apple-darwin*)
-    # Berkeley DB 4.0 does not work on OS X.
-    SVN_FS_WANT_DB_MAJOR=4
-    SVN_FS_WANT_DB_MINOR=1
-    SVN_FS_WANT_DB_PATCH=25
-    ;;
-*)
-    SVN_FS_WANT_DB_MAJOR=4
-    SVN_FS_WANT_DB_MINOR=0
-    SVN_FS_WANT_DB_PATCH=14
-    ;;
-esac
-db_alt_version="5.x"
-# Look for libdb4.so first:
-SVN_LIB_BERKELEY_DB($SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MINOR,
-                    $SVN_FS_WANT_DB_PATCH, [db4 db])
-
-AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MAJOR,
-                   [The desired major version for the Berkeley DB])
-AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_MINOR, $SVN_FS_WANT_DB_MINOR,
-                   [The desired minor version for the Berkeley DB])
-AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_PATCH, $SVN_FS_WANT_DB_PATCH,
-                   [The desired patch version for the Berkeley DB])
-
-AC_SUBST(SVN_DB_INCLUDES)
-AC_SUBST(SVN_DB_LIBS)
-
 SVN_LIB_SASL
 
 if test "$svn_lib_sasl" = "yes"; then
@@ -1004,14 +969,6 @@ INSTALL_RULES="install-fsmod-lib install
 INSTALL_RULES="$INSTALL_RULES $INSTALL_APACHE_RULE"
 BUILD_RULES="fsmod-lib ramod-lib lib bin tui test sub-test $BUILD_APACHE_RULE 
tools"
 
-if test "$svn_lib_berkeley_db" = "yes"; then
-  BUILD_RULES="$BUILD_RULES bdb-lib bdb-test"
-  INSTALL_RULES="`echo $INSTALL_RULES | $SED 
's/install-fsmod-lib/install-fsmod-lib install-bdb-lib/'`"
-  INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-bdb-lib"
-  BDB_TEST_DEPS="\$(BDB_TEST_DEPS)"
-  BDB_TEST_PROGRAMS="\$(BDB_TEST_PROGRAMS)"
-fi
-
 if test "$svn_lib_serf" = "yes"; then
   BUILD_RULES="$BUILD_RULES serf-lib"
   INSTALL_RULES="`echo $INSTALL_RULES | $SED 
's/install-ramod-lib/install-ramod-lib install-serf-lib/'`"
@@ -1038,8 +995,6 @@ fi
 AC_SUBST(BUILD_RULES)
 AC_SUBST(INSTALL_STATIC_RULES)
 AC_SUBST(INSTALL_RULES)
-AC_SUBST(BDB_TEST_DEPS)
-AC_SUBST(BDB_TEST_PROGRAMS)
 
 dnl Check for header files ----------------
 
@@ -1135,7 +1090,6 @@ AC_SUBST([libsvn_client_LDFLAGS])
 AC_SUBST([libsvn_delta_LDFLAGS])
 AC_SUBST([libsvn_diff_LDFLAGS])
 AC_SUBST([libsvn_fs_LDFLAGS])
-AC_SUBST([libsvn_fs_base_LDFLAGS])
 AC_SUBST([libsvn_fs_fs_LDFLAGS])
 AC_SUBST([libsvn_fs_x_LDFLAGS])
 AC_SUBST([libsvn_fs_util_LDFLAGS])
@@ -1661,14 +1615,6 @@ if test "$svn_enable_shared" = "no" || t
 dnl  FSFS already installs fsmod
 dnl  svn_fs_lib_install_deps="$svn_fs_lib_install_deps install-fsmod-lib"
 
-  if test "$svn_lib_berkeley_db" = "yes"; then
-  AC_DEFINE(SVN_LIBSVN_FS_LINKS_FS_BASE, 1,
-      [Defined if libsvn_fs should link against libsvn_fs_base])
-    svn_fs_lib_deps="$svn_fs_lib_deps \$(FS_BASE_DEPS)"
-    svn_fs_lib_install_deps="$svn_fs_lib_install_deps install-bdb-lib"
-    svn_fs_lib_link="$svn_fs_lib_link \$(FS_BASE_LINK)"
-  fi
-
   SVN_FS_LIB_DEPS=$svn_fs_lib_deps
   SVN_FS_LIB_INSTALL_DEPS=$svn_fs_lib_install_deps
   SVN_FS_LIB_LINK=$svn_fs_lib_link
@@ -1918,29 +1864,3 @@ fi
 dnl Configure is long - users tend to miss warnings printed during it.
 dnl Hence, print a warnings about what we did and didn't configure at the 
 dnl end, where people will actually see them.
-
-if test "$svn_have_berkeley_db" = "no6" && test "$enable_bdb6" != "no"; then
-  AC_MSG_WARN([We have configured without BDB filesystem support
-
-
-Berkeley DB 6 was found, but not used.  Please re-run configure (see
-./config.nice) with the '--enable-bdb6' flag to use it,
-or explicitly specify '--disable-bdb6' or '--without-berkeley-db'
-to silence this warning.
-
-Please note that some versions of Berkeley DB 6+ are under the GNU Affero
-General Public License, version 3:
-https://oss.oracle.com/pipermail/bdb/2013-June/000056.html
-
-The AGPL-3.0 licence may impose special requirements for making available
-source code of server-side software.  The text of the licence is:
-https://www.gnu.org/licenses/agpl-3.0.html
-http://opensource.org/licenses/AGPL-3.0
-
-The Berkeley DB backend to Subversion is deprecated; see
-https://subversion.apache.org/docs/release-notes/1.8#bdb-deprecated
-
-The Subversion developers have not tested Subversion with Berkeley DB 6 for
-technical problems or bugs.
-])
-fi

Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c   Sat Nov  7 16:15:21 
2026        (r1940161)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c   Sat Nov  7 16:15:34 
2026        (r1940162)
@@ -60,7 +60,6 @@
    to the create and open functions and these init functions (as well
    as the open and create functions) are globally serialized so that
    they have exclusive access to the common_pool. */
-#include "../libsvn_fs_base/fs_init.h"
 #include "../libsvn_fs_fs/fs_init.h"
 #include "../libsvn_fs_x/fs_init.h"
 
@@ -105,19 +104,6 @@ struct fs_type_defn {
   struct fs_type_defn *next;
 };
 
-static struct fs_type_defn base_defn =
-  {
-    SVN_FS_TYPE_BDB, "base",
-#ifdef SVN_LIBSVN_FS_LINKS_FS_BASE
-    svn_fs_base__init,
-#else
-    NULL,
-#endif
-    NULL,
-    NULL /* End of static list: this needs to be reset to NULL if the
-            common_pool used when setting it has been cleared. */
-  };
-
 static struct fs_type_defn fsx_defn =
   {
     SVN_FS_TYPE_FSX, "x",
@@ -127,7 +113,8 @@ static struct fs_type_defn fsx_defn =
     NULL,
 #endif
     NULL,
-    &base_defn
+    NULL /* End of static list: this needs to be reset to NULL if the
+            common_pool used when setting it has been cleared. */
   };
 
 static struct fs_type_defn fsfs_defn =
@@ -419,7 +406,7 @@ static svn_error_t *
 synchronized_initialize(void *baton, apr_pool_t *pool)
 {
   common_pool = svn_pool_create(pool);
-  base_defn.next = NULL;
+  fsx_defn.next = NULL;
   SVN_ERR(svn_mutex__init(&common_pool_lock, TRUE, common_pool));
 
   /* ### This won't work if POOL is NULL and libsvn_fs is loaded as a DSO

Copied: subversion/trunk/subversion/libsvn_fs_base/README (from r1940158, 
subversion/branches/remove-bdb/subversion/libsvn_fs_base/README)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ subversion/trunk/subversion/libsvn_fs_base/README   Sat Nov  7 16:15:34 
2026        (r1940162, copy of r1940158, 
subversion/branches/remove-bdb/subversion/libsvn_fs_base/README)
@@ -0,0 +1,3 @@
+This directory used to contain an FS backend based on Berkley DB (BDB).
+
+The support for this backend was removed in Subversion 1.16.0.

Modified: subversion/trunk/subversion/svn_private_config.hc
==============================================================================
--- subversion/trunk/subversion/svn_private_config.hc   Sat Nov  7 16:15:21 
2026        (r1940161)
+++ subversion/trunk/subversion/svn_private_config.hc   Sat Nov  7 16:15:34 
2026        (r1940162)
@@ -33,11 +33,6 @@
 #define SVN_BUILD_HOST "@SVN_BUILD_HOST@"
 #define SVN_BUILD_TARGET "@SVN_BUILD_TARGET@"
 
-/* The minimal version of Berkeley DB we want */
-#define SVN_FS_WANT_DB_MAJOR    4
-#define SVN_FS_WANT_DB_MINOR    0
-#define SVN_FS_WANT_DB_PATCH    14
-
 /* Path separator for local filesystem */
 #ifdef WIN32
 # define SVN_PATH_LOCAL_SEPARATOR '\\'
@@ -110,9 +105,3 @@
 #define SVN_UNUSED(v) ( (void)(v) )
 
 #endif /* SVN_PRIVATE_CONFIG_HW */
-
-/* Inclusion of Berkeley DB header */
-#ifdef SVN_WANT_BDB
-# define APU_WANT_DB
-# include <apu_want.h>
-#endif

Modified: subversion/trunk/subversion/tests/cmdline/davautocheck.sh
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh   Sat Nov  7 
16:15:21 2026        (r1940161)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh   Sat Nov  7 
16:15:34 2026        (r1940162)
@@ -326,9 +326,6 @@ if [ ${APACHE_MPM:+set} ]; then
     LOAD_MOD_MPM=$(get_loadmodule_config mod_mpm_$APACHE_MPM) \
       || fail "MPM module not found"
 fi
-if [ x"$APACHE_MPM" = x"event" ] && [ x"$FS_TYPE" = x"bdb" ]; then
-  fail "FS_TYPE=bdb and APACHE_MPM=event are mutually exclusive (see SVN-4157)"
-fi
 if [ ${USE_SSL:+set} ]; then
     LOAD_MOD_SSL=$(get_loadmodule_config mod_ssl) \
       || fail "SSL module not found"

Modified: subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh      Sat Nov 
 7 16:15:21 2026        (r1940161)
+++ subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh      Sat Nov 
 7 16:15:34 2026        (r1940162)
@@ -30,7 +30,7 @@
 # This script should be run from the top level of the Subversion
 # distribution; it's easiest to just run it as "make svnserveautocheck".
 # Like "make check", you can specify further options like
-# "make svnserveautocheck FS_TYPE=bdb TESTS=subversion/tests/cmdline/basic.py".
+# "make svnserveautocheck FS_TYPE=fsfs 
TESTS=subversion/tests/cmdline/basic.py".
 #
 # Other environment variables that can be passed:
 #

Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py   Sat Nov  7 
16:15:21 2026        (r1940161)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py   Sat Nov  7 
16:15:34 2026        (r1940162)
@@ -2220,7 +2220,7 @@ def _create_parser(usage=None):
   parser.add_option('--url', action='store',
                     help='Base url to the repos (e.g. svn://localhost)')
   parser.add_option('--fs-type', action='store',
-                    help='Subversion file system type (fsfs, bdb or fsx)')
+                    help='Subversion file system type (fsfs or fsx)')
   parser.add_option('--cleanup', action='store_true',
                     help='Whether to clean up')
   parser.add_option('--enable-sasl', action='store_true',

Reply via email to