On the 'utf8-cmdline' branch: Sync with trunk, resolving minor conflicts in

svn_opt.h (left unchanged).


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/utf8-cmdline@1932345 13f79535-47bb-0310-9956-ffa450edef68

Author: rinrab

.github/workflows/cmake.yml

@@ -93,7 +93,6 @@ jobs:
     name: ${{ matrix.name }}
 
     env:
-      VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
       CMAKE_GENERATOR: ${{ matrix.cmake_generator }}
 
     steps:
@@ -106,22 +105,42 @@ jobs:
 
           ls env: | foreach { "$($_.Name)=$($_.Value)" >> $env:GITHUB_ENV }
 
-      - name: Export GitHub Actions cache environment variables
+      - name: Get vcpkg sha (Windows, vcpkg)
         if: runner.os == 'Windows'
-        uses: actions/github-script@v7
+        id: vcpkg-sha
+        run: |
+          cd C:\vcpkg
+          $sha = git rev-parse HEAD
+          echo "sha=$sha" >> $env:GITHUB_OUTPUT
+
+      - name: Restore vcpkg archives (Windows, vcpkg)
+        if: runner.os == 'Windows'
+        uses: actions/cache/restore@v4
         with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+          path: vcpkg-archives
+          key: vcpkg/${{ runner.os }}/${{ matrix.vcpkg_triplet }}/${{ steps.vcpkg-sha.outputs.sha }}
+          restore-keys: vcpkg/${{ runner.os }}/${{ matrix.vcpkg_triplet }}/
 
       - name: Install dependencies (Windows, vcpkg)
         if: runner.os == 'Windows'
+        env:
+          VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}\vcpkg-archives
         run: |
