subversion

Checkout Tools
  • last updated 3 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1850737 is being indexed.

* tools/upcoming.py

(DIST_RELEASE_URL): New constant.

(copyfrom_revision_of_previous_tag_of_this_stable_branch):

Determine the latest release by checking dist/release/, not by checking

tags, in order to also show changes that have been merged into a patch

release that has not been announced yet.

This change will cause tonight's bot run to effectively revert r1850708 (and

add Monday's merge to the output as well), re-adding all the merges that

went into 1.11.1 to the Web site — which is correct, since 1.11.1 has not yet

been published.

Add 'x-wc-copy-mods' to the help tests, following r1850720.
Fix some RA session breakage in the WC editor (issue #4786).

* subversion/include/private/svn_client_private.h

subversion/libsvn_client/copy.c

(svn_client__repos_to_wc_copy_dir): Note broken foreign-repo copy.

(svn_client__repos_to_wc_copy_internal): Save and restore the session URL.

* tools/dev/unix-build/Makefile.svn: Fix a config error which made

mod_authz_svn_tests.py's "test authenticated only access via group"

trigger a segfault in httpd cause authz_owner_get_file_group in

mod_authz_groupfile.c somehow ended up being a NULL pointer...?!?

* subversion/include/private/svn_client_private.h

(svn_client__wc_copy_mods): Add a doc string.

Un-break the build. A follow-up to r1850720.

* subversion/svn/svn.c

(svn_cl__cmd_table): Remove an empty initializer list, as it's invalid C

and broke the build on Windows.

Implement an experimental 'x-wc-copy-mods' command.

This can be used to comprehensively test the WC editor (issue #4786).

* subversion/include/private/svn_client_private.h,

subversion/libsvn_client/wc_editor.c

(svn_client__wc_copy_mods): New.

* subversion/svn/svn.c

(svn_cl__cmd_table): Add 'x-wc-copy-mods' command.

* subversion/svn/cl.h

(svn_opt_subcommand_t): Declare 'svn_cl__wc_copy_mods'.

* subversion/svn/shelf-cmd.c

(svn_cl__wc_copy_mods): New.

* upcoming.part.html: Automatically regenerated
Improvements to the 'WC editor' for issue #4786.

* subversion/include/private/svn_client_private.h

(svn_client__wc_editor): Specify the form of path arguments to the editor.

(svn_client__wc_replay): Same, and add a WC abspath argument.

* subversion/libsvn_client/commit.c

(svn_client__wc_replay): Add a WC abspath argument, and make all editor

paths relative to (the URL of) that path.

* subversion/libsvn_client/client.h,

subversion/libsvn_client/commit_util.c

(svn_client__condense_commit_items2): New.

* subversion/libsvn_client/wc_editor.c

(file_baton_t,

file_textdelta,

file_close): Add support for making a text-delta against a non-empty

base.

* subversion/libsvn_wc/revert.c

Update the top-of-file comment to mention removing/keeping

local files, for issue #4798.

* STATUS: Nominate r1850651.

* notes/knobs: Document SVNXX_USE_BOOST and SVNXX_POOL_DEBUG.

* STATUS: Nominate r1850651.

* STATUS: Nominate r1850651.

* STATUS: Nominate r1850651.

* STATUS: Add link to mailing list thread to r1850651 nomination.

* STATUS: Nominate r1850651.

Implement issue 4798 "revert: option to remove added items from disk".

But the the API doesn't currently work for items found by recursion, so the

last part of the test fails.

* subversion/svn/cl.h

(svn_cl__opt_state_t): Add a new flag, 'remove_added'.

* subversion/svn/revert-cmd.c

(svn_cl__revert): Pass that flag on to the API.

* subversion/svn/svn.c

(svn_cl__longopt_t,

svn_cl__options,

svn_cl__cmd_table,

sub_main): Add a new option, 'opt_remove_added', to the 'revert' command.

Fix a use-after-free in mod_dav_svn's logging of FS warnings.

The FS warning callback could be called with a request context that had

already been deallocated. This resulted in a crash during 'make check'

with ra_serf on OpenBSD. The problem was even documented in a comment:

/* ### hmm. the FS is cleaned up at request cleanup time. "r" might

### not really be valid. we should probably put the FS into a

### subpool to ensure it gets cleaned before the request.

### is there a good way to create and use a subpool for all

### of our functions ... ??

*/

Rather than putting the FS into a subpool, the solution implemented with this

commit installs a pre-cleanup handler on the request pool, which switches the

logging context from the request to its associated connection. This avoids the

use-after-free at the cost of a less precise logging context.

Suggested by: stefan2

https://svn.haxx.se/dev/archive-2018-12/0145.shtml

* subversion/mod_dav_svn/repos.c

(log_warning): Rename to ...

(log_warning_req): ... this.

(log_warning_conn): New logging helper which uses a connection context.

(cleanup_req_logging_baton, cleanup_req_logging): New APR pool cleanup

handler which switches FS logging context from a request to a connection.

(get_resource): Install aforementioned pool cleanup handler.

* tools/dev/unix-build/Makefile.svn: Load mod_access_compat into httpd 2.4.

Otherwise, "mod_authz_svn_tests.py 2: test mixed anonymous and authenticated

access" will fail and I haven't found any other way to make it work.

* tools/dev/unix-build/Makefile.svn: Fix typo which resulted in a bad httpd

configuration for 'make check'.

Post-release housekeeping: bump the 1.9.x branch to 1.9.11.
Post-release housekeeping: bump the 1.10.x branch to 1.10.5.
Post-release housekeeping: bump the 1.11.x branch to 1.11.2.
Tagging release 1.9.10
    • ?
    /tags/1.9.10/subversion/include/svn_version.h
Tagging release 1.10.4
    • ?
    /tags/1.10.4/subversion/include/svn_version.h
Tagging release 1.11.1
    • ?
    /tags/1.11.1/subversion/include/svn_version.h
Merge r1850621 from trunk:

* r1850621

CVE-2018-11803

Justification:

Fix access to potentially uninitialized local pointer variable.

Votes:

+1: stsp, rhuijben, julianfoad

Merge r1850621 from trunk:

* r1850621

CVE-2018-11803

Justification:

Fix access to potentially uninitialized local pointer variable.

Votes:

+1: julianfoad, stsp, stefan2

* subversion/mod_dav_svn/reports/list.c

(dav_svn__list_report): CVE-2018-11803 - Fix access to potentially uninitialized local

pointer variable.