Checkout Tools
  • last updated 6 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge r1845212 from trunk:

* r1845212

Silence a deprecation warning from amalgamated SQLite on macOS.

Justification:

Keeps the macOS warnings checker buildslave clean.

Votes:

+1: brane, stsp

  1. … 2 more files in changeset.
Merge r1853761 from trunk:

* r1853761

Fix an "unused static function" warning in non-maintainer mode builds.

Justification:

Requested on dev@. Fixes a compiler warning.

Votes:

+1: danielsh, brane, stsp

  1. … 2 more files in changeset.
Merge r1850348 (bump the copyright year) onto 1.9.x.
  1. … 2 more files in changeset.
Merge the 1.9.x-issue4686 branch:

* r1800754,r1800755,r1800803,r1801705,r1801722,r1823202,r1823203

Fix issue #4686 "Unable to parse reversed revision range '19634-19631'"

Justification:

Assertion failure during certain merges.

Branch: ^/subversion/branches/1.9.x-issue4686

Votes:

+1: julianfoad, brane, stefan2

  1. … 4 more files in changeset.
Merge the r1663609 group from trunk:

* r1663609, r1666067

Silence the svn-warnings bot on the 1.9.x branch.

Justification:

Keeps the warnings checker buildslave clean.

Notes:

- r1663609 fixes an old-style function definition.

- r1666067 removes an unused variable.

Votes:

+1: brane, danielsh, rhuijben

  1. … 3 more files in changeset.
Merge the 1.9.x-r1794166 branch:

* r1794166, r1795087

Search for gpg-agent sockets in (/var)/run.

Justification:

Improves GPG socket detection when $GPG_AGENT_INFO is unset or when gpg

>= 2.1.13 is used

Branch:

^/subversion/branches/1.9.x-r1794166

Votes:

+1: jamessan, stsp, brane

  1. … 2 more files in changeset.
On the '1.9.x' branch: update copyright year.

* NOTICE,

subversion/libsvn_subr/version.c

Update copyright year to 2018.

  1. … 1 more file in changeset.
Merge r1818584 from trunk:

* r1818584

Fix crash when exiting 'svnserve --config-file'.

Justification:

This is a user-reported crash. The underlying container type is now also

part of the authz infrastructure and should be as robust as possible.

Votes:

+1: stefan2, stsp, jamessan

  1. … 2 more files in changeset.
Merge r1804691 and r1804692 from trunk:

r1804691:

* CVE-2017-9800

Justification:

Malicious server can execute arbitrary command on client.

Notes:

patch: CVE-2017-9800/CVE-2017-9800-1.9.patch

Votes:

+1: philip, danielsh, stsp

+1: astieger (without r78105)

r1804692 corrects another bit of documentation, that is not present in tarball

releases. As a documentation fix it requires no voting.

  1. … 4 more files in changeset.
On the 1.9.x branch, Happy New Year.
  1. … 2 more files in changeset.
Merge r1759116 from trunk (with a 1.9.x client, to avoid a text conflict).

* r1759116

Work around an APR bug in svn_io_file_trunc with buffered r/w files.

Justification:

Without this patch, trunc() will leave buffered file objects with

alternating read and write accesses in an inconsistent state. Apart

from being a bug in one of our public APIs, this will cause corruptions

in FSFS when the strict-rep-sharing patches get backported.

Votes:

+1: stefan2, rhuijben, stsp

  1. … 3 more files in changeset.
Merge r1770677 from trunk:

* r1770677

Make the XML parser stricter by prohibiting custom XML entities.

Justification:

The parser should properly error out on invalid data.

Votes:

+1: kotkov, rhuijben, stefan2

  1. … 3 more files in changeset.
Merge r1766327 from trunk:

* r1766327

Improve discovery of gpg-agent sockets.

Justification:

Honor the user's request to use a different gpg configuration/home

directory

Votes:

+1: jamessan, rhuijben, stefan2

  1. … 2 more files in changeset.
Merge r1766323 from trunk:

* r1766323

Unconditionally call bye_gpg_agent when we're done with gpg-agent to fix a

file descriptor leak.

Justification:

Fixes a file descriptor leak

Votes:

+1: jamessan, rhuijben, stefan2

  1. … 2 more files in changeset.
Merge r1761755 from trunk:

* r1761755

Fix link error with --disable-keychain behavior on OS/X

Justification:

User reported problem. Easy fix.

Votes:

+1: rhuijben, stefan2, brane

  1. … 2 more files in changeset.
Merge r1763934 from trunk:

* r1763934

Add the OSX 10.12 commercial name for 'svn --version --verbose'.

Justification:

Very minor change makes SVN look slightly more polished.

Votes:

+1: brane, ivan, stefan2

  1. … 2 more files in changeset.
Merge r1715777 from trunk:

* r1715777

Convert assertion failure to error if configuration file contains just one

0xEE character.

Justification:

Assertion on invalid config is not good behavior.

Votes:

+1: ivan, rhuijben, kotkov

  1. … 3 more files in changeset.
Merge the 1.9.x-rep-cache-db-fixes branch:

