svn commit: r253728 - in vendor/subversion/dist: . subversion/include subversion/include/private subversion/libsvn_client subversion/libsvn_delta subversion/libsvn_fs_base subversion/libsvn_fs_base...
Peter Wemm
peter at FreeBSD.org
Sun Jul 28 05:04:43 UTC 2013
Author: peter
Date: Sun Jul 28 05:04:41 2013
New Revision: 253728
URL: http://svnweb.freebsd.org/changeset/base/253728
Log:
Import subversion-1.8.1 into vendor staging area.
Modified:
vendor/subversion/dist/CHANGES
vendor/subversion/dist/Makefile.in
vendor/subversion/dist/build-outputs.mk
vendor/subversion/dist/configure
vendor/subversion/dist/configure.ac
vendor/subversion/dist/get-deps.sh
vendor/subversion/dist/subversion/include/private/svn_client_private.h
vendor/subversion/dist/subversion/include/private/svn_io_private.h
vendor/subversion/dist/subversion/include/private/svn_ra_private.h
vendor/subversion/dist/subversion/include/svn_version.h
vendor/subversion/dist/subversion/libsvn_client/client.h
vendor/subversion/dist/subversion/libsvn_client/commit.c
vendor/subversion/dist/subversion/libsvn_client/copy.c
vendor/subversion/dist/subversion/libsvn_client/diff.c
vendor/subversion/dist/subversion/libsvn_client/diff_local.c
vendor/subversion/dist/subversion/libsvn_client/log.c
vendor/subversion/dist/subversion/libsvn_client/merge.c
vendor/subversion/dist/subversion/libsvn_client/mergeinfo.c
vendor/subversion/dist/subversion/libsvn_client/ra.c
vendor/subversion/dist/subversion/libsvn_client/switch.c
vendor/subversion/dist/subversion/libsvn_delta/compat.c
vendor/subversion/dist/subversion/libsvn_fs_base/bdb/env.c
vendor/subversion/dist/subversion/libsvn_fs_base/tree.c
vendor/subversion/dist/subversion/libsvn_fs_fs/fs_fs.c
vendor/subversion/dist/subversion/libsvn_fs_fs/rep-cache-db.h
vendor/subversion/dist/subversion/libsvn_fs_fs/tree.c
vendor/subversion/dist/subversion/libsvn_ra/ra_loader.c
vendor/subversion/dist/subversion/libsvn_ra/util.c
vendor/subversion/dist/subversion/libsvn_ra_serf/blame.c
vendor/subversion/dist/subversion/libsvn_ra_serf/commit.c
vendor/subversion/dist/subversion/libsvn_ra_serf/getdate.c
vendor/subversion/dist/subversion/libsvn_ra_serf/getlocations.c
vendor/subversion/dist/subversion/libsvn_ra_serf/getlocationsegments.c
vendor/subversion/dist/subversion/libsvn_ra_serf/getlocks.c
vendor/subversion/dist/subversion/libsvn_ra_serf/inherited_props.c
vendor/subversion/dist/subversion/libsvn_ra_serf/log.c
vendor/subversion/dist/subversion/libsvn_ra_serf/mergeinfo.c
vendor/subversion/dist/subversion/libsvn_ra_serf/options.c
vendor/subversion/dist/subversion/libsvn_ra_serf/property.c
vendor/subversion/dist/subversion/libsvn_ra_serf/ra_serf.h
vendor/subversion/dist/subversion/libsvn_ra_serf/replay.c
vendor/subversion/dist/subversion/libsvn_ra_serf/serf.c
vendor/subversion/dist/subversion/libsvn_ra_serf/update.c
vendor/subversion/dist/subversion/libsvn_ra_serf/util.c
vendor/subversion/dist/subversion/libsvn_ra_serf/xml.c
vendor/subversion/dist/subversion/libsvn_ra_svn/client.c
vendor/subversion/dist/subversion/libsvn_ra_svn/protocol
vendor/subversion/dist/subversion/libsvn_repos/fs-wrap.c
vendor/subversion/dist/subversion/libsvn_subr/config_file.c
vendor/subversion/dist/subversion/libsvn_subr/gpg_agent.c
vendor/subversion/dist/subversion/libsvn_subr/internal_statements.h
vendor/subversion/dist/subversion/libsvn_subr/io.c
vendor/subversion/dist/subversion/libsvn_subr/named_atomic.c
vendor/subversion/dist/subversion/libsvn_subr/sqlite.c
vendor/subversion/dist/subversion/libsvn_subr/stream.c
vendor/subversion/dist/subversion/libsvn_subr/subst.c
vendor/subversion/dist/subversion/libsvn_subr/utf.c
vendor/subversion/dist/subversion/libsvn_wc/adm_ops.c
vendor/subversion/dist/subversion/libsvn_wc/crop.c
vendor/subversion/dist/subversion/libsvn_wc/externals.c
vendor/subversion/dist/subversion/libsvn_wc/update_editor.c
vendor/subversion/dist/subversion/libsvn_wc/upgrade.c
vendor/subversion/dist/subversion/libsvn_wc/wc-checks.h
vendor/subversion/dist/subversion/libsvn_wc/wc-metadata.h
vendor/subversion/dist/subversion/libsvn_wc/wc-queries.h
vendor/subversion/dist/subversion/libsvn_wc/wc-queries.sql
vendor/subversion/dist/subversion/libsvn_wc/wc_db.c
vendor/subversion/dist/subversion/libsvn_wc/wc_db.h
vendor/subversion/dist/subversion/libsvn_wc/wc_db_update_move.c
vendor/subversion/dist/subversion/libsvn_wc/wc_db_wcroot.c
vendor/subversion/dist/subversion/libsvn_wc/workqueue.c
vendor/subversion/dist/subversion/svn/cl.h
vendor/subversion/dist/subversion/svn/conflict-callbacks.c
vendor/subversion/dist/subversion/svn/file-merge.c
vendor/subversion/dist/subversion/svn/merge-cmd.c
vendor/subversion/dist/subversion/svn/mergeinfo-cmd.c
vendor/subversion/dist/subversion/svn/svn.c
vendor/subversion/dist/subversion/svn/util.c
vendor/subversion/dist/subversion/svnadmin/svnadmin.c
vendor/subversion/dist/subversion/svnlook/svnlook.c
vendor/subversion/dist/subversion/svnserve/serve.c
vendor/subversion/dist/win-tests.py
Modified: vendor/subversion/dist/CHANGES
==============================================================================
--- vendor/subversion/dist/CHANGES Sun Jul 28 04:53:00 2013 (r253727)
+++ vendor/subversion/dist/CHANGES Sun Jul 28 05:04:41 2013 (r253728)
@@ -1,3 +1,91 @@
+Version 1.8.1
+(23 July 2013, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.1
+
+ User-visible changes:
+ - Client- and server-side bugfixes:
+ * translation updates for German and Simplified Chinese
+ * improve sqlite error message output (r1497804)
+ * support platforms lacking mmap (r1498136)
+ * allow configuration files to start with UTF-8 BOM (r1499100 et al)
+ * don't fail on UTF-8 data when encoding conversion not available (r1503009)
+ * improve error messages when encoding conversion fails (r1503010)
+
+ - Client-side bugfixes:
+ * merge: rename 'automatic merge' to 'complete merge' (r1491432)
+ * mergeinfo: reduce network usage for '--show-revs' (r1492005)
+ * ra_serf: improve http status handling (r1495104)
+ * merge: avoid unneeded ra session (r1493475)
+ * merge: reduce network usage (r1478987)
+ * merge: remove duplicated ancestry check (r1493424, r1495597)
+ * ra_serf: fix 'Accept-Encoding' header for IIS interoperability (r1497551)
+ * svn status: improve documentation for lock columns (r1497318, r1497319)
+ * ra_serf: fix support for 'get-file-revs-reversed' capability (r1498456)
+ * log: reduce network usage on repository roots (r1496957)
+ * diff: avoid temporary files when calling external diff (issue #4382)
+ * upgrade: fix notification of 1.7.x working copies (r1493703, r1494171)
+ * fix crash during tree conflict resolution (issue #4388)
+ * interactive file merge: add two additional choices (r1491816, r1494089)
+ * diff: use local style paths in error messages (r1500680)
+ * resolve: improve the interactive conflict resolution menu (r1491739 et al)
+ * switch: use local style path in error message (r1500074)
+ * ra_serf: improve error output when receiving invalid XML (r1498851)
+ * svn cleanup: explain what the command does in help output (r1497310)
+ * blame: error on -r M:N where M>N unless server supports (r1498449 et al)
+ * gpg-agent auth: don't try to use agent when unavailable (r1500762 et al)
+ * gpg-agent auth: don't require GPG_TTY or TERM env vars (r1500801)
+ * update: fix some tree conflicts not triggering resolver (r1491868 et al)
+ * commit: remove stale entries from wc lock table when deleting (r1491756)
+ * merge: fix --record-only erroring out on renamed path (issue #4387)
+ * svnmucc: fix 'make install' symlink to work when DESTDIR is set (r1501072)
+ * wc: fix crash when target is symlink to a working copy root (issue #4383)
+ * ra_serf: change "internal malfunction" errors to normal errors (r1502577)
+ * ra_serf: handle proxies not supporting chunked requests (r1502401 et al)
+
+ - Server-side bugfixes:
+ * fsfs: resolve endless loop problem when repos/db/uuid has \r\n (r1492145)
+ * fsfs: remove revision property buffer limit (r1491770)
+ * mod_dav_svn: better status codes for anonymous user errors (r1495918)
+ * mod_dav_svn: better status codes for commit failures (r1490684)
+ * fix performance regression in 'svn log' against root (r1494913)
+ * allow deleting non-user-visible 'svn:' properties (r1495432)
+ * fsfs: fix crash on strict-alignment architectures (r1495806, r1495985)
+ * svnadmin upgrade: fix error of non-sharded fsfs repositories (r1494287)
+ * svnadmin create: deny '--fs-type=fsfs --compatible-version=1.0' (r1494223)
+ * svnadmin upgrade: fix data loss when cancelling in last stage (r1494298)
+ * mod_dav_svn: fix incorrect path canonicalization (r1503528)
+
+ - Other tool improvements and bugfixes:
+ * fsfs-stats (tool): resolve segfault when passing invalid path (r1492164)
+ * svn-bench: fix help output (r1493951)
+ * svnpubsub: add version header to server (r1491707)
+
+ Developer-visible changes
+ - General:
+ * ra_serf: fix some test runner issues on Windows (r1490679)
+ * fix two issues in reverse svn_ra_get_file_revs() (r1492148, et al)
+ * handle --compatible-version=1.8 in the C tests (r1494342)
+ * improve clang compatibility (r1480080 et al)
+ * use proper cancel baton when handling conflicts (r1495850)
+ * fs: BDB: provide proper error value from BDB (r1495428)
+ * ra_serf: tweak connection failed error value (r1496132, et al)
+ * svn_client_log5: resolve possible segfault (r1496110)
+ * fix metadata_only move to work when target is unversioned node (r1498564)
+ * ra_svn: fix segfault with a NULL commit message (r1498550, r1499727)
+ * Ev2: correctly initialize node kind in shims' change table (r1501058)
+ * Ev2: fix copyfrom URL construction in shims (r1500226)
+ * fs: improve test against newlines in filenames (r1498483 et al)
+ * make building with BDB 6 an opt-in feature (r1499438)
+ * sqlite: allow placing amalgamation in build dir (r1499034, r1500175)
+ * ra_svn: make sessions usable after log callback early out (r1503554)
+
+ - Bindings:
+ * swig-rb: fix tests with out-of-tree-builds (r1492295)
+ * javahl: fix encoding of error messages produced by javahl (r1492264)
+ * swig-pl: silence compiler warnings (r1487094)
+ * swig-pl: improve documentation (r1488693, r1490721, r1500904)
+
+
Version 1.8.0
(18 Jun 2013, from /branches/1.8.x)
http://svn.apache.org/repos/asf/subversion/tags/1.8.0
@@ -99,7 +187,6 @@ http://svn.apache.org/repos/asf/subversi
* support ipv6 in URLs (e.g. http://[::1]/svn/repos) (r1454047)
* conflict resolver now iterates paths in a sorted order (r1461820)
* mod_dav_svn does keyword expansion with 'kw=1' query arg (r1466055)
- * add support for custom keyword definitions (issue #890)
- Minor new features and improvements (server-side):
* improve performance of config file parsing (r1344347 et al)
@@ -339,6 +426,25 @@ http://svn.apache.org/repos/asf/subversi
* fix some reference counting bugs in swig-py bindings (r1464899, r1466524)
+Version 1.7.11
+(23 Jul 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.11
+
+ User-visible changes:
+ - General
+ * translation updates for Simplified Chinese
+
+ - Server-side bugfixes:
+ * mod_dav_svn: fix incorrect path canonicalization (r1503528)
+
+ - Other tool improvements and bugfixes:
+ * fix argument processing in contrib hook scripts (r1485350)
+
+ Developer-visible changes:
+ - Bindings:
+ * javahl: fix bug in error constructing code (r1405922)
+
+
Version 1.7.10
(30 May 2013, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.10
Modified: vendor/subversion/dist/Makefile.in
==============================================================================
--- vendor/subversion/dist/Makefile.in Sun Jul 28 04:53:00 2013 (r253727)
+++ vendor/subversion/dist/Makefile.in Sun Jul 28 05:04:41 2013 (r253728)
@@ -903,5 +903,5 @@ INSTALL_EXTRA_TOOLS=\
test -n "$$SVN_SVNMUCC_IS_SVNSYITF" && \
ln -sf svnmucc$(EXEEXT) $(DESTDIR)$(bindir)/svnsyitf$(EXEEXT); \
if test "$(DESTDIR)$(bindir)" != "$(DESTDIR)$(toolsdir)"; then \
- ln -sf $(DESTDIR)$(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \
+ ln -sf $(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \
fi
Modified: vendor/subversion/dist/build-outputs.mk
==============================================================================
--- vendor/subversion/dist/build-outputs.mk Sun Jul 28 04:53:00 2013 (r253727)
+++ vendor/subversion/dist/build-outputs.mk Sun Jul 28 05:04:41 2013 (r253728)
@@ -1985,7 +1985,7 @@ subversion/libsvn_client/delete.lo: subv
subversion/libsvn_client/deprecated.lo: subversion/libsvn_client/deprecated.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn
_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h
-subversion/libsvn_client/diff.lo: subversion/libsvn_client/diff.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/
svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+subversion/libsvn_client/diff.lo: subversion/libsvn_client/diff.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_io_private.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subvers
ion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
subversion/libsvn_client/diff_local.lo: subversion/libsvn_client/diff_local.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversi
on/libsvn_client/client.h subversion/svn_private_config.h
@@ -2703,7 +2703,7 @@ subversion/svnadmin/svnadmin.lo: subvers
subversion/svndumpfilter/svndumpfilter.lo: subversion/svndumpfilter/svndumpfilter.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_mergeinfo_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h
-subversion/svnlook/svnlook.lo: subversion/svnlook/svnlook.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_fspath.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/i
nclude/svn_version.h subversion/include/svn_xml.h subversion/svn_private_config.h
+subversion/svnlook/svnlook.lo: subversion/svnlook/svnlook.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_io_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types
.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/svn_private_config.h
subversion/svnmucc/svnmucc.lo: subversion/svnmucc/svnmucc.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_ver
sion.h subversion/include/svn_wc.h subversion/svn_private_config.h
@@ -2749,7 +2749,7 @@ subversion/tests/libsvn_diff/diff-diff3-
subversion/tests/libsvn_diff/parse-diff-test.lo: subversion/tests/libsvn_diff/parse-diff-test.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/tests/svn_test.h
-subversion/tests/libsvn_fs/fs-test.lo: subversion/tests/libsvn_fs/fs-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_delta/delta.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
+subversion/tests/libsvn_fs/fs-test.lo: subversion/tests/libsvn_fs/fs-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_delta/delta.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
subversion/tests/libsvn_fs/locks-test.lo: subversion/tests/libsvn_fs/locks-test.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
@@ -2849,7 +2849,7 @@ subversion/tests/libsvn_wc/wc-queries-te
subversion/tests/libsvn_wc/wc-test.lo: subversion/tests/libsvn_wc/wc-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversi
on/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h
-subversion/tests/svn_test_fs.lo: subversion/tests/svn_test_fs.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
+subversion/tests/svn_test_fs.lo: subversion/tests/svn_test_fs.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
subversion/tests/svn_test_main.lo: subversion/tests/svn_test_main.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h subversion/tests/svn_test.h
Modified: vendor/subversion/dist/configure
==============================================================================
--- vendor/subversion/dist/configure Sun Jul 28 04:53:00 2013 (r253727)
+++ vendor/subversion/dist/configure Sun Jul 28 05:04:41 2013 (r253728)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for subversion 1.8.0.
+# Generated by GNU Autoconf 2.69 for subversion 1.8.1.
#
# Report bugs to <http://subversion.apache.org/>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='subversion'
PACKAGE_TARNAME='subversion'
-PACKAGE_VERSION='1.8.0'
-PACKAGE_STRING='subversion 1.8.0'
+PACKAGE_VERSION='1.8.1'
+PACKAGE_STRING='subversion 1.8.1'
PACKAGE_BUGREPORT='http://subversion.apache.org/'
PACKAGE_URL=''
@@ -872,6 +872,7 @@ with_trang
with_doxygen
with_expat
with_berkeley_db
+enable_bdb6
with_sasl
enable_keychain
with_gpg_agent
@@ -1455,7 +1456,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures subversion 1.8.0 to adapt to many kinds of systems.
+\`configure' configures subversion 1.8.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1521,7 +1522,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of subversion 1.8.0:";;
+ short | recursive ) echo "Configuration of subversion 1.8.1:";;
esac
cat <<\_ACEOF
@@ -1547,6 +1548,10 @@ Optional Features:
testing prior to installation on some platforms. It
does not work on some platforms (Darwin, OpenBSD,
...).
+ --enable-bdb6 Allow building against BDB 6+. See
+ --with-berkeley-db for specifying the location of
+ the Berkeley DB installation. Using BDB 6 will fail
+ if this option is not used.
--disable-keychain Disable use of Mac OS KeyChain for auth credentials
--enable-ev2-impl Use Ev2 implementations, where available
[EXPERIMENTAL]
@@ -1609,9 +1614,9 @@ Optional Packages:
Specify location of Expat
--with-berkeley-db[=HEADER:INCLUDES:LIB_SEARCH_DIRS:LIBS]
The Subversion Berkeley DB based filesystem library
- requires Berkeley DB $db_version or newer. If you
- specify `--without-berkeley-db', that library will
- not be built. If you omit the argument of this
+ requires Berkeley DB $db_version or $db_alt_version.
+ If you specify `--without-berkeley-db', that library
+ will not be built. If you omit the argument of this
option completely, the configure script will use
Berkeley DB used by APR-UTIL.
--with-sasl=PATH Compile with libsasl2 in PATH
@@ -1731,7 +1736,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-subversion configure 1.8.0
+subversion configure 1.8.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2275,7 +2280,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by subversion $as_me 1.8.0, which was
+It was created by subversion $as_me 1.8.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2655,8 +2660,8 @@ ac_configure="$SHELL $ac_aux_dir/configu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Subversion 1.8.0" >&5
-$as_echo "$as_me: Configuring Subversion 1.8.0" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Subversion 1.8.1" >&5
+$as_echo "$as_me: Configuring Subversion 1.8.1" >&6;}
abs_srcdir="`cd $srcdir && pwd`"
@@ -3612,6 +3617,44 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ _svn_xxflags__save="$CFLAGS"
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC accepts -Werror=unknown-warning-option... " >&6; }
+ CFLAGS="-Werror=unknown-warning-option $CFLAGS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ CFLAGS="$_svn_xxflags__save"
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
# Look for a C++ compiler (before anything can set CXXFLAGS)
CXXMAINTAINERFLAGS="$CXXUSERFLAGS"
CXXUSERFLAGS="$CXXFLAGS"
@@ -3921,6 +3964,44 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ _svn_xxflags__save="$CXXFLAGS"
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CXX accepts -Werror=unknown-warning-option... " >&6; }
+ CXXFLAGS="-Werror=unknown-warning-option $CXXFLAGS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ CXXFLAGS="$_svn_xxflags__save"
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
# Look for a C pre-processor
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -6161,6 +6242,10 @@ $as_echo "$as_me: WARNING: no suitable s
echo "unpack the archive using unzip and rename the resulting"
echo "directory to:"
echo "$abs_srcdir/sqlite-amalgamation"
+ if test x"$abs_srcdir" != x"$abs_builddir"; then
+ echo "or to:"
+ echo "$abs_builddir/sqlite-amalgamation"
+ fi
echo ""
as_fn_error $? "Subversion requires SQLite" "$LINENO" 5
@@ -6461,6 +6546,299 @@ rm -f conftest*
if test -z "$svn_lib_sqlite"; then
+ sqlite_amalg="$abs_builddir/sqlite-amalgamation/sqlite3.c"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking sqlite amalgamation" >&5
+$as_echo_n "checking sqlite amalgamation... " >&6; }
+ if test ! -e $sqlite_amalg; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking sqlite amalgamation file version" >&5
+$as_echo_n "checking sqlite amalgamation file version... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include "$sqlite_amalg"
+#if SQLITE_VERSION_NUMBER >= $sqlite_min_ver_num
+SQLITE_VERSION_OKAY
+#endif
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "SQLITE_VERSION_OKAY" >/dev/null 2>&1; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: amalgamation found and is okay" >&5
+$as_echo "amalgamation found and is okay" >&6; }
+
+ case $host_os in
+ beos* | mingw* | pw32* | cegcc* | cygwin*)
+ svn_sqlite_dso_ldflags=
+ ;;
+
+ darwin*)
+ # if libdl is installed we need to link against it
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dl_dlopen=yes
+else
+ ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+ lt_cv_dlopen="dlopen" svn_sqlite_dso_ldflags="-ldl"
+else
+
+ svn_sqlite_dso_ldflags=
+
+fi
+
+ ;;
+
+ *)
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
+ svn_sqlite_dso_ldflags=
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dld_shl_load=yes
+else
+ ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+ svn_sqlite_dso_ldflags="-ldld"
+else
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+ svn_sqlite_dso_ldflags=
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dl_dlopen=yes
+else
+ ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+ svn_sqlite_dso_ldflags="-ldl"
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_svld_dlopen=yes
+else
+ ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+ svn_sqlite_dso_ldflags="-lsvld"
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dld_dld_link=yes
+else
+ ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+ svn_sqlite_dso_ldflags="-ldld"
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+ ;;
+ esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking additional libraries for sqlite" >&5
+$as_echo_n "checking additional libraries for sqlite... " >&6; }
+ if test -n "$svn_sqlite_dso_ldflags"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${svn_sqlite_dso_ldflags}" >&5
+$as_echo "${svn_sqlite_dso_ldflags}" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+ fi
+
+
+$as_echo "#define SVN_SQLITE_INLINE 1" >>confdefs.h
+
+ SVN_SQLITE_INCLUDES="-I`dirname $sqlite_amalg`"
+ if test -n "$svn_sqlite_dso_ldflags"; then
+ SVN_SQLITE_LIBS="$svn_sqlite_dso_ldflags -lpthread"
+ else
+ SVN_SQLITE_LIBS="-lpthread"
+ fi
+ svn_lib_sqlite="yes"
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported amalgamation SQLite version" >&5
+$as_echo "unsupported amalgamation SQLite version" >&6; }
+fi
+rm -f conftest*
+
+ fi
+
+ fi
+
+ if test -z "$svn_lib_sqlite"; then
+
if test -z ""; then
sqlite_dir=""
sqlite_include="sqlite3.h"
@@ -6633,6 +7011,10 @@ $as_echo "no" >&6; }
echo "unpack the archive using unzip and rename the resulting"
echo "directory to:"
echo "$abs_srcdir/sqlite-amalgamation"
+ if test x"$abs_srcdir" != x"$abs_builddir"; then
+ echo "or to:"
+ echo "$abs_builddir/sqlite-amalgamation"
+ fi
echo ""
as_fn_error $? "Subversion requires SQLite" "$LINENO" 5
@@ -17537,6 +17919,7 @@ powerpc-apple-darwin*)
SVN_FS_WANT_DB_PATCH=14
;;
esac
+db_alt_version="5.x"
# Look for libdb4.so first:
db_version=$SVN_FS_WANT_DB_MAJOR.$SVN_FS_WANT_DB_MINOR.$SVN_FS_WANT_DB_PATCH
@@ -17624,6 +18007,14 @@ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for availability of Berkeley DB" >&5
$as_echo_n "checking for availability of Berkeley DB... " >&6; }
+ # Check whether --enable-bdb6 was given.
+if test "${enable_bdb6+set}" = set; then :
+ enableval=$enable_bdb6; enable_bdb6=$enableval
+else
+ enable_bdb6=unspecified
+fi
+
+
svn_lib_berkeley_db_try_save_cppflags="$CPPFLAGS"
svn_lib_berkeley_db_try_save_libs="$LIBS"
@@ -17631,6 +18022,7 @@ $as_echo_n "checking for availability of
svn_check_berkeley_db_major=$SVN_FS_WANT_DB_MAJOR
svn_check_berkeley_db_minor=$SVN_FS_WANT_DB_MINOR
svn_check_berkeley_db_patch=$SVN_FS_WANT_DB_PATCH
+ enable_bdb6=$enable_bdb6
if test -z "$SVN_DB_LIBS"; then
# We pass --dbm-libs here since Debian has modified apu-config not
@@ -17673,6 +18065,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+#include <string.h>
#include <stdlib.h>
$svn_db_header
@@ -17688,6 +18081,12 @@ int main ()
|| patch != DB_VERSION_PATCH)
exit (1);
+ /* Block Berkeley DB 6, because (a) we haven't tested with it, (b) 6.0.20
+ and newer are under the AGPL, and we want use of AGPL dependencies to be
+ opt-in. */
+ if (major >= 6 && strcmp("$enable_bdb6", "yes"))
+ exit(2);
+
/* Run-time check: ensure the library claims to be the correct version. */
if (major < $svn_check_berkeley_db_major)
@@ -17710,7 +18109,11 @@ _ACEOF
if ac_fn_c_try_run "$LINENO"; then :
svn_have_berkeley_db=yes
else
- svn_have_berkeley_db=no
+ rc=$?
+ svn_have_berkeley_db=no
+ if test $rc = 2; then
+ svn_have_berkeley_db=no6
+ fi
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -17726,11 +18129,17 @@ fi
$as_echo "yes" >&6; }
svn_lib_berkeley_db=yes
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ if test "$svn_have_berkeley_db" = "no6"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (found version 6, but --enable-bdb6 not specified)" >&5
+$as_echo "no (found version 6, but --enable-bdb6 not specified)" >&6; }
+ # A warning will be printed at the end of configure.ac.
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
+ fi
svn_lib_berkeley_db=no
if test "$bdb_status" = "required"; then
- as_fn_error $? "Berkeley DB $db_version or newer wasn't found." "$LINENO" 5
+ as_fn_error $? "Berkeley DB $db_version or $db_alt_version wasn't found." "$LINENO" 5
fi
fi
fi
@@ -21156,6 +21565,18 @@ $as_echo "$as_me: Disabling optimization
# # do nothing
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: C compiler flags: $CFLAGS" >&5
+$as_echo "$as_me: C compiler flags: $CFLAGS" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: user-defined: $CUSERFLAGS" >&5
+$as_echo "$as_me: user-defined: $CUSERFLAGS" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: maintainer-mode: $CMAINTAINERFLAGS" >&5
+$as_echo "$as_me: maintainer-mode: $CMAINTAINERFLAGS" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: C++ compiler flags: $CXXFLAGS" >&5
+$as_echo "$as_me: C++ compiler flags: $CXXFLAGS" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: user-defined: $CXXUSERFLAGS" >&5
+$as_echo "$as_me: user-defined: $CXXUSERFLAGS" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: maintainer-mode: $CXXMAINTAINERFLAGS" >&5
+$as_echo "$as_me: maintainer-mode: $CXXMAINTAINERFLAGS" >&6;}
# Check whether --enable-full-version-match was given.
if test "${enable_full_version_match+set}" = set; then :
@@ -25315,7 +25736,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by subversion $as_me 1.8.0, which was
+This file was extended by subversion $as_me 1.8.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25381,7 +25802,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-subversion config.status 1.8.0
+subversion config.status 1.8.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -27295,30 +27716,51 @@ fi
# ==== Print final messages to user ==========================================
-if test "$svn_lib_berkeley_db" = "no" && test "$with_berkeley_db" != "no"; then
- db_version="$SVN_FS_WANT_DB_MAJOR.$SVN_FS_WANT_DB_MINOR.$SVN_FS_WANT_DB_PATCH"
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: we have configured without BDB filesystem support
+if test "$svn_have_berkeley_db" = "no6" && test "$enable_bdb6" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: We have configured without BDB filesystem support
+
+
+Berkeley DB 6 was found, but not used. Please re-run configure (see
+./config.nice) with the '--enable-bdb6' flag to use it,
+or explicitly specify '--disable-bdb6' or '--without-berkeley-db'
+to silence this warning.
+Please note that some versions of Berkeley DB 6+ are under the GNU Affero
+General Public License, version 3:
+https://oss.oracle.com/pipermail/bdb/2013-June/000056.html
-You don't seem to have Berkeley DB version $db_version or newer
-installed and linked to APR-UTIL. We have created a Makefile which will build
-Subversion without support for the Berkeley DB back-end. You can find the
-latest version of Berkeley DB here:
+The AGPL-3.0 licence may impose special requirements for making available
+source code of server-side software. The text of the licence is:
+https://www.gnu.org/licenses/agpl-3.0.html
+http://opensource.org/licenses/AGPL-3.0
- http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html
+The Berkeley DB backend to Subversion is deprecated; see
+http://subversion.apache.org/docs/release-notes/1.8#bdb-deprecated
-or explicitly specify --without-berkeley-db to silence this warning.
+The Subversion developers have not tested Subversion with Berkeley DB 6 for
+technical problems or bugs.
" >&5
-$as_echo "$as_me: WARNING: we have configured without BDB filesystem support
+$as_echo "$as_me: WARNING: We have configured without BDB filesystem support
+
+
+Berkeley DB 6 was found, but not used. Please re-run configure (see
+./config.nice) with the '--enable-bdb6' flag to use it,
+or explicitly specify '--disable-bdb6' or '--without-berkeley-db'
+to silence this warning.
+Please note that some versions of Berkeley DB 6+ are under the GNU Affero
+General Public License, version 3:
+https://oss.oracle.com/pipermail/bdb/2013-June/000056.html
-You don't seem to have Berkeley DB version $db_version or newer
-installed and linked to APR-UTIL. We have created a Makefile which will build
-Subversion without support for the Berkeley DB back-end. You can find the
-latest version of Berkeley DB here:
+The AGPL-3.0 licence may impose special requirements for making available
+source code of server-side software. The text of the licence is:
+https://www.gnu.org/licenses/agpl-3.0.html
+http://opensource.org/licenses/AGPL-3.0
- http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html
+The Berkeley DB backend to Subversion is deprecated; see
+http://subversion.apache.org/docs/release-notes/1.8#bdb-deprecated
-or explicitly specify --without-berkeley-db to silence this warning.
+The Subversion developers have not tested Subversion with Berkeley DB 6 for
+technical problems or bugs.
" >&2;}
fi
Modified: vendor/subversion/dist/configure.ac
==============================================================================
--- vendor/subversion/dist/configure.ac Sun Jul 28 04:53:00 2013 (r253727)
+++ vendor/subversion/dist/configure.ac Sun Jul 28 05:04:41 2013 (r253728)
@@ -460,6 +460,7 @@ powerpc-apple-darwin*)
SVN_FS_WANT_DB_PATCH=14
;;
esac
+db_alt_version="5.x"
# Look for libdb4.so first:
SVN_LIB_BERKELEY_DB($SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MINOR,
$SVN_FS_WANT_DB_PATCH, [db4 db])
@@ -1117,6 +1118,13 @@ elif test "$enable_optimization" = "no";
# # do nothing
fi
+dnl Dump the current compiler options
+AC_MSG_NOTICE([C compiler flags: $CFLAGS])
+AC_MSG_NOTICE([ user-defined: $CUSERFLAGS])
+AC_MSG_NOTICE([ maintainer-mode: $CMAINTAINERFLAGS])
+AC_MSG_NOTICE([C++ compiler flags: $CXXFLAGS])
+AC_MSG_NOTICE([ user-defined: $CXXUSERFLAGS])
+AC_MSG_NOTICE([ maintainer-mode: $CXXMAINTAINERFLAGS])
AC_ARG_ENABLE(full-version-match,
AS_HELP_STRING([--disable-full-version-match],
@@ -1504,18 +1512,28 @@ dnl Configure is long - users tend to mi
dnl Hence, print a warnings about what we did and didn't configure at the
dnl end, where people will actually see them.
-if test "$svn_lib_berkeley_db" = "no" && test "$with_berkeley_db" != "no"; then
- db_version="$SVN_FS_WANT_DB_MAJOR.$SVN_FS_WANT_DB_MINOR.$SVN_FS_WANT_DB_PATCH"
- AC_MSG_WARN([we have configured without BDB filesystem support
+if test "$svn_have_berkeley_db" = "no6" && test "$enable_bdb6" != "no"; then
+ AC_MSG_WARN([We have configured without BDB filesystem support
-You don't seem to have Berkeley DB version $db_version or newer
-installed and linked to APR-UTIL. We have created a Makefile which will build
-Subversion without support for the Berkeley DB back-end. You can find the
-latest version of Berkeley DB here:
+Berkeley DB 6 was found, but not used. Please re-run configure (see
+./config.nice) with the '--enable-bdb6' flag to use it,
+or explicitly specify '--disable-bdb6' or '--without-berkeley-db'
+to silence this warning.
- http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html
+Please note that some versions of Berkeley DB 6+ are under the GNU Affero
+General Public License, version 3:
+https://oss.oracle.com/pipermail/bdb/2013-June/000056.html
-or explicitly specify --without-berkeley-db to silence this warning.
+The AGPL-3.0 licence may impose special requirements for making available
+source code of server-side software. The text of the licence is:
+https://www.gnu.org/licenses/agpl-3.0.html
+http://opensource.org/licenses/AGPL-3.0
+
+The Berkeley DB backend to Subversion is deprecated; see
+http://subversion.apache.org/docs/release-notes/1.8#bdb-deprecated
+
+The Subversion developers have not tested Subversion with Berkeley DB 6 for
+technical problems or bugs.
])
fi
Modified: vendor/subversion/dist/get-deps.sh
==============================================================================
--- vendor/subversion/dist/get-deps.sh Sun Jul 28 04:53:00 2013 (r253727)
+++ vendor/subversion/dist/get-deps.sh Sun Jul 28 05:04:41 2013 (r253728)
@@ -37,7 +37,7 @@ SERF_VERSION=${SERF_VERSION:-"1.2.1"}
ZLIB_VERSION=${ZLIB_VERSION:-"1.2.8"}
SQLITE_VERSION=${SQLITE_VERSION:-"3.7.15.1"}
GTEST_VERSION=${GTEST_VERSION:-"1.6.0"}
-HTTPD_VERSION=${HTTPD_VERSION:-"2.4.3"}
+HTTPD_VERSION=${HTTPD_VERSION:-"2.4.6"}
APR_ICONV_VERSION=${APR_ICONV_VERSION:-"1.2.1"}
APR=apr-${APR_VERSION}
Modified: vendor/subversion/dist/subversion/include/private/svn_client_private.h
==============================================================================
--- vendor/subversion/dist/subversion/include/private/svn_client_private.h Sun Jul 28 04:53:00 2013 (r253727)
+++ vendor/subversion/dist/subversion/include/private/svn_client_private.h Sun Jul 28 05:04:41 2013 (r253728)
@@ -291,6 +291,39 @@ svn_client__copy_foreign(const char *url
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool);
+/* Same as the public svn_client_mergeinfo_log2 API, except for the addition
+ * of the TARGET_MERGEINFO_CATALOG and RESULT_POOL parameters.
+ *
+ * If TARGET_MERGEINFO_CATALOG is NULL then this acts exactly as the public
+ * API. If *TARGET_MERGEINFO_CATALOG is NULL, then *TARGET_MERGEINFO_CATALOG
+ * is set to the a mergeinfo catalog representing the mergeinfo on
+ * TARGET_PATH_OR_URL at TARGET_PEG_REVISION at DEPTH, (like the public API only
+ * depths of svn_depth_empty or svn_depth_infinity are supported) allocated in
+ * RESULT_POOL. Finally, if *TARGET_MERGEINFO_CATALOG is non-NULL, then it is
+ * assumed to be a mergeinfo catalog representing the mergeinfo on
+ * TARGET_PATH_OR_URL at TARGET_PEG_REVISION at DEPTH.
+ *
+ * The keys for the subtree mergeinfo are the repository root-relative
+ * paths of TARGET_PATH_OR_URL and/or its subtrees, regardless of whether
+ * TARGET_PATH_OR_URL is a URL or WC path.
+ */
+svn_error_t *
+svn_client__mergeinfo_log(svn_boolean_t finding_merged,
+ const char *target_path_or_url,
+ const svn_opt_revision_t *target_peg_revision,
+ svn_mergeinfo_catalog_t *target_mergeinfo_catalog,
+ const char *source_path_or_url,
+ const svn_opt_revision_t *source_peg_revision,
+ const svn_opt_revision_t *source_start_revision,
+ const svn_opt_revision_t *source_end_revision,
+ svn_log_entry_receiver_t log_receiver,
+ void *log_receiver_baton,
+ svn_boolean_t discover_changed_paths,
+ svn_depth_t depth,
+ const apr_array_header_t *revprops,
+ svn_client_ctx_t *ctx,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
#ifdef __cplusplus
}
Modified: vendor/subversion/dist/subversion/include/private/svn_io_private.h
==============================================================================
--- vendor/subversion/dist/subversion/include/private/svn_io_private.h Sun Jul 28 04:53:00 2013 (r253727)
+++ vendor/subversion/dist/subversion/include/private/svn_io_private.h Sun Jul 28 05:04:41 2013 (r253728)
@@ -90,6 +90,11 @@ svn_stream__set_is_buffered(svn_stream_t
svn_boolean_t
svn_stream__is_buffered(svn_stream_t *stream);
+/** Return the underlying file, if any, associated with the stream, or
+ * NULL if not available. Accessing the file bypasses the stream.
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-vendor
mailing list