svn commit: r333354 - in head/contrib/subversion: . doc subversion subversion/include subversion/include/private subversion/libsvn_auth_gnome_keyring subversion/libsvn_auth_kwallet subversion/libsv...
Peter Wemm
peter at FreeBSD.org
Tue May 8 04:52:55 UTC 2018
Author: peter
Date: Tue May 8 04:52:52 2018
New Revision: 333354
URL: https://svnweb.freebsd.org/changeset/base/333354
Log:
Update svn-1.9.7 to 1.10.0.
Added:
head/contrib/subversion/.editorconfig
- copied unchanged from r333351, vendor/subversion/dist/.editorconfig
head/contrib/subversion/subversion/include/private/ra_svn_wrapped_sasl.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/include/private/ra_svn_wrapped_sasl.h
head/contrib/subversion/subversion/include/private/svn_branch.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/include/private/svn_branch.h
head/contrib/subversion/subversion/include/private/svn_branch_compat.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/include/private/svn_branch_compat.h
head/contrib/subversion/subversion/include/private/svn_branch_impl.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/include/private/svn_branch_impl.h
head/contrib/subversion/subversion/include/private/svn_branch_nested.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/include/private/svn_branch_nested.h
head/contrib/subversion/subversion/include/private/svn_branch_repos.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/include/private/svn_branch_repos.h
head/contrib/subversion/subversion/include/private/svn_config_private.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/include/private/svn_config_private.h
head/contrib/subversion/subversion/include/private/svn_element.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/include/private/svn_element.h
head/contrib/subversion/subversion/libsvn_client/conflicts.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_client/conflicts.c
head/contrib/subversion/subversion/libsvn_client/merge_elements.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_client/merge_elements.c
head/contrib/subversion/subversion/libsvn_client/shelve.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_client/shelve.c
head/contrib/subversion/subversion/libsvn_delta/branch.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_delta/branch.c
head/contrib/subversion/subversion/libsvn_delta/branch_compat.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_delta/branch_compat.c
head/contrib/subversion/subversion/libsvn_delta/branch_migrate.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_delta/branch_migrate.c
head/contrib/subversion/subversion/libsvn_delta/branch_nested.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_delta/branch_nested.c
head/contrib/subversion/subversion/libsvn_delta/branch_repos.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_delta/branch_repos.c
head/contrib/subversion/subversion/libsvn_delta/element.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_delta/element.c
head/contrib/subversion/subversion/libsvn_fs_base/fs_init.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_fs_base/fs_init.h
head/contrib/subversion/subversion/libsvn_fs_fs/fs_init.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_fs_fs/fs_init.h
head/contrib/subversion/subversion/libsvn_fs_x/batch_fsync.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_fs_x/batch_fsync.c
head/contrib/subversion/subversion/libsvn_fs_x/batch_fsync.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_fs_x/batch_fsync.h
head/contrib/subversion/subversion/libsvn_fs_x/dag_cache.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_fs_x/dag_cache.c
head/contrib/subversion/subversion/libsvn_fs_x/dag_cache.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_fs_x/dag_cache.h
head/contrib/subversion/subversion/libsvn_fs_x/fs_init.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_fs_x/fs_init.h
head/contrib/subversion/subversion/libsvn_ra_serf/list.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_ra_serf/list.c
head/contrib/subversion/subversion/libsvn_ra_serf/request_body.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_ra_serf/request_body.c
head/contrib/subversion/subversion/libsvn_ra_serf/stream_bucket.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_ra_serf/stream_bucket.c
head/contrib/subversion/subversion/libsvn_ra_svn/wrapped_sasl.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_ra_svn/wrapped_sasl.c
head/contrib/subversion/subversion/libsvn_repos/authz.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_repos/authz.h
head/contrib/subversion/subversion/libsvn_repos/authz_info.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_repos/authz_info.c
head/contrib/subversion/subversion/libsvn_repos/authz_parse.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_repos/authz_parse.c
head/contrib/subversion/subversion/libsvn_repos/compat.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_repos/compat.c
head/contrib/subversion/subversion/libsvn_repos/config_file.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_repos/config_file.c
head/contrib/subversion/subversion/libsvn_repos/config_file.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_repos/config_file.h
head/contrib/subversion/subversion/libsvn_repos/list.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_repos/list.c
head/contrib/subversion/subversion/libsvn_subr/cache-null.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_subr/cache-null.c
head/contrib/subversion/subversion/libsvn_subr/compress_lz4.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_subr/compress_lz4.c
head/contrib/subversion/subversion/libsvn_subr/compress_zlib.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_subr/compress_zlib.c
head/contrib/subversion/subversion/libsvn_subr/encode.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_subr/encode.c
head/contrib/subversion/subversion/libsvn_subr/lz4/
- copied from r333351, vendor/subversion/dist/subversion/libsvn_subr/lz4/
head/contrib/subversion/subversion/libsvn_subr/pools.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_subr/pools.h
head/contrib/subversion/subversion/libsvn_subr/utf8proc/LICENSE.md
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_subr/utf8proc/LICENSE.md
head/contrib/subversion/subversion/libsvn_subr/utf8proc/NEWS.md
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_subr/utf8proc/NEWS.md
head/contrib/subversion/subversion/libsvn_subr/utf8proc/README.md
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_subr/utf8proc/README.md
head/contrib/subversion/subversion/libsvn_subr/utf8proc/lump.md
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_subr/utf8proc/lump.md
head/contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_internal.h
- copied unchanged from r333351, vendor/subversion/dist/subversion/libsvn_subr/utf8proc/utf8proc_internal.h
head/contrib/subversion/subversion/svn/shelve-cmd.c
- copied unchanged from r333351, vendor/subversion/dist/subversion/svn/shelve-cmd.c
Deleted:
head/contrib/subversion/subversion/libsvn_delta/debug_editor.h
head/contrib/subversion/subversion/libsvn_ra_serf/README
head/contrib/subversion/subversion/libsvn_repos/authz_pool.c
head/contrib/subversion/subversion/libsvn_subr/compress.c
head/contrib/subversion/subversion/libsvn_subr/utf8proc/LICENSE
head/contrib/subversion/subversion/libsvn_subr/utf8proc/README
head/contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc.h
Modified:
head/contrib/subversion/CHANGES
head/contrib/subversion/COMMITTERS
head/contrib/subversion/INSTALL
head/contrib/subversion/LICENSE
head/contrib/subversion/Makefile.in
head/contrib/subversion/NOTICE
head/contrib/subversion/README
head/contrib/subversion/aclocal.m4
head/contrib/subversion/build-outputs.mk
head/contrib/subversion/build.conf
head/contrib/subversion/configure
head/contrib/subversion/configure.ac
head/contrib/subversion/doc/doxygen.conf
head/contrib/subversion/gen-make.py
head/contrib/subversion/get-deps.sh
head/contrib/subversion/subversion/include/private/ra_svn_sasl.h
head/contrib/subversion/subversion/include/private/svn_atomic.h
head/contrib/subversion/subversion/include/private/svn_cache.h
head/contrib/subversion/subversion/include/private/svn_cmdline_private.h
head/contrib/subversion/subversion/include/private/svn_delta_private.h
head/contrib/subversion/subversion/include/private/svn_dep_compat.h
head/contrib/subversion/subversion/include/private/svn_diff_private.h
head/contrib/subversion/subversion/include/private/svn_diff_tree.h
head/contrib/subversion/subversion/include/private/svn_fs_fs_private.h
head/contrib/subversion/subversion/include/private/svn_fs_private.h
head/contrib/subversion/subversion/include/private/svn_fs_util.h
head/contrib/subversion/subversion/include/private/svn_io_private.h
head/contrib/subversion/subversion/include/private/svn_log.h
head/contrib/subversion/subversion/include/private/svn_mergeinfo_private.h
head/contrib/subversion/subversion/include/private/svn_mutex.h
head/contrib/subversion/subversion/include/private/svn_object_pool.h
head/contrib/subversion/subversion/include/private/svn_packed_data.h
head/contrib/subversion/subversion/include/private/svn_ra_svn_private.h
head/contrib/subversion/subversion/include/private/svn_repos_private.h
head/contrib/subversion/subversion/include/private/svn_sorts_private.h
head/contrib/subversion/subversion/include/private/svn_sqlite.h
head/contrib/subversion/subversion/include/private/svn_string_private.h
head/contrib/subversion/subversion/include/private/svn_subr_private.h
head/contrib/subversion/subversion/include/private/svn_temp_serializer.h
head/contrib/subversion/subversion/include/private/svn_utf_private.h
head/contrib/subversion/subversion/include/private/svn_wc_private.h
head/contrib/subversion/subversion/include/svn_auth.h
head/contrib/subversion/subversion/include/svn_base64.h
head/contrib/subversion/subversion/include/svn_checksum.h
head/contrib/subversion/subversion/include/svn_client.h
head/contrib/subversion/subversion/include/svn_cmdline.h
head/contrib/subversion/subversion/include/svn_config.h
head/contrib/subversion/subversion/include/svn_dav.h
head/contrib/subversion/subversion/include/svn_delta.h
head/contrib/subversion/subversion/include/svn_diff.h
head/contrib/subversion/subversion/include/svn_error.h
head/contrib/subversion/subversion/include/svn_error_codes.h
head/contrib/subversion/subversion/include/svn_fs.h
head/contrib/subversion/subversion/include/svn_hash.h
head/contrib/subversion/subversion/include/svn_io.h
head/contrib/subversion/subversion/include/svn_props.h
head/contrib/subversion/subversion/include/svn_ra.h
head/contrib/subversion/subversion/include/svn_ra_svn.h
head/contrib/subversion/subversion/include/svn_repos.h
head/contrib/subversion/subversion/include/svn_string.h
head/contrib/subversion/subversion/include/svn_types.h
head/contrib/subversion/subversion/include/svn_user.h
head/contrib/subversion/subversion/include/svn_version.h
head/contrib/subversion/subversion/include/svn_wc.h
head/contrib/subversion/subversion/include/svn_x509.h
head/contrib/subversion/subversion/include/svn_xml.h
head/contrib/subversion/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
head/contrib/subversion/subversion/libsvn_auth_kwallet/kwallet.cpp
head/contrib/subversion/subversion/libsvn_client/checkout.c
head/contrib/subversion/subversion/libsvn_client/client.h
head/contrib/subversion/subversion/libsvn_client/copy.c
head/contrib/subversion/subversion/libsvn_client/deprecated.c
head/contrib/subversion/subversion/libsvn_client/diff.c
head/contrib/subversion/subversion/libsvn_client/diff_local.c
head/contrib/subversion/subversion/libsvn_client/export.c
head/contrib/subversion/subversion/libsvn_client/externals.c
head/contrib/subversion/subversion/libsvn_client/import.c
head/contrib/subversion/subversion/libsvn_client/info.c
head/contrib/subversion/subversion/libsvn_client/list.c
head/contrib/subversion/subversion/libsvn_client/merge.c
head/contrib/subversion/subversion/libsvn_client/mergeinfo.c
head/contrib/subversion/subversion/libsvn_client/mtcc.c
head/contrib/subversion/subversion/libsvn_client/patch.c
head/contrib/subversion/subversion/libsvn_client/ra.c
head/contrib/subversion/subversion/libsvn_client/relocate.c
head/contrib/subversion/subversion/libsvn_client/resolved.c
head/contrib/subversion/subversion/libsvn_client/revisions.c
head/contrib/subversion/subversion/libsvn_client/upgrade.c
head/contrib/subversion/subversion/libsvn_delta/cancel.c
head/contrib/subversion/subversion/libsvn_delta/compat.c
head/contrib/subversion/subversion/libsvn_delta/debug_editor.c
head/contrib/subversion/subversion/libsvn_delta/default_editor.c
head/contrib/subversion/subversion/libsvn_delta/svndiff.c
head/contrib/subversion/subversion/libsvn_delta/text_delta.c
head/contrib/subversion/subversion/libsvn_delta/xdelta.c
head/contrib/subversion/subversion/libsvn_diff/binary_diff.c
head/contrib/subversion/subversion/libsvn_diff/diff.h
head/contrib/subversion/subversion/libsvn_diff/diff3.c
head/contrib/subversion/subversion/libsvn_diff/diff_file.c
head/contrib/subversion/subversion/libsvn_diff/diff_memory.c
head/contrib/subversion/subversion/libsvn_diff/parse-diff.c
head/contrib/subversion/subversion/libsvn_fs/deprecated.c
head/contrib/subversion/subversion/libsvn_fs/editor.c
head/contrib/subversion/subversion/libsvn_fs/fs-loader.c
head/contrib/subversion/subversion/libsvn_fs/fs-loader.h
head/contrib/subversion/subversion/libsvn_fs_base/bdb/rev-table.c
head/contrib/subversion/subversion/libsvn_fs_base/fs.c
head/contrib/subversion/subversion/libsvn_fs_base/lock.c
head/contrib/subversion/subversion/libsvn_fs_base/revs-txns.c
head/contrib/subversion/subversion/libsvn_fs_base/revs-txns.h
head/contrib/subversion/subversion/libsvn_fs_base/tree.c
head/contrib/subversion/subversion/libsvn_fs_fs/cached_data.c
head/contrib/subversion/subversion/libsvn_fs_fs/cached_data.h
head/contrib/subversion/subversion/libsvn_fs_fs/caching.c
head/contrib/subversion/subversion/libsvn_fs_fs/dag.c
head/contrib/subversion/subversion/libsvn_fs_fs/fs.c
head/contrib/subversion/subversion/libsvn_fs_fs/fs.h
head/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
head/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.h
head/contrib/subversion/subversion/libsvn_fs_fs/hotcopy.c
head/contrib/subversion/subversion/libsvn_fs_fs/hotcopy.h
head/contrib/subversion/subversion/libsvn_fs_fs/id.c
head/contrib/subversion/subversion/libsvn_fs_fs/index.c
head/contrib/subversion/subversion/libsvn_fs_fs/load-index.c
head/contrib/subversion/subversion/libsvn_fs_fs/lock.c
head/contrib/subversion/subversion/libsvn_fs_fs/low_level.c
head/contrib/subversion/subversion/libsvn_fs_fs/low_level.h
head/contrib/subversion/subversion/libsvn_fs_fs/pack.c
head/contrib/subversion/subversion/libsvn_fs_fs/recovery.c
head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.sql
head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c
head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.h
head/contrib/subversion/subversion/libsvn_fs_fs/rev_file.c
head/contrib/subversion/subversion/libsvn_fs_fs/revprops.c
head/contrib/subversion/subversion/libsvn_fs_fs/revprops.h
head/contrib/subversion/subversion/libsvn_fs_fs/stats.c
head/contrib/subversion/subversion/libsvn_fs_fs/structure
head/contrib/subversion/subversion/libsvn_fs_fs/structure-indexes
head/contrib/subversion/subversion/libsvn_fs_fs/temp_serializer.c
head/contrib/subversion/subversion/libsvn_fs_fs/temp_serializer.h
head/contrib/subversion/subversion/libsvn_fs_fs/transaction.c
head/contrib/subversion/subversion/libsvn_fs_fs/tree.c
head/contrib/subversion/subversion/libsvn_fs_fs/util.c
head/contrib/subversion/subversion/libsvn_fs_fs/util.h
head/contrib/subversion/subversion/libsvn_fs_fs/verify.c
head/contrib/subversion/subversion/libsvn_fs_util/fs-util.c
head/contrib/subversion/subversion/libsvn_fs_x/cached_data.c
head/contrib/subversion/subversion/libsvn_fs_x/cached_data.h
head/contrib/subversion/subversion/libsvn_fs_x/caching.c
head/contrib/subversion/subversion/libsvn_fs_x/changes.c
head/contrib/subversion/subversion/libsvn_fs_x/changes.h
head/contrib/subversion/subversion/libsvn_fs_x/dag.c
head/contrib/subversion/subversion/libsvn_fs_x/dag.h
head/contrib/subversion/subversion/libsvn_fs_x/fs.c
head/contrib/subversion/subversion/libsvn_fs_x/fs.h
head/contrib/subversion/subversion/libsvn_fs_x/fs_x.c
head/contrib/subversion/subversion/libsvn_fs_x/fs_x.h
head/contrib/subversion/subversion/libsvn_fs_x/hotcopy.c
head/contrib/subversion/subversion/libsvn_fs_x/hotcopy.h
head/contrib/subversion/subversion/libsvn_fs_x/index.c
head/contrib/subversion/subversion/libsvn_fs_x/index.h
head/contrib/subversion/subversion/libsvn_fs_x/lock.c
head/contrib/subversion/subversion/libsvn_fs_x/lock.h
head/contrib/subversion/subversion/libsvn_fs_x/low_level.c
head/contrib/subversion/subversion/libsvn_fs_x/low_level.h
head/contrib/subversion/subversion/libsvn_fs_x/noderevs.c
head/contrib/subversion/subversion/libsvn_fs_x/noderevs.h
head/contrib/subversion/subversion/libsvn_fs_x/pack.c
head/contrib/subversion/subversion/libsvn_fs_x/pack.h
head/contrib/subversion/subversion/libsvn_fs_x/recovery.c
head/contrib/subversion/subversion/libsvn_fs_x/recovery.h
head/contrib/subversion/subversion/libsvn_fs_x/rep-cache-db.h
head/contrib/subversion/subversion/libsvn_fs_x/rep-cache.c
head/contrib/subversion/subversion/libsvn_fs_x/rep-cache.h
head/contrib/subversion/subversion/libsvn_fs_x/reps.c
head/contrib/subversion/subversion/libsvn_fs_x/reps.h
head/contrib/subversion/subversion/libsvn_fs_x/rev_file.c
head/contrib/subversion/subversion/libsvn_fs_x/rev_file.h
head/contrib/subversion/subversion/libsvn_fs_x/revprops.c
head/contrib/subversion/subversion/libsvn_fs_x/revprops.h
head/contrib/subversion/subversion/libsvn_fs_x/string_table.c
head/contrib/subversion/subversion/libsvn_fs_x/string_table.h
head/contrib/subversion/subversion/libsvn_fs_x/temp_serializer.c
head/contrib/subversion/subversion/libsvn_fs_x/temp_serializer.h
head/contrib/subversion/subversion/libsvn_fs_x/transaction.c
head/contrib/subversion/subversion/libsvn_fs_x/transaction.h
head/contrib/subversion/subversion/libsvn_fs_x/tree.c
head/contrib/subversion/subversion/libsvn_fs_x/tree.h
head/contrib/subversion/subversion/libsvn_fs_x/util.c
head/contrib/subversion/subversion/libsvn_fs_x/util.h
head/contrib/subversion/subversion/libsvn_fs_x/verify.c
head/contrib/subversion/subversion/libsvn_fs_x/verify.h
head/contrib/subversion/subversion/libsvn_ra/ra_loader.c
head/contrib/subversion/subversion/libsvn_ra/ra_loader.h
head/contrib/subversion/subversion/libsvn_ra_local/ra_plugin.c
head/contrib/subversion/subversion/libsvn_ra_serf/blame.c
head/contrib/subversion/subversion/libsvn_ra_serf/commit.c
head/contrib/subversion/subversion/libsvn_ra_serf/eagain_bucket.c
head/contrib/subversion/subversion/libsvn_ra_serf/get_file.c
head/contrib/subversion/subversion/libsvn_ra_serf/getlocations.c
head/contrib/subversion/subversion/libsvn_ra_serf/getlocationsegments.c
head/contrib/subversion/subversion/libsvn_ra_serf/libsvn_ra_serf.pc.in
head/contrib/subversion/subversion/libsvn_ra_serf/lock.c
head/contrib/subversion/subversion/libsvn_ra_serf/log.c
head/contrib/subversion/subversion/libsvn_ra_serf/merge.c
head/contrib/subversion/subversion/libsvn_ra_serf/mergeinfo.c
head/contrib/subversion/subversion/libsvn_ra_serf/multistatus.c
head/contrib/subversion/subversion/libsvn_ra_serf/options.c
head/contrib/subversion/subversion/libsvn_ra_serf/property.c
head/contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h
head/contrib/subversion/subversion/libsvn_ra_serf/replay.c
head/contrib/subversion/subversion/libsvn_ra_serf/sb_bucket.c
head/contrib/subversion/subversion/libsvn_ra_serf/serf.c
head/contrib/subversion/subversion/libsvn_ra_serf/stat.c
head/contrib/subversion/subversion/libsvn_ra_serf/update.c
head/contrib/subversion/subversion/libsvn_ra_serf/util.c
head/contrib/subversion/subversion/libsvn_ra_serf/xml.c
head/contrib/subversion/subversion/libsvn_ra_svn/client.c
head/contrib/subversion/subversion/libsvn_ra_svn/cram.c
head/contrib/subversion/subversion/libsvn_ra_svn/cyrus_auth.c
head/contrib/subversion/subversion/libsvn_ra_svn/deprecated.c
head/contrib/subversion/subversion/libsvn_ra_svn/editorp.c
head/contrib/subversion/subversion/libsvn_ra_svn/internal_auth.c
head/contrib/subversion/subversion/libsvn_ra_svn/marshal.c
head/contrib/subversion/subversion/libsvn_ra_svn/protocol
head/contrib/subversion/subversion/libsvn_ra_svn/ra_svn.h
head/contrib/subversion/subversion/libsvn_repos/authz.c
head/contrib/subversion/subversion/libsvn_repos/commit.c
head/contrib/subversion/subversion/libsvn_repos/config_pool.c
head/contrib/subversion/subversion/libsvn_repos/delta.c
head/contrib/subversion/subversion/libsvn_repos/deprecated.c
head/contrib/subversion/subversion/libsvn_repos/dump.c
head/contrib/subversion/subversion/libsvn_repos/fs-wrap.c
head/contrib/subversion/subversion/libsvn_repos/hooks.c
head/contrib/subversion/subversion/libsvn_repos/load-fs-vtable.c
head/contrib/subversion/subversion/libsvn_repos/load.c
head/contrib/subversion/subversion/libsvn_repos/log.c
head/contrib/subversion/subversion/libsvn_repos/replay.c
head/contrib/subversion/subversion/libsvn_repos/reporter.c
head/contrib/subversion/subversion/libsvn_repos/repos.c
head/contrib/subversion/subversion/libsvn_repos/repos.h
head/contrib/subversion/subversion/libsvn_repos/rev_hunt.c
head/contrib/subversion/subversion/libsvn_subr/atomic.c
head/contrib/subversion/subversion/libsvn_subr/auth.c
head/contrib/subversion/subversion/libsvn_subr/base64.c
head/contrib/subversion/subversion/libsvn_subr/cache-inprocess.c
head/contrib/subversion/subversion/libsvn_subr/cache-membuffer.c
head/contrib/subversion/subversion/libsvn_subr/checksum.c
head/contrib/subversion/subversion/libsvn_subr/cmdline.c
head/contrib/subversion/subversion/libsvn_subr/config.c
head/contrib/subversion/subversion/libsvn_subr/config_auth.c
head/contrib/subversion/subversion/libsvn_subr/config_file.c
head/contrib/subversion/subversion/libsvn_subr/config_impl.h
head/contrib/subversion/subversion/libsvn_subr/config_win.c
head/contrib/subversion/subversion/libsvn_subr/deprecated.c
head/contrib/subversion/subversion/libsvn_subr/dirent_uri.c
head/contrib/subversion/subversion/libsvn_subr/dso.c
head/contrib/subversion/subversion/libsvn_subr/eol.c
head/contrib/subversion/subversion/libsvn_subr/error.c
head/contrib/subversion/subversion/libsvn_subr/errorcode.inc
head/contrib/subversion/subversion/libsvn_subr/fnv1a.c
head/contrib/subversion/subversion/libsvn_subr/fnv1a.h
head/contrib/subversion/subversion/libsvn_subr/gpg_agent.c
head/contrib/subversion/subversion/libsvn_subr/hash.c
head/contrib/subversion/subversion/libsvn_subr/internal_statements.h
head/contrib/subversion/subversion/libsvn_subr/io.c
head/contrib/subversion/subversion/libsvn_subr/libsvn_subr.pc.in
head/contrib/subversion/subversion/libsvn_subr/log.c
head/contrib/subversion/subversion/libsvn_subr/mergeinfo.c
head/contrib/subversion/subversion/libsvn_subr/mutex.c
head/contrib/subversion/subversion/libsvn_subr/object_pool.c
head/contrib/subversion/subversion/libsvn_subr/opt.c
head/contrib/subversion/subversion/libsvn_subr/packed_data.c
head/contrib/subversion/subversion/libsvn_subr/path.c
head/contrib/subversion/subversion/libsvn_subr/pool.c
head/contrib/subversion/subversion/libsvn_subr/prefix_string.c
head/contrib/subversion/subversion/libsvn_subr/prompt.c
head/contrib/subversion/subversion/libsvn_subr/properties.c
head/contrib/subversion/subversion/libsvn_subr/skel.c
head/contrib/subversion/subversion/libsvn_subr/sorts.c
head/contrib/subversion/subversion/libsvn_subr/spillbuf.c
head/contrib/subversion/subversion/libsvn_subr/sqlite.c
head/contrib/subversion/subversion/libsvn_subr/sqlite3wrapper.c
head/contrib/subversion/subversion/libsvn_subr/stream.c
head/contrib/subversion/subversion/libsvn_subr/string.c
head/contrib/subversion/subversion/libsvn_subr/subst.c
head/contrib/subversion/subversion/libsvn_subr/sysinfo.c
head/contrib/subversion/subversion/libsvn_subr/temp_serializer.c
head/contrib/subversion/subversion/libsvn_subr/user.c
head/contrib/subversion/subversion/libsvn_subr/utf.c
head/contrib/subversion/subversion/libsvn_subr/utf8proc.c
head/contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc.c
head/contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_data.c
head/contrib/subversion/subversion/libsvn_subr/version.c
head/contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c
head/contrib/subversion/subversion/libsvn_subr/win32_crashrpt_dll.h
head/contrib/subversion/subversion/libsvn_subr/win32_crypto.c
head/contrib/subversion/subversion/libsvn_subr/win32_xlate.c
head/contrib/subversion/subversion/libsvn_subr/x509info.c
head/contrib/subversion/subversion/libsvn_subr/x509parse.c
head/contrib/subversion/subversion/libsvn_subr/xml.c
head/contrib/subversion/subversion/libsvn_wc/adm_crawler.c
head/contrib/subversion/subversion/libsvn_wc/conflicts.c
head/contrib/subversion/subversion/libsvn_wc/copy.c
head/contrib/subversion/subversion/libsvn_wc/crop.c
head/contrib/subversion/subversion/libsvn_wc/deprecated.c
head/contrib/subversion/subversion/libsvn_wc/diff.h
head/contrib/subversion/subversion/libsvn_wc/diff_editor.c
head/contrib/subversion/subversion/libsvn_wc/diff_local.c
head/contrib/subversion/subversion/libsvn_wc/entries.c
head/contrib/subversion/subversion/libsvn_wc/externals.c
head/contrib/subversion/subversion/libsvn_wc/node.c
head/contrib/subversion/subversion/libsvn_wc/old-and-busted.c
head/contrib/subversion/subversion/libsvn_wc/props.c
head/contrib/subversion/subversion/libsvn_wc/status.c
head/contrib/subversion/subversion/libsvn_wc/translate.c
head/contrib/subversion/subversion/libsvn_wc/upgrade.c
head/contrib/subversion/subversion/libsvn_wc/wc-checks.h
head/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
head/contrib/subversion/subversion/libsvn_wc/wc-metadata.sql
head/contrib/subversion/subversion/libsvn_wc/wc-queries.h
head/contrib/subversion/subversion/libsvn_wc/wc-queries.sql
head/contrib/subversion/subversion/libsvn_wc/wc.h
head/contrib/subversion/subversion/libsvn_wc/wc_db.c
head/contrib/subversion/subversion/libsvn_wc/wc_db.h
head/contrib/subversion/subversion/libsvn_wc/wc_db_pristine.c
head/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c
head/contrib/subversion/subversion/libsvn_wc/wc_db_util.c
head/contrib/subversion/subversion/libsvn_wc/wcroot_anchor.c
head/contrib/subversion/subversion/libsvn_wc/workqueue.c
head/contrib/subversion/subversion/svn/cl-conflicts.c
head/contrib/subversion/subversion/svn/cl-conflicts.h
head/contrib/subversion/subversion/svn/cl-log.h
head/contrib/subversion/subversion/svn/cl.h
head/contrib/subversion/subversion/svn/cleanup-cmd.c
head/contrib/subversion/subversion/svn/conflict-callbacks.c
head/contrib/subversion/subversion/svn/diff-cmd.c
head/contrib/subversion/subversion/svn/help-cmd.c
head/contrib/subversion/subversion/svn/info-cmd.c
head/contrib/subversion/subversion/svn/list-cmd.c
head/contrib/subversion/subversion/svn/log-cmd.c
head/contrib/subversion/subversion/svn/merge-cmd.c
head/contrib/subversion/subversion/svn/notify.c
head/contrib/subversion/subversion/svn/propdel-cmd.c
head/contrib/subversion/subversion/svn/propedit-cmd.c
head/contrib/subversion/subversion/svn/propget-cmd.c
head/contrib/subversion/subversion/svn/propset-cmd.c
head/contrib/subversion/subversion/svn/resolve-cmd.c
head/contrib/subversion/subversion/svn/status.c
head/contrib/subversion/subversion/svn/svn.c
head/contrib/subversion/subversion/svn/switch-cmd.c
head/contrib/subversion/subversion/svn/update-cmd.c
head/contrib/subversion/subversion/svn/util.c
head/contrib/subversion/subversion/svn_private_config.h.in
head/contrib/subversion/subversion/svn_private_config.hw
head/contrib/subversion/subversion/svnadmin/svnadmin.c
head/contrib/subversion/subversion/svnbench/cl.h
head/contrib/subversion/subversion/svnbench/null-export-cmd.c
head/contrib/subversion/subversion/svnbench/null-list-cmd.c
head/contrib/subversion/subversion/svnbench/null-log-cmd.c
head/contrib/subversion/subversion/svnbench/svnbench.c
head/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c
head/contrib/subversion/subversion/svnfsfs/load-index-cmd.c
head/contrib/subversion/subversion/svnfsfs/stats-cmd.c
head/contrib/subversion/subversion/svnfsfs/svnfsfs.c
head/contrib/subversion/subversion/svnfsfs/svnfsfs.h
head/contrib/subversion/subversion/svnlook/svnlook.c
head/contrib/subversion/subversion/svnmucc/svnmucc.c
head/contrib/subversion/subversion/svnrdump/dump_editor.c
head/contrib/subversion/subversion/svnrdump/load_editor.c
head/contrib/subversion/subversion/svnrdump/svnrdump.c
head/contrib/subversion/subversion/svnrdump/svnrdump.h
head/contrib/subversion/subversion/svnrdump/util.c
head/contrib/subversion/subversion/svnserve/cyrus_auth.c
head/contrib/subversion/subversion/svnserve/serve.c
head/contrib/subversion/subversion/svnserve/server.h
head/contrib/subversion/subversion/svnserve/svnserve.c
head/contrib/subversion/subversion/svnsync/svnsync.c
head/contrib/subversion/win-tests.py
Directory Properties:
head/contrib/subversion/ (props changed)
Copied: head/contrib/subversion/.editorconfig (from r333351, vendor/subversion/dist/.editorconfig)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/subversion/.editorconfig Tue May 8 04:52:52 2018 (r333354, copy of r333351, vendor/subversion/dist/.editorconfig)
@@ -0,0 +1,9 @@
+# top-most EditorConfig file
+# See http://editorconfig.org/
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = false
Modified: head/contrib/subversion/CHANGES
==============================================================================
--- head/contrib/subversion/CHANGES Tue May 8 04:51:47 2018 (r333353)
+++ head/contrib/subversion/CHANGES Tue May 8 04:52:52 2018 (r333354)
@@ -1,3 +1,291 @@
+Version 1.10.0
+(?? ??? 2018, from /branches/1.10.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.10.0
+
+See the 1.10 release notes for a more verbose overview of the changes since
+the 1.9 release: https://subversion.apache.org/docs/release-notes/1.10.html
+
+ User-visible changes:
+ - Major new features:
+ * Better interactive conflict resolution for tree conflicts (r1687489 et al)
+ * Wilcards and improved performance in path-based authorization (r1776832)
+ * New experimental 'svn shelve' command (issue #3625)
+ - Minor new features and improvements:
+ * svnbench: Show time taken & bytes transferred (r1703383, r1710586)
+ * New 'svnadmin dump' options to include/exclude paths (r1811992 et al)
+ * New '--normalize-props' option for 'svnadmin dump' (r1807836 et al)
+ * New 'svnadmin 'load-revprops', 'dump-revprops' subcommands (r1694191, -225)
+ * New '--no-flush-to-disk' option for 'svnadmin load' (r1736357, -7357)
+ * New '--file' option for several svnadmin subcommands (r1738021)
+ * New '--max-request-size', '--max-response-size' options for svnserve (r1714330, -333)
+ * New '-rN' option for 'svnadmin lstxns' (r1703699)
+ * New '--search' option for fast 'svn ls' searches (r1767186 et al)
+ * Add '--search' option support to 'svnbench null-list' (r1767202)
+ * New '-M' option for 'svnlook tree' (r1708222)
+ * New '--skip-unchanged' option for 'svnsync copy-revprops' (r1692655)
+ * 'svn log --search' now ignores case and diacriticals (r1731300, r1735614)
+ * Improved performance of server-side log processing (r1732768, r1731656)
+ * diff3: Reduce processing time and memory usage (r1731659)
+ * ra_serf: Adjustments for serf versions with HTTP/2 support (r1716400)
+ * ra_serf: Send svndiff1 deltas during commit (r1704317, r1704613, r1791290)
+ * ra_serf: Stream svndiff deltas w/o creating temporary files (r1803143 et al)
+ * ra_serf: Don't necessarily request full MERGE reponses (r1806017 et al)
+ * 'svn patch': Parse binary diffs in git-style patches (r1703925)
+ * 'svnadmin info' now reports latest revision in the repository (r1697953)
+ * ra_svn: Various performance-related tweaks (r1694490)
+ * Optimize svndiff parser (r1685063)
+ * 'svn status' without -v: Stop showing uninteresting deletions (r1664533)
+ * Save a few cycles in svn_stringbuf_set() (r1759177)
+ * windows: Use the Unicode Windows API (r1756193)
+ * windows: Distinguish out-of-memory error from abort() (r1724784, -809)
+ * windows: Explicitly release file locks (r1702089)
+ * windows: Correctly check result from LoadLibrary() call (r1755983)
+ * Remove Windows-specific slowdown during pristine cleanup (r1701641)
+ * FSFS: Optionally cache node properties without full-text cache (r1723715)
+ * FSFS: Open transaction's proto revision in write-only mode (r1759135)
+ * FSFS: Avoid checksum calculations if logical addressing is used (r1756377)
+ * FSFS: Do not read very long change lists in block read mode (r1746012)
+ * FSFS: Avoid double DAG lookup (r1711582)
+ * FSFS: Avoid double cache lookups (r1681974, r1710370)
+ * FSFS: Increase default revprop pack size from 4k to 16k (r1709799)
+ * FSFS: Speed up revprop access (r1707986 et al)
+ * FSFS: Disable representation sharing for directories (r1706619)
+ * FSFS: Speed up transaction processing for large directories (r1706617)
+ * FSFS: Tune format 7 pack ordering heuristics (r1706615)
+ * FSFS: Reduce I/O overhead during history traversal (r1703237)
+ * FSFS: Use native Windows API to guarantee data is flushed (r1701053)
+ * FSFS: Warn if a possible rep-cache SHA1 collision is detected (r1674673)
+ * FSFS: Optimize revprop cache filling strategy under high load (r1795324)
+ * FSFS: New "verify-before-commit" fsfs.conf option (r1795351)
+ * FSFS: New format 8 with various performance improvements (r1801940 et al)
+ * FSFS/FSX: Chunked read support for changed paths lists (r1746026, -4987)
+ * FSFS/FSX: Improvements to cache implementation (r1694489)
+ * FSX: Add checksums to packed revprop manifests and files (r1713132, -9717)
+ * FSX: Significantly reduce size of packed revprop manifest data (r1713109)
+ * FSX: Improved on-disk representation of property lists (r1717427)
+ * FSX: New in-repository representation of directories (r1712967)
+ * FSX: Make 'svnadmin recover' discard all transactions (r1712937)
+ * FSX: Reduce number of fsync operations (r1711354 et al)
+ * mod_dav_svn: Improve performance and memory usage of PROPFIND (r1721732)
+ * mod_dav_svn: Show process-id on Windows in /svn-status page (r1718567)
+ * mod_dav_svn: Advertise svndiff1 support to clients (r1704891, r1791285)
+ * mod_dav_svn: Remove disk I/O to TMPDIR during first commit (r1716240)
+ * svnsync: Fix assertion failure with up-to-date repositories (r1727140)
+ * ra_serf: Parallel requests for text and property changes (r1716575)
+ * svnserve: Remove disk I/O to TMPDIR during first commit (r1716240)
+ * Triple performance of URI escaping (r1710099, -103)
+ * 'svn blame': Optimize a bit on the server side (r1711666)
+ * 'svn cleanup': Add --vacuum-pristines option (r1802787 et al)
+ * 'svn diff --git': Show diffs of symlinks like git and hg (r1706372)
+ * 'svn patch': Capable of handling git-like symlink changes (r1706446)
+ * 'svn patch': Improve detection of additions and deletions (r1706623)
+ * 'svn patch': Handle zero-byte files vs deleted files (r1705856)
+ * 'svn diff --git': Produce 'rename from/to' headers (r1706855)
+ * 'svn diff --git': Produce proper mode headers (r1706041)
+ * 'svn lock', 'svn unlock': Take the -q option (r1796288)
+ * 'svn help': improved wording and consistency (r1802989 et al)
+ * 'svn': Add a new '--accept recommended' option. (r1805623)
+ * 'svn': --non-interactive uses recommended tree conflict resolution (r1805620)
+ * Evaluate 'old mode' and 'new mode' lines from git-syle diffs (r1705391)
+ * svnrdump, svndumpfilter: Enable buffered stdin (r1703074)
+ * ra_serf: Receive svndiff1 and gzip compressed deltas (r1791282, -3, -4)
+ * svnadmin: 'lock', 'unlock', 'rmlocks': Take the -q option (r1796406)
+ * New svndiff2 binary delta format using lz4 compression (r1801938, et al)
+ * gpg-agent: Support gpg ≥2.1.13 and unset GPG_AGENT_INFO (r1795087)
+ * Add 'http-compression=auto' client config option as default (r1803899 et al)
+ * Speed up processing of mergeinfo (r1802470 et al)
+ * Check for invalid 'xt' fields in x509 certs (r1809290)
+ * New '--password-from-stdin' option for 'svn' (r1819093)
+ - Client-side bugfixes:
+ * svnbench: Honour the '--with-no-revprops' option (r1709593)
+ * ra_serf: Fix segfault when running over HTTP v1 (r1766089)
+ * ra_serf: Keep small svndiffs in memory during commit (r1724455)
+ * ra_serf: Improve error messages related to lock operations (r1716450)
+ * ra_serf: Work around a bug in serf bucket handling (r1714806)
+ * ra_serf: Fix lock token handling for file-path commits (r1815799 et al)
+ * Raise a malfunction instead of segfaulting with corrupt wc.db (r1749887)
+ * Fix check for unversioned obstructions blocking file externals (r1735932)
+ * 'svn patch' bugfixes:
+ + Fix behaviour if a reject file can't be created (r1725948)
+ + Describe adds and removes in reject file headers (r1707034)
+ + Detect recorded moves that are already applied (r1706893)
+ + Detect already applied patches in edge cases (r1706687)
+ + Fix handling of missing trailing context (issue #4609)
+ + Fix interaction of moves and property changes (r1706875)
+ + Fix output for reordered hunks (issue #4533)
+ + Prevent from overwriting existing reject files (r1706600)
+ + Improve handling of added properties (r1706598)
+ + Improve handling of rejected file deletions (r1706221)
+ + Fix --dry-run with replaced files (r1706217)
+ + Fix applying prop changes which should conflict (r1705733)
+ + Fix duplicate notifications when adding directories (r1704883)
+ + Fix duplicate notifications when patching svn:executable prop (r1706078)
+ + Fix notifications when adding/removing properties (r1705698)
+ + Make handle already applied property patches (r1705692)
+ + Change some notifications to 'U' instead of 'G' (r1706693)
+ + Don't create file if git-style patch indicates modification (r1706005)
+ + Parse any properties following svn:mergeinfo (r1706825)
+ + Fix potential unbounded memory usage in parser (r1705979)
+ + Fix problems with --git diffs applied in reverse (r1704854, -88)
+ + Fix removal of EOL if final patch context line has no EOL (#4315)
+ * 'svn diff --git': Fix file permission modes to match git and hg (r1695384)
+ * 'svn diff --git': added/deleted filenames are never /dev/null (issue #4689)
+ * Fix a problem with relocating some externals (r1723385)
+ * Fix 'svn diff URL at REV WC' wrongly looks up URL at HEAD (issue #4597)
+ * Fix 'svn diff --no-diff-added' shows properties as added (issue #4596)
+ * Properly raise text merge conflicts with file externals (r1680245)
+ * Fix 'svn diff' with local directories marked incomplete (r1674413 et al)
+ * ra_svn/ra_serf: Make negative log limits work as documented (r1665530)
+ * ra_svn: Eliminate unnecessary URL reparenting (r1779611, r1779611)
+ * ra_svn: Use svndiff2 deltas when supported on both ends (r1803269 et al)
+ * Handle invalid revision numbers consistently across RA layers (r1665328)
+ * Handle commits to revs > HEAD consistently across RA layers (r1664698)
+ * Eliminate one client/server roundtrip from checkouts of HEAD (r1779620)
+ * Expose some error messages generated by github's SVN server (r1707164)
+ * 'svnfsfs stats': Show average lengths of delta chains (r1705739)
+ * svnmucc: Fix crash during application teardown (r1795727)
+ * Fix assertion when exporting a working copy containing relative externals
+ (r1802316)
+ - Server-side bugfixes:
+ * Fix checksum validation error due to data eviction from cache (r1781694)
+ * FSFS pack: Use unbuffered file streams in a couple of places (r1759405)
+ * FSFS: Reduce excessive amount of read and seek syscalls (r1758979, -9399)
+ * FSFS: Reduce memory footprint of cached directories (r1725179)
+ * FSFS: Add various checks for integer overflows (r1714372, -32, -34)
+ * FSFS: Detect a very unlikely case of item index corruption (r1716973)
+ * FSFS: Make handling of revprop size information more resilient (r1716784)
+ * FSFS: Don't re-parse a directory which just got committed (r1706679)
+ * FSFS: Handle some known quirks in committed node revisions (r1673875)
+ * FSFS format 7: Verify item types more thoroughly (r1796160)
+ * FSFS: Fix false positive "Not a directory" error involving file moved and
+ replaced by dir (issue #4677)
+ * FSFS: Fix crash accessing revprops with --memory-cache-size=0 (r1795164)
+ * FSFS: Fix issue #4623 for FSFS. (r1813794 et al)
+ * mod_dav_svn: Omit Cache-Control HTTP header for HEAD URLs (issue #4514)
+ * mod_dav_svn: Reduced memory consumption for DAV merge responses (r1727790)
+ * mod_dav_svn: Don't set a Last-Modified header in GET responses (r1724790)
+ * mod_dav_svn: Actually use FSFS transaction directory cache (r1723720)
+ * mod_dav_svn: Do not insert newlines in base64 encoded responses (r1712223)
+ * Fix insertion of very large items into the membuffer cache (r1717337, -8)
+ * Fix capacity check of the membuffer cache's prefix pool (r1714356)
+ * Prevent paths containing newlines from being committed (r1662585)
+ * Fix for properties: Null updates break last-changed-revision (issue #4700)
+ * 'svnfsfs stats': Fix false positive checksum errors reading old revisions
+ (r1785904)
+ * 'svnfsfs stats': Fix support for pre-v4 FSFS repositories. (r1816966)
+ * svnadmin, svnfsfs: Detect invalid arguments to -M (r1787023, r1787045)
+ * svnlook, svnserve: Detect invalid arguments to -M (r1787023, r1787045)
+ * svnadmin: Output locked paths in canonical form (r1796420)
+ * svnadmin: Output locked paths correctly encoded (r1797122)
+ * svn: propdel, propset: Transcode property names on output (r1797186)
+ * svnserve: Make use-sasl=true a fatal error in SASL-less builds. (r1803188)
+ - Client-side and server-side bugfixes:
+ * Fix integer overflow check with >= 1G mergeinfo ranges per path (r1714380)
+ * Fix integer overflow checks on WoW64 platforms (r1714372)
+ * Fix bug with canonicalizing Window-specific drive-relative URL (r1692262)
+ * In file:// URLs, allow '\' directly after Windows drive letter (r1692259)
+ * Fix segfault with recursive configuration value definitions (issue #4543)
+ * FSFS: Improve error messages when DAG lookup fails (r1795120)
+ * Transcode command-line arguments to UTF-8 (r1797190, r1797362, et al)
+ * Fix segfault on x509 certificate with empty name (r1798157)
+ * Fix segfault with invalid URLs in svn:externals (r1803471)
+ * Windows: Failure to write files might remain undetected (r1806014)
+ - Other tool improvements and bugfixes:
+ * New svn-mergeinfo-normalizer tool (r1695992 et al)
+ * Allow configuring mailer.py to use SMTP SSL (r1777846)
+ * svnmucc can now delete directories with deleted children (issue #4666)
+ * svn-vendor.py: Minor enhancements, mostly in treating symlinks (r1732669)
+ * bash_completion: Better URL completion (r1701494)
+ * bash_completion: Complete arguments to 'svn info --show-item' (r1698276)
+ * fsfs-stats: New 1.8-compatible wrapper for 'svnfsfs stats' (r1802032)
+ * Drop support for upgrading working copies created with Subversion 1.7
+ (r1807584 et al)
+
+ Developer-visible changes:
+ - General:
+ * windows: Removed support for building with Visual Studio 6.0 (r1703419)
+ * Fix .py scripts throughout the source tree for Python 3 (r1741723 et al)
+ * Support memcached on Windows with APR-util 1.3 or later (r1674626 et al)
+ * Don't require GNU-specific sed(1) extensions during the build (r1693159)
+ * get-deps.sh: download Googlemock and Googletest from GitHub (r1746303)
+ * windows: Add autodetection for 'zlibstat.lib' (r1783704)
+ * windows: Compile libsvn_fs_* as DLLs (r1696758, -83)
+ * windows: Allow building against OpenSSL 1.1.0 (r1814724 et al)
+ * OS X: Silence compile-time deprecation warnings with SASL (r1739649)
+ * OS X: Silence ranlib warnings about disabled WIN32 code (r1809792)
+ * 'make check GLOBAL_SCHEDULER=1' will run many tests in parallel (r1716399)
+ * unix: New '--enable-apache-whitelist' configure script option (r1732294)
+ * OS X: Support 'configure --enable-runtime-module-search' (r1677273)
+ * tests: Allow tests to be run over HTTP/2 (r1710707)
+ * tests: httpd compile-time and run-time version may differ (r1808955 et al)
+ * tests: Add pre-cooked repos for all FSFS versions. (r1816402 et al)
+ * tests: Add FSFS_DIR_DELTIFICATION option. (r1813897)
+ * Add basic tests for svn_xml_parser_t API (r1765214)
+ * Unbreak the test suite on Python 3 (r1743034, -81, et al)
+ * Make the test suite work when checked out of a git repository (r1771118)
+ * Allow Apache HTTPD with mod_deflate in testsuite on Windows (r1758776)
+ * Support modern utilities for finding free TCP ports for tests (r1684649)
+ * The C test scheduler is more efficient in SMP environments (r1775555)
+ * The C tests convert paths from/to UTF-8 more efficiently (r1775642)
+ * Add INSTALL instructions for building with OpenSSL 1.1.0 (r1778313)
+ * Improved INSTALL instructions for Windows (r1703470, -2, -3, -4, et al)
+ * Updated INSTALL instructions (r1691712)
+ * windows: Support Visual Studio 2017 (r1786653, r1786669)
+ * gnome-keyring: Support libsecret in preference to libgnome-keyring
+ (r1798004)
+ * kwallet: Support KDE 5 in preference to KDE 4 (r1798731)
+ * kwallet: Fix KDE5 support with clang 3.8 (r1802536 et al)
+ * kwallet: Add --with-kwallet=INCDIR:LIBDIR build option (r1802646)
+ * Rename cxxhl bindings 'make tests' to avoid confusion with 'make test'
+ (r1800849)
+ * 'make check': Allow testing with FSFS compression (r1801936)
+ * svnserveautocheck.sh: Support out-of-tree builds when running a single
+ test file (r1802081)
+ * Distribution artifacts now prepared with swig 3.0.10 (r1802135)
+ * SQLite: Use https:// links to download amalgamation sources (r1817043)
+ * Create reproducible tarballs (r1804618 et al)
+ * Disable static builds of the apache and auth provider modules (r1802612)
+ * utf8proc: Update to version 2.1.0 (r1809090 et al)
+ * utf8proc: Build against the system library by default (r1803210 et al)
+ - API changes:
+ * New svn_client_conflict_* API functions for the new conflict resolver.
+ * New svn_repos_fs_get_mergeinfo2() with streamy access (r1780810 et al)
+ * New streamy svn_repos_get_logs5() API function (r1730389, -1163)
+ * New streamy svn_fs_paths_changed3() API function (r1727822, r1745055)
+ * New svn_client_list4() API function (r1767186)
+ * New svn_ra_list() API function (r1767190)
+ * New svn_repos_list() API function (r1765088)
+ * New svn_stream_contents_checksum() API function (r1755486, -6651)
+ * New svn_io_file_get_offset() API function (r1719269)
+ * New svn_base64_encode2 API function (r1711517)
+ * New svn_fs_create2() API function (r1710631)
+ * New svn_string_from_stream2() API function (r1710065)
+ * New svn_io_write_atomic2() API function (r1703142)
+ * New svn_stream_for_stdin2() API function (r1702983)
+ * New svn_io_file_rename2() API function (r1701017)
+ * New svn_error_quick_wrapf() API function (r1662668)
+ * New svn_repos_path_change_t type (r1802114)
+ * New svn_repos_log_entry_t type (r1802114)
+ * New svn_cstring_join2() API (r1806041)
+ * New svn_txdelta_to_svndiff_stream() API (r1803140 et al)
+ * svn_repos_parse_dumpstream3() now accepts NULL pointers (r1700180)
+ * Return resettable streams from svn_stream_checksummed2(). (r1804807)
+ * Fix svnserveautocheck&davautocheck when time is only a built-in (r1665652)
+ - Bindings:
+ * Configure the swig bindings only if swig has been enabled (r1751167)
+ * Error if 'configure --with-swig' is used and swig is not found (r1700844)
+ * Perl: Fix build with libraries in non-standard LD_LIBRARY_PATH (r1781588)
+ * JavaHL can now get revision properties along with log messages (r1780819)
+ * JavaHL: Allow access to constructors of a couple JavaHL classes (r1739704)
+ * JavaHL: Correct some JNIEntry method names (r1706738)
+ * Allow swig bindings scripts to configure the FSFS cache (r1709922)
+ * Disable some swig wrappers that aren't working (r1700966)
+ * JavaHL: Make StringArray nullable (r1785429)
+ * JavaHL: Add missing exception checks (r1801108)
+ * Ruby: Fix handling of NULL MD5 digests (r1811786)
+ * Ruby: Detect versions up to 2.4 (r1806570)
+
+
Version 1.9.7
(10 Aug 2017, from /branches/1.9.x)
http://svn.apache.org/repos/asf/subversion/tags/1.9.7
@@ -994,6 +1282,51 @@ http://svn.apache.org/repos/asf/subversion/tags/1.9.0
* javahl: allow compiling with a C++11 compiler (r1684412)
+Version 1.8.19
+(10 Aug 2017, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.19
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * Fix arbitrary code execution vulnerability CVE-2017-9800
+ See <https://subversion.apache.org/security/CVE-2017-9800-advisory.txt>
+ for details.
+
+ - Server-side bugfixes:
+ (none)
+
+ - Bindings bugfixes:
+ (none)
+
+ Developer-visible changes:
+ - General:
+ (none)
+
+ - API changes:
+ (none)
+
+
+Version 1.8.18
+(10 Jul 2017, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.18
+
+ User-visible changes:
+ - Server-side bugfixes:
+ * fsfs: never attempt to share directory representations (r1785053)
+ * fsfs: make consistency independent of hash algorithms (r1785737 et al)
+ This change makes Subversion resilient to collision attacks, including
+ SHA-1 collision attacks such as <http://shattered.io/>. See also our
+ documentation at <https://subversion.apache.org/faq#shattered-sha1> and
+ <https://subversion.apache.org/docs/release-notes/1.8#shattered-sha1>.
+
+ - Client-side and server-side bugfixes:
+ * work around an APR bug related to file truncation (r1759116)
+
+ Developer-visible changes:
+ - General:
+ * update serf download URI in build scripts (r1700130 et al)
+
+
Version 1.8.17
(29 Nov 2016, from /branches/1.8.x)
http://svn.apache.org/repos/asf/subversion/tags/1.8.17
@@ -2666,7 +2999,7 @@ the 1.6 release: http://subversion.apache.org/docs/re
* fixed: ra_serf doesn't support http-auth-types config (issue #3435)
* fixed: merge sets incorrect mergeinfo on skipped paths (issue #3440)
* fixed: ra_serf inconsistent handling of cached authn creds (issue #3450)
- * fixed: ra_serf sefault with using NTLM or Negotiate auth (r876910)
+ * fixed: ra_serf segfault with using NTLM or Negotiate auth (r876910)
* fixed: excluded subtrees are not detected by svnversion (issue #3461)
* fixed: submitting a changelist while obstructed item exists (issue #3484)
* fixed: crash when changing an external's URL (issue #3530)
Modified: head/contrib/subversion/COMMITTERS
==============================================================================
--- head/contrib/subversion/COMMITTERS Tue May 8 04:51:47 2018 (r333353)
+++ head/contrib/subversion/COMMITTERS Tue May 8 04:52:52 2018 (r333354)
@@ -19,7 +19,7 @@ Blanket commit access:
fitz Brian W. Fitzpatrick <fitz at red-bean.com>
daniel Daniel Stenberg <daniel at haxx.se>
cmpilato C. Michael Pilato <cmpilato at collab.net>
- philip Philip Martin <philip.martin at wandisco.com>
+ philip Philip Martin <philip at apache.org>
jerenkrantz Justin Erenkrantz <justin at erenkrantz.com>
rooneg Garrett Rooney <rooneg at electricjellyfish.net>
blair Blair Zajac <blair at orcaware.com>
@@ -27,14 +27,13 @@ Blanket commit access:
dlr Daniel Rall <dlr at finemaltcoding.com>
mbk Mark Benedetto King <mbk at lowlatency.com>
jaa Jani Averbach <jaa at iki.fi>
- julianfoad Julian Foad <julian.foad at wandisco.com>
+ julianfoad Julian Foad <julian at foad.me.uk>
jszakmeister John Szakmeister <john at szakmeister.net>
ehu Erik Hülsmann <ehuels at gmail.com>
breser Ben Reser <ben at reser.org>
maxb Max Bowsher <maxb1 at ukf.net>
dberlin Daniel Berlin <dberlin at dberlin.org>
danderson David Anderson <david.anderson at natulte.net>
- ivan Ivan Zhakov <chemodax at gmail.com>
djames David James <james at cs.toronto.edu>
pburba Paul Burba <pburba at collab.net>
glasser David Glasser <glasser at davidglasser.net>
@@ -48,17 +47,20 @@ Blanket commit access:
kou Kouhei Sutou <kou at cozmixng.org>
danielsh Daniel Shahaf <d.s at daniel.shahaf.name>
peters Peter Samuelson <peter at p12n.org>
- rhuijben Bert Huijben <rhuijben at collab.net>
+ rhuijben Bert Huijben <rhuijben at apache.org>
stylesen Senthil Kumaran S <stylesen at gmail.com>
steveking Stefan Küng <tortoisesvn at gmail.com>
- neels Neels J. Hofmeyr <neels at elego.de>
+ neels Neels J. Hofmeyr <neels at hofmeyr.de>
jwhitlock Jeremy Whitlock <jcscoobyrs at gmail.com>
sbutler Stephen Butler <sbutler at elego.de>
dannas Daniel Näslund <dannas at dannas.name>
- stefan2 Stefan Fuhrmann <stefan.fuhrmann at wandisco.com>
+ stefan2 Stefan Fuhrmann <stefan2 at apache.org>
jcorvel Johan Corveleyn <jcorvel at gmail.com>
trent Trent Nelson <trent at snakebite.org>
kotkov Evgeny Kotkov <evgeny.kotkov at visualsvn.com>
+ astieger Andreas Stieger <andreas.stieger at gmx.de>
+ jamessan James McCoy <jamessan at jamessan.com>
+ luke1410 Stefan Hett <luke1410 at posteo.de>
[[END ACTIVE FULL COMMITTERS. LEAVE THIS LINE HERE; SCRIPTS LOOK FOR IT.]]
@@ -76,6 +78,7 @@ Full committers who have asked to be listed as dormant
malcolm Malcolm Rowe <malcolm-svn-dev at farside.org.uk>
naked Nuutti Kotivuori <naked at iki.fi>
ringstrom Tobias Ringström <tobias at ringstrom.mine.nu>
+ ivan Ivan Zhakov <chemodax at gmail.com>
Partial committers who have asked to be listed as dormant:
@@ -100,6 +103,7 @@ Commit access for specific areas:
rschupp Roderich Schupp <roderich.schupp at gmail.com> (Swig bindings)
stilor Alexey Neyman <stilor at att.net> (Python bindings,
svn-vendor.py)
+ troycurtisjr Troy Curtis, Jr <troycurtisjr at gmail.com> (Swig bindings)
Packages:
@@ -164,14 +168,14 @@ Commit access for specific areas:
humbedooh Daniel Gruno <humbedooh at apache.org> (svnpubsub)
prabhugs Prabhu Gnana Sundar <pprabhugs at gmail.com> (verify-keep-going)
schabi Markus Schaber <schabi at apache.org> (testsuite)
- gbg Gabriela Gibson <gabriela.gibson at gmail.com> (gtest)
+ gbg Gabriela Gibson <gabriela.gibson at gmail.com> (gtest)
+ lyalyakin Pavel Lyalyakin <pavel.lyalyakin at visualsvn.com> (site)
Translation of message files:
niqueco Nicolás Lichtmaier <nick at reloco.com.ar> (po: es)
luebbe Lübbe Onken <luebbe at tigris.org> (po: de)
jensseidel Jens Seidel <jensseidel at users.sf.net> (po: de)
- astieger Andreas Stieger <andreas.stieger at gmx.de> (po: de)
oyvindmo Øyvind Møll <svn at moll.no> (po: nb)
sunny256 Øyvind A. Holm <sunny at sunbase.org> (po: nb)
jzgoda Jaroslaw Zgoda <jzgoda at o2.pl> (po: pl)
@@ -188,8 +192,7 @@ Commit access for specific areas:
lark Wang Jian <lark at linux.net.cn> (po: zh_CN) [EMAIL
IS BOUNCING]
giorgio_valoti Giorgio Valoti <giorgio_v at mac.com> (po: it)
- nebiac Federico Nebiacolombo <cint1 at amsjv.it> (po: it) [EMAIL
- IS BOUNCING]
+ nebiac Federico Nebiacolombo <cint1 at amsjv.it> (po: it)
fabien Fabien Coelho <fabien at coelho.net> (po: fr)
marcelg Marcel Gosselin <marcel.gosselin at polymtl.ca> (po: fr)
mattiase Mattias Engdegård <mattiase at acm.org> (po: sv)
Modified: head/contrib/subversion/INSTALL
==============================================================================
--- head/contrib/subversion/INSTALL Tue May 8 04:51:47 2018 (r333353)
+++ head/contrib/subversion/INSTALL Tue May 8 04:52:52 2018 (r333354)
@@ -3,7 +3,7 @@
A Quick Guide
======================================
-$LastChangedDate: 2015-12-12 04:00:43 +0000 (Sat, 12 Dec 2015) $
+$LastChangedDate: 2017-12-25 04:00:08 +0000 (Mon, 25 Dec 2017) $
Contents:
@@ -22,7 +22,7 @@ Contents:
E. Building the Latest Source under Windows
III. BUILDING A SUBVERSION SERVER
- A. Setting Up Apache
+ A. Setting Up Apache Httpd
B. Making and Installing the Subversion Server
C. Configuring Apache for Subversion
D. Running and Testing
@@ -55,7 +55,7 @@ I. INTRODUCTION
'installers' for both Windows and OS X. Visit this page for
package links:
- http://subversion.apache.org/packages.html
+ https://subversion.apache.org/packages.html
For those of you who still wish to build from source, Subversion
follows the Unix convention of "./configure && make", but it has
@@ -96,9 +96,9 @@ I. INTRODUCTION
These diff streams are used everywhere -- over the network,
in the repository, and in the client's working copy.
- * libserf (OPTIONAL for client)
+ * Apache Serf (OPTIONAL for client)
- The Serf library allows the Subversion client to send HTTP
+ The Apache Serf library allows the Subversion client to send HTTP
requests. This is necessary if you want your client to access
a repository served by the Apache HTTP server. There is an
alternate 'svnserve' server as well, though, and clients
@@ -110,10 +110,16 @@ I. INTRODUCTION
* OpenSSL (OPTIONAL for client and server)
OpenSSL enables your client to access SSL-encrypted https://
- URLs (using libserf) in addition to unencrypted http:// URLs.
+ URLs (using Apache Serf) in addition to unencrypted http:// URLs.
To use SSL with Subversion's WebDAV server, Apache needs to be
compiled with OpenSSL as well.
+ * Netwide Assembler (OPTIONAL for client and server)
+
+ The Netwide Assembler (NASM) is used to build the (optionally)
+ assembler modules of OpenSSL. As of OpenSSL 1.1.0 NASM is the
+ only supported assembler.
+
* Berkeley DB (OPTIONAL for client and server)
There are two different repository 'back-end'
@@ -185,7 +191,7 @@ I. INTRODUCTION
Subversion's own configure script may need to be told where to find
them, if they were not installed in standard system locations.
- Note: there are optional dependencies (such as openssl, swig, and httpd)
+ Note: there are optional dependencies (such as OpenSSL, swig, and httpd)
which get-deps.sh does not download.
Note: Because previous builds of Subversion may have installed older
@@ -202,7 +208,7 @@ I. INTRODUCTION
If you do not have a pre-installed APR and APR-util, you will need
to get these yourself:
- http://apr.apache.org/download.cgi
+ https://apr.apache.org/download.cgi
On Unix systems, if you already have the APR libraries compiled and do
not wish to regenerate them from source code, then Subversion needs to
@@ -271,11 +277,11 @@ I. INTRODUCTION
newer. The autogen.sh script knows about that.
- 5. Serf library 1.3.4 or newer (OPTIONAL)
+ 5. Apache Serf library 1.3.4 or newer (OPTIONAL)
If you want your client to be able to speak to an Apache
server (via a http:// or https:// URL), you must link against
- serf. Though optional, we strongly recommend this.
+ Apache Serf. Though optional, we strongly recommend this.
In order to use ra_serf, you must install serf, and run Subversion's
./configure with the argument --with-serf. If serf is installed in a
@@ -285,31 +291,31 @@ I. INTRODUCTION
instead.
- Serf can be obtained via your system's package distribution
+ Apache Serf can be obtained via your system's package distribution
system or directly from http://code.google.com/p/serf/.
- For more information on serf and Subversion's ra_serf, see the file
- subversion/libsvn_ra_serf/README.
+ For more information on Apache Serf and Subversion's ra_serf, see the
+ file subversion/libsvn_ra_serf/README.
6. OpenSSL (OPTIONAL)
- ### needs some updates. I think serf automagically handles
+ ### needs some updates. I think Apache Serf automagically handles
### finding OpenSSL, but we may need more docco here. and w.r.t
### zlib.
- The Serf library has support for SSL encryption by relying on the
+ The Apache Serf library has support for SSL encryption by relying on the
OpenSSL library.
- a. Using OpenSSL on the client through Serf
+ a. Using OpenSSL on the client through Apache Serf
- On Unix systems, to build Serf with OpenSSL, you need OpenSSL
+ On Unix systems, to build Apache Serf with OpenSSL, you need OpenSSL
installed on your system, and you must add "--with-ssl" as a
"./configure" parameter. If your OpenSSL installation is hard
- for Serf to find, you may need to use "--with-libs=/path/to/lib"
- in addition. In particular, on Red Hat (but not Fedora Core) it
- is necessary to specify "--with-libs=/usr/kerberos" for OpenSSL
- to be found. You can also specify a path to the zlib library
- using "--with-libs".
+ for Apache Serf to find, you may need to use
+ "--with-libs=/path/to/lib" in addition. In particular, on Red Hat
+ (but not Fedora Core) it is necessary to specify
+ "--with-libs=/usr/kerberos" for OpenSSL to be found. You can also
+ specify a path to the zlib library using "--with-libs".
Under Windows, you can specify the paths to these libraries by
passing the options --with-zlib and --with-openssl to gen-make.py.
@@ -334,7 +340,7 @@ I. INTRODUCTION
including instructions for building and packaging on both Unix
systems and Windows, at:
- http://www.openssl.org/
+ https://www.openssl.org/
7. Berkeley DB 4.X (OPTIONAL)
@@ -358,7 +364,7 @@ I. INTRODUCTION
You'll need Berkeley DB installed on your system. You can
get it from:
- http://www.oracle.com/technology/software/products/berkeley-db/index.html
+ http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
If you have Berkeley DB installed in a place not searched by default
for includes and libraries, add something like this:
@@ -393,7 +399,7 @@ I. INTRODUCTION
9. Apache Web Server 2.2.X or newer (OPTIONAL)
- (http://httpd.apache.org/download.cgi)
+ (https://httpd.apache.org/download.cgi)
The Apache httpd server is one of two methods to make your Subversion
repository available over a network - the other is a custom server
@@ -404,7 +410,7 @@ I. INTRODUCTION
is done: See section III for details.
- 10. Python 2.7 or newer (http://www.python.org/) (OPTIONAL)
+ 10. Python 2.7 or newer (https://www.python.org/) (OPTIONAL)
If you want to run "make check" or build from the latest source
under Unix/Windows as described in section II.B, II.E and III.D,
@@ -424,7 +430,7 @@ I. INTRODUCTION
12. SQLite (REQUIRED)
- Subversion requires SQLite version 3.7.12 or above. You can meet this
+ Subversion requires SQLite version 3.8.2 or above. You can meet this
dependency several ways:
* Use an SQLite amalgamation file.
* Specify an SQLite installation to use.
@@ -435,7 +441,7 @@ I. INTRODUCTION
--with-sqlite configure option. This file also ships with the Subversion
dependencies distribution, or you can download it from SQLite:
- http://www.sqlite.org/download.html
+ https://www.sqlite.org/download.html
13. pkg-config (Unix only, OPTIONAL)
@@ -521,6 +527,19 @@ I. INTRODUCTION
$ ./get-dep.sh gmock
+ 22. LZ4 (OPTIONAL)
+
+ Subversion uses LZ4 compression libary version r129 or above. Configure
+ will attempt to locate the system library by default using pkg-config
+ and known paths.
+
+ If it is installed in a non-standard location, then use:
+
+ --with-lz4=/path/to/liblz4
+
+ If configure should use the version bundled with the sources, use:
+ --with-lz4=internal
+
D. Documentation
The primary documentation for Subversion is the free book
@@ -542,7 +561,7 @@ II. INSTALLATION
Download the most recent distribution tarball from:
- http://subversion.apache.org/download/
+ https://subversion.apache.org/download/
Unpack it, and use the standard GNU procedure to compile:
@@ -674,28 +693,22 @@ II. INSTALLATION
D. Installing from a Zip or Installer File under Windows
- --------------------------------------------------------
+ -----------------------------------------------------
Of all the ways of getting a Subversion client, this is the
- easiest. Download a Zip (*.zip) or self-extracting installer
- (*-setup.exe) file from:
+ easiest. Download a Zip or self-extracting installer via:
- http://subversion.apache.org/packages#windows
+ https://subversion.apache.org/packages.html#windows
- For a Zip file, run your unzipping utility (WinZIP, ZipGenius,
- UltimateZIP, FreeZIP, whatever) and extract the DLLs and EXEs to
- a directory of your choice. Included in the download is the SVN
- client, the SVNADMIN administration tool, and the SVNLOOK
- reporting tool.
+ For a Zip file extract the DLLs and EXEs to a directory of your
+ choice. Included in the download are among other tools the SVN
+ client, the SVNADMIN administration tool and the SVNLOOK reporting
+ tool.
- Note that if you need support for non-English locales you'll have
- to set the APR_ICONV_PATH environment variable to the path of the
- iconv directory in the folder that contains the Subversion install.
+ You may want to add the bin directory in the Subversion folder to your
+ PATH environment variable so as to not have to use the full path when
+ running Subversion commands.
- You may also want to add the bin directory in the Subversion folder
- to your PATH environment variable so as to not have to use the full
- path when running Subversion commands.
-
To test the installation, open a DOS box (run either "cmd" or
"command" from the Start menu's "Run..." menu option), change to
the directory you installed the executables into, and run:
@@ -713,58 +726,41 @@ II. INSTALLATION
E.1 Prerequisites
- * Visual Studio 6 and service pack. It can be built with later versions
- of Visual Studio (Visual Studio.NET 2005-2015, Visual C++ Express
- 2005-2010, Visual Studio Express 2012-2013 and Visual Studio Community
- 2013-2015) but these instructions assume VS6.
- * A recent Windows SDK. (Not needed with Visual Studio 2005 and later)
- If you are using Visual Studio 6, you need the latest SDK which
- is compatible with VC6, which is the one from February 2003.
- You can get it from MSDN:
- https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/e1147034-9b0b-4494-a5bc-6dfebb6b7eb1/download-and-install-microsoft-platform-sdk-febuary-2003-last-version-with-vc6-support?forum=windowssdk
- * Python 2.7 or higher, downloaded from http://www.python.org/ which is
+ * Microsoft Visual Studio. Any recent (2005+) version containing the
+ Visual C++ component will work (E.g. Professional, Express, Community
+ Edition). Make sure you enable C++ support during setup.
+ * Python 2.7 or higher, downloaded from https://www.python.org/ which is
used to generate the project files.
Note that Python 3.x is not supported (yet).
- * Perl 5.8 or higher from http://www.activestate.com/
- * Awk (from http://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe) is
- needed to compile Apache or APR. Note that this is the actual awk
- program, not an installer - just rename it to awk.exe and it is
- ready to use.
+ * Perl 5.8 or higher from https://www.perl.org/get.html
+ * Awk (from https://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe) is
+ needed to compile Apache. Note that this is the actual awk program,
+ not an installer - just rename it to awk.exe and it is ready to use.
* Apache apr, apr-util, and optionally apr-iconv libraries, version
- 1.3 or later. Included in both the Subversion dependencies ZIP file
- and the Apache 2 source zip. If you are building from a Subversion
+ 1.3 or later (1.2 for apr-iconv). If you are building from a Subversion
checkout and have not downloaded Apache 2, then get these 3 libraries
- from http://www.apache.org/dist/apr/.
- * SQLite 3.7.12 or higher from http://www.sqlite.org/download.html
- * ZLib 1.2 or higher is required and is included in the Subversion
- dependencies zip file or can be obtained from http://www.zlib.net/
- * Either a Subversion client binary from http://subversion.apache.org/ to
- do the initial checkout of the Subversion source or the zip file
- source distribution. See the section "Bootstrapping from a Zip or
- Installer File under Windows" above for more.
- * A means of unpacking the files, e.g., WinZIP or similar.
+ from https://www.apache.org/dist/apr/.
+ * SQLite 3.8.2 or higher from https://www.sqlite.org/download.html
+ (3.8.11.1 or higher recommended)
+ * ZLib 1.2 or higher is required and can be obtained from
+ http://www.zlib.net/
+ * Either a Subversion client binary from
+ https://subversion.apache.org/packages.html to do the initial checkout
+ of the Subversion source or the zip file source distribution.
Additional Options
- * [Optional] Apache 2 source, downloaded from
- http://httpd.apache.org/download.cgi, these instructions assume
+ * [Optional] Apache Httpd 2 source, downloaded from
+ https://httpd.apache.org/download.cgi, these instructions assume
version 2.0.58. This is only needed for building the Subversion
server Apache modules. ### FIXME Apache 2.2 or greater required.
- * [Optional] Apache 2 msi install file, also from
- http://httpd.apache.org/download.cgi (required for running the
- tests). Only needed for testing the server dso modules and if
- you are using Visual Studio 6.
- Note that if you are not using Visual Studio 6 (and you want to
- run and test the server modules) then you must rebuild Apache
- from source -- do not use the stock MSI since mixing C runtime
- libraries is not supported.
- * [Optional] Berkeley DB for backend support of the server
- components -- versions 4.3.27 and 4.4.20 are available from
- http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=688
- as db-4.3.27-win32.zip and db-4.4.20-win32.zip.
+ * [Optional] Berkeley DB for backend support of the server components
+ are available from
+ http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index-082944.html
+ (Version 4.4.20 or in specific cases some higher version recommended)
For more information see Section I.C.7.
- * [Optional] Openssl 0.9.7f or higher can be obtained from
- http://www.openssl.org/source/openssl-0.9.7f.tar.gz
+ * [Optional] Openssl can be obtained from https://www.openssl.org/source/
+ * [Optional] NASM can be obtained from http://www.nasm.us/
* [Optional] A modified version of GNU libintl, called
svn-win32-libintl.zip, can be used for displaying localized
messages. Available at:
@@ -774,14 +770,11 @@ II. INSTALLATION
binaries from http://gnuwin32.sourceforge.net/. You'll need the
binaries (gettext-0.14.1-bin.zip) and dependencies
(gettext-0.14.1-dep.zip).
- * [Optional] An assembler, e.g., MASM32 from http://www.masm32.com/
- or nasm which is available from
- http://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D
E.2 Notes
- The Serf library supports secure connections with OpenSSL and
- on-the-wire compression with zlib. If you want to use the
+ The Apache Serf library supports secure connections with OpenSSL
+ and on-the-wire compression with zlib. If you want to use the
secure connections feature, you should pass the option
"--with-openssl" to the gen-make.py script. See Section I.C.6 for
more details.
@@ -802,35 +795,20 @@ II. INSTALLATION
installer to register environment variables or run VCVARS32.BAT
before building anything. If you are using a newer Visual Studio,
use the 'Visual Studio 20xx Command Prompt' on the Start menu.
- * Install and register a recent Windows Core SDK if you are using
- Visual Studio 6. This is a quote from the Microsoft February 2003
- SDK documentation:
-
- "To register the SDK bin, include, and library directories with
- Microsoft Visual Studio® version 6.0 and Visual Studio .NET,
- click Start, point to All Programs, point to Microsoft Platform
- SDK February 2003, point to Visual Studio Registration, and then
- click Register PSDK Directories with Visual Studio. This
- registration process places the SDK bin, include, and library
- directories at the beginning of the search paths, which ensures
- that the latest headers and libraries are used when building
- applications in the IDE. Note that for Visual Studio 6.0
- integration to succeed, Visual Studio 6.0 must run at least once
- before you select Register PSDK Directories with Visual
- Studio. Also note that when this option is run, the IDEs should
- not be running."
-
* Install Python and add it to your path
* Install Perl (it should add itself to the path)
+ ### Subversion doesn't need perl. Only some dependencies need it
+ (OpenSSL and some apr scripts)
* Copy AWK (awk95.exe) to awk.exe (e.g. SVN\awk\awk.exe) and add
the directory containing it (e.g. SVN\awk) to the path.
- * [Optional] Install Apache 2 using the msi file if you are going to test
- the server dso modules and are using Visual Studio 6. You must build
- and install it from source if you are not using Visual Studio 6 and
- want to build and/or test the server modules.
+ ### Subversion doesn't need awk. Only some dependencies need it
+ (some apr scripts)
+ * [Optional] Install NASM and add it to your path
+ ### Subversion doesn't need NASM. Only some dependencies need it
+ optionally (OpenSSL)
* [Optional] If you checked out Subversion from the repository and want
to build Subversion with http/https access support then install the
- serf sources into SVN\src-trunk\serf.
+ Apache Serf sources into SVN\src-trunk\serf.
* [Optional] If you want BDB backend support, extract the Berkeley DB
files into SVN\src-trunk\db4-win32. It's a good idea to add
SVN\src-trunk\db4-win32\bin to your PATH, so that Subversion can find
@@ -846,6 +824,7 @@ II. INSTALLATION
SVN\src-trunk\db4-win32\include, and all the import libraries to
SVN\src-trunk\db4-win32\lib. Again, the DLLs should be somewhere in
your path.
+ ### Just use --with-serf instead of the hardcoded path
* [Optional] If you want to build the server modules, extract Apache
source into SVN\httpd-2.x.x.
@@ -858,22 +837,22 @@ II. INSTALLATION
- Extract the apr, apr-util and apr-iconv directories from the
srclib folder in the Apache httpd source into SVN\apr,
SVN\apr-util, and SVN\apr-iconv respectively.
+ ### Just use --with-apr, etc. instead of the hardcoded paths
* Extract the ZLib sources into SVN\zlib if you are not using the zlib
included in the dependencies zip file.
- * [Optional] If you want secure connection (https) client support, or if
- you are building with enabled support for serf extract openssl into
- SVN\openssl-x.x.x
+ ### Just use --with-zlib instead of the hardcoded path
+ * [Optional] If you want secure connection (https) client support extract
+ OpenSSL into SVN\openssl
+ ### And pass the path to both serf and gen-make.py
* [Optional] If you want localized message support, extract
svn-win32-libintl.zip into SVN\svn-win32-libintl and extract
gettext-x.x.x-bin.zip and gettext-x.x.x-dep.zip into
SVN\gettext-x.x.x-bin.
- Add SVN\gettext-x.x.x-bin\bin to your path.
- * [Optional] Extract MASM32 (only the ML.EXE and ML.ERR files) into
- SVN\asm (or extract nasm into SVN\asm) and put it in your path.
- * Download the SQLite amalgemation from
- http://www.sqlite.org/download.html
- and extract it into SVN\sqlite-amalgemation.
- See I.C.12 for alternatives to using the amalgemation package.
+ Add SVN\gettext-x.x.x-bin\bin to your path.
+ * Download the SQLite amalgamation from
+ https://www.sqlite.org/download.html
+ and extract it into SVN\sqlite-amalgamation.
+ See I.C.12 for alternatives to using the amalgamation package.
E.4 Building the Binaries
@@ -890,7 +869,7 @@ II. INSTALLATION
C:>set VER=trunk
C:>set DIR=trunk
C:>set BUILD_ROOT=C:\SVN
- C:>set PYTHONDIR=C:\Python22
+ C:>set PYTHONDIR=C:\Python27
C:>set AWKDIR=C:\SVN\Awk
C:>set ASMDIR=C:\SVN\asm
C:>set SDKINC="C:\Program Files\Microsoft SDK\include"
@@ -901,9 +880,9 @@ II. INSTALLATION
C:>set INCLUDE=%SDKINC%;%INCLUDE%
C:>set LIB=%SDKLIB%;%LIB%
- OpenSSL
+ OpenSSL < 1.1.0
- C:>cd openssl-0.9.7f
+ C:>cd openssl
C:>perl Configure VC-WIN32
[*] C:>call ms\do_masm
C:>nmake -f ms\ntdll.mak
@@ -913,11 +892,23 @@ II. INSTALLATION
*Note: Use "call ms\do_nasm" if you have nasm instead of MASM, or
"call ms\do_ms" if you don't have an assembler.
+ Also if you are using OpenSSL >= 1.0.0 masm is no longer
+ supported. You will have to use do_nasm or do_ms in this case.
+ OpenSSL >= 1.1.0
+
+ C:>cd openssl
+ C:>perl Configure VC-WIN32
+ C:>nmake
+ C:>nmake test
+ C:>cd ..
+
Apache 2
This step is only required for building the server dso modules.
+ ### FIXME Apache 2.2 or greater required. Old build instructions for VC6.
+
C:>set APACHEDIR=C:\Program Files\Apache Group\Apache2
C:>msdev httpd-2.0.58\apache.dsw /MAKE "BuildBin - Win32 Release"
@@ -946,11 +937,11 @@ II. INSTALLATION
Note that you'd make sure to define ZLIB_WINAPI in the ZLib config
header and move the lib-file into the zlib root-directory.
- Serf
+ Apache Serf
- ### Section about serf might be required/useful to add.
- ### scons is required too and serf needs to be configured prior to be
- ### able to build Subversion using:
+ ### Section about Apache Serf might be required/useful to add.
+ ### scons is required too and Apache Serf needs to be configured prior to
+ ### be able to build Subversion using:
### scons APR=[PATH_TO_APR] APU=[PATH_TO_APU] OPENSSL=[PATH_TO_OPENSSL]
### ZLIB=[PATH_TO_ZLIB] PREFIX=[PATH_TO_SERF_DEST]
### scons check
@@ -967,28 +958,16 @@ II. INSTALLATION
the APR libraries; the options are --with-apr, --with-apr-util and
--with-apr-iconv.
* If you would like a debug build substitute Debug for Release in
- the msdev/msbuild commands.
+ the msbuild command.
* There have been rumors that Subversion on Win32 can be built
using the latest cygwin, you probably don't want the zip file source
distribution though. ymmv.
- * The /USEENV switch to msdev makes it take notice of the INCLUDE and
- LIB environment variables, it also makes it ignore its own lib and
- include settings so you need to have the Windows SDK lib and include
- directories in the LIB and INCLUDE environment variables. Do *not*
- use this switch when starting up the msdev Visual environment. If you
- wish to build in the Visual environment the SDK lib and include
- directories must be in the Tools/Options/Directories settings (if you
- followed the 'Register the SDK with Visual Studio 6' instructions
- above this has been done for you).
- * If you are using Visual Studio later than VC6 change -t dsw into
- -t vcproj and add the --vsnet-version=20xx option on the gen-make.py
- command.
- In this case you will also have to distribute the C runtime dll with
- the binaries. Also, since Apache/APR do not provide .vcproj files,
- you will need to convert the Apache/APR .dsp files to .vcproj files
- with Visual Studio before building -- just open the Apache .dsw file
- and answer 'Yes To All' when the conversion dialog pops up, or you
- can open the individual .dsp files and convert them one at a time.
+ * You will also have to distribute the C runtime dll with the binaries.
+ Also, since Apache/APR do not provide .vcproj files, you will need to
+ convert the Apache/APR .dsp files to .vcproj files with Visual Studio
+ before building -- just open the Apache .dsw file and answer 'Yes To
+ All' when the conversion dialog pops up, or you can open the individual
+ .dsp files and convert them one at a time.
The Apache/APR projects required by Subversion are:
apr-util\libaprutil.dsp, apr\libapr.dsp,
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list