* r1663286, r1741071, r1741072, r1741073, r1741078, r1741096, r1741200,

r1741206

Fix the source of "database is locked" errors when opening rep-cache.db.

Justification:

Users can get unexpected errors during operations that open rep-cache.db,

e.g., when calling 'svnadmin verify'.

Branch:

^/subversion/branches/1.9.x-rep-cache-db-fixes

Notes:

r1663286 only affects maintainer mode and is included to avoid conflicts.

r1741073 fixes a potential crash in our sqlite helper.

r1741096 and r1741200 are the core fix for this issue.

r1741206 fixes a potential problem with the long-living db connection.

.

The backport branch is required, because r1741096 adds a new error code

that can't be backported as is without breaking compatibility between

patch versions.

Votes:

+1: kotkov, ivan, rhuijben

  1. … 8 more files in changeset.
Merge the r1663253 group from trunk:

* r1663253, r1704821, r1738659, r1738828

Fix a few instances of undefined behavior in Win32 crash reporter.

Justification:

Potentially crashing in a crash reporter is bad.

Votes:

+1: kotkov, ivan, jamessan

  1. … 2 more files in changeset.
Merge r1741401 from trunk:

* r1741401

Add the OSX 10.11 commercial name for 'svn --version --verbose'.

Justification:

Minor cosmetic change, but it should have been done before the 1.9.0

release since OSX 10.11 was released first.

Votes:

+1: brane, kotkov, jamessan

  1. … 2 more files in changeset.
Merge r1740316 from trunk as a documentation/trivial change.

* r1740316

Update copyright years in NOTICE and subversion/libsvn_subr/version.c.

Justification:

We're not in 2015 any more.

Votes:

+1: kotkov

  1. … 3 more files in changeset.
Merge r1735826 from trunk:

* r1735826

Make SIGINT abort a commit, even at the interactive plaintext prompt.

(Issue #4624.)

Justification:

Can result in unintended commits (users expect ^C to abort the commit).

Notes:

r1735826 is the merge to trunk of r1735680 from the 1.9.x branch.

Some older versions of 'svn merge' would make the merge of r1735826

to 1.9.x a noop merge. (1.8.9 does; 1.8.15 does not.) Consequently,

this entry must be merged by a sufficiently new svn.

.

'svn-role' uses a sufficiently new svn (1.9.3).

Votes:

+1: danielsh, ivan, rhuijben

  1. … 2 more files in changeset.
Revert r1735680, which was intended for trunk.
[ This revision should have been committed to trunk. It was reverted on

this branch, applied to trunk, and renominated in STATUS in r1735825,

r1735826, and r1735827 respectively. ]

Make SIGINT abort a commit, even at the interactive plaintext prompt.

(Issue #4624.)

Follow-up to r30730 (r870804).

Found by: Richlv

* subversion/libsvn_subr/prompt.c

(plaintext_prompt_helper): Propagate canncellations.

Merge r1728387 from trunk:

* r1728387

Fix issue 4611, gpg-agent and passwords with a percent character.

Justification:

Some passwords don't work.

Votes:

+1: philip, jamessan, rhuijben

  1. … 2 more files in changeset.
Merge the r1722860 group from trunk:

* r1722860, r1722861, r1722879, r1722887

Memory access portability issues.

Justification:

Not complying to the C standard is bad. At the very least we

improve the signal/noise ratio when using memory sanitizers.

Part of this patch set (r1722879) fixes a crash on SPARC that

apparently gets masked by some lucky caller pattern.

Finally, these changes make the code actually simpler.

Notes:

r1722860 fixes the issue originally reported on dev@.

r1722879 fixes a follow-up issue found by the SPARC buildbot.

r1722887 removes similar logic from the membuffer cache although

that had not been reported a faulty.

r1722861 has been included to make r1722879 merge cleanly.

Votes:

+1: stefan2, rhuijben, jamessan

  1. … 2 more files in changeset.
Merge r1710167 from trunk:

* r1710167

Set journal-mode in exclusive-locking mode to improve NFS performance.

Justification:

Reduces performance regression compared to 1.8.

Votes:

+1: philip, stefan2, julianfoad

  1. … 3 more files in changeset.
Merge r1714358 from trunk:

* r1714358

Fix overflow detection in svn_stringbuf_remove and svn_stringbuf_replace.

Justification:

Using the public API as documented may result in undefined behavior.

Votes:

+1: stefan2, gstein, ivan

  1. … 3 more files in changeset.
Merge r1705328 from trunk:

* r1705328

Resolve a possible segfault in authentication credentials cache caused by

storing key in APR hashtable without copying to long-life pool. I don't know

exact reproduction script, but it's obvious bug and crash reported via

TortoiseSVN crash dump service multiple times.

Justification:

Segfault. User reported.

Votes:

+1: ivan, rhuijben, kotkov

  1. … 2 more files in changeset.
Merge the r1702533 group from trunk:

* r1702533, r1702891

Expose utf8proc version information via 'svn --version --verbose'

Justification:

There is no way to retrieve this from the binaries.

Votes:

+1: ivan, rhuijben, stefan2

  1. … 3 more files in changeset.