Import svn-1.8.5. This contains a user-visible fix for svn:externals
handling (there are no svn:externals in freebsd repo), and two security fixes for modules that we don't build for the apache http server stack.
This commit is contained in:
Peter Wemm
commit
949ef25c23
@ -1,3 +1,33 @@
|
||||
Version 1.8.5
|
||||
(25 November 2013, from /branches/1.8.x)
|
||||
http://svn.apache.org/repos/asf/subversion/tags/1.8.5
|
||||
|
||||
User-visible changes:
|
||||
- Client-side bugfixes:
|
||||
* fix externals that point at redirected locations (issues #4428, #4429)
|
||||
* diff: fix assertion with move inside a copy (issue #4444)
|
||||
|
||||
- Server-side bugfixes:
|
||||
* mod_dav_svn: Prevent crashes with some 3rd party modules (r1537360 et al)
|
||||
* mod_dav_svn: canonicalize paths properly (r1542071)
|
||||
* mod_authz_svn: fix crash of mod_authz_svn with invalid config (r1541432)
|
||||
* hotcopy: fix hotcopy losing revprop files in packed repos (issue #4448)
|
||||
|
||||
- Other tool improvements and bugfixes:
|
||||
* mod_dontdothat: Fix the uri parser (r1542069 et al)
|
||||
|
||||
Developer-visible changes:
|
||||
- General:
|
||||
* fix compilation with '--enable-optimize' with clang (r1534860)
|
||||
* fix copmpilation with debug build of BDB on Windows (r1501656, r1501702)
|
||||
* fix '--with-openssl' option when building on Windows (r1535139)
|
||||
* add test to fail when built against broken ZLib (r1537193 et al)
|
||||
|
||||
- Bindings:
|
||||
* swig-rb: fix tests to run without installing on OS X (r1535161)
|
||||
* ctypes-python: build with compiler selected via configure (r1536537)
|
||||
|
||||
|
||||
Version 1.8.4
|
||||
(29 October 2013, from /branches/1.8.x)
|
||||
http://svn.apache.org/repos/asf/subversion/tags/1.8.4
|
||||
@ -32,7 +62,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.4
|
||||
* allow compiling against serf 1.3 and later on Windows (r1517123)
|
||||
|
||||
- Bindings:
|
||||
* javahl: canonicalize path for streaFileContent method (r1524869)
|
||||
* javahl: canonicalize path for streamFileContent method (r1524869)
|
||||
|
||||
|
||||
Version 1.8.3
|
||||
@ -523,6 +553,36 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.0
|
||||
* fix some reference counting bugs in swig-py bindings (r1464899, r1466524)
|
||||
|
||||
|
||||
Version 1.7.14
|
||||
(25 Nov 2013, from /branches/1.7.x)
|
||||
http://svn.apache.org/repos/asf/subversion/tags/1.7.14
|
||||
|
||||
User-visible changes:
|
||||
- Client- and server-side bugfixes:
|
||||
* fix assertion on urls of the form 'file://./' (r1516806)
|
||||
|
||||
- Client-side bugfixes:
|
||||
* upgrade: fix an assertion when used with pre-1.3 wcs (r1530849)
|
||||
* ra_local: fix error with repository in Windows drive root (r1518184)
|
||||
* fix crash on windows when piped command is interrupted (r1522892)
|
||||
* fix externals that point at redirected locations (issues #4428, #4429)
|
||||
* diff: fix incorrect calculation of changes in some cases (issue #4283)
|
||||
* diff: fix errors with added/deleted targets (issues #4153, #4421)
|
||||
|
||||
- Server-side bugfixes:
|
||||
* mod_dav_svn: Prevent crashes with some 3rd party modules (r1537360 et al)
|
||||
* fix OOM on concurrent requests at threaded server start (r1527103 et al)
|
||||
* fsfs: limit commit time of files with deep change histories (r1536790)
|
||||
* mod_dav_svn: canonicalize paths properly (r1542071)
|
||||
|
||||
- Other tool improvements and bugfixes:
|
||||
* mod_dontdothat: Fix the uri parser (r1542069 et al)
|
||||
|
||||
Developer-visible changes:
|
||||
- Bindings:
|
||||
* javahl: canonicalize path for streamFileContent method (r1524869)
|
||||
|
||||
|
||||
Version 1.7.13
|
||||
(29 Aug 2013, from /branches/1.7.x)
|
||||
http://svn.apache.org/repos/asf/subversion/tags/1.7.13
|
||||
|
||||
@ -108,6 +108,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
|
||||
|
||||
CC = @CC@
|
||||
CXX = @CXX@
|
||||
CPP = @CPP@
|
||||
EXEEXT = @EXEEXT@
|
||||
|
||||
SHELL = @SHELL@
|
||||
@ -331,7 +332,7 @@ INSTALL_EXTRA_SWIG_RB=\
|
||||
# export an env variable so that the tests can run without being installed
|
||||
TEST_SHLIB_VAR_SWIG_RB=\
|
||||
if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \
|
||||
for d in $(SWIG_PY_DIR)/libsvn_swig_rb $(SWIG_PY_DIR)/../../../libsvn_*; do \
|
||||
for d in $(SWIG_RB_DIR)/libsvn_swig_ruby $(SWIG_RB_DIR)/../../../libsvn_*; do \
|
||||
if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
|
||||
@SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
|
||||
else \
|
||||
@ -871,7 +872,7 @@ install-swig-rb-doc:
|
||||
|
||||
# ctypes-python make targets
|
||||
ctypes-python: local-all
|
||||
$(SHELL) $(abs_srcdir)/build/run_ctypesgen.sh "$(LT_EXECUTE)" "$(CPPFLAGS)" "$(EXTRA_CTYPES_LDFLAGS)" "$(PYTHON)" "$(CTYPESGEN)" "$(abs_srcdir)" "$(abs_builddir)" "$(libdir)" "$(SVN_APR_CONFIG)" "$(SVN_APRUTIL_CONFIG)"
|
||||
$(SHELL) $(abs_srcdir)/build/run_ctypesgen.sh "$(LT_EXECUTE)" "$(CPPFLAGS)" "$(EXTRA_CTYPES_LDFLAGS)" "$(PYTHON)" "$(CTYPESGEN)" "$(abs_srcdir)" "$(abs_builddir)" "$(libdir)" "$(SVN_APR_CONFIG)" "$(SVN_APRUTIL_CONFIG)" "$(CPP)"
|
||||
|
||||
install-ctypes-python: ctypes-python
|
||||
cd $(CTYPES_PYTHON_SRC_DIR); \
|
||||
|
||||
@ -115,7 +115,7 @@ checksum_test_PATH = subversion/tests/libsvn_subr
|
||||
checksum_test_DEPS = subversion/tests/libsvn_subr/checksum-test.lo subversion/tests/libsvn_test-1.la subversion/libsvn_subr/libsvn_subr-1.la
|
||||
checksum_test_OBJECTS = checksum-test.lo
|
||||
subversion/tests/libsvn_subr/checksum-test$(EXEEXT): $(checksum_test_DEPS)
|
||||
cd subversion/tests/libsvn_subr && $(LINK) $(checksum_test_LDFLAGS) -o checksum-test$(EXEEXT) $(checksum_test_OBJECTS) ../../../subversion/tests/libsvn_test-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) $(LIBS)
|
||||
cd subversion/tests/libsvn_subr && $(LINK) $(checksum_test_LDFLAGS) -o checksum-test$(EXEEXT) $(checksum_test_OBJECTS) ../../../subversion/tests/libsvn_test-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) $(SVN_ZLIB_LIBS) $(LIBS)
|
||||
|
||||
client_test_PATH = subversion/tests/libsvn_client
|
||||
client_test_DEPS = subversion/tests/libsvn_client/client-test.lo subversion/tests/libsvn_test-1.la subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
|
||||
@ -2851,7 +2851,7 @@ subversion/tests/libsvn_wc/wc-test.lo: subversion/tests/libsvn_wc/wc-test.c subv
|
||||
|
||||
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
|
||||
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/include/svn_utf.h subversion/svn_private_config.h subversion/tests/svn_test.h
|
||||
|
||||
tools/client-side/svn-bench/help-cmd.lo: tools/client-side/svn-bench/help-cmd.c subversion/include/private/svn_debug.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_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/client-side/svn-bench/cl.h
|
||||
|
||||
@ -2881,7 +2881,7 @@ tools/diff/diff4.lo: tools/diff/diff4.c subversion/include/private/svn_debug.h s
|
||||
|
||||
tools/server-side/fsfs-stats.lo: tools/server-side/fsfs-stats.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.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_iter.h subversion/include/svn_pools.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
|
||||
|
||||
tools/server-side/mod_dontdothat/mod_dontdothat.lo: tools/server-side/mod_dontdothat/mod_dontdothat.c subversion/include/mod_dav_svn.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h
|
||||
tools/server-side/mod_dontdothat/mod_dontdothat.lo: tools/server-side/mod_dontdothat/mod_dontdothat.c subversion/include/mod_dav_svn.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_config.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_string.h subversion/include/svn_types.h
|
||||
if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)tools/server-side/mod_dontdothat/mod_dontdothat.c ; else echo "fake" > tools/server-side/mod_dontdothat/mod_dontdothat.lo ; fi
|
||||
|
||||
tools/server-side/svn-populate-node-origins-index.lo: tools/server-side/svn-populate-node-origins-index.c 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_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
|
||||
|
||||
@ -766,7 +766,7 @@ type = exe
|
||||
path = subversion/tests/libsvn_subr
|
||||
sources = checksum-test.c
|
||||
install = test
|
||||
libs = libsvn_test libsvn_subr apr
|
||||
libs = libsvn_test libsvn_subr apr zlib
|
||||
|
||||
[compat-test]
|
||||
description = Test compatibility functions
|
||||
|
||||
96
contrib/subversion/configure
vendored
96
contrib/subversion/configure
vendored
@ -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.4.
|
||||
# Generated by GNU Autoconf 2.69 for subversion 1.8.5.
|
||||
#
|
||||
# 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.4'
|
||||
PACKAGE_STRING='subversion 1.8.4'
|
||||
PACKAGE_VERSION='1.8.5'
|
||||
PACKAGE_STRING='subversion 1.8.5'
|
||||
PACKAGE_BUGREPORT='http://subversion.apache.org/'
|
||||
PACKAGE_URL=''
|
||||
|
||||
@ -1456,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.4 to adapt to many kinds of systems.
|
||||
\`configure' configures subversion 1.8.5 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1522,7 +1522,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of subversion 1.8.4:";;
|
||||
short | recursive ) echo "Configuration of subversion 1.8.5:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1736,7 +1736,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
subversion configure 1.8.4
|
||||
subversion configure 1.8.5
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@ -2280,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.4, which was
|
||||
It was created by subversion $as_me 1.8.5, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -2660,8 +2660,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
|
||||
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Subversion 1.8.4" >&5
|
||||
$as_echo "$as_me: Configuring Subversion 1.8.4" >&6;}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Subversion 1.8.5" >&5
|
||||
$as_echo "$as_me: Configuring Subversion 1.8.5" >&6;}
|
||||
|
||||
abs_srcdir="`cd $srcdir && pwd`"
|
||||
|
||||
@ -21158,43 +21158,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
|
||||
$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
|
||||
|
||||
|
||||
|
||||
_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 -fwhole-program" >&5
|
||||
$as_echo_n "checking if $CC accepts -fwhole-program... " >&6; }
|
||||
CFLAGS="-fwhole-program $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
|
||||
@ -21501,43 +21464,6 @@ if ac_fn_cxx_try_compile "$LINENO"; then :
|
||||
$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
|
||||
|
||||
|
||||
|
||||
_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 -fwhole-program" >&5
|
||||
$as_echo_n "checking if $CXX accepts -fwhole-program... " >&6; }
|
||||
CXXFLAGS="-fwhole-program $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
|
||||
@ -25736,7 +25662,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# 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.4, which was
|
||||
This file was extended by subversion $as_me 1.8.5, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -25802,7 +25728,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.4
|
||||
subversion config.status 1.8.5
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
@ -1089,7 +1089,6 @@ if test "$enable_optimization" = "yes"; then
|
||||
SVN_CFLAGS_ADD_IFELSE([-O])])])])
|
||||
SVN_CFLAGS_ADD_IFELSE([-Wno-clobbered])
|
||||
SVN_CFLAGS_ADD_IFELSE([-flto])
|
||||
SVN_CFLAGS_ADD_IFELSE([-fwhole-program])
|
||||
fi
|
||||
fi
|
||||
if test -z ["`echo $CXXUSERFLAGS' ' | $EGREP -- '-O[^ ]* '`"]; then
|
||||
@ -1106,7 +1105,6 @@ if test "$enable_optimization" = "yes"; then
|
||||
SVN_CXXFLAGS_ADD_IFELSE([-O])])])])
|
||||
SVN_CXXFLAGS_ADD_IFELSE([-Wno-clobbered])
|
||||
SVN_CXXFLAGS_ADD_IFELSE([-flto])
|
||||
SVN_CXXFLAGS_ADD_IFELSE([-fwhole-program])
|
||||
fi
|
||||
fi
|
||||
elif test "$enable_optimization" = "no"; then
|
||||
|
||||
@ -72,7 +72,7 @@ extern "C" {
|
||||
*
|
||||
* @since New in 1.1.
|
||||
*/
|
||||
#define SVN_VER_PATCH 4
|
||||
#define SVN_VER_PATCH 5
|
||||
|
||||
|
||||
/** @deprecated Provided for backward compatibility with the 1.0 API. */
|
||||
@ -95,7 +95,7 @@ extern "C" {
|
||||
*
|
||||
* Always change this at the same time as SVN_VER_NUMTAG.
|
||||
*/
|
||||
#define SVN_VER_TAG " (r1534716)"
|
||||
#define SVN_VER_TAG " (r1542147)"
|
||||
|
||||
|
||||
/** Number tag: a string describing the version.
|
||||
@ -121,7 +121,7 @@ extern "C" {
|
||||
* When rolling a tarball, we automatically replace it with what we
|
||||
* guess to be the correct revision number.
|
||||
*/
|
||||
#define SVN_VER_REVISION 1534716
|
||||
#define SVN_VER_REVISION 1542147
|
||||
|
||||
|
||||
/* Version strings composed from the above definitions. */
|
||||
|
||||
@ -737,7 +737,7 @@ handle_external_item_change(svn_client_ctx_t *ctx,
|
||||
switch (ext_kind)
|
||||
{
|
||||
case svn_node_dir:
|
||||
SVN_ERR(switch_dir_external(local_abspath, new_url,
|
||||
SVN_ERR(switch_dir_external(local_abspath, new_loc->url,
|
||||
&(new_item->peg_revision),
|
||||
&(new_item->revision),
|
||||
parent_dir_abspath,
|
||||
|
||||
@ -11293,16 +11293,18 @@ hotcopy_body(void *baton, apr_pool_t *pool)
|
||||
SVN_ERR(hotcopy_remove_rev_files(dst_fs, rev,
|
||||
rev + max_files_per_dir,
|
||||
max_files_per_dir, iterpool));
|
||||
SVN_ERR(hotcopy_remove_revprop_files(dst_fs, rev,
|
||||
rev + max_files_per_dir,
|
||||
max_files_per_dir, iterpool));
|
||||
if (dst_ffd->format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT)
|
||||
SVN_ERR(hotcopy_remove_revprop_files(dst_fs, rev,
|
||||
rev + max_files_per_dir,
|
||||
max_files_per_dir,
|
||||
iterpool));
|
||||
}
|
||||
|
||||
/* Now that all revisions have moved into the pack, the original
|
||||
* rev dir can be removed. */
|
||||
SVN_ERR(remove_folder(path_rev_shard(dst_fs, rev, iterpool),
|
||||
cancel_func, cancel_baton, iterpool));
|
||||
if (rev > 0)
|
||||
if (rev > 0 && dst_ffd->format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT)
|
||||
SVN_ERR(remove_folder(path_revprops_shard(dst_fs, rev, iterpool),
|
||||
cancel_func, cancel_baton, iterpool));
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* This file is automatically generated from rep-cache-db.sql and .dist_sandbox/subversion-1.8.4/subversion/libsvn_fs_fs/token-map.h.
|
||||
/* This file is automatically generated from rep-cache-db.sql and .dist_sandbox/subversion-1.8.5/subversion/libsvn_fs_fs/token-map.h.
|
||||
* Do not edit this file -- edit the source and rerun gen-make.py */
|
||||
|
||||
#define STMT_CREATE_SCHEMA 0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* This file is automatically generated from internal_statements.sql and .dist_sandbox/subversion-1.8.4/subversion/libsvn_subr/token-map.h.
|
||||
/* This file is automatically generated from internal_statements.sql and .dist_sandbox/subversion-1.8.5/subversion/libsvn_subr/token-map.h.
|
||||
* Do not edit this file -- edit the source and rerun gen-make.py */
|
||||
|
||||
#define STMT_INTERNAL_SAVEPOINT_SVN 0
|
||||
|
||||
@ -38,7 +38,9 @@
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/* Reports the file LOCAL_ABSPATH as ADDED file with relpath RELPATH to
|
||||
/* A function to diff locally added and locally copied files.
|
||||
|
||||
Reports the file LOCAL_ABSPATH as ADDED file with relpath RELPATH to
|
||||
PROCESSOR with as parent baton PROCESSOR_PARENT_BATON.
|
||||
|
||||
The node is expected to have status svn_wc__db_status_normal, or
|
||||
@ -61,7 +63,9 @@ svn_wc__diff_local_only_file(svn_wc__db_t *db,
|
||||
void *cancel_baton,
|
||||
apr_pool_t *scratch_pool);
|
||||
|
||||
/* Reports the directory LOCAL_ABSPATH and everything below it (limited by
|
||||
/* A function to diff locally added and locally copied directories.
|
||||
|
||||
Reports the directory LOCAL_ABSPATH and everything below it (limited by
|
||||
DEPTH) as added with relpath RELPATH to PROCESSOR with as parent baton
|
||||
PROCESSOR_PARENT_BATON.
|
||||
|
||||
|
||||
@ -391,7 +391,7 @@ diff_status_callback(void *baton,
|
||||
}
|
||||
}
|
||||
|
||||
if (local_only)
|
||||
if (local_only && (db_status != svn_wc__db_status_deleted))
|
||||
{
|
||||
if (db_kind == svn_node_file)
|
||||
SVN_ERR(svn_wc__diff_local_only_file(db, child_abspath,
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* This file is automatically generated from wc-checks.sql and .dist_sandbox/subversion-1.8.4/subversion/libsvn_wc/token-map.h.
|
||||
/* This file is automatically generated from wc-checks.sql and .dist_sandbox/subversion-1.8.5/subversion/libsvn_wc/token-map.h.
|
||||
* Do not edit this file -- edit the source and rerun gen-make.py */
|
||||
|
||||
#define STMT_VERIFICATION_TRIGGERS 0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* This file is automatically generated from wc-metadata.sql and .dist_sandbox/subversion-1.8.4/subversion/libsvn_wc/token-map.h.
|
||||
/* This file is automatically generated from wc-metadata.sql and .dist_sandbox/subversion-1.8.5/subversion/libsvn_wc/token-map.h.
|
||||
* Do not edit this file -- edit the source and rerun gen-make.py */
|
||||
|
||||
#define STMT_CREATE_SCHEMA 0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* This file is automatically generated from wc-queries.sql and .dist_sandbox/subversion-1.8.4/subversion/libsvn_wc/token-map.h.
|
||||
/* This file is automatically generated from wc-queries.sql and .dist_sandbox/subversion-1.8.5/subversion/libsvn_wc/token-map.h.
|
||||
* Do not edit this file -- edit the source and rerun gen-make.py */
|
||||
|
||||
#define STMT_SELECT_NODE_INFO 0
|
||||
|
||||
@ -105,7 +105,7 @@
|
||||
#define PACKAGE_NAME "subversion"
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
#define PACKAGE_STRING "subversion 1.8.4"
|
||||
#define PACKAGE_STRING "subversion 1.8.5"
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#define PACKAGE_TARNAME "subversion"
|
||||
@ -114,7 +114,7 @@
|
||||
#define PACKAGE_URL ""
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#define PACKAGE_VERSION "1.8.4"
|
||||
#define PACKAGE_VERSION "1.8.5"
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#define STDC_HEADERS 1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user