Author: danielsh
Date: Fri Aug 30 17:44:04 2019
New Revision: 1866154

URL: http://svn.apache.org/viewvc?rev=1866154&view=rev
Log:
Sync-merge from publish

Added:
    
subversion/site/staging/docs/community-guide/how-to-roll-releases-in-private.txt
      - copied unchanged from r1866153, 
subversion/site/publish/docs/community-guide/how-to-roll-releases-in-private.txt
    subversion/site/staging/security/CVE-2018-11782-advisory.txt
      - copied unchanged from r1866153, 
subversion/site/publish/security/CVE-2018-11782-advisory.txt
    subversion/site/staging/security/CVE-2018-11782-advisory.txt.asc
      - copied unchanged from r1866153, 
subversion/site/publish/security/CVE-2018-11782-advisory.txt.asc
    subversion/site/staging/security/CVE-2019-0203-advisory.txt
      - copied unchanged from r1866153, 
subversion/site/publish/security/CVE-2019-0203-advisory.txt
    subversion/site/staging/security/CVE-2019-0203-advisory.txt.asc
      - copied unchanged from r1866153, 
subversion/site/publish/security/CVE-2019-0203-advisory.txt.asc
Modified:
    subversion/site/staging/   (props changed)
    subversion/site/staging/.message-ids.tsv
    subversion/site/staging/docs/   (props changed)
    subversion/site/staging/docs/community-guide/   (props changed)
    subversion/site/staging/docs/community-guide/issues.part.html
    subversion/site/staging/docs/release-notes/   (props changed)
    subversion/site/staging/docs/release-notes/index.html
    subversion/site/staging/download.html
    subversion/site/staging/index.html   (contents, props changed)
    subversion/site/staging/news.html   (contents, props changed)
    subversion/site/staging/roadmap.html   (props changed)
    subversion/site/staging/security/index.html
    subversion/site/staging/site-nav.html
    subversion/site/staging/upcoming.part.html

Propchange: subversion/site/staging/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 30 17:44:04 2019
@@ -1 +1 @@
-/subversion/site/publish:1812681-1863904
+/subversion/site/publish:1812681-1866153

Modified: subversion/site/staging/.message-ids.tsv
URL: 
http://svn.apache.org/viewvc/subversion/site/staging/.message-ids.tsv?rev=1866154&r1=1866153&r2=1866154&view=diff
==============================================================================
--- subversion/site/staging/.message-ids.tsv (original)
+++ subversion/site/staging/.message-ids.tsv Fri Aug 30 17:44:04 2019
@@ -1,5 +1,5 @@
 # Message-ids of archived emails that are referenced by a svn.haxx.se URL.
-# Generated by tools/haxx-url-to-message-id.sh on 2018-12-11
+# Generated by tools/haxx-url-to-message-id.sh on 2019-08-03
 https://svn.haxx.se/dev/archive-2003-01/1125.shtml     
20030116213052.314004c1.tt...@idsoftware.com
 https://svn.haxx.se/dev/archive-2003-02/0068.shtml     
87wuki4fpy....@codematters.co.uk
 https://svn.haxx.se/dev/archive-2003-10/0136.shtml     
200310031235.h93czgiv064...@bigtex.jrv.org
@@ -41,9 +41,12 @@ https://svn.haxx.se/dev/archive-2015-08/
 https://svn.haxx.se/dev/archive-2015-08/0026.shtml     
20150805203809.go30...@ted.stsp.name
 https://svn.haxx.se/dev/archive-2015-08/0098.shtml     
20150814190158.ga13...@fintan.stsp.name
 https://svn.haxx.se/dev/archive-2017-07/0054.shtml     
20170707111125.gc53...@jessup.stsp.name
+https://svn.haxx.se/dev/archive-2019-03/0012.shtml     
fbbd2c2c-0287-4486-9177-e532ba45f...@ikoder.com
+https://svn.haxx.se/dev/archive-2019-04/0020.shtml     
0ca0045a-7f19-b22b-b184-535275371...@apache.org
 https://svn.haxx.se/users/archive-2004-03/0488.shtml   
