On the better-pristines branch: Sync with trunk to r1931476.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/better-pristines@1931477 13f79535-47bb-0310-9956-ffa450edef68

Author: brainy

CHANGES

@@ -11,15 +11,111 @@ 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

@@ -386,14 +386,14 @@ if (SVN_ENABLE_RA_SERF)
 endif()
 
 if (SVN_CHECKSUM_BACKEND STREQUAL "apr")
-  add_library(external-openssl INTERFACE)
+  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-openssl ALIAS OpenSSL::Crypto)
+  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"
@@ -403,8 +403,8 @@ elseif (SVN_CHECKSUM_BACKEND STREQUAL "bcrypt")
     message(SEND_ERROR "BCrypt checksum backend is only available on Win32 platform.")
   endif()
 
-  add_library(external-openssl INTERFACE)
-  target_link_libraries(external-openssl INTERFACE Bcrypt.lib)
+  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."
@@ -682,6 +682,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")
@@ -986,7 +990,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 "    Use OpenSSL for checksum ...... : ${SVN_CHECKSUM_USE_OPENSSL}")
+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}")

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 openssl
+       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 = 
@@ -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)

build/generator/gen_base.py

@@ -1288,6 +1288,9 @@ def _scan_for_includes(self, fname):
       if os.sep.join(['libsvn_subr', 'cmdline.c']) in fname \
            and 'config_keys.inc' == include_param:
         continue # generated by GeneratorBase.write_config_keys
+      if os.sep.join(['tests', 'libsvn_subr', 'adler32-test.c']) in fname \
+           and '../../libsvn_subr/adler32.c' == include_param:
+        continue # adler32-test.c inludes the source file on purpose
       elif direct_possibility_fname in domain_fnames:
         self._upd_dep_hash(hdrs, direct_possibility_fname, type_code)
       elif (len(domain_fnames) == 1

build/generator/gen_win_dependencies.py

@@ -125,6 +125,7 @@ class GenDependenciesBase(gen_base.GeneratorBase):
         'java_sdk',
         'openssl',
         'apr_memcache',
+        'checksum-libs',
 
         # So optional, we don't even have any code to detect them on Windows
         'magic',

subversion/libsvn_subr/adler32.c

@@ -25,6 +25,7 @@
 #include <apr.h>
 #include <zlib.h>
 
+#include "svn_private_config.h"
 #include "private/svn_adler32.h"
 
 /**
@@ -34,20 +35,63 @@
  * still provides an extremely low probability of undetected errors"
  */
 
+/* Prefer adler32_z() over adler32(). It should be more efficient, especially
+ * if the length of the data is larger then the size of zlib's uInt. The
+ * current implementation of adler32() in zlib just calls adler32_z() anyway.
+ *
+ * adler32_z() was added in zlib 1.2.9.
+ */
+#if SVN_ZLIB_HAS_ADLER32_Z
+#define svn__adler32_impl adler32_z
+typedef z_size_t svn__adler32_size_t;
+#else
+typedef uInt svn__adler32_size_t;
+#define svn__adler32_impl adler32
+#endif  /* SVN_ZLIB_HAS_ADLER32_Z */
+
+#define svn__adler32_fn(c,d,s) svn__adler32_impl((c), (const Bytef *)(d), (s))
+
+/* See adler32-test.c which invokes dark magic in order to test the
+   (len > SVN__ADLER32_SIZE_MAX) branch of the implementation. */
+#ifndef SVN__ADLER32_STATIC
+#define SVN__ADLER32_STATIC
+#define SVN__ADLER32_SIZE_MAX (~(svn__adler32_size_t)0)
+#endif
+
 /*
  * 65521 is the largest prime less than 65536.
  * "That 65521 is prime is important to avoid a possible large class of
  *  two-byte errors that leave the check unchanged."
  */
-#define ADLER_MOD_BASE 65521
+#define SVN__ADLER_MOD_BASE 65521U
 
 /*
  * Start with CHECKSUM and update the checksum by processing a chunk
  * of DATA sized LEN.
  */
-apr_uint32_t
+SVN__ADLER32_STATIC apr_uint32_t
 svn__adler32(apr_uint32_t checksum, const char *data, apr_off_t len)
 {
+  /* Process large amounts of data in max-sized chunks.
+   *
+   * Note: > not >=; then if sizeof(apr_off_t) <= sizeof(svn__adler32_size_t),
+   *                 this whole code block can be elided at compile time ...
+   */
+  if (SVN__PREDICT_FALSE(len > SVN__ADLER32_SIZE_MAX))
+    {
+      uLong partial = checksum; /* Avoid typecasts in the while loop. */
+      /* ... but >= here because we just might get lucky and
+       *     consume all the data in this loop.
+       */
+      while (len >= SVN__ADLER32_SIZE_MAX)
+        {
+          partial = svn__adler32_fn(partial, data, SVN__ADLER32_SIZE_MAX);
+          len -= SVN__ADLER32_SIZE_MAX;
+          data += SVN__ADLER32_SIZE_MAX;
+        }
+      checksum = (apr_uint32_t)partial;
+    }
+
   /* The actual limit can be set somewhat higher but should
    * not be lower because the SIMD code would not be used
    * in that case.
@@ -61,11 +105,10 @@ svn__adler32(apr_uint32_t checksum, const char *data, apr_off_t len)
        * optimized code. Also, new zlib versions will come with
        * SIMD code for x86 and x64.
        */
-      return (apr_uint32_t)adler32(checksum,
-                                   (const Bytef *)data,
-                                   (uInt)len);
+      return (apr_uint32_t)svn__adler32_fn(checksum, data,
+                                           (svn__adler32_size_t)len);
     }
-  else
+  else if (len > 0)
     {
       const unsigned char *input = (const unsigned char *)data;
       apr_uint32_t s1 = checksum & 0xFFFF;
@@ -96,6 +139,8 @@ svn__adler32(apr_uint32_t checksum, const char *data, apr_off_t len)
           s2 += s1;
         }
 
-      return ((s2 % ADLER_MOD_BASE) << 16) | (s1 % ADLER_MOD_BASE);
+      return ((s2 % SVN__ADLER_MOD_BASE) << 16) | (s1 % SVN__ADLER_MOD_BASE);
     }
