svn commit: r66034 - in /dev/subversion: subversion-1.14.3.tar.bz2.asc subversion-1.14.3.tar.gz.asc
Author: stsp Date: Wed Dec 13 12:50:12 2023 New Revision: 66034 Log: add my signatures for Subversion 1.14.3 Modified: dev/subversion/subversion-1.14.3.tar.bz2.asc dev/subversion/subversion-1.14.3.tar.gz.asc Modified: dev/subversion/subversion-1.14.3.tar.bz2.asc == --- dev/subversion/subversion-1.14.3.tar.bz2.asc (original) +++ dev/subversion/subversion-1.14.3.tar.bz2.asc Wed Dec 13 12:50:12 2023 @@ -15,3 +15,9 @@ Ihe5nAFycPiVaQpQvfxo7ulqEN3m3AQXvoSC5bV6 BA5m839fsofxiQOhMbHk4A== =aL2X -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- + +iF0EABECAB0WIQSxzxBgoek00Z6G1tbl0wJz9Z0l8AUCZXmlZwAKCRDl0wJz9Z0l +8NfyAKCNzMW+mM42nhMPKsTTGMmBalSahwCgm7pKfbUqmf8YbXT5bFdEBlkJ9I4= +=CUBD +-END PGP SIGNATURE- Modified: dev/subversion/subversion-1.14.3.tar.gz.asc == --- dev/subversion/subversion-1.14.3.tar.gz.asc (original) +++ dev/subversion/subversion-1.14.3.tar.gz.asc Wed Dec 13 12:50:12 2023 @@ -15,3 +15,9 @@ re9XsrXaGrj7vjAjcrEsGlZVLn5nONLh/u5Were3 jmAFwQ3iKYPagerYeww9pQ== =QjmS -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- + +iF0EABECAB0WIQSxzxBgoek00Z6G1tbl0wJz9Z0l8AUCZXmlZwAKCRDl0wJz9Z0l +8IIwAKD2wK/rnl2UQKrfOky2LViOATy5CQCgh88jUXwB4fzAlwrhuOe8t/Y8LRM= +=P7zH +-END PGP SIGNATURE-
svn commit: r1914616 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp Date: Wed Dec 13 08:07:37 2023 New Revision: 1914616 URL: http://svn.apache.org/viewvc?rev=1914616=rev Log: * tools/dev/unix-build/Makefile.svn: Remove obsolete notes the bb-openbsd buildbot, which is no longer running. Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1914616=1914615=1914616=diff == --- subversion/trunk/tools/dev/unix-build/Makefile.svn (original) +++ subversion/trunk/tools/dev/unix-build/Makefile.svn Wed Dec 13 08:07:37 2023 @@ -20,15 +20,6 @@ # WARNING: This may or may not work on your system. This Makefile is # an example, rather than a ready-made universal solution. -# -# ** IMPORTANT NOTE FOR SVN COMMITTERS: READ THIS. ** -# **** -# -# | This Makefile is used by the bb-openbsd buildbot | -# | (http://ci.apache.org/builders/bb-openbsd). Please check | -# | the bot's health after making changes to this file. | -# |__| - PERL ?= yes ENABLE_PERL_BINDINGS = $(PERL) THREADING ?= yes
svn commit: r1913717 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp
Date: Sat Nov 11 15:30:34 2023
New Revision: 1913717
URL: http://svn.apache.org/viewvc?rev=1913717=rev
Log:
* tools/dev/unix-build/Makefile.svn: Update to neon 0.32.5.
Make sure to have 'xmlto' installed, it is required to build the docs.
Neon's 'make install' step will fail otherwise.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1913717=1913716=1913717=diff
==
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Sat Nov 11 15:30:34 2023
@@ -118,7 +118,7 @@ GNU_ICONV_VER = 1.15
APR_UTIL_VER = 1.6.1
PCRE_VER = 8.41
HTTPD_VER = 2.4.37
-NEON_VER = 0.30.2
+NEON_VER = 0.32.5
SERF_VER = 1.3.10
CYRUS_SASL_VER = 2.1.28
SQLITE_VER = 3390400
@@ -157,7 +157,7 @@ SHA256_${APR_ICONV_DIST} = 19381959d50c4
SHA256_${GNU_ICONV_DIST} =
ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178
SHA256_${PCRE_DIST} =
244838e1f1d14f7e2fa7681b857b3a8566b74215f28133f14a8f5e59241b682c
SHA256_${HTTPD_DIST} =
aa97a834a32d51974be8d8a013b561e28d327387cb1da2c3c2762acd0146aabd
-SHA256_${NEON_DIST} =
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
+SHA256_${NEON_DIST} =
4872e12f802572dedd4b02f870065814b2d5141f7dbdaf708eedab826b51a58a
SHA256_${CYRUS_SASL_DIST} =
7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c
SHA256_${SQLITE_DIST} =
f31d445b48e67e284cf206717cc170ab63cbe4fd7f79a82793b772285e78fdbb
SHA256_${LIBMAGIC_DIST} =
694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214
@@ -212,8 +212,7 @@ GNU_ICONV_URL = https://ftp.gnu.org/pub/
APR_UTIL_URL = https://svn.apache.org/repos/asf/apr/apr-util
PCRE_URL =
https://downloads.sourceforge.net/project/pcre/pcre/$(PCRE_VER)/$(PCRE_DIST)
HTTPD_URL = https://archive.apache.org/dist/httpd/$(HTTPD_DIST)
-#NEON_URL = http://webdav.org/neon/$(NEON_DIST)
-NEON_URL = http://ftp.openbsd.org/pub/OpenBSD/distfiles/$(NEON_DIST)
+NEON_URL = https://notroj.github.io/neon/$(NEON_DIST)
SERF_URL = https://svn.apache.org/repos/asf/serf/tags/$(SERF_VER)
SQLITE_URL = https://www.sqlite.org/2022/$(SQLITE_DIST)
CYRUS_SASL_URL =
https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${CYRUS_SASL_VER}/$(CYRUS_SASL_DIST)
@@ -893,6 +892,7 @@ $(NEON_OBJDIR)/.configured: $(NEON_OBJDI
# compile neon
$(NEON_OBJDIR)/.compiled: $(NEON_OBJDIR)/.configured
(cd $(NEON_OBJDIR) && env MAKEFLAGS= make -j${MAKE_JOBS})
+ (cd $(NEON_OBJDIR) && env MAKEFLAGS= make docs)
touch $@
# install neon
svn commit: r1911286 - /subversion/branches/1.14.x/STATUS
Author: stsp Date: Wed Jul 26 08:54:02 2023 New Revision: 1911286 URL: http://svn.apache.org/viewvc?rev=1911286=rev Log: * STATUS (1.14.x): Vote for r1906502, r1907124, and r1908926 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=1911286=1911285=1911286=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Wed Jul 26 08:54:02 2023 @@ -27,13 +27,14 @@ Candidate changes: Justification: Bug fix. Code to parse forward merges did not work as intended. Votes: - +1: hartmannathan + +1: hartmannathan, stsp * r1907124 svntest/main.py: Remove wrong comma that broke tests with --enable-sasl Justification: Syntax error. Votes: + +1: stsp +0: hartmannathan (haven't tested yet; intend to upgrade to +1 soon) * r1908926 @@ -41,7 +42,7 @@ Candidate changes: Justification: Bug fix. Issue #4911. Votes: - +1: dsahlberg + +1: dsahlberg, stsp Veto-blocked changes: =
svn commit: r1910152 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp Date: Wed May 31 19:21:48 2023 New Revision: 1910152 URL: http://svn.apache.org/viewvc?rev=1910152=rev Log: * tools/dev/unix-build/Makefile.svn: update to serf 1.3.10 Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1910152=1910151=1910152=diff == --- subversion/trunk/tools/dev/unix-build/Makefile.svn (original) +++ subversion/trunk/tools/dev/unix-build/Makefile.svn Wed May 31 19:21:48 2023 @@ -100,7 +100,7 @@ BRANCH_MAJOR:= $(shell echo $(BRANCH) | ifeq ($(BRANCH_MAJOR), $(filter 1.5 1.6 1.7 1.8 1.9 1.10 1.11 1.12 1.13, $(BRANCH_MAJOR))) PYTHON = python2 else -PYTHON = python +PYTHON = python3 endif SVN_REL_WC = svn-$(WC) SVN_WC = $(PWD)/$(SVN_REL_WC) @@ -119,7 +119,7 @@ APR_UTIL_VER= 1.6.1 PCRE_VER = 8.41 HTTPD_VER = 2.4.37 NEON_VER = 0.30.2 -SERF_VER = 1.3.9 +SERF_VER = 1.3.10 CYRUS_SASL_VER = 2.1.28 SQLITE_VER = 3390400 LIBMAGIC_VER = 5.30 @@ -932,9 +932,7 @@ $(SERF_OBJDIR)/.retrieved: [ -d $(SERF_OBJDIR) ] || mkdir -p $(SERF_OBJDIR) if [ ! -d $(SERF_SRCDIR) ]; then \ svn co $(SERF_URL) $(SERF_SRCDIR); \ - svn merge ^/serf/branches/1.3.x-sslbuild@1781542 $(SERF_SRCDIR); \ - svn merge -c 1811083 ^/serf/trunk@1811083 $(SERF_SRCDIR); \ - svn merge -c 1814604 ^/serf/trunk@1814604 $(SERF_SRCDIR); \ + svn merge ^/serf/branches/1.3.x-sslbuild@1910116 $(SERF_SRCDIR); \ fi touch $@ @@ -1807,7 +1805,7 @@ $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR) $(SWIG_PL_INCLUDES_HACK) $(SWIG_PL_LINK_HACK) cd $(svn_builddir) && \ - env LDFLAGS="-L$(PREFIX)/neon/lib -L$(PREFIX)/apr/lib -L$(PREFIX)/serf/lib $(SERF_LDFLAG) $(LZ4_LDFLAG) -L$(PREFIX)/gettext/lib -L$(PREFIX)/iconv/lib" \ + env LDFLAGS="-L$(PREFIX)/neon/lib -L$(PREFIX)/apr/lib -L$(PREFIX)/serf/lib $(SERF_LDFLAG) -lcrypto -lssl $(LZ4_LDFLAG) -L$(PREFIX)/gettext/lib -L$(PREFIX)/iconv/lib" \ CC=$(CC) CXX=$(CXX) \ CFLAGS="-I$(PREFIX)/gettext/include -DAPR_POOL_DEBUG" \ CXXFLAGS="-I$(PREFIX)/gettext/include -DAPR_POOL_DEBUG" \
svn commit: r1910117 - /subversion/trunk/build/ac-macros/swig.m4
Author: stsp Date: Mon May 29 16:35:04 2023 New Revision: 1910117 URL: http://svn.apache.org/viewvc?rev=1910117=rev Log: Fix a typo in swig-bindings related build-time error messages. * build/ac-macros/swig.m4: (SWIG_PY_ERRMSG, SWIG_PL_ERRMSG, SWIG_RB_ERRMSG): specfied -> specified Modified: subversion/trunk/build/ac-macros/swig.m4 Modified: subversion/trunk/build/ac-macros/swig.m4 URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/swig.m4?rev=1910117=1910116=1910117=diff == --- subversion/trunk/build/ac-macros/swig.m4 (original) +++ subversion/trunk/build/ac-macros/swig.m4 Mon May 29 16:35:04 2023 @@ -116,7 +116,7 @@ AC_DEFUN(SVN_DETERMINE_SWIG_OPTS, SWIG_PY_OPTS="none" SWIG_PY_ERRMSG="check config.log for details" if test "$SWIG_PY_PYTHON" = "none"; then - SWIG_PY_ERRMSG="You specfied not to build Python bindings or \ + SWIG_PY_ERRMSG="You specified not to build Python bindings or \ suitable Python interpreter is not found." else if test "$SWIG" = "none"; then @@ -217,7 +217,7 @@ suitable Python interpreter is not found SWIG_PL_ERRMSG="check config.log for details" if test "$SWIG_PL_PERL" = "none"; then - SWIG_PL_ERRMSG="You specfied not to build Perl bindings or \ + SWIG_PL_ERRMSG="You specified not to build Perl bindings or \ suitable Perl interpreter is not found." else if test "$SWIG" = "none"; then @@ -246,7 +246,7 @@ suitable Perl interpreter is not found." SWIG_RB_LINK="none" SWIG_RB_ERRMSG="check config.log for details" if test "$SWIG_RB_RUBY" = "none"; then - SWIG_RB_ERRMSG="You specfied not to build Ruby bindings or \ + SWIG_RB_ERRMSG="You specified not to build Ruby bindings or \ suitable Ruby interpreter is not found." else if test "$SWIG" = "none"; then @@ -382,7 +382,7 @@ int main() SWIG_PY_OPTS="none" SWIG_PY_ERRMSG="check config.log for details" if test "$SWIG_PY_PYTHON" = "none"; then - SWIG_PY_ERRMSG="You specfied not to build Python bindings or \ + SWIG_PY_ERRMSG="You specified not to build Python bindings or \ suitable Python interpreter is not found." else AC_MSG_NOTICE([Configuring python swig binding]) @@ -439,7 +439,7 @@ suitable Python interpreter is not found SWIG_PL_ERRMSG="check config.log for details" if test "$SWIG_PL_PERL" = "none"; then - SWIG_PL_ERRMSG="You specfied not to build Perl bindings or \ + SWIG_PL_ERRMSG="You specified not to build Perl bindings or \ suitable Perl interpreter is not found." else AC_MSG_CHECKING([perl version]) @@ -463,7 +463,7 @@ suitable Perl interpreter is not found." SWIG_RB_LINK="none" SWIG_RB_ERRMSG="check config.log for details" if test "$SWIG_RB_RUBY" = "none"; then - SWIG_RB_ERRMSG="You specfied not to build Ruby bindings or \ + SWIG_RB_ERRMSG="You specified not to build Ruby bindings or \ suitable Ruby interpreter is not found." else rbconfig="$SWIG_RB_RUBY -rrbconfig -e "
svn commit: r1909337 - /subversion/trunk/contrib/server-side/fsfsverify.py
Author: stsp
Date: Fri Apr 21 21:10:32 2023
New Revision: 1909337
URL: http://svn.apache.org/viewvc?rev=1909337=rev
Log:
* contrib/server-side/fsfsverify.py
(NodeRev): Do not error on property lists as found in FSFS format >=4
which added the sha1 and uniquifier fields. Previously fsfsverify.py
would exit with a ValueError when reading such a revision.
Modified:
subversion/trunk/contrib/server-side/fsfsverify.py
Modified: subversion/trunk/contrib/server-side/fsfsverify.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/contrib/server-side/fsfsverify.py?rev=1909337=1909336=1909337=diff
==
--- subversion/trunk/contrib/server-side/fsfsverify.py (original)
+++ subversion/trunk/contrib/server-side/fsfsverify.py Fri Apr 21 21:10:32 2023
@@ -726,7 +726,10 @@ class NodeRev(object):
self.text = TextRep(rev, offset, length, size, digest,
contentType, currentRev, self, sha1, uniquifier)
elif field == 'props':
-(rev, offset, length, size, digest) = value.split(' ')
+if len(value.split(' ')) == 5:
+ (rev, offset, length, size, digest) = value.split(' ')
+else:
+ (rev, offset, length, size, digest, sha1, uniquifier) =
value.split(' ')
rev = int(rev)
offset = int(offset)
length = int(length)
svn commit: r1906502 - /subversion/trunk/subversion/libsvn_diff/parse-diff.c
Author: stsp
Date: Mon Jan 9 14:04:44 2023
New Revision: 1906502
URL: http://svn.apache.org/viewvc?rev=1906502=rev
Log:
Fix missing pointer dereference in the diff parser.
* subversion/libsvn_diff/parse-diff.c
(parse_pretty_mergeinfo_line): number_of_forward_merges is a pointer.
Read the number of forward merges as intended, instead of checking
whether the address is greater zero.
Patch by: Johannes von Rotz (jr {AT} vrtz.ch)
Modified:
subversion/trunk/subversion/libsvn_diff/parse-diff.c
Modified: subversion/trunk/subversion/libsvn_diff/parse-diff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/parse-diff.c?rev=1906502=1906501=1906502=diff
==
--- subversion/trunk/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/trunk/subversion/libsvn_diff/parse-diff.c Mon Jan 9 14:04:44
2023
@@ -1006,7 +1006,7 @@ parse_pretty_mergeinfo_line(svn_boolean_
}
(*number_of_reverse_merges)--;
}
- else if (number_of_forward_merges > 0) /* forward merges */
+ else if (*number_of_forward_merges > 0) /* forward merges */
{
if (patch->reverse)
{
svn commit: r1905959 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp
Date: Tue Dec 13 13:14:30 2022
New Revision: 1905959
URL: http://svn.apache.org/viewvc?rev=1905959=rev
Log:
* tools/devel/unix-build/Makefile.svn: Update sqlite version to 3.39.4.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1905959=1905958=1905959=diff
==
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Tue Dec 13 13:14:30 2022
@@ -121,7 +121,7 @@ HTTPD_VER = 2.4.37
NEON_VER = 0.30.2
SERF_VER = 1.3.9
CYRUS_SASL_VER = 2.1.28
-SQLITE_VER = 3160200
+SQLITE_VER = 3390400
LIBMAGIC_VER = 5.30
RUBY_VER = 2.7.4
BZ2_VER= 1.0.6
@@ -159,7 +159,7 @@ SHA256_${PCRE_DIST} = 244838e1f1d14f7e2f
SHA256_${HTTPD_DIST} =
aa97a834a32d51974be8d8a013b561e28d327387cb1da2c3c2762acd0146aabd
SHA256_${NEON_DIST} =
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
SHA256_${CYRUS_SASL_DIST} =
7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c
-SHA256_${SQLITE_DIST} =
65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615
+SHA256_${SQLITE_DIST} =
f31d445b48e67e284cf206717cc170ab63cbe4fd7f79a82793b772285e78fdbb
SHA256_${LIBMAGIC_DIST} =
694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214
SHA256_${RUBY_DIST} =
3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b
SHA256_${BZ2_DIST} =
a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
@@ -215,7 +215,7 @@ HTTPD_URL = https://archive.apache.org/d
#NEON_URL = http://webdav.org/neon/$(NEON_DIST)
NEON_URL = http://ftp.openbsd.org/pub/OpenBSD/distfiles/$(NEON_DIST)
SERF_URL = https://svn.apache.org/repos/asf/serf/tags/$(SERF_VER)
-SQLITE_URL = https://www.sqlite.org/2017/$(SQLITE_DIST)
+SQLITE_URL = https://www.sqlite.org/2022/$(SQLITE_DIST)
CYRUS_SASL_URL =
https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${CYRUS_SASL_VER}/$(CYRUS_SASL_DIST)
LIBMAGIC_URL = ftp://ftp.astron.com/pub/file/$(LIBMAGIC_DIST)
RUBY_URL = https://cache.ruby-lang.org/pub/ruby/2.7/$(RUBY_DIST)
svn commit: r1905434 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp
Date: Mon Nov 21 13:33:55 2022
New Revision: 1905434
URL: http://svn.apache.org/viewvc?rev=1905434=rev
Log:
* tools/dev/unix-build/Makefile.svn: explicitly disable boost during SVN build
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1905434=1905433=1905434=diff
==
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Mon Nov 21 13:33:55 2022
@@ -1832,6 +1832,7 @@ $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)
--with-ruby-sitedir="$(SVN_PREFIX)/lib/ruby/site_ruby" \
--with-py3c="$(SRCDIR)/py3c-${PY3C_VER}" \
--disable-mod-activation \
+ --with-boost=no \
$(JAVAHL_FLAG) \
$(LIBMAGIC_FLAG) \
$(LZ4_FLAG) \
svn commit: r1905433 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp Date: Mon Nov 21 13:32:38 2022 New Revision: 1905433 URL: http://svn.apache.org/viewvc?rev=1905433=rev Log: * tools/dev/unix-build/Makefile.svn: Repair run-time linkage of libserf-1.so Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1905433=1905432=1905433=diff == --- subversion/trunk/tools/dev/unix-build/Makefile.svn (original) +++ subversion/trunk/tools/dev/unix-build/Makefile.svn Mon Nov 21 13:32:38 2022 @@ -959,6 +959,8 @@ $(SERF_OBJDIR)/.installed: $(SERF_OBJDIR # work around unportable scons shared lib support -ln -s libserf-1.so.$(shell echo $(SERF_VER) | sed -e 's/[0-9]$$/0/') \ $(PREFIX)/serf/lib/libserf-1.so + -ln -s libserf-1.so.$(shell echo $(SERF_VER) | sed -e 's/[0-9]$$/0/') \ + $(PREFIX)/serf/lib/libserf-1.so.$(shell echo $(SERF_VER) | sed -e 's/\.[0-9]$$//') touch $@ ### @@ -1805,7 +1807,7 @@ $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR) $(SWIG_PL_INCLUDES_HACK) $(SWIG_PL_LINK_HACK) cd $(svn_builddir) && \ - env LDFLAGS="-L$(PREFIX)/neon/lib -L$(PREFIX)/apr/lib $(SERF_LDFLAG) $(LZ4_LDFLAG) -L$(PREFIX)/gettext/lib -L$(PREFIX)/iconv/lib" \ + env LDFLAGS="-L$(PREFIX)/neon/lib -L$(PREFIX)/apr/lib -L$(PREFIX)/serf/lib $(SERF_LDFLAG) $(LZ4_LDFLAG) -L$(PREFIX)/gettext/lib -L$(PREFIX)/iconv/lib" \ CC=$(CC) CXX=$(CXX) \ CFLAGS="-I$(PREFIX)/gettext/include -DAPR_POOL_DEBUG" \ CXXFLAGS="-I$(PREFIX)/gettext/include -DAPR_POOL_DEBUG" \
svn commit: r1905431 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp
Date: Mon Nov 21 12:43:56 2022
New Revision: 1905431
URL: http://svn.apache.org/viewvc?rev=1905431=rev
Log:
* tools/dev/unix-build/Makefile.svn: Update to python 3.10.8.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1905431=1905430=1905431=diff
==
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Mon Nov 21 12:43:56 2022
@@ -125,7 +125,7 @@ SQLITE_VER = 3160200
LIBMAGIC_VER = 5.30
RUBY_VER = 2.7.4
BZ2_VER= 1.0.6
-PYTHON_VER = 3.7.5
+PYTHON_VER = 3.10.8
PYTHON2_VER= 2.7.13
PY3C_VER = 1.1
JUNIT_VER = 4.10
@@ -163,7 +163,7 @@ SHA256_${SQLITE_DIST} = 65cc0c3e9366f50c
SHA256_${LIBMAGIC_DIST} =
694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214
SHA256_${RUBY_DIST} =
3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b
SHA256_${BZ2_DIST} =
a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
-SHA256_${PYTHON_DIST} =
8ecc681ea0600bbfb366f2b173f727b205bb825d93d2f0b286bc4e58d37693da
+SHA256_${PYTHON_DIST} =
f400c3fb394b8bef1292f6dc1292c5fadc3533039a5bc0c3e885f3e16738029a
SHA256_${PYTHON2_DIST} =
a4f05a0720ce0fd92626f0278b6b433eee9a6173ddf2bced7957dfb599a5ece1
SHA256_${PY3C_DIST} =
c7ffc22bc92dded0ca859db53ef3a0b466f89a9f8aad29359c9fe4ff18ebdd20
SHA256_${JUNIT_DIST} =
36a747ca1e0b86f6ea88055b8723bb87030d627766da6288bf077afdeeb0f75a
@@ -1323,9 +1323,19 @@ python-clean:
$(DISTDIR)/$(PYTHON_DIST):
cd $(DISTDIR) && $(FETCH_CMD) $(PYTHON_URL)
+$(PYTHON_OBJDIR)/openbsd-march.diff:
+ mkdir -p $(dir $@)
+ echo >$@.tmp '--- configure.ac.orig Mon Nov 21 13:32:19 2022'
+ echo >>$@.tmp '+++ configure.ac Mon Nov 21 13:32:40 2022'
+ echo >>$@.tmp '@@ -878,2 +878,3 @@'
+ echo >>$@.tmp ' [FreeBSD*], [MULTIARCH=""],'
+ echo >>$@.tmp '+ [OpenBSD*], [MULTIARCH=""],'
+ echo >>$@.tmp ' [MULTIARCH=$$($$CC --print-multiarch 2>/dev/null)]'
+ mv -f $@.tmp $@
+
# retrieve python
#
-$(PYTHON_OBJDIR)/.retrieved: $(DISTDIR)/$(PYTHON_DIST)
+$(PYTHON_OBJDIR)/.retrieved: $(DISTDIR)/$(PYTHON_DIST)
$(PYTHON_OBJDIR)/openbsd-march.diff
$(call do_check_sha256,$(PYTHON_DIST))
[ -d $(PYTHON_OBJDIR) ] || mkdir -p $(PYTHON_OBJDIR)
tar -C $(SRCDIR) -zxf $(DISTDIR)/$(PYTHON_DIST)
@@ -1339,6 +1349,7 @@ $(PYTHON_OBJDIR)/.retrieved: $(DISTDIR)/
> $(PYTHON_SRCDIR)/setup.py.patched
mv $(PYTHON_SRCDIR)/setup.py.patched $(PYTHON_SRCDIR)/setup.py
chmod +x $(PYTHON_SRCDIR)/setup.py
+ cd $(PYTHON_SRCDIR) && patch -p0 < $(PYTHON_OBJDIR)/openbsd-march.diff
touch $@
# configure python
@@ -1347,6 +1358,7 @@ PYTHON_PROFILING=--enable-profiling
endif
$(PYTHON_OBJDIR)/.configured: $(PYTHON_OBJDIR)/.retrieved \
$(BZ2_OBJDIR)/.installed
+ cd $(PYTHON_SRCDIR) && autoconf
cd $(PYTHON_OBJDIR) \
&& env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`" \
CC=$(CC) CXX=$(CXX) \
svn commit: r1905430 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp Date: Mon Nov 21 12:22:01 2022 New Revision: 1905430 URL: http://svn.apache.org/viewvc?rev=1905430=rev Log: * tools/dev/unix-build/Makefile.svn: Fix ruby build on OpenBSD 7.2. Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1905430=1905429=1905430=diff == --- subversion/trunk/tools/dev/unix-build/Makefile.svn (original) +++ subversion/trunk/tools/dev/unix-build/Makefile.svn Mon Nov 21 12:22:01 2022 @@ -1231,6 +1231,8 @@ $(RUBY_OBJDIR)/.retrieved: $(DISTDIR)/$( $(RUBY_SSL_EX_NEW_DATA_PATCH) $(RUBY_SRCDIR)/ext/openssl/extconf.rb cd $(RUBY_SRCDIR) && patch -p0 < $(RUBY_OBJDIR)/openssl_missing.patch cd $(RUBY_SRCDIR) && patch -p0 < $(RUBY_OBJDIR)/sparc64_buserror.patch + sed -i 's/X509_num(bs->certs)/X509_num(OCSP_resp_get0_certs(bs))/' \ + $(RUBY_SRCDIR)/ext/openssl/ossl_ocsp.c touch $@ ifeq ($(THREADING),yes)
svn commit: r1905429 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp
Date: Mon Nov 21 11:51:25 2022
New Revision: 1905429
URL: http://svn.apache.org/viewvc?rev=1905429=rev
Log:
* tools/dev/unix-build/Makfile.svn: Update to cyrus-sasl 2.1.28.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1905429=1905428=1905429=diff
==
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Mon Nov 21 11:51:25 2022
@@ -120,7 +120,7 @@ PCRE_VER= 8.41
HTTPD_VER = 2.4.37
NEON_VER = 0.30.2
SERF_VER = 1.3.9
-CYRUS_SASL_VER = 2.1.25
+CYRUS_SASL_VER = 2.1.28
SQLITE_VER = 3160200
LIBMAGIC_VER = 5.30
RUBY_VER = 2.7.4
@@ -158,7 +158,7 @@ SHA256_${GNU_ICONV_DIST} = ccf536620a454
SHA256_${PCRE_DIST} =
244838e1f1d14f7e2fa7681b857b3a8566b74215f28133f14a8f5e59241b682c
SHA256_${HTTPD_DIST} =
aa97a834a32d51974be8d8a013b561e28d327387cb1da2c3c2762acd0146aabd
SHA256_${NEON_DIST} =
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
-SHA256_${CYRUS_SASL_DIST} =
418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe
+SHA256_${CYRUS_SASL_DIST} =
7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c
SHA256_${SQLITE_DIST} =
65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615
SHA256_${LIBMAGIC_DIST} =
694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214
SHA256_${RUBY_DIST} =
3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b
@@ -1060,6 +1060,8 @@ endif
$(CYRUS_SASL_SRCDIR)/lib/dlopen.c
# Fix a weird autotools error about missing cmulocal dir
(cd $(CYRUS_SASL_SRCDIR)/saslauthd/ && ln -sf ../cmulocal)
+ # Fix 64-bit time_t format-string issues
+ sed -i 's/t%020ld"/t%020lld"/' $(CYRUS_SASL_SRCDIR)/plugins/otp.c
touch $@
# configure cyrus-sasl
@@ -1067,8 +1069,7 @@ $(CYRUS_SASL_OBJDIR)/.configured: $(CYRU
$(BDB_OBJDIR)/.installed $(SQLITE_OBJDIR)/.installed
cd $(CYRUS_SASL_OBJDIR) \
&& env CFLAGS="-g $(PROFILE_CFLAGS)" \
- CPPFLAGS="-I/usr/include/kerberosV" \
- CC=$(CC) CXX=$(CXX) \
+ CC=$(CC) CXX=$(CXX) MAKE=$(MAKE) \
GREP="`which grep`" \
PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
$(CYRUS_SASL_SRCDIR)/configure \
@@ -1084,12 +1085,12 @@ $(CYRUS_SASL_OBJDIR)/.configured: $(CYRU
# compile cyrus-sasl (ignore MAKE_JOBS; multiple jobs cause random build
failures)
$(CYRUS_SASL_OBJDIR)/.compiled: $(CYRUS_SASL_OBJDIR)/.configured
- (cd $(CYRUS_SASL_OBJDIR) && env MAKEFLAGS= make)
+ (cd $(CYRUS_SASL_OBJDIR) && env MAKE=$(MAKE) MAKEFLAGS= $(MAKE))
touch $@
# install cyrus-sasl
$(CYRUS_SASL_OBJDIR)/.installed: $(CYRUS_SASL_OBJDIR)/.compiled
- (cd $(CYRUS_SASL_OBJDIR) && env MAKEFLAGS= make install)
+ (cd $(CYRUS_SASL_OBJDIR) && env MAKE=$(MAKE) MAKEFLAGS= $(MAKE) install)
touch $@
###
svn commit: r1905428 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp
Date: Mon Nov 21 11:06:24 2022
New Revision: 1905428
URL: http://svn.apache.org/viewvc?rev=1905428=rev
Log:
* tools/dev/unix-build/Makefile.svn: remove old serf used for SVN 1.5; obsolete
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1905428=1905427=1905428=diff
==
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Mon Nov 21 11:06:24 2022
@@ -120,7 +120,6 @@ PCRE_VER= 8.41
HTTPD_VER = 2.4.37
NEON_VER = 0.30.2
SERF_VER = 1.3.9
-SERF_OLD_VER = 0.3.1
CYRUS_SASL_VER = 2.1.25
SQLITE_VER = 3160200
LIBMAGIC_VER = 5.30
@@ -216,7 +215,6 @@ HTTPD_URL = https://archive.apache.org/d
#NEON_URL = http://webdav.org/neon/$(NEON_DIST)
NEON_URL = http://ftp.openbsd.org/pub/OpenBSD/distfiles/$(NEON_DIST)
SERF_URL = https://svn.apache.org/repos/asf/serf/tags/$(SERF_VER)
-SERF_OLD_URL = https://svn.apache.org/repos/asf/serf/tags/$(SERF_OLD_VER)
SQLITE_URL = https://www.sqlite.org/2017/$(SQLITE_DIST)
CYRUS_SASL_URL =
https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${CYRUS_SASL_VER}/$(CYRUS_SASL_DIST)
LIBMAGIC_URL = ftp://ftp.astron.com/pub/file/$(LIBMAGIC_DIST)
@@ -240,7 +238,6 @@ PCRE_SRCDIR = $(SRCDIR)/pcre-$(PCRE_VER)
HTTPD_SRCDIR = $(SRCDIR)/httpd-$(HTTPD_VER)
NEON_SRCDIR= $(SRCDIR)/neon-$(NEON_VER)
SERF_SRCDIR= $(SRCDIR)/serf-$(SERF_VER)
-SERF_OLD_SRCDIR= $(SRCDIR)/serf-$(SERF_OLD_VER)
SQLITE_SRCDIR = $(SRCDIR)/sqlite-autoconf-$(SQLITE_VER)
CYRUS_SASL_SRCDIR = $(SRCDIR)/cyrus-sasl-$(CYRUS_SASL_VER)
LIBMAGIC_SRCDIR= $(SRCDIR)/file-$(LIBMAGIC_VER)
@@ -263,7 +260,6 @@ PCRE_OBJDIR = $(OBJDIR)/pcre-$(PCRE_VER)
HTTPD_OBJDIR = $(OBJDIR)/httpd-$(HTTPD_VER)
NEON_OBJDIR= $(OBJDIR)/neon-$(NEON_VER)
SERF_OBJDIR= $(OBJDIR)/serf-$(SERF_VER)
-SERF_OLD_OBJDIR= $(OBJDIR)/serf-$(SERF_OLD_VER)
SQLITE_OBJDIR = $(OBJDIR)/sqlite-$(SQLITE_VER)
CYRUS_SASL_OBJDIR = $(OBJDIR)/cyrus-sasl-$(CYRUS_SASL_VER)
LIBMAGIC_OBJDIR= $(OBJDIR)/file-$(LIBMAGIC_VER)
@@ -300,7 +296,7 @@ PKG_CONFIG_PATH=$(PREFIX)/apr/lib/pkgcon
.PHONY: all reset clean nuke fetch
all: dirs-create bdb-install apr-install iconv-install apr-util-install \
- pcre-install httpd-install neon-install serf-install serf-old-install \
+ pcre-install httpd-install neon-install serf-install \
sqlite-install cyrus-sasl-install libmagic-install \
ruby-install bz2-install python-install python2-install py3c-retrieve \
gettext-install lz4-install swig-old-install svn-install \
@@ -308,13 +304,13 @@ all: dirs-create bdb-install apr-install
# Use these to start a build from the beginning.
reset: dirs-reset bdb-reset apr-reset iconv-reset apr-util-reset \
- pcre-reset httpd-reset neon-reset serf-reset serf-old-reset \
+ pcre-reset httpd-reset neon-reset serf-reset \
sqlite-reset cyrus-sasl-reset libmagic-reset ruby-reset python-reset \
python2-reset bz2-reset gettext-reset lz4-reset swig-old-reset svn-reset
# Use to save disk space.
clean: bdb-clean apr-clean iconv-clean apr-util-clean pcre-clean httpd-clean \
- neon-clean serf-clean serf-old-clean sqlite-clean cyrus-sasl-clean \
+ neon-clean serf-clean sqlite-clean cyrus-sasl-clean \
libmagic-clean ruby-clean bz2-clean python-clean python2-clean \
gettext-clean lz4-clean swig-old-clean svn-clean
@@ -966,50 +962,6 @@ $(SERF_OBJDIR)/.installed: $(SERF_OBJDIR
touch $@
###
-# serf-old (compatible with Subversion 1.5)
-###
-
-serf-old-retrieve: $(SERF_OLD_OBJDIR)/.retrieved
-serf-old-configure:$(SERF_OLD_OBJDIR)/.configured
-serf-old-compile: $(SERF_OLD_OBJDIR)/.compiled
-serf-old-install: $(SERF_OLD_OBJDIR)/.installed
-serf-old-reset:
- $(foreach f, .retrieved .configured .compiled .installed, \
- rm -f $(SERF_OLD_OBJDIR)/$(f);)
-
-serf-old-clean:
- -(cd $(SERF_OLD_SRCDIR) && ./serfmake clean)
-
-# retrieve serf if not present yet
-$(SERF_OLD_OBJDIR)/.retrieved:
- [ -d $(SERF_OLD_OBJDIR) ] || mkdir -p $(SERF_OLD_OBJDIR)
- if [ ! -d $(SERF_OLD_SRCDIR) ]; then \
- svn export $(SERF_OLD_URL) $(SERF_OLD_SRCDIR); \
- fi
- touch $@
-
-# compile serf (serf won't compile outside its source tree)
-$(SERF_OLD_OBJDIR)/.compiled: $(SERF_OLD_OBJDIR)/.retrieved \
- $(APR_UTIL_OBJDIR)/.installed
- cd $(SERF_OLD_SRCDIR) && \
- env CFLAGS="-O0 -g $(PROFILE_CFLAGS) -DAPR_POOL_DEBUG" \
-
svn commit: r1905427 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp
Date: Mon Nov 21 11:02:12 2022
New Revision: 1905427
URL: http://svn.apache.org/viewvc?rev=1905427=rev
Log:
* tools/dev/unix-build/Makefile.svn: Fix serf build with scons 3 and above.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1905427=1905426=1905427=diff
==
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Mon Nov 21 11:02:12 2022
@@ -937,6 +937,8 @@ $(SERF_OBJDIR)/.retrieved:
if [ ! -d $(SERF_SRCDIR) ]; then \
svn co $(SERF_URL) $(SERF_SRCDIR); \
svn merge ^/serf/branches/1.3.x-sslbuild@1781542
$(SERF_SRCDIR); \
+ svn merge -c 1811083 ^/serf/trunk@1811083 $(SERF_SRCDIR); \
+ svn merge -c 1814604 ^/serf/trunk@1814604 $(SERF_SRCDIR); \
fi
touch $@
@@ -945,7 +947,7 @@ $(SERF_OBJDIR)/.compiled: $(SERF_OBJDIR)
$(APR_UTIL_OBJDIR)/.installed
cd $(SERF_SRCDIR) && \
scons -j${MAKE_JOBS} DEBUG=1 \
- CFLAGS="-O0 -g $(PROFILE_CFLAGS) -DAPR_POOL_DEBUG" \
+ CFLAGS="-O0 -g $(PROFILE_CFLAGS) -fPIC
-DAPR_POOL_DEBUG" \
CC=$(CC) CXX=$(CXX) \
APR=$(PREFIX)/apr \
APU=$(PREFIX)/apr \
svn commit: r1899789 - /subversion/trunk/CHANGES
Author: stsp Date: Tue Apr 12 18:52:40 2022 New Revision: 1899789 URL: http://svn.apache.org/viewvc?rev=1899789=rev Log: * CHANGES: The fix for CVE-2021-28544 was a server-side fix, not client-side. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1899789=1899788=1899789=diff == --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Tue Apr 12 18:52:40 2022 @@ -15,12 +15,12 @@ Version 1.14.2 (12 Apr 2022, from /branches/1.14.x) User-visible changes: - Client-side bugfixes: -* Fix CVE-2021-28544: authz protected copyfrom paths regression (r1899227) * Fix -r option documentation for some svnadmin subcommands (r1896877) * Fix error message encoding when system() call fails (r1887641, r1890013) * Fix assertion failure in conflict resolver (r1892470, -471, -541) - Server-side bugfixes: +* Fix CVE-2021-28544: authz protected copyfrom paths regression (r1899227) * Fix CVE-2022-24070: use-after-free in mod_dav_svn (issue #4880) Developer-visible changes: @@ -300,10 +300,10 @@ Version 1.10.8 (12 Apr 2022, from /branches/1.10.x) User-visible changes: - Client-side bugfixes: -* Fix CVE-2021-28544: authz protected copyfrom paths regression (r1899227) * Fix merge assertion failure in svn_sort__array_insert (issue #4840) - Server-side bugfixes: +* Fix CVE-2021-28544: authz protected copyfrom paths regression (r1899227) * Fix CVE-2022-24070: use-after-free in mod_dav_svn (issue #4880) * Fix authz doesn't combine global and repository rules (issue #4762)
svn commit: r1899788 - /subversion/trunk/CHANGES
Author: stsp Date: Tue Apr 12 18:47:33 2022 New Revision: 1899788 URL: http://svn.apache.org/viewvc?rev=1899788=rev Log: * CHANGES: Refer to 1.14.2/1.10.8 security fixes by CVE number. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1899788=1899787=1899788=diff == --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Tue Apr 12 18:47:33 2022 @@ -15,13 +15,13 @@ Version 1.14.2 (12 Apr 2022, from /branches/1.14.x) User-visible changes: - Client-side bugfixes: -* Don't show unreadable copyfrom paths in 'svn log -v' (r1899227) +* Fix CVE-2021-28544: authz protected copyfrom paths regression (r1899227) * Fix -r option documentation for some svnadmin subcommands (r1896877) * Fix error message encoding when system() call fails (r1887641, r1890013) * Fix assertion failure in conflict resolver (r1892470, -471, -541) - Server-side bugfixes: -* Fix use-after-free of object-pools when running in httpd (issue #4880) +* Fix CVE-2022-24070: use-after-free in mod_dav_svn (issue #4880) Developer-visible changes: * Add test coverage for CVE-2020-17525 (r1883838 et al) @@ -300,11 +300,11 @@ Version 1.10.8 (12 Apr 2022, from /branches/1.10.x) User-visible changes: - Client-side bugfixes: -* Don't show unreadable copyfrom paths in 'svn log -v' (r1899227) +* Fix CVE-2021-28544: authz protected copyfrom paths regression (r1899227) * Fix merge assertion failure in svn_sort__array_insert (issue #4840) - Server-side bugfixes: -* Fix use-after-free of object-pools when running in httpd (issue #4880) +* Fix CVE-2022-24070: use-after-free in mod_dav_svn (issue #4880) * Fix authz doesn't combine global and repository rules (issue #4762) Developer-visible changes:
svn commit: r53598 - in /dev/subversion: subversion-1.10.8.tar.bz2.asc subversion-1.10.8.tar.gz.asc subversion-1.14.2.tar.bz2.asc subversion-1.14.2.tar.gz.asc
Author: stsp Date: Mon Apr 4 13:43:50 2022 New Revision: 53598 Log: add my signatures for 1.10.8 and 1.14.2 Modified: dev/subversion/subversion-1.10.8.tar.bz2.asc dev/subversion/subversion-1.10.8.tar.gz.asc dev/subversion/subversion-1.14.2.tar.bz2.asc dev/subversion/subversion-1.14.2.tar.gz.asc Modified: dev/subversion/subversion-1.10.8.tar.bz2.asc == --- dev/subversion/subversion-1.10.8.tar.bz2.asc (original) +++ dev/subversion/subversion-1.10.8.tar.bz2.asc Mon Apr 4 13:43:50 2022 @@ -21,3 +21,14 @@ Pe8aOrlPFsLl/lSYzHRQ8L4nrbrHdGhTyd/2kv2N 7JINqhWpGXf6hObFC+/7HxNdTUgC8uMp1y8dwPuFrMAv1Mb/pBk= =diLt -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- + +iQEzBAABCAAdFiEEi8Ta4MWk1l9ARAEHT326qZpZuXMFAmJK9eMACgkQT326qZpZ +uXOlAggAnhDjYRDBmaembQAOMEo7GEuoCVSWnmTGOfktmrqZMPEce7nDrOOqcQW1 +mxz6eruHf4R30CC/uKRsQbq9j5qDP/N/MbPAOlWUvkZiMWwbwMuiEOoMm1JYlG/s +DbLSF3SUwS8r5ofoBVv+AN3vg1//XnOTAH/Wh5HVVwOnyNL08yMVIqVyZ3Nfz8Vx +gLhybFK1hHIBpf5rad6B6IFabxuqV5C9G4TGJu7wZa4NIW7eRRY+eqO88D70T06D +n3dMoonkoCabpuiUVqMB9q66HCnEZVryf4878hfVvYQFjU34zZAXEQsv3Q0VxJaS +hluoyxXWqIJCxKlJGKuCQhzZrgKtGg== +=Zytq +-END PGP SIGNATURE- Modified: dev/subversion/subversion-1.10.8.tar.gz.asc == --- dev/subversion/subversion-1.10.8.tar.gz.asc (original) +++ dev/subversion/subversion-1.10.8.tar.gz.asc Mon Apr 4 13:43:50 2022 @@ -21,3 +21,14 @@ QLgQJrmAIgLMdy/Au9BZ6TChLKUETbH+ECcyXVj1 pgs+QLTKZWduVjvPygSsvs1ZGtwkDfixqiQH/ufNFu0ay1k00II= =V57K -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- + +iQEzBAABCAAdFiEEi8Ta4MWk1l9ARAEHT326qZpZuXMFAmJK9eMACgkQT326qZpZ +uXPIhAgAzR/pWjYONFN30R31/bJx10iodiERbjuS3G8ZqEQQAs1nT4vSHSH1pgub +dyoF/q3+iDbpvgqeigMm5Fp+iOchDU/8bG9b5rWdXkeEn88r4de2lw+ioEywcmv0 +CMa7nrxwnEPpd+IVBQ/BmWA9TqZhQK2IIRZ9trljX8ssva14J6YaJ7PhSaUWttgs +Qvf76mfW7N5t/2cW9jbdUEm9H+dIUwir2M/AwK3Utmb3MPSw6PCEFL+H7tCY1G6p +qPkkdxrzyglt5Lt/D2S3+nuCOzhmczQwG1IF6FNbyvW2Bf30xJPit54+3ISivS4k +yDJn4bplBOhtYnD4cEJjmhwirCm18A== +=qWf/ +-END PGP SIGNATURE- Modified: dev/subversion/subversion-1.14.2.tar.bz2.asc == --- dev/subversion/subversion-1.14.2.tar.bz2.asc (original) +++ dev/subversion/subversion-1.14.2.tar.bz2.asc Mon Apr 4 13:43:50 2022 @@ -37,3 +37,14 @@ Ed+Hk0Pj24KGsKMHONAXB0rd7kW2f9+tPKO2tK7x yCj77G9sJmyxGmE1Mb/UW6b7CCUo+Owb3+IsrntKxb4GFTwaVAE= =9MZA -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- + +iQEzBAABCAAdFiEEi8Ta4MWk1l9ARAEHT326qZpZuXMFAmJK9doACgkQT326qZpZ +uXNxqAf+PtDGZD4Qd1fJCns6eK18lIU8xBMy1Q+TxRp/RqtnSg075osJGevvCsmZ +syn8JcoPFzc+EzX94bOLAFbcnxC+FZTyAiMMCcnmLO+uGUfMMGxUTiXV8Vkc9VHJ +WDKqKfzjDbmSGBmb4nKMyChbpfWFyw5INnPxxCA4GDjYqavlA+RsDx2efwtD3zWz +SNa0Ww8aQyWD9hSY8MU/iVNkajEE1fVIxHjAuHlvyTYPZr7jEavpQoMLMiKKiJJG +mLpEpPvfud92D4TaxKK/nFbdn2XKfEVZ61/0hstj7B/BZnufBFsWVNmU6fXbfnGg +RgLNgPYXMeozlwq2d6eh340NKcSrCQ== +=hC7u +-END PGP SIGNATURE- Modified: dev/subversion/subversion-1.14.2.tar.gz.asc == --- dev/subversion/subversion-1.14.2.tar.gz.asc (original) +++ dev/subversion/subversion-1.14.2.tar.gz.asc Mon Apr 4 13:43:50 2022 @@ -37,3 +37,14 @@ BsLDJNlz/TaH9eR2QJZlL9m3ZpKIcLNNGZrJ9zDW LygsrocDwqsMluLnfWf+quADxiebMvj5F/T4yFhQKmlynFnq4K4= =iVJF -END PGP SIGNATURE- +-BEGIN PGP SIGNATURE- + +iQEzBAABCAAdFiEEi8Ta4MWk1l9ARAEHT326qZpZuXMFAmJK9doACgkQT326qZpZ +uXNQvQf/bLxThHqK1pbHkej4vKyzM+siMyQPoYN5JiGFKs8Mxht/Bf+6Gq9Kopr6 +XMRl3vDU7WWW9E3sS5ygH0JKkm+BaF41ahPzirM7m+dDNb4UdSpWcT7WjG+O3DAV +lMzojsshu9T9/KRcjIAO0el/cCyrOFmj2LXxRgHVYBCozJU8uFl+971og7hNeO0v +R+NYtdUo9AzvUzbDNrFRsViisyfrjgxD7LQw1V74tiNwPPuPmIUDmktqzWM0AJ2v +syPfSNx+pkLlt0ej8c9reiJC+ngduQQEuBwqljsxDf3MTS2dQkxq3IeVlB38RyRx +tFvtSbzWKuMGWRpi1QmgdKHnU/c4ug== +=6zzL +-END PGP SIGNATURE-
svn commit: r1899553 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp
Date: Mon Apr 4 11:36:28 2022
New Revision: 1899553
URL: http://svn.apache.org/viewvc?rev=1899553=rev
Log:
* tools/dev/unix-build/Makefile.svn: Use swig 3 for SVN branches < 1.14.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1899553=1899552=1899553=diff
==
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Mon Apr 4 11:36:28 2022
@@ -132,6 +132,7 @@ PY3C_VER= 1.1
JUNIT_VER = 4.10
GETTEXT_VER= 0.19.8.1
LZ4_VER= 1.7.5
+SWIG_OLD_VER = 3.0.12
BDB_DIST = db-$(BDB_VER).tar.gz
APR_ICONV_DIST = apr-iconv-$(APR_ICONV_VER).tar.gz
@@ -150,6 +151,7 @@ PY3C_DIST = py3c-$(PY3C_VER).tar.gz
JUNIT_DIST = junit-${JUNIT_VER}.jar
GETTEXT_DIST = gettext-$(GETTEXT_VER).tar.gz
LZ4_DIST = lz4-$(LZ4_VER).tar.gz
+SWIG_OLD_DIST = swig-$(SWIG_OLD_VER).tar.gz
SHA256_${BDB_DIST} =
f14fd96dd38915a1d63dcb94a63fbb8092334ceba6b5060760427096f631263e
SHA256_${APR_ICONV_DIST} =
19381959d50c4a5f3b9c84d594a5f9ffb3809786919b3058281f4c87e1f4b245
@@ -168,6 +170,7 @@ SHA256_${PY3C_DIST} = c7ffc22bc92dded0ca
SHA256_${JUNIT_DIST} =
36a747ca1e0b86f6ea88055b8723bb87030d627766da6288bf077afdeeb0f75a
SHA256_${GETTEXT_DIST} =
ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43
SHA256_${LZ4_DIST} =
0190cacd63022ccb86f44fa5041dc6c3804407ad61550ca21c382827319e7e7e
+SHA256_${SWIG_OLD_DIST} =
7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d
define do_check_sha256
if [ -x /bin/sha256 ]; then \
@@ -197,7 +200,8 @@ DISTFILES = $(DISTDIR)/$(NEON_DIST) \
$(DISTDIR)/$(PYTHON2_DIST) \
$(DISTDIR)/$(PY3C_DIST) \
$(DISTDIR)/$(JUNIT_DIST) \
- $(DISTDIR)/$(GETTEXT_DIST)
+ $(DISTDIR)/$(GETTEXT_DIST) \
+ $(DISTDIR)/$(SWIG_OLD_DIST)
FETCH_CMD = wget -c
@@ -224,6 +228,7 @@ PY3C_URL= https://stsp.name/distfiles/p
JUNIT_URL = https://stsp.name/distfiles/$(JUNIT_DIST)
GETTEXT_URL= https://ftp.gnu.org/pub/gnu/gettext/$(GETTEXT_DIST)
LZ4_URL= https://github.com/lz4/lz4/archive/v$(LZ4_VER).tar.gz
+SWIG_OLD_URL =
https://downloads.sourceforge.net/sourceforge/swig/swig-$(SWIG_OLD_VER).tar.gz
BDB_SRCDIR = $(SRCDIR)/db-$(BDB_VER)
@@ -246,6 +251,7 @@ PYTHON2_SRCDIR = $(SRCDIR)/Python-$(PYTH
PY3C_SRCDIR= $(SRCDIR)/py3c-$(PY3C_VER)
GETTEXT_SRCDIR = $(SRCDIR)/gettext-$(GETTEXT_VER)
LZ4_SRCDIR = ${SRCDIR}/lz4-$(LZ4_VER)
+SWIG_OLD_SRCDIR= ${SRCDIR}/swig-$(SWIG_OLD_VER)
SVN_SRCDIR = $(SVN_WC)
BDB_OBJDIR = $(OBJDIR)/db-$(BDB_VER)
@@ -268,6 +274,7 @@ PYTHON2_OBJDIR = $(OBJDIR)/python-$(PYTH
PY3C_OBJDIR= $(OBJDIR)/py3c-$(PY3C_VER)
GETTEXT_OBJDIR = $(OBJDIR)/gettext-$(GETTEXT_VER)
LZ4_OBJDIR = ${OBJDIR}/lz4-$(LZ4_VER)
+SWIG_OLD_OBJDIR= ${OBJDIR}/swig-$(SWIG_OLD_VER)
SVN_OBJDIR = $(OBJDIR)/$(SVN_REL_WC)
# Tweak this for out-of-tree builds. Note that running individual
@@ -296,19 +303,20 @@ all: dirs-create bdb-install apr-install
pcre-install httpd-install neon-install serf-install serf-old-install \
sqlite-install cyrus-sasl-install libmagic-install \
ruby-install bz2-install python-install python2-install py3c-retrieve \
- gettext-install lz4-install svn-install svn-bindings-install
+ gettext-install lz4-install swig-old-install svn-install \
+ svn-bindings-install
# Use these to start a build from the beginning.
reset: dirs-reset bdb-reset apr-reset iconv-reset apr-util-reset \
pcre-reset httpd-reset neon-reset serf-reset serf-old-reset \
sqlite-reset cyrus-sasl-reset libmagic-reset ruby-reset python-reset \
- python2-reset bz2-reset gettext-reset lz4-reset svn-reset
+ python2-reset bz2-reset gettext-reset lz4-reset swig-old-reset svn-reset
# Use to save disk space.
clean: bdb-clean apr-clean iconv-clean apr-util-clean pcre-clean httpd-clean \
neon-clean serf-clean serf-old-clean sqlite-clean cyrus-sasl-clean \
libmagic-clean ruby-clean bz2-clean python-clean python2-clean \
- gettext-clean lz4-clean svn-clean
+ gettext-clean lz4-clean swig-old-clean svn-clean
# Nukes everything (including installed binaries!)
# Use this to start ALL OVER AGAIN! Use with caution!
@@ -1636,6 +1644,56 @@ $(LZ4_OBJDIR)/.installed: $(LZ4_OBJDIR)/
touch $@
###
+# swig-old
+###
+
+swig-old-retrieve: $(SWIG_OLD_OBJDIR)/.retrieved
+swig-old-configure:$(SWIG_OLD_OBJDIR)/.configured
+swig-old-comp
svn commit: r1899494 - /subversion/branches/1.10.x/CHANGES
Author: stsp Date: Fri Apr 1 15:05:47 2022 New Revision: 1899494 URL: http://svn.apache.org/viewvc?rev=1899494=rev Log: * CHANGES (1.10.x): Sync merge with CHANGES from trunk, resolving conflicts. Modified: subversion/branches/1.10.x/CHANGES (contents, props changed) Modified: subversion/branches/1.10.x/CHANGES URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/CHANGES?rev=1899494=1899493=1899494=diff == --- subversion/branches/1.10.x/CHANGES (original) +++ subversion/branches/1.10.x/CHANGES Fri Apr 1 15:05:47 2022 @@ -37,7 +37,7 @@ Version 1.10.7 * mod_dav_svn: Fix missing Last-Modified header on 'external' GET requests (r1866425) * Fix formatting type size mismatches in FSFS (r1865987, -8) * Fix an undefined behavior problem in FSFS caching code (r1876054) -* Fix a potential NULL dereference in the config file parser (r1886019) +* Fix CVE-2020-17525: NULL dereference in mod_authz_svn (r1886019) Developer-visible changes: * Fix Requires(.private) fields in pkg-config files (r1863987, -90) Propchange: subversion/branches/1.10.x/CHANGES -- Merged /subversion/trunk/CHANGES:r1886195-1899485
svn commit: r1899493 - /subversion/branches/1.10.x/CHANGES
Author: stsp Date: Fri Apr 1 15:03:27 2022 New Revision: 1899493 URL: http://svn.apache.org/viewvc?rev=1899493=rev Log: * CHANGES (1.10.x): Merge r1899491 from trunk. Modified: subversion/branches/1.10.x/CHANGES (contents, props changed) Modified: subversion/branches/1.10.x/CHANGES URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/CHANGES?rev=1899493=1899492=1899493=diff == --- subversion/branches/1.10.x/CHANGES (original) +++ subversion/branches/1.10.x/CHANGES Fri Apr 1 15:03:27 2022 @@ -12,12 +12,12 @@ Version 1.10.8 * Fix merge assertion failure in svn_sort__array_insert (issue #4840) - Server-side bugfixes: -* Fix Use-after-free of object-pools when running in httpd (issue #4880 r1894734) -* Fix authz doesn't combine global and repository rules (issue #4762 r1835049, r1882326) +* Fix use-after-free of object-pools when running in httpd (issue #4880) +* Fix authz doesn't combine global and repository rules (issue #4762) Developer-visible changes: -* Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref) (r1883838, r1883989, r1886460, r1886582, r1892121, r1884474) -* Fix «make davautocheck» failure because of an unbuilt dependency. (r1891908) +* Add test coverage for CVE-2020-17525 (r1883838 et al) +* Fix «make davautocheck» failure due to unbuilt dependency (r1891908) * Follow up to r1866587, r1866588: Unbreak a msgid (r1887704) * Remove incorrect include paths from svn_cv_ruby_includes (r1875602) Propchange: subversion/branches/1.10.x/CHANGES -- Merged /subversion/trunk/CHANGES:r1899491
svn commit: r1899492 - /subversion/branches/1.14.x/CHANGES
Author: stsp Date: Fri Apr 1 14:57:43 2022 New Revision: 1899492 URL: http://svn.apache.org/viewvc?rev=1899492=rev Log: CHANGES (1.14.x): Merge from trunk. Modified: subversion/branches/1.14.x/CHANGES (contents, props changed) Modified: subversion/branches/1.14.x/CHANGES URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/CHANGES?rev=1899492=1899491=1899492=diff == --- subversion/branches/1.14.x/CHANGES (original) +++ subversion/branches/1.14.x/CHANGES Fri Apr 1 14:57:43 2022 @@ -9,25 +9,28 @@ Version 1.14.2 User-visible changes: - Client-side bugfixes: * Don't show unreadable copyfrom paths in 'svn log -v' (r1899227) -* Fix misleading -r option documentation for some svnadmin subcommands (r1896877) -* Fix encoding of error message on failure of system() call (r1887641, r1890013) -* Fix an assertion failure triggered by the conflict resolver (r1892470, r1892471, r1892541) +* Fix -r option documentation for some svnadmin subcommands (r1896877) +* Fix error message encoding when system() call fails (r1887641, r1890013) +* Fix assertion failure in conflict resolver (r1892470, -471, -541) + User-visible changes: + - Client-side improvements and bugfixes: +* Support multiple working copy formats (1.8-onward, 1.15) (issue #) - Server-side bugfixes: -* Fix Use-after-free of object-pools when running in httpd (issue #4880 r1894734) +* Fix use-after-free of object-pools when running in httpd (issue #4880) Developer-visible changes: -* Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref) (r1883838, r1883989, r1886460, r1886582, r1892121, r1884474) -* Fix «make davautocheck» failure because of an unbuilt dependency (r1891908) +* Add test coverage for CVE-2020-17525 (r1883838 et al) +* Fix «make davautocheck» failure due to unbuilt dependency (r1891908) * Follow up to r1866587, r1866588: Unbreak a msgid. (r1887704) -* swig-py: Fix doubly destroying memory pool with cyclic garbage collector (r1889487) -* swig-py: Skip some tests on Python 2 if default encoding is 'utf-8' (r1885199) +* swig-py: Fix double-free with cyclic garbage collector (r1889487) +* swig-py: Skip some tests on Python2 if encoding is 'utf-8' (r1885199) * swig-py: Fix dependency of make copy-swig-py target (r1886708) * Document how the port number is passed to custom tunnels (r1889629) * tests: Include additional information in an error message (r1897449) * Fix an error message when running make davautocheck (r1892121) * Use the APR-1.4+ API for flushing file contents to disk (r1883355) -* JavaHL: Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure (r1898633) +* JavaHL: Fix RequestChannel_nativeRead_AfterException failure (r1898633) Version 1.14.1 (10 Feb 2021, from /branches/1.14.x) @@ -48,7 +51,7 @@ Version 1.14.1 * Make the hot-backup.py script work with Python 3 (r1878855, r1878859) * Fix an uninitialized read in FSFS (r1880374) * Make mailer.py work properly with Python 3 (r1884427 et al) -* Fix a potential NULL dereference in the config file parser (r1886019) +* Fix CVE-2020-17525: NULL dereference in mod_authz_svn (r1886019) Developer-visible changes: - General: @@ -69,7 +72,7 @@ Version 1.14.1 * Fix crash in JavaHL JNI wrapper caused by object lifetimes (r1880886) * autogen.sh: Remove .swig_*_checked files from release tarballs (r1878413) * Avoid version check for Python if --without-swig is used (r1876662) -* siwg-py: Fix a syntax error for Python 3.6 and later (r1885112) +* swig-py: Fix a syntax error for Python 3.6 and later (r1885112) * Fix several crashes and JNI warnings in javahl TunnelAgent (r1886029) Version 1.14.0 @@ -289,6 +292,22 @@ http://svn.apache.org/repos/asf/subversi * Enable building against Java 10 (r1841180 et al) * Fix a potential crash in JavaHL (issue #4764) +Version 1.10.8 +(12 Apr 2022, from /branches/1.10.x) + User-visible changes: + - Client-side bugfixes: +* Don't show unreadable copyfrom paths in 'svn log -v' (r1899227) +* Fix merge assertion failure in svn_sort__array_insert (issue #4840) + + - Server-side bugfixes: +* Fix use-after-free of object-pools when running in httpd (issue #4880) +* Fix authz doesn't combine global and repository rules (issue #4762) + + Developer-visible changes: +* Add test coverage for CVE-2020-17525 (r1883838 et al) +* Fix «make davautocheck» failure due to unbuilt dependency (r1891908) +* Follow up to r1866587, r1866588: Unbreak a msgid (r1887704) +* Remove incorrect include paths from svn_cv_ruby_includes (r1875602) Version 1.10.7 (10 Feb 2021, from /branches/1.10.x) @@ -306,7 +325,7 @@ Version 1.10.7 * mod_dav_svn: Fix missing Last-Modified header on 'external' GET requests (r1866425
svn commit: r1899491 - /subversion/trunk/CHANGES
Author: stsp Date: Fri Apr 1 14:43:34 2022 New Revision: 1899491 URL: http://svn.apache.org/viewvc?rev=1899491=rev Log: * CHANGES: Shorten entries for 1.14.2 and 1.10.8 to fit in 80 columns. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1899491=1899490=1899491=diff == --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Fri Apr 1 14:43:34 2022 @@ -16,25 +16,25 @@ Version 1.14.2 User-visible changes: - Client-side bugfixes: * Don't show unreadable copyfrom paths in 'svn log -v' (r1899227) -* Fix misleading -r option documentation for some svnadmin subcommands (r1896877) -* Fix encoding of error message on failure of system() call (r1887641, r1890013) -* Fix an assertion failure triggered by the conflict resolver (r1892470, r1892471, r1892541) +* Fix -r option documentation for some svnadmin subcommands (r1896877) +* Fix error message encoding when system() call fails (r1887641, r1890013) +* Fix assertion failure in conflict resolver (r1892470, -471, -541) - Server-side bugfixes: -* Fix Use-after-free of object-pools when running in httpd (issue #4880 r1894734) +* Fix use-after-free of object-pools when running in httpd (issue #4880) Developer-visible changes: -* Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref) (r1883838, r1883989, r1886460, r1886582, r1892121, r1884474) -* Fix «make davautocheck» failure because of an unbuilt dependency (r1891908) +* Add test coverage for CVE-2020-17525 (r1883838 et al) +* Fix «make davautocheck» failure due to unbuilt dependency (r1891908) * Follow up to r1866587, r1866588: Unbreak a msgid. (r1887704) -* swig-py: Fix doubly destroying memory pool with cyclic garbage collector (r1889487) -* swig-py: Skip some tests on Python 2 if default encoding is 'utf-8' (r1885199) +* swig-py: Fix double-free with cyclic garbage collector (r1889487) +* swig-py: Skip some tests on Python2 if encoding is 'utf-8' (r1885199) * swig-py: Fix dependency of make copy-swig-py target (r1886708) * Document how the port number is passed to custom tunnels (r1889629) * tests: Include additional information in an error message (r1897449) * Fix an error message when running make davautocheck (r1892121) * Use the APR-1.4+ API for flushing file contents to disk (r1883355) -* JavaHL: Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure (r1898633) +* JavaHL: Fix RequestChannel_nativeRead_AfterException failure (r1898633) Version 1.14.1 (10 Feb 2021, from /branches/1.14.x) @@ -304,12 +304,12 @@ Version 1.10.8 * Fix merge assertion failure in svn_sort__array_insert (issue #4840) - Server-side bugfixes: -* Fix Use-after-free of object-pools when running in httpd (issue #4880 r1894734) -* Fix authz doesn't combine global and repository rules (issue #4762 r1835049, r1882326) +* Fix use-after-free of object-pools when running in httpd (issue #4880) +* Fix authz doesn't combine global and repository rules (issue #4762) Developer-visible changes: -* Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref) (r1883838, r1883989, r1886460, r1886582, r1892121, r1884474) -* Fix «make davautocheck» failure because of an unbuilt dependency. (r1891908) +* Add test coverage for CVE-2020-17525 (r1883838 et al) +* Fix «make davautocheck» failure due to unbuilt dependency (r1891908) * Follow up to r1866587, r1866588: Unbreak a msgid (r1887704) * Remove incorrect include paths from svn_cv_ruby_includes (r1875602)
svn commit: r1899298 - /subversion/branches/1.10.x/STATUS
Author: stsp Date: Mon Mar 28 11:17:18 2022 New Revision: 1899298 URL: http://svn.apache.org/viewvc?rev=1899298=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=1899297=1899298=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
Author: stsp Date: Mon Mar 28 11:11:26 2022 New Revision: 1899296 URL: http://svn.apache.org/viewvc?rev=1899296=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=1899295=1899296=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
Author: stsp Date: Mon Mar 28 11:09:40 2022 New Revision: 1899294 URL: http://svn.apache.org/viewvc?rev=1899294=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=1899293=1899294=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
Author: stsp Date: Mon Mar 28 11:03:53 2022 New Revision: 1899292 URL: http://svn.apache.org/viewvc?rev=1899292=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=1899291=1899292=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
Author: stsp Date: Mon Mar 28 10:58:56 2022 New Revision: 1899291 URL: http://svn.apache.org/viewvc?rev=1899291=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=1899290=1899291=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 propchange: r1896877 - svn:log
Author: stsp Revision: 1896877 Modified property: svn:log Modified: svn:log at Tue Jan 11 10:27:35 2022 -- --- svn:log (original) +++ svn:log Tue Jan 11 10:27:35 2022 @@ -1,6 +1,6 @@ Fix misleading -r option documentation for some svnadmin subcommands. -The commands delrevprop, lstxns, rev-size, and setrevprop accept only +The commands delrevprop, setlog, rev-size, and setrevprop accept only a single revision number. However, the -r option help text implied that a revision range was accepted. Correct the -r option help text of aforementioned commands. @@ -11,5 +11,5 @@ The new text omits the reference to a re -r [--revision] ARG : specify revision number ARG * subversion/svnadmin/svnadmin.c - (cmd_table): Override -r option description for the devrevprop, lsxtns, + (cmd_table): Override -r option description for the devrevprop, setlog, rev-size, and setrevprop commands.
svn commit: r1896878 - /subversion/branches/1.14.x/STATUS
Author: stsp Date: Mon Jan 10 11:46:01 2022 New Revision: 1896878 URL: http://svn.apache.org/viewvc?rev=1896878=rev Log: * STATUS: Nominate r1896877. 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=1896878=1896877=1896878=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Mon Jan 10 11:46:01 2022 @@ -115,6 +115,13 @@ Candidate changes: Votes: +1: stsp + * r1896877 +Fix misleading -r option documentation for some svnadmin subcommands. +Justification: + Documentation should be correct. +Votes: + +1: stsp + Veto-blocked changes: =
svn commit: r1896877 - /subversion/trunk/subversion/svnadmin/svnadmin.c
Author: stsp
Date: Mon Jan 10 11:44:46 2022
New Revision: 1896877
URL: http://svn.apache.org/viewvc?rev=1896877=rev
Log:
Fix misleading -r option documentation for some svnadmin subcommands.
The commands delrevprop, lstxns, rev-size, and setrevprop accept only
a single revision number. However, the -r option help text implied
that a revision range was accepted. Correct the -r option help text
of aforementioned commands.
The old text was:
-r [--revision] ARG : specify revision number ARG (or X:Y range)
The new text omits the reference to a revision range:
-r [--revision] ARG : specify revision number ARG
* subversion/svnadmin/svnadmin.c
(cmd_table): Override -r option description for the devrevprop, lsxtns,
rev-size, and setrevprop commands.
Modified:
subversion/trunk/subversion/svnadmin/svnadmin.c
Modified: subversion/trunk/subversion/svnadmin/svnadmin.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1896877=1896876=1896877=diff
==
--- subversion/trunk/subversion/svnadmin/svnadmin.c (original)
+++ subversion/trunk/subversion/svnadmin/svnadmin.c Mon Jan 10 11:44:46 2022
@@ -352,7 +352,8 @@ static const svn_opt_subcommand_desc3_t
"2. Delete the property NAME on transaction TXN.\n"
)},
{'r', 't', svnadmin__use_pre_revprop_change_hook,
-svnadmin__use_post_revprop_change_hook} },
+svnadmin__use_post_revprop_change_hook},
+ { {'r', "specify revision number ARG"} } },
{"deltify", subcommand_deltify, {0}, {N_(
"usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
@@ -541,7 +542,8 @@ static const svn_opt_subcommand_desc3_t
"The size includes revision properties and excludes FSFS indexes.\n"
)},
{'r', 'q', 'M'},
- { {'q', "print only the size and a newline"} } },
+ { {'r', "specify revision number ARG"},
+ {'q', "print only the size and a newline"} }, },
{"rmlocks", subcommand_rmlocks, {0}, {N_(
"usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n"
@@ -570,7 +572,8 @@ static const svn_opt_subcommand_desc3_t
"NOTE: Revision properties are not versioned, so this command will\n"
"overwrite the previous log message.\n"
)},
- {'r', svnadmin__bypass_hooks} },
+ {'r', svnadmin__bypass_hooks},
+ { {'r', "specify revision number ARG"} }, },
{"setrevprop", subcommand_setrevprop, {0}, {N_(
"usage: 1. svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n"
@@ -588,7 +591,8 @@ static const svn_opt_subcommand_desc3_t
"2. Set the property NAME on transaction TXN to the contents of FILE.\n"
)},
{'r', 't', svnadmin__use_pre_revprop_change_hook,
-svnadmin__use_post_revprop_change_hook} },
+svnadmin__use_post_revprop_change_hook},
+ { {'r', "specify revision number ARG"} }, },
{"setuuid", subcommand_setuuid, {0}, {N_(
"usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n"
svn commit: r1894736 - /subversion/branches/1.10.x/STATUS
Author: stsp Date: Thu Nov 4 14:56:30 2021 New Revision: 1894736 URL: http://svn.apache.org/viewvc?rev=1894736=rev Log: * STATUS (1.10.x): Nominate r1894734. 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=1894736=1894735=1894736=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Thu Nov 4 14:56:30 2021 @@ -64,6 +64,13 @@ 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 + Veto-blocked changes: =
svn commit: r1894735 - /subversion/branches/1.14.x/STATUS
Author: stsp Date: Thu Nov 4 14:56:12 2021 New Revision: 1894735 URL: http://svn.apache.org/viewvc?rev=1894735=rev Log: * STATUS: Nominate r1894734. 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=1894735=1894734=1894735=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Thu Nov 4 14:56:12 2021 @@ -108,6 +108,13 @@ 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 + Veto-blocked changes: =
svn commit: r1894734 - /subversion/trunk/subversion/libsvn_repos/authz.c
Author: stsp
Date: Thu Nov 4 14:53:30 2021
New Revision: 1894734
URL: http://svn.apache.org/viewvc?rev=1894734=rev
Log:
Fix issue #4880 "Use-after-free of object-pools when used as httpd module"
Ensure that we initialize authz again if the pool which our authz
caches depend on is cleared. Apache HTTPD may run pre/post config
hooks multiple times and clear its global configuration pool which
our authz caching pools depend on.
Reported-by: Thomas Weißschuh (thomas {at} t-8ch dot de)
Thomas has also confirmed that this patch fixes the problem.
* subversion/libsvn_repos/authz.c
(deinit_authz): New pool cleanup handler which resets authz initialization
in case the parent pool of our authz caches is cleared.
(synchronized_authz_initialize): Register new pool cleanup handler.
Modified:
subversion/trunk/subversion/libsvn_repos/authz.c
Modified: subversion/trunk/subversion/libsvn_repos/authz.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/authz.c?rev=1894734=1894733=1894734=diff
==
--- subversion/trunk/subversion/libsvn_repos/authz.c (original)
+++ subversion/trunk/subversion/libsvn_repos/authz.c Thu Nov 4 14:53:30 2021
@@ -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(_pool, multi_threaded, pool));
SVN_ERR(svn_object_pool__create(_pool, multi_threaded, pool));
+ apr_pool_cleanup_register(pool, NULL, deinit_authz, apr_pool_cleanup_null);
return SVN_NO_ERROR;
}
svn commit: r1894731 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp
Date: Thu Nov 4 13:23:21 2021
New Revision: 1894731
URL: http://svn.apache.org/viewvc?rev=1894731=rev
Log:
* tools/dev/unix-build/Makfile.svn: Update to ruby 2.7.4.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1894731=1894730=1894731=diff
==
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Thu Nov 4 13:23:21 2021
@@ -53,6 +53,12 @@ PWD = $(shell pwd)
UNAME = $(shell uname)
RUBY = $(shell which ruby 2>/dev/null)
ifeq ($(RUBY),)
+RUBY = $(shell which ruby27 2>/dev/null)
+ifeq ($(RUBY),)
+RUBY = $(shell which ruby26 2>/dev/null)
+ifeq ($(RUBY),)
+RUBY = $(shell which ruby25 2>/dev/null)
+ifeq ($(RUBY),)
RUBY = $(shell which ruby24 2>/dev/null)
ifeq ($(RUBY),)
RUBY = $(shell which ruby23 2>/dev/null)
@@ -73,6 +79,9 @@ endif # 2.1
endif # 2.2
endif # 2.3
endif # 2.4
+endif # 2.5
+endif # 2.6
+endif # 2.7
ifeq ($(UNAME),OpenBSD)
# Pick the correct base compiler (ie. clang rather than ancient gcc 4.2.1)
@@ -115,7 +124,7 @@ SERF_OLD_VER= 0.3.1
CYRUS_SASL_VER = 2.1.25
SQLITE_VER = 3160200
LIBMAGIC_VER = 5.30
-RUBY_VER = 2.4.4
+RUBY_VER = 2.7.4
BZ2_VER= 1.0.6
PYTHON_VER = 3.7.5
PYTHON2_VER= 2.7.13
@@ -151,7 +160,7 @@ SHA256_${NEON_DIST} = db0bd8cdec329b48f5
SHA256_${CYRUS_SASL_DIST} =
418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe
SHA256_${SQLITE_DIST} =
65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615
SHA256_${LIBMAGIC_DIST} =
694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214
-SHA256_${RUBY_DIST} =
254f1c1a79e4cc814d1e7320bc5bdd995dc57e08727d30a767664619a9c8ae5a
+SHA256_${RUBY_DIST} =
3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b
SHA256_${BZ2_DIST} =
a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
SHA256_${PYTHON_DIST} =
8ecc681ea0600bbfb366f2b173f727b205bb825d93d2f0b286bc4e58d37693da
SHA256_${PYTHON2_DIST} =
a4f05a0720ce0fd92626f0278b6b433eee9a6173ddf2bced7957dfb599a5ece1
@@ -207,7 +216,7 @@ SERF_OLD_URL= https://svn.apache.org/re
SQLITE_URL = https://www.sqlite.org/2017/$(SQLITE_DIST)
CYRUS_SASL_URL =
https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${CYRUS_SASL_VER}/$(CYRUS_SASL_DIST)
LIBMAGIC_URL = ftp://ftp.astron.com/pub/file/$(LIBMAGIC_DIST)
-RUBY_URL = https://cache.ruby-lang.org/pub/ruby/2.4/$(RUBY_DIST)
+RUBY_URL = https://cache.ruby-lang.org/pub/ruby/2.7/$(RUBY_DIST)
BZ2_URL= https://stsp.name/distfiles/$(BZ2_DIST)
PYTHON_URL = https://python.org/ftp/python/$(PYTHON_VER)/$(PYTHON_DIST)
PYTHON2_URL= https://python.org/ftp/python/$(PYTHON2_VER)/$(PYTHON2_DIST)
@@ -1241,33 +1250,6 @@ $(RUBY_OBJDIR)/sparc64_buserror.patch:
echo >> $@.tmp ' #ifdef STRICT_ALIGNMENT'
echo >> $@.tmp ' #if defined(HAVE_TRUE_LONG_LONG) && SIZEOF_LONG_LONG
> SIZEOF_VALUE'
echo >> $@.tmp ' #define ALIGNMENT_SIZE SIZEOF_LONG_LONG'
- echo >> $@.tmp '@@ -2094,7 +2104,8 @@'
- echo >> $@.tmp 'unref_destination(iobj, 0);'
- echo >> $@.tmp 'REMOVE_ELEM(>link);'
- echo >> $@.tmp '}'
- echo >> $@.tmp '- else if (iobj != diobj && IS_INSN_ID(diobj,
jump) &&'
- echo >> $@.tmp '+ else if (iobj != diobj && IS_INSN(>link)
&&'
- echo >> $@.tmp '+IS_INSN_ID(diobj, jump) &&'
- echo >> $@.tmp ' OPERAND_AT(iobj, 0) !=
OPERAND_AT(diobj, 0)) {'
- echo >> $@.tmp 'replace_destination(iobj, diobj);'
- echo >> $@.tmp 'remove_unreachable_chunk(iseq,
iobj->link.next);'
- echo >> $@.tmp '@@ -2136,6 +2147,7 @@'
- echo >> $@.tmp ' * L2:'
- echo >> $@.tmp ' */'
- echo >> $@.tmp 'else if ((piobj = (INSN *)get_prev_insn(iobj))
!= 0 &&'
- echo >> $@.tmp '+IS_INSN(>link) &&'
- echo >> $@.tmp ' (IS_INSN_ID(piobj, branchif) ||'
- echo >> $@.tmp ' IS_INSN_ID(piobj, branchunless))) {'
- echo >> $@.tmp 'if (niobj == (INSN
*)get_destination_insn(piobj)) {'
- echo >> $@.tmp '@@ -2176,7 +2188,7 @@'
- echo >> $@.tmp '}'
- echo >> $@.tmp ' '
- echo >> $@.tmp 'for (;;) {'
- echo >> $@.tmp '- if (IS_INSN_ID(no
svn commit: r1894730 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp
Date: Thu Nov 4 12:20:09 2021
New Revision: 1894730
URL: http://svn.apache.org/viewvc?rev=1894730=rev
Log:
* tools/dev/unix-build/Makfile.svn: Fix GNU libiconv build on machines
which do not have gcc installed.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1894730=1894729=1894730=diff
==
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Thu Nov 4 12:20:09 2021
@@ -556,6 +556,8 @@ $(GNU_ICONV_OBJDIR)/.retrieved: $(DISTDI
cd $(SRCDIR)/libiconv-$(GNU_ICONV_VER) && \
patch -p0 < $(GNU_ICONV_OBJDIR)/lib_encodings.def.diff && \
patch -p0 < $(GNU_ICONV_OBJDIR)/lib_aliases.gperf.diff
+ cd $(SRCDIR)/libiconv-${GNU_ICONV_VER} && \
+ sed -i 's/gcc/${CC}/' Makefile.devel
touch $@
# configure gnu-iconv
svn commit: r1892542 - /subversion/branches/1.14.x/STATUS
Author: stsp Date: Mon Aug 23 09:29:44 2021 New Revision: 1892542 URL: http://svn.apache.org/viewvc?rev=1892542=rev Log: * STATUS: Nominate 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=1892542=1892541=1892542=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Mon Aug 23 09:29:44 2021 @@ -98,13 +98,14 @@ Candidate changes: Votes: +1: danielsh, dsahlberg - * r1892470, r1892471 + * r1892470, r1892471, r1892541 Fix an assertion failure triggered by the conflict resolver. Justification: Subversion should not crash. User complained. Votes: +1: stsp - -1: dsahlberg (FAILURE in conflicts-test, see dev@, comments to r1892471) + -1: dsahlberg (without r1892541: + FAILURE in conflicts-test, see dev@, comments to r1892471) Veto-blocked changes: =
svn commit: r1892541 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Mon Aug 23 09:28:50 2021
New Revision: 1892541
URL: http://svn.apache.org/viewvc?rev=1892541=rev
Log:
Follow-up to r1892471:
Fix a regression where the resolver runs into a NULL-deref.
The wc_move_targets hash map is now always allocated and this exposed
missing NULL checks which resulted in attempts to search the hash map
with NULL keys. This was exposed by a segfault in the following test:
conflicts-test 45: cherry-pick edit from moved directory
* subversion/libsvn_client/conflicts.c
(resolve_incoming_move_file_text_merge,
resolve_local_move_dir_merge,
describe_incoming_move_merge_conflict_option,
svn_client_conflict_option_get_moved_to_abspath_candidates2,
svn_client_conflict_option_set_moved_to_abspath2): Ensure that we have
a valid hash key before searching the wc_move_targets hash map.
In all these cases this means that move_target_repos_relpath must
not be a NULL pointer.
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1892541=1892540=1892541=diff
==
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Aug 23 09:28:50
2021
@@ -8597,13 +8597,20 @@ resolve_incoming_move_file_text_merge(sv
* Merge from the local move's target location to the
* incoming move's target location. */
struct conflict_tree_local_missing_details *local_details;
- apr_array_header_t *moves;
local_details = conflict->tree_conflict_local_details;
- moves = svn_hash_gets(local_details->wc_move_targets,
-local_details->move_target_repos_relpath);
- merge_source_abspath =
-APR_ARRAY_IDX(moves, local_details->wc_move_target_idx, const char *);
+ if (local_details->wc_move_targets &&
+ local_details->move_target_repos_relpath)
+{
+ apr_array_header_t *moves;
+ moves = svn_hash_gets(local_details->wc_move_targets,
+local_details->move_target_repos_relpath);
+ merge_source_abspath =
+APR_ARRAY_IDX(moves, local_details->wc_move_target_idx,
+const char *);
+}
+ else
+merge_source_abspath = victim_abspath;
}
else
merge_source_abspath = victim_abspath;
@@ -9783,7 +9790,7 @@ resolve_local_move_dir_merge(svn_client_
NULL, conflict, scratch_pool,
scratch_pool));
- if (details->wc_move_targets)
+ if (details->wc_move_targets && details->move_target_repos_relpath)
{
apr_array_header_t *moves;
@@ -10732,7 +10739,8 @@ describe_incoming_move_merge_conflict_op
struct conflict_tree_incoming_delete_details *details;
details = conflict->tree_conflict_incoming_details;
- if (details->wc_move_targets)
+ if (details->wc_move_targets &&
+ details->move_target_repos_relpath)
{
apr_array_header_t *moves;
@@ -12265,7 +12273,7 @@ svn_client_conflict_option_get_moved_to_
*possible_moved_to_abspaths = apr_array_make(result_pool, 1,
sizeof (const char *));
- if (details->wc_move_targets)
+ if (details->wc_move_targets && details->move_target_repos_relpath)
{
apr_array_header_t *move_target_wc_abspaths;
move_target_wc_abspaths =
@@ -12459,7 +12467,7 @@ svn_client_conflict_option_set_moved_to_
svn_dirent_skip_ancestor(wcroot_abspath, preferred_sibling),
scratch_pool));
}
- else if (details->wc_move_targets)
+ else if (details->wc_move_targets && details->move_target_repos_relpath)
{
apr_array_header_t *move_target_wc_abspaths;
move_target_wc_abspaths =
svn commit: r1892472 - /subversion/branches/1.14.x/STATUS
Author: stsp Date: Fri Aug 20 12:43:11 2021 New Revision: 1892472 URL: http://svn.apache.org/viewvc?rev=1892472=rev Log: * STATUS: Nominate r1892470 and r1892471. 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=1892472=1892471=1892472=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Aug 20 12:43:11 2021 @@ -98,6 +98,13 @@ Candidate changes: Votes: +1: danielsh, dsahlberg + * r1892470, r1892471 + Fix an assertion failure triggered by the conflict resolver. + Justification: + Subversion should not crash. User complained. + Votes: + +1: stsp + Veto-blocked changes: =
svn commit: r1892471 - in /subversion/trunk/subversion: libsvn_client/conflicts.c libsvn_wc/wc_db.c tests/cmdline/merge_tree_conflict_tests.py
Author: stsp
Date: Fri Aug 20 12:39:20 2021
New Revision: 1892471
URL: http://svn.apache.org/viewvc?rev=1892471=rev
Log:
Fix an assertion failure triggered by the conflict resolver.
The resolver may need to deal with nodes of type 'none' but was using
a token map which does not support the 'none' type. Switch to a token
map which supports the 'none' type. This makes the regression test
added in r1892470 pass.
The above fix uncovered a different problem where the wc_move_targets
pointer in conflict details for a "local missing" node was left as NULL.
The assumption throughout the resolver is that this variable is initialized
to an empty array instead. Do this to avoid a NULL-deref which would
otherwise be triggered by the same regression test.
* subversion/libsvn_client/conflicts.c
(conflict_tree_get_details_local_missing): Always initialize the
details->wc_move_targets variable.
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_find_working_nodes_with_basename,
svn_wc__db_find_copies_of_repos_path): Use kind_map_none instead of
the regular kind_map which doesn't support the 'none' type.
* subversion/tests/cmdline/merge_tree_conflict_tests.py
(merge_local_missing_node_kind_none): Remove XFail marker.
Reported by: Joshua Kordani (jkordani {AT} roboticresearch dot com)
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1892471=1892470=1892471=diff
==
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Aug 20 12:39:20
2021
@@ -3028,12 +3028,12 @@ conflict_tree_get_details_local_missing(
deleted_basename,
conflict->pool);
details->moves = moves;
+ details->wc_move_targets = apr_hash_make(conflict->pool);
if (details->moves != NULL)
{
apr_pool_t *iterpool;
int i;
- details->wc_move_targets = apr_hash_make(conflict->pool);
iterpool = svn_pool_create(scratch_pool);
for (i = 0; i < details->moves->nelts; i++)
{
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1892471=1892470=1892471=diff
==
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Aug 20 12:39:20 2021
@@ -16732,7 +16732,7 @@ svn_wc__db_find_working_nodes_with_basen
SVN_ERR(svn_sqlite__get_statement(, wcroot->sdb,
STMT_SELECT_PRESENT_HIGHEST_WORKING_NODES_BY_BASENAME_AND_KIND));
SVN_ERR(svn_sqlite__bindf(stmt, "ist", wcroot->wc_id, basename,
-kind_map, kind));
+kind_map_none, kind));
SVN_ERR(svn_sqlite__step(_row, stmt));
*local_abspaths = apr_array_make(result_pool, 1, sizeof(const char *));
@@ -16776,7 +16776,7 @@ svn_wc__db_find_copies_of_repos_path(apr
SVN_ERR(svn_sqlite__get_statement(, wcroot->sdb,
STMT_SELECT_COPIES_OF_REPOS_RELPATH));
SVN_ERR(svn_sqlite__bindf(stmt, "ist", wcroot->wc_id, repos_relpath,
-kind_map, kind));
+kind_map_none, kind));
SVN_ERR(svn_sqlite__step(_row, stmt));
*local_abspaths = apr_array_make(result_pool, 1, sizeof(const char *));
Modified: subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1892471=1892470=1892471=diff
==
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
(original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Fri
Aug 20 12:39:20 2021
@@ -2364,7 +2364,6 @@ def spurios_tree_conflict_with_added_fil
[], False, True, '--reintegrate',
sbox.ospath('A_branch'))
-@XFail()
def merge_local_missing_node_kind_none(sbox):
"crash in resolver triggered by none-type node"
svn commit: r1892470 - /subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
Author: stsp
Date: Fri Aug 20 12:29:19 2021
New Revision: 1892470
URL: http://svn.apache.org/viewvc?rev=1892470=rev
Log:
Add a regression test for an assertion failure in the conflict resolver.
With tree conflicts involving a "local missing" node the node type recorded
in wc_db may be 'none'. The resolver attempts to resolve node types with a
token map which does not support the 'none' type. This results in a failing
assertion in libsvn_subr/token.c.
* subversion/tests/cmdline/merge_tree_conflict_tests.py
(merge_local_missing_node_kind_none): New test, based on a bash script
provided by Joshua Kordani which reproduced the bug.
(test_list): Add new test.
Reported by: Joshua Kordani (jkordani {AT} roboticresearch dot com)
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1892470=1892469=1892470=diff
==
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
(original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Fri
Aug 20 12:29:19 2021
@@ -2364,6 +2364,234 @@ def spurios_tree_conflict_with_added_fil
[], False, True, '--reintegrate',
sbox.ospath('A_branch'))
+@XFail()
+def merge_local_missing_node_kind_none(sbox):
+ "crash in resolver triggered by none-type node"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ sbox.simple_mkdir('branches')
+ sbox.simple_commit() # r2
+ sbox.simple_update()
+
+ # Create a feature branch of A
+ sbox.simple_copy('A', 'branches/feature1')
+ sbox.simple_commit() #r3
+ sbox.simple_update()
+
+ # On the branch, move file alpha to another directory
+ sbox.simple_move('branches/feature1/B/E/alpha',
+ 'branches/feature1/D/H/alpha-from-B-E')
+ sbox.simple_commit() # r4
+ sbox.simple_update()
+
+ # Cherry-pick the delete-half of the above move into A (the trunk)
+ expected_output = svntest.wc.State(sbox.ospath('A/B/E'), {
+'alpha' : Item(status='D '),
+ })
+ expected_mergeinfo_output = wc.State(sbox.ospath('A/B/E'), {
+'' : Item(status=' U')
+ })
+ expected_elision_output = wc.State(wc_dir, {
+ })
+ expected_disk = wc.State('', {
+'beta' : Item(contents="This is the file 'beta'.\n"),
+'.' : Item(props={u'svn:mergeinfo':
+ u'/branches/feature1/B/E:4'}),
+ })
+ expected_status = wc.State(sbox.ospath('A/B/E'), {
+'' : Item(status=' M', wc_rev='4'),
+'alpha' : Item(status='D ', wc_rev='4'),
+'beta' : Item(status=' ', wc_rev='4'),
+ })
+ expected_skip = wc.State('', {
+ })
+ svntest.actions.run_and_verify_merge(sbox.ospath('A/B/E'), 3, 4,
+ sbox.repo_url +
'/branches/feature1/B/E',
+ None,
+ expected_output,
+ expected_mergeinfo_output,
+ expected_elision_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ check_props=True)
+ sbox.simple_commit() # r5
+ sbox.simple_update()
+
+ # Create a new file on the feature branch
+ sbox.simple_add_text("This is the file 'pi'\n", 'branches/feature1/B/E/pi')
+ sbox.simple_commit() #r6
+ sbox.simple_update()
+
+ # Create a second branch based on the feature branch.
+ sbox.simple_copy('branches/feature1', 'branches/feature2')
+ sbox.simple_commit() #r7
+ sbox.simple_update()
+
+ # Create a new file kappa on this second branch
+ sbox.simple_add_text("This is the file 'kappa'\n",
+ 'branches/feature2/B/E/kappa')
+ sbox.simple_commit() #r8
+ sbox.simple_update()
+
+ # An unrelated additional change on the second branch.
+ sbox.simple_append('branches/feature2/B/E/beta',
+ "This is a change to file 'beta'.\n")
+ sbox.simple_commit() #r9
+ sbox.simple_update()
+
+ # Merge the second branch back into the feature branch
+ expected_output = svntest.wc.State(sbox.ospath('branches/feature1'), {
+'B/E/kappa' : Item(status='A '),
+'B/E/beta' : Item(status='U '),
+})
+ expected_mergeinfo_output = wc.State(sbox.ospath('branches/feature1'), {
+'.' : Item(status=' U'),
+ })
+ expected_elision_output = wc.State(wc_dir, {
+ })
+ expected_disk = wc.State('', {
+'C' : Item(),
+'B/E/kappa'
svn commit: r1892118 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Sun Aug 8 20:26:28 2021
New Revision: 1892118
URL: http://svn.apache.org/viewvc?rev=1892118=rev
Log:
Fix a NULL pointer dereference in the conflict resolver.
* subversion/libsvn_client/conflicts.c
(conflict_tree_get_details_local_missing): The find_related_node() helper
may return a NULL related_repo_relpath in some cases. Ensure that this
will not clobber the related_repo_relpath we already calculated and
bail out early in case we do end up with a NULL pointer.
Reported by: Joshua Kordani (jkordani {AT} roboticresearch dot com)
on users@ with a patch included in the report. Joshua kindly tested my
alternative fix for this issue and confirmed that it works as expected.
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1892118=1892117=1892118=diff
==
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Sun Aug 8 20:26:28
2021
@@ -2847,12 +2847,26 @@ conflict_tree_get_details_local_missing(
/* Make sure we're going to search the related node in a revision where
* it exists. The younger incoming node might have been deleted in HEAD. */
if (related_repos_relpath != NULL && related_peg_rev != SVN_INVALID_REVNUM)
-SVN_ERR(find_related_node(
- _repos_relpath, _peg_rev,
- related_repos_relpath, related_peg_rev,
- (old_rev < new_rev ? old_repos_relpath : new_repos_relpath),
- (old_rev < new_rev ? old_rev : new_rev),
- conflict, ctx, scratch_pool, scratch_pool));
+{
+ const char *older_related_repos_relpath;
+ svn_revnum_t older_related_peg_rev;
+ SVN_ERR(find_related_node(
+_related_repos_relpath, _related_peg_rev,
+related_repos_relpath, related_peg_rev,
+(old_rev < new_rev ? old_repos_relpath : new_repos_relpath),
+(old_rev < new_rev ? old_rev : new_rev),
+conflict, ctx, scratch_pool, scratch_pool));
+ if (older_related_repos_relpath != NULL &&
+ older_related_peg_rev != SVN_INVALID_REVNUM)
+{
+ related_repos_relpath = older_related_repos_relpath;
+ related_peg_rev = older_related_peg_rev;
+}
+}
+
+ /* Bail if we are unable to find the related node. */
+ if (related_repos_relpath == NULL || related_peg_rev == SVN_INVALID_REVNUM)
+return SVN_NO_ERROR;
/* Set END_REV to our best guess of the nearest YCA revision. */
url = svn_path_url_add_component2(repos_root_url, related_repos_relpath,
svn commit: r1890328 - in /subversion/site/publish: ./ faq.html
Author: stsp Date: Sun May 30 20:47:22 2021 New Revision: 1890328 URL: http://svn.apache.org/viewvc?rev=1890328=rev Log: * publish: Merge from staging. Modified: subversion/site/publish/ (props changed) subversion/site/publish/faq.html Propchange: subversion/site/publish/ -- Merged /subversion/site/staging:r1890319-1890327 Modified: subversion/site/publish/faq.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1890328=1890327=1890328=diff == --- subversion/site/publish/faq.html (original) +++ subversion/site/publish/faq.html Sun May 30 20:47:22 2021 @@ -710,7 +710,7 @@ other resources available: moderated) The Subversion Users IRC channel #svn on irc.libera.chat (use the https://web.libera.chat/?channel=#svn;>web interface or - http://libera.chat;>Matrix or + https://matrix.to/#/#svn:libera.chat;>Matrix or any IRC software; archived https://colabti.org/irclogger/irclogger_logs/svn;>here). (The IRC channel was hosted on freenode.net until May 2021. It may still exist
svn commit: r1890327 - /subversion/site/staging/faq.html
Author: stsp Date: Sun May 30 20:46:25 2021 New Revision: 1890327 URL: http://svn.apache.org/viewvc?rev=1890327=rev Log: * staging/faq.html: Fix LiberaChat Matrix bridge URL, as confirmed by Julian. Modified: subversion/site/staging/faq.html Modified: subversion/site/staging/faq.html URL: http://svn.apache.org/viewvc/subversion/site/staging/faq.html?rev=1890327=1890326=1890327=diff == --- subversion/site/staging/faq.html (original) +++ subversion/site/staging/faq.html Sun May 30 20:46:25 2021 @@ -710,7 +710,7 @@ other resources available: moderated) The Subversion Users IRC channel #svn on irc.libera.chat (use the https://web.libera.chat/?channel=#svn;>web interface or - http://libera.chat;>Matrix or + https://matrix.to/#/#svn:libera.chat;>Matrix or any IRC software; archived https://colabti.org/irclogger/irclogger_logs/svn;>here). (The IRC channel was hosted on freenode.net until May 2021. It may still exist
svn commit: r1890319 - in /subversion/site/publish: ./ faq.html
Author: stsp Date: Sun May 30 07:41:14 2021 New Revision: 1890319 URL: http://svn.apache.org/viewvc?rev=1890319=rev Log: * publish: Merge from staging. Modified: subversion/site/publish/ (props changed) subversion/site/publish/faq.html Propchange: subversion/site/publish/ -- Merged /subversion/site/staging:r1890281-1890318 Modified: subversion/site/publish/faq.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1890319=1890318=1890319=diff == --- subversion/site/publish/faq.html (original) +++ subversion/site/publish/faq.html Sun May 30 07:41:14 2021 @@ -710,8 +710,7 @@ other resources available: moderated) The Subversion Users IRC channel #svn on irc.libera.chat (use the https://web.libera.chat/?channel=#svn;>web interface or - + http://libera.chat;>Matrix or any IRC software; archived https://colabti.org/irclogger/irclogger_logs/svn;>here). (The IRC channel was hosted on freenode.net until May 2021. It may still exist
svn commit: r1890318 - /subversion/site/staging/faq.html
Author: stsp Date: Sun May 30 07:40:26 2021 New Revision: 1890318 URL: http://svn.apache.org/viewvc?rev=1890318=rev Log: * staging/faq.html: Link to Libera's matrix bridge. Modified: subversion/site/staging/faq.html Modified: subversion/site/staging/faq.html URL: http://svn.apache.org/viewvc/subversion/site/staging/faq.html?rev=1890318=1890317=1890318=diff == --- subversion/site/staging/faq.html (original) +++ subversion/site/staging/faq.html Sun May 30 07:40:26 2021 @@ -710,8 +710,7 @@ other resources available: moderated) The Subversion Users IRC channel #svn on irc.libera.chat (use the https://web.libera.chat/?channel=#svn;>web interface or - + http://libera.chat;>Matrix or any IRC software; archived https://colabti.org/irclogger/irclogger_logs/svn;>here). (The IRC channel was hosted on freenode.net until May 2021. It may still exist
svn commit: r1890239 - in /subversion/site/staging: docs/community-guide/general.part.html faq.html
Author: stsp Date: Thu May 27 07:12:43 2021 New Revision: 1890239 URL: http://svn.apache.org/viewvc?rev=1890239=rev Log: Add links to libera.chat's new web interface. * staging/docs/community-guide/general.part.html, staging/faq.html: Link to web.libera.chat. Modified: subversion/site/staging/docs/community-guide/general.part.html subversion/site/staging/faq.html Modified: subversion/site/staging/docs/community-guide/general.part.html URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/community-guide/general.part.html?rev=1890239=1890238=1890239=diff == --- subversion/site/staging/docs/community-guide/general.part.html (original) +++ subversion/site/staging/docs/community-guide/general.part.html Thu May 27 07:12:43 2021 @@ -27,10 +27,8 @@ Subversion repository. To participate:< Join us on irc.libera.chat in the #svn-dev channel; archived https://colabti.org/irclogger/irclogger_logs/svn-dev;>here. - +or via the https://web.libera.chat/?channel=svn-dev; +>libera.chat IRC webchat interface. Modified: subversion/site/staging/faq.html URL: http://svn.apache.org/viewvc/subversion/site/staging/faq.html?rev=1890239=1890238=1890239=diff == --- subversion/site/staging/faq.html (original) +++ subversion/site/staging/faq.html Thu May 27 07:12:43 2021 @@ -709,8 +709,7 @@ other resources available: public archives, subscribe, unsubscribe; moderated) The Subversion Users IRC channel #svn on irc.libera.chat (use - + the https://web.libera.chat/?channel=#svn;>web interface or any IRC software; archived
svn commit: r1890219 - in /subversion/site/staging: docs/community-guide/general.part.html docs/community-guide/issues.part.html docs/community-guide/releasing.part.html docs/release-notes/1.14.html f
Author: stsp Date: Wed May 26 08:48:44 2021 New Revision: 1890219 URL: http://svn.apache.org/viewvc?rev=1890219=rev Log: On the staging web site, replace references to freenode with libera.chat. Two things which aren't available yet on the new libera.chat service: - webchat (kiwiirc.com seems to be recommended? need an official solution) - matrix bridge (apparently being worked on) I have wrapped our links to such services in HTML comment markers for now. * staging/docs/community-guide/general.part.html, staging/docs/community-guide/issues.part.html, staging/docs/community-guide/releasing.part.html, staging/docs/release-notes/1.14.html,. staging/faq.html, staging/faq.ja.html, staging/faq.zh.html, staging/opw.html: Freenode -> libera.chat Modified: subversion/site/staging/docs/community-guide/general.part.html subversion/site/staging/docs/community-guide/issues.part.html subversion/site/staging/docs/community-guide/releasing.part.html subversion/site/staging/docs/release-notes/1.14.html subversion/site/staging/faq.html subversion/site/staging/faq.ja.html subversion/site/staging/faq.zh.html subversion/site/staging/opw.html Modified: subversion/site/staging/docs/community-guide/general.part.html URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/community-guide/general.part.html?rev=1890219=1890218=1890219=diff == --- subversion/site/staging/docs/community-guide/general.part.html (original) +++ subversion/site/staging/docs/community-guide/general.part.html Wed May 26 08:48:44 2021 @@ -25,9 +25,13 @@ Subversion repository. To participate:< -Join us on irc.freenode.net #svn-dev or via the -https://webchat.freenode.net/?nick=visitorchannels=svn-dev; ->freenode IRC webchat interface. +Join us on irc.libera.chat in the #svn-dev channel. + + + Join the "dev", "commits", and "announce" mailing lists. Modified: subversion/site/staging/docs/community-guide/issues.part.html URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/community-guide/issues.part.html?rev=1890219=1890218=1890219=diff == --- subversion/site/staging/docs/community-guide/issues.part.html (original) +++ subversion/site/staging/docs/community-guide/issues.part.html Wed May 26 08:48:44 2021 @@ -80,7 +80,7 @@ caused smoke to pour out of your monitor judgement. But if you're not sure, go ahead and ask on the users mailing list first, mailto:us...@subversion.apache.org; >us...@subversion.apache.org, or ask in IRC, irc.freenode.net, channel #svn. +href="irc://irc.libera.chat/#svn">irc.libera.chat, channel #svn. You should also http://svn.apache.org/viewvc/subversion/site/staging/docs/community-guide/releasing.part.html?rev=1890219=1890218=1890219=diff == --- subversion/site/staging/docs/community-guide/releasing.part.html (original) +++ subversion/site/staging/docs/community-guide/releasing.part.html Wed May 26 08:48:44 2021 @@ -1414,7 +1414,7 @@ needs to be done about it. (If necessary be contacted via the announce-owner@ handle.) Update the topics in various Subversion-related IRC channels, such as -#svn and #svn-dev on freenode. +#svn and #svn-dev on libera.chat. If this is an X.Y.0 release, update the community support level at the very top of the STATUS files of any branches that have changed support Modified: subversion/site/staging/docs/release-notes/1.14.html URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.14.html?rev=1890219=1890218=1890219=diff == --- subversion/site/staging/docs/release-notes/1.14.html (original) +++ subversion/site/staging/docs/release-notes/1.14.html Wed May 26 08:48:44 2021 @@ -1772,7 +1772,7 @@ anything you imagine. https://subversion.apache.org/mailing-lists.html;> https://subversion.apache.org/mailing-lists.html -Or by IRC at irc.freenode.net: +Or by IRC at irc.libera.chat: #svn channel: User chat and help using Subversion #svn-dev channel: Get involved in development! Modified: subversion/site/staging/faq.html URL: http://svn.apache.org/viewvc/subversion/site/staging/faq.html?rev=1890219=1890218=1890219=diff == --- subversion/site/staging/faq.html (original) +++ subversion/site/staging/faq.html Wed May 26 08:48:44 2021 @@ -708,10 +708,12 @@ other resources available: (full details including public archives, subscribe, unsubscribe; moderated) - The Subversion Users IRC channel #svn on irc.freenode.net (use - https://webchat.freenode.net/?channels=#svn;>web interface - or https://matrix.to/#
svn commit: r1886861 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp Date: Tue Feb 23 20:54:00 2021 New Revision: 1886861 URL: http://svn.apache.org/viewvc?rev=1886861=rev Log: * tools/dev/unix-build/Makefile.svn: Force creation of the symlink from python to python2 in case the link already exists. This should unbreak failing builds on the svn-bb-openbsd buildbot. Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1886861=1886860=1886861=diff == --- subversion/trunk/tools/dev/unix-build/Makefile.svn (original) +++ subversion/trunk/tools/dev/unix-build/Makefile.svn Tue Feb 23 20:54:00 2021 @@ -1473,7 +1473,7 @@ $(PYTHON2_OBJDIR)/.retrieved: $(DISTDIR) chmod +x $(PYTHON2_SRCDIR)/setup.py cd $(PYTHON2_SRCDIR) && patch -p1 < $(DISTDIR)/python-issue12560.patch mkdir -p $(PYTHON2_OBJDIR)/bin - ln -s "`which python2`" $(PYTHON2_OBJDIR)/bin/python + ln -sf "`which python2`" $(PYTHON2_OBJDIR)/bin/python touch $@ # configure python 2
svn commit: r1886616 - /subversion/branches/1.10.x/STATUS
Author: stsp Date: Wed Feb 17 10:45:01 2021 New Revision: 1886616 URL: http://svn.apache.org/viewvc?rev=1886616=rev Log: * STATUS (1.10.x): Nominate test changes relataed to CVE-2020-17525. Reminded by: danielsh 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=1886616=1886615=1886616=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Wed Feb 17 10:45:01 2021 @@ -43,6 +43,11 @@ Candidate changes: Votes: +1: stsp, jcorvel + * r1883838, r1883989, r1886460, r1886582 +Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref) +Votes: + +1: stsp + Veto-blocked changes: =
svn commit: r1886614 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp Date: Wed Feb 17 09:56:10 2021 New Revision: 1886614 URL: http://svn.apache.org/viewvc?rev=1886614=rev Log: * tools/dev/unix-build/Makefile.svn: Reduce HTTPD debug log level to 'warn'. At log level 'debug' our tests generate enough logs to drive the ramdisk of my svn-bb-openbsd buildbot out of space within a few build runs. Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1886614=1886613=1886614=diff == --- subversion/trunk/tools/dev/unix-build/Makefile.svn (original) +++ subversion/trunk/tools/dev/unix-build/Makefile.svn Wed Feb 17 09:56:10 2021 @@ -1929,7 +1929,7 @@ $(HTTPD_CHECK_CONF): $(MOD_DONTDOTHAT_CO echo > $@.tmp '# httpd config for make check' echo >>$@.tmp 'ServerRoot "$(PREFIX)/httpd"' echo >>$@.tmp 'Listen localhost:$(HTTPD_CHECK_PORT)' - echo >>$@.tmp 'LogLevel debug' + echo >>$@.tmp 'LogLevel warn' echo >>$@.tmp 'LoadModule unixd_module modules/mod_unixd.so' echo >>$@.tmp 'LoadModule alias_module modules/mod_alias.so' echo >>$@.tmp 'LoadModule access_compat_module modules/mod_access_compat.so'
svn commit: r1886583 - /subversion/branches/1.14.x/STATUS
Author: stsp Date: Tue Feb 16 11:11:31 2021 New Revision: 1886583 URL: http://svn.apache.org/viewvc?rev=1886583=rev Log: * STATUS: Nominate test cases related to CVE-2020-17525. Suggested by: danielsh 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=1886583=1886582=1886583=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Tue Feb 16 11:11:31 2021 @@ -50,6 +50,11 @@ Candidate changes: Votes: +1: hartmannathan, stsp + * r1883838, r1883989, r1886460, r1886582 +Add test coverage for CVE-2020-17525 (mod_authz_svn NULL deref) +Votes: + +1: stsp + Veto-blocked changes: =
svn commit: r1886582 - /subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py
Author: stsp Date: Tue Feb 16 11:06:55 2021 New Revision: 1886582 URL: http://svn.apache.org/viewvc?rev=1886582=rev Log: * subversion/tests/cmdline/mod_authz_svn_tests.py (nonexistent_repos_relative_access_file): Fix typo in comment: CVS -> CVE Spotted by: danielsh Modified: subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py Modified: subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py?rev=1886582=1886581=1886582=diff == --- subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py Tue Feb 16 11:06:55 2021 @@ -1072,7 +1072,7 @@ def repos_relative_access_file(sbox): verify_gets(test_area_url, in_repos_authz_tests) -# test for the bug also known as CVS-2020-17525 +# test for the bug also known as CVE-2020-17525 @SkipUnless(svntest.main.is_ra_type_dav) def nonexistent_repos_relative_access_file(sbox): "repos-relative access file with bad repository URL"
svn commit: r1886461 - /subversion/trunk/CHANGES
Author: stsp Date: Fri Feb 12 10:51:53 2021 New Revision: 1886461 URL: http://svn.apache.org/viewvc?rev=1886461=rev Log: * CHANGES: Refer to CVE-2020-17525 Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1886461=1886460=1886461=diff == --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Fri Feb 12 10:51:53 2021 @@ -27,7 +27,7 @@ Version 1.14.1 * Make the hot-backup.py script work with Python 3 (r1878855, r1878859) * Fix an uninitialized read in FSFS (r1880374) * Make mailer.py work properly with Python 3 (r1884427 et al) -* Fix a potential NULL dereference in the config file parser (r1886019) +* Fix CVE-2020-17525: NULL dereference in mod_authz_svn (r1886019) Developer-visible changes: - General: @@ -285,7 +285,7 @@ Version 1.10.7 * mod_dav_svn: Fix missing Last-Modified header on 'external' GET requests (r1866425) * Fix formatting type size mismatches in FSFS (r1865987, -8) * Fix an undefined behavior problem in FSFS caching code (r1876054) -* Fix a potential NULL dereference in the config file parser (r1886019) +* Fix CVE-2020-17525: NULL dereference in mod_authz_svn (r1886019) Developer-visible changes: * Fix Requires(.private) fields in pkg-config files (r1863987, -90)
svn commit: r1886460 - /subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py
Author: stsp
Date: Fri Feb 12 10:40:16 2021
New Revision: 1886460
URL: http://svn.apache.org/viewvc?rev=1886460=rev
Log:
Add a test for the NULL deref issue also known as CVE-2020-17525.
* subversion/tests/cmdline/mod_authz_svn_tests.py
(nonexistent_repos_relative_access_file): New test.
Modified:
subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py?rev=1886460=1886459=1886460=diff
==
--- subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py Fri Feb 12
10:40:16 2021
@@ -1072,6 +1072,43 @@ def repos_relative_access_file(sbox):
verify_gets(test_area_url, in_repos_authz_tests)
+# test for the bug also known as CVS-2020-17525
+@SkipUnless(svntest.main.is_ra_type_dav)
+def nonexistent_repos_relative_access_file(sbox):
+ "repos-relative access file with bad repository URL"
+
+ sbox.build()
+
+ test_area_url = sbox.repo_url.replace('/svn-test-work/repositories/',
+'/authz-test-work/in-repos-authz/')
+
+ # Construct a bad test-area URL to see what happens if we attempt to access
+ # a repository in a subdirectory which does not exist in SVNParentPath.
+ # This used to crash the server with a NULL-pointer dereference upon
+ # unauthenticated access.
+ test_area_url += '-this/does/not/exist'
+
+ 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")
+
+ # access is denied across the board since this repository does not exist
+ 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': 403, },
+ { 'path': '/A/', 'user' : user1, 'pw' : user1_pass,
+ 'status': 403, },
+ )
+
+ verify_gets(test_area_url, in_repos_authz_tests)
+
# Run the tests
@@ -1089,6 +1126,7 @@ test_list = [ None,
authn_sallrany,
authn_sallrall,
repos_relative_access_file,
+ nonexistent_repos_relative_access_file,
]
serial_only = True
svn commit: r1886422 - in /subversion/trunk/tools/dist/templates: rc-release-ann.ezt stable-release-ann.ezt
Author: stsp Date: Thu Feb 11 11:27:00 2021 New Revision: 1886422 URL: http://svn.apache.org/viewvc?rev=1886422=rev Log: * dist/templates/rc-release-ann.ezt, dist/templates/stable-release-ann.ezt: Don't bother sending announcements to the Apache-wide announce list for now. Its moderators keep rejecting our announcements for dubious reasons. Modified: subversion/trunk/tools/dist/templates/rc-release-ann.ezt subversion/trunk/tools/dist/templates/stable-release-ann.ezt Modified: subversion/trunk/tools/dist/templates/rc-release-ann.ezt URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/templates/rc-release-ann.ezt?rev=1886422=1886421=1886422=diff == --- subversion/trunk/tools/dist/templates/rc-release-ann.ezt (original) +++ subversion/trunk/tools/dist/templates/rc-release-ann.ezt Thu Feb 11 11:27:00 2021 @@ -1,5 +1,5 @@ From: ...@apache.org -To: annou...@subversion.apache.org, us...@subversion.apache.org, d...@subversion.apache.org, annou...@apache.org +To: annou...@subversion.apache.org, us...@subversion.apache.org, d...@subversion.apache.org Reply-To: us...@subversion.apache.org Subject: [[]ANNOUNCE] Apache Subversion [version] released Modified: subversion/trunk/tools/dist/templates/stable-release-ann.ezt URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/templates/stable-release-ann.ezt?rev=1886422=1886421=1886422=diff == --- subversion/trunk/tools/dist/templates/stable-release-ann.ezt (original) +++ subversion/trunk/tools/dist/templates/stable-release-ann.ezt Thu Feb 11 11:27:00 2021 @@ -1,5 +1,5 @@ From: ...@apache.org -To: annou...@subversion.apache.org, us...@subversion.apache.org, d...@subversion.apache.org, annou...@apache.org +To: annou...@subversion.apache.org, us...@subversion.apache.org, d...@subversion.apache.org Reply-To: us...@subversion.apache.org [if-any security]Cc: secur...@apache.org, oss-secur...@lists.openwall.com, bugt...@securityfocus.com [end][if-any security]Subject: [[]SECURITY][[]ANNOUNCE] Apache Subversion [version] released
svn commit: r1886396 - in /subversion/site/publish: ./ doap.rdf docs/release-notes/release-history.html download.html
Author: stsp Date: Wed Feb 10 20:39:22 2021 New Revision: 1886396 URL: http://svn.apache.org/viewvc?rev=1886396=rev Log: site/publish: Merge from staging area. Modified: subversion/site/publish/ (props changed) subversion/site/publish/doap.rdf subversion/site/publish/docs/release-notes/release-history.html subversion/site/publish/download.html Propchange: subversion/site/publish/ -- Merged /subversion/site/staging:r1886391-1886395 Modified: subversion/site/publish/doap.rdf URL: http://svn.apache.org/viewvc/subversion/site/publish/doap.rdf?rev=1886396=1886395=1886396=diff == --- subversion/site/publish/doap.rdf (original) +++ subversion/site/publish/doap.rdf Wed Feb 10 20:39:22 2021 @@ -22,7 +22,7 @@ limitations under the License. --> http://subversion.apache.org/;> -2010-12-28 +2021-02-10 http://usefulinc.com/doap/licenses/asl20; /> Apache Subversion http://subversion.apache.org/; /> @@ -37,15 +37,15 @@ Current 1.14 LTS release -2020-05-27 -1.14.0 +2021-02-10 +1.14.1 Current 1.10 LTS release -2019-07-24 -1.10.6 +2021-02-10 +1.10.7 Modified: subversion/site/publish/docs/release-notes/release-history.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/release-history.html?rev=1886396=1886395=1886396=diff == --- subversion/site/publish/docs/release-notes/release-history.html (original) +++ subversion/site/publish/docs/release-notes/release-history.html Wed Feb 10 20:39:22 2021 @@ -31,6 +31,12 @@ Subversion 2.0. +Subversion 1.14.1 (Wednesday, 10 February 2021): Bugfix/security release. + + +Subversion 1.10.7 (Wednesday, 10 February 2021): Bugfix/security release. + + Subversion 1.14.0 (Wednesday, 27 May 2020): Feature and bugfix release, see the release notes. Modified: subversion/site/publish/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download.html?rev=1886396=1886395=1886396=diff == --- subversion/site/publish/download.html (original) +++ subversion/site/publish/download.html Wed Feb 10 20:39:22 2021 @@ -102,7 +102,7 @@ Other mirrors: title="Link to this section"> -Apache Subversion 1.14.0 LTS +Apache Subversion 1.14.1 LTS File @@ -111,20 +111,20 @@ Other mirrors: PGP Public Keys - subversion-1.14.0.tar.bz2 - [https://www.apache.org/dist/subversion/subversion-1.14.0.tar.bz2.sha512;>SHA-512] - [https://www.apache.org/dist/subversion/subversion-1.14.0.tar.bz2.asc;>PGP signatures] - [https://www.apache.org/dist/subversion/subversion-1.14.0.KEYS;>PGP keyring] + subversion-1.14.1.tar.bz2 + [https://www.apache.org/dist/subversion/subversion-1.14.1.tar.bz2.sha512;>SHA-512] + [https://www.apache.org/dist/subversion/subversion-1.14.1.tar.bz2.asc;>PGP signatures] + [https://www.apache.org/dist/subversion/subversion-1.14.1.KEYS;>PGP keyring] - subversion-1.14.0.tar.gz - [https://www.apache.org/dist/subversion/subversion-1.14.0.tar.gz.sha512;>SHA-512] - [https://www.apache.org/dist/subversion/subversion-1.14.0.tar.gz.asc;>PGP signatures] - [https://www.apache.org/dist/subversion/subversion-1.14.0.KEYS;>PGP keyring] + subversion-1.14.1.tar.gz + [https://www.apache.org/dist/subversion/subversion-1.14.1.tar.gz.sha512;>SHA-512] + [https://www.apache.org/dist/subversion/subversion-1.14.1.tar.gz.asc;>PGP signatures] + [https://www.apache.org/dist/subversion/subversion-1.14.1.KEYS;>PGP keyring] - subversion-1.14.0.zip - [https://www.apache.org/dist/subversion/subversion-1.14.0.zip.sha512;>SHA-512] - [https://www.apache.org/dist/subversion/subversion-1.14.0.zip.asc;>PGP signatures] - [https://www.apache.org/dist/subversion/subversion-1.14.0.KEYS;>PGP keyring] + subversion-1.14.1.zip + [https://www.apache.org/dist/subversion/subversion-1.14.1.zip.sha512;>SHA-512] + [https://www.apache.org/dist/subversion/subversion-1.14.1.zip.asc;>PGP signatures] + [https://www.apache.org/dist/subversion/subversion-1.14.1.KEYS;>PGP keyring] @@ -136,31 +136,29 @@ Other mirrors: title="Link to this section"> -Apache Subversion 1.10.6 LTS +Apache Subversion 1.10.7 LTS File Checksum (SHA512) Signatures + PGP Public Keys - subversion-1.10.6.tar.bz2 - - [https://www.apache.org/dist/subversion/subversion-1.10.6.tar.bz2.sha512;>SHA-512] - [https://www.apache.org/dist/subversion/subversion-1.10.6.tar.bz2.asc;>PGP] + subversion-1.10.7.tar.bz2 + [https://ww
svn commit: r1886395 - in /subversion/site/staging: doap.rdf docs/release-notes/release-history.html download.html
Author: stsp Date: Wed Feb 10 20:38:05 2021 New Revision: 1886395 URL: http://svn.apache.org/viewvc?rev=1886395=rev Log: Additional web site updates for the 1.14.1 and 1.10.7 releases. * staging/doap.rdf: Update version numbers. * staging/docs/release-notes/release-history.html: Add 1.14.1 and 1.10.7. * staging/download.html: Update download links. Pointed out by: dsahlberg Modified: subversion/site/staging/doap.rdf subversion/site/staging/docs/release-notes/release-history.html subversion/site/staging/download.html Modified: subversion/site/staging/doap.rdf URL: http://svn.apache.org/viewvc/subversion/site/staging/doap.rdf?rev=1886395=1886394=1886395=diff == --- subversion/site/staging/doap.rdf (original) +++ subversion/site/staging/doap.rdf Wed Feb 10 20:38:05 2021 @@ -22,7 +22,7 @@ limitations under the License. --> http://subversion.apache.org/;> -2010-12-28 +2021-02-10 http://usefulinc.com/doap/licenses/asl20; /> Apache Subversion http://subversion.apache.org/; /> @@ -37,15 +37,15 @@ Current 1.14 LTS release -2020-05-27 -1.14.0 +2021-02-10 +1.14.1 Current 1.10 LTS release -2019-07-24 -1.10.6 +2021-02-10 +1.10.7 Modified: subversion/site/staging/docs/release-notes/release-history.html URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/release-history.html?rev=1886395=1886394=1886395=diff == --- subversion/site/staging/docs/release-notes/release-history.html (original) +++ subversion/site/staging/docs/release-notes/release-history.html Wed Feb 10 20:38:05 2021 @@ -31,6 +31,12 @@ Subversion 2.0. +Subversion 1.14.1 (Wednesday, 10 February 2021): Bugfix/security release. + + +Subversion 1.10.7 (Wednesday, 10 February 2021): Bugfix/security release. + + Subversion 1.14.0 (Wednesday, 27 May 2020): Feature and bugfix release, see the release notes. Modified: subversion/site/staging/download.html URL: http://svn.apache.org/viewvc/subversion/site/staging/download.html?rev=1886395=1886394=1886395=diff == --- subversion/site/staging/download.html (original) +++ subversion/site/staging/download.html Wed Feb 10 20:38:05 2021 @@ -102,7 +102,7 @@ Other mirrors: title="Link to this section"> -Apache Subversion 1.14.0 LTS +Apache Subversion 1.14.1 LTS File @@ -111,20 +111,20 @@ Other mirrors: PGP Public Keys - subversion-1.14.0.tar.bz2 - [https://www.apache.org/dist/subversion/subversion-1.14.0.tar.bz2.sha512;>SHA-512] - [https://www.apache.org/dist/subversion/subversion-1.14.0.tar.bz2.asc;>PGP signatures] - [https://www.apache.org/dist/subversion/subversion-1.14.0.KEYS;>PGP keyring] + subversion-1.14.1.tar.bz2 + [https://www.apache.org/dist/subversion/subversion-1.14.1.tar.bz2.sha512;>SHA-512] + [https://www.apache.org/dist/subversion/subversion-1.14.1.tar.bz2.asc;>PGP signatures] + [https://www.apache.org/dist/subversion/subversion-1.14.1.KEYS;>PGP keyring] - subversion-1.14.0.tar.gz - [https://www.apache.org/dist/subversion/subversion-1.14.0.tar.gz.sha512;>SHA-512] - [https://www.apache.org/dist/subversion/subversion-1.14.0.tar.gz.asc;>PGP signatures] - [https://www.apache.org/dist/subversion/subversion-1.14.0.KEYS;>PGP keyring] + subversion-1.14.1.tar.gz + [https://www.apache.org/dist/subversion/subversion-1.14.1.tar.gz.sha512;>SHA-512] + [https://www.apache.org/dist/subversion/subversion-1.14.1.tar.gz.asc;>PGP signatures] + [https://www.apache.org/dist/subversion/subversion-1.14.1.KEYS;>PGP keyring] - subversion-1.14.0.zip - [https://www.apache.org/dist/subversion/subversion-1.14.0.zip.sha512;>SHA-512] - [https://www.apache.org/dist/subversion/subversion-1.14.0.zip.asc;>PGP signatures] - [https://www.apache.org/dist/subversion/subversion-1.14.0.KEYS;>PGP keyring] + subversion-1.14.1.zip + [https://www.apache.org/dist/subversion/subversion-1.14.1.zip.sha512;>SHA-512] + [https://www.apache.org/dist/subversion/subversion-1.14.1.zip.asc;>PGP signatures] + [https://www.apache.org/dist/subversion/subversion-1.14.1.KEYS;>PGP keyring] @@ -136,31 +136,29 @@ Other mirrors: title="Link to this section"> -Apache Subversion 1.10.6 LTS +Apache Subversion 1.10.7 LTS File Checksum (SHA512) Signatures + PGP Public Keys - subversion-1.10.6.tar.bz2 - - [https://www.apache.org/dist/subversion/subversion-1.10.6.tar.bz2.sha512;>SHA-512] - [https://www.apache.org/dist/subversion/subversion-1.10.6.tar.bz2.asc;>PGP] + subversion-1.10.7.tar.b
svn commit: r1886391 - in /subversion/site/publish: ./ index.html news.html
Author: stsp Date: Wed Feb 10 14:05:35 2021 New Revision: 1886391 URL: http://svn.apache.org/viewvc?rev=1886391=rev Log: * site/publish: Merge from staging area. Modified: subversion/site/publish/ (props changed) subversion/site/publish/index.html (contents, props changed) subversion/site/publish/news.html (contents, props changed) Propchange: subversion/site/publish/ -- Merged /subversion/site/staging:r1886389-1886390 Modified: subversion/site/publish/index.html URL: http://svn.apache.org/viewvc/subversion/site/publish/index.html?rev=1886391=1886390=1886391=diff == --- subversion/site/publish/index.html (original) +++ subversion/site/publish/index.html Wed Feb 10 14:05:35 2021 @@ -97,7 +97,7 @@ This is the most complete Subversion release to date, and we encourage users of Subversion to upgrade as soon as reasonable. Please see the - https://lists.apache.org/list.html?annou...@subversion.apache.org; + https://lists.apache.org/thread.html/rd55a46419a0ee994c9290cb2d5149d94f834584f1d78135390a4095b%40%3Cannounce.subversion.apache.org%3E; >release announcement and the release notes for more information about this release. @@ -117,7 +117,7 @@ This is the most complete release of the 1.10.x line to date, and we encourage all users to upgrade as soon as reasonable. Please see the - https://lists.apache.org/list.html?annou...@subversion.apache.org; + https://lists.apache.org/thread.html/r86eb93bd4e12c126203f61e9bd42f9a3905117842b481d20e15fd61f%40%3Cannounce.subversion.apache.org%3E; >release announcement and the release notes for more information about this release. Propchange: subversion/site/publish/index.html -- Merged /subversion/site/staging/index.html:r1886389-1886390 Modified: subversion/site/publish/news.html URL: http://svn.apache.org/viewvc/subversion/site/publish/news.html?rev=1886391=1886390=1886391=diff == --- subversion/site/publish/news.html (original) +++ subversion/site/publish/news.html Wed Feb 10 14:05:35 2021 @@ -53,7 +53,7 @@ This is the most complete Subversion release to date, and we encourage users of Subversion to upgrade as soon as reasonable. Please see the - https://lists.apache.org/list.html?annou...@subversion.apache.org; + https://lists.apache.org/thread.html/rd55a46419a0ee994c9290cb2d5149d94f834584f1d78135390a4095b%40%3Cannounce.subversion.apache.org%3E; >release announcement and the release notes for more information about this release. @@ -73,7 +73,7 @@ This is the most complete release of the 1.10.x line to date, and we encourage all users to upgrade as soon as reasonable. Please see the - https://lists.apache.org/list.html?annou...@subversion.apache.org; + https://lists.apache.org/thread.html/r86eb93bd4e12c126203f61e9bd42f9a3905117842b481d20e15fd61f%40%3Cannounce.subversion.apache.org%3E; >release announcement and the release notes for more information about this release. Propchange: subversion/site/publish/news.html -- Merged /subversion/site/staging/news.html:r1886387-1886390
svn commit: r1886390 - in /subversion/site/staging: index.html news.html
Author: stsp Date: Wed Feb 10 14:04:51 2021 New Revision: 1886390 URL: http://svn.apache.org/viewvc?rev=1886390=rev Log: * staging/index.html, staging/news.html: Update links to 1.14.1 and 1.10.7 release announcements. Modified: subversion/site/staging/index.html subversion/site/staging/news.html Modified: subversion/site/staging/index.html URL: http://svn.apache.org/viewvc/subversion/site/staging/index.html?rev=1886390=1886389=1886390=diff == --- subversion/site/staging/index.html (original) +++ subversion/site/staging/index.html Wed Feb 10 14:04:51 2021 @@ -97,7 +97,7 @@ This is the most complete Subversion release to date, and we encourage users of Subversion to upgrade as soon as reasonable. Please see the - https://lists.apache.org/list.html?annou...@subversion.apache.org; + https://lists.apache.org/thread.html/rd55a46419a0ee994c9290cb2d5149d94f834584f1d78135390a4095b%40%3Cannounce.subversion.apache.org%3E; >release announcement and the release notes for more information about this release. @@ -117,7 +117,7 @@ This is the most complete release of the 1.10.x line to date, and we encourage all users to upgrade as soon as reasonable. Please see the - https://lists.apache.org/list.html?annou...@subversion.apache.org; + https://lists.apache.org/thread.html/r86eb93bd4e12c126203f61e9bd42f9a3905117842b481d20e15fd61f%40%3Cannounce.subversion.apache.org%3E; >release announcement and the release notes for more information about this release. Modified: subversion/site/staging/news.html URL: http://svn.apache.org/viewvc/subversion/site/staging/news.html?rev=1886390=1886389=1886390=diff == --- subversion/site/staging/news.html (original) +++ subversion/site/staging/news.html Wed Feb 10 14:04:51 2021 @@ -53,7 +53,7 @@ This is the most complete Subversion release to date, and we encourage users of Subversion to upgrade as soon as reasonable. Please see the - https://lists.apache.org/list.html?annou...@subversion.apache.org; + https://lists.apache.org/thread.html/rd55a46419a0ee994c9290cb2d5149d94f834584f1d78135390a4095b%40%3Cannounce.subversion.apache.org%3E; >release announcement and the release notes for more information about this release. @@ -73,7 +73,7 @@ This is the most complete release of the 1.10.x line to date, and we encourage all users to upgrade as soon as reasonable. Please see the - https://lists.apache.org/list.html?annou...@subversion.apache.org; + https://lists.apache.org/thread.html/r86eb93bd4e12c126203f61e9bd42f9a3905117842b481d20e15fd61f%40%3Cannounce.subversion.apache.org%3E; >release announcement and the release notes for more information about this release.
svn commit: r1886385 - in /subversion/site/staging: news.html security/CVE-2020-17525-advisory.txt security/CVE-2020-17525-advisory.txt.asc security/index.html
Author: stsp Date: Wed Feb 10 13:32:38 2021 New Revision: 1886385 URL: http://svn.apache.org/viewvc?rev=1886385=rev Log: Publish the CVE-202-17525 advisory in the staging/ area. * staging/security/CVE-2020-17525-advisory.txt, staging/security/CVE-2020-17525-advisory.txt.asc: Advisory. * staging/news.html, staging/security/index.html: Add news items. Added: subversion/site/staging/security/CVE-2020-17525-advisory.txt subversion/site/staging/security/CVE-2020-17525-advisory.txt.asc Modified: subversion/site/staging/news.html subversion/site/staging/security/index.html Modified: subversion/site/staging/news.html URL: http://svn.apache.org/viewvc/subversion/site/staging/news.html?rev=1886385=1886384=1886385=diff == --- subversion/site/staging/news.html (original) +++ subversion/site/staging/news.html Wed Feb 10 13:32:38 2021 @@ -22,6 +22,27 @@ + +2021-02-10 Apache Subversion Security Advisory + + + +The recent releases of Apache Subversion 1.14.1 and 1.10.7 contain + a fix for a security issue: CVE-2020-17525. This issue + affect Subversion 'mod_dav_svn' servers only. We encourage server operators + to upgrade to the latest appropriate version as soon as reasonable. + + Please see the https://lists.apache.org/list.html?annou...@subversion.apache.org; + >release announcements for more information about the releases. + +To get the latest release from the nearest mirror, please visit our + download page. + + + 2021-02-10 Apache Subversion 1.14.1 Released http://svn.apache.org/viewvc/subversion/site/staging/security/CVE-2020-17525-advisory.txt?rev=1886385=auto == --- subversion/site/staging/security/CVE-2020-17525-advisory.txt (added) +++ subversion/site/staging/security/CVE-2020-17525-advisory.txt Wed Feb 10 13:32:38 2021 @@ -0,0 +1,114 @@ + + Remote unauthenticated denial-of-service in Subversion mod_authz_svn. + +Summary: + + + Subversion's mod_authz_svn module will crash if the server is using + in-repository authz rules with the AuthzSVNReposRelativeAccessFile + option and a client sends a request for a non-existing repository URL. + + This can lead to disruption for users of the service. + +Known vulnerable: += + + mod_dav_svn+mod_authz_svn servers 1.9.0 through 1.10.6 (inclusive). + mod_dav_svn+mod_authz_svn servers 1.11.0 through 1.14.0 (inclusive). + +Known fixed: + + + mod_dav_svn+mod_authz_svn servers 1.14.1 + mod_dav_svn+mod_authz_svn servers 1.10.7 + +Details: + + + A null-pointer-dereference has been found in mod_authz_svn that results in + a remote unauthenticated Denial-of-Service in some server configurations. + + The vulnerability can be triggered by an unauthenticated user if the + Apache HTTPD server is configured to use an in-repository authz file, + with configuration directives such as: + +AuthzSVNAccessFile "^/authz" +AuthzSVNReposRelativeAccessFile "^/authz" + + The problem originates when sending a GET request to a non-existent + repository. The mod_authz_svn module will attempt to find authz rules + at a path within the requested SVN repository. Upon constructing this + path, the function svn_repos_find_root_path will return a NULL pointer + since the requested repository does not exist on-disk. + A check for this legitimate NULL pointer condition is missing, which + results in a segmentation fault when the NULL pointer is used. + + The in-repository authz feature was first introduced in Subversion 1.8: + https://subversion.apache.org/docs/release-notes/1.8.html#in-repo-authz + + The missing NULL check was first introduced during refactoring of the + authz code during development work leading up to Subversion 1.9. + Subversion 1.8 servers are unaffected. + +Severity: += + + CVSSv3 Base Score: 7.5 (High) + + CVSSv3 Base Vector: CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:H + + Exploitation results in denial of service by crashing the HTTPD worker + handling the request. The impact of this differs depending on how the + Apache HTTPD server is configured, including the choice of MPM (Multi- + Processing-Module). If the worker shares its memory address space with + the main thread, as is the case with e.g. the Event MPM, the entire + HTTPD server process will terminate. If the pre-fork MPM is used, the + worker will terminate but the HTTPD server will stay up, and service + availability will depend on how frequently the attacker is able to + send malicious requests which target the vulnerability. + +Recommendations: + + + We recommend all users to upgrade to a known fixed release of the + Subversion mod_dav_svn server. + + Users who are unable to upgrade may apply the included patches. + + As a workaround, the use of in-repos
svn commit: r1886389 - in /subversion/site/publish: ./ index.html
Author: stsp Date: Wed Feb 10 13:43:32 2021 New Revision: 1886389 URL: http://svn.apache.org/viewvc?rev=1886389=rev Log: * site/publish: merge from staging area Modified: subversion/site/publish/ (props changed) subversion/site/publish/index.html (contents, props changed) Propchange: subversion/site/publish/ -- Merged /subversion/site/staging:r1886387-1886388 Modified: subversion/site/publish/index.html URL: http://svn.apache.org/viewvc/subversion/site/publish/index.html?rev=1886389=1886388=1886389=diff == --- subversion/site/publish/index.html (original) +++ subversion/site/publish/index.html Wed Feb 10 13:43:32 2021 @@ -66,6 +66,27 @@ + +2021-02-10 Apache Subversion Security Advisory + + + +The recent releases of Apache Subversion 1.14.1 and 1.10.7 contain + a fix for a security issue: CVE-2020-17525. This issue + affect Subversion 'mod_dav_svn' servers only. We encourage server operators + to upgrade to the latest appropriate version as soon as reasonable. + + Please see the https://lists.apache.org/list.html?annou...@subversion.apache.org; + >release announcements for more information about the releases. + +To get the latest release from the nearest mirror, please visit our + download page. + + + 2021-02-10 Apache Subversion 1.14.1 Released
svn commit: r1886387 - in /subversion/site/publish: ./ docs/release-notes/1.10.html docs/release-notes/1.14.html index.html news.html roadmap.html security/CVE-2020-17525-advisory.txt security/CVE-202
Author: stsp
Date: Wed Feb 10 13:36:21 2021
New Revision: 1886387
URL: http://svn.apache.org/viewvc?rev=1886387=rev
Log:
* site/publish: Merge everything from staging area.
Added:
subversion/site/publish/security/CVE-2020-17525-advisory.txt
- copied unchanged from r1886386,
subversion/site/staging/security/CVE-2020-17525-advisory.txt
subversion/site/publish/security/CVE-2020-17525-advisory.txt.asc
- copied unchanged from r1886386,
subversion/site/staging/security/CVE-2020-17525-advisory.txt.asc
Modified:
subversion/site/publish/ (props changed)
subversion/site/publish/docs/release-notes/1.10.html
subversion/site/publish/docs/release-notes/1.14.html
subversion/site/publish/index.html (contents, props changed)
subversion/site/publish/news.html (contents, props changed)
subversion/site/publish/roadmap.html (props changed)
subversion/site/publish/security/index.html
Propchange: subversion/site/publish/
--
Merged
/subversion/site/staging:r1878173-1885742,1885744-1886108,1886110-1886386
Modified: subversion/site/publish/docs/release-notes/1.10.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.10.html?rev=1886387=1886386=1886387=diff
==
--- subversion/site/publish/docs/release-notes/1.10.html (original)
+++ subversion/site/publish/docs/release-notes/1.10.html Wed Feb 10 13:36:21
2021
@@ -268,22 +268,81 @@ selected while 1.10 combines all the lin
The 1.10 implementation may change in future releases, perhaps to
make this case an error.
-The 1.9 implementation combined the global and per-repository rules
-for the same path:
+A fix for https://issues.apache.org/jira/browse/SVN-4762?issueNumber=4762;
+>Issue #4762 may change the way path-based authorization rules are applied
+in some circumstances. See http://svn.apache.org/r1882326;>r1882326.
+
+Background: Subversion 1.10 introduced a new implementation of path-based
+authorization (authz) to deliver wildcard support and improved performance
+over that of Subversion 1.9 and earlier. From Subversion 1.10 through 1.14.0,
+the new implementation did not correctly combine global rules with repository
+rules: if a global rule and a per-repository rule were both present for a
+path, the global rule would be ignored and the per-repository rule would
+apply by itself. As a result, from Subversion 1.10 through 1.14.0, it was not
+possible to override per-path access rules for specific users (or groups) at
+the global level. Administrators whose authz rules rely on this incorrect
+behavior may need to adjust their rules accordingly.
+
+
+This issue is fixed in 1.14.1, making it possible once again 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.
+
+As an example, consider the following rule set:
- [/some/path]
- userA = rw
- [repository:/some/path]
- userB = r
+[groups]
+company = developer1, developer2, developer3
+customer = customer1, customer2
+
+# company can read-write on everything
+[/]
+@company = rw
+
+[project1:/]
+@customer = r
+
+
+
+Does developer1 have rw access to "/trunk" in
project1?
+
+
+
+Subversion servers running 1.10.0 up to 1.10.6 or 1.14.0, without the fix for
+https://issues.apache.org/jira/browse/SVN-4762?issueNumber=4762;
+>issue #4762, will only apply the repository-specific part of the rule
set:
+
+[project1:/]
+@customer = r
+
+
+The answer in this case is that developer1 has no access at all
because the
+global rule which grants rw access to the @company group is
ignored.
+
+
+
+Subversion servers running 1.14.1 or later match the behaviour of
+Subversion 1.9, meaning they will apply both the global and the
repository-specific
+part of the rule set:
+
+# company can read-write on everything
+[/]
+@company = rw
+
+[project1:/]
+@customer = r
+
+The answer in this case is that developer1 has rw access
+to any path in project1.
+Global rules are overridden by repository-specific rules only if both the
+user (developer1) and the path ("/", including child paths
+for which no specific rules exist) match the repository-specific rule.
+While the repository-specific rule matches "/trunk" it does not
+match developer1, and hence the global rule will be used.
+
-In 1.9 this would define access for both userA
-and userB, in 1.10 the per-repository rule overrides the
-global rule and this only defines access for userB. The 1.10
-implementation may change in future releases, but the exact change
-is still being discussed on the dev mailing
-list.
Modified: subversion/site/publish/docs/release-notes/1.14.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/d
svn commit: r1886386 - in /subversion/site/staging: index.html news.html
Author: stsp Date: Wed Feb 10 13:34:51 2021 New Revision: 1886386 URL: http://svn.apache.org/viewvc?rev=1886386=rev Log: * staging/index.html, staging/news.html, Add stub release announcement links, to be replaced as soon as the actual announcements appear in archives. Modified: subversion/site/staging/index.html subversion/site/staging/news.html Modified: subversion/site/staging/index.html URL: http://svn.apache.org/viewvc/subversion/site/staging/index.html?rev=1886386=1886385=1886386=diff == --- subversion/site/staging/index.html (original) +++ subversion/site/staging/index.html Wed Feb 10 13:34:51 2021 @@ -76,7 +76,7 @@ This is the most complete Subversion release to date, and we encourage users of Subversion to upgrade as soon as reasonable. Please see the - https://lists.apache.org/list.html?annou...@subversion.apache.org; >release announcement and the release notes for more information about this release. @@ -96,7 +96,7 @@ This is the most complete release of the 1.10.x line to date, and we encourage all users to upgrade as soon as reasonable. Please see the - https://lists.apache.org/list.html?annou...@subversion.apache.org; >release announcement and the release notes for more information about this release. Modified: subversion/site/staging/news.html URL: http://svn.apache.org/viewvc/subversion/site/staging/news.html?rev=1886386=1886385=1886386=diff == --- subversion/site/staging/news.html (original) +++ subversion/site/staging/news.html Wed Feb 10 13:34:51 2021 @@ -53,7 +53,7 @@ This is the most complete Subversion release to date, and we encourage users of Subversion to upgrade as soon as reasonable. Please see the - https://lists.apache.org/list.html?annou...@subversion.apache.org; >release announcement and the release notes for more information about this release. @@ -73,7 +73,7 @@ This is the most complete release of the 1.10.x line to date, and we encourage all users to upgrade as soon as reasonable. Please see the - https://lists.apache.org/list.html?annou...@subversion.apache.org; >release announcement and the release notes for more information about this release.
svn commit: r1886388 - /subversion/site/staging/index.html
Author: stsp Date: Wed Feb 10 13:42:48 2021 New Revision: 1886388 URL: http://svn.apache.org/viewvc?rev=1886388=rev Log: * staging/index.html: Copy the CVE-2020-17525 news item over from news.html. Modified: subversion/site/staging/index.html Modified: subversion/site/staging/index.html URL: http://svn.apache.org/viewvc/subversion/site/staging/index.html?rev=1886388=1886387=1886388=diff == --- subversion/site/staging/index.html (original) +++ subversion/site/staging/index.html Wed Feb 10 13:42:48 2021 @@ -66,6 +66,27 @@ + +2021-02-10 Apache Subversion Security Advisory + + + +The recent releases of Apache Subversion 1.14.1 and 1.10.7 contain + a fix for a security issue: CVE-2020-17525. This issue + affect Subversion 'mod_dav_svn' servers only. We encourage server operators + to upgrade to the latest appropriate version as soon as reasonable. + + Please see the https://lists.apache.org/list.html?annou...@subversion.apache.org; + >release announcements for more information about the releases. + +To get the latest release from the nearest mirror, please visit our + download page. + + + 2021-02-10 Apache Subversion 1.14.1 Released
svn commit: r1886384 - in /subversion/site/staging: index.html news.html
Author: stsp Date: Wed Feb 10 13:00:47 2021 New Revision: 1886384 URL: http://svn.apache.org/viewvc?rev=1886384=rev Log: * staging/index.html, staging/news.html: Add news items for 1.14.1 and 1.10.7. Modified: subversion/site/staging/index.html subversion/site/staging/news.html Modified: subversion/site/staging/index.html URL: http://svn.apache.org/viewvc/subversion/site/staging/index.html?rev=1886384=1886383=1886384=diff == --- subversion/site/staging/index.html (original) +++ subversion/site/staging/index.html Wed Feb 10 13:00:47 2021 @@ -66,6 +66,46 @@ + +2021-02-10 Apache Subversion 1.14.1 Released + + + +We are pleased to announce the release of Apache Subversion 1.14.1. + This is the most complete Subversion release to date, and we encourage + users of Subversion to upgrade as soon as reasonable. + Please see the + release announcement and the + release notes for more information about this release. + +To get this release from the nearest mirror, please visit our + download page. + + + + +2021-02-10 Apache Subversion 1.10.7 Released + + + +We are pleased to announce the release of Apache Subversion 1.10.7. + This is the most complete release of the 1.10.x line to date, + and we encourage all users to upgrade as soon as reasonable. + Please see the + release announcement and the + release notes for more information about this release. + +To get this release from the nearest mirror, please visit our + download page. + + + 2020-05-27 Apache Subversion 1.14.0 Released http://svn.apache.org/viewvc/subversion/site/staging/news.html?rev=1886384=1886383=1886384=diff == --- subversion/site/staging/news.html (original) +++ subversion/site/staging/news.html Wed Feb 10 13:00:47 2021 @@ -22,6 +22,46 @@ + +2021-02-10 Apache Subversion 1.14.1 Released + + + +We are pleased to announce the release of Apache Subversion 1.14.1. + This is the most complete Subversion release to date, and we encourage + users of Subversion to upgrade as soon as reasonable. + Please see the + release announcement and the + release notes for more information about this release. + +To get this release from the nearest mirror, please visit our + download page. + + + + +2021-02-10 Apache Subversion 1.10.7 Released + + + +We are pleased to announce the release of Apache Subversion 1.10.7. + This is the most complete release of the 1.10.x line to date, + and we encourage all users to upgrade as soon as reasonable. + Please see the + release announcement and the + release notes for more information about this release. + +To get this release from the nearest mirror, please visit our + download page. + + + 2020-05-27 Apache Subversion 1.14.0 Released
svn commit: r1886383 - in /subversion/site/staging/docs/release-notes: 1.10.html 1.14.html
Author: stsp Date: Wed Feb 10 12:55:26 2021 New Revision: 1886383 URL: http://svn.apache.org/viewvc?rev=1886383=rev Log: * staging/docs/release-notes/1.10.html, staging/docs/release-notes/1.14.html: The issue #4762 fix did not make it into the 1.10.7 release. Remove mentions of 1.10.7 which suggest otherwise. Modified: subversion/site/staging/docs/release-notes/1.10.html subversion/site/staging/docs/release-notes/1.14.html Modified: subversion/site/staging/docs/release-notes/1.10.html URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.10.html?rev=1886383=1886382=1886383=diff == --- subversion/site/staging/docs/release-notes/1.10.html (original) +++ subversion/site/staging/docs/release-notes/1.10.html Wed Feb 10 12:55:26 2021 @@ -284,7 +284,7 @@ the global level. Administrators whose a behavior may need to adjust their rules accordingly. -This issue is fixed in 1.10.7 and 1.14.1, making it possible once again to +This issue is fixed in 1.14.1, making it possible once again 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. @@ -322,7 +322,7 @@ global rule which grants rw acc -Subversion servers running 1.10.7 or 1.14.1 or later match the behaviour of +Subversion servers running 1.14.1 or later match the behaviour of Subversion 1.9, meaning they will apply both the global and the repository-specific part of the rule set: Modified: subversion/site/staging/docs/release-notes/1.14.html URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.14.html?rev=1886383=1886382=1886383=diff == --- subversion/site/staging/docs/release-notes/1.14.html (original) +++ subversion/site/staging/docs/release-notes/1.14.html Wed Feb 10 12:55:26 2021 @@ -240,7 +240,7 @@ the global level. Administrators whose a behavior may need to adjust their rules accordingly. -This issue is fixed in 1.10.7 and 1.14.1, making it possible once again to +This issue is fixed in 1.14.1, making it possible once again 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. @@ -278,7 +278,7 @@ global rule which grants rw acc -Subversion servers running 1.10.7 or 1.14.1 or later match the behaviour of +Subversion servers running 1.14.1 or later match the behaviour of Subversion 1.9, meaning they will apply both the global and the repository-specific part of the rule set: @@ -1596,7 +1596,7 @@ path-based authorization (authz) rules: rule were both present for a path, the global rule would be ignored and the per-repository rule would apply by itself. -This issue is fixed as of 1.10.7 and 1.14.1. See This issue is fixed as of 1.14.1. See https://issues.apache.org/jira/browse/SVN-4762?issueNumber=4762; >Issue #4762 and http://svn.apache.org/r1882326;>r1882326.
svn commit: r45956 - /dev/subversion/ /release/subversion/
Author: stsp Date: Wed Feb 10 11:28:06 2021 New Revision: 45956 Log: Publish Subversion-1.10.7. Added: release/subversion/subversion-1.10.7.KEYS - copied unchanged from r45955, dev/subversion/subversion-1.10.7.KEYS release/subversion/subversion-1.10.7.tar.bz2 - copied unchanged from r45955, dev/subversion/subversion-1.10.7.tar.bz2 release/subversion/subversion-1.10.7.tar.bz2.asc - copied unchanged from r45955, dev/subversion/subversion-1.10.7.tar.bz2.asc release/subversion/subversion-1.10.7.tar.bz2.sha1 - copied unchanged from r45955, dev/subversion/subversion-1.10.7.tar.bz2.sha1 release/subversion/subversion-1.10.7.tar.bz2.sha512 - copied unchanged from r45955, dev/subversion/subversion-1.10.7.tar.bz2.sha512 release/subversion/subversion-1.10.7.tar.gz - copied unchanged from r45955, dev/subversion/subversion-1.10.7.tar.gz release/subversion/subversion-1.10.7.tar.gz.asc - copied unchanged from r45955, dev/subversion/subversion-1.10.7.tar.gz.asc release/subversion/subversion-1.10.7.tar.gz.sha1 - copied unchanged from r45955, dev/subversion/subversion-1.10.7.tar.gz.sha1 release/subversion/subversion-1.10.7.tar.gz.sha512 - copied unchanged from r45955, dev/subversion/subversion-1.10.7.tar.gz.sha512 release/subversion/subversion-1.10.7.zip - copied unchanged from r45955, dev/subversion/subversion-1.10.7.zip release/subversion/subversion-1.10.7.zip.asc - copied unchanged from r45955, dev/subversion/subversion-1.10.7.zip.asc release/subversion/subversion-1.10.7.zip.sha1 - copied unchanged from r45955, dev/subversion/subversion-1.10.7.zip.sha1 release/subversion/subversion-1.10.7.zip.sha512 - copied unchanged from r45955, dev/subversion/subversion-1.10.7.zip.sha512 Removed: dev/subversion/subversion-1.10.7.KEYS dev/subversion/subversion-1.10.7.tar.bz2 dev/subversion/subversion-1.10.7.tar.bz2.asc dev/subversion/subversion-1.10.7.tar.bz2.sha1 dev/subversion/subversion-1.10.7.tar.bz2.sha512 dev/subversion/subversion-1.10.7.tar.gz dev/subversion/subversion-1.10.7.tar.gz.asc dev/subversion/subversion-1.10.7.tar.gz.sha1 dev/subversion/subversion-1.10.7.tar.gz.sha512 dev/subversion/subversion-1.10.7.zip dev/subversion/subversion-1.10.7.zip.asc dev/subversion/subversion-1.10.7.zip.sha1 dev/subversion/subversion-1.10.7.zip.sha512 dev/subversion/svn_version.h.dist-1.10.7
svn commit: r45955 - /dev/subversion/ /release/subversion/
Author: stsp Date: Wed Feb 10 11:27:48 2021 New Revision: 45955 Log: Publish Subversion-1.14.1. Added: release/subversion/subversion-1.14.1.KEYS - copied unchanged from r45954, dev/subversion/subversion-1.14.1.KEYS release/subversion/subversion-1.14.1.tar.bz2 - copied unchanged from r45954, dev/subversion/subversion-1.14.1.tar.bz2 release/subversion/subversion-1.14.1.tar.bz2.asc - copied unchanged from r45954, dev/subversion/subversion-1.14.1.tar.bz2.asc release/subversion/subversion-1.14.1.tar.bz2.sha512 - copied unchanged from r45954, dev/subversion/subversion-1.14.1.tar.bz2.sha512 release/subversion/subversion-1.14.1.tar.gz - copied unchanged from r45954, dev/subversion/subversion-1.14.1.tar.gz release/subversion/subversion-1.14.1.tar.gz.asc - copied unchanged from r45954, dev/subversion/subversion-1.14.1.tar.gz.asc release/subversion/subversion-1.14.1.tar.gz.sha512 - copied unchanged from r45954, dev/subversion/subversion-1.14.1.tar.gz.sha512 release/subversion/subversion-1.14.1.zip - copied unchanged from r45954, dev/subversion/subversion-1.14.1.zip release/subversion/subversion-1.14.1.zip.asc - copied unchanged from r45954, dev/subversion/subversion-1.14.1.zip.asc release/subversion/subversion-1.14.1.zip.sha512 - copied unchanged from r45954, dev/subversion/subversion-1.14.1.zip.sha512 Removed: dev/subversion/subversion-1.14.1.KEYS dev/subversion/subversion-1.14.1.tar.bz2 dev/subversion/subversion-1.14.1.tar.bz2.asc dev/subversion/subversion-1.14.1.tar.bz2.sha512 dev/subversion/subversion-1.14.1.tar.gz dev/subversion/subversion-1.14.1.tar.gz.asc dev/subversion/subversion-1.14.1.tar.gz.sha512 dev/subversion/subversion-1.14.1.zip dev/subversion/subversion-1.14.1.zip.asc dev/subversion/subversion-1.14.1.zip.sha512 dev/subversion/svn_version.h.dist-1.14.1
svn propchange: r1886358 - svn:log
Author: stsp
Revision: 1886358
Modified property: svn:log
Modified: svn:log at Tue Feb 9 12:02:33 2021
--
--- svn:log (original)
+++ svn:log Tue Feb 9 12:02:33 2021
@@ -5,4 +5,4 @@ Update a raise statement probably missed
(Permission.parse_groups): Use 'raise exception("string")' instead of
'raise exception, "string"'.
-Patch by: From: Daniel Roßberg (danielmrossberg {AT} gmail dot com)
+Patch by: Daniel Roßberg (danielmrossberg {AT} gmail dot com)
svn commit: r1886358 - /subversion/trunk/tools/hook-scripts/svnperms.py
Author: stsp
Date: Tue Feb 9 11:59:13 2021
New Revision: 1886358
URL: http://svn.apache.org/viewvc?rev=1886358=rev
Log:
Python 3 compatibility:
Update a raise statement probably missed in revision 873411 changes.
* tools/hook-scripts/svnperms.py
(Permission.parse_groups): Use 'raise exception("string")' instead of
'raise exception, "string"'.
Patch by: From: Daniel Roßberg (danielmrossberg {AT} gmail dot com)
Modified:
subversion/trunk/tools/hook-scripts/svnperms.py
Modified: subversion/trunk/tools/hook-scripts/svnperms.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/hook-scripts/svnperms.py?rev=1886358=1886357=1886358=diff
==
--- subversion/trunk/tools/hook-scripts/svnperms.py (original)
+++ subversion/trunk/tools/hook-scripts/svnperms.py Tue Feb 9 11:59:13 2021
@@ -137,7 +137,8 @@ class Permission:
try:
groupusers.extend(self._group[token[1:]])
except KeyError:
-raise Error, "group '%s' not found" % token[1:]
+raise Error("group '%s' not found" % \
+ token[1:])
else:
groupusers.append(token)
self._group[option] = groupusers
svn commit: r45805 [1/3] - /dev/subversion/
Author: stsp Date: Thu Feb 4 12:55:32 2021 New Revision: 45805 Log: Add Subversion 1.10.7 candidate release artifacts Added: dev/subversion/subversion-1.10.7.KEYS dev/subversion/subversion-1.10.7.tar.bz2 (with props) dev/subversion/subversion-1.10.7.tar.bz2.asc (with props) dev/subversion/subversion-1.10.7.tar.bz2.sha1 dev/subversion/subversion-1.10.7.tar.bz2.sha512 dev/subversion/subversion-1.10.7.tar.gz (with props) dev/subversion/subversion-1.10.7.tar.gz.asc (with props) dev/subversion/subversion-1.10.7.tar.gz.sha1 dev/subversion/subversion-1.10.7.tar.gz.sha512 dev/subversion/subversion-1.10.7.zip (with props) dev/subversion/subversion-1.10.7.zip.asc (with props) dev/subversion/subversion-1.10.7.zip.sha1 dev/subversion/subversion-1.10.7.zip.sha512 dev/subversion/svn_version.h.dist-1.10.7
svn commit: r45805 [3/3] - /dev/subversion/
Added: dev/subversion/subversion-1.10.7.tar.bz2 == Binary file - no diff available. Propchange: dev/subversion/subversion-1.10.7.tar.bz2 -- svn:mime-type = application/octet-stream Added: dev/subversion/subversion-1.10.7.tar.bz2.asc == --- dev/subversion/subversion-1.10.7.tar.bz2.asc (added) +++ dev/subversion/subversion-1.10.7.tar.bz2.asc Thu Feb 4 12:55:32 2021 @@ -0,0 +1,10 @@ +-BEGIN PGP SIGNATURE- + +iQEcBAABAgAGBQJgG+xlAAoJEE99uqmaWblzpkEIAKanhKsDRXbVEbwL9imQRJNj +uL8q9hBrxDkWkXUpEJ2MaqcLj31mcz+REKmPrmYogpdLR829wRZ2VHcWEntacK06 +4YWCXDyCCI5J2pCo1/iB6SdkS+F6NrPikZWN2QqOr+oRBccLBZwrNd8bfS0HMbT5 +hQmh5U9UXYtCZNXL7qmgbLQ4PZMPDOZ0PMVnsGEhFozHwF/qMX14YOJpujruaRnB +xyoOAqShBSI1tzJXD200iQe19f9op/RZlYMuyEPG9zb9mdTzXsr9c28Dgv2BlJkQ +8ta0gzVON67tJGhTMi47VIizbPPyssEHOIT4CV+H9P9Ul4pPogkqwnMCrwyUcpE= +=CJxJ +-END PGP SIGNATURE- Propchange: dev/subversion/subversion-1.10.7.tar.bz2.asc -- svn:eol-style = native Propchange: dev/subversion/subversion-1.10.7.tar.bz2.asc -- svn:mime-type = text/plain Added: dev/subversion/subversion-1.10.7.tar.bz2.sha1 == --- dev/subversion/subversion-1.10.7.tar.bz2.sha1 (added) +++ dev/subversion/subversion-1.10.7.tar.bz2.sha1 Thu Feb 4 12:55:32 2021 @@ -0,0 +1 @@ +2e82d37bc053908cdc45cab54bf82016f5a7eccc \ No newline at end of file Added: dev/subversion/subversion-1.10.7.tar.bz2.sha512 == --- dev/subversion/subversion-1.10.7.tar.bz2.sha512 (added) +++ dev/subversion/subversion-1.10.7.tar.bz2.sha512 Thu Feb 4 12:55:32 2021 @@ -0,0 +1 @@ +f29186995f65dbfb9eaafd2324176a40cbd5beb1c032bdd3ed025f995cc27f230054fa3296fa90907b818e556d054d84d1f270251adbfd1967c5f81c603e11f1 \ No newline at end of file Added: dev/subversion/subversion-1.10.7.tar.gz == Binary file - no diff available. Propchange: dev/subversion/subversion-1.10.7.tar.gz -- svn:mime-type = application/octet-stream Added: dev/subversion/subversion-1.10.7.tar.gz.asc == --- dev/subversion/subversion-1.10.7.tar.gz.asc (added) +++ dev/subversion/subversion-1.10.7.tar.gz.asc Thu Feb 4 12:55:32 2021 @@ -0,0 +1,10 @@ +-BEGIN PGP SIGNATURE- + +iQEcBAABAgAGBQJgG+xhAAoJEE99uqmaWblzjX4H/1Iox2ltx4RjqmIMlXhdteLk +/IXcAlM3nU3bab+JiwYP/Ego3tGpmWqYP0Rp7vVvpwOYYM8U1uWtSvPED9+txZA2 +XdkTAiE7QdO85pLfgTxy+W3zHoGytKqK0n8doVq2w3MoloV+KhlN320j7VOU4q74 +h3EAMLPHiBxp9kKc2Xe/KqCYJiWuM4p4JiCiJI5jjUVc4/XrPQ4BhKK2XAAAMh7d +wZ+KheaamMrSBxuIubaGW/QJuOlHui5zIVJYsDoPIEKpUZGAytuWWAp56DmLM9CN +1gL0r+lwmSeIkSqMQaNLtxHVIo8uU2la6N0ZZqwElH/ugeSo19LKKi2ovzoRyaI= +=JqBj +-END PGP SIGNATURE- Propchange: dev/subversion/subversion-1.10.7.tar.gz.asc -- svn:eol-style = native Propchange: dev/subversion/subversion-1.10.7.tar.gz.asc -- svn:mime-type = text/plain Added: dev/subversion/subversion-1.10.7.tar.gz.sha1 == --- dev/subversion/subversion-1.10.7.tar.gz.sha1 (added) +++ dev/subversion/subversion-1.10.7.tar.gz.sha1 Thu Feb 4 12:55:32 2021 @@ -0,0 +1 @@ +d4f8a607ed56f206b6cc559f0f81c1acb6abccb6 \ No newline at end of file Added: dev/subversion/subversion-1.10.7.tar.gz.sha512 == --- dev/subversion/subversion-1.10.7.tar.gz.sha512 (added) +++ dev/subversion/subversion-1.10.7.tar.gz.sha512 Thu Feb 4 12:55:32 2021 @@ -0,0 +1 @@ +d5494d305db8f10f778901f1e0b190dd71f82abd9a38ef9ea3a98a3ec535c00c755ee179276bae692cd50af8a1c885beada6ed2bea2eaeda8c09d7e0c55c1e9b \ No newline at end of file Added: dev/subversion/subversion-1.10.7.zip == Binary file - no diff available. Propchange: dev/subversion/subversion-1.10.7.zip -- svn:mime-type = application/octet-stream Added: dev/subversion/subversion-1.10.7.zip.asc == --- dev/subversion/subversion-1.10.7.zip.asc (added) +++ dev/subversion/subversion-1.10.7.zip.asc Thu Feb 4 12:55:32 2021 @@ -0,0
svn commit: r45805 [2/3] - /dev/subversion/
Added: dev/subversion/subversion-1.10.7.KEYS == --- dev/subversion/subversion-1.10.7.KEYS (added) +++ dev/subversion/subversion-1.10.7.KEYS Thu Feb 4 12:55:32 2021 @@ -0,0 +1,44678 @@ +ASF ID: artagnon +LDAP PGP key: A86A BD6C 9B68 6580 3A87 ED69 16EB F926 B8BB 3FE9 + +A86A BD6C 9B68 6580 3A87 ED69 16EB F926 B8BB 3FE9 +-BEGIN PGP PUBLIC KEY BLOCK- + +mQENBErAw2ABCADRhHz/FSgjSDN6+Hvh1Ipjl+RsmGDMYIanxk08pUaO+4tridXC +L6RMeXFsVFSkEAXOsxAGKHM3MbqNyk/uXdf8P8CcbkvYcTaRHFJAueBN7Ot1z1aF +4SXP/WULGnsvbjcE+fdokjY80Qs3nPOEaIuM1cs9EfIaBYWviBld10f9deo6IRoF +72ZJjXJjWOgb14VjEuIX61eMeGZvyKvwy3sKfOco6YZtnGQchVhjq2ZFFAzZtvBr +/vbjoEvxQcmKMu60tT+b5JCfLdaZkHbXlo2so1eKsJPkS83dE78Bqy1BkQfaoK0l +3oln4r97KuJcornSPyG8oEbGXc6F4X9v8c3hABEBAAG0NFJhbWt1bWFyIFJhbWFj +aGFuZHJhIChhcnRhZ25vbikgPGFydGFnbm9uQGdtYWlsLmNvbT6IRgQQEQIABgUC +Sxin5AAKCRChGD+O0QKMjUQXAKCZfSvy0scFCm5iIXmSGbJrDou8/ACeILFD7jXY +E4fnZtNggnCYeHAqeD2IRgQQEQIABgUCSyM3ewAKCRBBYxwTO2a5gHnxAJ97gp9P +JuAzjG8W95QQcP9kV/6wcQCggWKo1vn9rbXXwY5I+s1Dtv7TyVWJATcEEwEIACEF +AkrAw2ACGwMFCwkIBwMFFQoICQsFFgIDAQACHgECF4AACgkQFuv5Jri7P+ng4Af8 +CbH+6Fxu72uY5kdWG11uicPsEA5wR7qPiJL1zsx1TRp06Yx3ngneJuVfPApuhshL +QDj86hZrfZe1oF+2oV9xXxBfs6RTflR8i0yD3ix6Q+ayi9lPxr+quJfAv8DXZMRY +vNj6LYcsTSYOQvlSQwhs/ZKBds5uvsFvOC4tEqNFj4Nyv4jbQLrTOGX18EEHWd1X +aisQ1vuKVT1KQHyt/n1OkSvp/K+u+yDzPUin9rUnPtVyciUJvUAmH3e+M1Yufvgr +GNogLhEbUMa9ZrvEnpqRspNEQImLU35xuIjwXSgyY5kHO1Fu4TXcJ9dM/auWrXfc +y+OefXJk/QEiHyZyfQPUR7Q3UmFta3VtYXIgUmFtYWNoYW5kcmEgKGFydGFnbm9u +KSA8cmFta3VtYXJAaWl0a2dwLmFjLmluPohGBBARAgAGBQJLGKfkAAoJEKEYP47R +AoyNB80An1ruMzj5mes5lP7TntKYD5segaY1AJ0UTMNId6jbpxpRRvmjHW0mNJPl +EohGBBARAgAGBQJLIzd7AAoJEEFjHBM7ZrmAQfkAoIUyseOmQOfS6Gkjp5IK7i/C +qXlHAJwNql3AKgb9rWk+m4p4LrBDq3Z97YkBOAQTAQIAIgUCSsD6JgIbAwYLCQgH +AwIGFQgCCQoLBBYCAwECHgECF4AACgkQFuv5Jri7P+lj2Qf/VSW9A1dQfa4SafzF +lNhPB259RX9Zx/Px3q+6CVXmP1GyKyJJ2sLMkHiYCdP9hjpDJ98VBZ0KHSGF7XUm +fdWwPk1XV7I8jct1xsxDLy2T0UmjPj63+ZEc/Q4NeuaErNlCzGT0DvK5ITHvKqoX +8DAlgeRiSRb2DvM5h8tz22yoVesLQVnAPDD7eTFxi5wSUtbIjkXbKor/hKUn55Wy +L0EyvZvfcgIUCgr9fPTv+a5gkCkrzDguMVz6nyEAttYiAXi2EIsSgW118rNcimxC +F81kntW+BIVeQKhtrTVbTWBv2JVveJVbTtKb9g7rtZNPCDRqoBl1/FxgQPwVu+Dc +lePZEbkBDQRKwMNgAQgA8JfwOlfKwNQFKUxgQKEWHE503Aryz++8dUR74MKFkteZ +NbbNASuEB+QvHspl0y9Alm/hou+Yj1AFpyNBKIEZXzmT6gccNZFsAKXThzPz6rXs +ysFYTEQ6yiAQKflXiRltnwkLIzKl+WL17ZHFH1nXUxumaprNYwqjIVB9Ybd49NH3 +1W4H1w5ivCnEUhYJ4xiVo8QGw2YzJAa9LemRAocygLvqFE7hLKVKWCct21XYAvH/ +640hLLmhMFgN2+417jJqUr/M/B7mk7Ga68ear6olUZI6ppuGrtCqtaTA2H8j7jHo +nADruSlJ52Xmk7yAphImHADbj0r7np7+edFo6ngw+wARAQABiQEfBBgBCAAJBQJK +wMNgAhsMAAoJEBbr+Sa4uz/pIOEH/i5eq6A/xCGryFrXrqXGYX0cEKHOr8Ve52oK +6UKuRDVQp0BLFLd58CD3Td0lpsIiWdwXpAEn7rzNpnJ86Sz5O9YPK5Bbbb8QyEgF +HQ8i8D1MyADN/zy8pYluVpB7dFEPvERPv53+okt82Edd0DVFRcNWU5WqtIIXDYIk +3bV/rFXu9almxu4GHCIUSPi+/5HHFjpjphTZCmXogGjOalSwZnCkGTN3x3yjbZow +x3M4EIEI14n/M2zF4Jb51xWgaZ2lZj3JBLPBP7QnbdpfbVdBWaKGVHbhi3jlmcfn +f+5xWbj9/YGbAz7tYKAMF9BkkmTB1CExaRlWPBD1ZBEi8wHJxZc= +=hCXt +-END PGP PUBLIC KEY BLOCK- + +ASF ID: astieger +LDAP PGP key: C236 283C 970D 2C3C FEEB 4936 BF35 CF00 7838 3142 + +C236 283C 970D 2C3C FEEB 4936 BF35 CF00 7838 3142 +-BEGIN PGP PUBLIC KEY BLOCK- + +mQGiBD7L4j8RBACkBu28B2EJ7st1mQf0vKeOl6d5Na2FDhDpYjctRoFd4QuI+pO5 +U17azA32ZFAhBW7TtJ4ZjviogUAoE8Aec/gEi9RxFfpzyjMMYZODXLX8MEnfOCij +OWBXvOkO/gDM8PIXmXHxr6C9I7BVkEr7L+JT3uQbKyKjhSEFeCt6vvy35wCgkc2t +CxF7Q7pXXyvhKpOMNc4p/4kD/3cxsrRYF3i7AlOHH0uwLDWQ6WVScGnU3BdmfLo/ +AvxW7FWiYyQZzE9gi5Q2nxbTK/76HhwgYmz/Fn44XzFRP5xAZ9mYaZUZswrr87/+ +yDrYUY4EpckQyYw66IN5VfYB5iVdyIcF+nGXiHQR9PMu93bAB6a/eFyVVkmXVCa+ +JqxFA/437DM83GkF9jrSHXdckrKwVzRaE5zy4XzFkvzl/aMSdh54rVR+WXE8lUoF +i+nxQPjHSW7mnLXZ0WQcVnvQ9STBejHgz6m3MwByeFv5eUMq3XXfSRp+V/uJ1XU7 +rovraiqONgDB42rov6RE2UphBEQpkLR7EWb97aGJvKTN6fCykrQnQW5kcmVhcyBT +dGllZ2VyIDx0dXhAd2gtaG1zLnVuaS11bG0uZGU+iEkEMBECAAkFAkeeMO0CHSAA +CgkQvzXPAHg4MUIT5gCfaQP/GWvNv30jSUEsRht9RWrKQKMAn1NotiXC/vhKQ9GH +MBOH2Uz6la/eiF4EExECAB4FAj/VnzMCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AA +CgkQvzXPAHg4MULQHQCfbcX19u+skeBCLm3sUjfmdwMRWJAAn0NKuHFZ0WGoDICi +p4EcyELVVtE/tChBbmRyZWFzIFN0aWVnZXIgPEFuZHJlYXMuU3RpZWdlckBnbXgu +ZGU+iFkEExECABkFAj7L4j8ECwcDAgMVAgMDFgIBAh4BAheAAAoJEL81zwB4ODFC +0QIAnjr96Oqs647OGPPZt62itX2on7iNAJ9Qu+woYC0dSL4Xu2g8PwQIx69VyIhc +BBMRAgAcBAsHAwIDFQIDAxYCAQIeAQIXgAUCP9WhZQIZAQAKCRC/Nc8AeDgxQg/H +AJ49Y6RLMK7Ut1KoIhfTgtU3Mzn26ACfZkrDudNlpnOAhMh6r6wnY8uS0ZS0LEFu +ZHJlYXMgU3RpZWdlciA8YXM0OEBpbmZvcm1hdGlrLnVuaS11bG0uZGU+iEkEMBEC +AAkFAkeeMNECHSAACgkQvzXPAHg4MULyXACfXg5VaVcOzREAbG+8aBXSSsxjXjoA +niTYHsSKBA6atMOoAwNqW/44L0vniF4EExECAB4FAj/Vn1ECGwMGCwkIBwMCAxUC +AwMWAgECHgECF4AACgkQvzXPAHg4MULcwACeNjGAOVTD/x9clriqa8IzqtI7WY8A +n2ZMV6xErbBr3uP/31tVEI0fK63GtDNBbmRyZWFzIFN0aWVnZXIgPEFuZHJlYXMu +U3RpZWdlckB3aC1obXMudW5pLXVsbS5kZT6ISQQwEQIACQUCR54wxwIdIAAKCRC/ +Nc8AeDgxQrj1AJ4/TvJRicUh9cSd7BWtgWivgqBemgCfbTWfXx5zljfibYPE7WMn +6iBl2LKIXgQTEQIAHgUCP9WfnQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRC/
svn commit: r1886199 - in /subversion/branches/1.10.x: STATUS subversion/include/svn_version.h
Author: stsp
Date: Thu Feb 4 12:48:34 2021
New Revision: 1886199
URL: http://svn.apache.org/viewvc?rev=1886199=rev
Log:
Post-release housekeeping: bump the 1.10.x branch to 1.10.8.
Modified:
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/include/svn_version.h
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1886199=1886198=1886199=diff
==
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Thu Feb 4 12:48:34 2021
@@ -10,7 +10,7 @@ See http://subversion.apache.org/docs/co
for details on how release lines and voting work, what kinds of bugs can
delay a release, etc.
-Status of 1.10.7:
+Status of 1.10.8:
Candidate changes:
==
Modified: subversion/branches/1.10.x/subversion/include/svn_version.h
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/include/svn_version.h?rev=1886199=1886198=1886199=diff
==
--- subversion/branches/1.10.x/subversion/include/svn_version.h (original)
+++ subversion/branches/1.10.x/subversion/include/svn_version.h Thu Feb 4
12:48:34 2021
@@ -70,7 +70,7 @@ extern "C" {
*
* @since New in 1.1.
*/
-#define SVN_VER_PATCH 7
+#define SVN_VER_PATCH 8
/** @deprecated Provided for backward compatibility with the 1.0 API. */
svn commit: r1886198 - in /subversion/tags/1.10.7: ./ subversion/include/svn_version.h
Author: stsp
Date: Thu Feb 4 12:46:01 2021
New Revision: 1886198
URL: http://svn.apache.org/viewvc?rev=1886198=rev
Log:
Tagging release 1.10.7
Added:
subversion/tags/1.10.7/
- copied from r1886195, subversion/branches/1.10.x/
Modified:
subversion/tags/1.10.7/subversion/include/svn_version.h
Modified: subversion/tags/1.10.7/subversion/include/svn_version.h
URL:
http://svn.apache.org/viewvc/subversion/tags/1.10.7/subversion/include/svn_version.h?rev=1886198=1886195=1886198=diff
==
--- subversion/tags/1.10.7/subversion/include/svn_version.h (original)
+++ subversion/tags/1.10.7/subversion/include/svn_version.h Thu Feb 4 12:46:01
2021
@@ -93,7 +93,7 @@ extern "C" {
*
* Always change this at the same time as SVN_VER_NUMTAG.
*/
-#define SVN_VER_TAG" (under development)"
+#define SVN_VER_TAG" (r1886195)"
/** Number tag: a string describing the version.
@@ -108,7 +108,7 @@ extern "C" {
*
* Always change this at the same time as SVN_VER_TAG.
*/
-#define SVN_VER_NUMTAG "-dev"
+#define SVN_VER_NUMTAG ""
/** Revision number: The repository revision number of this release.
@@ -117,7 +117,7 @@ extern "C" {
* file version. Its value remains 0 in the repository except in release
* tags where it is the revision from which the tag was created.
*/
-#define SVN_VER_REVISION 0
+#define SVN_VER_REVISION 1886195
/* Version strings composed from the above definitions. */
svn commit: r45803 [1/3] - /dev/subversion/
Author: stsp Date: Thu Feb 4 12:34:28 2021 New Revision: 45803 Log: Add Subversion 1.14.1 candidate release artifacts Added: dev/subversion/subversion-1.14.1.KEYS dev/subversion/subversion-1.14.1.tar.bz2 (with props) dev/subversion/subversion-1.14.1.tar.bz2.asc (with props) dev/subversion/subversion-1.14.1.tar.bz2.sha512 dev/subversion/subversion-1.14.1.tar.gz (with props) dev/subversion/subversion-1.14.1.tar.gz.asc (with props) dev/subversion/subversion-1.14.1.tar.gz.sha512 dev/subversion/subversion-1.14.1.zip (with props) dev/subversion/subversion-1.14.1.zip.asc (with props) dev/subversion/subversion-1.14.1.zip.sha512 dev/subversion/svn_version.h.dist-1.14.1
svn commit: r45803 [3/3] - /dev/subversion/
Added: dev/subversion/subversion-1.14.1.tar.bz2 == Binary file - no diff available. Propchange: dev/subversion/subversion-1.14.1.tar.bz2 -- svn:mime-type = application/octet-stream Added: dev/subversion/subversion-1.14.1.tar.bz2.asc == --- dev/subversion/subversion-1.14.1.tar.bz2.asc (added) +++ dev/subversion/subversion-1.14.1.tar.bz2.asc Thu Feb 4 12:34:28 2021 @@ -0,0 +1,10 @@ +-BEGIN PGP SIGNATURE- + +iQEcBAABAgAGBQJgG+hvAAoJEE99uqmaWblz4yUIAMCqnFGchPMrWNhrRLOb3oi+ +vzk64LJ1h2X3MzstqIzRGb3ja3VmPcx2kQ4MmmHLc7XzXL7rMVRgPJB9NzKhs+dp +nvnTq0wS4KLjOzIiG3ump41T1qofi5ui5fbgeVEyU4py/fBDVeR0XokZ0k8HAZCj +oM166uprcSr0RfeQqnlSNEFUgIMq1hxTOa879N4aoMsFoLaMx18gjFL1RUyaz/0R +eH+EMkBk2wgGkzCWdOZlJeyp0YI6Lx4k/bHO8WXLci97tpw9t9UUtQAXTrKudShP +fP9BQqUv0uHdUAF3ZiYga6VKQicynuXev4du2vVqLoQ+BgMQXPwnbgA/FtSpeOA= +=z3Ba +-END PGP SIGNATURE- Propchange: dev/subversion/subversion-1.14.1.tar.bz2.asc -- svn:eol-style = native Propchange: dev/subversion/subversion-1.14.1.tar.bz2.asc -- svn:mime-type = text/plain Added: dev/subversion/subversion-1.14.1.tar.bz2.sha512 == --- dev/subversion/subversion-1.14.1.tar.bz2.sha512 (added) +++ dev/subversion/subversion-1.14.1.tar.bz2.sha512 Thu Feb 4 12:34:28 2021 @@ -0,0 +1 @@ +0a70c7152b77cdbcb810a029263e4b3240b6ef41d1c19714e793594088d3cca758d40dfbc05622a806b06463becb73207df249393924ce591026b749b875fcdd \ No newline at end of file Added: dev/subversion/subversion-1.14.1.tar.gz == Binary file - no diff available. Propchange: dev/subversion/subversion-1.14.1.tar.gz -- svn:mime-type = application/octet-stream Added: dev/subversion/subversion-1.14.1.tar.gz.asc == --- dev/subversion/subversion-1.14.1.tar.gz.asc (added) +++ dev/subversion/subversion-1.14.1.tar.gz.asc Thu Feb 4 12:34:28 2021 @@ -0,0 +1,10 @@ +-BEGIN PGP SIGNATURE- + +iQEcBAABAgAGBQJgG+hsAAoJEE99uqmaWblzSbsH/3ZnrbDqsgCZeCtYSCxqBcSA +ESvlG450cbD0dTC2CimUJOwbGADm0kb1kh7LuXjXxf5XSrHLBAdh0D8FUCKpUdT1 +6B06eyLehBWMQFaFnxiX1wkIj0LOZvbGkysw7zQOFu30JaqOBdMvckUbpJnb/Z4T +Oalf8ueClGONA2UB+BOiAUPYqvwcUKdPZvsSumOLV0O7SnwuqsPRrDdb9al/WWTt +bbU46t79ni0hvSToiDXgmS29BxF7JmQeG5oajS59QX+ygo6ikexqN0Ai9UxVAc5b +AEhVW4255TdRcOGhKHIgnhb3lHiY92y3feNqy3UsJQs+cB3j5vyDHlatkh3er8U= +=rIAK +-END PGP SIGNATURE- Propchange: dev/subversion/subversion-1.14.1.tar.gz.asc -- svn:eol-style = native Propchange: dev/subversion/subversion-1.14.1.tar.gz.asc -- svn:mime-type = text/plain Added: dev/subversion/subversion-1.14.1.tar.gz.sha512 == --- dev/subversion/subversion-1.14.1.tar.gz.sha512 (added) +++ dev/subversion/subversion-1.14.1.tar.gz.sha512 Thu Feb 4 12:34:28 2021 @@ -0,0 +1 @@ +6cd780f6669c811264de03b94ea41487111957dfd817498699c91e5dbb975e4b9626de9c436c5722fd6a6fadc4fef35f51905c2c0f5fd4955cf0fadef9cba60e \ No newline at end of file Added: dev/subversion/subversion-1.14.1.zip == Binary file - no diff available. Propchange: dev/subversion/subversion-1.14.1.zip -- svn:mime-type = application/octet-stream Added: dev/subversion/subversion-1.14.1.zip.asc == --- dev/subversion/subversion-1.14.1.zip.asc (added) +++ dev/subversion/subversion-1.14.1.zip.asc Thu Feb 4 12:34:28 2021 @@ -0,0 +1,10 @@ +-BEGIN PGP SIGNATURE- + +iQEcBAABAgAGBQJgG+hnAAoJEE99uqmaWblzt/EIALRvLiaKRLJfSkOqKEwWxyq4 +NfJxwm640AE5Hq6Uy2oWp9p1RqaZqPeYYUjE95GKeAJLH0mn4qYvQQkdSZDUGWmU +NjpTSOLEZXg+5hXq+JJVZWtu71372uTKL0A4AZN/Phnl9SAIiIABu5bf6FuYti5B +Kl+NCK3S104Flb2n1Qa99/cXTWoYuGYKW5yIdcvDXxAi+zcVTPD7fiV+gTKavaBg +m+XjA0YrdpLtGuTjZwqaKMa+Ck/RtMVVVMYXnzkNSSF9yEVHpClPfFVJHgKYDaRs +M8DFmtDC5kY5DCnJ+Z6YC7aKfvYMwRk+E8oz6F6zPGg/VeTlojOt77ixfn1C1YE= +=cAoR +-END PGP SIGNATURE- Propchange: dev/subversion/subversion-1.14.1.zip.asc -- svn:eol-style = native Propchange: dev/subversion/subversion-1.14.1.zip.asc
svn commit: r45803 [2/3] - /dev/subversion/
Added: dev/subversion/subversion-1.14.1.KEYS == --- dev/subversion/subversion-1.14.1.KEYS (added) +++ dev/subversion/subversion-1.14.1.KEYS Thu Feb 4 12:34:28 2021 @@ -0,0 +1,44678 @@ +ASF ID: artagnon +LDAP PGP key: A86A BD6C 9B68 6580 3A87 ED69 16EB F926 B8BB 3FE9 + +A86A BD6C 9B68 6580 3A87 ED69 16EB F926 B8BB 3FE9 +-BEGIN PGP PUBLIC KEY BLOCK- + +mQENBErAw2ABCADRhHz/FSgjSDN6+Hvh1Ipjl+RsmGDMYIanxk08pUaO+4tridXC +L6RMeXFsVFSkEAXOsxAGKHM3MbqNyk/uXdf8P8CcbkvYcTaRHFJAueBN7Ot1z1aF +4SXP/WULGnsvbjcE+fdokjY80Qs3nPOEaIuM1cs9EfIaBYWviBld10f9deo6IRoF +72ZJjXJjWOgb14VjEuIX61eMeGZvyKvwy3sKfOco6YZtnGQchVhjq2ZFFAzZtvBr +/vbjoEvxQcmKMu60tT+b5JCfLdaZkHbXlo2so1eKsJPkS83dE78Bqy1BkQfaoK0l +3oln4r97KuJcornSPyG8oEbGXc6F4X9v8c3hABEBAAG0NFJhbWt1bWFyIFJhbWFj +aGFuZHJhIChhcnRhZ25vbikgPGFydGFnbm9uQGdtYWlsLmNvbT6IRgQQEQIABgUC +Sxin5AAKCRChGD+O0QKMjUQXAKCZfSvy0scFCm5iIXmSGbJrDou8/ACeILFD7jXY +E4fnZtNggnCYeHAqeD2IRgQQEQIABgUCSyM3ewAKCRBBYxwTO2a5gHnxAJ97gp9P +JuAzjG8W95QQcP9kV/6wcQCggWKo1vn9rbXXwY5I+s1Dtv7TyVWJATcEEwEIACEF +AkrAw2ACGwMFCwkIBwMFFQoICQsFFgIDAQACHgECF4AACgkQFuv5Jri7P+ng4Af8 +CbH+6Fxu72uY5kdWG11uicPsEA5wR7qPiJL1zsx1TRp06Yx3ngneJuVfPApuhshL +QDj86hZrfZe1oF+2oV9xXxBfs6RTflR8i0yD3ix6Q+ayi9lPxr+quJfAv8DXZMRY +vNj6LYcsTSYOQvlSQwhs/ZKBds5uvsFvOC4tEqNFj4Nyv4jbQLrTOGX18EEHWd1X +aisQ1vuKVT1KQHyt/n1OkSvp/K+u+yDzPUin9rUnPtVyciUJvUAmH3e+M1Yufvgr +GNogLhEbUMa9ZrvEnpqRspNEQImLU35xuIjwXSgyY5kHO1Fu4TXcJ9dM/auWrXfc +y+OefXJk/QEiHyZyfQPUR7Q3UmFta3VtYXIgUmFtYWNoYW5kcmEgKGFydGFnbm9u +KSA8cmFta3VtYXJAaWl0a2dwLmFjLmluPohGBBARAgAGBQJLGKfkAAoJEKEYP47R +AoyNB80An1ruMzj5mes5lP7TntKYD5segaY1AJ0UTMNId6jbpxpRRvmjHW0mNJPl +EohGBBARAgAGBQJLIzd7AAoJEEFjHBM7ZrmAQfkAoIUyseOmQOfS6Gkjp5IK7i/C +qXlHAJwNql3AKgb9rWk+m4p4LrBDq3Z97YkBOAQTAQIAIgUCSsD6JgIbAwYLCQgH +AwIGFQgCCQoLBBYCAwECHgECF4AACgkQFuv5Jri7P+lj2Qf/VSW9A1dQfa4SafzF +lNhPB259RX9Zx/Px3q+6CVXmP1GyKyJJ2sLMkHiYCdP9hjpDJ98VBZ0KHSGF7XUm +fdWwPk1XV7I8jct1xsxDLy2T0UmjPj63+ZEc/Q4NeuaErNlCzGT0DvK5ITHvKqoX +8DAlgeRiSRb2DvM5h8tz22yoVesLQVnAPDD7eTFxi5wSUtbIjkXbKor/hKUn55Wy +L0EyvZvfcgIUCgr9fPTv+a5gkCkrzDguMVz6nyEAttYiAXi2EIsSgW118rNcimxC +F81kntW+BIVeQKhtrTVbTWBv2JVveJVbTtKb9g7rtZNPCDRqoBl1/FxgQPwVu+Dc +lePZEbkBDQRKwMNgAQgA8JfwOlfKwNQFKUxgQKEWHE503Aryz++8dUR74MKFkteZ +NbbNASuEB+QvHspl0y9Alm/hou+Yj1AFpyNBKIEZXzmT6gccNZFsAKXThzPz6rXs +ysFYTEQ6yiAQKflXiRltnwkLIzKl+WL17ZHFH1nXUxumaprNYwqjIVB9Ybd49NH3 +1W4H1w5ivCnEUhYJ4xiVo8QGw2YzJAa9LemRAocygLvqFE7hLKVKWCct21XYAvH/ +640hLLmhMFgN2+417jJqUr/M/B7mk7Ga68ear6olUZI6ppuGrtCqtaTA2H8j7jHo +nADruSlJ52Xmk7yAphImHADbj0r7np7+edFo6ngw+wARAQABiQEfBBgBCAAJBQJK +wMNgAhsMAAoJEBbr+Sa4uz/pIOEH/i5eq6A/xCGryFrXrqXGYX0cEKHOr8Ve52oK +6UKuRDVQp0BLFLd58CD3Td0lpsIiWdwXpAEn7rzNpnJ86Sz5O9YPK5Bbbb8QyEgF +HQ8i8D1MyADN/zy8pYluVpB7dFEPvERPv53+okt82Edd0DVFRcNWU5WqtIIXDYIk +3bV/rFXu9almxu4GHCIUSPi+/5HHFjpjphTZCmXogGjOalSwZnCkGTN3x3yjbZow +x3M4EIEI14n/M2zF4Jb51xWgaZ2lZj3JBLPBP7QnbdpfbVdBWaKGVHbhi3jlmcfn +f+5xWbj9/YGbAz7tYKAMF9BkkmTB1CExaRlWPBD1ZBEi8wHJxZc= +=hCXt +-END PGP PUBLIC KEY BLOCK- + +ASF ID: astieger +LDAP PGP key: C236 283C 970D 2C3C FEEB 4936 BF35 CF00 7838 3142 + +C236 283C 970D 2C3C FEEB 4936 BF35 CF00 7838 3142 +-BEGIN PGP PUBLIC KEY BLOCK- + +mQGiBD7L4j8RBACkBu28B2EJ7st1mQf0vKeOl6d5Na2FDhDpYjctRoFd4QuI+pO5 +U17azA32ZFAhBW7TtJ4ZjviogUAoE8Aec/gEi9RxFfpzyjMMYZODXLX8MEnfOCij +OWBXvOkO/gDM8PIXmXHxr6C9I7BVkEr7L+JT3uQbKyKjhSEFeCt6vvy35wCgkc2t +CxF7Q7pXXyvhKpOMNc4p/4kD/3cxsrRYF3i7AlOHH0uwLDWQ6WVScGnU3BdmfLo/ +AvxW7FWiYyQZzE9gi5Q2nxbTK/76HhwgYmz/Fn44XzFRP5xAZ9mYaZUZswrr87/+ +yDrYUY4EpckQyYw66IN5VfYB5iVdyIcF+nGXiHQR9PMu93bAB6a/eFyVVkmXVCa+ +JqxFA/437DM83GkF9jrSHXdckrKwVzRaE5zy4XzFkvzl/aMSdh54rVR+WXE8lUoF +i+nxQPjHSW7mnLXZ0WQcVnvQ9STBejHgz6m3MwByeFv5eUMq3XXfSRp+V/uJ1XU7 +rovraiqONgDB42rov6RE2UphBEQpkLR7EWb97aGJvKTN6fCykrQnQW5kcmVhcyBT +dGllZ2VyIDx0dXhAd2gtaG1zLnVuaS11bG0uZGU+iEkEMBECAAkFAkeeMO0CHSAA +CgkQvzXPAHg4MUIT5gCfaQP/GWvNv30jSUEsRht9RWrKQKMAn1NotiXC/vhKQ9GH +MBOH2Uz6la/eiF4EExECAB4FAj/VnzMCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AA +CgkQvzXPAHg4MULQHQCfbcX19u+skeBCLm3sUjfmdwMRWJAAn0NKuHFZ0WGoDICi +p4EcyELVVtE/tChBbmRyZWFzIFN0aWVnZXIgPEFuZHJlYXMuU3RpZWdlckBnbXgu +ZGU+iFkEExECABkFAj7L4j8ECwcDAgMVAgMDFgIBAh4BAheAAAoJEL81zwB4ODFC +0QIAnjr96Oqs647OGPPZt62itX2on7iNAJ9Qu+woYC0dSL4Xu2g8PwQIx69VyIhc +BBMRAgAcBAsHAwIDFQIDAxYCAQIeAQIXgAUCP9WhZQIZAQAKCRC/Nc8AeDgxQg/H +AJ49Y6RLMK7Ut1KoIhfTgtU3Mzn26ACfZkrDudNlpnOAhMh6r6wnY8uS0ZS0LEFu +ZHJlYXMgU3RpZWdlciA8YXM0OEBpbmZvcm1hdGlrLnVuaS11bG0uZGU+iEkEMBEC +AAkFAkeeMNECHSAACgkQvzXPAHg4MULyXACfXg5VaVcOzREAbG+8aBXSSsxjXjoA +niTYHsSKBA6atMOoAwNqW/44L0vniF4EExECAB4FAj/Vn1ECGwMGCwkIBwMCAxUC +AwMWAgECHgECF4AACgkQvzXPAHg4MULcwACeNjGAOVTD/x9clriqa8IzqtI7WY8A +n2ZMV6xErbBr3uP/31tVEI0fK63GtDNBbmRyZWFzIFN0aWVnZXIgPEFuZHJlYXMu +U3RpZWdlckB3aC1obXMudW5pLXVsbS5kZT6ISQQwEQIACQUCR54wxwIdIAAKCRC/ +Nc8AeDgxQrj1AJ4/TvJRicUh9cSd7BWtgWivgqBemgCfbTWfXx5zljfibYPE7WMn +6iBl2LKIXgQTEQIAHgUCP9WfnQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRC/
svn commit: r1886197 - in /subversion/branches/1.14.x: STATUS subversion/include/svn_version.h
Author: stsp
Date: Thu Feb 4 12:29:49 2021
New Revision: 1886197
URL: http://svn.apache.org/viewvc?rev=1886197=rev
Log:
Post-release housekeeping: bump the 1.14.x branch to 1.14.2.
Modified:
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/include/svn_version.h
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1886197=1886196=1886197=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Thu Feb 4 12:29:49 2021
@@ -10,7 +10,7 @@ See http://subversion.apache.org/docs/co
for details on how release lines and voting work, what kinds of bugs can
delay a release, etc.
-Status of 1.14.1:
+Status of 1.14.2:
Candidate changes:
==
Modified: subversion/branches/1.14.x/subversion/include/svn_version.h
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/include/svn_version.h?rev=1886197=1886196=1886197=diff
==
--- subversion/branches/1.14.x/subversion/include/svn_version.h (original)
+++ subversion/branches/1.14.x/subversion/include/svn_version.h Thu Feb 4
12:29:49 2021
@@ -70,7 +70,7 @@ extern "C" {
*
* @since New in 1.1.
*/
-#define SVN_VER_PATCH 1
+#define SVN_VER_PATCH 2
/** @deprecated Provided for backward compatibility with the 1.0 API. */
svn commit: r1886196 - in /subversion/tags/1.14.1: ./ subversion/include/svn_version.h
Author: stsp
Date: Thu Feb 4 12:29:37 2021
New Revision: 1886196
URL: http://svn.apache.org/viewvc?rev=1886196=rev
Log:
Tagging release 1.14.1
Added:
subversion/tags/1.14.1/
- copied from r1886195, subversion/branches/1.14.x/
Modified:
subversion/tags/1.14.1/subversion/include/svn_version.h
Modified: subversion/tags/1.14.1/subversion/include/svn_version.h
URL:
http://svn.apache.org/viewvc/subversion/tags/1.14.1/subversion/include/svn_version.h?rev=1886196=1886195=1886196=diff
==
--- subversion/tags/1.14.1/subversion/include/svn_version.h (original)
+++ subversion/tags/1.14.1/subversion/include/svn_version.h Thu Feb 4 12:29:37
2021
@@ -93,7 +93,7 @@ extern "C" {
*
* Always change this at the same time as SVN_VER_NUMTAG.
*/
-#define SVN_VER_TAG" (under development)"
+#define SVN_VER_TAG" (r1886195)"
/** Number tag: a string describing the version.
@@ -108,7 +108,7 @@ extern "C" {
*
* Always change this at the same time as SVN_VER_TAG.
*/
-#define SVN_VER_NUMTAG "-dev"
+#define SVN_VER_NUMTAG ""
/** Revision number: The repository revision number of this release.
@@ -117,7 +117,7 @@ extern "C" {
* file version. Its value remains 0 in the repository except in release
* tags where it is the revision from which the tag was created.
*/
-#define SVN_VER_REVISION 0
+#define SVN_VER_REVISION 1886195
/* Version strings composed from the above definitions. */
svn commit: r1886195 - /subversion/branches/1.10.x/CHANGES
Author: stsp Date: Thu Feb 4 11:47:44 2021 New Revision: 1886195 URL: http://svn.apache.org/viewvc?rev=1886195=rev Log: * CHANGES (1.10.x): Merge from trunk. Modified: subversion/branches/1.10.x/CHANGES (contents, props changed) Modified: subversion/branches/1.10.x/CHANGES URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/CHANGES?rev=1886195=1886194=1886195=diff == --- subversion/branches/1.10.x/CHANGES (original) +++ subversion/branches/1.10.x/CHANGES Thu Feb 4 11:47:44 2021 @@ -13,12 +13,14 @@ Version 1.10.7 * Fix non-deterministic generation of mergeinfo (issue #4862) * Fix a crash seen when using git-svn with kwallet (r1875680) * Fix merge removing a folder with non-inheritable mergeinfo (issue #4859) +* Fix 'svn info --xml' gives wrong 'source-right' of conflict (issue #4869) - Server-side bugfixes: * mod_dav_svn: install cleanup handler for FS warning logging (r1865266) * mod_dav_svn: Fix missing Last-Modified header on 'external' GET requests (r1866425) * Fix formatting type size mismatches in FSFS (r1865987, -8) * Fix an undefined behavior problem in FSFS caching code (r1876054) +* Fix a potential NULL dereference in the config file parser (r1886019) Developer-visible changes: * Fix Requires(.private) fields in pkg-config files (r1863987, -90) Propchange: subversion/branches/1.10.x/CHANGES -- Merged /subversion/trunk/CHANGES:r1886017-1886194
svn commit: r1886194 - /subversion/branches/1.14.x/CHANGES
Author: stsp Date: Thu Feb 4 11:46:44 2021 New Revision: 1886194 URL: http://svn.apache.org/viewvc?rev=1886194=rev Log: * CHANGES (1.14.x): Merge from trunk. Modified: subversion/branches/1.14.x/CHANGES (contents, props changed) Modified: subversion/branches/1.14.x/CHANGES URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/CHANGES?rev=1886194=1886193=1886194=diff == --- subversion/branches/1.14.x/CHANGES (original) +++ subversion/branches/1.14.x/CHANGES Thu Feb 4 11:46:44 2021 @@ -14,12 +14,16 @@ Version 1.14.1 * Fix invalid SQL quoting in working copy upgrade system (r1879198) * Fix problems in human-readable file size formatting (r1878909, -18, -50) * Improve an error message from svnmucc (r1877072) +* Fix 'svn info --xml' gives wrong 'source-right' of conflict (issue #4869) +* Fix filename encoding/quoting when invoking editor on Windows (r1885953) +* Convert filename for editor from UTF-8 to the locale's encoding (r1882234) - Server-side improvements and bugfixes: * Fix authz doesn't combine global and repository rules (issue #4762) * Make the hot-backup.py script work with Python 3 (r1878855, r1878859) * Fix an uninitialized read in FSFS (r1880374) * Make mailer.py work properly with Python 3 (r1884427 et al) +* Fix a potential NULL dereference in the config file parser (r1886019) Developer-visible changes: - General: @@ -41,6 +45,7 @@ Version 1.14.1 * autogen.sh: Remove .swig_*_checked files from release tarballs (r1878413) * Avoid version check for Python if --without-swig is used (r1876662) * siwg-py: Fix a syntax error for Python 3.6 and later (r1885112) +* Fix several crashes and JNI warnings in javahl TunnelAgent (r1886029) Version 1.14.0 (27 May 2020, from /branches/1.14.x) @@ -269,12 +274,14 @@ Version 1.10.7 * Fix non-deterministic generation of mergeinfo (issue #4862) * Fix a crash seen when using git-svn with kwallet (r1875680) * Fix merge removing a folder with non-inheritable mergeinfo (issue #4859) +* Fix 'svn info --xml' gives wrong 'source-right' of conflict (issue #4869) - Server-side bugfixes: * mod_dav_svn: install cleanup handler for FS warning logging (r1865266) * mod_dav_svn: Fix missing Last-Modified header on 'external' GET requests (r1866425) * Fix formatting type size mismatches in FSFS (r1865987, -8) * Fix an undefined behavior problem in FSFS caching code (r1876054) +* Fix a potential NULL dereference in the config file parser (r1886019) Developer-visible changes: * Fix Requires(.private) fields in pkg-config files (r1863987, -90) Propchange: subversion/branches/1.14.x/CHANGES -- Merged /subversion/trunk/CHANGES:r1886016-1886193
svn commit: r1886193 - /subversion/trunk/CHANGES
Author: stsp Date: Thu Feb 4 11:45:27 2021 New Revision: 1886193 URL: http://svn.apache.org/viewvc?rev=1886193=rev Log: * CHANGES: Add entries for additional 1.14.x and 1.10.x backports. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1886193=1886192=1886193=diff == --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Thu Feb 4 11:45:27 2021 @@ -18,12 +18,16 @@ Version 1.14.1 * Fix invalid SQL quoting in working copy upgrade system (r1879198) * Fix problems in human-readable file size formatting (r1878909, -18, -50) * Improve an error message from svnmucc (r1877072) +* Fix 'svn info --xml' gives wrong 'source-right' of conflict (issue #4869) +* Fix filename encoding/quoting when invoking editor on Windows (r1885953) +* Convert filename for editor from UTF-8 to the locale's encoding (r1882234) - Server-side improvements and bugfixes: * Fix authz doesn't combine global and repository rules (issue #4762) * Make the hot-backup.py script work with Python 3 (r1878855, r1878859) * Fix an uninitialized read in FSFS (r1880374) * Make mailer.py work properly with Python 3 (r1884427 et al) +* Fix a potential NULL dereference in the config file parser (r1886019) Developer-visible changes: - General: @@ -45,6 +49,7 @@ Version 1.14.1 * autogen.sh: Remove .swig_*_checked files from release tarballs (r1878413) * Avoid version check for Python if --without-swig is used (r1876662) * siwg-py: Fix a syntax error for Python 3.6 and later (r1885112) +* Fix several crashes and JNI warnings in javahl TunnelAgent (r1886029) Version 1.14.0 (27 May 2020, from /branches/1.14.x) @@ -273,12 +278,14 @@ Version 1.10.7 * Fix non-deterministic generation of mergeinfo (issue #4862) * Fix a crash seen when using git-svn with kwallet (r1875680) * Fix merge removing a folder with non-inheritable mergeinfo (issue #4859) +* Fix 'svn info --xml' gives wrong 'source-right' of conflict (issue #4869) - Server-side bugfixes: * mod_dav_svn: install cleanup handler for FS warning logging (r1865266) * mod_dav_svn: Fix missing Last-Modified header on 'external' GET requests (r1866425) * Fix formatting type size mismatches in FSFS (r1865987, -8) * Fix an undefined behavior problem in FSFS caching code (r1876054) +* Fix a potential NULL dereference in the config file parser (r1886019) Developer-visible changes: * Fix Requires(.private) fields in pkg-config files (r1863987, -90)
svn propchange: r1886052 - svn:log
Author: stsp Revision: 1886052 Modified property: svn:log Modified: svn:log at Sat Jan 30 10:34:53 2021 -- --- svn:log (original) +++ svn:log Sat Jan 30 10:34:53 2021 @@ -1,2 +1,2 @@ * staging/docs/release-notes/1.10.html - (misc-compat-authz): Sync information about issue 4762 with 1.14.html. + (authz-compatibility): Sync information about issue 4762 with 1.14.html.
svn commit: r1886052 - /subversion/site/staging/docs/release-notes/1.10.html
Author: stsp
Date: Sat Jan 30 10:32:47 2021
New Revision: 1886052
URL: http://svn.apache.org/viewvc?rev=1886052=rev
Log:
* staging/docs/release-notes/1.10.html
(misc-compat-authz): Sync information about issue 4762 with 1.14.html.
Modified:
subversion/site/staging/docs/release-notes/1.10.html
Modified: subversion/site/staging/docs/release-notes/1.10.html
URL:
http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.10.html?rev=1886052=1886051=1886052=diff
==
--- subversion/site/staging/docs/release-notes/1.10.html (original)
+++ subversion/site/staging/docs/release-notes/1.10.html Sat Jan 30 10:32:47
2021
@@ -268,22 +268,81 @@ selected while 1.10 combines all the lin
The 1.10 implementation may change in future releases, perhaps to
make this case an error.
-The 1.9 implementation combined the global and per-repository rules
-for the same path:
+A fix for https://issues.apache.org/jira/browse/SVN-4762?issueNumber=4762;
+>Issue #4762 may change the way path-based authorization rules are applied
+in some circumstances. See http://svn.apache.org/r1882326;>r1882326.
+
+Background: Subversion 1.10 introduced a new implementation of path-based
+authorization (authz) to deliver wildcard support and improved performance
+over that of Subversion 1.9 and earlier. From Subversion 1.10 through 1.14.0,
+the new implementation did not correctly combine global rules with repository
+rules: if a global rule and a per-repository rule were both present for a
+path, the global rule would be ignored and the per-repository rule would
+apply by itself. As a result, from Subversion 1.10 through 1.14.0, it was not
+possible to override per-path access rules for specific users (or groups) at
+the global level. Administrators whose authz rules rely on this incorrect
+behavior may need to adjust their rules accordingly.
+
+
+This issue is fixed in 1.10.7 and 1.14.1, making it possible once again 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.
+
+As an example, consider the following rule set:
- [/some/path]
- userA = rw
- [repository:/some/path]
- userB = r
+[groups]
+company = developer1, developer2, developer3
+customer = customer1, customer2
+
+# company can read-write on everything
+[/]
+@company = rw
+
+[project1:/]
+@customer = r
+
+
+
+Does developer1 have rw access to "/trunk" in
project1?
+
+
+
+Subversion servers running 1.10.0 up to 1.10.6 or 1.14.0, without the fix for
+https://issues.apache.org/jira/browse/SVN-4762?issueNumber=4762;
+>issue #4762, will only apply the repository-specific part of the rule
set:
+
+[project1:/]
+@customer = r
+
+
+The answer in this case is that developer1 has no access at all
because the
+global rule which grants rw access to the @company group is
ignored.
+
+
+
+Subversion servers running 1.10.7 or 1.14.1 or later match the behaviour of
+Subversion 1.9, meaning they will apply both the global and the
repository-specific
+part of the rule set:
+
+# company can read-write on everything
+[/]
+@company = rw
+
+[project1:/]
+@customer = r
+
+The answer in this case is that developer1 has rw access
+to any path in project1.
+Global rules are overridden by repository-specific rules only if both the
+user (developer1) and the path ("/", including child paths
+for which no specific rules exist) match the repository-specific rule.
+While the repository-specific rule matches "/trunk" it does not
+match developer1, and hence the global rule will be used.
+
-In 1.9 this would define access for both userA
-and userB, in 1.10 the per-repository rule overrides the
-global rule and this only defines access for userB. The 1.10
-implementation may change in future releases, but the exact change
-is still being discussed on the dev mailing
-list.
svn commit: r1886051 - /subversion/site/staging/docs/release-notes/1.14.html
Author: stsp Date: Sat Jan 30 10:16:58 2021 New Revision: 1886051 URL: http://svn.apache.org/viewvc?rev=1886051=rev Log: * staging/docs/release-notes/1.14.html: Assume issue 4762 will be fixed in 1.10.7. Modified: subversion/site/staging/docs/release-notes/1.14.html Modified: subversion/site/staging/docs/release-notes/1.14.html URL: http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.14.html?rev=1886051=1886050=1886051=diff == --- subversion/site/staging/docs/release-notes/1.14.html (original) +++ subversion/site/staging/docs/release-notes/1.14.html Sat Jan 30 10:16:58 2021 @@ -1588,7 +1588,7 @@ path-based authorization (authz) rules: rule were both present for a path, the global rule would be ignored and the per-repository rule would apply by itself. -This issue is fixed as of 1.14.1. See This issue is fixed as of 1.10.7 and 1.14.1. See https://issues.apache.org/jira/browse/SVN-4762?issueNumber=4762; >Issue #4762 and http://svn.apache.org/r1882326;>r1882326.
svn commit: r1886050 - /subversion/site/staging/docs/release-notes/1.14.html
Author: stsp
Date: Sat Jan 30 10:14:29 2021
New Revision: 1886050
URL: http://svn.apache.org/viewvc?rev=1886050=rev
Log:
* staging/docs/release-notes/1.14.html
(compat-misc-authz): Add authz ruleset example for issue 4762 fix.
Modified:
subversion/site/staging/docs/release-notes/1.14.html
Modified: subversion/site/staging/docs/release-notes/1.14.html
URL:
http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/1.14.html?rev=1886050=1886049=1886050=diff
==
--- subversion/site/staging/docs/release-notes/1.14.html (original)
+++ subversion/site/staging/docs/release-notes/1.14.html Sat Jan 30 10:14:29
2021
@@ -226,7 +226,7 @@ users. We'll cover those in this sectio
A fix for https://issues.apache.org/jira/browse/SVN-4762?issueNumber=4762;
>Issue #4762 may change the way path-based authorization rules are applied
-in some circumstances.
+in some circumstances. See http://svn.apache.org/r1882326;>r1882326.
Background: Subversion 1.10 introduced a new implementation of path-based
authorization (authz) to deliver wildcard support and improved performance
@@ -236,20 +236,68 @@ rules: if a global rule and a per-reposi
path, the global rule would be ignored and the per-repository rule would
apply by itself. As a result, from Subversion 1.10 through 1.14.0, it was not
possible to override per-path access rules for specific users (or groups) at
-the global level.
-
-This issue is fixed in 1.14.1, making it possible once again 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.
-
-TODO: Show examples of authz syntax and explain how they are
-interpreted before and after the fix.
-
-Administrators whose authz rules rely on the incorrect behavior in 1.10
-through 1.14.0 may need to adjust their rules accordingly.
-
-See http://svn.apache.org/r1882326;>r1882326.
+the global level. Administrators whose authz rules rely on this incorrect
+behavior may need to adjust their rules accordingly.
+
+
+This issue is fixed in 1.10.7 and 1.14.1, making it possible once again 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.
+
+As an example, consider the following rule set:
+
+
+[groups]
+company = developer1, developer2, developer3
+customer = customer1, customer2
+
+# company can read-write on everything
+[/]
+@company = rw
+
+[project1:/]
+@customer = r
+
+
+
+Does developer1 have rw access to "/trunk" in
project1?
+
+
+
+Subversion servers running 1.10.0 up to 1.10.6 or 1.14.0, without the fix for
+https://issues.apache.org/jira/browse/SVN-4762?issueNumber=4762;
+>issue #4762, will only apply the repository-specific part of the rule
set:
+
+[project1:/]
+@customer = r
+
+
+The answer in this case is that developer1 has no access at all
because the
+global rule which grants rw access to the @company group is
ignored.
+
+
+
+Subversion servers running 1.10.7 or 1.14.1 or later match the behaviour of
+Subversion 1.9, meaning they will apply both the global and the
repository-specific
+part of the rule set:
+
+# company can read-write on everything
+[/]
+@company = rw
+
+[project1:/]
+@customer = r
+
+
+The answer in this case is that developer1 has rw access
+to any path in project1.
+Global rules are overridden by repository-specific rules only if both the
+user (developer1) and the path ("/", including child paths
+for which no specific rules exist) match the repository-specific rule.
+While the repository-specific rule matches "/trunk" it does not
+match developer1, and hence the global rule will be used.
+
svn commit: r1886021 - /subversion/branches/1.10.x/STATUS
Author: stsp Date: Fri Jan 29 13:22:08 2021 New Revision: 1886021 URL: http://svn.apache.org/viewvc?rev=1886021=rev Log: * STATUS (1.10.x): Nominate r1886019. 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=1886021=1886020=1886021=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Jan 29 13:22:08 2021 @@ -52,6 +52,13 @@ Candidate changes: Votes: +1: hartmannathan, stsp + * r1886019 + Fix a potential NULL dereference in the config file parser. + Justification: + Missing return value check. C is hard. + Votes: + +1: stsp + Veto-blocked changes: =
svn commit: r1886020 - /subversion/branches/1.14.x/STATUS
Author: stsp Date: Fri Jan 29 13:21:42 2021 New Revision: 1886020 URL: http://svn.apache.org/viewvc?rev=1886020=rev Log: * STATUS: Nominate r1886019. 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=1886020=1886019=1886020=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Jan 29 13:21:42 2021 @@ -57,6 +57,13 @@ Candidate changes: Votes: +1: hartmannathan, stsp + * r1886019 + Fix a potential NULL dereference in the config file parser. + Justification: + Missing return value check. C is hard. + Votes: + +1: stsp + Veto-blocked changes: =
svn commit: r1886019 - /subversion/trunk/subversion/libsvn_repos/config_file.c
Author: stsp
Date: Fri Jan 29 13:17:15 2021
New Revision: 1886019
URL: http://svn.apache.org/viewvc?rev=1886019=rev
Log:
Fix a potential NULL dereference in the config file parser.
* subversion/libsvn_repos/config_file.c
(get_repos_config): svn_repos_find_root_path() may return NULL.
Check the return value accordingly.
Modified:
subversion/trunk/subversion/libsvn_repos/config_file.c
Modified: subversion/trunk/subversion/libsvn_repos/config_file.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/config_file.c?rev=1886019=1886018=1886019=diff
==
--- subversion/trunk/subversion/libsvn_repos/config_file.c (original)
+++ subversion/trunk/subversion/libsvn_repos/config_file.c Fri Jan 29 13:17:15
2021
@@ -237,6 +237,10 @@ get_repos_config(svn_stream_t **stream,
{
/* Search for a repository in the full path. */
repos_root_dirent = svn_repos_find_root_path(dirent, scratch_pool);
+ if (repos_root_dirent == NULL)
+return svn_error_trace(handle_missing_file(stream, checksum, access,
+ url, must_exist,
+ svn_node_none));
/* Attempt to open a repository at repos_root_dirent. */
SVN_ERR(svn_repos_open3(>repos, repos_root_dirent, NULL,
svn commit: r1886018 - /subversion/branches/1.10.x/CHANGES
Author: stsp Date: Fri Jan 29 12:45:09 2021 New Revision: 1886018 URL: http://svn.apache.org/viewvc?rev=1886018=rev Log: * CHANGES (1.10.x): Merge outstanding updates from trunk. Modified: subversion/branches/1.10.x/CHANGES (contents, props changed) Modified: subversion/branches/1.10.x/CHANGES URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/CHANGES?rev=1886018=1886017=1886018=diff == --- subversion/branches/1.10.x/CHANGES (original) +++ subversion/branches/1.10.x/CHANGES Fri Jan 29 12:45:09 2021 @@ -5,11 +5,14 @@ # https://subversion.apache.org/issue- Version 1.10.7 -(?? ??? 2021, from /branches/1.10.x) +(10 Feb 2021, from /branches/1.10.x) User-visible changes: - Client-side bugfixes: * Fix 'svn patch' setting mode 0600 on patched files with props (r1864440) * Fix invalid SQL quoting in working copy upgrade system (r1879198) +* Fix non-deterministic generation of mergeinfo (issue #4862) +* Fix a crash seen when using git-svn with kwallet (r1875680) +* Fix merge removing a folder with non-inheritable mergeinfo (issue #4859) - Server-side bugfixes: * mod_dav_svn: install cleanup handler for FS warning logging (r1865266) @@ -20,6 +23,7 @@ Version 1.10.7 Developer-visible changes: * Fix Requires(.private) fields in pkg-config files (r1863987, -90) * Fix crash in JavaHL JNI wrapper caused by object lifetimes (r1880886) +* Fix an EOL issue in tests on Windows (r1881985 et al) Version 1.10.6 (24 Jul 2019, from /branches/1.10.x) Propchange: subversion/branches/1.10.x/CHANGES -- Merged /subversion/trunk/CHANGES:r1885106-1886016
svn commit: r1886016 - /subversion/branches/1.14.x/CHANGES
Author: stsp Date: Fri Jan 29 12:43:35 2021 New Revision: 1886016 URL: http://svn.apache.org/viewvc?rev=1886016=rev Log: * CHANGES: Merge outstanding changes from trunk. Modified: subversion/branches/1.14.x/CHANGES (contents, props changed) Modified: subversion/branches/1.14.x/CHANGES URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/CHANGES?rev=1886016=1886015=1886016=diff == --- subversion/branches/1.14.x/CHANGES (original) +++ subversion/branches/1.14.x/CHANGES Fri Jan 29 12:43:35 2021 @@ -5,7 +5,7 @@ # https://subversion.apache.org/issue- Version 1.14.1 -(?? ??? 2021, from /branches/1.14.x) +(10 Feb 2021, from /branches/1.14.x) User-visible changes: - Client-side improvements and bugfixes: * Fix non-deterministic generation of mergeinfo (issue #4862) @@ -19,6 +19,7 @@ Version 1.14.1 * Fix authz doesn't combine global and repository rules (issue #4762) * Make the hot-backup.py script work with Python 3 (r1878855, r1878859) * Fix an uninitialized read in FSFS (r1880374) +* Make mailer.py work properly with Python 3 (r1884427 et al) Developer-visible changes: - General: @@ -29,6 +30,7 @@ Version 1.14.1 * Make gen-make.py --debug work with Python 3 (r1876906) * Make test suite run correctly with Python 3 on Windows (r1876707 et al) * Fix compilation errors with Visual Studio 2008 (r1877259) +* Use Doxygen comment leader for comments with doxygen syntax (r1877794) - Bindings: * Fix win-tests.py to load Python 3 bindings with debug config (r1884642) * Fix C4204 errors building swig-py with Python 3.9 on Windows (r1883570) @@ -38,6 +40,7 @@ Version 1.14.1 * Fix crash in JavaHL JNI wrapper caused by object lifetimes (r1880886) * autogen.sh: Remove .swig_*_checked files from release tarballs (r1878413) * Avoid version check for Python if --without-swig is used (r1876662) +* siwg-py: Fix a syntax error for Python 3.6 and later (r1885112) Version 1.14.0 (27 May 2020, from /branches/1.14.x) @@ -258,11 +261,14 @@ http://svn.apache.org/repos/asf/subversi Version 1.10.7 -(?? ??? 2021, from /branches/1.10.x) +(10 Feb 2021, from /branches/1.10.x) User-visible changes: - Client-side bugfixes: * Fix 'svn patch' setting mode 0600 on patched files with props (r1864440) * Fix invalid SQL quoting in working copy upgrade system (r1879198) +* Fix non-deterministic generation of mergeinfo (issue #4862) +* Fix a crash seen when using git-svn with kwallet (r1875680) +* Fix merge removing a folder with non-inheritable mergeinfo (issue #4859) - Server-side bugfixes: * mod_dav_svn: install cleanup handler for FS warning logging (r1865266) @@ -273,6 +279,7 @@ Version 1.10.7 Developer-visible changes: * Fix Requires(.private) fields in pkg-config files (r1863987, -90) * Fix crash in JavaHL JNI wrapper caused by object lifetimes (r1880886) +* Fix an EOL issue in tests on Windows (r1881985 et al) Version 1.10.6 (24 Jul 2019, from /branches/1.10.x) Propchange: subversion/branches/1.14.x/CHANGES -- Merged /subversion/trunk/CHANGES:r1885105-1886015
svn commit: r1886014 - /subversion/trunk/CHANGES
Author: stsp Date: Fri Jan 29 12:42:47 2021 New Revision: 1886014 URL: http://svn.apache.org/viewvc?rev=1886014=rev Log: * CHANGES: Add changes recently merged to 1.14.x and 1.10.x Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1886014=1886013=1886014=diff == --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Fri Jan 29 12:42:47 2021 @@ -23,6 +23,7 @@ Version 1.14.1 * Fix authz doesn't combine global and repository rules (issue #4762) * Make the hot-backup.py script work with Python 3 (r1878855, r1878859) * Fix an uninitialized read in FSFS (r1880374) +* Make mailer.py work properly with Python 3 (r1884427 et al) Developer-visible changes: - General: @@ -33,6 +34,7 @@ Version 1.14.1 * Make gen-make.py --debug work with Python 3 (r1876906) * Make test suite run correctly with Python 3 on Windows (r1876707 et al) * Fix compilation errors with Visual Studio 2008 (r1877259) +* Use Doxygen comment leader for comments with doxygen syntax (r1877794) - Bindings: * Fix win-tests.py to load Python 3 bindings with debug config (r1884642) * Fix C4204 errors building swig-py with Python 3.9 on Windows (r1883570) @@ -42,6 +44,7 @@ Version 1.14.1 * Fix crash in JavaHL JNI wrapper caused by object lifetimes (r1880886) * autogen.sh: Remove .swig_*_checked files from release tarballs (r1878413) * Avoid version check for Python if --without-swig is used (r1876662) +* siwg-py: Fix a syntax error for Python 3.6 and later (r1885112) Version 1.14.0 (27 May 2020, from /branches/1.14.x) @@ -267,6 +270,9 @@ Version 1.10.7 - Client-side bugfixes: * Fix 'svn patch' setting mode 0600 on patched files with props (r1864440) * Fix invalid SQL quoting in working copy upgrade system (r1879198) +* Fix non-deterministic generation of mergeinfo (issue #4862) +* Fix a crash seen when using git-svn with kwallet (r1875680) +* Fix merge removing a folder with non-inheritable mergeinfo (issue #4859) - Server-side bugfixes: * mod_dav_svn: install cleanup handler for FS warning logging (r1865266) @@ -277,6 +283,7 @@ Version 1.10.7 Developer-visible changes: * Fix Requires(.private) fields in pkg-config files (r1863987, -90) * Fix crash in JavaHL JNI wrapper caused by object lifetimes (r1880886) +* Fix an EOL issue in tests on Windows (r1881985 et al) Version 1.10.6 (24 Jul 2019, from /branches/1.10.x)
svn commit: r1886013 - /subversion/trunk/CHANGES
Author: stsp Date: Fri Jan 29 12:35:25 2021 New Revision: 1886013 URL: http://svn.apache.org/viewvc?rev=1886013=rev Log: * CHANGES: Update projected release date for 1.14.1 and 1.10.17. Modified: subversion/trunk/CHANGES Modified: subversion/trunk/CHANGES URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1886013=1886012=1886013=diff == --- subversion/trunk/CHANGES (original) +++ subversion/trunk/CHANGES Fri Jan 29 12:35:25 2021 @@ -9,7 +9,7 @@ Version 1.15.0 https://svn.apache.org/repos/asf/subversion/tags/1.15.0 Version 1.14.1 -(?? ??? 2021, from /branches/1.14.x) +(10 Feb 2021, from /branches/1.14.x) User-visible changes: - Client-side improvements and bugfixes: * Fix non-deterministic generation of mergeinfo (issue #4862) @@ -262,7 +262,7 @@ http://svn.apache.org/repos/asf/subversi Version 1.10.7 -(?? ??? 2021, from /branches/1.10.x) +(10 Feb 2021, from /branches/1.10.x) User-visible changes: - Client-side bugfixes: * Fix 'svn patch' setting mode 0600 on patched files with props (r1864440)
svn commit: r1886012 - /subversion/branches/1.10.x/STATUS
Author: stsp Date: Fri Jan 29 12:17:22 2021 New Revision: 1886012 URL: http://svn.apache.org/viewvc?rev=1886012=rev Log: * STATUS (1.10.x): Vote for r1885983. 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=1886012=1886011=1886012=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Fri Jan 29 12:17:22 2021 @@ -50,7 +50,7 @@ Candidate changes: Branch: 1.10.x-r1885983 Votes: - +1: hartmannathan + +1: hartmannathan, stsp Veto-blocked changes: =
svn commit: r1886011 - /subversion/branches/1.14.x/STATUS
Author: stsp Date: Fri Jan 29 11:37:05 2021 New Revision: 1886011 URL: http://svn.apache.org/viewvc?rev=1886011=rev Log: * STATUS: Vote for r1882234 and r1885953, 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=1886011=1886010=1886011=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Jan 29 11:37:05 2021 @@ -50,16 +50,6 @@ Candidate changes: Votes: +1: hartmannathan, stsp - * r1885953 - Fix file name encoding and quoting when invoking editor on Windows. - Justification: - Invoking editor with special character or spaces in path is broken - on Windows. - Depends: - r1882234 - Votes: - +1: jcorvel, futatuki - * r1885983 Fix issue #4869: 'svn info --xml' gives wrong 'source-right' of conflict Justification: @@ -67,13 +57,6 @@ Candidate changes: Votes: +1: hartmannathan, stsp - * r1882234 - Fix file name to edit from utf8 to local style. - Justification: - Editor invocation should work correctly in any valid locale. - Votes: - +1: futatuki, jcorvel - Veto-blocked changes: = @@ -90,3 +73,20 @@ Veto-blocked changes: Approved changes: = + + * r1882234 + Fix file name to edit from utf8 to local style. + Justification: + Editor invocation should work correctly in any valid locale. + Votes: + +1: futatuki, jcorvel, stsp + + * r1885953 + Fix file name encoding and quoting when invoking editor on Windows. + Justification: + Invoking editor with special character or spaces in path is broken + on Windows. + Depends: + r1882234 + Votes: + +1: jcorvel, futatuki, stsp
svn commit: r1886010 - /subversion/branches/1.14.x/STATUS
Author: stsp Date: Fri Jan 29 11:22:16 2021 New Revision: 1886010 URL: http://svn.apache.org/viewvc?rev=1886010=rev Log: * STATUS: Vote for r1881534 and r1885983. 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=1886010=1886009=1886010=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Fri Jan 29 11:22:16 2021 @@ -48,7 +48,7 @@ Candidate changes: Branch: 1.14.x-r1881534-no-crlf Votes: - +1: hartmannathan + +1: hartmannathan, stsp * r1885953 Fix file name encoding and quoting when invoking editor on Windows. @@ -65,7 +65,7 @@ Candidate changes: Justification: Bugfix; 'svn info --xml' should give correct results; user complained. Votes: - +1: hartmannathan + +1: hartmannathan, stsp * r1882234 Fix file name to edit from utf8 to local style.
svn commit: r1886000 - /subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh
Author: stsp
Date: Thu Jan 28 22:17:44 2021
New Revision: 1886000
URL: http://svn.apache.org/viewvc?rev=1886000=rev
Log:
* tools/buildbot/slaves/bb-openbsd/svnclean.sh: Remove generated HTTPD config
files if Makefile.svn has changed. Should prevent this bot from staying red
when these files need to be updated in order to keep ra_serf tests passing.
Modified:
subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh
Modified: subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh?rev=1886000=1885999=1886000=diff
==
--- subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh Thu Jan 28
22:17:44 2021
@@ -40,6 +40,11 @@ if [ -d .svn ]; then
branch="${url##*/}"
if [ "$lastchangedrev" != "$newlastchangedrev" ]; then
(cd .. && gmake BRANCH="$branch" reset clean)
+rm -f ../prefix/httpd/conf/httpd-svn-check-*.conf
+rm -f ../prefix/httpd/conf/httpd-svn-proxy-*.conf
+rm -f ../prefix/httpd/conf/httpd-svn-check-users
+rm -f ../prefix/httpd/conf/httpd-svn-check-groups
+rm -f ../prefix/httpd/conf/dontdothat
else
(cd .. && gmake BRANCH="$branch" svn-reset svn-bindings-reset svn-clean)
fi