1078601435.31293.104.ca...@madison.badger.com
 https://svn.haxx.se/users/archive-2004-07/1662.shtml   
003c01c4763b$180511f0$800000c0@blazepoint.local
 https://svn.haxx.se/users/archive-2010-01/0001.shtml   
69b68910-b4d0-428e-a4bb-fb7d6e87b...@barrys-emacs.org
 https://svn.haxx.se/users/archive-2012-03/0147.shtml   
20120308190221.ga4...@jack.stsp.name
 https://svn.haxx.se/users/archive-2012-09/0236.shtml   
20120921085850.gg24...@ted.stsp.name
+https://svn.haxx.se/users/archive-2019-04/0041.shtml   
9739e241-f88c-8a79-11f5-783a7f119...@neuf.fr
 http://svn.haxx.se/dev/archive-2010-08/0362.shtml      
4c65756c.8070...@collab.net

Propchange: subversion/site/staging/docs/
------------------------------------------------------------------------------
    svn:mergeinfo = /subversion/site/publish/docs:1812681-1866153*

Propchange: subversion/site/staging/docs/community-guide/
------------------------------------------------------------------------------
    svn:mergeinfo = 
/subversion/site/publish/docs/community-guide:1812681-1866153

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=1866154&r1=1866153&r2=1866154&view=diff
==============================================================================
--- subversion/site/staging/docs/community-guide/issues.part.html (original)
+++ subversion/site/staging/docs/community-guide/issues.part.html Fri Aug 30 
17:44:04 2019
@@ -410,6 +410,8 @@ Security reporting instructions</a>.</p>
 
 </div>
 
+<h3>Security approach in Subversion's Design and Implementation</h3>
+
 <p>Subversion's first job is keeping your data safe.  To do that, the
 Subversion development community takes security very seriously.  One way we
 demonstrate this is by not pretending to be cryptography or security experts.
@@ -422,6 +424,8 @@ SASL or by the Apache HTTP Server and it
 degree that we can leverage the knowledge of security experts by using the
 third-party libraries and APIs they provide, we will continue to do so.</p>
 
+<h3>Handling reported security vulnerabilities</h3>
+
 <p>This document describes the steps we take when receiving or finding an
 issue which may be classified as having security implications, and is meant to
 suppliment the
@@ -436,6 +440,35 @@ to committers for the same.</p>
   Other stuff?
 -->
 
+<h4>Mailing Lists</h4>
+
+<p>Security problems should be discussed on priv...@subversion.apache.org +
+secur...@apache.org.  secur...@subversion.apache.org is a convenience alias
+that targets these two lists.  (Note that unlike, say, security@httpd.a.o,
+it is not a mailing list, so you can't subscribe/unsubscribe to it
+separately.)</p>
+
+<h4>Tracking Issues</h4>
+
+<p>We publish the list of previous security advisories at:
+<a 
href="http://subversion.apache.org/security/#advisories";>http://subversion.apache.org/security/</a></p>
+
+<p>We track in-progress issues in the PMC's private repository:
+<tt>https://svn.apache.org/repos/private/pmc/subversion/security</tt></p>
+
+<h4>Procedures We Follow</h4>
+
+<p>We aim to follow a published procedure.</p>
+
+<p>We usually follow the ASF's recommended
+<a href="https://www.apache.org/security/committers";>procedure</a>.
+We usually also do pre-notification to pre-selected parties; details of this
+are managed in the PMC's private repository.</p>
+
+<p>We also have a different procedure which we may use, documented in
+<a href="how-to-roll-releases-in-private.txt">How to Roll Releases in 
Private</a>.
+At present we do <b>not</b> usually use this procedure.</p>
+
 
 </div> <!-- security -->
 

Propchange: subversion/site/staging/docs/release-notes/
------------------------------------------------------------------------------
    svn:mergeinfo = /subversion/site/publish/docs/release-notes:1812681-1866153

