svn commit: r1933566 - in subversion/branches/1.14.x: . subversion/tests/cmdline

Author: svn-role
Date: Thu Apr 30 04:00:10 2026
New Revision: 1933566

Log:
Merge r1933475 from trunk:

 * r1933475
   Avoid DNS reverse name lookups during test configuration.
   Justification:
     Reverse lookups can cause long delays or even block.
   Votes:
     +1: brane, dsahlberg

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

Modified: subversion/branches/1.14.x/STATUS
==============================================================================
--- subversion/branches/1.14.x/STATUS	Thu Apr 30 02:49:36 2026	(r1933565)
+++ subversion/branches/1.14.x/STATUS	Thu Apr 30 04:00:10 2026	(r1933566)
@@ -55,11 +55,11 @@ Candidate changes:
    Remove a potentially data-truncating typecast in our adler32 implementation.
    Justification:
      Do not silently compute the wrong checksum.
+   Branch:
+     1.14.x-r1931334
    Notes:
      Triggering this bug was not likely, but still possible. In addition, we
      now use adler32_z() when available, which may be slightly more efficient.
-   Branch:
-     ^/subversion/branches/1.14.x-r1931334
    Votes:
      +1: brane
 
@@ -68,11 +68,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1933475
-   Avoid DNS reverse name lookups during test configuration.
-   Justification:
-     Reverse lookups can cause long delays or even block.
-   Votes:
-     +1: brane, dsahlberg
-

Modified: subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh
==============================================================================
--- subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh	Thu Apr 30 02:49:36 2026	(r1933565)
+++ subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh	Thu Apr 30 04:00:10 2026	(r1933566)
@@ -334,7 +334,7 @@ fi
 # Stop any previous instances, os we can re-use the port.
 if [ -x $STOPSCRIPT ]; then $STOPSCRIPT ; sleep 1; fi
 
-ss > /dev/null 2>&1 || netstat > /dev/null 2>&1 || fail "unable to find ss or netstat required to find a free port"
+ss -n > /dev/null 2>&1 || netstat -n > /dev/null 2>&1 || fail "unable to find ss or netstat required to find a free port"
 
 HTTPD_PORT=3691
 while \

Modified: subversion/branches/1.14.x/subversion/tests/cmdline/svnserveautocheck.sh
==============================================================================
--- subversion/branches/1.14.x/subversion/tests/cmdline/svnserveautocheck.sh	Thu Apr 30 02:49:36 2026	(r1933565)
+++ subversion/branches/1.14.x/subversion/tests/cmdline/svnserveautocheck.sh	Thu Apr 30 04:00:10 2026	(r1933566)
@@ -143,7 +143,7 @@ if type time > /dev/null ; then TIME_CMD
 MAKE=${MAKE:-make}
 PATH="$PATH:/usr/sbin/:/usr/local/sbin/"
 
-ss > /dev/null 2>&1 || netstat > /dev/null 2>&1 || fail "unable to find ss or netstat required to find a free port"
+ss -n > /dev/null 2>&1 || netstat -n > /dev/null 2>&1 || fail "unable to find ss or netstat required to find a free port"
 
 SVNSERVE_PORT=$(random_port)
 while \