You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2015/09/11 17:51:34 UTC
svn commit: r1702504 [1/19] - in /subversion/branches/reuse-ra-session: ./
build/ build/ac-macros/ build/generator/ build/generator/templates/
contrib/hook-scripts/ notes/ subversion/bindings/ctypes-python/csvn/ext/
subversion/bindings/javahl/native/ s...
Author: ivan
Date: Fri Sep 11 15:51:30 2015
New Revision: 1702504
URL: http://svn.apache.org/r1702504
Log:
On the reuse-ra-session branch: Sync with trunk up to r1702502.
Added:
subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/ReposVerifyCallback.cpp
- copied unchanged from r1702502, subversion/trunk/subversion/bindings/javahl/native/ReposVerifyCallback.cpp
subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/ReposVerifyCallback.h
- copied unchanged from r1702502, subversion/trunk/subversion/bindings/javahl/native/ReposVerifyCallback.h
subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ReposVerifyCallback.java
- copied unchanged from r1702502, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ReposVerifyCallback.java
subversion/branches/reuse-ra-session/subversion/libsvn_fs_base/fs_init.h
- copied unchanged from r1702502, subversion/trunk/subversion/libsvn_fs_base/fs_init.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/fs_init.h
- copied unchanged from r1702502, subversion/trunk/subversion/libsvn_fs_fs/fs_init.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/batch_fsync.c
- copied unchanged from r1702502, subversion/trunk/subversion/libsvn_fs_x/batch_fsync.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/batch_fsync.h
- copied unchanged from r1702502, subversion/trunk/subversion/libsvn_fs_x/batch_fsync.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/dag_cache.c
- copied unchanged from r1702502, subversion/trunk/subversion/libsvn_fs_x/dag_cache.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/dag_cache.h
- copied unchanged from r1702502, subversion/trunk/subversion/libsvn_fs_x/dag_cache.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/fs_init.h
- copied unchanged from r1702502, subversion/trunk/subversion/libsvn_fs_x/fs_init.h
subversion/branches/reuse-ra-session/subversion/libsvn_subr/cache-null.c
- copied unchanged from r1702502, subversion/trunk/subversion/libsvn_subr/cache-null.c
subversion/branches/reuse-ra-session/subversion/tests/cmdline/mod_authz_svn_tests.py
- copied unchanged from r1702502, subversion/trunk/subversion/tests/cmdline/mod_authz_svn_tests.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnfsfs_tests.py
- copied unchanged from r1702502, subversion/trunk/subversion/tests/cmdline/svnfsfs_tests.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/upgrade_tests_data/upgrade_1_0_with_externals.tar.bz2
- copied unchanged from r1702502, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_1_0_with_externals.tar.bz2
subversion/branches/reuse-ra-session/tools/client-side/svn-mergeinfo-normalizer/
- copied from r1702502, subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/
subversion/branches/reuse-ra-session/tools/dist/security/
- copied from r1702502, subversion/trunk/tools/dist/security/
Removed:
subversion/branches/reuse-ra-session/tools/client-side/detach.py
subversion/branches/reuse-ra-session/tools/dist/_gnupg.py
Modified:
subversion/branches/reuse-ra-session/ (props changed)
subversion/branches/reuse-ra-session/CHANGES
subversion/branches/reuse-ra-session/INSTALL
subversion/branches/reuse-ra-session/Makefile.in
subversion/branches/reuse-ra-session/autogen.sh
subversion/branches/reuse-ra-session/build.conf
subversion/branches/reuse-ra-session/build/ac-macros/apache.m4
subversion/branches/reuse-ra-session/build/ac-macros/serf.m4
subversion/branches/reuse-ra-session/build/ac-macros/swig.m4
subversion/branches/reuse-ra-session/build/find_python.sh
subversion/branches/reuse-ra-session/build/generator/gen_base.py
subversion/branches/reuse-ra-session/build/generator/gen_vcnet_vcproj.py
subversion/branches/reuse-ra-session/build/generator/gen_win.py
subversion/branches/reuse-ra-session/build/generator/gen_win_dependencies.py
subversion/branches/reuse-ra-session/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/reuse-ra-session/build/generator/templates/vcnet_vcxproj_filters.ezt
subversion/branches/reuse-ra-session/build/run_tests.py
subversion/branches/reuse-ra-session/build/transform_sql.py
subversion/branches/reuse-ra-session/configure.ac
subversion/branches/reuse-ra-session/contrib/hook-scripts/check-mime-type.pl
subversion/branches/reuse-ra-session/notes/svnsync.txt
subversion/branches/reuse-ra-session/subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py
subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/JNIUtil.h
subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/SVNRepos.cpp
subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/SVNRepos.h
subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
subversion/branches/reuse-ra-session/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNReposTests.java
subversion/branches/reuse-ra-session/subversion/bindings/swig/INSTALL
subversion/branches/reuse-ra-session/subversion/bindings/swig/include/svn_types.swg
subversion/branches/reuse-ra-session/subversion/bindings/swig/python/svn/core.py
subversion/branches/reuse-ra-session/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h
subversion/branches/reuse-ra-session/subversion/bindings/swig/svn_client.i
subversion/branches/reuse-ra-session/subversion/include/private/svn_atomic.h
subversion/branches/reuse-ra-session/subversion/include/private/svn_cache.h
subversion/branches/reuse-ra-session/subversion/include/private/svn_dep_compat.h
subversion/branches/reuse-ra-session/subversion/include/private/svn_io_private.h
subversion/branches/reuse-ra-session/subversion/include/private/svn_mutex.h
subversion/branches/reuse-ra-session/subversion/include/private/svn_ra_svn_private.h
subversion/branches/reuse-ra-session/subversion/include/private/svn_subr_private.h
subversion/branches/reuse-ra-session/subversion/include/private/svn_temp_serializer.h
subversion/branches/reuse-ra-session/subversion/include/private/svn_wc_private.h
subversion/branches/reuse-ra-session/subversion/include/svn_client.h
subversion/branches/reuse-ra-session/subversion/include/svn_error_codes.h
subversion/branches/reuse-ra-session/subversion/include/svn_fs.h
subversion/branches/reuse-ra-session/subversion/include/svn_io.h
subversion/branches/reuse-ra-session/subversion/include/svn_ra_svn.h
subversion/branches/reuse-ra-session/subversion/include/svn_repos.h
subversion/branches/reuse-ra-session/subversion/include/svn_string.h
subversion/branches/reuse-ra-session/subversion/include/svn_user.h
subversion/branches/reuse-ra-session/subversion/libsvn_auth_kwallet/kwallet.cpp
subversion/branches/reuse-ra-session/subversion/libsvn_client/copy.c
subversion/branches/reuse-ra-session/subversion/libsvn_client/diff.c
subversion/branches/reuse-ra-session/subversion/libsvn_client/export.c
subversion/branches/reuse-ra-session/subversion/libsvn_client/externals.c
subversion/branches/reuse-ra-session/subversion/libsvn_client/merge.c
subversion/branches/reuse-ra-session/subversion/libsvn_client/mtcc.c
subversion/branches/reuse-ra-session/subversion/libsvn_client/patch.c
subversion/branches/reuse-ra-session/subversion/libsvn_client/ra.c
subversion/branches/reuse-ra-session/subversion/libsvn_client/resolved.c
subversion/branches/reuse-ra-session/subversion/libsvn_client/upgrade.c
subversion/branches/reuse-ra-session/subversion/libsvn_diff/parse-diff.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs/fs-loader.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs/fs-loader.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_base/revs-txns.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/cached_data.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/caching.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/fs.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/fs.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/hotcopy.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/hotcopy.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/id.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/index.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/load-index.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/lock.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/pack.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/temp_serializer.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/transaction.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/util.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/verify.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/ (props changed)
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/cached_data.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/cached_data.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/caching.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/changes.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/changes.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/dag.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/dag.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/fs.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/fs.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/fs_id.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/fs_x.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/fs_x.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/hotcopy.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/hotcopy.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/index.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/index.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/lock.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/lock.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/low_level.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/low_level.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/noderevs.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/noderevs.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/pack.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/pack.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/recovery.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/recovery.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/reps.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/reps.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/rev_file.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/rev_file.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/revprops.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/revprops.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/string_table.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/string_table.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/temp_serializer.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/temp_serializer.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/transaction.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/transaction.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/tree.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/tree.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/util.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/util.h
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/verify.c
subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/verify.h
subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/serf.c
subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/update.c
subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/util.c
subversion/branches/reuse-ra-session/subversion/libsvn_ra_svn/client.c
subversion/branches/reuse-ra-session/subversion/libsvn_ra_svn/cram.c
subversion/branches/reuse-ra-session/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/reuse-ra-session/subversion/libsvn_ra_svn/deprecated.c
subversion/branches/reuse-ra-session/subversion/libsvn_ra_svn/editorp.c
subversion/branches/reuse-ra-session/subversion/libsvn_ra_svn/internal_auth.c
subversion/branches/reuse-ra-session/subversion/libsvn_ra_svn/marshal.c
subversion/branches/reuse-ra-session/subversion/libsvn_ra_svn/ra_svn.h
subversion/branches/reuse-ra-session/subversion/libsvn_repos/deprecated.c
subversion/branches/reuse-ra-session/subversion/libsvn_repos/dump.c
subversion/branches/reuse-ra-session/subversion/libsvn_repos/fs-wrap.c
subversion/branches/reuse-ra-session/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/reuse-ra-session/subversion/libsvn_repos/load.c
subversion/branches/reuse-ra-session/subversion/libsvn_repos/log.c
subversion/branches/reuse-ra-session/subversion/libsvn_repos/rev_hunt.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/atomic.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/auth.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/auth.h
subversion/branches/reuse-ra-session/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/compress.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/config.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/config_auth.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/config_file.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/deprecated.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/dirent_uri.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/io.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/mergeinfo.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/mutex.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/stream.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/subst.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/sysinfo.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/temp_serializer.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/user.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/x509parse.c
subversion/branches/reuse-ra-session/subversion/libsvn_subr/xml.c
subversion/branches/reuse-ra-session/subversion/libsvn_wc/adm_crawler.c
subversion/branches/reuse-ra-session/subversion/libsvn_wc/conflicts.c
subversion/branches/reuse-ra-session/subversion/libsvn_wc/copy.c
subversion/branches/reuse-ra-session/subversion/libsvn_wc/node.c
subversion/branches/reuse-ra-session/subversion/libsvn_wc/update_editor.c
subversion/branches/reuse-ra-session/subversion/libsvn_wc/upgrade.c
subversion/branches/reuse-ra-session/subversion/libsvn_wc/wc_db.c
subversion/branches/reuse-ra-session/subversion/libsvn_wc/wc_db.h
subversion/branches/reuse-ra-session/subversion/libsvn_wc/wc_db_pristine.c
subversion/branches/reuse-ra-session/subversion/libsvn_wc/workqueue.c
subversion/branches/reuse-ra-session/subversion/mod_authz_svn/mod_authz_svn.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/activity.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/dav_svn.h
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/deadprops.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/lock.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/merge.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/reports/dated-rev.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/reports/deleted-rev.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/reports/file-revs.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/reports/get-location-segments.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/reports/get-locations.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/reports/get-locks.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/reports/inherited-props.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/reports/log.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/reports/mergeinfo.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/reports/replay.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/reports/update.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/repos.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/util.c
subversion/branches/reuse-ra-session/subversion/mod_dav_svn/version.c
subversion/branches/reuse-ra-session/subversion/svn/cl-conflicts.c
subversion/branches/reuse-ra-session/subversion/svn/cl-conflicts.h
subversion/branches/reuse-ra-session/subversion/svn/cl.h
subversion/branches/reuse-ra-session/subversion/svn/conflict-callbacks.c
subversion/branches/reuse-ra-session/subversion/svn/help-cmd.c
subversion/branches/reuse-ra-session/subversion/svn/info-cmd.c
subversion/branches/reuse-ra-session/subversion/svn/lock-cmd.c
subversion/branches/reuse-ra-session/subversion/svn/status.c
subversion/branches/reuse-ra-session/subversion/svn/svn.c
subversion/branches/reuse-ra-session/subversion/svn/unlock-cmd.c
subversion/branches/reuse-ra-session/subversion/svn/util.c
subversion/branches/reuse-ra-session/subversion/svnadmin/svnadmin.c
subversion/branches/reuse-ra-session/subversion/svndumpfilter/svndumpfilter.c
subversion/branches/reuse-ra-session/subversion/svnfsfs/load-index-cmd.c
subversion/branches/reuse-ra-session/subversion/svnfsfs/stats-cmd.c
subversion/branches/reuse-ra-session/subversion/svnrdump/load_editor.c
subversion/branches/reuse-ra-session/subversion/svnserve/cyrus_auth.c
subversion/branches/reuse-ra-session/subversion/svnserve/serve.c
subversion/branches/reuse-ra-session/subversion/svnserve/svnserve.c
subversion/branches/reuse-ra-session/subversion/svnsync/svnsync.c
subversion/branches/reuse-ra-session/subversion/tests/cmdline/README
subversion/branches/reuse-ra-session/subversion/tests/cmdline/authz_tests.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/davautocheck.sh
subversion/branches/reuse-ra-session/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
subversion/branches/reuse-ra-session/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
subversion/branches/reuse-ra-session/subversion/tests/cmdline/lock_tests.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/merge_automatic_tests.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/mergeinfo_tests.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/move_tests.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/patch_tests.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/prop_tests.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/revert_tests.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnmucc_tests.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/__init__.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/actions.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/main.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/verify.py
subversion/branches/reuse-ra-session/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.c
subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c
subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_x/ (props changed)
subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
subversion/branches/reuse-ra-session/subversion/tests/libsvn_ra/ra-test.c
subversion/branches/reuse-ra-session/subversion/tests/libsvn_repos/dump-load-test.c
subversion/branches/reuse-ra-session/subversion/tests/libsvn_repos/repos-test.c
subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/cache-test.c
subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/config-test.c
subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/config-test.cfg
subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/dirent_uri-test.c
subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/io-test.c
subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/stream-test.c
subversion/branches/reuse-ra-session/subversion/tests/libsvn_wc/wc-queries-test.c
subversion/branches/reuse-ra-session/tools/buildbot/slaves/bb-openbsd/svnbuild.sh
subversion/branches/reuse-ra-session/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
subversion/branches/reuse-ra-session/tools/buildbot/slaves/svn-sparc-solaris/svncheck.sh
subversion/branches/reuse-ra-session/tools/buildbot/slaves/svn-x64-macosx/ (props changed)
subversion/branches/reuse-ra-session/tools/buildbot/slaves/svn-x64-macosx/setenv.sh
subversion/branches/reuse-ra-session/tools/client-side/bash_completion
subversion/branches/reuse-ra-session/tools/dev/fsfs-access-map.c
subversion/branches/reuse-ra-session/tools/dev/scramble-tree.py
subversion/branches/reuse-ra-session/tools/dev/unix-build/Makefile.svn
subversion/branches/reuse-ra-session/tools/dist/backport.pl
subversion/branches/reuse-ra-session/tools/dist/rat-excludes
subversion/branches/reuse-ra-session/tools/dist/release.py
subversion/branches/reuse-ra-session/tools/dist/templates/rc-news.ezt
subversion/branches/reuse-ra-session/tools/dist/templates/rc-release-ann.ezt
subversion/branches/reuse-ra-session/tools/dist/templates/stable-news.ezt
subversion/branches/reuse-ra-session/tools/dist/templates/stable-release-ann.ezt
subversion/branches/reuse-ra-session/win-tests.py
Propchange: subversion/branches/reuse-ra-session/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 11 15:51:30 2015
@@ -1,4 +1,4 @@
-/subversion/branches/1.10-cache-improvements:1675666-1677522,1679679,1679681,1679859
+/subversion/branches/1.10-cache-improvements:1669168-1694487
/subversion/branches/1.5.x-r30215:870312
/subversion/branches/1.7.x-fs-verify:1146708,1161180
/subversion/branches/1.9-cache-improvements:1678948-1679863
@@ -23,6 +23,7 @@
/subversion/branches/fsfs-lock-many:1571740-1577217
/subversion/branches/fsfs-pack:873717-874575
/subversion/branches/fsx:1507845-1509914
+/subversion/branches/fsx-1.10:1658219-1694500
/subversion/branches/fsx-id:1645603-1649011
/subversion/branches/gnome-keyring:870558-871410
/subversion/branches/gpg-agent-password-store:1005036-1150766
@@ -64,6 +65,7 @@
/subversion/branches/performance:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985673,985695,985697,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,1029339-1029340,1029342,10
29344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
/subversion/branches/pin-externals:1643757-1659392
/subversion/branches/py-tests-as-modules:956579-1033052
+/subversion/branches/ra-svn-tuning:1658201-1694489
/subversion/branches/ra_serf-digest-authn:875693-876404
/subversion/branches/reintegrate-improvements:873853-874164
/subversion/branches/remote-only-status:1581845-1586090
@@ -74,6 +76,7 @@
/subversion/branches/svn-auth-x509:1603509-1655900
/subversion/branches/svn-info-detail:1660035-1662618
/subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
+/subversion/branches/svn-mergeinfo-normalizer:1642232-1695991
/subversion/branches/svn-patch-improvements:918519-934609
/subversion/branches/svn_mutex:1141683-1182099
/subversion/branches/svnpatch-diff:865738-876477
@@ -91,4 +94,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1501802-1686172
+/subversion/trunk:1501802-1702502
Propchange: subversion/branches/reuse-ra-session/
------------------------------------------------------------------------------
tsvn:projectlanguage = 1033
Modified: subversion/branches/reuse-ra-session/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/CHANGES?rev=1702504&r1=1702503&r2=1702504&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/CHANGES (original)
+++ subversion/branches/reuse-ra-session/CHANGES Fri Sep 11 15:51:30 2015
@@ -1,5 +1,35 @@
+Version 1.9.1
+(02 Sep 2015, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.1
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * Fix crash with GPG-agent with non-canonical $HOME (r1691928, issue #4584)
+ * Fix checkout errors with svn+ssh:// on Windows (r1696222, r1696225)
+ * svn: expose expat and zlib versions in svn --version --verbose (r1696387, r1697664)
+ * svn: improve help text for 'svn info --show-item' (r1698106)
+
+ - Server-side bugfixes:
+ * svnserve: fixed minor typo in help text (r1694023)
+ * Enable caching with memcached on Windows (1674626, r1674785)
+ * Fix an error leak in FSFS verification (r1693886)
+ * Fix incomplete membuffer cache initialization (r1695022)
+ * svnfsfs: fix some bugs and inconsistencies in load-index (r1697381 et al.)
+
+ - Client-side and server-side bugfixes:
+ * Fix alignment fault in ra_svn on 32 bit SPARC machines (r1697914)
+
+ - Bindings bugfixes:
+ * Fix memory corruption in copy source SWIG bindings (r1694929)
+
+ Developer-visible changes:
+ * Better configure-time detection of httpd version and authz fix (r1687304 et al.)
+ * Correct a parameter name in svn_repos_get_fs_build_parser5 (r1694194)
+ * Resolve circular library reference in libsvn_fs_x (r1696695)
+ * Fix Unix build on systems without GPG agent (r1694481, r1697824)
+
Version 1.9.0
-(?? ??? 2015, from /branches/1.9.x)
+(5 Aug 2015, from /branches/1.9.x)
http://svn.apache.org/repos/asf/subversion/tags/1.9.0
User-visible changes:
@@ -9,7 +39,6 @@ http://svn.apache.org/repos/asf/subversi
- Major new features:
* fsfs: new format 7 with more efficient on-disk layout (r1547045 et al)
- * resolve: improve interactive conflict resolution menus
* blame: support showing prospective as well as previous changes
* info: support printing of individual values with --show-item (r1662620)
* svn auth: new subcommand to manage cached credentials and certs
@@ -137,7 +166,6 @@ http://svn.apache.org/repos/asf/subversi
* svnfsfs: new expert tool (r1594860)
* mod_dav_svn: allow server admin to GET the FSFS global cache stats
(r1595160)
- * patch: support of svn:mergeinfo (issue #3747)
* diff: support git-like binary file diffs with '--git' (r1599552)
* diff: support arbitrary context size for internal diff tool with
'-U' option (r1603847, 1603871)
@@ -167,6 +195,7 @@ http://svn.apache.org/repos/asf/subversi
* svnadmin setrevprop: add '--transaction' option (r1631435)
* svnadmin delrevprop: new subcommand (1592723)
* svnadmin verify: validate the index data against checksums (r1631598)
+ * svnadmin verify: new option '--metadata-only' (r1593753)
* cp: improve performance of local copies (r1632284, et al)
* fsfs: speed up operations that use revision properties (r1634875,
r1634879)
@@ -175,8 +204,7 @@ http://svn.apache.org/repos/asf/subversi
* patch: improve command to be more capable as compared to GNU patch
(issue #4533)
* limit server caches to avoid running out of memory if server admin
- configured caches largely then they can possibly be on the platform
- (r1645572)
+ configured caches larger than supported by the platform (r1645572)
* mod_authz_svn: log implicit read access failures with INFO log level;
Explicit read access failures are still logged with ERROR log level
(r1653032)
@@ -196,6 +224,7 @@ http://svn.apache.org/repos/asf/subversi
* warn when the '--config-option' FILE:SECTION:OPTION combination may
be invalid. (r1674301 et al)
* ensure full key matching in membuffer cache (r1678950 et al)
+ * mod_dav_svn: expose cache statistics via HTTP (r1595160)
- Client-side bugfixes:
* export: fix problem exporting symlinks on windows (r1476093)
@@ -306,6 +335,7 @@ http://svn.apache.org/repos/asf/subversi
* merge: raise a tree conflict on root of obstructing dir (r1666690)
* cp: fix 'svn cp ^/A/D/H@1 ^/A' to properly create A (r1674455, r1674456)
* status: fix incorrect output with file externals (issue #4580)
+ * merge: fix part of issue #4582 (r1686175, r1687029, r1688258)
- Server-side bugfixes:
* svnserve: don't ignore socket initialization errors (r1544253)
@@ -333,7 +363,6 @@ http://svn.apache.org/repos/asf/subversi
* svnserve: fix potential integer overflow in Cyrus SASL support (r1570434)
* bdb: fix potential integer overflow and underflow (r1570701)
* bdb: prevent silent propogation of some corruption (r1570778)
- * svnadmin verify: new option '--metadata-only' (r1593753)
* svnadmin hotcopy: do not corrupt db/current contents when copying old
FSFS repos (r1603485)
* svnadmin hotcopy: don't produce broken copies when a concurrent pack
@@ -390,6 +419,9 @@ http://svn.apache.org/repos/asf/subversi
* fsfs: fix 'EOF found' error when reading repo (issue #4577)
* svnadmin freeze: unlock rep-cache.db as part of unfreezing
(r1679169, r1679287)
+ * fsfs: improve stability in the presence of power or network
+ disk failures during 'svnadmin pack' (r1683378)
+ * detect invalid svndiff data earlier (r1684077)
- Client-side and server-side bugfixes:
* use less memory when retrieving extension from filename (r1548480)
@@ -443,9 +475,11 @@ http://svn.apache.org/repos/asf/subversi
* bash_completion: stop offering deprecated options (r1662291)
* bash_completion: add '--show-item' and '--no-newline' (r1662622)
* svnbench: add null-blame command (r1673785, r1673803, r1674015)
+ * svnbench: install with default 'make install' (r1685085)
Developer-visible changes:
- General:
+ * require Python 2.7+ for development and testing (r1691712, r1691713, r1692448)
* include symbolic names for error codes in maintainer mode (r1467643)
* include symbolic names for warning codes in maintainer mode (r1469855)
* support YouCompleteMe vim plugin (r1476374 et al)
@@ -513,11 +547,14 @@ http://svn.apache.org/repos/asf/subversi
* fix bugs and performance issues using svn_wc_walk_entries3() (r1661110)
* support using Python 3 for building (r1661247)
* don't add -lstdc++ on FreeBSD 10 (r1662329)
- * add build support for Visual Studio 2015 (r1663183, r1663184)
+ * add build support for Visual Studio 2015 (r1663183, r1663184, r1689721 et al.)
* fix test failures when running from a directory whose name contains
characters that must be escaped when used in a URL. (r1664997)
* fix breakage of the serf ra session with svn_ra_get_dir2() and
svn_ra_get_log2(). (r1665213, r1665259, r1665609)
+ * resolve a race condition in some test suite cleanup code (r1683303)
+ * fix some tests on non-US default locale on Windows (r1684034)
+ * document the meaning of "XFAIL" for users building from source (r1683071)
- API changes:
* new RA callbacks for managing ra_svn tunnels:
@@ -644,6 +681,7 @@ http://svn.apache.org/repos/asf/subversi
* svn_ra_get_file_revs2() now handles SVN_INVALID_REVNUM as HEAD (r1660463)
* new API svn_error_quick_wrapf() (r1662668)
* new API svn_fs_node_has_props() (r1673170, r1673172, r1673692, r1673746)
+ * new API svn_repos_verify_fs3() (r1492651 ... r1687769)
- Bindings:
* javahl: add support for the RA layer (r1494650 et al)
@@ -720,7 +758,43 @@ http://svn.apache.org/repos/asf/subversi
with newer versions of SWIG (1675149)
* javahl: requires Java 1.6 (r1677003)
* javahl: on OS X use /usr/libexec/java_home to find the JDK (r1675774)
+ * javahl: allow compiling with a C++11 compiler (r1684412)
+
+
+Version 1.8.14
+(5 Aug 2015, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.14
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * document svn:autoprops (r1678494 et al.)
+ * cp: fix 'svn cp ^/A/D/H@1 ^/A' to properly create A (r1674455, r1674456)
+ * resolve: improve conflict prompts for binary files (r1667228 et al.)
+ * ls: improve performance of '-v' on tag directories (r1673153)
+ * improved Sqlite 3.8.9 query performance regression on externals (r1672295 et al.)
+ * fixed issue #4580: 'svn -v st' on file externals reports "?" instead
+ of user and revision after 'svn up' (r1680242)
+
+ - Server-side bugfixes:
+ * mod_authz_svn: do not leak information in mixed anonymous/authenticated
+ httpd (dav) configurations (CVE-2015-3184)
+ * do not leak paths that were hidden by path-based authz (CVE-2015-3187)
+ * mod_dav_svn: do not ignore skel parsing errors (r1658168)
+ * detect invalid svndiff data earlier (r1684077)
+ * prevent possible repository corruption on power/disk failures (r1680819)
+ * fixed issue #4577: Read error with nodes whose DELTA chain starts with
+ a PLAIN rep (r1676667, r1677267)
+ * fixed issue #4531: server-side copy (over dav) is slow and uses
+ too much memory (r1674627)
+
+ Developer-visible changes:
+ - General:
+ * support building on Windows with Visual Studio 2015 (r1692785)
+ * avoid failing some tests on versions of Python with a very old sqlite (r1674522)
+ * fix Ruby tests so they don't use the users real configuration (r1597884)
+ - Bindings:
+ * swig-pl: fix some stack memory problems (r1668618, 1671388)
Version 1.8.13
(31 Mar 2015, from /branches/1.8.x)
@@ -1555,6 +1629,36 @@ http://svn.apache.org/repos/asf/subversi
* add missing API functions to JavaHL bindings (issue #4326)
* fix some reference counting bugs in swig-py bindings (r1464899, r1466524)
+Version 1.7.22
+(12 Aug 2015, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.22
+
+ Developer-visible changes:
+ - General:
+ * fix the regression test suite which was broken in 1.7.21 (r1694012)
+
+Version 1.7.21
+(5 Aug 2015, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.21
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * cp: fix 'svn cp ^/A/D/H@1 ^/A' to properly create A (r1674455, r1674456)
+ * fix issue #4551: svnrdump load commits wrong properties, or fails, on a
+ non-deltas dumpfile (r1652182 et al.)
+
+ - Server-side bugfixes:
+ * mod_authz_svn: do not leak information in mixed anonymous/authenticated
+ httpd (dav) configurations (CVE-2015-3184)
+ * do not leak paths that were hidden by path-based authz (CVE-2015-3187)
+ * fix 'svnadmin recover' for pre-1.4 FSFS repositories (r1561419)
+
+ Developer-visible changes:
+ - General:
+ * support building on Windows with Visual Studio 2012, 2013 and 2015 (r1687158, r1692783)
+
+ - Bindings:
+ * swig-pl: fix some stack memory problems (r1668618, 1671388)
Version 1.7.20
(31 Mar 2015, from /branches/1.7.x)
Modified: subversion/branches/reuse-ra-session/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/INSTALL?rev=1702504&r1=1702503&r2=1702504&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/INSTALL (original)
+++ subversion/branches/reuse-ra-session/INSTALL Fri Sep 11 15:51:30 2015
@@ -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,7 +110,7 @@ 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.
@@ -146,7 +146,7 @@ I. INTRODUCTION
Subversion contains optional support for storing passwords in
KWallet (KDE 4) or GNOME Keyring.
- * libmagic
+ * libmagic (OPTIONAL)
If the libmagic library is detected at compile time,
it will be used to determine mime-types of binary files
@@ -295,7 +295,7 @@ I. INTRODUCTION
compression. Most Unix systems have libz pre-installed, but
if you need it, you can get it from
- http://www.zlib.net
+ http://www.zlib.net/
3. autoconf 2.59 or newer (Unix only)
@@ -313,11 +313,11 @@ I. INTRODUCTION
newer. The autogen.sh script knows about that.
- 5. Serf library 1.2.1 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
@@ -327,36 +327,36 @@ 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.
- c. Using OpenSSL on the Apache server
+ b. Using OpenSSL on the Apache server
You can also add support for these features to an Apache httpd
server to be used for Subversion using the same support libraries.
@@ -446,14 +446,16 @@ I. INTRODUCTION
is done: See section III for details.
- 10. Python 2.5 or newer (http://www.python.org/) (OPTIONAL)
+ 10. Python 2.7 or newer (http://www.python.org/) (OPTIONAL)
If you want to run "make check" or build from the latest source
- under Unix as described in section II.B and III.D, install
- Python 2.5 or higher on your system. The majority of the test
- suite is written in Python, as is part of Subversion's build
+ under Unix/Windows as described in section II.B, II.E and III.D,
+ install Python 2.7 or higher on your system. The majority of the
+ test suite is written in Python, as is part of Subversion's build
system.
+ Note that Python 3.x is not supported and most likely won't work.
+
11. Perl 5.8 or newer (Windows only) (OPTIONAL)
@@ -464,8 +466,8 @@ I. INTRODUCTION
12. SQLite (REQUIRED)
- Subversion 1.8 requires SQLite version 3.7.12 or above. You can meet
- this dependency several ways:
+ Subversion requires SQLite version 3.7.12 or above. You can meet this
+ dependency several ways:
* Use an SQLite amalgamation file.
* Specify an SQLite installation to use.
* Let Subversion find an installed SQLite.
@@ -754,15 +756,17 @@ II. INSTALLATION
E.1 Prerequisites
* Visual Studio 6 and service pack. It can be built with later versions
- of Visual Studio (Visual Studio.NET 2002, 2003, 2005, 2008 and Visual
- C++ Express 2005, 2008) but these instructions assume VS6.
+ 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.
+ is compatible with VC6, which is the one from February 2003.
You can get it from MSDN:
- http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdk-full.htm
- * Python 2.5 or higher, downloaded from http://www.python.org/ which is
+ 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
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
@@ -773,8 +777,9 @@ II. INSTALLATION
and the Apache 2 source zip. 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.org
+ 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
@@ -799,7 +804,7 @@ II. INSTALLATION
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.
- For more information see Section I.5.
+ 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] A modified version of GNU libintl, called
@@ -817,10 +822,10 @@ II. INSTALLATION
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.11 for
+ "--with-openssl" to the gen-make.py script. See Section I.C.6 for
more details.
E.3 Preparation
@@ -838,7 +843,7 @@ II. INSTALLATION
* Install Visual Studio Environment. You either have to tell the
installer to register environment variables or run VCVARS32.BAT
before building anything. If you are using a newer Visual Studio,
- use the 'Visual Studio 200x Command Prompt' on the Start menu.
+ 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:
@@ -861,14 +866,15 @@ II. INSTALLATION
* Install Perl (it should add itself to the path)
* 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.
- * 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
+ * [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.
- * If you checked out Subversion from the repository then install the serf
- sources into SVN\src-trunk\serf.
- * If you want BDB backend support, extract the Berkeley DB files
- into SVN\src-trunk\db4-win32. It's a good idea to add
+ * [Optional] If you checked out Subversion from the repository and want
+ to build Subversion with http/https access support then install the
+ 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
the Berkeley DB DLLs.
@@ -883,8 +889,8 @@ II. INSTALLATION
SVN\src-trunk\db4-win32\lib. Again, the DLLs should be somewhere in
your path.
- * If you want to build the server modules, extract Apache source into
- SVN\httpd-2.x.x.
+ * [Optional] If you want to build the server modules, extract Apache
+ source into SVN\httpd-2.x.x.
* If you are building from a checkout of Subversion, and you are NOT
building Apache, then you will need the APR libraries. Depending
on how you got your version of APR, either:
@@ -896,14 +902,19 @@ II. INSTALLATION
SVN\apr-util, and SVN\apr-iconv respectively.
* Extract the ZLib sources into SVN\zlib if you are not using the zlib
included in the dependencies zip file.
- * If you want secure connection (https) client support, extract openssl
- into SVN\openssl-x.x.x
- * 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.
+ * [Optional] If you want secure connection (https) client support extract
+ openssl into SVN\openssl-x.x.x
+ * [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.
E.4 Building the Binaries
@@ -919,14 +930,14 @@ II. INSTALLATION
C:>set VER=trunk
C:>set DIR=trunk
- C:>set DRIVE=C
+ C:>set BUILD_ROOT=C:\SVN
C:>set PYTHONDIR=C:\Python22
C:>set AWKDIR=C:\SVN\Awk
C:>set ASMDIR=C:\SVN\asm
- C:>set SDKINC=C:\Program Files\Microsoft SDK\include
- C:>set SDKLIB=C:\Program Files\Microsoft SDK\lib
+ C:>set SDKINC="C:\Program Files\Microsoft SDK\include"
+ C:>set SDKLIB="C:\Program Files\Microsoft SDK\lib"
C:>set GETTEXTBIN=C:\SVN\gettext-0.14.1-bin\bin
- C:>PATH=%PATH%;%DRIVE%:\SVN\src-%DIR%\db4-win32;%ASMDIR%;
+ C:>PATH=%PATH%;%BUILD_ROOT%\src-%DIR%\db4-win32;%ASMDIR%;
%PYTHONDIR%;%AWKDIR%;%GETTEXTBIN%
C:>set INCLUDE=%SDKINC%;%INCLUDE%
C:>set LIB=%SDKLIB%;%LIB%
@@ -943,6 +954,8 @@ 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.
Apache 2
@@ -959,6 +972,41 @@ II. INSTALLATION
C:>set APACHEDIR=C:\Program Files\Apache Group\Apache2
C:>msdev httpd-2.0.58\apache.dsw /MAKE "BuildBin - Win32 Release"
+ APR
+
+ If you downloaded APR / APR-UTIL / APR_ICONV by source, you will have to
+ build these libraries first.
+ Building these libraries on Windows is straight forward and in most cases
+ as simple as issuing these two commands:
+
+ C:>nmake -f Makefile.win
+ C:>nmake -f Makefile.win install
+
+ Please refere to the build instructions provided by the library source
+ for actual build instructions.
+
+ ZLib
+
+ If you downloaded the zlib source, you will have to build ZLib first.
+ Building ZLib using Visual Studio should be quite simple. Just open the
+ appropriate solution and build the project zlibstat using the IDE.
+
+ Please refere to the build instructions provided by the library source
+ for actual build instructions.
+
+ 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.
+
+ Apache Serf
+
+ ### 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
+ ### scons install
+
Subversion
Things to note:
@@ -970,7 +1018,7 @@ 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 commands.
+ the msdev/msbuild commands.
* 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.
@@ -983,8 +1031,9 @@ II. INSTALLATION
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 .NET change -t dsw into -t vcproj and
- add the --vsnet-version=200x option on the gen-make.py command.
+ * 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
@@ -1015,12 +1064,13 @@ II. INSTALLATION
C:>msdev subversion_msvc.dsw /USEENV /MAKE "__ALL_TESTS__ - Win32 Release"
C:>cd ..
- Or, with Visual C++.NET 2002, 2003, 2005:
+ Or, with Visual C++.NET 2005 or C++ Express 2005:
C:>devenv subversion_vcnet.sln /build "Release" /project "__ALL_TESTS__"
C:>cd ..
- Or, with Visual C++ Express 2005:
+ Or, with Visual C++.NET 2008+, C++ Express 2008+, Studio Express 2012+ or
+ Studio Community 2013+:
C:>msbuild subversion_vcnet.sln /t:__ALL_TESTS__ /p:Configuration=Release
C:>cd ..
@@ -1066,7 +1116,7 @@ II. INSTALLATION
Then run the client tests:
- C:>PATH=%DRIVE%:\SVN\svn-win32-%VER%\bin;%PATH%
+ C:>PATH=%BUILD_ROOT%\svn-win32-%VER%\bin;%PATH%
C:>cd src-%DIR%
C:>python win-tests.py -c -r -v
@@ -1171,7 +1221,7 @@ III. BUILDING A SUBVERSION SERVER
line. Make sure this is the same db as the one Subversion uses.
This note assumes you have installed Berkeley DB 4.2.52
at its default locations. For more info about the db requirement,
- see section I.5.
+ see section I.C.7.
You may also want to include other modules in your build. Add
--enable-ssl to turn on SSL support, and --enable-deflate to turn on
Modified: subversion/branches/reuse-ra-session/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/Makefile.in?rev=1702504&r1=1702503&r2=1702504&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/Makefile.in (original)
+++ subversion/branches/reuse-ra-session/Makefile.in Fri Sep 11 15:51:30 2015
@@ -584,7 +584,7 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
$$flags \
'$(abs_srcdir)' '$(abs_builddir)' $(TESTS); \
else \
- echo "make check: Python 2.5 or greater is required,"; \
+ echo "make check: Python 2.7 or greater is required,"; \
echo " but was not detected during configure"; \
exit 1; \
fi;
Modified: subversion/branches/reuse-ra-session/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/autogen.sh?rev=1702504&r1=1702503&r2=1702504&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/autogen.sh (original)
+++ subversion/branches/reuse-ra-session/autogen.sh Fri Sep 11 15:51:30 2015
@@ -157,11 +157,11 @@ fi
#
# Note: this dependency on Python is fine: only SVN developers use autogen.sh
# and we can state that dev people need Python on their machine. Note
-# that running gen-make.py requires Python 2.5 or newer.
+# that running gen-make.py requires Python 2.7 or newer.
PYTHON="`./build/find_python.sh`"
if test -z "$PYTHON"; then
- echo "Python 2.5 or later is required to run autogen.sh"
+ echo "Python 2.7 or later is required to run autogen.sh"
echo "If you have a suitable Python installed, but not on the"
echo "PATH, set the environment variable PYTHON to the full path"
echo "to the Python executable, and re-run autogen.sh"
Modified: subversion/branches/reuse-ra-session/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build.conf?rev=1702504&r1=1702503&r2=1702504&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build.conf (original)
+++ subversion/branches/reuse-ra-session/build.conf Fri Sep 11 15:51:30 2015
@@ -282,7 +282,8 @@ path = subversion/libsvn_fs_base
sources = *.c bdb/*.c util/*.c
install = bdb-lib
libs = libsvn_delta libsvn_subr aprutil apriconv apr bdb libsvn_fs_util
-msvc-static = yes
+msvc-export = ../libsvn_fs_base/fs_init.h
+msvc-delayload = yes
[libsvn_fs_fs]
description = Subversion FSFS Repository Filesystem Library
@@ -290,7 +291,8 @@ type = fs-module
path = subversion/libsvn_fs_fs
install = fsmod-lib
libs = libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs_util
-msvc-static = yes
+msvc-export = private/svn_fs_fs_private.h ../libsvn_fs_fs/fs_init.h
+msvc-delayload = yes
[libsvn_fs_x]
description = Subversion FSX Repository Filesystem Library
@@ -298,7 +300,8 @@ type = fs-module
path = subversion/libsvn_fs_x
install = fsmod-lib
libs = libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs_util
-msvc-static = yes
+msvc-export = ../libsvn_fs_x/fs_init.h
+msvc-delayload = yes
# Low-level grab bag of utilities
[libsvn_fs_util]
@@ -308,7 +311,7 @@ install = fsmod-lib
path = subversion/libsvn_fs_util
libs = libsvn_subr aprutil apriconv apr
msvc-libs = advapi32.lib shfolder.lib
-msvc-static = yes
+msvc-export = private/svn_fs_util.h
# General API for accessing repositories
[libsvn_ra]
@@ -321,6 +324,7 @@ add-deps = $(SVN_RA_LIB_DEPS)
add-install-deps = $(SVN_RA_LIB_INSTALL_DEPS)
install = lib
msvc-export = svn_ra.h private\svn_ra_private.h
+msvc-delayload = yes
# Accessing repositories via DAV through serf
[libsvn_ra_serf]
@@ -787,6 +791,7 @@ sources = fs-base-test.c
install = bdb-test
libs = libsvn_test libsvn_fs libsvn_fs_base libsvn_delta
libsvn_fs_util libsvn_subr apriconv apr
+msvc-force-static = yes
[strings-reps-test]
description = Test strings/reps in libsvn_fs_base
@@ -796,6 +801,7 @@ sources = strings-reps-test.c
install = bdb-test
libs = libsvn_test libsvn_fs libsvn_fs_base libsvn_delta
libsvn_subr apriconv apr
+msvc-force-static = yes
[changes-test]
description = Test changes in libsvn_fs_base
@@ -805,6 +811,7 @@ sources = changes-test.c
install = bdb-test
libs = libsvn_test libsvn_fs libsvn_fs_base libsvn_delta
libsvn_subr apriconv apr
+msvc-force-static = yes
# ----------------------------------------------------------------------------
# Tests for libsvn_fs_fs
@@ -816,6 +823,7 @@ sources = fs-fs-pack-test.c
install = test
libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
libsvn_subr apriconv apr
+msvc-force-static = yes
[fs-fs-fuzzy-test]
description = Use fuzzying to test FSFS corruption resilience
@@ -825,6 +833,7 @@ sources = fs-fs-fuzzy-test.c
install = sub-test
libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
libsvn_repos libsvn_subr apriconv apr
+msvc-force-static = yes
[fs-fs-private-test]
description = Test FSSF private API
@@ -834,6 +843,7 @@ sources = fs-fs-private-test.c
install = test
libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
libsvn_repos libsvn_subr apriconv apr
+msvc-force-static = yes
# ----------------------------------------------------------------------------
# Tests for libsvn_fs_x
@@ -845,6 +855,7 @@ sources = fs-x-pack-test.c
install = test
libs = libsvn_test libsvn_fs libsvn_fs_x libsvn_delta
libsvn_subr apriconv apr
+msvc-force-static = yes
[string-table-test]
description = Test fsfs string tables
@@ -853,6 +864,7 @@ path = subversion/tests/libsvn_fs_x
sources = string-table-test.c
install = test
libs = libsvn_test libsvn_fs_x libsvn_subr apr
+msvc-force-static = yes
# ----------------------------------------------------------------------------
# Tests for libsvn_fs
@@ -1532,6 +1544,7 @@ path = build/win32
libs = __ALL_TESTS__
diff diff3 diff4 fsfs-access-map svnauth
svn-populate-node-origins-index x509-parser svn-wc-db-tester
+ svn-mergeinfo-normalizer
[__LIBS__]
type = project
@@ -1646,6 +1659,13 @@ path = tools/dev/svnraisetreeconflict
libs = libsvn_wc libsvn_subr apriconv apr
install = tools
+[svn-mergeinfo-normalizer]
+type = exe
+path = tools/client-side/svn-mergeinfo-normalizer
+install = tools
+libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr
+ apriconv apr
+
[x509-parser]
description = Tool to verify x509 certificates
type = exe
Modified: subversion/branches/reuse-ra-session/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/ac-macros/apache.m4?rev=1702504&r1=1702503&r2=1702504&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/ac-macros/apache.m4 (original)
+++ subversion/branches/reuse-ra-session/build/ac-macros/apache.m4 Fri Sep 11 15:51:30 2015
@@ -89,6 +89,33 @@ else
AC_MSG_RESULT(no)
fi
+# check for some busted versions of mod_dav
+# in particular 2.2.25, 2.4.5, and 2.4.6 had the following bugs which are
+# troublesome for Subversion:
+# PR 55304: https://issues.apache.org/bugzilla/show_bug.cgi?id=55304
+# PR 55306: https://issues.apache.org/bugzilla/show_bug.cgi?id=55306
+# PR 55397: https://issues.apache.org/bugzilla/show_bug.cgi?id=55397
+if test -n "$APXS" && test "$APXS" != "no"; then
+ AC_MSG_CHECKING([mod_dav version])
+ HTTPD_MAJOR=`$SED -ne '/^#define AP_SERVER_MAJORVERSION_NUMBER/p' "$APXS_INCLUDE/ap_release.h" | $SED -e 's/^.*NUMBER *//'`
+ HTTPD_MINOR=`$SED -ne '/^#define AP_SERVER_MINORVERSION_NUMBER/p' "$APXS_INCLUDE/ap_release.h" | $SED -e 's/^.*NUMBER *//'`
+ HTTPD_PATCH=`$SED -ne '/^#define AP_SERVER_PATCHLEVEL_NUMBER/p' "$APXS_INCLUDE/ap_release.h" | $SED -e 's/^.*NUMBER *//'`
+ HTTPD_VERSION="${HTTPD_MAJOR}.${HTTPD_MINOR}.${HTTPD_PATCH}"
+ case "$HTTPD_VERSION" in
+ 2.2.25 | 2.4.[[5-6]])
+ AC_MSG_RESULT([broken])
+ AC_MSG_ERROR([Apache httpd version $HTTPD_VERSION includes a broken mod_dav; use a newer version of httpd])
+ ;;
+ 2.[[0-9]]*.[[0-9]]*)
+ AC_MSG_RESULT([acceptable])
+ ;;
+ *)
+ AC_MSG_RESULT([unrecognised])
+ AC_MSG_ERROR([Apache httpd version $HTTPD_VERSION not recognised])
+ ;;
+ esac
+fi
+
if test -n "$APXS" && test "$APXS" != "no"; then
AC_MSG_CHECKING([whether Apache version is compatible with APR version])
apr_major_version="${apr_version%%.*}"
@@ -106,37 +133,15 @@ if test -n "$APXS" && test "$APXS" != "n
AC_MSG_ERROR([unknown APR version])
;;
esac
- old_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
- AC_EGREP_CPP([apache_minor_version= *\"$apache_minor_version_wanted_regex\"],
- [
-#include "$APXS_INCLUDE/ap_release.h"
-apache_minor_version=AP_SERVER_MINORVERSION],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])
- AC_MSG_ERROR([Apache version incompatible with APR version])])
- CPPFLAGS="$old_CPPFLAGS"
-fi
-
-# check for some busted versions of mod_dav
-# in particular 2.2.25, 2.4.5, and 2.4.6 had the following bugs which are
-# troublesome for Subversion:
-# PR 55304: https://issues.apache.org/bugzilla/show_bug.cgi?id=55304
-# PR 55306: https://issues.apache.org/bugzilla/show_bug.cgi?id=55306
-# PR 55397: https://issues.apache.org/bugzilla/show_bug.cgi?id=55397
-if test -n "$APXS" && test "$APXS" != "no"; then
- AC_MSG_CHECKING([mod_dav version])
- old_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
- blacklisted_versions_regex=["\"2\" \"\.\" (\"2\" \"\.\" \"25\"|\"4\" \"\.\" \"[56]\")"]
- AC_EGREP_CPP([apache_version= *$blacklisted_versions_regex],
- [
-#include "$APXS_INCLUDE/ap_release.h"
-apache_version=AP_SERVER_BASEREVISION],
- [AC_MSG_RESULT([broken])
- AC_MSG_ERROR([Apache httpd version includes a broken mod_dav; use a newer version of httpd])],
- [AC_MSG_RESULT([acceptable])])
- CPPFLAGS="$old_CPPFLAGS"
+ case $HTTPD_MINOR in
+ $apache_minor_version_wanted_regex)
+ AC_MSG_RESULT([yes])
+ ;;
+ *)
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Apache version $HTTPD_VERSION incompatible with APR version $apr_version])
+ ;;
+ esac
fi
AC_ARG_WITH(apache-libexecdir,
@@ -159,15 +164,42 @@ if test -n "$APXS" && test "$APXS" != "n
AC_CHECK_HEADERS(unistd.h, [AC_CHECK_FUNCS(getpid)], [])
+ MMN_MAJOR=`$SED -ne '/^#define MODULE_MAGIC_NUMBER_MAJOR/p' "$APXS_INCLUDE/ap_mmn.h" | $SED -e 's/^.*MAJOR *//'`
+ MMN_MINOR=`$SED -ne '/^#define MODULE_MAGIC_NUMBER_MINOR/p' "$APXS_INCLUDE/ap_mmn.h" | $SED -e 's/^.*MINOR *//' | $SED -e 's/ .*//'`
+ if test "$MMN_MAJOR" = "20120211" && test "$MMN_MINOR" -lt "47" ; then
+ # This is httpd 2.4 and it doesn't appear to have the required
+ # API but the installation may have been patched.
+ AC_ARG_ENABLE(broken-httpd-auth,
+ AS_HELP_STRING([--enable-broken-httpd-auth],
+ [Force build against httpd 2.4 with broken auth]),
+ [broken_httpd_auth=$enableval],[broken_httpd_auth=no])
+ AC_MSG_CHECKING([for ap_some_authn_required])
+ old_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $APACHE_INCLUDES $SVN_APR_INCLUDES"
+ AC_EGREP_CPP([int.*\sap_some_authn_required\s*\(],
+ [#include "http_request.h"],
+ [AC_MSG_RESULT([yes])
+ working_auth=yes],
+ [AC_MSG_RESULT([no])])
+ CPPFLAGS="$old_CPPFLAGS"
+ if test "$working_auth" = "yes" ; then
+ AC_DEFINE(SVN_USE_FORCE_AUTHN, 1,
+ [Defined to build with patched httpd 2.4 and working auth])
+ elif test "$enable_broken_httpd_auth" = "yes"; then
+ AC_MSG_WARN([==============================================])
+ AC_MSG_WARN([Apache httpd $HTTPD_VERSION MMN $MMN_MAJOR.$MMN_MINOR])
+ AC_MSG_WARN([Subversion will be vulnerable to CVE-2015-3184])
+ AC_MSG_WARN([==============================================])
+ AC_DEFINE(SVN_ALLOW_BROKEN_HTTPD_AUTH, 1,
+ [Defined to build against httpd 2.4 with broken auth])
+ else
+ AC_MSG_ERROR([Apache httpd $HTTPD_VERSION MMN $MMN_MAJOR.$MMN_MINOR has broken auth (CVE-2015-3184)])
+ fi
+ fi
+
BUILD_APACHE_RULE=apache-mod
INSTALL_APACHE_RULE=install-mods-shared
INSTALL_APACHE_MODS=true
- HTTPD="`$APXS -q sbindir`/`$APXS -q PROGNAME`"
- if ! test -e $HTTPD ; then
- HTTPD="`$APXS -q bindir`/`$APXS -q PROGNAME`"
- fi
- HTTPD_VERSION=["`$HTTPD -v | $SED -e 's@^.*/\([0-9.]*\)\(.*$\)@\1@ ; 1q'`"]
-
case $host in
*-*-cygwin*)
APACHE_LDFLAGS="-shrext .so"
Modified: subversion/branches/reuse-ra-session/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/ac-macros/serf.m4?rev=1702504&r1=1702503&r2=1702504&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/ac-macros/serf.m4 (original)
+++ subversion/branches/reuse-ra-session/build/ac-macros/serf.m4 Fri Sep 11 15:51:30 2015
@@ -168,7 +168,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
if $PKG_CONFIG $serf_pc_arg --atleast-version=$serf_check_version; then
AC_MSG_RESULT([yes])
serf_found=yes
- SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/-D[^ ]*//g'`]
+ SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/ -D[^ ]*//g' -e 's/^-D[^ ]*//g'`]
SVN_SERF_LIBS=`$PKG_CONFIG $serf_pc_arg --libs-only-l`
dnl don't use --libs-only-L because then we might miss some options
LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"]
Modified: subversion/branches/reuse-ra-session/build/ac-macros/swig.m4
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/ac-macros/swig.m4?rev=1702504&r1=1702503&r2=1702504&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/ac-macros/swig.m4 (original)
+++ subversion/branches/reuse-ra-session/build/ac-macros/swig.m4 Fri Sep 11 15:51:30 2015
@@ -38,7 +38,7 @@ AC_DEFUN(SVN_CHECK_SWIG,
SVN_FIND_SWIG(no)
;;
"yes")
- SVN_FIND_SWIG(check)
+ SVN_FIND_SWIG(required)
;;
*)
SVN_FIND_SWIG($withval)
@@ -56,8 +56,11 @@ AC_DEFUN(SVN_FIND_SWIG,
if test $where = no; then
SWIG=none
- elif test $where = check; then
+ elif test $where = required || test $where = check; then
AC_PATH_PROG(SWIG, swig, none)
+ if test "$SWIG" = "none" && test $where = required; then
+ AC_MSG_ERROR([SWIG required, but not found])
+ fi
else
if test -f "$where"; then
SWIG="$where"
Modified: subversion/branches/reuse-ra-session/build/find_python.sh
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/find_python.sh?rev=1702504&r1=1702503&r2=1702504&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/find_python.sh (original)
+++ subversion/branches/reuse-ra-session/build/find_python.sh Fri Sep 11 15:51:30 2015
@@ -21,9 +21,7 @@
#
# Required version of Python
-# Python 2.0 = 0x2000000
-# Python 2.4 = 0x2040000
-VERSION=${1:-0x2050000}
+VERSION=${1:-0x2070000}
for pypath in "$PYTHON" "$PYTHON2" "$PYTHON3" python python2 python3; do
if [ "x$pypath" != "x" ]; then
Modified: subversion/branches/reuse-ra-session/build/generator/gen_base.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/generator/gen_base.py?rev=1702504&r1=1702503&r2=1702504&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/generator/gen_base.py (original)
+++ subversion/branches/reuse-ra-session/build/generator/gen_base.py Fri Sep 11 15:51:30 2015
@@ -590,6 +590,7 @@ class TargetLinked(Target):
self.external_lib = options.get('external-lib')
self.external_project = options.get('external-project')
self.msvc_libs = options.get('msvc-libs', '').split()
+ self.msvc_delayload_targets = []
def add_dependencies(self):
if self.external_lib or self.external_project:
@@ -690,6 +691,7 @@ class TargetLib(TargetLinked):
self.link_cmd = options.get('link-cmd', '$(LINK_LIB)')
self.msvc_static = options.get('msvc-static') == 'yes' # is a static lib
+ self.msvc_delayload = options.get('msvc-delayload') == 'yes' # Delay dll load
self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
self.msvc_export = options.get('msvc-export', '').split()
Modified: subversion/branches/reuse-ra-session/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/generator/gen_vcnet_vcproj.py?rev=1702504&r1=1702503&r2=1702504&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/reuse-ra-session/build/generator/gen_vcnet_vcproj.py Fri Sep 11 15:51:30 2015
@@ -209,14 +209,23 @@ class Generator(gen_win.WinGeneratorBase
deplist = [ ]
for i in range(len(depends)):
- if depends[i].fname.startswith(self.projfilesdir):
- path = depends[i].fname[len(self.projfilesdir) + 1:]
+ dp = depends[i]
+ if dp.fname.startswith(self.projfilesdir):
+ path = dp.fname[len(self.projfilesdir) + 1:]
else:
path = os.path.join(os.path.relpath('.', self.projfilesdir),
- depends[i].fname)
+ dp.fname)
+
+ if isinstance(dp, gen_base.TargetLib) and dp.msvc_delayload \
+ and isinstance(target, gen_base.TargetLinked) \
+ and not self.disable_shared:
+ delayload = self.get_output_name(dp)
+ else:
+ delayload = None
deplist.append(gen_win.ProjectItem(guid=guids[depends[i].name],
index=i,
path=path,
+ delayload=delayload
))
fname = self.get_external_project(target, self.vcproj_extension[1:])
Modified: subversion/branches/reuse-ra-session/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/generator/gen_win.py?rev=1702504&r1=1702503&r2=1702504&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/generator/gen_win.py (original)
+++ subversion/branches/reuse-ra-session/build/generator/gen_win.py Fri Sep 11 15:51:30 2015
@@ -23,12 +23,7 @@
#
import os
-try:
- # Python >=2.5
- from hashlib import md5 as hashlib_md5
-except ImportError:
- # Python <2.5
- from md5 import md5 as hashlib_md5
+from hashlib import md5 as hashlib_md5
import sys
import fnmatch
import re
@@ -90,9 +85,6 @@ class WinGeneratorBase(gen_win_dependenc
printed.append(lib.name)
print('Found %s %s' % (lib.name, lib.version))
- if 'db' not in self._libraries:
- print('BDB not found, BDB fs will not be built')
-
#Make some files for the installer so that we don't need to
#require sed or some other command to do it
### GJS: don't do this right now
@@ -279,6 +271,7 @@ class WinGeneratorBase(gen_win_dependenc
'msvc-name' : dep.name + "_dll" },
self)
target.msvc_export = dep.msvc_export
+ target.msvc_delayload = dep.msvc_delayload
# move the description from the static library target to the dll.
target.desc = dep.desc
@@ -287,6 +280,7 @@ class WinGeneratorBase(gen_win_dependenc
# The dependency should now be static.
dep.msvc_export = None
dep.msvc_static = True
+ dep.msvc_delayload = False
# Remove the 'lib' prefix, so that the static library will be called
# svn_foo.lib
@@ -608,14 +602,13 @@ class WinGeneratorBase(gen_win_dependenc
for dep, (is_proj, is_lib, is_static) in dep_dict.items():
if is_proj:
deps.append(dep)
- elif mode == FILTER_LIBS:
- for dep, (is_proj, is_lib, is_static) in dep_dict.items():
- if is_static or (is_lib and not is_proj):
- deps.append(dep)
- elif mode == FILTER_EXTERNALLIBS:
+ elif mode == FILTER_LIBS or mode == FILTER_EXTERNALLIBS:
for dep, (is_proj, is_lib, is_static) in dep_dict.items():
if is_static or (is_lib and not is_proj):
- deps.append(dep)
+ # Filter explicit msvc libraries of optional dependencies
+ if (dep.name in self._libraries
+ or dep.name not in self._optional_libraries):
+ deps.append(dep)
else:
raise NotImplementedError
Modified: subversion/branches/reuse-ra-session/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/generator/gen_win_dependencies.py?rev=1702504&r1=1702503&r2=1702504&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/reuse-ra-session/build/generator/gen_win_dependencies.py Fri Sep 11 15:51:30 2015
@@ -118,9 +118,10 @@ class GenDependenciesBase(gen_base.Gener
'python',
'ruby',
'java_sdk',
+ 'openssl',
+ 'apr_memcache',
# So optional, we don't even have any code to detect them on Windows
- 'apr_memcache',
'magic',
]
@@ -136,7 +137,7 @@ class GenDependenciesBase(gen_base.Gener
self.apr_util_path = 'apr-util'
self.apr_iconv_path = 'apr-iconv'
self.serf_path = None
- self.bdb_path = 'db4-win32'
+ self.bdb_path = None
self.httpd_path = None
self.libintl_path = None
self.zlib_path = 'zlib'
@@ -745,13 +746,17 @@ class GenDependenciesBase(gen_base.Gener
def _find_bdb(self, show_warnings):
"Find the Berkeley DB library and version"
- # Default to not found
- self.bdb_lib = None
-
- inc_path = os.path.join(self.bdb_path, 'include')
+ # try default path to detect BDB support, unless different path is
+ # specified so to keep pre 1.10-behavior for BDB detection on Windows
+ bdb_path = 'db4-win32'
+
+ if self.bdb_path:
+ bdb_path = self.bdb_path
+
+ inc_path = os.path.join(bdb_path, 'include')
db_h_path = os.path.join(inc_path, 'db.h')
- if not self.bdb_path or not os.path.isfile(db_h_path):
+ if not os.path.isfile(db_h_path):
if show_warnings and self.bdb_path:
print('WARNING: \'%s\' not found' % (db_h_path,))
print("Use '--with-berkeley-db' to configure BDB location.");
@@ -781,7 +786,7 @@ class GenDependenciesBase(gen_base.Gener
):
return
- lib_dir = os.path.join(self.bdb_path, 'lib')
+ lib_dir = os.path.join(bdb_path, 'lib')
lib_name = 'libdb%s.lib' % (versuffix,)
if not os.path.exists(os.path.join(lib_dir, lib_name)):
@@ -792,7 +797,7 @@ class GenDependenciesBase(gen_base.Gener
if not os.path.isfile(os.path.join(lib_dir, debug_lib_name)):
debug_lib_name = None
- dll_dir = os.path.join(self.bdb_path, 'bin')
+ dll_dir = os.path.join(bdb_path, 'bin')
# Are there binaries we should copy for testing?
dll_name = os.path.splitext(lib_name)[0] + '.dll'
@@ -818,9 +823,6 @@ class GenDependenciesBase(gen_base.Gener
debug_dll_name=debug_dll_name,
defines=defines)
- # For compatibility with old code
- self.bdb_lib = self._libraries['db'].lib_name
-
def _find_openssl(self, show_warnings):
"Find openssl"
@@ -925,11 +927,11 @@ class GenDependenciesBase(gen_base.Gener
# Pass -W0 to stifle the "-e:1: Use RbConfig instead of obsolete
# and deprecated Config." warning if we are using Ruby 1.9.
fp = os.popen('ruby -rrbconfig -W0 -e ' + escape_shell_arg(
- "puts Config::CONFIG['ruby_version'];"
- "puts Config::CONFIG['LIBRUBY'];"
- "puts Config::CONFIG['libdir'];"
- "puts Config::CONFIG['rubyhdrdir'];"
- "puts Config::CONFIG['arch'];"), 'r')
+ "puts RbConfig::CONFIG['ruby_version'];"
+ "puts RbConfig::CONFIG['LIBRUBY'];"
+ "puts RbConfig::CONFIG['libdir'];"
+ "puts RbConfig::CONFIG['rubyhdrdir'];"
+ "puts RbConfig::CONFIG['arch'];"), 'r')
try:
line = fp.readline()
if line:
@@ -958,9 +960,11 @@ class GenDependenciesBase(gen_base.Gener
if not lib_dir:
return
- # Visual C++ doesn't have a standard compliant snprintf yet
- # (Will probably be added in VS2013 + 1)
- defines = ['snprintf=_snprintf']
+ # Visual C++ prior to VS2015 doesn't have a standard compliant snprintf
+ if self.vs_version < '2015':
+ defines = ['snprintf=_snprintf']
+ else:
+ defines = []
ver = ruby_version.split('.')
ver = tuple(map(int, ver))
Modified: subversion/branches/reuse-ra-session/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/generator/templates/vcnet_vcxproj.ezt?rev=1702504&r1=1702503&r2=1702504&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/reuse-ra-session/build/generator/templates/vcnet_vcxproj.ezt Fri Sep 11 15:51:30 2015
@@ -20,7 +20,7 @@
]<?xml version="1.0" encoding="utf-8"?>
[format "xml"]<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
-[for configs][for platforms] <ProjectConfiguration Include="[configs.name]|[platforms]">
+[for platforms][for configs] <ProjectConfiguration Include="[configs.name]|[platforms]">
<Configuration>[configs.name]</Configuration>
<Platform>[platforms]</Platform>
</ProjectConfiguration>
@@ -38,8 +38,10 @@
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
-[for platforms][for configs] <ImportGroup Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+[for platforms][for configs] <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
[end][end] <PropertyGroup Label="UserMacros" />
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">
@@ -62,13 +64,18 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
<DisableSpecificWarnings>4100;4127;4206;4512;4701;4706;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <TreatSpecificWarningsAsErrors>4002;4003;4013;4020;4022;4024;4028;4029;4030;4031;4033;4047;4089;4113;4115;4133;4204;4715;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+ <TreatSpecificWarningsAsErrors>4002;4003;4013;4020;4022;4024;4028;4029;4030;4031;4033;4047;4089;4113;4115;4133;4204;4700;4715;4789;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
[if-any configs.forced_include_files] <ForcedIncludeFiles>[for configs.forced_include_files][configs.forced_include_files];[end]%(ForcedIncludeFiles)</ForcedIncludeFiles>
[end] </ClCompile>
+ <ResourceCompile>
+ <AdditionalIncludeDirectories>[for configs.includes][configs.includes];[end]%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>SVN_FILE_NAME=[target.output_name];SVN_FILE_DESCRIPTION=[target.desc];[is platforms "x64"]WIN64;[end][for configs.defines][configs.defines];[end]%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
[is config_type "Application"] <Link>
<AdditionalDependencies>[for configs.libs][configs.libs];[end]%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>[for configs.libdirs][configs.libdirs];[end]%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
+ <DelayLoadDLLs>[for depends][if-any depends.delayload][depends.delayload];[end][end]</DelayLoadDLLs>
<SubSystem>Console</SubSystem>
<EnableUAC>true</EnableUAC>
<OptimizeReferences>true</OptimizeReferences>
@@ -79,6 +86,7 @@
<AdditionalDependencies>[for configs.libs][configs.libs];[end]%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>[for configs.libdirs][configs.libdirs];[end]%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
+ <DelayLoadDLLs>[for depends][if-any depends.delayload][depends.delayload];[end][end]</DelayLoadDLLs>
<IgnoreSpecificDefaultLibraries>[is configs.name "Debug"]msvcrt.lib[end][is configs.name "Release"]msvcrtd.lib[end]</IgnoreSpecificDefaultLibraries>
[if-any def_file] <ModuleDefinitionFile>[def_file]</ModuleDefinitionFile>
[end] </Link>
@@ -88,10 +96,7 @@
[end] </Lib>
[end][end][end] </ItemDefinitionGroup>
[end][end][if-any target.desc] <ItemGroup>
- <ResourceCompile Include="..\svn.rc">
-[for configs][for platforms] <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[for configs.includes][configs.includes];[end]%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">SVN_FILE_NAME=[target.output_name];SVN_FILE_DESCRIPTION=[target.desc];[is configs.name "Debug"]_DEBUG[else]NDEBUG[end];%(PreprocessorDefinitions)</PreprocessorDefinitions>
-[end][end] </ResourceCompile>
+ <ResourceCompile Include="..\svn.rc" />
</ItemGroup>
[end] <ItemGroup>
[for sources][is sources.extension ".h"][else][is sources.extension ".hpp"][else][if-any sources.custom_build] <CustomBuild Include="[sources.path]">