Modified: subversion/site/staging/docs/release-notes/index.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging/docs/release-notes/index.html?rev=1866154&r1=1866153&r2=1866154&view=diff
==============================================================================
--- subversion/site/staging/docs/release-notes/index.html (original)
+++ subversion/site/staging/docs/release-notes/index.html Fri Aug 30 17:44:04 
2019
@@ -78,12 +78,10 @@ official support status for the various
     title="Link to this section">&para;</a>
 </h3>
 
-<p>The following changes have been merged to the 1.11.x branch since the last 
1.11.x patch release and will almost certainly be included in the next 1.11.x 
patch release:</p>
+<p>The following changes have been merged since the last patch release and 
will almost certainly be included in the next patch release:</p>
 
 <!--#include virtual="/upcoming.part.html" -->
 
-<p>Further changes currently under consideration are listed in <a 
href="http://svn.apache.org/repos/asf/subversion/branches/1.11.x/STATUS";>1.11.x/STATUS</a>.</p>
-
 <p>See also <a 
href="http://svn.apache.org/repos/asf/subversion/trunk/CHANGES";>trunk/CHANGES</a>,
 where all significant-enough changes will summarized for each version by the 
time it is released.</p>
 
 <p>The list above is generated daily by <a 
href="http://svn.apache.org/repos/asf/subversion/site/tools/upcoming.py";>^/subversion/site/tools/upcoming.py</a>.
 You could find the changes queued for another release line by running that 
script in a working copy of, for example, the 1.10.x branch.</p>
@@ -106,29 +104,24 @@ official support status for the various
 <tr>
 <th>Version</th>
 <th>Type of Release</th>
-<th>Support Period</th>
 </tr>
 </thead>
 <tbody>
 <tr>
 <td>1.12.x</td>
 <td>Regular Release</td>
-<td>6 months</td>
 </tr>
 <tr>
 <td>1.10.x</td>
 <td>Long-Term Support</td>
-<td>2 years</td>
 </tr>
 <tr>
 <td>1.9.x</td>
 <td>Long-Term Support</td>
-<td>2 years</td>
 </tr>
 <tr>
 <td>1.8.x and earlier</td>
 <td>No longer supported</td>
-<td></td>
 </tr>
 </tbody>
 </table>

Modified: subversion/site/staging/download.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging/download.html?rev=1866154&r1=1866153&r2=1866154&view=diff
==============================================================================
--- subversion/site/staging/download.html (original)
+++ subversion/site/staging/download.html Fri Aug 30 17:44:04 2019
@@ -20,15 +20,20 @@
 [define version]1.12.2[end]
 
 <div class="notice">
-<p>New 6-month regular and 2-year LTS release schedule: see
+<p>Learn about our new 6-month regular and 2-year LTS release schedule: see
 <a href="/roadmap.html#release-planning">How We Plan Releases</a>.</p>
 </div>
 
 <div class="bigpoint">
-<p>The latest stable release of Apache Subversion
+<p>The latest regular release of Apache Subversion
    is:&nbsp;<a href="#recommended-release">[version]</a></p>
 </div> <!-- .bigpoint -->
 
+<div class="bigpoint">
+<p>The latest LTS (long-term support) release of Apache Subversion
+   is:&nbsp;<a href="#supported-releases">1.10 LTS</a></p>
+</div> <!-- .bigpoint -->
+
 <p>Use the links below to download Apache Subversion from one of our mirrors.
    You <strong>must</strong> <a href="#verifying">verify the integrity</a> of
    the downloaded files using signatures downloaded from our main
@@ -92,11 +97,14 @@ Other mirrors:
    download <tt>.tar.gz</tt> or <tt>.tar.bz2</tt> files.</p>
 
 <div class="h3" id="recommended-release">
-<h3>Latest Stable Release
+<h3>Latest Regular Release
   <a class="sectionlink" href="#recommended-release"
     title="Link to this section">&para;</a>
 </h3>
 
+<p><a href="/roadmap.html#release-planning">Regular releases</a>
+   are supported for <b>6 months</b>.</p>
+
 <p style="font-size: 150%; text-align: center;">Apache Subversion 1.12.2</p>
 <table class="centered">
 <tr>
@@ -128,17 +136,15 @@ Other mirrors:
 </div>  <!-- #recommended-release -->
 
 <div class="h3" id="supported-releases">