+          if (-not (Test-Path $env:VCPKG_DEFAULT_BINARY_CACHE)) {
+            New-Item $env:VCPKG_DEFAULT_BINARY_CACHE -ItemType Directory | Out-Null
+          }
           C:\vcpkg\vcpkg.exe install --triplet ${{ matrix.vcpkg_triplet }} `
             apr apr-util serf expat zlib sqlite3
 
           "CMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" >> $env:GITHUB_ENV
 
+      - name: Save vcpkg archives (Windows, vcpkg)
+        if: runner.os == 'Windows'
+        uses: actions/cache/save@v4
+        with:
+          path: vcpkg-archives
+          key: vcpkg/${{ runner.os }}/${{ matrix.vcpkg_triplet }}/${{ steps.vcpkg-sha.outputs.sha }}
+
       - name: Install dependencies (Linux, apt-get)
         if: runner.os == 'Linux'
         run: >

CHANGES

@@ -4,18 +4,118 @@
 # To view an issue listed as (issue #XXXX), visit:
 #   https://subversion.apache.org/issue-XXXX
 
+Version 1.16.0
+(?? ??? 20XX, from /branches/1.16.x)
+https://svn.apache.org/repos/asf/subversion/tags/1.16.0
+
 Version 1.15.0
 (?? ??? 20XX, from /branches/1.15.x)
 https://svn.apache.org/repos/asf/subversion/tags/1.15.0
+
+See the 1.15 release notes for a more verbose overview of the changes since
+the 1.14 release:  https://subversion.apache.org/docs/release-notes/1.15.html
+
  User-visible changes:
+  - Major new features:
+    * New 'pristineless' mode for working copies that eliminates overhead
+      from storing cached pristine content (r1905955, issue #525)
+    * Support for multiple working copy formats (r1898187, issue #4883)
+
+  - Minor new features and improvements:
+    * Re-enable plaintext credential store by default on Unix (r1909351)
+    * Optimize checkout, update and export by simultaneously streaming
+      data to both pristine and working files (r1886490 et al)
+
   - Client-side improvements and bugfixes:
-    * Support multiple working copy formats (1.8-onward, 1.15) (issue #????)
+    * Disable best-fit Unicode mapping for Windows command-line arguments
+      (r1927953)
+    * Optimize checkout, update and export on Windows by reducing the
+      number of file reopens (r1886490 et al)
+    * Use a cryptographic checksum comparison to determine if a file
+      has been modified in a working copy (r1892645)
+    * Warn on merges from foreign repositories if UUIDs match but URLs
+      differ (r1888474 et al, issue #4874)
+    * Fix assertion on 'svn move [URL] [URL]/subdir' (r1909127, issue #4913)
+    * ra_serf: Fix segfault on unexpected server responses (r1929793)
+    * ra_serf: Optimize array filling for inherited properties (r1878084)
+    * svn: Print character encoding in 'svn --version --verbose' (r1926252)
+    * svn: Show new macOS versions in 'svn --version --verbose' (r1882127 et al)
+    * svn: Document trailing-@ trick to avoid peg-revision parsing (r1910826)
+    * svnlook: Fix handling of negative --limit arguments (r1919535)
+    * svnmucc: Fix handling of revision arguments like 'Head' (r1925905)
+    * svnmucc: Fix handling of revision arguments like 'r123' (r1925907)
+    * svnmucc: Ensure that log messages are using UTF-8 (r1925913)
+    * svnmucc: Ensure that property values are using UTF-8 (r1926023)
+    * svnmucc: Show usage instead of help for empty actions (r1926034)
+    * Use distinct temporary file names for regular and revision property
+      edits (r1885997)
+    * Expand ~username directories in tab completion (r1896619, issue #3714)
+    * Reimplement macOS Keychain auth provider with SecItem* API (r1926564)
+
+  - Server-side improvements and bugfixes:
+    * fsfs: Fix uninitialized read in the logical addressing code (r1880374)
+    * fsfs: Reduce spurious conflicts when file content and directory
+      properties are changed in parallel (r1908595)
+    * fsx: Fix uninitialized read in the logical addressing code (r1880374)
+    * fsx: Reduce spurious conflicts when file content and directory
+      properties are changed in parallel (r1908595)
+    * mod_dav_svn: Use mod_dav's DAVBasePath setting to determine the
+      repository root path (r1926683)
+    * svnadmin: Minor optimization in 'svnadmin load' (r1908751)
+    * svnserve: Add SIGTERM/SIGINT handling (r1908547)
 
   - Other tool improvements and bugfixes:
-    * When building on Unix, change default configure option to enable support
-      for the simple (plaintext) credential store unless disabled at configure
-      time with --disable-plaintext-password-storage. This reverts r1845377
-      (r1909351).
+    * case-insensitive.py: Update for Python 3 compatibility (r1881774)
+    * check-mime-type.pl: Support property-modified files (r1911931)
+    * fsfsfixer: Update to work with svnadmin verify versions 1.9+ (r1886928)
+    * fsfsfixer: Update to work with packed repositories (r1887170)
+    * fsfsverify.py: Support FSFS format >= 4 property lists (r1909337)
+    * mailer.py: Support message buffering (r1914915)
+    * mailer.py: Support maximum message length (r1917168)
+    * mailer.py: Omit diff content when messages are too long (r1917169)
+    * svn_apply_autoprops.py: Fix Windows compatibility (r1917382)
+    * svn_apply_autoprops.py: Support @-containing filenames (r1917397)
+    * svn_apply_autoprops.py: Update for Python 3 compatibility (r1917446)
+    * svn_load_dirs.pl: Update to handle 'svn propget' errors for non-existent
+      properties (r1912002, issue #4621)
+    * wc-format.py: Minor update for Python 3 compatibility (r1880178)
+
+ Developer-visible changes:
+  - General:
+    * Support building using CMake (r1920717 et al)
+    * Drop support for Python 2.x in test scripts (r1899944, r1925713)
+    * Support building for Windows on ARM64 (r1890668, r1890673)
+    * Support Visual Studio 2022 project generation (r1899028)
+    * Enable multi-processor compilation (/MP) on Windows (r1906011)
+    * Support shared RA modules on Windows with CMake (r1921006 et al)
+    * Support running Valgrind during 'make check' (r1908546)
+    * Fix building against static Serf on Windows (r1888560)
+    * Fix finding libexpat on static library builds on Windows (r1888565)
+    * Fix 'make clean' in out-of-tree builds (r1883939)
+    * Default AR_FLAGS to 'cr' to fix GNU archiver warnings (r1884094)
+    * Support generation of .clangd file with '--enable-dot-clangd' (r1925652)
+    * Fix propagation of libsvn_fs_x_LDFLAGS to the Makefile (r1908721)
+    * Support C++11 and later (r1883715)
+    * Allow selecting the C++ language standard with '--enable-c++' (r1883715)
+    * Remove use of some deprecated autoconf macros (r1908543)
+    * Guard experimental Serf logic with SVN__SERF_EXPERIMENTAL (r1930808)
+    * Add 'reverse-merge' attribute to the log schema (r1892455)
+    * tests: Allow testing ra_serf using Digest authentication (r1926790)
+    * tests: Close file descriptor using the context manager (r1884279)
+    * tests: Fix TypeError in some test cases (r1897708)
+    * tests: Stop encoding a test's number in the svntest library (r1897443)
+    * tests: Verify command output against Relax NG XML schemas (r1925717)
+
+  - Bindings:
+    * JavaHL: Fix JNI setup for translateOutputStream (r1886280)
+    * swig: Allow NULL wri_abspath in svn_client_ra_session2() (r1917448)
+    * swig-py: Allow str(unicode) input for string types (r1885370)
+    * swig-py: Allow SubversionException to carry attributes (r1880967)
+    * swig-rb: Block SWIG 4.2.0 because it produces broken external
+      runtime code (r1915235)
+    * swig-pl: Fix 'unable to close filehandle' warnings in tests (r1915576)
+    * swig-py: Fix test cleanup failing with Python 3 on Windows due
+      to a circular reference of the raised exception (r1897441)
 
 Version 1.14.5
 (7 Dec 2024, from /branches/1.14.x)

CMakeLists.txt

@@ -32,6 +32,9 @@ function(read_version path var major minor patch)
     string(REGEX REPLACE ".*${minor} +([0-9]+).*" "\\1" VER_MINOR ${VERSION_STRINGS})
     string(REGEX REPLACE ".*${patch} +([0-9]+).*" "\\1" VER_PATCH ${VERSION_STRINGS})
 
+    set(${major} "${VER_MAJOR}" PARENT_SCOPE)
+    set(${minor} "${VER_MINOR}" PARENT_SCOPE)
+    set(${patch} "${VER_PATCH}" PARENT_SCOPE)
     set(${var} "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}" PARENT_SCOPE)
   endif()
 endfunction()
@@ -92,7 +95,7 @@ option(SVN_ENABLE_SWIG_RUBY "Enable Subversion SWIG bindings into Ruby" OFF)
 
 # Enable modules and features
 option(SVN_ENABLE_RA_LOCAL "Enable Subversion Local Repository Access Library" ON)
-option(SVN_ENABLE_RA_SERF "Enable Subversion HTTP/WebDAV Protocol Repository Access Library" OFF)
+option(SVN_ENABLE_RA_SERF "Enable Subversion HTTP/WebDAV Protocol Repository Access Library" ON)
 option(SVN_ENABLE_RA_SVN "Enable Subversion SVN Protocol Repository Access Library" ON)
 option(SVN_ENABLE_FS_FS "Enable Subversion FSFS Repository Filesystem Library" ON)
 option(SVN_ENABLE_FS_X "Enable Subversion FSX Repository Filesystem Library" ON)
@@ -111,6 +114,8 @@ cmake_dependent_option(SVN_BUILD_SHARED_RA "Build shared RA modules" ON "BUILD_S
 option(SVN_DEBUG "Enables specific features for developer builds" OFF)
 cmake_dependent_option(SVN_USE_WIN32_CRASHHANDLER "Enables WIN32 crash handler." ON "WIN32" OFF)
 option(SVN_USE_DSO "Defined if svn should try to load DSOs" OFF)
+set(SVN_CHECKSUM_BACKEND "apr" CACHE STRING "Checksum backend to use (possible values are 'apr', 'openssl', 'bcrypt', 'xdigest')" )
+set_property(CACHE SVN_CHECKSUM_BACKEND PROPERTY STRINGS "apr" "openssl" "bcrypt" "xdigest")
 set(SVN_SOVERSION "0" CACHE STRING "Subversion library ABI version")
 mark_as_advanced(SVN_SOVERSION)
 
@@ -372,17 +377,59 @@ endif()
 ### Serf
 if (SVN_ENABLE_RA_SERF)
   if(SVN_USE_PKG_CONFIG)
-    pkg_search_module(serf IMPORTED_TARGET serf-2 serf-1)
-
-    if(serf_FOUND)
-      add_library(external-serf ALIAS PkgConfig::serf)
-    endif()
+    pkg_search_module(serf IMPORTED_TARGET REQUIRED serf-2 serf-1>=1.3.4)
+    add_library(external-serf ALIAS PkgConfig::serf)
   else()
-    find_package(Serf REQUIRED)
+    find_package(Serf 1.3.4 REQUIRED)
     add_library(external-serf ALIAS Serf::Serf)
   endif()
 endif()
 
+if (SVN_CHECKSUM_BACKEND STREQUAL "apr")
+  add_library(external-checksum-libs INTERFACE)
+  add_private_config_definition(
+    "Defined if svn should use APR to compute checksums."
+    "SVN_CHECKSUM_BACKEND_APR" "1"
+  )
+elseif (SVN_CHECKSUM_BACKEND STREQUAL "openssl")
+  find_package(OpenSSL REQUIRED)
+  add_library(external-checksum-libs ALIAS OpenSSL::Crypto)
+  add_private_config_definition(
+    "Defined if svn should use OpenSSL to compute checksums."
+    "SVN_CHECKSUM_BACKEND_OPENSSL" "1"
+  )
+elseif (SVN_CHECKSUM_BACKEND STREQUAL "bcrypt")
+  if (NOT WIN32)
+    message(SEND_ERROR "BCrypt checksum backend is only available on Win32 platform.")
+  endif()
+
+  add_library(external-checksum-libs INTERFACE)
+  target_link_libraries(external-checksum-libs INTERFACE Bcrypt.lib)
+
+  add_private_config_definition(
+    "Defined if svn should use BCrypt to compute checksums."
+    "SVN_CHECKSUM_BACKEND_BCRYPT" "1"
+  )
+elseif (SVN_CHECKSUM_BACKEND STREQUAL "xdigest")
+  if (SVN_USE_PKG_CONFIG)
+    pkg_check_modules(xdigest REQUIRED IMPORTED_TARGET xdigest)
+    add_library(external-checksum-libs ALIAS PkgConfig::xdigest)
+  else()
+    find_package(XDIGEST REQUIRED)
+    add_library(external-checksum-libs ALIAS XDIGEST::XDIGEST)
+  endif()
+
+  add_private_config_definition(
+    "Defined if svn should use xdigest to compute checksums."
+    "SVN_CHECKSUM_BACKEND_XDIGEST" "1"
+  )
+else()
+  message(SEND_ERROR
+    "Invalid value of SVN_CHECKSUM_BACKEND: '${SVN_CHECKSUM_BACKEND}'. "
+    "Possible options are 'apr' or 'openssl'."
+  )
+endif()
+
 ### Python
 
 if(SVN_ENABLE_SWIG_PYTHON)
@@ -648,6 +695,10 @@ if (HAVE_UNISTD_H)
   autocheck_symbol_exists("getpid" "unistd.h" HAVE_GETPID)
 endif()
 
+set(CMAKE_REQUIRED_LIBRARIES external-zlib)
+autocheck_symbol_exists("adler32_z" "zlib.h" SVN_ZLIB_HAS_ADLER32_Z)
+unset(CMAKE_REQUIRED_LIBRARIES)
+
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")
 
 file(GLOB public_headers "subversion/include/*.h")
@@ -952,6 +1003,7 @@ message(STATUS "    Build shared libraries ........ : ${BUILD_SHARED_LIBS}")
 message(STATUS "    Build shared FS Modues ........ : ${SVN_BUILD_SHARED_FS}")
 message(STATUS "    Build shared RA Modues ........ : ${SVN_BUILD_SHARED_RA}")
 message(STATUS "    Use pkg-config dependencies ... : ${SVN_USE_PKG_CONFIG}")
+message(STATUS "    Checksum Backend .............. : ${SVN_CHECKSUM_BACKEND}")
 message(STATUS "  FS modules:")
 message(STATUS "    Enable FSFS ................... : ${SVN_ENABLE_FS_FS}")
 message(STATUS "    Enable FSX .................... : ${SVN_ENABLE_FS_X}")

COMMITTERS

@@ -57,7 +57,7 @@ Blanket commit access:
        stefan2   Stefan Fuhrmann <stefan2@apache.org>
        jcorvel   Johan Corveleyn <jcorvel@gmail.com>
          trent   Trent Nelson <trent@snakebite.org>
-        kotkov   Evgeny Kotkov <evgeny.kotkov@visualsvn.com>
+        kotkov   Evgeny Kotkov <evgeny.kotkov@axiorema.com>
       astieger   Andreas Stieger <andreas.stieger@gmx.de>
       jamessan   James McCoy <jamessan@jamessan.com>
   troycurtisjr   Troy Curtis, Jr <troycurtisjr@gmail.com>
@@ -67,6 +67,7 @@ Blanket commit access:
      dsahlberg   Daniel Sahlberg <daniel.l.sahlberg@gmail.com>
         vinc17   Vincent Lefevre <vincent@vinc17.net>
         rinrab   Timofei Zhakov <tima@chemodax.net>
+       minfrin   Graham Leggett <minfrin@sharp.fm>
 
 [[END ACTIVE FULL COMMITTERS.  LEAVE THIS LINE HERE; SCRIPTS LOOK FOR IT.]]
 

NOTICE

@@ -1,5 +1,5 @@
 Apache Subversion
-Copyright 2025 The Apache Software Foundation
+Copyright 2026 The Apache Software Foundation
 
 This product includes software developed by many people, and distributed
 under Contributor License Agreements to The Apache Software Foundation

build.conf

@@ -394,7 +394,7 @@ install = fsmod-lib
 path = subversion/libsvn_subr
 sources = *.c lz4/*.c
 libs = aprutil apriconv apr xml zlib apr_memcache
-       sqlite magic intl lz4 utf8proc macos-plist macos-keychain
+       sqlite magic intl lz4 utf8proc macos-plist macos-keychain checksum-libs
 msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib
             crypt32.lib version.lib ws2_32.lib
 msvc-export = 
@@ -417,7 +417,7 @@ msvc-export =
         private/svn_thread_cond.h private/svn_waitable_counter.h
         private/svn_packed_data.h private/svn_object_pool.h private/svn_cert.h
         private/svn_config_private.h private/svn_dirent_uri_private.h
-        ../libsvn_subr/crypto.h
+        private/svn_xml_private.h ../libsvn_subr/crypto.h
 
 # Working copy management lib
 [libsvn_wc]
@@ -932,6 +932,14 @@ libs = libsvn_test libsvn_wc libsvn_repos libsvn_fs libsvn_delta libsvn_subr apr
 # ----------------------------------------------------------------------------
 # Tests for libsvn_subr
 
+[adler32-test]
+description = Test our implementation of the adler32 checksum.
+type = exe
+path = subversion/tests/libsvn_subr
+sources = adler32-test.c
+install = test
+libs = libsvn_test libsvn_subr apr zlib
+
 [auth-test]
 description = Test platform-specific auth provider access
 type = exe
@@ -1497,6 +1505,10 @@ external-lib = $(SVN_SASL_LIBS)
 type = lib
 external-lib = $(SVN_OPENSSL_LIBS) $(SVN_LIBCRYPTO_LIBS)
 
+[checksum-libs]
+type = lib
+external-lib = $(SVN_CHECKSUM_LIBS)
+
 [intl]
 type = lib
 external-lib = $(SVN_INTL_LIBS)

build/ac-macros/zlib.m4

@@ -73,11 +73,20 @@ AC_DEFUN(SVN_LIB_Z,
       ])
     fi
   fi
- 
+
   if test "$zlib_found" = "no"; then
     AC_MSG_ERROR([subversion requires zlib])
   fi
 
+  dnl Check if this zlib provides adler32_z().
+  save_ldflags="$LDFLAGS"
+  LDFLAGS="$SVN_ZLIB_LIBS"
+  AC_CHECK_FUNC([adler32_z],[
+    AC_DEFINE([SVN_ZLIB_HAS_ADLER32_Z],[1],
+              [Define if the function adler32_z() is available])
+  ],[])
+  LDFLAGS="$save_ldflags"
+
   SVN_DOT_CLANGD([$SVN_ZLIB_INCLUDES])
   AC_SUBST(SVN_ZLIB_INCLUDES)
   AC_SUBST(SVN_ZLIB_LIBS)