+
+  return checksum;
 }

subversion/libsvn_subr/checksum_apr.c

@@ -85,19 +85,38 @@ svn_checksum__md5_ctx_final(unsigned char *digest,
 
 
 /*** SHA1 checksum ***/
+static void
+sha1_update(apr_sha1_ctx_t *ctx,
+            const char *data,
+            apr_size_t len)
+{
+  while (len > 0)
+    {
+      unsigned int block;
+
+      if (len < UINT_MAX)
+        block = (unsigned int)len;
+      else
+        block = UINT_MAX;
+
+      apr_sha1_update(ctx, data, block);
+
+      len -= block;
+      data += block;
+    }
+}
+
 svn_error_t *
 svn_checksum__sha1(unsigned char *digest,
                    const void *data,
                    apr_size_t len)
 {
   apr_sha1_ctx_t sha1_ctx;
 
-  /* Do not blindly truncate the data length. */
-  SVN_ERR_ASSERT(len < UINT_MAX);
-
   apr_sha1_init(&sha1_ctx);
-  apr_sha1_update(&sha1_ctx, data, (unsigned int)len);
+  sha1_update(&sha1_ctx, data, len);
   apr_sha1_final(digest, &sha1_ctx);
+
   return SVN_NO_ERROR;
 }
 
@@ -127,9 +146,7 @@ svn_checksum__sha1_ctx_update(svn_checksum__sha1_ctx_t *ctx,
                               const void *data,
                               apr_size_t len)
 {
-  /* Do not blindly truncate the data length. */
-  SVN_ERR_ASSERT(len < UINT_MAX);
-  apr_sha1_update(&ctx->apr_ctx, data, (unsigned int)len);
+  sha1_update(&ctx->apr_ctx, data, len);
   return SVN_NO_ERROR;
 }
 

subversion/libsvn_subr/lz4/LICENSE

@@ -1,5 +1,5 @@
 LZ4 Library
-Copyright (c) 2011-2016, Yann Collet
+Copyright (c) 2011-2020, Yann Collet
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,