svn commit: r1899342 - /subversion/site/publish/upcoming.part.html

[svn-role]

Author: svn-role
Date: Tue Mar 29 04:15:02 2022
New Revision: 1899342

URL: http://svn.apache.org/viewvc?rev=1899342&view=rev
Log:
* upcoming.part.html: Automatically regenerated

Modified:
subversion/site/publish/upcoming.part.html

Modified: subversion/site/publish/upcoming.part.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1899342&r1=1899341&r2=1899342&view=diff
==
--- subversion/site/publish/upcoming.part.html (original)
+++ subversion/site/publish/upcoming.part.html Tue Mar 29 04:15:02 2022
@@ -2,6 +2,470 @@
 
 Changes in ^/subversion/branches/1.14.x:
 
+https://svn.apache.org/r1877978";>r1877978 | svn-role | 2020-05-21 
04:00:13 + (Thu, 21 May 2020) | 7 lines
+
+Merge https://svn.apache.org/r1877788";>r1877788 from trunk:
+
+ * https://svn.apache.org/r1877788";>r1877788
+   Fix a broken link in a docstring.
+   Votes:
+ +1: danielsh, stsp
+
+
+https://svn.apache.org/r1878211";>r1878211 | svn-role | 2020-05-28 
04:00:12 + (Thu, 28 May 2020) | 10 lines
+
+Merge https://svn.apache.org/r1877072";>r1877072 from trunk:
+
+ * https://svn.apache.org/r1877072";>r1877072
+   svnmucc: Change an error message to state another possible cause of the
+   error.
+   Justification:
+ Error messages should be accurate.  User reported (issue #4854).
+   Votes:
+ +1: danielsh, stsp, jcorvel
+
+
+https://svn.apache.org/r1878213";>r1878213 | svn-role | 2020-05-28 
04:00:16 + (Thu, 28 May 2020) | 11 lines
+
+Merge https://svn.apache.org/r1877259";>r1877259 from trunk:
+
+* https://svn.apache.org/r1877259";>r1877259
+Move variable declarations to the start of block the to fix
+syntax errors with VC9 (Visual Studio 2008).
+  Justification:
+Our code should be C90.
+  Votes:
++1: brane, stsp, jcorvel
++0: danielsh (from dev@)
+
+
+https://svn.apache.org/r1878415";>r1878415 | svn-role | 2020-06-03 
04:00:20 + (Wed, 03 Jun 2020) | 12 lines
+
+Merge the https://svn.apache.org/r1876707";>r1876707 group from 
trunk:
+
+ * https://svn.apache.org/r1876707";>r1876707, https://svn.apache.org/r1876734";>r1876734, https://svn.apache.org/r1877318";>r1877318, https://svn.apache.org/r1877712";>r1877712, https://svn.apache.org/r1878141";>r1878141, https://svn.apache.org/r1878142";>r1878142, https://svn.apache.org/r1878143";>r1878143,
+   https://svn.apache.org/r1878144";>r1878144
+   Various fixes for making the test suite run correctly with Python 3 on
+   Windows. 
+   Justification:
+ Our test suite should test Subversion correctly also on Windows with
+ Python 3
+   Votes:
+ +1: futatuki, jcorvel, stsp
+
+
+https://svn.apache.org/r1879245";>r1879245 | svn-role | 2020-06-27 
04:00:12 + (Sat, 27 Jun 2020) | 11 lines
+
+Merge https://svn.apache.org/r1876662";>r1876662 from trunk:
+
+ * https://svn.apache.org/r1876662";>r1876662
+   Avoid check for SWIG version for Python bindings when --without-swig is
+   passed.
+   Justification:
+ SWIG python bindings should be able to be built without SWIG when we use
+ the release tarball
+   Votes:
+ +1: futatuki, stsp, rhuijben
+
+
+https://svn.apache.org/r1879246";>r1879246 | svn-role | 2020-06-27 
04:00:17 + (Sat, 27 Jun 2020) | 10 lines
+
+Merge https://svn.apache.org/r1876906";>r1876906 from trunk:
+
+ * https://svn.apache.org/r1876906";>r1876906
+   Make gen-make.py --debug work with Python 3
+   Justification:
+ We should also be able to build in Debug configuration with Python 3
+ on Windows.
+   Votes:
+ +1: jcorvel, stsp, rhuijben
+
+
+https://svn.apache.org/r1879797";>r1879797 | svn-role | 2020-07-12 
04:00:12 + (Sun, 12 Jul 2020) | 10 lines
+
+Merge https://svn.apache.org/r1876410";>r1876410 from trunk:
+
+ * https://svn.apache.org/r1876410";>r1876410
+   Fix the .editorconfig stanza for Makefile's.
+   Justification:
+ Make $EDITOR do the right thing on any backport branches we may create
+ off this stabilization branch.
+   Votes:
+ +1: danielsh, stsp, jamessan
+
+
+https://svn.apache.org/r1879798";>r1879798 | svn-role | 2020-07-12 
04:00:17 + (Sun, 12 Jul 2020) | 9 lines
+
+Merge https://svn.apache.org/r1878413";>r1878413 from trunk:
+
+ * https://svn.apache.org/r1878413";>r1878413
+   autogen.sh: Remove per SWIG bindings checked files on release mode.
+   Justification:
+ The release ta

svn commit: r1899341 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_subr/io.c

[svn-role]

Author: svn-role
Date: Tue Mar 29 04:01:20 2022
New Revision: 1899341

URL: http://svn.apache.org/viewvc?rev=1899341&view=rev
Log:
Merge r1883355 from trunk:

 * r1883355
   Use the APR-1.4+ API for flushing file contents to disk.
   Justification:
 Reduce code duplication between APR and SVN.
   Votes:
 +1: brane, jun66j5, markphip

Modified:
subversion/branches/1.14.x/   (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_subr/io.c

Propchange: subversion/branches/1.14.x/
--
  Merged /subversion/trunk:r1883355

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899341&r1=1899340&r2=1899341&view=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Tue Mar 29 04:01:20 2022
@@ -79,13 +79,6 @@ Approved changes:
Votes:
  +1: jamessan, stsp
 
- * r1883355
-   Use the APR-1.4+ API for flushing file contents to disk.
-   Justification:
- Reduce code duplication between APR and SVN.
-   Votes:
- +1: brane, jun66j5, markphip
-
  * r1881534
Fix issue #4864 "build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE"
Justification:

Modified: subversion/branches/1.14.x/subversion/libsvn_subr/io.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_subr/io.c?rev=1899341&r1=1899340&r2=1899341&view=diff
==
--- subversion/branches/1.14.x/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_subr/io.c Tue Mar 29 04:01:20 
2022
@@ -2703,7 +2703,6 @@ svn_io__file_lock_autocreate(const char
 svn_error_t *svn_io_file_flush_to_disk(apr_file_t *file,
apr_pool_t *pool)
 {
-  apr_os_file_t filehand;
   const char *fname;
   apr_status_t apr_err;
 
@@ -2713,49 +2712,21 @@ svn_error_t *svn_io_file_flush_to_disk(a
   if (apr_err)
 return svn_error_wrap_apr(apr_err, _("Can't get file name"));
 
-  /* ### In apr 1.4+ we could delegate most of this function to
- apr_file_sync(). The only major difference is that this doesn't
- contain the retry loop for EINTR on linux. */
-
-  /* First make sure that any user-space buffered data is flushed. */
-  SVN_ERR(svn_io_file_flush(file, pool));
-
-  apr_os_file_get(&filehand, file);
-
-  /* Call the operating system specific function to actually force the
- data to disk. */
-  {
-#ifdef WIN32
-
-if (! FlushFileBuffers(filehand))
-return svn_error_wrap_apr(apr_get_os_error(),
-  _("Can't flush file '%s' to disk"),
-  try_utf8_from_internal_style(fname, pool));
-
-#else
-  int rv;
-
-  do {
-#ifdef F_FULLFSYNC
-rv = fcntl(filehand, F_FULLFSYNC, 0);
-#else
-rv = fsync(filehand);
-#endif
-  } while (rv == -1 && APR_STATUS_IS_EINTR(apr_get_os_error()));
-
-  /* If the file is in a memory filesystem, fsync() may return
- EINVAL.  Presumably the user knows the risks, and we can just
- ignore the error. */
-  if (rv == -1 && APR_STATUS_IS_EINVAL(apr_get_os_error()))
-return SVN_NO_ERROR;
-
-  if (rv == -1)
-return svn_error_wrap_apr(apr_get_os_error(),
-  _("Can't flush file '%s' to disk"),
-  try_utf8_from_internal_style(fname, pool));
+  do {
+apr_err = apr_file_datasync(file);
+  } while(APR_STATUS_IS_EINTR(apr_err));
+
+  /* If the file is in a memory filesystem, fsync() may return
+ EINVAL.  Presumably the user knows the risks, and we can just
+ ignore the error. */
+  if (APR_STATUS_IS_EINVAL(apr_err))
+return SVN_NO_ERROR;
+
+  if (apr_err)
+return svn_error_wrap_apr(apr_err,
+  _("Can't flush file '%s' to disk"),
+  try_utf8_from_internal_style(fname, pool));
 
-#endif
-  }
   return SVN_NO_ERROR;
 }
 

svn commit: r1899340 - in /subversion/branches/1.14.x: ./ STATUS subversion/tests/cmdline/davautocheck.sh

[svn-role]

Author: svn-role
Date: Tue Mar 29 04:01:19 2022
New Revision: 1899340

URL: http://svn.apache.org/viewvc?rev=1899340&view=rev
Log:
Merge r1892121 from trunk:

 * r1892121
   Fix an error message when running make davautocheck.
   Justification:
 davautocheck should work
   Votes:
 +1: dsahlberg, markphip, stsp

Modified:
subversion/branches/1.14.x/   (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh

Propchange: subversion/branches/1.14.x/
--
  Merged /subversion/trunk:r1892121

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899340&r1=1899339&r2=1899340&view=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Tue Mar 29 04:01:19 2022
@@ -79,13 +79,6 @@ Approved changes:
Votes:
  +1: jamessan, stsp
 
- * r1892121
-   Fix an error message when running make davautocheck.
-   Justification:
- davautocheck should work
-   Votes:
- +1: dsahlberg, markphip, stsp
-
  * r1883355
Use the APR-1.4+ API for flushing file contents to disk.
Justification:

Modified: subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh?rev=1899340&r1=1899339&r2=1899340&view=diff
==
--- subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh 
(original)
+++ subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh Tue Mar 
29 04:01:19 2022
@@ -547,10 +547,9 @@ Alias /fsdavroot $ABS_BUILDDIR/subversio
 
 
 __EOF__
-location_common() {
+location_common_without_authz() {
 cat >> "$HTTPD_CFG" <<__EOF__
   DAV   svn
-  AuthzSVNAccessFile 
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
   AuthType  Basic
   AuthName  "Subversion Repository"
   AuthUserFile  $HTTPD_USERS
@@ -560,6 +559,12 @@ cat >> "$HTTPD_CFG" <<__EOF__
   SVNBlockRead  ${BLOCK_READ_SETTING}
 __EOF__
 }
+location_common() {
+location_common_without_authz
+cat >> "$HTTPD_CFG" <<__EOF__
+  AuthzSVNAccessFile 
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
+__EOF__
+}
 location_common
 cat >> "$HTTPD_CFG" <<__EOF__
   SVNParentPath 
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
@@ -612,7 +617,7 @@ cat >> "$HTTPD_CFG" <<__EOF__
 
 
 __EOF__
-location_common
+location_common_without_authz
 cat >> "$HTTPD_CFG" <<__EOF__
   SVNParentPath 
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
   Require   valid-user

svn commit: r1899339 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_repos/authz.c

[svn-role]

Author: svn-role
Date: Tue Mar 29 04:01:18 2022
New Revision: 1899339

URL: http://svn.apache.org/viewvc?rev=1899339&view=rev
Log:
Merge r1894734 from trunk:

 * r1894734
   Fix issue #4880, "Use-after-free of object-pools when running in httpd"
   Justification:
 Subversion should not crash. User complained.
   Votes:
 +1: stsp, hartmannathan, rhuijben

Modified:
subversion/branches/1.14.x/   (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_repos/authz.c

Propchange: subversion/branches/1.14.x/
--
  Merged /subversion/trunk:r1894734

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899339&r1=1899338&r2=1899339&view=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Tue Mar 29 04:01:18 2022
@@ -63,13 +63,6 @@ Veto-blocked changes:
 Approved changes:
 =
 
- * r1894734
-   Fix issue #4880, "Use-after-free of object-pools when running in httpd"
-   Justification:
- Subversion should not crash. User complained.
-   Votes:
- +1: stsp, hartmannathan, rhuijben
-
  * r1899227
 Don't show unreadable copyfrom paths in 'svn log -v' 
 Justification:

Modified: subversion/branches/1.14.x/subversion/libsvn_repos/authz.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_repos/authz.c?rev=1899339&r1=1899338&r2=1899339&view=diff
==
--- subversion/branches/1.14.x/subversion/libsvn_repos/authz.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_repos/authz.c Tue Mar 29 
04:01:18 2022
@@ -130,6 +130,30 @@ static svn_object_pool__t *authz_pool =
 static svn_object_pool__t *filtered_pool = NULL;
 static svn_atomic_t authz_pool_initialized = FALSE;
 
+/*
+ * Ensure that we will initialize authz again if the pool which
+ * our authz caches depend on is cleared.
+ *
+ * HTTPD may run pre/post config hooks multiple times and clear
+ * its global configuration pool which our authz pools depend on.
+ * This happens in a non-threaded context during HTTPD's intialization
+ * and HTTPD's main loop, so it is safe to reset static variables here.
+ * (And any applications which cleared this pool while SVN threads
+ * were running would crash no matter what.)
+ *
+ * See issue #4880, "Use-after-free of object-pools in
+ * subversion/libsvn_repos/authz.c when used as httpd module"
+ */
+static apr_status_t
+deinit_authz(void *data)
+{
+  /* The two object pools run their own cleanup handlers. */
+  authz_pool = NULL;
+  filtered_pool = NULL;
+  authz_pool_initialized = FALSE;
+  return APR_SUCCESS;
+}
+
 /* Implements svn_atomic__err_init_func_t. */
 static svn_error_t *
 synchronized_authz_initialize(void *baton, apr_pool_t *pool)
@@ -143,6 +167,7 @@ synchronized_authz_initialize(void *bato
   SVN_ERR(svn_object_pool__create(&authz_pool, multi_threaded, pool));
   SVN_ERR(svn_object_pool__create(&filtered_pool, multi_threaded, pool));
 
+  apr_pool_cleanup_register(pool, NULL, deinit_authz, apr_pool_cleanup_null);
   return SVN_NO_ERROR;
 }
 

svn commit: r1899338 - in /subversion/branches/1.10.x: ./ STATUS build/ac-macros/swig.m4

[svn-role]

Author: svn-role
Date: Tue Mar 29 04:01:16 2022
New Revision: 1899338

URL: http://svn.apache.org/viewvc?rev=1899338&view=rev
Log:
Merge r1875602 from trunk:

 * r1875602
   Remove incorrect include paths from svn_cv_ruby_includes.
   Justification:
 Fixes building with latest Ruby
   Votes:
 +1: jamessan, stsp, markphip

Modified:
subversion/branches/1.10.x/   (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/build/ac-macros/swig.m4

Propchange: subversion/branches/1.10.x/
--
  Merged /subversion/trunk:r1875602

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899338&r1=1899337&r2=1899338&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Mar 29 04:01:16 2022
@@ -30,10 +30,3 @@ Veto-blocked changes:
 
 Approved changes:
 =
-
- * r1875602
-   Remove incorrect include paths from svn_cv_ruby_includes.
-   Justification:
- Fixes building with latest Ruby
-   Votes:
- +1: jamessan, stsp, markphip

Modified: subversion/branches/1.10.x/build/ac-macros/swig.m4
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/build/ac-macros/swig.m4?rev=1899338&r1=1899337&r2=1899338&view=diff
==
--- subversion/branches/1.10.x/build/ac-macros/swig.m4 (original)
+++ subversion/branches/1.10.x/build/ac-macros/swig.m4 Tue Mar 29 04:01:16 2022
@@ -162,7 +162,7 @@ AC_DEFUN(SVN_FIND_SWIG,
 AC_CACHE_CHECK([for Ruby include path], [svn_cv_ruby_includes],[
 if test -d "$rbconfig_rubyhdrdir"; then
   dnl Ruby >=1.9
-  svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir 
-I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
+  svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir"
   if test -d "$rbconfig_rubyarchhdrdir"; then
 dnl Ruby >=2.0
 svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"

svn commit: r1899337 - /subversion/branches/1.10.x-issue4762/

[svn-role]

Author: svn-role
Date: Tue Mar 29 04:01:15 2022
New Revision: 1899337

URL: http://svn.apache.org/viewvc?rev=1899337&view=rev
Log:
Remove the '1.10.x-issue4762' branch, merged in r1899336.

Removed:
subversion/branches/1.10.x-issue4762/

svn commit: r1899336 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_repos/authz.c subversion/tests/libsvn_repos/authz-test.c

[svn-role]

Author: svn-role
Date: Tue Mar 29 04:00:59 2022
New Revision: 1899336

URL: http://svn.apache.org/viewvc?rev=1899336&view=rev
Log:
Merge the 1.10.x-issue4762 branch:

 * r1835049, r1882326
   Fix issue #4762 "authz doesn't combine global and repository rules"
   Justification:
 Restore behaviour of SVN 1.9: It is now again possible to override
 per-path access rules for specific users (and groups) at the global
 level. Such global rules are overridden by repository-specific rules
 only if both the user and the path match the repository-specific rule.
   Branch: ^/subversion/branches/1.10.x-issue4762
   Votes:
 +1: stsp, jcorvel, markphip

Modified:
subversion/branches/1.10.x/   (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_repos/authz.c
subversion/branches/1.10.x/subversion/tests/libsvn_repos/authz-test.c

Propchange: subversion/branches/1.10.x/
--
  Merged /subversion/trunk:r1835049,1882326
  Merged /subversion/branches/1.10.x-issue4762:r1885788-1899335

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899336&r1=1899335&r2=1899336&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Mar 29 04:00:59 2022
@@ -31,17 +31,6 @@ Veto-blocked changes:
 Approved changes:
 =
 
- * r1835049, r1882326
-   Fix issue #4762 "authz doesn't combine global and repository rules"
-   Justification:
- Restore behaviour of SVN 1.9: It is now again possible to override
- per-path access rules for specific users (and groups) at the global
- level. Such global rules are overridden by repository-specific rules
- only if both the user and the path match the repository-specific rule.
-   Branch: ^/subversion/branches/1.10.x-issue4762
-   Votes:
- +1: stsp, jcorvel, markphip
-
  * r1875602
Remove incorrect include paths from svn_cv_ruby_includes.
Justification:

Modified: subversion/branches/1.10.x/subversion/libsvn_repos/authz.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_repos/authz.c?rev=1899336&r1=1899335&r2=1899336&view=diff
==
--- subversion/branches/1.10.x/subversion/libsvn_repos/authz.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_repos/authz.c Tue Mar 29 
04:00:59 2022
@@ -914,9 +914,7 @@ create_user_authz(authz_full_t *authz,
   /* Use a separate sub-pool to keep memory usage tight. */
   apr_pool_t *subpool = svn_pool_create(scratch_pool);
 
-  /* Find all ACLs for REPOSITORY. 
-   * Note that repo-specific rules replace global rules,
-   * even if they don't apply to the current user. */
+  /* Find all ACLs for REPOSITORY. */
   apr_array_header_t *acls = apr_array_make(subpool, authz->acls->nelts,
 sizeof(authz_acl_t *));
   for (i = 0; i < authz->acls->nelts; ++i)
@@ -933,15 +931,36 @@ create_user_authz(authz_full_t *authz,
 = APR_ARRAY_IDX(acls, acls->nelts - 1, const authz_acl_t *);
   if (svn_authz__compare_paths(&prev_acl->rule, &acl->rule) == 0)
 {
+  svn_boolean_t global_acl_applies;
+  svn_boolean_t repos_acl_applies;
+
+  /* Previous ACL is a global rule. */
   SVN_ERR_ASSERT_NO_RETURN(!strcmp(prev_acl->rule.repos,
AUTHZ_ANY_REPOSITORY));
+  /* Current ACL is a per-repository rule. */
   SVN_ERR_ASSERT_NO_RETURN(strcmp(acl->rule.repos,
   AUTHZ_ANY_REPOSITORY));
-  apr_array_pop(acls);
+
+  global_acl_applies =
+svn_authz__get_acl_access(NULL, prev_acl, user, 
repository);
+  repos_acl_applies =
+svn_authz__get_acl_access(NULL, acl, user, repository);
+
+  /* Prefer rules which apply to both this user and this path
+   * over rules which apply only to the path. In cases where
+   * both rules apply to user and path, always prefer the
+   * repository-specific rule. */
+  if (!global_acl_applies || repos_acl_applies)
+{
+  apr_array_pop(acls);
+  APR_ARRAY_PUSH(acls, const authz_acl_t *) = acl;
+}
 }
+  else
+APR_ARRAY_PUSH(acls, const authz_acl_t *) = acl;
 }
-
-  APR_ARRAY_PUSH(acls, const authz_acl_t *) = acl;
+  else
+APR_ARRAY_PUSH(acls, const authz_acl_t *) = acl;
 }
 }
 

svn commit: r1899335 - /subversion/branches/1.10.x-r1887704/

[svn-role]

Author: svn-role
Date: Tue Mar 29 04:00:56 2022
New Revision: 1899335

URL: http://svn.apache.org/viewvc?rev=1899335&view=rev
Log:
Remove the '1.10.x-r1887704' branch, merged in r1899334.

Removed:
subversion/branches/1.10.x-r1887704/

svn commit: r1899334 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_fs_fs/verify.c subversion/po/sv.po

[svn-role]

Author: svn-role
Date: Tue Mar 29 04:00:41 2022
New Revision: 1899334

URL: http://svn.apache.org/viewvc?rev=1899334&view=rev
Log:
Merge the 1.10.x-r1887704 branch:

 * r1887704
   Follow up to r1866587, r1866588: Unbreak a msgid.
   Justification:
 subversion.pot should be built correctly.
   Branch: ^/subversion/branches/1.10.x-r1887704
   Votes:
 +1: futatuki, stsp, markphip

Modified:
subversion/branches/1.10.x/   (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_fs_fs/verify.c
subversion/branches/1.10.x/subversion/po/sv.po

Propchange: subversion/branches/1.10.x/
--
  Merged /subversion/branches/1.10.x-r1887704:r1887719-1899333
  Merged /subversion/trunk:r1887704

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899334&r1=1899333&r2=1899334&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Mar 29 04:00:41 2022
@@ -31,14 +31,6 @@ Veto-blocked changes:
 Approved changes:
 =
 
- * r1887704
-   Follow up to r1866587, r1866588: Unbreak a msgid.
-   Justification:
- subversion.pot should be built correctly.
-   Branch: ^/subversion/branches/1.10.x-r1887704
-   Votes:
- +1: futatuki, stsp, markphip
-
  * r1835049, r1882326
Fix issue #4762 "authz doesn't combine global and repository rules"
Justification:

Modified: subversion/branches/1.10.x/subversion/libsvn_fs_fs/verify.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_fs_fs/verify.c?rev=1899334&r1=1899333&r2=1899334&view=diff
==
--- subversion/branches/1.10.x/subversion/libsvn_fs_fs/verify.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_fs_fs/verify.c Tue Mar 29 
04:00:41 2022
@@ -691,17 +691,20 @@ compare_p2l_to_rev(svn_fs_t *fs,
* during later stages of the verification process. */
   if (   (entry->type == SVN_FS_FS__ITEM_TYPE_CHANGES)
   != (entry->item.number == SVN_FS_FS__ITEM_INDEX_CHANGES))
-return svn_error_createf(SVN_ERR_FS_INDEX_CORRUPTION,
- NULL,
- _("p2l index entry for changes in"
-   " revision r%ld is item"
-   " %"APR_UINT64_T_FMT
-   " of type %u at offset %s"),
- entry->item.revision,
- entry->item.number,
- (unsigned int)entry->type,
- apr_off_t_toa(pool, offset));
-
+{
+  const char *num_str = apr_psprintf(pool,
+ "%" APR_UINT64_T_FMT,
+ entry->item.number);
+  return svn_error_createf(SVN_ERR_FS_INDEX_CORRUPTION,
+   NULL,
+   _("p2l index entry for changes in"
+ " revision r%ld is item %s"
+ " of type %u at offset %s"),
+   entry->item.revision,
+   num_str,
+   (unsigned int)entry->type,
+   apr_off_t_toa(pool, offset));
+}
   /* Check contents. */
   if (entry->type == SVN_FS_FS__ITEM_TYPE_UNUSED)
 {

Modified: subversion/branches/1.10.x/subversion/po/sv.po
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/po/sv.po?rev=1899334&r1=1899333&r2=1899334&view=diff
==
--- subversion/branches/1.10.x/subversion/po/sv.po [UTF-8] (original)
+++ subversion/branches/1.10.x/subversion/po/sv.po [UTF-8] Tue Mar 29 04:00:41 
2022
@@ -6794,8 +6794,8 @@ msgstr "p2l-indexpost för revision r%ld
 
 #: ../libsvn_fs_fs/verify.c:696
 #, c-format
-msgid "p2l index entry for changes in revision r%ld is item %ld of type %d at 
offset %s"
-msgstr "p2l-indexpost för ändringar i revision r%ld är objekt %ld av typ %d på 
position %s"
+msgid "p2l index entry for changes in revision r%ld is item %s of type %u at 
offset %s"
+msgstr "p2l-indexpost för ändringar i revision r%ld är objekt %s av typ %u på 
position %s"
 
 #: ../libsvn_fs_util/fs-util.c:164
 msgid "Filesystem object has not been opened yet"

svn commit: r1899333 - in /subversion/branches/1.10.x: ./ Makefile.in STATUS

[svn-role]

Author: svn-role
Date: Tue Mar 29 04:00:39 2022
New Revision: 1899333

URL: http://svn.apache.org/viewvc?rev=1899333&view=rev
Log:
Merge r1891908 from trunk:

 * r1891908
   Fix a bug where «make davautocheck» immediately after configure failed
   hard because of an unbuilt dependency.
   Justification:
 Small fix.  Prevents spurious hard fails of 'make davautocheck'.
   Votes:
 +1: danielsh, dsahlberg, markphip

Modified:
subversion/branches/1.10.x/   (props changed)
subversion/branches/1.10.x/Makefile.in
subversion/branches/1.10.x/STATUS

Propchange: subversion/branches/1.10.x/
--
  Merged /subversion/trunk:r1891908

Modified: subversion/branches/1.10.x/Makefile.in
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/Makefile.in?rev=1899333&r1=1899332&r2=1899333&view=diff
==
--- subversion/branches/1.10.x/Makefile.in (original)
+++ subversion/branches/1.10.x/Makefile.in Tue Mar 29 04:00:39 2022
@@ -617,12 +617,12 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
 
 # First, set up Apache as documented in
 # subversion/tests/cmdline/README.
-davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
+davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod mod_dontdothat
@$(MAKE) check BASE_URL=http://localhost
 
 # Automatically configure and run Apache httpd on a random port, and then
 # run make check.
-davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
+davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod mod_dontdothat
@# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the environment.
@APXS=$(APXS) MAKE=$(MAKE) $(SHELL) 
$(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
 

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899333&r1=1899332&r2=1899333&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Mar 29 04:00:39 2022
@@ -31,14 +31,6 @@ Veto-blocked changes:
 Approved changes:
 =
 
- * r1891908
-   Fix a bug where «make davautocheck» immediately after configure failed
-   hard because of an unbuilt dependency.
-   Justification:
- Small fix.  Prevents spurious hard fails of 'make davautocheck'.
-   Votes:
- +1: danielsh, dsahlberg, markphip
-
  * r1887704
Follow up to r1866587, r1866588: Unbreak a msgid.
Justification:

svn commit: r1899332 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_repos/authz.c

[svn-role]

Author: svn-role
Date: Tue Mar 29 04:00:38 2022
New Revision: 1899332

URL: http://svn.apache.org/viewvc?rev=1899332&view=rev
Log:
Merge r1894734 from trunk:

 * r1894734
   Fix issue #4880, "Use-after-free of object-pools when running in httpd"
   Justification:
 Subversion should not crash. User complained.
   Votes:
 +1: stsp, hartmannathan, markphip

Modified:
subversion/branches/1.10.x/   (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_repos/authz.c

Propchange: subversion/branches/1.10.x/
--
  Merged /subversion/trunk:r1894734

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899332&r1=1899331&r2=1899332&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Mar 29 04:00:38 2022
@@ -31,13 +31,6 @@ Veto-blocked changes:
 Approved changes:
 =
 
- * r1894734
-   Fix issue #4880, "Use-after-free of object-pools when running in httpd"
-   Justification:
- Subversion should not crash. User complained.
-   Votes:
- +1: stsp, hartmannathan, markphip
-
  * r1891908
Fix a bug where «make davautocheck» immediately after configure failed
hard because of an unbuilt dependency.

Modified: subversion/branches/1.10.x/subversion/libsvn_repos/authz.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_repos/authz.c?rev=1899332&r1=1899331&r2=1899332&view=diff
==
--- subversion/branches/1.10.x/subversion/libsvn_repos/authz.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_repos/authz.c Tue Mar 29 
04:00:38 2022
@@ -130,6 +130,30 @@ static svn_object_pool__t *authz_pool =
 static svn_object_pool__t *filtered_pool = NULL;
 static svn_atomic_t authz_pool_initialized = FALSE;
 
+/*
+ * Ensure that we will initialize authz again if the pool which
+ * our authz caches depend on is cleared.
+ *
+ * HTTPD may run pre/post config hooks multiple times and clear
+ * its global configuration pool which our authz pools depend on.
+ * This happens in a non-threaded context during HTTPD's intialization
+ * and HTTPD's main loop, so it is safe to reset static variables here.
+ * (And any applications which cleared this pool while SVN threads
+ * were running would crash no matter what.)
+ *
+ * See issue #4880, "Use-after-free of object-pools in
+ * subversion/libsvn_repos/authz.c when used as httpd module"
+ */
+static apr_status_t
+deinit_authz(void *data)
+{
+  /* The two object pools run their own cleanup handlers. */
+  authz_pool = NULL;
+  filtered_pool = NULL;
+  authz_pool_initialized = FALSE;
+  return APR_SUCCESS;
+}
+
 /* Implements svn_atomic__err_init_func_t. */
 static svn_error_t *
 synchronized_authz_initialize(void *baton, apr_pool_t *pool)
@@ -143,6 +167,7 @@ synchronized_authz_initialize(void *bato
   SVN_ERR(svn_object_pool__create(&authz_pool, multi_threaded, pool));
   SVN_ERR(svn_object_pool__create(&filtered_pool, multi_threaded, pool));
 
+  apr_pool_cleanup_register(pool, NULL, deinit_authz, apr_pool_cleanup_null);
   return SVN_NO_ERROR;
 }
 

svn commit: r1899331 - in /subversion/branches/1.10.x: ./ STATUS subversion/tests/cmdline/davautocheck.sh subversion/tests/cmdline/mod_authz_svn_tests.py

[svn-role]

Author: svn-role
Date: Tue Mar 29 04:00:37 2022
New Revision: 1899331

URL: http://svn.apache.org/viewvc?rev=1899331&view=rev
Log:
Merge the r1883838 group from trunk:

 * r1883838, r1883989, r1886460, r1886582, r1892121
   Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref)
   Votes:
 +1: stsp, markphip, dsahlberg

Modified:
subversion/branches/1.10.x/   (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh
subversion/branches/1.10.x/subversion/tests/cmdline/mod_authz_svn_tests.py

Propchange: subversion/branches/1.10.x/
--
  Merged /subversion/trunk:r1883838,1883989,1886460,1886582,1892121

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899331&r1=1899330&r2=1899331&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Mar 29 04:00:37 2022
@@ -31,11 +31,6 @@ Veto-blocked changes:
 Approved changes:
 =
 
- * r1883838, r1883989, r1886460, r1886582, r1892121
-   Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref)
-   Votes:
- +1: stsp, markphip, dsahlberg
-
  * r1894734
Fix issue #4880, "Use-after-free of object-pools when running in httpd"
Justification:

Modified: subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh?rev=1899331&r1=1899330&r2=1899331&view=diff
==
--- subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh 
(original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/davautocheck.sh Tue Mar 
29 04:00:37 2022
@@ -527,10 +527,9 @@ CustomLog   "$HTTPD_ROOT/ops" "%
 
 
 __EOF__
-location_common() {
+location_common_without_authz() {
 cat >> "$HTTPD_CFG" <<__EOF__
   DAV   svn
-  AuthzSVNAccessFile 
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
   AuthType  Basic
   AuthName  "Subversion Repository"
   AuthUserFile  $HTTPD_USERS
@@ -540,6 +539,12 @@ cat >> "$HTTPD_CFG" <<__EOF__
   SVNBlockRead  ${BLOCK_READ_SETTING}
 __EOF__
 }
+location_common() {
+location_common_without_authz
+cat >> "$HTTPD_CFG" <<__EOF__
+  AuthzSVNAccessFile 
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
+__EOF__
+}
 location_common
 cat >> "$HTTPD_CFG" <<__EOF__
   SVNParentPath 
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
@@ -582,6 +587,15 @@ cat >> "$HTTPD_CFG" <<__EOF__
   
   ${SVN_PATH_AUTHZ_LINE}
 
+
+__EOF__
+location_common_without_authz
+cat >> "$HTTPD_CFG" <<__EOF__
+  SVNParentPath 
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
+  Require   valid-user
+  Satisfy Any
+  AuthzSVNReposRelativeAccessFile "^/authz"
+
 
 __EOF__
 location_common

Modified: 
subversion/branches/1.10.x/subversion/tests/cmdline/mod_authz_svn_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/mod_authz_svn_tests.py?rev=1899331&r1=1899330&r2=1899331&view=diff
==
--- subversion/branches/1.10.x/subversion/tests/cmdline/mod_authz_svn_tests.py 
(original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/mod_authz_svn_tests.py 
Tue Mar 29 04:00:37 2022
@@ -25,7 +25,7 @@
 ##
 
 # General modules
-import os, re, logging
+import os, re, logging, shutil
 
 logger = logging.getLogger()
 
@@ -1043,6 +1043,73 @@ def authn_sallrall(sbox):
   verify_gets(test_area_url, sallrall_tests)
 
 
+@SkipUnless(svntest.main.is_ra_type_dav)
+def repos_relative_access_file(sbox):
+  "repos-relative access file"
+
+  sbox.build()
+
+  test_area_url = sbox.repo_url.replace('/svn-test-work/repositories/',
+'/authz-test-work/in-repos-authz/')
+
+  svntest.main.write_authz_file(sbox, {"/": "", "/A": "%s = rw" % user1})
+  shutil.move(sbox.authz_file, os.path.join(sbox.wc_dir, 'authz'))
+  sbox.simple_add('authz')
+  svntest.actions.run_and_verify_svn(None, [], 'relocate',
+  sbox.file_protocol_repo_url(), sbox.wc_dir)
+  sbox.simple_commit(message="adding in-repository authz rules file")
+
+  in_repos_authz_tests = (
+ { 'path': '', 'status': 401, },
+ { 'path': '/authz', 'status': 401, },
+ { 'path': '/authz', 'user' : user1, 'pw' : user1_pass,
+   'status': 403, },
+ { 'path': '/A', 'user' : user1, 'pw' : user1_pass,
+   'status': 301, },
+ { 'path': '/A/', 'user' : user1, 'pw' :

svn commit: r1899330 - /subversion/branches/1.10.x-r1899227/

[svn-role]

Author: svn-role
Date: Tue Mar 29 04:00:35 2022
New Revision: 1899330

URL: http://svn.apache.org/viewvc?rev=1899330&view=rev
Log:
Remove the '1.10.x-r1899227' branch, merged in r1899329.

Removed:
subversion/branches/1.10.x-r1899227/

svn commit: r1899329 - in /subversion/branches/1.10.x: ./ STATUS subversion/libsvn_repos/log.c subversion/tests/cmdline/authz_tests.py

[svn-role]

Author: svn-role
Date: Tue Mar 29 04:00:19 2022
New Revision: 1899329

URL: http://svn.apache.org/viewvc?rev=1899329&view=rev
Log:
Merge the 1.10.x-r1899227 branch:

 * r1899227
   Don't show unreadable copyfrom paths in 'svn log -v' 
   Justification:
 Makes 'svn log -v' consistent with spec.
   Branch:
 1.10.x-r1899227
   Votes:
 +1: hartmannathan, dsahlberg, stsp

Modified:
subversion/branches/1.10.x/   (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_repos/log.c
subversion/branches/1.10.x/subversion/tests/cmdline/authz_tests.py

Propchange: subversion/branches/1.10.x/
--
  Merged /subversion/branches/1.10.x-r1899227:r1899231-1899328
  Merged /subversion/trunk:r1899227

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899329&r1=1899328&r2=1899329&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Mar 29 04:00:19 2022
@@ -31,15 +31,6 @@ Veto-blocked changes:
 Approved changes:
 =
 
- * r1899227
-   Don't show unreadable copyfrom paths in 'svn log -v' 
-   Justification:
- Makes 'svn log -v' consistent with spec.
-   Branch:
- 1.10.x-r1899227
-   Votes:
- +1: hartmannathan, dsahlberg, stsp
-
  * r1883838, r1883989, r1886460, r1886582, r1892121
Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref)
Votes:

Modified: subversion/branches/1.10.x/subversion/libsvn_repos/log.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_repos/log.c?rev=1899329&r1=1899328&r2=1899329&view=diff
==
--- subversion/branches/1.10.x/subversion/libsvn_repos/log.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_repos/log.c Tue Mar 29 
04:00:19 2022
@@ -337,42 +337,36 @@ detect_changed(svn_repos_revision_access
   if (   (change->change_kind == svn_fs_path_change_add)
   || (change->change_kind == svn_fs_path_change_replace))
 {
-  const char *copyfrom_path = change->copyfrom_path;
-  svn_revnum_t copyfrom_rev = change->copyfrom_rev;
-
   /* the following is a potentially expensive operation since on FSFS
  we will follow the DAG from ROOT to PATH and that requires
  actually reading the directories along the way. */
   if (!change->copyfrom_known)
 {
-  SVN_ERR(svn_fs_copied_from(©from_rev, ©from_path,
+  SVN_ERR(svn_fs_copied_from(&change->copyfrom_rev, 
&change->copyfrom_path,
 root, path, iterpool));
   change->copyfrom_known = TRUE;
 }
 
-  if (copyfrom_path && SVN_IS_VALID_REVNUM(copyfrom_rev))
+  if (change->copyfrom_path && 
SVN_IS_VALID_REVNUM(change->copyfrom_rev))
 {
-  svn_boolean_t readable = TRUE;
-
   if (callbacks->authz_read_func)
 {
   svn_fs_root_t *copyfrom_root;
+  svn_boolean_t readable;
 
   SVN_ERR(svn_fs_revision_root(©from_root, fs,
-   copyfrom_rev, iterpool));
+   change->copyfrom_rev, 
iterpool));
   SVN_ERR(callbacks->authz_read_func(&readable,
  copyfrom_root,
- copyfrom_path,
+ change->copyfrom_path,
  
callbacks->authz_read_baton,
  iterpool));
   if (! readable)
-found_unreadable = TRUE;
-}
-
-  if (readable)
-{
-  change->copyfrom_path = copyfrom_path;
-  change->copyfrom_rev = copyfrom_rev;
+{
+  found_unreadable = TRUE;
+  change->copyfrom_path = NULL;
+  change->copyfrom_rev = SVN_INVALID_REVNUM;
+}
 }
 }
 }

Modified: subversion/branches/1.10.x/subversion/tests/cmdline/authz_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/authz_tests.py?rev=1899329&r1=1899328&r2=1899329&view=diff
==
--- subversion/branches/1.10.x/subversion/tests/cmdline/authz_tests.py 
(original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/authz_tests.py Tue Mar 
29 04:00:19 2022
@@ -1710,6 +1710,60 @@ def

svn commit: r1899328 - /subversion/site/staging/faq.html

[hartmannathan]

Author: hartmannathan
Date: Tue Mar 29 02:57:55 2022
New Revision: 1899328

URL: http://svn.apache.org/viewvc?rev=1899328&view=rev
Log:
In site/staging:

* faq.html:
  (#general-questions -> collab): Fix spelling error (s/payed/paid/).


Modified:
subversion/site/staging/faq.html

Modified: subversion/site/staging/faq.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging/faq.html?rev=1899328&r1=1899327&r2=1899328&view=diff
==
--- subversion/site/staging/faq.html (original)
+++ subversion/site/staging/faq.html Tue Mar 29 02:57:55 2022
@@ -321,7 +321,7 @@ See Quick Start
 
 No, Subversion is open source / free software.  Several companies
-(CollabNet, WANdisco, VisualSVN, elego, ...) pay or have payed the salaries
+(CollabNet, WANdisco, VisualSVN, elego, ...) pay or have paid the salaries
 of some full-time developers, but the
 software carries an https://www.apache.org/licenses/LICENSE-2.0";
 >Apache License which is fully compliant with

Re: svn commit: r1899324 - /subversion/site/publish/upcoming.part.html

[Daniel Sahlberg]

Den mån 28 mars 2022 kl 22:04 skrev Mark Phippard :

> What is this file used for? Is it displayed on the website somewhere?
>

Yes, it is included in the release-notes page (via an SSI #include):
https://subversion.apache.org/docs/release-notes/

It is just showing merged changes since the last release? So I guess
> could help us write CHANGES?
>

Yes, it should only show merged changes since last release. It didn't work
properly and showed changes since 1.14.0 but I hope it should be alright
now. It is generated by site/tools/generate-upcoming-changes-log.sh (you
should be able to run it locally, but make sure that `cwd` is in the 1.14.x
branch). And yes, it would probably be a good starting point for CHANGES.

/Daniel

Re: svn commit: r1899324 - /subversion/site/publish/upcoming.part.html

[Mark Phippard]

What is this file used for? Is it displayed on the website somewhere?

It is just showing merged changes since the last release? So I guess
could help us write CHANGES?

Mark


On Mon, Mar 28, 2022 at 4:01 PM Daniel Sahlberg
 wrote:
>
> Once again I've executed this manually to make sure it correctly reflects the 
> upcoming changes between 1.14.1 and 1.14.2. I hope infra will be able to 
> merge my PR before 04.00Z tomorrow when the cronjobs are executed.
>
> Den mån 28 mars 2022 kl 21:56 skrev :
>>
>> Author: svn-role
>> Date: Mon Mar 28 19:56:19 2022
>> New Revision: 1899324
>>
>> URL: http://svn.apache.org/viewvc?rev=1899324&view=rev
>> Log:
>> * upcoming.part.html: Automatically regenerated
>>
>> Modified:
>> subversion/site/publish/upcoming.part.html
>>
>> Modified: subversion/site/publish/upcoming.part.html
>> URL: 
>> http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1899324&r1=1899323&r2=1899324&view=diff
>> ==
>> --- subversion/site/publish/upcoming.part.html (original)
>> +++ subversion/site/publish/upcoming.part.html Mon Mar 28 19:56:19 2022
>> @@ -2,470 +2,6 @@
>>  
>>  Changes in ^/subversion/branches/1.14.x:
>>  
>> -https://svn.apache.org/r1877978";>r1877978 | svn-role | 
>> 2020-05-21 04:00:13 + (Thu, 21 May 2020) | 7 lines
>> -
>> -Merge https://svn.apache.org/r1877788";>r1877788 from trunk:
>> -
>> - * https://svn.apache.org/r1877788";>r1877788
>> -   Fix a broken link in a docstring.
>> -   Votes:
>> - +1: danielsh, stsp
>> -
>> -
>> -https://svn.apache.org/r1878211";>r1878211 | svn-role | 
>> 2020-05-28 04:00:12 + (Thu, 28 May 2020) | 10 lines
>> -
>> -Merge https://svn.apache.org/r1877072";>r1877072 from trunk:
>> -
>> - * https://svn.apache.org/r1877072";>r1877072
>> -   svnmucc: Change an error message to state another possible cause of the
>> -   error.
>> -   Justification:
>> - Error messages should be accurate.  User reported (> href="/issue-4854">issue #4854).
>> -   Votes:
>> - +1: danielsh, stsp, jcorvel
>> -
>> -
>> -https://svn.apache.org/r1878213";>r1878213 | svn-role | 
>> 2020-05-28 04:00:16 + (Thu, 28 May 2020) | 11 lines
>> -
>> -Merge https://svn.apache.org/r1877259";>r1877259 from trunk:
>> -
>> -* https://svn.apache.org/r1877259";>r1877259
>> -Move variable declarations to the start of block the to fix
>> -syntax errors with VC9 (Visual Studio 2008).
>> -  Justification:
>> -Our code should be C90.
>> -  Votes:
>> -+1: brane, stsp, jcorvel
>> -+0: danielsh (from dev@)
>> -
>> -
>> -https://svn.apache.org/r1878415";>r1878415 | svn-role | 
>> 2020-06-03 04:00:20 + (Wed, 03 Jun 2020) | 12 lines
>> -
>> -Merge the https://svn.apache.org/r1876707";>r1876707 group from 
>> trunk:
>> -
>> - * https://svn.apache.org/r1876707";>r1876707, > href="https://svn.apache.org/r1876734";>r1876734, > href="https://svn.apache.org/r1877318";>r1877318, > href="https://svn.apache.org/r1877712";>r1877712, > href="https://svn.apache.org/r1878141";>r1878141, > href="https://svn.apache.org/r1878142";>r1878142, > href="https://svn.apache.org/r1878143";>r1878143,
>> -   https://svn.apache.org/r1878144";>r1878144
>> -   Various fixes for making the test suite run correctly with Python 3 on
>> -   Windows.
>> -   Justification:
>> - Our test suite should test Subversion correctly also on Windows with
>> - Python 3
>> -   Votes:
>> - +1: futatuki, jcorvel, stsp
>> -
>> -
>> -https://svn.apache.org/r1879245";>r1879245 | svn-role | 
>> 2020-06-27 04:00:12 + (Sat, 27 Jun 2020) | 11 lines
>> -
>> -Merge https://svn.apache.org/r1876662";>r1876662 from trunk:
>> -
>> - * https://svn.apache.org/r1876662";>r1876662
>> -   Avoid check for SWIG version for Python bindings when --without-swig is
>> -   passed.
>> -   Justification:
>> - SWIG python bindings should be able to be built without SWIG when we 
>> use
>> - the release tarball
>> -   Votes:
>> - +1: futatuki, stsp, rhuijben
>> -
>> -
>> -https://svn.apache.org/r1879246";>r1879246 | svn-role | 
>> 2020-06-27 04:00:17 + (Sat, 27 Jun 2020) | 10 lines
>> -
>> -Merge https://svn.apache.org/r1876906";>r1876906 from trunk:
>> -
>> - * https://svn.apache.org/r1876906";>r1876906
>> -   Make gen-make.py --debug work with Python 3
>> -   Justification:
>> - We should also be able to build in Debug configuration with Python 3
>> - on Windows.
>> -   Votes:
>> - +1: jcorvel, stsp, rhuijben
>> -
>> --

Re: svn commit: r1899324 - /subversion/site/publish/upcoming.part.html

[Daniel Sahlberg]

Once again I've executed this manually to make sure it correctly reflects
the upcoming changes between 1.14.1 and 1.14.2. I hope infra will be able
to merge my PR before 04.00Z tomorrow when the cronjobs are executed.

Den mån 28 mars 2022 kl 21:56 skrev :

> Author: svn-role
> Date: Mon Mar 28 19:56:19 2022
> New Revision: 1899324
>
> URL: http://svn.apache.org/viewvc?rev=1899324&view=rev
> Log:
> * upcoming.part.html: Automatically regenerated
>
> Modified:
> subversion/site/publish/upcoming.part.html
>
> Modified: subversion/site/publish/upcoming.part.html
> URL:
> http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1899324&r1=1899323&r2=1899324&view=diff
>
> ==
> --- subversion/site/publish/upcoming.part.html (original)
> +++ subversion/site/publish/upcoming.part.html Mon Mar 28 19:56:19 2022
> @@ -2,470 +2,6 @@
>  
>  Changes in ^/subversion/branches/1.14.x:
>  
> -https://svn.apache.org/r1877978";>r1877978 | svn-role |
> 2020-05-21 04:00:13 + (Thu, 21 May 2020) | 7 lines
> -
> -Merge https://svn.apache.org/r1877788";>r1877788 from trunk:
> -
> - * https://svn.apache.org/r1877788";>r1877788
> -   Fix a broken link in a docstring.
> -   Votes:
> - +1: danielsh, stsp
> -
> -
> -https://svn.apache.org/r1878211";>r1878211 | svn-role |
> 2020-05-28 04:00:12 + (Thu, 28 May 2020) | 10 lines
> -
> -Merge https://svn.apache.org/r1877072";>r1877072 from trunk:
> -
> - * https://svn.apache.org/r1877072";>r1877072
> -   svnmucc: Change an error message to state another possible cause of the
> -   error.
> -   Justification:
> - Error messages should be accurate.  User reported ( href="/issue-4854">issue #4854).
> -   Votes:
> - +1: danielsh, stsp, jcorvel
> -
> -
> -https://svn.apache.org/r1878213";>r1878213 | svn-role |
> 2020-05-28 04:00:16 + (Thu, 28 May 2020) | 11 lines
> -
> -Merge https://svn.apache.org/r1877259";>r1877259 from trunk:
> -
> -* https://svn.apache.org/r1877259";>r1877259
> -Move variable declarations to the start of block the to fix
> -syntax errors with VC9 (Visual Studio 2008).
> -  Justification:
> -Our code should be C90.
> -  Votes:
> -+1: brane, stsp, jcorvel
> -+0: danielsh (from dev@)
> -
> -
> -https://svn.apache.org/r1878415";>r1878415 | svn-role |
> 2020-06-03 04:00:20 + (Wed, 03 Jun 2020) | 12 lines
> -
> -Merge the https://svn.apache.org/r1876707";>r1876707 group
> from trunk:
> -
> - * https://svn.apache.org/r1876707";>r1876707, https://svn.apache.org/r1876734";>r1876734, https://svn.apache.org/r1877318";>r1877318, https://svn.apache.org/r1877712";>r1877712, https://svn.apache.org/r1878141";>r1878141, https://svn.apache.org/r1878142";>r1878142, https://svn.apache.org/r1878143";>r1878143,
> -   https://svn.apache.org/r1878144";>r1878144
> -   Various fixes for making the test suite run correctly with Python 3 on
> -   Windows.
> -   Justification:
> - Our test suite should test Subversion correctly also on Windows with
> - Python 3
> -   Votes:
> - +1: futatuki, jcorvel, stsp
> -
> -
> -https://svn.apache.org/r1879245";>r1879245 | svn-role |
> 2020-06-27 04:00:12 + (Sat, 27 Jun 2020) | 11 lines
> -
> -Merge https://svn.apache.org/r1876662";>r1876662 from trunk:
> -
> - * https://svn.apache.org/r1876662";>r1876662
> -   Avoid check for SWIG version for Python bindings when --without-swig is
> -   passed.
> -   Justification:
> - SWIG python bindings should be able to be built without SWIG when we
> use
> - the release tarball
> -   Votes:
> - +1: futatuki, stsp, rhuijben
> -
> -
> -https://svn.apache.org/r1879246";>r1879246 | svn-role |
> 2020-06-27 04:00:17 + (Sat, 27 Jun 2020) | 10 lines
> -
> -Merge https://svn.apache.org/r1876906";>r1876906 from trunk:
> -
> - * https://svn.apache.org/r1876906";>r1876906
> -   Make gen-make.py --debug work with Python 3
> -   Justification:
> - We should also be able to build in Debug configuration with Python 3
> - on Windows.
> -   Votes:
> - +1: jcorvel, stsp, rhuijben
> -
> -
> -https://svn.apache.org/r1879797";>r1879797 | svn-role |
> 2020-07-12 04:00:12 + (Sun, 12 Jul 2020) | 10 lines
> -
> -Merge https://svn.apache.org/r1876410";>r1876410 from trunk:
> -
> - * https://svn.apache.org/r1876410";>r1876410
> -   Fix the .editorconfig stanza for Makefile's.
> -   Justification:
> - Make $EDITOR do the right thing on any backport branches we may
> 

svn commit: r1899324 - /subversion/site/publish/upcoming.part.html

[svn-role]

Author: svn-role
Date: Mon Mar 28 19:56:19 2022
New Revision: 1899324

URL: http://svn.apache.org/viewvc?rev=1899324&view=rev
Log:
* upcoming.part.html: Automatically regenerated

Modified:
subversion/site/publish/upcoming.part.html

Modified: subversion/site/publish/upcoming.part.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1899324&r1=1899323&r2=1899324&view=diff
==
--- subversion/site/publish/upcoming.part.html (original)
+++ subversion/site/publish/upcoming.part.html Mon Mar 28 19:56:19 2022
@@ -2,470 +2,6 @@
 
 Changes in ^/subversion/branches/1.14.x:
 
-https://svn.apache.org/r1877978";>r1877978 | svn-role | 2020-05-21 
04:00:13 + (Thu, 21 May 2020) | 7 lines
-
-Merge https://svn.apache.org/r1877788";>r1877788 from trunk:
-
- * https://svn.apache.org/r1877788";>r1877788
-   Fix a broken link in a docstring.
-   Votes:
- +1: danielsh, stsp
-
-
-https://svn.apache.org/r1878211";>r1878211 | svn-role | 2020-05-28 
04:00:12 + (Thu, 28 May 2020) | 10 lines
-
-Merge https://svn.apache.org/r1877072";>r1877072 from trunk:
-
- * https://svn.apache.org/r1877072";>r1877072
-   svnmucc: Change an error message to state another possible cause of the
-   error.
-   Justification:
- Error messages should be accurate.  User reported (issue #4854).
-   Votes:
- +1: danielsh, stsp, jcorvel
-
-
-https://svn.apache.org/r1878213";>r1878213 | svn-role | 2020-05-28 
04:00:16 + (Thu, 28 May 2020) | 11 lines
-
-Merge https://svn.apache.org/r1877259";>r1877259 from trunk:
-
-* https://svn.apache.org/r1877259";>r1877259
-Move variable declarations to the start of block the to fix
-syntax errors with VC9 (Visual Studio 2008).
-  Justification:
-Our code should be C90.
-  Votes:
-+1: brane, stsp, jcorvel
-+0: danielsh (from dev@)
-
-
-https://svn.apache.org/r1878415";>r1878415 | svn-role | 2020-06-03 
04:00:20 + (Wed, 03 Jun 2020) | 12 lines
-
-Merge the https://svn.apache.org/r1876707";>r1876707 group from 
trunk:
-
- * https://svn.apache.org/r1876707";>r1876707, https://svn.apache.org/r1876734";>r1876734, https://svn.apache.org/r1877318";>r1877318, https://svn.apache.org/r1877712";>r1877712, https://svn.apache.org/r1878141";>r1878141, https://svn.apache.org/r1878142";>r1878142, https://svn.apache.org/r1878143";>r1878143,
-   https://svn.apache.org/r1878144";>r1878144
-   Various fixes for making the test suite run correctly with Python 3 on
-   Windows. 
-   Justification:
- Our test suite should test Subversion correctly also on Windows with
- Python 3
-   Votes:
- +1: futatuki, jcorvel, stsp
-
-
-https://svn.apache.org/r1879245";>r1879245 | svn-role | 2020-06-27 
04:00:12 + (Sat, 27 Jun 2020) | 11 lines
-
-Merge https://svn.apache.org/r1876662";>r1876662 from trunk:
-
- * https://svn.apache.org/r1876662";>r1876662
-   Avoid check for SWIG version for Python bindings when --without-swig is
-   passed.
-   Justification:
- SWIG python bindings should be able to be built without SWIG when we use
- the release tarball
-   Votes:
- +1: futatuki, stsp, rhuijben
-
-
-https://svn.apache.org/r1879246";>r1879246 | svn-role | 2020-06-27 
04:00:17 + (Sat, 27 Jun 2020) | 10 lines
-
-Merge https://svn.apache.org/r1876906";>r1876906 from trunk:
-
- * https://svn.apache.org/r1876906";>r1876906
-   Make gen-make.py --debug work with Python 3
-   Justification:
- We should also be able to build in Debug configuration with Python 3
- on Windows.
-   Votes:
- +1: jcorvel, stsp, rhuijben
-
-
-https://svn.apache.org/r1879797";>r1879797 | svn-role | 2020-07-12 
04:00:12 + (Sun, 12 Jul 2020) | 10 lines
-
-Merge https://svn.apache.org/r1876410";>r1876410 from trunk:
-
- * https://svn.apache.org/r1876410";>r1876410
-   Fix the .editorconfig stanza for Makefile's.
-   Justification:
- Make $EDITOR do the right thing on any backport branches we may create
- off this stabilization branch.
-   Votes:
- +1: danielsh, stsp, jamessan
-
-
-https://svn.apache.org/r1879798";>r1879798 | svn-role | 2020-07-12 
04:00:17 + (Sun, 12 Jul 2020) | 9 lines
-
-Merge https://svn.apache.org/r1878413";>r1878413 from trunk:
-
- * https://svn.apache.org/r1878413";>r1878413
-   autogen.sh: Remove per SWIG bindings checked files on release mode.
-   Justification:
- The release ta

Re: svn commit: r1899276 - /subversion/site/publish/upcoming.part.html

[Daniel Sahlberg]

Den mån 28 mars 2022 kl 09:55 skrev Daniel Sahlberg <
daniel.l.sahlb...@gmail.com>:

> This commit doesn't look correct.
>
> I executed the generate-upcoming-changes-log.sh manually yesterday and it
> created r1899244, removing a lot of log entries belonging to 1.14.1. This
> commit (which was executed by cron) restores them.
>
> The crontab entry is:
> [[[
> # Puppet Name: Update our upcoming changes list
> SVN=svn
> 15 4 * * * chronic ~/src/svn/site/tools/generate-upcoming-changes-log.sh
> ]]]
>
> The script begins with a comment
> [[[
> # This should be run from the root of a branches/1.{9,10,11}.x working
> copy.
> ]]]
>
> I suppose the crontab command should be changed to:
> cd ~/src/svn/1.14.x && chronic
> ~/src/svn/site/tools/generate-upcoming-changes-log.sh
>

So I've investigated this further and my initial analysis seems correct.

This is what happens:
* generate-upcoming-changes-log.sh determines last patch release number and
generates upcoming.part.html based on all commits since that patch release
was tagged.
* It has two different ways to determine "the last patch release":
   * If `cwd` is a WC it look in the subversion/include/svn_version.h
   * Else look in https://dist.apache.org/repos/dist/release/subversion/
* The logic looking at dists.a.o selected the oldest patch release
available on dists.a.o, in case there are more than one.
* The crontab entry executed generate-upcoming-changes-log.sh from ~, thus
forcing a lookup from dists.a.o

Currently, both 1.14.0 and 1.14.1 are available on dists.a.o. Thus it
emitted all merged changes since 1.14.0, while expected behaviour (of
upcoming.part.html) would be to only display merged changes since 1.14.1.

I've pushed a change in puppet to the crontab entry as suggested above.
This should solve the problem for now. When branching 1.15.x, we need to
update this crontab entry.

I don't have time right now to look at generating separate
upcoming.$VERSION.part.html files for the supported versions, but I will
leave it on the todo list.

/Daniel

svn commit: r1899319 - /subversion/branches/1.10.x/STATUS

[markphip]

Author: markphip
Date: Mon Mar 28 14:51:07 2022
New Revision: 1899319

URL: http://svn.apache.org/viewvc?rev=1899319&view=rev
Log:
* STATUS: Vote for r1875602, approving

Modified:
subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899319&r1=1899318&r2=1899319&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Mar 28 14:51:07 2022
@@ -25,13 +25,6 @@ Candidate changes:
  +1: stsp
  +1: julianfoad (without r1875188,r1875189)
 
- * r1875602
-   Remove incorrect include paths from svn_cv_ruby_includes.
-   Justification:
- Fixes building with latest Ruby
-   Votes:
- +1: jamessan, stsp
-
 Veto-blocked changes:
 =
 
@@ -86,3 +79,9 @@ Approved changes:
Votes:
  +1: stsp, jcorvel, markphip
 
+ * r1875602
+   Remove incorrect include paths from svn_cv_ruby_includes.
+   Justification:
+ Fixes building with latest Ruby
+   Votes:
+ +1: jamessan, stsp, markphip

svn commit: r1899318 - /subversion/branches/1.10.x/STATUS

[markphip]

Author: markphip
Date: Mon Mar 28 14:49:54 2022
New Revision: 1899318

URL: http://svn.apache.org/viewvc?rev=1899318&view=rev
Log:
* STATUS: Vote for r1835049, r1882326, approving

Modified:
subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899318&r1=1899317&r2=1899318&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Mar 28 14:49:54 2022
@@ -32,17 +32,6 @@ Candidate changes:
Votes:
  +1: jamessan, stsp
 
- * r1835049, r1882326
-   Fix issue #4762 "authz doesn't combine global and repository rules"
-   Justification:
- Restore behaviour of SVN 1.9: It is now again possible to override
- per-path access rules for specific users (and groups) at the global
- level. Such global rules are overridden by repository-specific rules
- only if both the user and the path match the repository-specific rule.
-   Branch: ^/subversion/branches/1.10.x-issue4762
-   Votes:
- +1: stsp, jcorvel
-
 Veto-blocked changes:
 =
 
@@ -86,3 +75,14 @@ Approved changes:
Votes:
  +1: futatuki, stsp, markphip
 
+ * r1835049, r1882326
+   Fix issue #4762 "authz doesn't combine global and repository rules"
+   Justification:
+ Restore behaviour of SVN 1.9: It is now again possible to override
+ per-path access rules for specific users (and groups) at the global
+ level. Such global rules are overridden by repository-specific rules
+ only if both the user and the path match the repository-specific rule.
+   Branch: ^/subversion/branches/1.10.x-issue4762
+   Votes:
+ +1: stsp, jcorvel, markphip
+

svn commit: r1899317 - /subversion/branches/1.10.x/STATUS

[markphip]

Author: markphip
Date: Mon Mar 28 14:48:19 2022
New Revision: 1899317

URL: http://svn.apache.org/viewvc?rev=1899317&view=rev
Log:
* STATUS: Vote for r1887704, approving

Modified:
subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899317&r1=1899316&r2=1899317&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Mar 28 14:48:19 2022
@@ -43,14 +43,6 @@ Candidate changes:
Votes:
  +1: stsp, jcorvel
 
-  * r1887704
-   Follow up to r1866587, r1866588: Unbreak a msgid.
-   Justification:
- subversion.pot should be built correctly.
-   Branch: ^/subversion/branches/1.10.x-r1887704
-   Votes:
- +1: futatuki, stsp
-
 Veto-blocked changes:
 =
 
@@ -86,3 +78,11 @@ Approved changes:
Votes:
  +1: danielsh, dsahlberg, markphip
 
+ * r1887704
+   Follow up to r1866587, r1866588: Unbreak a msgid.
+   Justification:
+ subversion.pot should be built correctly.
+   Branch: ^/subversion/branches/1.10.x-r1887704
+   Votes:
+ +1: futatuki, stsp, markphip
+

svn commit: r1899316 - /subversion/branches/1.10.x/STATUS

[markphip]

Author: markphip
Date: Mon Mar 28 14:45:17 2022
New Revision: 1899316

URL: http://svn.apache.org/viewvc?rev=1899316&view=rev
Log:
* STATUS: Vote for r1891908, approving

Modified:
subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899316&r1=1899315&r2=1899316&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Mar 28 14:45:17 2022
@@ -51,14 +51,6 @@ Candidate changes:
Votes:
  +1: futatuki, stsp
 
- * r1891908
-   Fix a bug where «make davautocheck» immediately after configure failed
-   hard because of an unbuilt dependency.
-   Justification:
- Small fix.  Prevents spurious hard fails of 'make davautocheck'.
-   Votes:
- +1: danielsh, dsahlberg
-
 Veto-blocked changes:
 =
 
@@ -79,9 +71,18 @@ Approved changes:
Votes:
  +1: stsp, markphip, dsahlberg
 
-  * r1894734
-Fix issue #4880, "Use-after-free of object-pools when running in httpd"
-Justification:
-  Subversion should not crash. User complained.
-Votes:
-  +1: stsp, hartmannathan, markphip
+ * r1894734
+   Fix issue #4880, "Use-after-free of object-pools when running in httpd"
+   Justification:
+ Subversion should not crash. User complained.
+   Votes:
+ +1: stsp, hartmannathan, markphip
+
+ * r1891908
+   Fix a bug where «make davautocheck» immediately after configure failed
+   hard because of an unbuilt dependency.
+   Justification:
+ Small fix.  Prevents spurious hard fails of 'make davautocheck'.
+   Votes:
+ +1: danielsh, dsahlberg, markphip
+

svn commit: r1899315 - /subversion/branches/1.10.x/STATUS

[markphip]

Author: markphip
Date: Mon Mar 28 14:43:41 2022
New Revision: 1899315

URL: http://svn.apache.org/viewvc?rev=1899315&view=rev
Log:
* STATUS: Vote for r1894734, approving

Modified:
subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899315&r1=1899314&r2=1899315&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Mar 28 14:43:41 2022
@@ -59,13 +59,6 @@ Candidate changes:
Votes:
  +1: danielsh, dsahlberg
 
-  * r1894734
-Fix issue #4880, "Use-after-free of object-pools when running in httpd"
-Justification:
-  Subversion should not crash. User complained.
-Votes:
-  +1: stsp, hartmannathan
-
 Veto-blocked changes:
 =
 
@@ -85,3 +78,10 @@ Approved changes:
Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref)
Votes:
  +1: stsp, markphip, dsahlberg
+
+  * r1894734
+Fix issue #4880, "Use-after-free of object-pools when running in httpd"
+Justification:
+  Subversion should not crash. User complained.
+Votes:
+  +1: stsp, hartmannathan, markphip

svn commit: r1899314 - /subversion/branches/1.14.x/STATUS

[markphip]

Author: markphip
Date: Mon Mar 28 14:41:42 2022
New Revision: 1899314

URL: http://svn.apache.org/viewvc?rev=1899314&view=rev
Log:
* STATUS: Remove my incorrect veto

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899314&r1=1899313&r2=1899314&view=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Mon Mar 28 14:41:42 2022
@@ -60,25 +60,24 @@ Veto-blocked changes:
  +1: jun66j5, markphip
  -1: dsahlberg (doesn't apply cleanly, +0 once fixed)
 
-* r1899227
-   Don't show unreadable copyfrom paths in 'svn log -v' 
-   Justification:
- Makes 'svn log -v' consistent with spec.
-   Branch:
- 1.14.x-r1899227
-   Votes:
- +1: hartmannathan, dsahlberg, rhuijben
- -1: markphip (doesn't apply cleanly, +1 once fixed)
-
 Approved changes:
 =
 
-  * r1894734
-Fix issue #4880, "Use-after-free of object-pools when running in httpd"
+ * r1894734
+   Fix issue #4880, "Use-after-free of object-pools when running in httpd"
+   Justification:
+ Subversion should not crash. User complained.
+   Votes:
+ +1: stsp, hartmannathan, rhuijben
+
+ * r1899227
+Don't show unreadable copyfrom paths in 'svn log -v' 
 Justification:
-  Subversion should not crash. User complained.
+  Makes 'svn log -v' consistent with spec.
+Branch:
+  1.14.x-r1899227
 Votes:
-  +1: stsp, hartmannathan, rhuijben
+  +1: hartmannathan, dsahlberg, rhuijben
  
  * r1898633
Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure

svn commit: r1899313 - /subversion/branches/1.14.x/STATUS

[markphip]

Author: markphip
Date: Mon Mar 28 14:29:26 2022
New Revision: 1899313

URL: http://svn.apache.org/viewvc?rev=1899313&view=rev
Log:
* STATUS: Move r1899227 from approved to veto

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899313&r1=1899312&r2=1899313&view=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Mon Mar 28 14:29:26 2022
@@ -60,6 +60,16 @@ Veto-blocked changes:
  +1: jun66j5, markphip
  -1: dsahlberg (doesn't apply cleanly, +0 once fixed)
 
+* r1899227
+   Don't show unreadable copyfrom paths in 'svn log -v' 
+   Justification:
+ Makes 'svn log -v' consistent with spec.
+   Branch:
+ 1.14.x-r1899227
+   Votes:
+ +1: hartmannathan, dsahlberg, rhuijben
+ -1: markphip (doesn't apply cleanly, +1 once fixed)
+
 Approved changes:
 =
 
@@ -70,15 +80,6 @@ Approved changes:
 Votes:
   +1: stsp, hartmannathan, rhuijben
  
- * r1899227
-   Don't show unreadable copyfrom paths in 'svn log -v' 
-   Justification:
- Makes 'svn log -v' consistent with spec.
-   Branch:
- 1.14.x-r1899227
-   Votes:
- +1: hartmannathan, dsahlberg, rhuijben
-
  * r1898633
Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure
Justification:

svn commit: r1899312 - /subversion/branches/1.14.x/STATUS

[markphip]

Author: markphip
Date: Mon Mar 28 14:25:46 2022
New Revision: 1899312

URL: http://svn.apache.org/viewvc?rev=1899312&view=rev
Log:
* STATUS: Vote for r1892470, r1892471, r1892541

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899312&r1=1899311&r2=1899312&view=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Mon Mar 28 14:25:46 2022
@@ -44,7 +44,7 @@ Candidate changes:
Justification:
  Subversion should not crash. User complained.
Votes:
- +1: stsp
+ +1: stsp, markphip
  +0: dsahlberg (test suite passes for 'check', 'davautocheck' and
  'svnserveautocheck'. Not enough C experience for a formal
  review)

svn commit: r1899311 - /subversion/branches/1.14.x/STATUS

[markphip]

Author: markphip
Date: Mon Mar 28 14:22:47 2022
New Revision: 1899311

URL: http://svn.apache.org/viewvc?rev=1899311&view=rev
Log:
* STATUS: Vote for r1881534 approving (remove previous nomination)

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899311&r1=1899310&r2=1899311&view=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Mon Mar 28 14:22:47 2022
@@ -32,18 +32,6 @@ Candidate changes:
Votes:
  +1: futatuki, stsp
 
- * r1881534
-   Fix issue #4864 "build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE"
-   Justification:
- Unblocks cross-compiling SVN.
-   Notes:
- Replacement for veto-blocked r1881534 group (see below) without the
- inconsistent line endings that instigated said veto blockage.
-   Branch:
- 1.14.x-r1881534-no-crlf
-   Votes:
- +1: hartmannathan, stsp
-
  * r1890223, r1890668, r1890673
Support building on Win64/ARM64.
Justification:
@@ -64,17 +52,6 @@ Candidate changes:
 Veto-blocked changes:
 =
 
- * r1881534, r1883388
-   Fix issue #4864 "build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE"
-   Justification:
- Unblocks cross-compiling SVN.
-   Notes:
- Replacement nomination above (the 1.14.x-r1881534-no-crlf branch)
-   Votes:
- +1: hartmannathan
- -1: brane (contains CRLF line endings, needs svn:eol-style + fixup)
-   (+1 once that is fixed)
-
  * r1897441
swig-py: Fix cleanup failing in unit tests with Python 3 on Windows.
Justification:
@@ -122,3 +99,15 @@ Approved changes:
  Reduce code duplication between APR and SVN.
Votes:
  +1: brane, jun66j5, markphip
+
+ * r1881534
+   Fix issue #4864 "build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE"
+   Justification:
+ Unblocks cross-compiling SVN.
+   Notes:
+ Replacement for veto-blocked r1881534 group (see below) without the
+ inconsistent line endings that instigated said veto blockage.
+   Branch:
+ 1.14.x-r1881534-no-crlf
+   Votes:
+ +1: hartmannathan, stsp, markphip

svn commit: r1899310 - /subversion/branches/1.14.x/STATUS

[markphip]

Author: markphip
Date: Mon Mar 28 14:20:51 2022
New Revision: 1899310

URL: http://svn.apache.org/viewvc?rev=1899310&view=rev
Log:
* STATUS: Vote for r1883355 approving

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899310&r1=1899309&r2=1899310&view=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Mon Mar 28 14:20:51 2022
@@ -24,13 +24,6 @@ Candidate changes:
  +0: danielsh (with appropriate Skip()/XFail() annotations if needed)
  +1: hartmannathan
 
- * r1883355
-   Use the APR-1.4+ API for flushing file contents to disk.
-   Justification:
- Reduce code duplication between APR and SVN.
-   Votes:
- +1: brane, jun66j5
-
  * r1878379, r1883719, r1883722, r1884610
Distinguish configure scripts on release mode and non release mode.
Justification:
@@ -122,3 +115,10 @@ Approved changes:
  davautocheck should work
Votes:
  +1: dsahlberg, markphip, stsp
+
+ * r1883355
+   Use the APR-1.4+ API for flushing file contents to disk.
+   Justification:
+ Reduce code duplication between APR and SVN.
+   Votes:
+ +1: brane, jun66j5, markphip

svn commit: r1899305 - /subversion/branches/1.10.x/STATUS

[dsahlberg]

Author: dsahlberg
Date: Mon Mar 28 12:19:06 2022
New Revision: 1899305

URL: http://svn.apache.org/viewvc?rev=1899305&view=rev
Log:
* STATUS (1.10.x): Vote for the r1883838 group

Modified:
subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899305&r1=1899304&r2=1899305&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Mar 28 12:19:06 2022
@@ -43,11 +43,6 @@ Candidate changes:
Votes:
  +1: stsp, jcorvel
 
- * r1883838, r1883989, r1886460, r1886582, r1892121
-   Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref)
-   Votes:
- +1: stsp, markphip
-
   * r1887704
Follow up to r1866587, r1866588: Unbreak a msgid.
Justification:
@@ -85,3 +80,8 @@ Approved changes:
  1.10.x-r1899227
Votes:
  +1: hartmannathan, dsahlberg, stsp
+
+ * r1883838, r1883989, r1886460, r1886582, r1892121
+   Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref)
+   Votes:
+ +1: stsp, markphip, dsahlberg

Re: svn commit: r1899276 - /subversion/site/publish/upcoming.part.html

[Daniel Sahlberg]

Den mån 28 mars 2022 kl 13:29 skrev Nathan Hartman :

> On Mon, Mar 28, 2022 at 3:55 AM Daniel Sahlberg <
> daniel.l.sahlb...@gmail.com> wrote:
>
>> This commit doesn't look correct.
>>
>> I executed the generate-upcoming-changes-log.sh manually yesterday and it
>> created r1899244, removing a lot of log entries belonging to 1.14.1. This
>> commit (which was executed by cron) restores them.
>>
>> The crontab entry is:
>> [[[
>> # Puppet Name: Update our upcoming changes list
>> SVN=svn
>> 15 4 * * * chronic ~/src/svn/site/tools/generate-upcoming-changes-log.sh
>> ]]]
>>
>> The script begins with a comment
>> [[[
>> # This should be run from the root of a branches/1.{9,10,11}.x working
>> copy.
>> ]]]
>>
>> I suppose the crontab command should be changed to:
>> cd ~/src/svn/1.14.x && chronic
>> ~/src/svn/site/tools/generate-upcoming-changes-log.sh
>>
>> However that will create an "upcoming" only for 1.14 and not for 1.10.
>> Any thoughts
>>
>
>
> We don't really have a place on the release notes page for "upcoming" for
> two different major lines. For now it probably makes sense to show it for
> 1.14.x only, but when 1.15 is released we'll have to decide whether to show
> "upcoming" for just 1.15 or separately for 1.14 and 1.15.
>

(y)

It should be fairly simple to run the script twice (with a version
argument) and generate two separate upcoming.$VERSION.part.html and
referencing from the website. I feel this being an itch for me and I'll see
if I can find some time to scratch for 1.10 and 1.14. It might be good to
have a framework for the future even if 1.10 is approaching EOL.


> Regarding things disappearing and reappearing, some time ago I noticed
> that if an error occurs in the script, such as it can't reach the repo,
> then it fails to generate any text but proceeds to commit unconditionally.
> I don't remember if that was ever fixed.
>

I saw that as well but in this case there are merges from 2020 showing up
in "upcoming". These changes were part of 1.14.1.

I'll try again to run the script manually, noting the `cwd` each time and
see what happens. There may be some spurious commit messages while I'm
doing this.

I'll also try to figure out what to do in case of problems reaching the
repo.

Kind regards,
Daniel

Re: svn commit: r1899276 - /subversion/site/publish/upcoming.part.html

[Nathan Hartman]

On Mon, Mar 28, 2022 at 3:55 AM Daniel Sahlberg 
wrote:

> This commit doesn't look correct.
>
> I executed the generate-upcoming-changes-log.sh manually yesterday and it
> created r1899244, removing a lot of log entries belonging to 1.14.1. This
> commit (which was executed by cron) restores them.
>
> The crontab entry is:
> [[[
> # Puppet Name: Update our upcoming changes list
> SVN=svn
> 15 4 * * * chronic ~/src/svn/site/tools/generate-upcoming-changes-log.sh
> ]]]
>
> The script begins with a comment
> [[[
> # This should be run from the root of a branches/1.{9,10,11}.x working
> copy.
> ]]]
>
> I suppose the crontab command should be changed to:
> cd ~/src/svn/1.14.x && chronic
> ~/src/svn/site/tools/generate-upcoming-changes-log.sh
>
> However that will create an "upcoming" only for 1.14 and not for 1.10. Any
> thoughts
>


We don't really have a place on the release notes page for "upcoming" for
two different major lines. For now it probably makes sense to show it for
1.14.x only, but when 1.15 is released we'll have to decide whether to show
"upcoming" for just 1.15 or separately for 1.14 and 1.15.

Regarding things disappearing and reappearing, some time ago I noticed that
if an error occurs in the script, such as it can't reach the repo, then it
fails to generate any text but proceeds to commit unconditionally. I don't
remember if that was ever fixed.

Nathan

svn commit: r1899298 - /subversion/branches/1.10.x/STATUS

[stsp]

Author: stsp
Date: Mon Mar 28 11:17:18 2022
New Revision: 1899298

URL: http://svn.apache.org/viewvc?rev=1899298&view=rev
Log:
* STATUS (for 1.10.x): Vote for r1887704.

Modified:
subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899298&r1=1899297&r2=1899298&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Mar 28 11:17:18 2022
@@ -54,7 +54,7 @@ Candidate changes:
  subversion.pot should be built correctly.
Branch: ^/subversion/branches/1.10.x-r1887704
Votes:
- +1: futatuki
+ +1: futatuki, stsp
 
  * r1891908
Fix a bug where «make davautocheck» immediately after configure failed

svn commit: r1899296 - /subversion/branches/1.14.x/STATUS

[stsp]

Author: stsp
Date: Mon Mar 28 11:11:26 2022
New Revision: 1899296

URL: http://svn.apache.org/viewvc?rev=1899296&view=rev
Log:
* STATUS: Vote for r1892121, approving.

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899296&r1=1899295&r2=1899296&view=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Mon Mar 28 11:11:26 2022
@@ -68,13 +68,6 @@ Candidate changes:
  'svnserveautocheck'. Not enough C experience for a formal
  review)
 
- * r1892121
-   Fix an error message when running make davautocheck.
-   Justification:
- davautocheck should work
-   Votes:
- +1: dsahlberg, markphip
-
 Veto-blocked changes:
 =
 
@@ -122,3 +115,10 @@ Approved changes:
  Fix test failure
Votes:
  +1: jamessan, stsp
+
+ * r1892121
+   Fix an error message when running make davautocheck.
+   Justification:
+ davautocheck should work
+   Votes:
+ +1: dsahlberg, markphip, stsp

svn commit: r1899294 - /subversion/branches/1.14.x/STATUS

[stsp]

Author: stsp
Date: Mon Mar 28 11:09:40 2022
New Revision: 1899294

URL: http://svn.apache.org/viewvc?rev=1899294&view=rev
Log:
* STATUS: Vote for r1898633, approving (just 2 votes needed for bindings)

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899294&r1=1899293&r2=1899294&view=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Mon Mar 28 11:09:40 2022
@@ -68,13 +68,6 @@ Candidate changes:
  'svnserveautocheck'. Not enough C experience for a formal
  review)
 
- * r1898633
-   Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure
-   Justification:
- Fix test failure
-   Votes:
- +1: jamessan
-
  * r1892121
Fix an error message when running make davautocheck.
Justification:
@@ -122,3 +115,10 @@ Approved changes:
  1.14.x-r1899227
Votes:
  +1: hartmannathan, dsahlberg, rhuijben
+
+ * r1898633
+   Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure
+   Justification:
+ Fix test failure
+   Votes:
+ +1: jamessan, stsp

svn commit: r1899292 - /subversion/branches/1.10.x/STATUS

[stsp]

Author: stsp
Date: Mon Mar 28 11:03:53 2022
New Revision: 1899292

URL: http://svn.apache.org/viewvc?rev=1899292&view=rev
Log:
* STATUS (for 1.10.x): Vote for r1899227, approving.

Modified:
subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899292&r1=1899291&r2=1899292&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Mar 28 11:03:53 2022
@@ -71,6 +71,12 @@ Candidate changes:
 Votes:
   +1: stsp, hartmannathan
 
+Veto-blocked changes:
+=
+
+Approved changes:
+=
+
  * r1899227
Don't show unreadable copyfrom paths in 'svn log -v' 
Justification:
@@ -78,10 +84,4 @@ Candidate changes:
Branch:
  1.10.x-r1899227
Votes:
- +1: hartmannathan, dsahlberg
-
-Veto-blocked changes:
-=
-
-Approved changes:
-=
+ +1: hartmannathan, dsahlberg, stsp

svn commit: r1899291 - /subversion/branches/1.10.x/STATUS

[stsp]

Author: stsp
Date: Mon Mar 28 10:58:56 2022
New Revision: 1899291

URL: http://svn.apache.org/viewvc?rev=1899291&view=rev
Log:
* STATUS (for 1.10.x): Vote for r1892121.

Modified:
subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899291&r1=1899290&r2=1899291&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Mar 28 10:58:56 2022
@@ -46,8 +46,7 @@ Candidate changes:
  * r1883838, r1883989, r1886460, r1886582, r1892121
Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref)
Votes:
- +1: stsp (without r1892121)
- +1: markphip
+ +1: stsp, markphip
 
   * r1887704
Follow up to r1866587, r1866588: Unbreak a msgid.

svn commit: r1899290 - /subversion/branches/1.10.x/STATUS

[markphip]

Author: markphip
Date: Mon Mar 28 10:53:20 2022
New Revision: 1899290

URL: http://svn.apache.org/viewvc?rev=1899290&view=rev
Log:
* STATUS: Nominate r1892121 and add vote to group

Modified:
subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899290&r1=1899289&r2=1899290&view=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Mar 28 10:53:20 2022
@@ -43,10 +43,11 @@ Candidate changes:
Votes:
  +1: stsp, jcorvel
 
- * r1883838, r1883989, r1886460, r1886582
+ * r1883838, r1883989, r1886460, r1886582, r1892121
Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref)
Votes:
- +1: stsp
+ +1: stsp (without r1892121)
+ +1: markphip
 
   * r1887704
Follow up to r1866587, r1866588: Unbreak a msgid.

svn commit: r1899285 - /subversion/branches/1.14.x/STATUS

[rhuijben]

Author: rhuijben
Date: Mon Mar 28 09:58:51 2022
New Revision: 1899285

URL: http://svn.apache.org/viewvc?rev=1899285&view=rev
Log:
* STATUS: Approve 2 groups.

Modified:
subversion/branches/1.14.x/STATUS

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899285&r1=1899284&r2=1899285&view=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Mon Mar 28 09:58:51 2022
@@ -68,13 +68,6 @@ Candidate changes:
  'svnserveautocheck'. Not enough C experience for a formal
  review)
 
-  * r1894734
-Fix issue #4880, "Use-after-free of object-pools when running in httpd"
-Justification:
-  Subversion should not crash. User complained.
-Votes:
-  +1: stsp, hartmannathan
-
  * r1898633
Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure
Justification:
@@ -82,15 +75,6 @@ Candidate changes:
Votes:
  +1: jamessan
 
- * r1899227
-   Don't show unreadable copyfrom paths in 'svn log -v' 
-   Justification:
- Makes 'svn log -v' consistent with spec.
-   Branch:
- 1.14.x-r1899227
-   Votes:
- +1: hartmannathan, dsahlberg
-
  * r1892121
Fix an error message when running make davautocheck.
Justification:
@@ -122,3 +106,19 @@ Veto-blocked changes:
 
 Approved changes:
 =
+
+  * r1894734
+Fix issue #4880, "Use-after-free of object-pools when running in httpd"
+Justification:
+  Subversion should not crash. User complained.
+Votes:
+  +1: stsp, hartmannathan, rhuijben
+ 
+ * r1899227
+   Don't show unreadable copyfrom paths in 'svn log -v' 
+   Justification:
+ Makes 'svn log -v' consistent with spec.
+   Branch:
+ 1.14.x-r1899227
+   Votes:
+ +1: hartmannathan, dsahlberg, rhuijben

Re: svn commit: r1899247 - /subversion/branches/1.13.x/STATUS

[Daniel Sahlberg]

Den mån 28 mars 2022 kl 02:33 skrev Daniel Shahaf :

> Daniel Sahlberg wrote on Sun, 27 Mar 2022 23:30 +00:00:
> > Den sön 27 mars 2022 kl 19:37 skrev Daniel Shahaf <
> d...@daniel.shahaf.name>:
> >
> >> Thanks for these two changes!  The information is duplicated in
> >> ;
> >> anyone wants to fix that, too?  (Also, 1.14.x is absent from there.)
> >>
> >
> > Done (r1899267). This should be quite straight forward and could be
> merged
> > right away. Thanks for pointing out!
> >
>
> Thanks for fixing it.
>
> I wonder whether we should add "1.15.x | Not yet supported" to that table.
>

-0:  1.15 doesn't even exist yet and /trunk is never "supported". I think
we can add it when we branch.

> I also made some additional changes in roadmap.html (r1899268). This could
> > probably be discussed a bit more but the "out of date" and eted
> > sections doesn't look nice.
>
> All I have to say is that it'd be nice to keep somewhere either
> a working example of those CSS classes or documentation of them… even if
> it's just "Refer to roadmap.html@r1899267" :-)
>

#todo is used in several other places. I don't know if we have specific CSS
for .

This was a little bit of a flame bait to see if anyone else has an opinion
on the eted table.

Kind regards,
Daniel

Re: svn commit: r1899276 - /subversion/site/publish/upcoming.part.html

[Daniel Sahlberg]

This commit doesn't look correct.

I executed the generate-upcoming-changes-log.sh manually yesterday and it
created r1899244, removing a lot of log entries belonging to 1.14.1. This
commit (which was executed by cron) restores them.

The crontab entry is:
[[[
# Puppet Name: Update our upcoming changes list
SVN=svn
15 4 * * * chronic ~/src/svn/site/tools/generate-upcoming-changes-log.sh
]]]

The script begins with a comment
[[[
# This should be run from the root of a branches/1.{9,10,11}.x working copy.
]]]

I suppose the crontab command should be changed to:
cd ~/src/svn/1.14.x && chronic
~/src/svn/site/tools/generate-upcoming-changes-log.sh

However that will create an "upcoming" only for 1.14 and not for 1.10. Any
thoughts?

Kind regards,
Daniel


Den mån 28 mars 2022 kl 06:15 skrev :

> Author: svn-role
> Date: Mon Mar 28 04:15:01 2022
> New Revision: 1899276
>
> URL: http://svn.apache.org/viewvc?rev=1899276&view=rev
> Log:
> * upcoming.part.html: Automatically regenerated
>
> Modified:
> subversion/site/publish/upcoming.part.html
>
> Modified: subversion/site/publish/upcoming.part.html
> URL:
> http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1899276&r1=1899275&r2=1899276&view=diff
>
> ==
> --- subversion/site/publish/upcoming.part.html (original)
> +++ subversion/site/publish/upcoming.part.html Mon Mar 28 04:15:01 2022
> @@ -2,6 +2,470 @@
>  
>  Changes in ^/subversion/branches/1.14.x:
>  
> +https://svn.apache.org/r1877978";>r1877978 | svn-role |
> 2020-05-21 04:00:13 + (Thu, 21 May 2020) | 7 lines
> +
> +Merge https://svn.apache.org/r1877788";>r1877788 from trunk:
> +
> + * https://svn.apache.org/r1877788";>r1877788
> +   Fix a broken link in a docstring.
> +   Votes:
> + +1: danielsh, stsp
> +
> +
> +https://svn.apache.org/r1878211";>r1878211 | svn-role |
> 2020-05-28 04:00:12 + (Thu, 28 May 2020) | 10 lines
> +
> +Merge https://svn.apache.org/r1877072";>r1877072 from trunk:
> +
> + * https://svn.apache.org/r1877072";>r1877072
> +   svnmucc: Change an error message to state another possible cause of the
> +   error.
> +   Justification:
> + Error messages should be accurate.  User reported ( href="/issue-4854">issue #4854).
> +   Votes:
> + +1: danielsh, stsp, jcorvel
> +
> +
> +https://svn.apache.org/r1878213";>r1878213 | svn-role |
> 2020-05-28 04:00:16 + (Thu, 28 May 2020) | 11 lines
> +
> +Merge https://svn.apache.org/r1877259";>r1877259 from trunk:
> +
> +* https://svn.apache.org/r1877259";>r1877259
> +Move variable declarations to the start of block the to fix
> +syntax errors with VC9 (Visual Studio 2008).
> +  Justification:
> +Our code should be C90.
> +  Votes:
> ++1: brane, stsp, jcorvel
> ++0: danielsh (from dev@)
> +
> +
> +https://svn.apache.org/r1878415";>r1878415 | svn-role |
> 2020-06-03 04:00:20 + (Wed, 03 Jun 2020) | 12 lines
> +
> +Merge the https://svn.apache.org/r1876707";>r1876707 group
> from trunk:
> +
> + * https://svn.apache.org/r1876707";>r1876707, https://svn.apache.org/r1876734";>r1876734, https://svn.apache.org/r1877318";>r1877318, https://svn.apache.org/r1877712";>r1877712, https://svn.apache.org/r1878141";>r1878141, https://svn.apache.org/r1878142";>r1878142, https://svn.apache.org/r1878143";>r1878143,
> +   https://svn.apache.org/r1878144";>r1878144
> +   Various fixes for making the test suite run correctly with Python 3 on
> +   Windows.
> +   Justification:
> + Our test suite should test Subversion correctly also on Windows with
> + Python 3
> +   Votes:
> + +1: futatuki, jcorvel, stsp
> +
> +
> +https://svn.apache.org/r1879245";>r1879245 | svn-role |
> 2020-06-27 04:00:12 + (Sat, 27 Jun 2020) | 11 lines
> +
> +Merge https://svn.apache.org/r1876662";>r1876662 from trunk:
> +
> + * https://svn.apache.org/r1876662";>r1876662
> +   Avoid check for SWIG version for Python bindings when --without-swig is
> +   passed.
> +   Justification:
> + SWIG python bindings should be able to be built without SWIG when we
> use
> + the release tarball
> +   Votes:
> + +1: futatuki, stsp, rhuijben
> +
> +
> +https://svn.apache.org/r1879246";>r1879246 | svn-role |
> 2020-06-27 04:00:17 + (Sat, 27 Jun 2020) | 10 lines
> +
> +Merge https://svn.apache.org/r1876906";>r1876906 from trunk:
> +
> + * https://svn.apache.org/r1876906";>r1876906
> +   Make gen-make.py --debug work with Python 3
> +   Justification:
> + We should also be able to build in Debug configuration with 

Re: svn commit: r1899275 - /subversion/site/publish/.message-ids.tsv

[Daniel Sahlberg]

Anyone got an idea why the URL list was sorted in a different way on the
new svn-qavm? Not that it is a big difference, but I don't like loose ends.

In either case, I updated the source to use https on the offending link to
(r1899280) so we should see another update tomorrow.

/Daniel

Den mån 28 mars 2022 kl 06:00 skrev :

> Author: svn-role
> Date: Mon Mar 28 04:00:20 2022
> New Revision: 1899275
>
> URL: http://svn.apache.org/viewvc?rev=1899275&view=rev
> Log:
> * publish/.message-ids.tsv: Automatically regenerated.
>
> Modified:
> subversion/site/publish/.message-ids.tsv
>
> Modified: subversion/site/publish/.message-ids.tsv
> URL:
> http://svn.apache.org/viewvc/subversion/site/publish/.message-ids.tsv?rev=1899275&r1=1899274&r2=1899275&view=diff
>
> ==
> --- subversion/site/publish/.message-ids.tsv (original)
> +++ subversion/site/publish/.message-ids.tsv Mon Mar 28 04:00:20 2022
> @@ -1,5 +1,6 @@
>  # Message-ids of archived emails that are referenced by a svn.haxx.se
> URL.
> -# Generated by tools/haxx-url-to-message-id.sh on 2021-07-04
> +# Generated by tools/haxx-url-to-message-id.sh on 2022-03-28
> +http://svn.haxx.se/dev/archive-2010-08/0362.shtml
> 4c65756c.8070...@collab.net
>  https://svn.haxx.se/dev/archive-2003-01/1125.shtml
> 20030116213052.314004c1.tt...@idsoftware.com
>  https://svn.haxx.se/dev/archive-2003-02/0068.shtml
> 87wuki4fpy@codematters.co.uk
>  https://svn.haxx.se/dev/archive-2003-10/0136.shtml
> 200310031235.h93czgiv064...@bigtex.jrv.org
> @@ -55,4 +56,3 @@ https://svn.haxx.se/users/archive-2012-0
>  https://svn.haxx.se/users/archive-2012-09/0236.shtml
> 20120921085850.gg24...@ted.stsp.name
>  https://svn.haxx.se/users/archive-2019-04/0041.shtml
> 9739e241-f88c-8a79-11f5-783a7f119...@neuf.fr
>  https://svn.haxx.se/users/archive-2020-04/0040.shtml
> 20200422065424.gl81...@ted.stsp.name
> -http://svn.haxx.se/dev/archive-2010-08/0362.shtml
> 4c65756c.8070...@collab.net
>
>
>

svn commit: r1899280 - /subversion/trunk/subversion/include/svn_types.h

[dsahlberg]

Author: dsahlberg
Date: Mon Mar 28 07:16:52 2022
New Revision: 1899280

URL: http://svn.apache.org/viewvc?rev=1899280&view=rev
Log:
Docstring adjustments, no functional change

* subversion/include/svn_types.h:
  Replaced two links to subversion.tigris.org with their svn.haxx.se
  equivalent. Also s/http:/https:/ for svn.haxx.se.

Modified:
subversion/trunk/subversion/include/svn_types.h

Modified: subversion/trunk/subversion/include/svn_types.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_types.h?rev=1899280&r1=1899279&r2=1899280&view=diff
==
--- subversion/trunk/subversion/include/svn_types.h (original)
+++ subversion/trunk/subversion/include/svn_types.h Mon Mar 28 07:16:52 2022
@@ -610,7 +610,7 @@ svn_dirent_create(apr_pool_t *result_poo
  * keywords (e.g., $NetBSD$).  See
  *
  * @verbatim
-  http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=8921
+  https://svn.haxx.se/dev/archive-2001-12/0479.shtml
   =
   From: "Jonathan M. Manning" 
   To: d...@subversion.tigris.org
@@ -621,7 +621,7 @@ svn_dirent_create(apr_pool_t *result_poo
  * and Eric Gillespie's support of same:
  *
  * @verbatim
-  http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=8757
+  https://svn.haxx.se/dev/archive-2001-12/0315.shtml
   =
   From: "Eric Gillespie, Jr." 
   To: d...@subversion.tigris.org
@@ -878,7 +878,7 @@ typedef struct svn_log_entry_t
* value as changed_paths for compatibility with users assuming an older
* version.
*
-   * @note See http://svn.haxx.se/dev/archive-2010-08/0362.shtml for
+   * @note See https://svn.haxx.se/dev/archive-2010-08/0362.shtml for
* further explanation.
*
* @since New in 1.6.