You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ko...@apache.org on 2022/11/18 13:43:08 UTC

svn commit: r1905381 [1/7] - in /subversion/branches/pristines-on-demand-on-mwf: ./ build/ac-macros/ build/generator/ build/win32/ contrib/client-side/emacs/ contrib/hook-scripts/ contrib/server-side/ doc/ doc/user/ notes/ notes/api-errata/1.7/ notes/c...

Author: kotkov
Date: Fri Nov 18 13:43:05 2022
New Revision: 1905381

URL: http://svn.apache.org/viewvc?rev=1905381&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: Sync with trunk@1905380.

Added:
    subversion/branches/pristines-on-demand-on-mwf/tools/client-side/store-plaintext-password.py
      - copied unchanged from r1905380, subversion/trunk/tools/client-side/store-plaintext-password.py
    subversion/branches/pristines-on-demand-on-mwf/tools/dist/make-keys.sh
      - copied unchanged from r1905380, subversion/trunk/tools/dist/make-keys.sh
Modified:
    subversion/branches/pristines-on-demand-on-mwf/   (props changed)
    subversion/branches/pristines-on-demand-on-mwf/BUGS
    subversion/branches/pristines-on-demand-on-mwf/CHANGES
    subversion/branches/pristines-on-demand-on-mwf/INSTALL
    subversion/branches/pristines-on-demand-on-mwf/Makefile.in
    subversion/branches/pristines-on-demand-on-mwf/NOTICE
    subversion/branches/pristines-on-demand-on-mwf/README
    subversion/branches/pristines-on-demand-on-mwf/autogen.sh
    subversion/branches/pristines-on-demand-on-mwf/build.conf
    subversion/branches/pristines-on-demand-on-mwf/build/ac-macros/swig.m4
    subversion/branches/pristines-on-demand-on-mwf/build/generator/gen_base.py
    subversion/branches/pristines-on-demand-on-mwf/build/generator/gen_win_dependencies.py
    subversion/branches/pristines-on-demand-on-mwf/build/win32/make_gem.rb
    subversion/branches/pristines-on-demand-on-mwf/configure.ac
    subversion/branches/pristines-on-demand-on-mwf/contrib/client-side/emacs/dsvn.el
    subversion/branches/pristines-on-demand-on-mwf/contrib/client-side/emacs/psvn.el
    subversion/branches/pristines-on-demand-on-mwf/contrib/hook-scripts/check-mime-type.pl
    subversion/branches/pristines-on-demand-on-mwf/contrib/hook-scripts/hook_toolbox.py
    subversion/branches/pristines-on-demand-on-mwf/contrib/server-side/svnmirror.sh
    subversion/branches/pristines-on-demand-on-mwf/doc/README
    subversion/branches/pristines-on-demand-on-mwf/doc/user/cvs-crossover-guide.html
    subversion/branches/pristines-on-demand-on-mwf/doc/user/svn-best-practices.html
    subversion/branches/pristines-on-demand-on-mwf/notes/api-errata/1.7/ra001.txt
    subversion/branches/pristines-on-demand-on-mwf/notes/commit-access-templates/full-committer.tmpl
    subversion/branches/pristines-on-demand-on-mwf/notes/commit-access-templates/partial-committer.tmpl
    subversion/branches/pristines-on-demand-on-mwf/notes/commit-access-templates/pmc-member.tmpl
    subversion/branches/pristines-on-demand-on-mwf/notes/fsfs
    subversion/branches/pristines-on-demand-on-mwf/notes/http-and-webdav/webdav-protocol
    subversion/branches/pristines-on-demand-on-mwf/notes/http-and-webdav/webdav-usage.html
    subversion/branches/pristines-on-demand-on-mwf/notes/xfail-status
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/ctypes-python/setup.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/INSTALL
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/include/proxy.swg
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/__init__.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/__init__.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/client.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/core.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/delta.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/diff.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/fs.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/ra.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/repos.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/wc.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/ruby/svn/util.rb
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/ruby/test/test_wc.rb
    subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/ruby/test/windows_util.rb
    subversion/branches/pristines-on-demand-on-mwf/subversion/include/private/svn_doxygen.h
    subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_client.h
    subversion/branches/pristines-on-demand-on-mwf/subversion/include/svn_io.h
    subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/commit_util.c
    subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_repos/authz.c
    subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_repos/repos.c
    subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_subr/config_file.c
    subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_subr/gpg_agent.c
    subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_subr/sysinfo.c
    subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_subr/version.c
    subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/deprecated.c
    subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/branches/pristines-on-demand-on-mwf/subversion/mod_dav_svn/repos.c
    subversion/branches/pristines-on-demand-on-mwf/subversion/po/de.po
    subversion/branches/pristines-on-demand-on-mwf/subversion/po/es.po
    subversion/branches/pristines-on-demand-on-mwf/subversion/po/fr.po
    subversion/branches/pristines-on-demand-on-mwf/subversion/po/it.po
    subversion/branches/pristines-on-demand-on-mwf/subversion/po/ja.po
    subversion/branches/pristines-on-demand-on-mwf/subversion/po/ko.po
    subversion/branches/pristines-on-demand-on-mwf/subversion/po/nb.po
    subversion/branches/pristines-on-demand-on-mwf/subversion/po/pl.po
    subversion/branches/pristines-on-demand-on-mwf/subversion/po/pt_BR.po
    subversion/branches/pristines-on-demand-on-mwf/subversion/po/sv.po
    subversion/branches/pristines-on-demand-on-mwf/subversion/po/zh_CN.po
    subversion/branches/pristines-on-demand-on-mwf/subversion/po/zh_TW.po
    subversion/branches/pristines-on-demand-on-mwf/subversion/svn/help-cmd.c
    subversion/branches/pristines-on-demand-on-mwf/subversion/svn/svn.1
    subversion/branches/pristines-on-demand-on-mwf/subversion/svn/svn.c
    subversion/branches/pristines-on-demand-on-mwf/subversion/svnadmin/svnadmin.1
    subversion/branches/pristines-on-demand-on-mwf/subversion/svnbench/help-cmd.c
    subversion/branches/pristines-on-demand-on-mwf/subversion/svndumpfilter/svndumpfilter.1
    subversion/branches/pristines-on-demand-on-mwf/subversion/svnlook/svnlook.1
    subversion/branches/pristines-on-demand-on-mwf/subversion/svnmucc/svnmucc.1
    subversion/branches/pristines-on-demand-on-mwf/subversion/svnrdump/svnrdump.1
    subversion/branches/pristines-on-demand-on-mwf/subversion/svnsync/svnsync.1
    subversion/branches/pristines-on-demand-on-mwf/subversion/svnversion/svnversion.1
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/authz_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/autoprop_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/basic_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/blame_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/cat_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/changelist_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/checkout_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/commit_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/copy_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/dav_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/depth_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/diff_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/entries_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/export_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/externals_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/getopt_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/history_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/import_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/info_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/input_validation_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/iprop_authz_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/iprop_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/legacy/utf8_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/lock_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/log_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/merge_authz_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/merge_automatic_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/merge_reintegrate_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/merge_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/merge_tree_conflict_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/mergeinfo_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/mod_authz_svn_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/mod_dav_svn_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/move_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/patch_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/pegrev_parse_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/prop_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/redirect_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/relocate_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/resolve_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/revert_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/schedule_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/shelf2_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/shelf_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/special_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/stat_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svnauthz_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svndumpfilter_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svneditor.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svneditor.sh.in
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svnfsfs_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svnlook_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svnmover_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svnmucc_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svnrdump_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svnsync_authz_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svnsync_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/__init__.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svntest/mergetrees.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/svnversion_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/switch_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/trans_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/tree_conflict_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/update_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/upgrade_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/wc_tests.py
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/libsvn_diff/parse-diff-test.c
    subversion/branches/pristines-on-demand-on-mwf/subversion/tests/libsvn_wc/create_wc_for_upgrade.sh
    subversion/branches/pristines-on-demand-on-mwf/tools/backup/hot-backup.py.in
    subversion/branches/pristines-on-demand-on-mwf/tools/buildbot/master/README
    subversion/branches/pristines-on-demand-on-mwf/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
    subversion/branches/pristines-on-demand-on-mwf/tools/client-side/svnconflict/svnconflict.c
    subversion/branches/pristines-on-demand-on-mwf/tools/client-side/svnviewspec_test.py
    subversion/branches/pristines-on-demand-on-mwf/tools/dev/benchmarks/RepoPerf/copy_repo.py
    subversion/branches/pristines-on-demand-on-mwf/tools/dev/benchmarks/RepoPerf/win_repo_bench.py
    subversion/branches/pristines-on-demand-on-mwf/tools/dev/contribulyze.py
    subversion/branches/pristines-on-demand-on-mwf/tools/dev/svn-dev.el
    subversion/branches/pristines-on-demand-on-mwf/tools/dist/advisory.py
    subversion/branches/pristines-on-demand-on-mwf/tools/dist/backport_tests.py
    subversion/branches/pristines-on-demand-on-mwf/tools/dist/backport_tests_pl.py
    subversion/branches/pristines-on-demand-on-mwf/tools/dist/backport_tests_py.py
    subversion/branches/pristines-on-demand-on-mwf/tools/dist/release.py
    subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/STATUS.ezt
    subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes-lts.ezt
    subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/release-notes.ezt
    subversion/branches/pristines-on-demand-on-mwf/tools/dist/templates/stable-release-ann.ezt
    subversion/branches/pristines-on-demand-on-mwf/tools/examples/svnlook.py