-<h3>Other Supported Release(s)
+<h3>LTS Releases
   <a class="sectionlink" href="#supported-releases"
     title="Link to this section">&para;</a>
 </h3>
 
-<p>In addition to the <a href="#recommended-release">latest stable
-   release [version]</a>, the following releases currently receive
-   <a href="/roadmap.html#release-planning">Long-Term Support</a> for high
-   priority issues such as security and data loss or corruption only:</p>
+<p><a href="/roadmap.html#release-planning">LTS releases</a>
+   receive Long-Term Support for <b>4 years</b>.</p>
 
-<p style="font-size: 150%; text-align: center;">Apache Subversion 1.10.6</p>
+<p style="font-size: 150%; text-align: center;">Apache Subversion 1.10.6 
LTS</p>
 <table class="centered">
 <tr>
   <th>File</th>
@@ -166,7 +172,7 @@ Other mirrors:
 </tr>
 </table>
 
-<p style="font-size: 150%; text-align: center;">Apache Subversion 1.9.12</p>
+<p style="font-size: 150%; text-align: center;">Apache Subversion 1.9.12 
LTS</p>
 <table class="centered">
 <tr>
   <th>File</th>
@@ -232,9 +238,7 @@ Other mirrors:
 <p>Looking for previous releases of Subversion?  All Subversion
    releases are available for download from the
    <a href="https://archive.apache.org/dist/subversion/"; >Apache
-   distribution archive</a>.  Please note that, with the exception of
-   our <a href="#recommended-release">recommended</a> and
-   other <a href="#supported-releases">supported</a> releases,
+   distribution archive</a>.  Except for our currently supported releases,
    distributions of Subversion found in the archives are not supported
    by the community.  If you require support for an older version of
    Subversion, and are not able to upgrade to a newer version,

Modified: subversion/site/staging/index.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging/index.html?rev=1866154&r1=1866153&r2=1866154&view=diff
==============================================================================
--- subversion/site/staging/index.html (original)
+++ subversion/site/staging/index.html Fri Aug 30 17:44:04 2019
@@ -64,6 +64,28 @@
 
 <!-- In general, we'll keep only the most recent 3 or 4 news items here. -->
 
+<div class="h3" id="news-20190731">
+<h3>2019-07-31 &mdash; Apache Subversion Security Advisory
+<a class="sectionlink" href="#news-20190731"
+   title="Link to this section">&para;</a>
+</h3>
+
+<p>The recent releases of Apache Subversion 1.12.2, 1.10.6, 1.9.12, contain
+ fixes for two security issues, <a
+ href="/security/CVE-2018-11782-advisory.txt">CVE-2018-11782</a> and <a
+ href="/security/CVE-2019-0203-advisory.txt">CVE-2019-0203</a>. These issues
+ affect Subversion 'svnserve' servers only. We encourage server operators
+ to upgrade to the latest appropriate version as soon as reasonable.
+
+ Please see the <a
+ href="https://lists.apache.org/list.html?annou...@subversion.apache.org";
+ >release announcements</a> for more information about the releases.</p>
+
+<p>To get the latest release from the nearest mirror, please visit our
+ <a href="/download.cgi">download page</a>.</p>
+
+</div> <!-- #news-20190731 -->
+
 <div class="h3" id="news-20190724"> 
 <h3>2019-07-24 &mdash; Apache Subversion 1.12.2, 1.10.6, 1.9.12 Released
  <a class="sectionlink" href="#news-20190724"
@@ -82,7 +104,7 @@
  for more information about these releases.</p> 
  
 <p>To get this release from the nearest mirror, please visit our
- <a href="/download.cgi#supported-releases">download page</a>.</p> 
+ <a href="/download.cgi">download page</a>.</p> 
  
 </div> <!-- #news-20190724 --> 
 
@@ -102,7 +124,7 @@
  >release notes</a> for more information about this release.</p> 
  
 <p>To get this release from the nearest mirror, please visit our
- <a href="/download.cgi#supported-releases">download page</a>.</p> 
+ <a href="/download.cgi">download page</a>.</p> 
  
 </div> <!-- #news-20190424 --> 
 

