Update Subversion to 1.14.1 LTS. See contrib/subversion/CHANGES for a

summary of changes, or for a more thorough overview:

https://subversion.apache.org/docs/release-notes/1.14

NOTE 1: There is no need to dump and reload repositories, and the
working copy format is still the same as Subversion 1.8 through 1.13.

NOTE 2: The upstream release also contains a fix for a security issue in
mod_dav_svn (CVE-2020-17525), but since we do not build or use any
Apache modules, it is not an issue for the FreeBSD base system.

Relnotes:	yes

(cherry-picked from 0ff1014)

contrib/subversion/.editorconfig

@@ -10,6 +10,7 @@ trim_trailing_whitespace = false
 
 [**/Makefile*]
 indent_style = tab
+indent_size = 8
 
 [build-outputs.mk]
 indent_style = tab

contrib/subversion/CHANGES

@@ -4,8 +4,51 @@
 # To view an issue listed as (issue #XXXX), visit:
 #   https://subversion.apache.org/issue-XXXX
 
+Version 1.14.1
+(10 Feb 2021, from /branches/1.14.x)
+ User-visible changes:
+  - Client-side improvements and bugfixes:
+    * Fix non-deterministic generation of mergeinfo (issue #4862)
+    * Fix merge removing a folder with non-inheritable mergeinfo (issue #4859)
+    * Do not suggest --help -v for commands which do not support -v (r1882157)
+    * Fix invalid SQL quoting in working copy upgrade system (r1879198)
+    * Fix problems in human-readable file size formatting (r1878909, -18, -50)
+    * Improve an error message from svnmucc (r1877072)
+    * Fix 'svn info --xml' gives wrong 'source-right' of conflict (issue #4869)
+    * Fix filename encoding/quoting when invoking editor on Windows (r1885953)
+    * Convert filename for editor from UTF-8 to the locale's encoding (r1882234)
+
+  - Server-side improvements and bugfixes:
+    * Fix authz doesn't combine global and repository rules (issue #4762)
+    * Make the hot-backup.py script work with Python 3 (r1878855, r1878859)
+    * Fix an uninitialized read in FSFS (r1880374)
+    * Make mailer.py work properly with Python 3 (r1884427 et al)
+    * Fix a potential NULL dereference in the config file parser (r1886019)
+
+ Developer-visible changes:
+  - General:
+    * Restore support for building with APR 1.4 (r1881958, r1882128)
+    * Rewrite internal test data to avoid literal trailing spaces (r1875675)
+    * Remove use of os.dup2() from tests for Python 3.6 on Windows (r1883337)
+    * Note in INSTALL that non-release mode is required for Python 2 (r1877960)
+    * Make gen-make.py --debug work with Python 3 (r1876906)
+    * Make test suite run correctly with Python 3 on Windows (r1876707 et al)
+    * Fix compilation errors with Visual Studio 2008 (r1877259)
+    * Use Doxygen comment leader for comments with doxygen syntax (r1877794)
+  - Bindings:
+    * Fix win-tests.py to load Python 3 bindings with debug config (r1884642)
+    * Fix C4204 errors building swig-py with Python 3.9 on Windows (r1883570)
+    * Fix unable to load *.pyd files with Python 3.8.x on Windows (r1883335)
+    * Add SWIG4 support for SWIG Python binding on Windows (r1877338)
+    * Fix incorrect cache in JavaHL SVNBase::createCppBoundObject (r1882115)
+    * Fix crash in JavaHL JNI wrapper caused by object lifetimes (r1880886)
+    * autogen.sh: Remove .swig_*_checked files from release tarballs (r1878413)
+    * Avoid version check for Python if --without-swig is used (r1876662)
+    * siwg-py: Fix a syntax error for Python 3.6 and later (r1885112)
+    * Fix several crashes and JNI warnings in javahl TunnelAgent (r1886029)
+
 Version 1.14.0
-(6 May 2020, from /branches/1.14.x)
+(27 May 2020, from /branches/1.14.x)
 https://svn.apache.org/repos/asf/subversion/tags/1.14.0
 
  User-visible changes:
@@ -222,6 +265,29 @@ http://svn.apache.org/repos/asf/subversion/tags/1.11.0
     * Fix a potential crash in JavaHL (issue #4764)
 
 
+Version 1.10.7
+(10 Feb 2021, from /branches/1.10.x)
+ User-visible changes:
+  - Client-side bugfixes:
+    * Fix 'svn patch' setting mode 0600 on patched files with props (r1864440)
+    * Fix invalid SQL quoting in working copy upgrade system (r1879198)
+    * Fix non-deterministic generation of mergeinfo (issue #4862)
+    * Fix a crash seen when using git-svn with kwallet (r1875680)
+    * Fix merge removing a folder with non-inheritable mergeinfo (issue #4859)
+    * Fix 'svn info --xml' gives wrong 'source-right' of conflict (issue #4869)
+
+  - Server-side bugfixes:
+    * mod_dav_svn: install cleanup handler for FS warning logging (r1865266)
+    * mod_dav_svn: Fix missing Last-Modified header on 'external' GET requests (r1866425)
+    * Fix formatting type size mismatches in FSFS (r1865987, -8)
+    * Fix an undefined behavior problem in FSFS caching code (r1876054)
+    * Fix a potential NULL dereference in the config file parser (r1886019)
+
+ Developer-visible changes:
+    * Fix Requires(.private) fields in pkg-config files (r1863987, -90)
+    * Fix crash in JavaHL JNI wrapper caused by object lifetimes (r1880886)
+    * Fix an EOL issue in tests on Windows (r1881985 et al)
+
 Version 1.10.6
 (24 Jul 2019, from /branches/1.10.x)
 https://svn.apache.org/repos/asf/subversion/tags/1.10.6

contrib/subversion/INSTALL

@@ -3,7 +3,7 @@
                           A Quick Guide
                ======================================
 
-$LastChangedDate: 2020-02-17 03:49:42 +0000 (Mon, 17 Feb 2020) $
+$LastChangedDate: 2020-12-18 04:00:24 +0000 (Fri, 18 Dec 2020) $
 
 
 Contents:
@@ -206,7 +206,7 @@ I.    INTRODUCTION
       commands described in section II.B before installing the following.
 
 
-      1.  Apache Portable Runtime 1.5 or newer  (REQUIRED)
+      1.  Apache Portable Runtime 1.4 or newer  (REQUIRED)
 
       Whenever you want to build any part of Subversion, you need the
       Apache Portable Runtime (APR) and the APR Utility (APR-util)
@@ -506,6 +506,12 @@ I.    INTRODUCTION
       reached end of life.  All users are strongly encouraged to move
       to Python 3.
 
+      Note: If you are using a Subversion distribution tarball and want
+      to build the Python bindings for Python 2, you should rebuild
+      the build environment in non-release mode by running
+      'sh autogen.sh' before running the ./configure script; see
+      section II.B for more about autogen.sh.
+
 
       13. Perl 5.8 or newer (Windows only)  (OPTIONAL)
 
@@ -832,7 +838,7 @@ II.   INSTALLATION
         needed to compile Apache.  Note that this is the actual awk program,
         not an installer - just rename it to awk.exe and it is ready to use.
       * Apache apr, apr-util, and optionally apr-iconv libraries, version
-        1.5 or later (1.2 for apr-iconv). If you are building from a Subversion
+        1.4 or later (1.2 for apr-iconv). If you are building from a Subversion
         checkout and have not downloaded Apache 2, then get these 3 libraries
         from https://www.apache.org/dist/apr/.
       * SQLite 3.8.2 or higher from https://www.sqlite.org/download.html

contrib/subversion/NOTICE

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

contrib/subversion/autogen.sh

@@ -178,8 +178,8 @@ if test -n "$RELEASE_MODE"; then
   # Build the SWIG-related files
   make -f autogen-standalone.mk autogen-swig || gen_failed=1
 
-  # Remove the .swig_checked file
-  rm -f .swig_checked
+  # Remove the .swig_*checked files
+  rm -f .swig_checked .swig_pl_checked .swig_py_checked .swig_rb_checked
 fi
 
 if test -n "$SKIP_DEPS"; then

contrib/subversion/build.conf

@@ -53,6 +53,7 @@ private-includes =
         subversion/libsvn_subr/utf8proc/utf8proc_internal.h
         subversion/libsvn_subr/utf8proc/utf8proc.c
         subversion/libsvn_subr/utf8proc/utf8proc_data.c
+        subversion/svn/filesize.c
 private-built-includes =
         subversion/svn_private_config.h
         subversion/libsvn_fs_fs/rep-cache-db.h
@@ -1338,6 +1339,18 @@ install = test
 libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
 msvc-force-static = yes
 
+# ----------------------------------------------------------------------------
+# Tests for the client's internal functions
+
+[filesize-test]
+description = Test conversion of file sizes to human-readable form
+type = exe
+path = subversion/tests/client
+sources = filesize-test.c
+install = test
+libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
+msvc-force-static = yes
+
 # ----------------------------------------------------------------------------
 # These are not unit tests at all, they are small programs that exercise
 # parts of the libsvn_delta API from the command line.  They are stuck here
@@ -1565,7 +1578,7 @@ libs = __ALL__
        checksum-test compat-test config-test hashdump-test mergeinfo-test
        opt-test packed-data-test path-test prefix-string-test
        priority-queue-test root-pools-test stream-test
-       string-test time-test utf-test bit-array-test
+       string-test time-test utf-test bit-array-test filesize-test
        error-test error-code-test cache-test spillbuf-test crypto-test
        revision-test
        subst_translate-test io-test