Propchange: subversion/branches/pristines-on-demand-on-mwf/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1899647-1905380
  Merged /subversion/branches/issue-4908:r1903812-1904192

Modified: subversion/branches/pristines-on-demand-on-mwf/BUGS
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/BUGS?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/BUGS (original)
+++ subversion/branches/pristines-on-demand-on-mwf/BUGS Fri Nov 18 13:43:05 2022
@@ -1,2 +1,2 @@
 This document has been moved to
-http://subversion.apache.org/docs/community-guide/issues.html
+https://subversion.apache.org/docs/community-guide/issues.html

Modified: subversion/branches/pristines-on-demand-on-mwf/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/CHANGES?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/CHANGES (original)
+++ subversion/branches/pristines-on-demand-on-mwf/CHANGES Fri Nov 18 13:43:05 2022
@@ -15,13 +15,13 @@ Version 1.14.2
 (12 Apr 2022, from /branches/1.14.x)
  User-visible changes:
   - Client-side bugfixes:
-    * Don't show unreadable copyfrom paths in 'svn log -v'  (r1899227)
     * Fix -r option documentation for some svnadmin subcommands (r1896877)
     * Fix error message encoding when system() call fails (r1887641, r1890013)
     * Fix assertion failure in conflict resolver (r1892470, -471, -541)
 
   - Server-side bugfixes:
-    * Fix use-after-free of object-pools when running in httpd (issue #4880)
+    * Fix CVE-2021-28544: authz protected copyfrom paths regression (r1899227)
+    * Fix CVE-2022-24070: use-after-free in mod_dav_svn (issue #4880)
  
  Developer-visible changes:
     * Add test coverage for CVE-2020-17525 (r1883838 et al)
@@ -300,11 +300,11 @@ Version 1.10.8
 (12 Apr 2022, from /branches/1.10.x)
  User-visible changes:
   - Client-side bugfixes:
-    * Don't show unreadable copyfrom paths in 'svn log -v'  (r1899227)
     * Fix merge assertion failure in svn_sort__array_insert (issue #4840)
 
   - Server-side bugfixes:
-    * Fix use-after-free of object-pools when running in httpd (issue #4880)
+    * Fix CVE-2021-28544: authz protected copyfrom paths regression (r1899227)
+    * Fix CVE-2022-24070: use-after-free in mod_dav_svn (issue #4880)
     * Fix authz doesn't combine global and repository rules (issue #4762)
 
  Developer-visible changes:
@@ -2460,7 +2460,7 @@ http://svn.apache.org/repos/asf/subversi
     * svnadmin upgrade: fix data loss when cancelling in last stage (r1494298)
     * mod_dav_svn: fix incorrect path canonicalization (r1503528)
             See CVE-2013-4131, and descriptive advisory at
-            http://subversion.apache.org/security/CVE-2013-4131-advisory.txt
+            https://subversion.apache.org/security/CVE-2013-4131-advisory.txt
 
   - Other tool improvements and bugfixes:
     * fsfs-stats (tool): resolve segfault when passing invalid path (r1492164)
@@ -3057,12 +3057,12 @@ http://svn.apache.org/repos/asf/subversi
   - Server-side bugfixes:
     * mod_dav_svn: fix incorrect path canonicalization (r1503528)
             See CVE-2013-4131, and descriptive advisory at
-            http://subversion.apache.org/security/CVE-2013-4131-advisory.txt
+            https://subversion.apache.org/security/CVE-2013-4131-advisory.txt
 
   - Other tool improvements and bugfixes:
     * fix argument processing in contrib hook scripts (r1485350)
             See CVE-2013-2088, and descriptive advisory at
-            http://subversion.apache.org/security/CVE-2013-2088-advisory.txt
+            https://subversion.apache.org/security/CVE-2013-2088-advisory.txt
 
  Developer-visible changes:
   - Bindings:
@@ -3089,10 +3089,10 @@ http://svn.apache.org/repos/asf/subversi
   - Server-side bugfixes:
     * fix FSFS repository corruption due to newline in filename (issue #4340)
             See CVE-2013-1968, and descriptive advisory at
-            http://subversion.apache.org/security/CVE-2013-1968-advisory.txt
+            https://subversion.apache.org/security/CVE-2013-1968-advisory.txt
     * fix svnserve exiting when a client connection is aborted (r1482759)
             See CVE-2013-2112, and descriptive advisory at
-            http://subversion.apache.org/security/CVE-2013-2112-advisory.txt
+            https://subversion.apache.org/security/CVE-2013-2112-advisory.txt
     * fix svnserve memory use after clear (issue #4365)
     * fix repository corruption on power/disk failure on Windows (r1483781)
 
@@ -3120,7 +3120,7 @@ http://svn.apache.org/repos/asf/subversi
   - Server-side bugfixes:
       See CVE-2013-1845, CVE-2013-1846, CVE-2013-1847, CVE-2013-1849,
       and CVE-2013-1884, and descriptive advisories at
-            http://subversion.apache.org/security/
+            https://subversion.apache.org/security/
     * svnserve will log the replayed rev not the low-water rev. (r1461278)
     * mod_dav_svn will omit some property values for activity urls (r1453780)
     * fix an assertion in mod_dav_svn when acting as a proxy on / (issue #4272)
@@ -3460,7 +3460,7 @@ Version 1.7.0
 http://svn.apache.org/repos/asf/subversion/tags/1.7.0
 
 See the 1.7 release notes for a more verbose overview of the changes since
-the 1.6 release:  http://subversion.apache.org/docs/release-notes/1.7.html
+the 1.6 release:  https://subversion.apache.org/docs/release-notes/1.7.html
 
  User-visible changes:
   - General:
@@ -3659,7 +3659,7 @@ http://svn.apache.org/repos/asf/subversi
     * fix FSFS repository corruption due to newline in filename (issue #4340)
     * fix svnserve exiting when a client connection is aborted (r1482759)
             See CVE-2013-2112, and descriptive advisory at
-            http://subversion.apache.org/security/CVE-2013-2112-advisory.txt
+            https://subversion.apache.org/security/CVE-2013-2112-advisory.txt
 
   - Other tool improvements and bugfixes:
     * fix argument processing in contrib hook scripts (r1485350)
@@ -3757,7 +3757,7 @@ http://svn.apache.org/repos/asf/subversi
     * fixed: file externals cause mixed-revision working copies (issue #3816)
     * fix crash in mod_dav_svn with GETs of baselined resources (r1104126)
             See CVE-2011-1752, and descriptive advisory at
-            http://subversion.apache.org/security/CVE-2011-1752-advisory.txt
+            https://subversion.apache.org/security/CVE-2011-1752-advisory.txt
     * fixed: write-through proxy could directly commit to slave (r917523)
     * detect a particular corruption condition in FSFS (r1100213)
     * improve error message when clients refer to unknown revisions (r939000)
@@ -3770,10 +3770,10 @@ http://svn.apache.org/repos/asf/subversi
     * server-side validation of svn:mergeinfo syntax during commit (issue #3895)
     * fix remotely triggerable mod_dav_svn DoS (r1130303)
             See CVE-2011-1783, and descriptive advisory at
-            http://subversion.apache.org/security/CVE-2011-1783-advisory.txt
+            https://subversion.apache.org/security/CVE-2011-1783-advisory.txt
     * fix potential leak of authz-protected file contents (r1130303)
             See CVE-2011-1921, and descriptive advisory at
-            http://subversion.apache.org/security/CVE-2011-1921-advisory.txt
+            https://subversion.apache.org/security/CVE-2011-1921-advisory.txt
 
   Developer-visible changes:
     * fix reporting FS-level post-commit processing errors (r1104098)
@@ -3789,7 +3789,7 @@ http://svn.apache.org/repos/asf/subversi
    * more improvement to the 'blame -g' memory leak from 1.6.15 (r1041438)
    * avoid a crash in mod_dav_svn when using locks (r1071239, -307)
             See CVE-2011-0715, and descriptive advisory at
-            http://subversion.apache.org/security/CVE-2011-0715-advisory.txt
+            https://subversion.apache.org/security/CVE-2011-0715-advisory.txt
    * avoid unnecessary globbing for performance (r1068988)
    * don't add tree conflicts when one already exists (issue #3486)
    * fix potential crash when requesting mergeinfo (r902467)
@@ -3864,7 +3864,7 @@ http://svn.apache.org/repos/asf/subversi
    * fixed: record-only merges create self-referential mergeinfo (issue #3646)
    * fixed: 'SVNPathAuthz short_circuit' unsolicited read access (issue #3695)
             See CVE-2010-3315, and descriptive advisory at
-            http://subversion.apache.org/security/CVE-2010-3315-advisory.txt
+            https://subversion.apache.org/security/CVE-2010-3315-advisory.txt
    * make 'svnmucc propset' handle existing and non-existing URLs (r1000607)
    * add new 'propsetf' subcommand to svnmucc (r1000612)
    * warn about copied dirs during 'svn ci' with limited depth (r1002094)
@@ -4040,7 +4040,7 @@ http://svn.apache.org/repos/asf/subversi
  User-visible changes:
   * fixed: heap overflow vulnerability on server and client
            See CVE-2009-2411, and descriptive advisory at
-           http://subversion.apache.org/security/CVE-2009-2411-advisory.txt
+           https://subversion.apache.org/security/CVE-2009-2411-advisory.txt
 
 
 Version 1.6.3
@@ -4276,7 +4276,7 @@ http://svn.apache.org/repos/asf/subversi
   * improve memory performance in 'svn merge' (issue #3393)
   * fixed: 'SVNPathAuthz short_circuit' unsolicited read access (issue #3695)
            See CVE-2010-3315, and descriptive advisory at
-           http://subversion.apache.org/security/CVE-2010-3315-advisory.txt
+           https://subversion.apache.org/security/CVE-2010-3315-advisory.txt
   * prevent crash in mod_dav_svn when using SVNParentPath (r1033166)
   * limit memory fragmentation in svnserve (r1022675)
   * fix server-side memory leaks triggered by 'blame -g' (r1032808)
@@ -4301,7 +4301,7 @@ http://svn.apache.org/repos/asf/subversi
  User-visible changes:
   * fixed: heap overflow vulnerability on server and client
            See CVE-2009-2411, and descriptive advisory at
-           http://subversion.apache.org/security/CVE-2009-2411-advisory.txt
+           https://subversion.apache.org/security/CVE-2009-2411-advisory.txt
 
 
 Version 1.5.6
@@ -4734,7 +4734,7 @@ http://svn.apache.org/repos/asf/subversi
  User-visible changes:
  * fixed: file placement vulnerability (Win32 clients only)
           See CVE-2007-3846, and descriptive advisory at
-          http://subversion.apache.org/security/CVE-2007-3846-advisory.txt
+          https://subversion.apache.org/security/CVE-2007-3846-advisory.txt
 
 
 Version 1.4.4
@@ -5313,7 +5313,7 @@ Version 1.2.0
 http://svn.apache.org/repos/asf/subversion/tags/1.2.0
 
 See the 1.2 release notes for a more verbose overview of the changes since
-the 1.1 release:  http://subversion.apache.org/docs/release-notes/1.2.html
+the 1.1 release:  https://subversion.apache.org/docs/release-notes/1.2.html
 
  User-visible changes:
   - Client:
@@ -5609,7 +5609,7 @@ Version 1.1.0
 http://svn.apache.org/repos/asf/subversion/tags/1.1.0
 
 See the 1.1 release notes for a more verbose overview of the changes since
-1.0.x: http://subversion.apache.org/docs/release-notes/1.1.html
+1.0.x: https://subversion.apache.org/docs/release-notes/1.1.html
 
  User-visible changes:
  * new non-database repository back-end (libsvn_fs_fs)
@@ -5739,7 +5739,7 @@ http://svn.apache.org/repos/asf/subversi
  User-visible changes:
  * fixed: mod_authz_svn path and log-message metadata leaks.
           See CAN-2004-0749, and descriptive advisory at 
-          http://subversion.apache.org/security/CAN-2004-0749-advisory.txt
+          https://subversion.apache.org/security/CAN-2004-0749-advisory.txt
 
 
 Version 1.0.7

Modified: subversion/branches/pristines-on-demand-on-mwf/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/INSTALL?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/INSTALL (original)
+++ subversion/branches/pristines-on-demand-on-mwf/INSTALL Fri Nov 18 13:43:05 2022
@@ -646,7 +646,7 @@ I.    INTRODUCTION
 
       The primary documentation for Subversion is the free book
       "Version Control with Subversion", a.k.a. "The Subversion Book",
-      obtainable from http://svnbook.red-bean.com/.
+      obtainable from https://svnbook.red-bean.com/.
 
       Various additional documentation exists in the doc/ subdirectory of
       the Subversion source.  See the file doc/README for more information.
@@ -1282,7 +1282,7 @@ III.  BUILDING A SUBVERSION SERVER
 
       The following section is an abbreviated version of the
       information in the Subversion Book
-      (http://svnbook.red-bean.com).  Please read chapter 6 for more
+      (https://svnbook.red-bean.com).  Please read chapter 6 for more
       details.
 
       The following assumes you have already created a repository.
@@ -1429,7 +1429,7 @@ III.  BUILDING A SUBVERSION SERVER
       can use existing system accounts).  It's also capable of using
       Cyrus SASL if libsasl2 is detected at ./configure time.  Please
       read chapter 6 in the Subversion Book
-      (http://svnbook.red-bean.com) for details on these features.
+      (https://svnbook.red-bean.com) for details on these features.
 
 
 

Modified: subversion/branches/pristines-on-demand-on-mwf/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/Makefile.in?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/Makefile.in (original)
+++ subversion/branches/pristines-on-demand-on-mwf/Makefile.in Fri Nov 18 13:43:05 2022
@@ -457,10 +457,11 @@ fast-clean: doc-clean
         done
 	echo $(CLEAN_FILES) | xargs rm -f --
 	for d in $(CTYPES_PYTHON_SRC_DIR) $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) \
-		$(abs_srcdir)/build $(top_srcdir)/subversion/tests/cmdline/svntest; \
+		$(abs_srcdir)/build $(top_srcdir)/subversion/tests/cmdline; \
 	do \
 	  test -e $$d || continue; \
-	  find $$d -name "*.pyc" -exec rm {} ';'; \
+	  find $$d '(' -name "__pycache__" -prune -o -name "*.pyc" ')' \
+	    -exec rm -rf {} ';'; \
 	done
 
 # clean everything, returning to before './configure' was run.
@@ -969,7 +970,8 @@ clean-swig-py:
 	for d in $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR); \
 	do \
 	  test -e $$d || continue; \
-	  find $$d -name "*.pyc" -exec rm {} ';'; \
+	  find $$d '(' -name "__pycache__" -prune -o -name "*.pyc" ')' \
+	    -exec rm -rf {} ';'; \
 	done
 
 extraclean-swig-py: clean-swig-py

Modified: subversion/branches/pristines-on-demand-on-mwf/NOTICE
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/NOTICE?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/NOTICE (original)
+++ subversion/branches/pristines-on-demand-on-mwf/NOTICE Fri Nov 18 13:43:05 2022
@@ -3,7 +3,7 @@ Copyright 2022 The Apache Software Found
 
 This product includes software developed by many people, and distributed
 under Contributor License Agreements to The Apache Software Foundation
-(http://www.apache.org/).  See the accompanying COMMITTERS file and the
+(https://www.apache.org/).  See the accompanying COMMITTERS file and the
 revision logs for an exact contribution history.
 
 Portions of the test suite for Subversion's Python bindings are copyrighted

Modified: subversion/branches/pristines-on-demand-on-mwf/README
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/README?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/README (original)
+++ subversion/branches/pristines-on-demand-on-mwf/README Fri Nov 18 13:43:05 2022
@@ -32,7 +32,7 @@ II.   DOCUMENTATION
       The main documentation is the Subversion Book - an on-line version
       can be found at:
       
-         http://svnbook.red-bean.com/
+         https://svnbook.red-bean.com/
 
       It is written in DocBook XML, and the sources can be found at:
 

Modified: subversion/branches/pristines-on-demand-on-mwf/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/autogen.sh?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/autogen.sh (original)
+++ subversion/branches/pristines-on-demand-on-mwf/autogen.sh Fri Nov 18 13:43:05 2022
@@ -178,6 +178,7 @@ if test -z "$PYTHON"; then
   echo "to the Python executable, and re-run autogen.sh"
   exit 1
 fi
+export PYTHON
 
 # Compile SWIG headers into standalone C files if we are in release mode
 if test -n "$RELEASE_MODE"; then

Modified: subversion/branches/pristines-on-demand-on-mwf/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/build.conf?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/build.conf (original)
+++ subversion/branches/pristines-on-demand-on-mwf/build.conf Fri Nov 18 13:43:05 2022
@@ -288,6 +288,7 @@ 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
 msvc-delayload = yes
 
@@ -339,6 +340,7 @@ type = ra-module
 path = subversion/libsvn_ra_serf
 install = serf-lib
 libs = libsvn_delta libsvn_subr aprutil apriconv apr serf zlib
+add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS)
 msvc-static = yes
 
 # Accessing repositories via SVN

Modified: subversion/branches/pristines-on-demand-on-mwf/build/ac-macros/swig.m4
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/build/ac-macros/swig.m4?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/build/ac-macros/swig.m4 (original)
+++ subversion/branches/pristines-on-demand-on-mwf/build/ac-macros/swig.m4 Fri Nov 18 13:43:05 2022
@@ -182,22 +182,29 @@ suitable Python interpreter is not found
                 if test "$SWIG_VERSION" -ge "300010"; then
                   dnl SWIG Python bindings successfully configured, clear the error message dnl
                   SWIG_PY_ERRMSG=""
+                  if test "$SWIG_VERSION" -lt "400000"; then
+                    SWIG_PY_OPTS="-python -py3 -nofastunpack -modern"
+                  elif test "$SWIG_VERSION" -lt "401000"; then 
+                    SWIG_PY_OPTS="-python -py3 -nofastunpack"
+                  else
+                    SWIG_PY_OPTS="-python -nofastunpack"
+                  fi
+                  if test "$SWIG_VERSION" -gt "400002"; then 
+                    AC_MSG_WARN([Subversion Python bindings may work,])
+                    AC_MSG_WARN([but we didn't check with this SWIG version.])
+                  fi
                 else
+                  SWIG_PY_OPTS="-no-such-option" # fool proof
                   SWIG_PY_ERRMSG="SWIG version is not suitable"
                   AC_MSG_WARN([Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer])
                 fi
-                if test "$SWIG_VERSION" -lt "400000"; then
-                  SWIG_PY_OPTS="-python -py3 -nofastunpack -modern"
-                else
-                  SWIG_PY_OPTS="-python -py3 -nofastunpack"
-                fi
               else
                 if test "$SWIG_VERSION" -lt "400000"; then
                   SWIG_PY_OPTS="-python -classic"
                   dnl SWIG Python bindings successfully configured, clear the error message dnl
                   SWIG_PY_ERRMSG=""
                 else
-                  SWIG_PY_OPTS="-python -nofastunpack"
+                  SWIG_PY_OPTS="-no-such-option" # fool proof
                   SWIG_PY_ERRMSG="SWIG version is not suitable"
                   AC_MSG_WARN([Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0])
                 fi

Modified: subversion/branches/pristines-on-demand-on-mwf/build/generator/gen_base.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/build/generator/gen_base.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/build/generator/gen_base.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/build/generator/gen_base.py Fri Nov 18 13:43:05 2022
@@ -35,6 +35,7 @@ try:
 except ImportError:
   # Python <3.0
   import ConfigParser as configparser
+  configparser.ConfigParser.read_file = configparser.ConfigParser.readfp
 import generator.swig
 
 import getversion
@@ -76,7 +77,7 @@ class GeneratorBase:
 
     # Now read and parse build.conf
     parser = configparser.ConfigParser()
-    parser.readfp(open(fname))
+    parser.read_file(open(fname))
 
     self.conf = build_path(os.path.abspath(fname))
 

Modified: subversion/branches/pristines-on-demand-on-mwf/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/build/generator/gen_win_dependencies.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/build/generator/gen_win_dependencies.py Fri Nov 18 13:43:05 2022
@@ -1059,8 +1059,13 @@ class GenDependenciesBase(gen_base.Gener
         return
       if self.swig_version < (4, 0, 0):
         opts = "-python -py3 -nofastunpack -modern"
-      else:
+      elif self.swig_version < (4, 1, 0):
         opts = "-python -py3 -nofastunpack"
+      else:
+        opts = "-python -nofastunpack"
+      if show_warnings and self.swig_version > (4, 0, 2):
+        print("WARNING: Subversion Python bindings may work,\n"
+              "but we didn't check with this SWIG version.")
     else:
       if not ((1, 3, 24) <= self.swig_version < (4, 0, 0)):
         if show_warnings:

Modified: subversion/branches/pristines-on-demand-on-mwf/build/win32/make_gem.rb
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/build/win32/make_gem.rb?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/build/win32/make_gem.rb (original)
+++ subversion/branches/pristines-on-demand-on-mwf/build/win32/make_gem.rb Fri Nov 18 13:43:05 2022
@@ -80,7 +80,7 @@ Dir.chdir(archive_dir) do
     s.version = Svn::Core::VER_NUM
     s.summary = "The Ruby bindings for Subversion."
     s.email = "dev@subversion.apache.org"
-    s.homepage = "http://subversion.apache.org/"
+    s.homepage = "https://subversion.apache.org/"
     s.description = s.summary
     s.authors = ["Kouhei Sutou"]
     s.files = Dir.glob(File.join("**", "*")).delete_if {|x| /\.gem$/i =~ x}

Modified: subversion/branches/pristines-on-demand-on-mwf/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/configure.ac?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/configure.ac (original)
+++ subversion/branches/pristines-on-demand-on-mwf/configure.ac Fri Nov 18 13:43:05 2022
@@ -24,7 +24,7 @@ dnl Get the version of Subversion, using
 dnl at m4-time, since AC_INIT() requires it then.
 AC_INIT([subversion],
      [esyscmd($PYTHON build/getversion.py SVN subversion/include/svn_version.h)],
-     [http://subversion.apache.org/])
+     [https://subversion.apache.org/])
 
 AC_CONFIG_SRCDIR(subversion/include/svn_types.h)
 AC_CONFIG_AUX_DIR([build])
@@ -1814,7 +1814,7 @@ https://www.gnu.org/licenses/agpl-3.0.ht
 http://opensource.org/licenses/AGPL-3.0
 
 The Berkeley DB backend to Subversion is deprecated; see
-http://subversion.apache.org/docs/release-notes/1.8#bdb-deprecated
+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.

Modified: subversion/branches/pristines-on-demand-on-mwf/contrib/client-side/emacs/dsvn.el
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/contrib/client-side/emacs/dsvn.el?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/contrib/client-side/emacs/dsvn.el (original)
+++ subversion/branches/pristines-on-demand-on-mwf/contrib/client-side/emacs/dsvn.el Fri Nov 18 13:43:05 2022
@@ -1,5 +1,11 @@
 ;;; dsvn.el --- Subversion interface
 
+;; This file is known to be out of date but has been kept to not break scripts
+;; that might rely on it.
+;;
+;; The latest version is hosted on GitHub:
+;; https://github.com/rosbo018/dsvn
+
 ;; Copyright 2006-2010 Virtutech AB
 ;; Copyright 2010 Intel
 

Modified: subversion/branches/pristines-on-demand-on-mwf/contrib/client-side/emacs/psvn.el
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/contrib/client-side/emacs/psvn.el?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/contrib/client-side/emacs/psvn.el (original)
+++ subversion/branches/pristines-on-demand-on-mwf/contrib/client-side/emacs/psvn.el Fri Nov 18 13:43:05 2022
@@ -1,4 +1,11 @@
 ;;; psvn.el --- Subversion interface for emacs
+
+;; This file is known to be out of date but has been kept to not break scripts
+;; that might rely on it.
+;;
+;; The latest version is hosted here:
+;; http://www.xsteve.at/prg/emacs/
+
 ;; Copyright (C) 2002-2009 by Stefan Reichoer
 
 ;; Author: Stefan Reichoer <st...@xsteve.at>
@@ -28,7 +35,7 @@
 ;; if you upgrade to a higher version, you need to do a fresh checkout
 
 ;; psvn.el is an interface for the revision control tool subversion
-;; (see http://subversion.apache.org)
+;; (see https://subversion.apache.org)
 ;; psvn.el provides a similar interface for subversion as pcl-cvs for cvs.
 ;; At the moment the following commands are implemented:
 ;;
@@ -137,8 +144,6 @@
 
 ;; The latest version of psvn.el can be found at:
 ;;   http://www.xsteve.at/prg/emacs/psvn.el
-;; Or you can check it out from the subversion repository:
-;;   svn co http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs emacs-svn
 
 ;; TODO:
 ;; * shortcut for svn propset svn:keywords "Date" psvn.el

Modified: subversion/branches/pristines-on-demand-on-mwf/contrib/hook-scripts/check-mime-type.pl
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/contrib/hook-scripts/check-mime-type.pl?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/contrib/hook-scripts/check-mime-type.pl (original)
+++ subversion/branches/pristines-on-demand-on-mwf/contrib/hook-scripts/check-mime-type.pl Fri Nov 18 13:43:05 2022
@@ -195,7 +195,7 @@ if (@errors)
 
     You may want to consider uncommenting the auto-props section
     in your ~/.subversion/config file. Read the Subversion book
-    (http://svnbook.red-bean.com/), Chapter 7, Properties section,
+    (https://svnbook.red-bean.com/), Chapter 7, Properties section,
     Automatic Property Setting subsection for more help.
 EOS
     exit 1;

Modified: subversion/branches/pristines-on-demand-on-mwf/contrib/hook-scripts/hook_toolbox.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/contrib/hook-scripts/hook_toolbox.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/contrib/hook-scripts/hook_toolbox.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/contrib/hook-scripts/hook_toolbox.py Fri Nov 18 13:43:05 2022
@@ -55,7 +55,7 @@ def get_changed_paths(*args):
 
   # First four chars of each svnlook output line show the kind of change.
   # The rest of the line is the complete repository path. See:
-  # http://svnbook.red-bean.com/nightly/en/svn.ref.svnlook.c.changed.html
+  # https://svnbook.red-bean.com/nightly/en/svn.ref.svnlook.c.changed.html
   changed_paths = [ line[4:] for line in changes.split('\n') if len(line) > 4 ]
 
   #print '%s:\n '%(' '.join(args)), '\n  '.join(changed_paths)

Modified: subversion/branches/pristines-on-demand-on-mwf/contrib/server-side/svnmirror.sh
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/contrib/server-side/svnmirror.sh?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/contrib/server-side/svnmirror.sh (original)
+++ subversion/branches/pristines-on-demand-on-mwf/contrib/server-side/svnmirror.sh Fri Nov 18 13:43:05 2022
@@ -17,7 +17,7 @@ VERSION="0.0.7"
 #
 # 1. You need write access to the directory structure on both boxes
 #    for more see the warning at:
-#    http://svnbook.red-bean.com/html-chunk/ch06s03.html
+#    https://svnbook.red-bean.com/html-chunk/ch06s03.html
 #
 # 2. For running it from cron i suggest the use of the ssh agent e.g
 #    via keychain <http://www.gentoo.org/proj/en/keychain.xml>

Modified: subversion/branches/pristines-on-demand-on-mwf/doc/README
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/doc/README?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/doc/README (original)
+++ subversion/branches/pristines-on-demand-on-mwf/doc/README Fri Nov 18 13:43:05 2022
@@ -3,7 +3,7 @@
 
 A rough guide:
 
-  http://svnbook.red-bean.com/
+  https://svnbook.red-bean.com/
                              "Version Control with Subversion"
                              (a.k.a. "The Subversion Book", "The Svnbook",
                              and formerly entitled

Modified: subversion/branches/pristines-on-demand-on-mwf/doc/user/cvs-crossover-guide.html
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/doc/user/cvs-crossover-guide.html?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/doc/user/cvs-crossover-guide.html (original)
+++ subversion/branches/pristines-on-demand-on-mwf/doc/user/cvs-crossover-guide.html Fri Nov 18 13:43:05 2022
@@ -83,7 +83,7 @@ dd {
 <p>This document provides an alternate method of learning Subversion.
    Many users dislike learning new technology via a theoretical "top
    down" approach, as provided by the <a
-   href="http://svnbook.red-bean.com">Subversion Book</a>.  Instead,
+   href="https://svnbook.red-bean.com">Subversion Book</a>.  Instead,
    this document presents Subversion from the "bottom up": it shows a
    CVS command or task, and then shows the equivalent task in
    Subversion (along with relevant book links.) It's essentially a
@@ -185,7 +185,7 @@ dd {
 
 <dl class="bookref">
   <dt>Book References:</dt>
-  <dd><a href="http://svnbook.red-bean.com/svnbook/ch05s02.html">Repository Creation and Configuration</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/ch05s02.html">Repository Creation and Configuration</a></dd>
 </dl>
 
 </div>
@@ -241,8 +241,8 @@ dd {
 
 <dl class="bookref">
   <dt>Book References:</dt>
-  <dd><a href="http://svnbook.red-bean.com/svnbook/ch05s04.html#svn-ch-5-sect-6.1">Choosing a repository layout</a></dd>
-  <dd><a href="http://svnbook.red-bean.com/svnbook/re12.html">svn import</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/ch05s04.html#svn-ch-5-sect-6.1">Choosing a repository layout</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/re12.html">svn import</a></dd>
 </dl>
 </div>
 
@@ -288,7 +288,7 @@ dd {
 
 <dl class="bookref">
   <dt>Book References:</dt>
-  <dd><a href="http://svnbook.red-bean.com/svnbook/ch06.html">Server configuration</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/ch06.html">Server configuration</a></dd>
 </dl>
 
 </div>
@@ -341,7 +341,7 @@ dd {
 
 <dl class="bookref">
   <dt>Book References:</dt>
-  <dd><a href="http://svnbook.red-bean.com/svnbook/ch06s02.html">Network Model</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/ch06s02.html">Network Model</a></dd>
 </dl>
 
 </div>
@@ -397,7 +397,7 @@ dd {
 
 <dl class="bookref">
   <dt>Book References:</dt>
-  <dd><a href="http://svnbook.red-bean.com/svnbook/re14.html">svn list</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/re14.html">svn list</a></dd>
 </dl>
 
 </div>
@@ -454,8 +454,8 @@ dd {
 
 <dl class="bookref">
   <dt>Book References:</dt>
-  <dd><a href="http://svnbook.red-bean.com/svnbook/ch03s04.html">Initial Checkout</a></dd>
-  <dd><a href="http://svnbook.red-bean.com/svnbook/re04.html">svn checkout</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/ch03s04.html">Initial Checkout</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/re04.html">svn checkout</a></dd>
 </dl>
 
 </div>
@@ -518,8 +518,8 @@ dd {
 
 <dl class="bookref">
   <dt>Book References:</dt>
-  <dd><a href="http://svnbook.red-bean.com/svnbook/ch03s05.html#svn-ch-3-sect-4.3.1">Examine Your Changes</a></dd>
-  <dd><a href="http://svnbook.red-bean.com/svnbook/re26.html">svn status</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/ch03s05.html#svn-ch-3-sect-4.3.1">Examine Your Changes</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/re26.html">svn status</a></dd>
 </dl>
 
 </div>
@@ -583,8 +583,8 @@ dd {
 
 <dl class="bookref">
   <dt>Book References:</dt>
-  <dd><a href="http://svnbook.red-bean.com/svnbook/ch03s05.html#svn-ch-3-sect-4.3.1">Examine Your Changes</a></dd>
-  <dd><a href="http://svnbook.red-bean.com/svnbook/re26.html">svn status</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/ch03s05.html#svn-ch-3-sect-4.3.1">Examine Your Changes</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/re26.html">svn status</a></dd>
 </dl>
 
 </div>
@@ -673,9 +673,9 @@ dd {
 
 <dl class="bookref">
   <dt>Book References:</dt> 
-  <dd><a href="http://svnbook.red-bean.com/svnbook/ch03s05.html#svn-ch-3-sect-4.2">Make Changes to Your Working Copy</a></dd>
-  <dd><a href="http://svnbook.red-bean.com/svnbook/re01.html">svn add</a></dd>
-  <dd><a href="http://svnbook.red-bean.com/svnbook/re08.html">svn delete</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/ch03s05.html#svn-ch-3-sect-4.2">Make Changes to Your Working Copy</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/re01.html">svn add</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/re08.html">svn delete</a></dd>
 </dl>
 
 </div>
@@ -744,9 +744,9 @@ dd {
 
 <dl class="bookref">
   <dt>Book References:</dt> 
-  <dd><a href="http://svnbook.red-bean.com/svnbook/ch03s05.html#svn-ch-3-sect-4.2">Make Changes to Your Working Copy</a></dd>
-  <dd><a href="http://svnbook.red-bean.com/svnbook/re07.html">svn copy</a></dd>
-  <dd><a href="http://svnbook.red-bean.com/svnbook/re18.html">svn move</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/ch03s05.html#svn-ch-3-sect-4.2">Make Changes to Your Working Copy</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/re07.html">svn copy</a></dd>
+  <dd><a href="https://svnbook.red-bean.com/svnbook/re18.html">svn move</a></dd>
 </dl>
 
 

Modified: subversion/branches/pristines-on-demand-on-mwf/doc/user/svn-best-practices.html
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/doc/user/svn-best-practices.html?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/doc/user/svn-best-practices.html (original)
+++ subversion/branches/pristines-on-demand-on-mwf/doc/user/svn-best-practices.html Fri Nov 18 13:43:05 2022
@@ -53,7 +53,7 @@ root" contains exactly three subdirector
 only one project root, or it may contain a number of them.</p>
 
 <p><em>Book reference:</em> <a
-        href="http://svnbook.red-bean.com/nightly/en/svn.reposadmin.planning.html#svn.reposadmin.projects.chooselayout">Choosing
+        href="https://svnbook.red-bean.com/nightly/en/svn.reposadmin.planning.html#svn.reposadmin.projects.chooselayout">Choosing
         a Repository Layout</a>.</p>
 
 
@@ -71,7 +71,7 @@ it as an argument to <tt>svn merge</tt>
 change or port it to another branch.</p>
 
 <p><em>Book reference:</em> <a
-        href="http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchmerge.changesets">Changesets</a>.</p>
+        href="https://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchmerge.changesets">Changesets</a>.</p>
 
 <!-- =================================================== -->
 
@@ -101,9 +101,9 @@ like:</p>
   <pre>Merged revisions 3490:4120 of /branches/foobranch to /trunk.</pre>
 
 <p><em>Book reference:</em> <a
-        href="http://svnbook.red-bean.com/svnbook/ch04s03.html#svn-ch-4-sect-3.2">Tracking
+        href="https://svnbook.red-bean.com/svnbook/ch04s03.html#svn-ch-4-sect-3.2">Tracking
         merges manually</a>, and <a
-        href="http://svnbook.red-bean.com/svnbook/ch04s04.html#svn-ch-4-sect-4.1">Merging a whole branch to another</a>.</p>
+        href="https://svnbook.red-bean.com/svnbook/ch04s04.html#svn-ch-4-sect-4.1">Merging a whole branch to another</a>.</p>
 </div>
 
 <!-- =================================================== -->
@@ -136,7 +136,7 @@ revision, and everything else is at an o
 </ol>
 
 <p><em>Book reference:</em> <a
-        href="http://svnbook.red-bean.com/nightly/en/svn.basic.in-action.html#svn.basic.in-action.mixedrevs">Mixed-revision working copies</a>.</p>
+        href="https://svnbook.red-bean.com/nightly/en/svn.basic.in-action.html#svn.basic.in-action.mixedrevs">Mixed-revision working copies</a>.</p>
 
 
 <!-- =================================================== -->

Modified: subversion/branches/pristines-on-demand-on-mwf/notes/api-errata/1.7/ra001.txt
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/notes/api-errata/1.7/ra001.txt?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/notes/api-errata/1.7/ra001.txt (original)
+++ subversion/branches/pristines-on-demand-on-mwf/notes/api-errata/1.7/ra001.txt Fri Nov 18 13:43:05 2022
@@ -13,7 +13,7 @@ The ra_neon (formerly, ra_dav) drives de
 accordance with the constraints of that API [1].
 
 [1] ../../../subversion/include/svn_delta.h:svn_delta_editor_t 
-[1] http://subversion.apache.org/docs/api/latest/structsvn__delta__editor__t.html#_details
+[1] https://subversion.apache.org/docs/api/latest/structsvn__delta__editor__t.html#details
 
 
 == Details of New Behavior ==

Modified: subversion/branches/pristines-on-demand-on-mwf/notes/commit-access-templates/full-committer.tmpl
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/notes/commit-access-templates/full-committer.tmpl?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/notes/commit-access-templates/full-committer.tmpl (original)
+++ subversion/branches/pristines-on-demand-on-mwf/notes/commit-access-templates/full-committer.tmpl Fri Nov 18 13:43:05 2022
@@ -23,7 +23,7 @@ you can do it yourself, that's fine too)
 
 If you do not already have partial commit access, you can accept this
 offer by replying to this mail and following the instructions at
-<http://www.apache.org/dev/new-committers-guide.html#cla>.  You will
+<https://www.apache.org/dev/new-committers-guide.html>.  You will
 receive an email with details on how to access your account.  Once you
 have access to your account, you are encouraged to modify the COMMITTERS
 file appropriately, which also serves as a test of your new username and
@@ -32,8 +32,8 @@ password.
 Becoming a full committer also means you'll become part of the Subversion
 Project Management Committee (PMC).  The PMC is the managing body of the
 Subversion development and user communities.  For more information, see
-<http://www.apache.org/foundation/how-it-works.html#pmc> and
-<http://www.apache.org/dev/pmc.html#faq>.
+<https://www.apache.org/foundation/how-it-works.html#pmc> and
+<https://www.apache.org/dev/pmc.html#faq>.
 
 Please remember to subscribe to the private (PMC) mailing list by
 emailing <private-subscribe{AT}subversion.apache.org>, and to checkout
@@ -47,7 +47,7 @@ when you want to.  Commit access just me
 own judgment to decide when something is ready for commit.  Also, if
 you haven't done so already, please read
 
-   http://subversion.apache.org/docs/community-guide/
+   https://subversion.apache.org/docs/community-guide/
 
 Thanks for all your work so far!
 

Modified: subversion/branches/pristines-on-demand-on-mwf/notes/commit-access-templates/partial-committer.tmpl
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/notes/commit-access-templates/partial-committer.tmpl?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/notes/commit-access-templates/partial-committer.tmpl (original)
+++ subversion/branches/pristines-on-demand-on-mwf/notes/commit-access-templates/partial-committer.tmpl Fri Nov 18 13:43:05 2022
@@ -24,7 +24,7 @@ COMMITTERS file (or you can do it yourse
 
 #else
 You can accept this offer by replying to this mail and following the
-instructions at <http://www.apache.org/dev/new-committers-guide.html#cla>.
+instructions at <https://www.apache.org/dev/new-committers-guide.html>.
 You will receive an email with details on how to access your account.
 Once you have access to your account, you are encouraged to modify the
 COMMITTERS file appropriately, which also serves as a test of your new
@@ -36,7 +36,7 @@ when you want to.  Commit access just me
 own judgment to decide when something is ready for commit.  Also, if
 you haven't done so already, please read
 
-   http://subversion.apache.org/docs/community-guide/
+   https://subversion.apache.org/docs/community-guide/
 
 Thanks for all your work so far!
 

Modified: subversion/branches/pristines-on-demand-on-mwf/notes/commit-access-templates/pmc-member.tmpl
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/notes/commit-access-templates/pmc-member.tmpl?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/notes/commit-access-templates/pmc-member.tmpl (original)
+++ subversion/branches/pristines-on-demand-on-mwf/notes/commit-access-templates/pmc-member.tmpl Fri Nov 18 13:43:05 2022
@@ -17,13 +17,13 @@ Hi New PMC Member,
 The other PMC members and I would like to invite you to join the Subversion
 Project Management Committee (PMC).  The PMC is the managing body of the
 Subversion development and user communities.  For more information, see
-<http://www.apache.org/foundation/how-it-works.html#pmc> and
-<http://www.apache.org/dev/pmc.html#faq>.  If you have any questions about
+<https://www.apache.org/foundation/how-it-works.html#pmc> and
+<https://www.apache.org/dev/pmc.html#faq>.  If you have any questions about
 this invitation, please don't hesitate to ask me or the existing PMC.
 
 You can accept this offer by simply replying to this mail.  If you do not
 already have an account with the Apache Software Foundation, please follow
-the instructions at <http://www.apache.org/dev/new-committers-guide.html#cla>.
+the instructions at <https://www.apache.org/dev/new-committers-guide.html>.
 You will receive an email with details on how to access your account.
 
 Please remember to subscribe to the private (PMC) mailing list by
@@ -42,7 +42,7 @@ when something is ready for commit.
 
 Finally, if you haven't done so already, please read
 
-   http://subversion.apache.org/docs/community-guide/
+   https://subversion.apache.org/docs/community-guide/
 
 Thanks for all your work so far!
 

Modified: subversion/branches/pristines-on-demand-on-mwf/notes/fsfs
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/notes/fsfs?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/notes/fsfs (original)
+++ subversion/branches/pristines-on-demand-on-mwf/notes/fsfs Fri Nov 18 13:43:05 2022
@@ -1,6 +1,6 @@
 "FSFS" is the name of a Subversion filesystem implementation, an
 alternative to the original Berkeley DB-based implementation.  See
-http://subversion.apache.org/ for information about Subversion.  This
+https://subversion.apache.org/ for information about Subversion.  This
 is a propaganda document for FSFS, to help people determine if they
 should be interested in using it instead of the BDB filesystem.
 

Modified: subversion/branches/pristines-on-demand-on-mwf/notes/http-and-webdav/webdav-protocol
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/notes/http-and-webdav/webdav-protocol?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/notes/http-and-webdav/webdav-protocol (original)
+++ subversion/branches/pristines-on-demand-on-mwf/notes/http-and-webdav/webdav-protocol Fri Nov 18 13:43:05 2022
@@ -10,7 +10,7 @@ IMPORTANT RFCs and LINKS
 
   * Subversion's limited uses of DeltaV, as well as interoperability
     issues, are explained in the "WebDAV" appendix of the free
-    Subversion book (at http://svnbook.red-bean.com)
+    Subversion book (at https://svnbook.red-bean.com)
 
 
 

Modified: subversion/branches/pristines-on-demand-on-mwf/notes/http-and-webdav/webdav-usage.html
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/notes/http-and-webdav/webdav-usage.html?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/notes/http-and-webdav/webdav-usage.html (original)
+++ subversion/branches/pristines-on-demand-on-mwf/notes/http-and-webdav/webdav-usage.html Fri Nov 18 13:43:05 2022
@@ -19,7 +19,7 @@
 
     <p>
       This document details how WebDAV is used within the
-      <a href="http://subversion.apache.org/">Subversion
+      <a href="https://subversion.apache.org/">Subversion
       product</a>. Specifically, how the client side interfaces with
       <a href="http://www.webdav.org/neon/">Neon</a> to generate
       WebDAV requests over the wire, and what the

Modified: subversion/branches/pristines-on-demand-on-mwf/notes/xfail-status
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/notes/xfail-status?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/notes/xfail-status (original)
+++ subversion/branches/pristines-on-demand-on-mwf/notes/xfail-status Fri Nov 18 13:43:05 2022
@@ -1,5 +1,5 @@
 This tracked the remaining TODOs for the 'Test Review' roadmap item for
-1.7's release status (http://subversion.apache.org/roadmap), i.e.:
+1.7's release status (https://subversion.apache.org/roadmap), i.e.:
 
   "Determine which XFail and WIP tests should remain so,
    and which need to be fixed before release."

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/ctypes-python/setup.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/ctypes-python/setup.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/ctypes-python/setup.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/ctypes-python/setup.py Fri Nov 18 13:43:05 2022
@@ -471,7 +471,7 @@ setup(cmdclass={'build': build, 'clean':
       description='Python bindings for the Subversion version control system.',
       author='The Subversion Team',
       author_email='dev@subversion.apache.org',
-      url='http://subversion.apache.org',
+      url='https://subversion.apache.org',
       packages=['csvn', 'csvn.core', 'csvn.ext'],
       license='Apache License, Version 2.0',
      )

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java Fri Nov 18 13:43:05 2022
@@ -86,7 +86,11 @@ class NativeException extends Subversion
      */
     public String getMessage()
     {
-        StringBuffer msg = new StringBuffer(super.getMessage());
+        StringBuilder msg = new StringBuilder();
+        String message = super.getMessage();
+        if (message != null) {
+            msg.append(message);
+        }
         // ### This might be better off in JNIUtil::handleSVNError().
         String src = getSource();
         if (src != null)

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NativeException.java Fri Nov 18 13:43:05 2022
@@ -85,7 +85,11 @@ class NativeException extends Subversion
      */
     public String getMessage()
     {
-        StringBuffer msg = new StringBuffer(super.getMessage());
+        StringBuilder msg = new StringBuilder();
+        String message = super.getMessage();
+        if (message != null) {
+            msg.append(message);
+        }
         // ### This might be better off in JNIUtil::handleSVNError().
         String src = getSource();
         if (src != null)

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java Fri Nov 18 13:43:05 2022
@@ -1200,6 +1200,7 @@ public class SVNClient implements SVNCli
      *                                  boolean, boolean, int, String)} instead.
      * @since 1.0
      */
+    @Deprecated
     public long doExport(String srcPath, String destPath,
                                 Revision revision, boolean force)
             throws ClientException
@@ -1213,6 +1214,7 @@ public class SVNClient implements SVNCli
      *                                  boolean, boolean, int, String)} instead.
      * @since 1.2
      */
+    @Deprecated
     public long doExport(String srcPath, String destPath, Revision revision,
                          Revision pegRevision, boolean force,
                          boolean ignoreExternals, boolean recurse,
@@ -1251,6 +1253,7 @@ public class SVNClient implements SVNCli
      *             instead.
      * @since 1.0
      */
+    @Deprecated
     public long doSwitch(String path, String url, Revision revision,
                          boolean recurse)
             throws ClientException
@@ -1265,6 +1268,7 @@ public class SVNClient implements SVNCli
      *                                  boolean)} instead.
      * @since 1.5
      */
+    @Deprecated
     public long doSwitch(String path, String url, Revision revision,
                          Revision pegRevision, int depth,
                          boolean depthIsSticky, boolean ignoreExternals,
@@ -1359,6 +1363,7 @@ public class SVNClient implements SVNCli
      *                               boolean, boolean)} instead.
      * @since 1.0
      */
+    @Deprecated
     public void merge(String path1, Revision revision1, String path2,
                       Revision revision2, String localPath,
                       boolean force, boolean recurse)
@@ -1374,6 +1379,7 @@ public class SVNClient implements SVNCli
      *                               boolean, boolean)} instead.
      * @since 1.2
      */
+    @Deprecated
     public void merge(String path1, Revision revision1, String path2,
                       Revision revision2, String localPath, boolean force,
                       boolean recurse, boolean ignoreAncestry, boolean dryRun)

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Fri Nov 18 13:43:05 2022
@@ -27,6 +27,7 @@ import static org.junit.Assert.*;
 import org.apache.subversion.javahl.callback.*;
 import org.apache.subversion.javahl.remote.*;
 import org.apache.subversion.javahl.types.*;
+import org.apache.subversion.javahl.NativeException;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -4747,6 +4748,17 @@ public class BasicTests extends SVNTests
     }
 
     /**
+     * Test getMessage in NativeException.
+     * @throws Throwable
+     */
+    public void testGetMessage() throws Throwable
+    {
+	/* NativeException with a null message previously threw a NullPointerException */
+	assertEquals("", new NativeException(null, null, null, 0).getMessage());
+	assertEquals("messagesvn: source: (apr_err=0)", new NativeException("message", "source", null, 0).getMessage());
+    }
+
+    /**
      * @return <code>file</code> converted into a -- possibly
      * <code>canonical</code>-ized -- Subversion-internal path
      * representation.

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java Fri Nov 18 13:43:05 2022
@@ -22,6 +22,8 @@
  */
 package org.tigris.subversion.javahl;
 
+import org.tigris.subversion.javahl.NativeException;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileNotFoundException;
@@ -3321,6 +3323,17 @@ public class BasicTests extends SVNTests
     }
 
     /**
+     * Test getMessage in NativeException.
+     * @throws Throwable 
+     */
+    public void testGetMessage() throws Throwable
+    {
+	/* NativeException with a null message previously threw a NullPointerException */
+	assertEquals("", new NativeException(null, null, 0).getMessage());
+	assertEquals("messagesvn: source: (apr_err=0)", new NativeException("message", "source", 0).getMessage());
+    }
+
+    /**
      * @return <code>file</code> converted into a -- possibly
      * <code>canonical</code>-ized -- Subversion-internal path
      * representation.

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/INSTALL?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/INSTALL (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/INSTALL Fri Nov 18 13:43:05 2022
@@ -144,8 +144,8 @@ Step 2:  Build and Install Subversion.
   See Subversion's own INSTALL file for details.
 
   If you are using a Subversion distribution tarball and want to rebuild
-  the SWIG language bindings C source files with your installed SWIG, 
-  you need to execute autogen.sh, because the bundled configure script 
+  the SWIG language bindings C source files with your installed SWIG,
+  you need to execute autogen.sh, because the bundled configure script
   and makefiles don't support it.
 
   If you don't use SWIG bindings C source files already generated,
@@ -169,6 +169,17 @@ Step 2:  Build and Install Subversion.
     libsvn_swig_perl-1.so (for Perl)
     libsvn_swig_ruby-1.so (for Ruby)
 
+
+Step 2.5: [Optional] Clean Old Bindings Intermediate Source Files
+
+  If you are rebuilding bindings with different version of SWIG from
+  previously used, run 'make clean-swig'.  This will clean SWIG version
+  depended intermediate source files.  This step also needs if you are
+  using the Subversion distribution tarball and using autogen.sh to
+  rebuild configure script, because you might use different version of
+  SWIG from one we used to make the tarball.
+
+
 Step 3:  Install Specific Language Bindings
 
 *  Python
@@ -177,7 +188,9 @@ Step 3:  Install Specific Language Bindi
        build tree.  This will clean any prebuilt or previously built bindings
        to avoid a mixture of incompatible bindings source files (e.g., if you
        use the Subversion distribution tarball but want to build Python 2
-       bindings).
+       bindings).  This step is not needed if you run 'make clean-swig'
+       in Step 2.5 just before, because it runs 'make clean-swig-py'
+       internally.
 
    2.  Run 'make swig-py' from the top of the Subversion build tree,
        to build the bindings.

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/include/proxy.swg
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/include/proxy.swg?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/include/proxy.swg (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/include/proxy.swg Fri Nov 18 13:43:05 2022
@@ -66,7 +66,6 @@
         fn()
 
 %}
-#if defined(SWIGPYTHON_PY3)
 #if SWIG_VERSION >= 0x040000
 %pythoncode %{
   # -classic and -modern options have been dropped and this variable
@@ -76,7 +75,7 @@
   _set_instance_attr = _swig_setattr_nondynamic_instance_variable(object.__setattr__)
 
 %}
-#else
+#elif defined(SWIGPYTHON_PY3)
 %pythoncode %{
   # SWIG classes generated with -modern do not define this variable
   try:
@@ -90,7 +89,6 @@
   _set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
 
 %}
-#endif
 #else
 %pythoncode %{
   # SWIG classes generated with -classic do not define this variable,

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/__init__.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/__init__.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/__init__.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/__init__.py Fri Nov 18 13:43:05 2022
@@ -2,7 +2,7 @@
 # __init__.py:  defines this directory as the 'libsvn' package.
 #
 #  Subversion is a tool for revision control.
-#  See http://subversion.apache.org for more information.
+#  See https://subversion.apache.org for more information.
 #
 # ====================================================================
 #    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/__init__.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/__init__.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/__init__.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/__init__.py Fri Nov 18 13:43:05 2022
@@ -2,7 +2,7 @@
 # __init__.py: defines this directory as the 'svn' package
 #
 # Subversion is a tool for revision control.
-# See http://subversion.apache.org for more information.
+# See https://subversion.apache.org for more information.
 #
 ######################################################################
 #    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/client.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/client.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/client.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/client.py Fri Nov 18 13:43:05 2022
@@ -2,7 +2,7 @@
 # client.py: public Python interface for client components
 #
 # Subversion is a tool for revision control.
-# See http://subversion.apache.org for more information.
+# See https://subversion.apache.org for more information.
 #
 ######################################################################
 #    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/core.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/core.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/core.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/core.py Fri Nov 18 13:43:05 2022
@@ -2,7 +2,7 @@
 # core.py: public Python interface for core components
 #
 # Subversion is a tool for revision control.
-# See http://subversion.apache.org for more information.
+# See https://subversion.apache.org for more information.
 #
 ######################################################################
 #    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/delta.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/delta.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/delta.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/delta.py Fri Nov 18 13:43:05 2022
@@ -2,7 +2,7 @@
 # delta.py: public Python interface for delta components
 #
 # Subversion is a tool for revision control.
-# See http://subversion.apache.org for more information.
+# See https://subversion.apache.org for more information.
 #
 ######################################################################
 #    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/diff.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/diff.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/diff.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/diff.py Fri Nov 18 13:43:05 2022
@@ -2,7 +2,7 @@
 # diff.py: public Python interface for diff components
 #
 # Subversion is a tool for revision control.
-# See http://subversion.apache.org for more information.
+# See https://subversion.apache.org for more information.
 #
 ######################################################################
 #    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/fs.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/fs.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/fs.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/fs.py Fri Nov 18 13:43:05 2022
@@ -2,7 +2,7 @@
 # fs.py: public Python interface for fs components
 #
 # Subversion is a tool for revision control.
-# See http://subversion.apache.org for more information.
+# See https://subversion.apache.org for more information.
 #
 ######################################################################
 #    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/ra.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/ra.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/ra.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/ra.py Fri Nov 18 13:43:05 2022
@@ -2,7 +2,7 @@
 # ra.py: public Python interface for ra components
 #
 # Subversion is a tool for revision control.
-# See http://subversion.apache.org for more information.
+# See https://subversion.apache.org for more information.
 #
 ######################################################################
 #    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/repos.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/repos.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/repos.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/repos.py Fri Nov 18 13:43:05 2022
@@ -2,7 +2,7 @@
 # repos.py: public Python interface for repos components
 #
 # Subversion is a tool for revision control.
-# See http://subversion.apache.org for more information.
+# See https://subversion.apache.org for more information.
 #
 ######################################################################
 #    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/wc.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/wc.py?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/wc.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/python/svn/wc.py Fri Nov 18 13:43:05 2022
@@ -2,7 +2,7 @@
 # wc.py: public Python interface for wc components
 #
 # Subversion is a tool for revision control.
-# See http://subversion.apache.org for more information.
+# See https://subversion.apache.org for more information.
 #
 ######################################################################
 #    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/ruby/svn/util.rb
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/ruby/svn/util.rb?rev=1905381&r1=1905380&r2=1905381&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/ruby/svn/util.rb (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/bindings/swig/ruby/svn/util.rb Fri Nov 18 13:43:05 2022
@@ -20,7 +20,7 @@
 if /cygwin|mingw|mswin32|bccwin32/.match(RUBY_PLATFORM)
   $LOAD_PATH.each do |load_path|
     svn_ext_path = File.join(load_path, "svn", "ext")
-    if File.exists?(svn_ext_path)
+    if File.exist?(svn_ext_path)
       svn_ext_path_win = File.expand_path(svn_ext_path)
       svn_ext_path_win = svn_ext_path.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
       unless ENV["PATH"].split(";").find {|path| path == svn_ext_path_win}