Propchange: subversion/site/staging/index.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 30 17:44:04 2019
@@ -1,2 +1,2 @@
-/subversion/site/publish/index.html:1812681-1863904
+/subversion/site/publish/index.html:1812681-1866153
 /subversion/site/staging/index.html:1812681-1812682

Modified: subversion/site/staging/news.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging/news.html?rev=1866154&r1=1866153&r2=1866154&view=diff
==============================================================================
--- subversion/site/staging/news.html (original)
+++ subversion/site/staging/news.html Fri Aug 30 17:44:04 2019
@@ -22,6 +22,28 @@
 <!-- Maybe we could insert H2's to split up the news items by  -->
 <!-- calendar year if we felt the need to do so.               -->
 
+<div class="h3" id="news-20190731">
+<h3>2019-07-31 &mdash; Apache Subversion Security Advisory
+<a class="sectionlink" href="#news-20190731"
+   title="Link to this section">&para;</a>
+</h3>
+
+<p>The recent releases of Apache Subversion 1.12.2, 1.10.6, 1.9.12, contain
+ fixes for two security issues, <a
+ href="/security/CVE-2018-11782-advisory.txt">CVE-2018-11782</a> and <a
+ href="/security/CVE-2019-0203-advisory.txt">CVE-2019-0203</a>. These issues
+ affect Subversion 'svnserve' servers only. We encourage server operators
+ to upgrade to the latest appropriate version as soon as reasonable.
+
+ Please see the <a
+ href="https://lists.apache.org/list.html?annou...@subversion.apache.org";
+ >release announcements</a> for more information about the releases.</p>
+
+<p>To get the latest release from the nearest mirror, please visit our
+ <a href="/download.cgi">download page</a>.</p>
+
+</div> <!-- #news-20190731 -->
+
 <div class="h3" id="news-20190724"> 
 <h3>2019-07-24 &mdash; Apache Subversion 1.12.2, 1.10.6, 1.9.12 Released
  <a class="sectionlink" href="#news-20190724"
@@ -40,7 +62,7 @@
  for more information about these releases.</p> 
  
 <p>To get this release from the nearest mirror, please visit our
- <a href="/download.cgi#supported-releases">download page</a>.</p> 
+ <a href="/download.cgi">download page</a>.</p> 
  
 </div> <!-- #news-20190724 --> 
 
@@ -60,7 +82,7 @@
  >release notes</a> for more information about this release.</p> 
  
 <p>To get this release from the nearest mirror, please visit our
- <a href="/download.cgi#supported-releases">download page</a>.</p> 
+ <a href="/download.cgi">download page</a>.</p> 
  
 </div> <!-- #news-20190424 --> 
 

Propchange: subversion/site/staging/news.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 30 17:44:04 2019
@@ -1,2 +1,2 @@
-/subversion/site/publish/news.html:1812681-1863904
+/subversion/site/publish/news.html:1812681-1866153
 /subversion/site/staging/news.html:1812681-1812682

Propchange: subversion/site/staging/roadmap.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 30 17:44:04 2019
@@ -1,2 +1,2 @@
-/subversion/site/publish/roadmap.html:1812681-1863904
+/subversion/site/publish/roadmap.html:1812681-1866153
 /subversion/site/staging/roadmap.html:1812681-1812682

Modified: subversion/site/staging/security/index.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging/security/index.html?rev=1866154&r1=1866153&r2=1866154&view=diff
==============================================================================
--- subversion/site/staging/security/index.html (original)
+++ subversion/site/staging/security/index.html Fri Aug 30 17:44:04 2019
@@ -292,6 +292,20 @@ clients using http(s)://</td>
     directory listing operation.</td>
 </tr>
 
+<tr>
+<td><a href="CVE-2018-11782-advisory.txt">CVE-2018-11782-advisory.txt</a>
+[<a href="CVE-2018-11782-advisory.txt.asc">PGP</a>]</td>
+<td>1.9.0-1.9.10, 1.10.0-1.10.4, 1.11.0-1.11.1, 1.12.0</td>
+<td>Remotely triggerable DoS vulnerability in svnserve 'get-deleted-rev'.</td>
+</tr>
+
+<tr>
+<td><a href="CVE-2019-0203-advisory.txt">CVE-2019-0203-advisory.txt</a>
+[<a href="CVE-2019-0203-advisory.txt.asc">PGP</a>]</td>
+<td>1.9.0-1.9.10, 1.10.0-1.10.4, 1.11.0-1.11.1, 1.12.0</td>
+<td>Remote unauthenticated denial-of-service in Subversion svnserve.</td>
+</tr>
+
 </tbody>
 </table>
 

Modified: subversion/site/staging/site-nav.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging/site-nav.html?rev=1866154&r1=1866153&r2=1866154&view=diff
==============================================================================
--- subversion/site/staging/site-nav.html (original)
+++ subversion/site/staging/site-nav.html Fri Aug 30 17:44:04 2019
@@ -14,12 +14,13 @@
   </li>
   <li>Getting Subversion
       <ul>
-      <!-- The ?update= parameter is used to only offer mirrors that have
+      <!-- A parameter in the form '?update=YYYYMMDDhhmm' may
+           be appended to 'download.cgi' to only offer mirrors that have
            synced after the specified date. We update it after a security
            release when the email announcement is less than 24 hours after
            the upload to /dist/release, in order to prevent offering mirrors
            that don't carry the just-released artifacts. -->
-      <li><a href="/download.cgi?update=201708081800">Source Download</a></li>
+      <li><a href="/download.cgi">Source Download</a></li>
       <li><a href="/packages.html">Binary Packages</a></li>
       <li><a href="/docs/release-notes/">Release Notes</a></li>
     </ul>

Modified: subversion/site/staging/upcoming.part.html
URL: 
http://svn.apache.org/viewvc/subversion/site/staging/upcoming.part.html?rev=1866154&r1=1866153&r2=1866154&view=diff
==============================================================================
--- subversion/site/staging/upcoming.part.html (original)
+++ subversion/site/staging/upcoming.part.html Fri Aug 30 17:44:04 2019
@@ -1,62 +1,115 @@
 <!-- Automatically generated by 
^/subversion/site/tools/generate-upcoming-changes-log.sh -->
 <pre style="border-style: none">
+Changes in ^/subversion/branches/1.12.x:
 ------------------------------------------------------------------------
-<a href="https://svn.apache.org/r1854885";>r1854885</a> | svn-role | 2019-03-06 
04:00:16 +0000 (Wed, 06 Mar 2019) | 10 lines
+<a href="https://svn.apache.org/r1860377";>r1860377</a> | svn-role | 2019-05-30 
04:00:08 +0000 (Thu, 30 May 2019) | 11 lines
 
-Merge <a href="https://svn.apache.org/r1847377";>r1847377</a> from trunk:
+Merge <a href="https://svn.apache.org/r1857391";>r1857391</a> from trunk:
 
- * <a href="https://svn.apache.org/r1847377";>r1847377</a>
-   Reduce the scope of the Windows-specific help text for &#x27;svn list&#x27;.
+ * <a href="https://svn.apache.org/r1857391";>r1857391</a>
+   Fix build with APR 1.7.0.
    Justification:
-     Should make backporting translations easier with a more more similar
-     generated .po file.
+     Bogus configure script check relies on APR internals.
+     See https://svn.haxx.se/users/archive-2019-04/0041.shtml
+     and https://svn.haxx.se/dev/archive-2019-04/0020.shtml
    Votes:
-     +1: brane, stefan2, stsp
+     +1: stsp, rhuijben (bindings change so 2+1&#x27;s is enough)
 
 ------------------------------------------------------------------------
-<a href="https://svn.apache.org/r1854886";>r1854886</a> | svn-role | 2019-03-06 
04:00:19 +0000 (Wed, 06 Mar 2019) | 14 lines
+<a href="https://svn.apache.org/r1863267";>r1863267</a> | julianfoad | 
2019-07-18 10:11:00 +0000 (Thu, 18 Jul 2019) | 4 lines
 
-Merge the <a href="https://svn.apache.org/r1847598";>r1847598</a> group from 
trunk:
+On &#x27;1.12.x&#x27; branch: Backport <a 
href="https://svn.apache.org/r1863262";>r1863262</a> (Do not print password to 
screen in
+svn_load_dirs.pl). A contrib script, so backported without voting.
+This commit adds the missing mergeinfo.
+------------------------------------------------------------------------
+<a href="https://svn.apache.org/r1863285";>r1863285</a> | julianfoad | 
2019-07-18 13:36:09 +0000 (Thu, 18 Jul 2019) | 11 lines
+
+Merge <a href="https://svn.apache.org/r1855419";>r1855419</a> from trunk:
 
- * <a href="https://svn.apache.org/r1847598";>r1847598</a>, <a 
href="https://svn.apache.org/r1847697";>r1847697</a>, <a 
href="https://svn.apache.org/r1847922";>r1847922</a>, <a 
href="https://svn.apache.org/r1847924";>r1847924</a>, <a 
href="https://svn.apache.org/r1847946";>r1847946</a>
-   Fix <a href="/issue-4793">SVN-4793</a>: authz rights from inverted access 
selectors were not
-   accounted for at the global level, causing wrong authz check results.
+ * <a href="https://svn.apache.org/r1855419";>r1855419</a>
+   Fix conflict resolver bug where local and incoming edits got swapped.
    Justification:
-     Fixes a regression in the new authz parser and resolver.
-   Notes:
-     - <a href="https://svn.apache.org/r1847598";>r1847598</a> and <a 
href="https://svn.apache.org/r1847697";>r1847697</a> are only test suite 
changes, but by including
-       them we can avoids creating a backport branch.
-     - <a href="https://svn.apache.org/r1847924";>r1847924</a> and <a 
href="https://svn.apache.org/r1847946";>r1847946</a> are tiny but IMO relevant 
comment tweaks.
+     Bug breaks text conflict resolution.
+     User complained: https://svn.haxx.se/dev/archive-2019-03/0012.shtml
+   Votes:
+     +1: stsp
+     +0: rhuijben
+
+------------------------------------------------------------------------
+<a href="https://svn.apache.org/r1863286";>r1863286</a> | julianfoad | 
2019-07-18 13:36:17 +0000 (Thu, 18 Jul 2019) | 9 lines
+
+Merge <a href="https://svn.apache.org/r1856397";>r1856397</a> from trunk:
+
+ * <a href="https://svn.apache.org/r1856397";>r1856397</a>
+   Allow generating Visual Studio 2019 projects
+   Justification:
+     Makes it easier to build Subversion on Windows. Simple local fix.
    Votes:
-     +1: brane, stefan2, stsp
+     +1: rhuijben
+
+------------------------------------------------------------------------
+<a href="https://svn.apache.org/r1863287";>r1863287</a> | julianfoad | 
2019-07-18 13:36:24 +0000 (Thu, 18 Jul 2019) | 9 lines
+
+Merge <a href="https://svn.apache.org/r1857367";>r1857367</a> from trunk:
+
+ * <a href="https://svn.apache.org/r1857367";>r1857367</a>
+    Fix memory lifetime problem in a libsvn_wc error code path.
+    Justification:
+      Edge-case crash. Subversion should not crash.
+    Votes:
+      +1: stsp, rhuijben
 
 ------------------------------------------------------------------------
-<a href="https://svn.apache.org/r1854887";>r1854887</a> | svn-role | 2019-03-06 
04:00:22 +0000 (Wed, 06 Mar 2019) | 13 lines
+<a href="https://svn.apache.org/r1863288";>r1863288</a> | julianfoad | 
2019-07-18 13:36:36 +0000 (Thu, 18 Jul 2019) | 16 lines
 
-Merge the <a href="https://svn.apache.org/r1851676";>r1851676</a> group from 
trunk:
+Merge the <a href="https://svn.apache.org/r1860175";>r1860175</a> group from 
trunk:
 
- * <a href="https://svn.apache.org/r1851676";>r1851676</a>, <a 
href="https://svn.apache.org/r1851687";>r1851687</a>, <a 
href="https://svn.apache.org/r1851791";>r1851791</a>
-   Allow the use of empty groups in authz rules.
+ * <a href="https://svn.apache.org/r1860175";>r1860175</a>,<a 
href="https://svn.apache.org/r1860186";>r1860186</a>,<a 
href="https://svn.apache.org/r1860187";>r1860187</a>,<a 
href="https://svn.apache.org/r1860188";>r1860188</a>
+   Fix building Subversion with Visual Studio 2005 and 2008.
    Justification:
-     Fixes regression from 1.9.x. Does not affect authz file semantics.
+     A change in 1.12 accidentally introduced a macro escaping issue
+     which broke compilation with these older versions of VC++.
    Notes:
-     - <a href="https://svn.apache.org/r1851676";>r1851676</a> adds a 
regression test.
-     - <a href="https://svn.apache.org/r1851687";>r1851687</a> fixes the bug 
and extends the test.
-     - <a href="https://svn.apache.org/r1851791";>r1851791</a> refers to <a 
href="/issue-4802">issue #4802</a>.
+     Should have been a simple patch. But lack of this version on my
+     development machine made things harder.
+     (I don&#x27;t see a problem with dropping VS200 2008 support with
+      a future Subversion version, but then we should provide better
+      documentation on that change.)
+   Votes:
+     +1: rhuijben
+
+------------------------------------------------------------------------
+<a href="https://svn.apache.org/r1863289";>r1863289</a> | julianfoad | 
2019-07-18 13:36:46 +0000 (Thu, 18 Jul 2019) | 15 lines
+
+Merge the <a href="https://svn.apache.org/r1859732";>r1859732</a> group from 
trunk:
+
+ * <a href="https://svn.apache.org/r1859732";>r1859732</a>, <a 
href="https://svn.apache.org/r1859734";>r1859734</a>
+   io: Implement the functions that check for node existence using the native
+   Win32 APIs on Windows.
+   Justification:
+     - This allows us to remove the hack from <a 
href="https://svn.apache.org/r1833621";>r1833621</a> and properly handle
+       reparse points on Windows irrespectively of the used APR version.
+     - This improves the I/O performance by using only a single call to
+       GetFileAttributes(), which is much faster than the generic stat
+       implementations from APR 1.6.x and 1.7.x (the latter should be
+       even more slower).
    Votes:
-     +1: brane, julianfoad, stsp
+     +1: kotkov, rhuijben
 
 ------------------------------------------------------------------------
-<a href="https://svn.apache.org/r1854888";>r1854888</a> | svn-role | 2019-03-06 
04:00:23 +0000 (Wed, 06 Mar 2019) | 9 lines
+<a href="https://svn.apache.org/r1863290";>r1863290</a> | julianfoad | 
2019-07-18 13:36:57 +0000 (Thu, 18 Jul 2019) | 9 lines
 
-Merge <a href="https://svn.apache.org/r1853761";>r1853761</a> from trunk:
+Merge the <a href="https://svn.apache.org/r1860936";>r1860936</a> group from 
trunk:
 
- * <a href="https://svn.apache.org/r1853761";>r1853761</a>
-   Fix an &quot;unused static function&quot; warning in non-maintainer mode 
builds.
+ * <a href="https://svn.apache.org/r1860936";>r1860936</a>, <a 
href="https://svn.apache.org/r1860951";>r1860951</a>, <a 
href="https://svn.apache.org/r1860958";>r1860958</a>
+   Provide a way for svnserve&#x27;s &#x27;get-deleted-rev&#x27; API to return 
&#x27;not deleted&#x27;.
    Justification:
-     Requested on dev@.  Fixes a compiler warning.
+     Error handling was inconsistent across RA layers.
    Votes:
-     +1: danielsh, brane, stsp
+     +1: julianfoad, stsp
 
 ------------------------------------------------------------------------
 </pre>
+
+<p>Further changes currently under consideration are listed in each release 
line's 
+<a 
href="https://svn.apache.org/repos/asf/subversion/branches/1.12.x/STATUS";>STATUS</a>
 file.</p>


Reply via email to