From owner-svn-src-vendor@FreeBSD.ORG Mon Nov 25 17:44:07 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B9088E02; Mon, 25 Nov 2013 17:44:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A56822B66; Mon, 25 Nov 2013 17:44:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPHi7ZR041819; Mon, 25 Nov 2013 17:44:07 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPHi4OE041796; Mon, 25 Nov 2013 17:44:04 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201311251744.rAPHi4OE041796@svn.freebsd.org> From: Peter Wemm Date: Mon, 25 Nov 2013 17:44:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r258567 - in vendor/subversion/dist: . subversion/include subversion/libsvn_client subversion/libsvn_fs_fs subversion/libsvn_subr subversion/libsvn_wc X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2013 17:44:07 -0000 Author: peter Date: Mon Nov 25 17:44:04 2013 New Revision: 258567 URL: http://svnweb.freebsd.org/changeset/base/258567 Log: Import subversion-1.8.5 Modified: vendor/subversion/dist/CHANGES vendor/subversion/dist/Makefile.in vendor/subversion/dist/build-outputs.mk vendor/subversion/dist/build.conf vendor/subversion/dist/configure vendor/subversion/dist/configure.ac vendor/subversion/dist/subversion/include/svn_version.h vendor/subversion/dist/subversion/libsvn_client/externals.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_subr/internal_statements.h vendor/subversion/dist/subversion/libsvn_wc/diff.h vendor/subversion/dist/subversion/libsvn_wc/diff_local.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 Modified: vendor/subversion/dist/CHANGES ============================================================================== --- vendor/subversion/dist/CHANGES Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/CHANGES Mon Nov 25 17:44:04 2013 (r258567) @@ -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/subversi * 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/subversi * 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 Modified: vendor/subversion/dist/Makefile.in ============================================================================== --- vendor/subversion/dist/Makefile.in Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/Makefile.in Mon Nov 25 17:44:04 2013 (r258567) @@ -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); \ Modified: vendor/subversion/dist/build-outputs.mk ============================================================================== --- vendor/subversion/dist/build-outputs.mk Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/build-outputs.mk Mon Nov 25 17:44:04 2013 (r258567) @@ -115,7 +115,7 @@ checksum_test_PATH = subversion/tests/li 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: s 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 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 Modified: vendor/subversion/dist/build.conf ============================================================================== --- vendor/subversion/dist/build.conf Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/build.conf Mon Nov 25 17:44:04 2013 (r258567) @@ -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 Modified: vendor/subversion/dist/configure ============================================================================== --- vendor/subversion/dist/configure Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/configure Mon Nov 25 17:44:04 2013 (r258567) @@ -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 . # @@ -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/configu -{ $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`" @@ -21174,43 +21174,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLA 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 -$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 - - fi fi if test -z "`echo $CXXUSERFLAGS' ' | $EGREP -- '-O[^ ]* '`"; then @@ -21517,43 +21480,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLA 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 -$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 - - fi fi elif test "$enable_optimization" = "no"; then @@ -25736,7 +25662,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.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\\" Modified: vendor/subversion/dist/configure.ac ============================================================================== --- vendor/subversion/dist/configure.ac Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/configure.ac Mon Nov 25 17:44:04 2013 (r258567) @@ -1089,7 +1089,6 @@ if test "$enable_optimization" = "yes"; 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"; 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 Modified: vendor/subversion/dist/subversion/include/svn_version.h ============================================================================== --- vendor/subversion/dist/subversion/include/svn_version.h Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/subversion/include/svn_version.h Mon Nov 25 17:44:04 2013 (r258567) @@ -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. */ Modified: vendor/subversion/dist/subversion/libsvn_client/externals.c ============================================================================== --- vendor/subversion/dist/subversion/libsvn_client/externals.c Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/subversion/libsvn_client/externals.c Mon Nov 25 17:44:04 2013 (r258567) @@ -737,7 +737,7 @@ handle_external_item_change(svn_client_c 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, Modified: vendor/subversion/dist/subversion/libsvn_fs_fs/fs_fs.c ============================================================================== --- vendor/subversion/dist/subversion/libsvn_fs_fs/fs_fs.c Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/subversion/libsvn_fs_fs/fs_fs.c Mon Nov 25 17:44:04 2013 (r258567) @@ -11293,16 +11293,18 @@ hotcopy_body(void *baton, apr_pool_t *po 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)); } Modified: vendor/subversion/dist/subversion/libsvn_fs_fs/rep-cache-db.h ============================================================================== --- vendor/subversion/dist/subversion/libsvn_fs_fs/rep-cache-db.h Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/subversion/libsvn_fs_fs/rep-cache-db.h Mon Nov 25 17:44:04 2013 (r258567) @@ -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 Modified: vendor/subversion/dist/subversion/libsvn_subr/internal_statements.h ============================================================================== --- vendor/subversion/dist/subversion/libsvn_subr/internal_statements.h Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/subversion/libsvn_subr/internal_statements.h Mon Nov 25 17:44:04 2013 (r258567) @@ -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 Modified: vendor/subversion/dist/subversion/libsvn_wc/diff.h ============================================================================== --- vendor/subversion/dist/subversion/libsvn_wc/diff.h Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/subversion/libsvn_wc/diff.h Mon Nov 25 17:44:04 2013 (r258567) @@ -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_ 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. Modified: vendor/subversion/dist/subversion/libsvn_wc/diff_local.c ============================================================================== --- vendor/subversion/dist/subversion/libsvn_wc/diff_local.c Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/subversion/libsvn_wc/diff_local.c Mon Nov 25 17:44:04 2013 (r258567) @@ -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, Modified: vendor/subversion/dist/subversion/libsvn_wc/wc-checks.h ============================================================================== --- vendor/subversion/dist/subversion/libsvn_wc/wc-checks.h Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/subversion/libsvn_wc/wc-checks.h Mon Nov 25 17:44:04 2013 (r258567) @@ -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 Modified: vendor/subversion/dist/subversion/libsvn_wc/wc-metadata.h ============================================================================== --- vendor/subversion/dist/subversion/libsvn_wc/wc-metadata.h Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/subversion/libsvn_wc/wc-metadata.h Mon Nov 25 17:44:04 2013 (r258567) @@ -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 Modified: vendor/subversion/dist/subversion/libsvn_wc/wc-queries.h ============================================================================== --- vendor/subversion/dist/subversion/libsvn_wc/wc-queries.h Mon Nov 25 17:30:18 2013 (r258566) +++ vendor/subversion/dist/subversion/libsvn_wc/wc-queries.h Mon Nov 25 17:44:04 2013 (r258567) @@ -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 From owner-svn-src-vendor@FreeBSD.ORG Mon Nov 25 17:45:21 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4A4EEF35; Mon, 25 Nov 2013 17:45:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1FACC2B71; Mon, 25 Nov 2013 17:45:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPHjKuR042071; Mon, 25 Nov 2013 17:45:20 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPHjKhd042070; Mon, 25 Nov 2013 17:45:20 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201311251745.rAPHjKhd042070@svn.freebsd.org> From: Peter Wemm Date: Mon, 25 Nov 2013 17:45:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r258568 - vendor/subversion/subversion-1.8.5 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2013 17:45:21 -0000 Author: peter Date: Mon Nov 25 17:45:20 2013 New Revision: 258568 URL: http://svnweb.freebsd.org/changeset/base/258568 Log: Tag subversion-1.8.5 import Added: vendor/subversion/subversion-1.8.5/ - copied from r258567, vendor/subversion/dist/ From owner-svn-src-vendor@FreeBSD.ORG Mon Nov 25 18:28:35 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 12901666; Mon, 25 Nov 2013 18:28:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DC6CD2E32; Mon, 25 Nov 2013 18:28:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPISYO6075477; Mon, 25 Nov 2013 18:28:34 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPISYuV075476; Mon, 25 Nov 2013 18:28:34 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201311251828.rAPISYuV075476@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Mon, 25 Nov 2013 18:28:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r258571 - vendor/tcpdump/dist X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2013 18:28:35 -0000 Author: pfg Date: Mon Nov 25 18:28:34 2013 New Revision: 258571 URL: http://svnweb.freebsd.org/changeset/base/258571 Log: tcpdump Bring change from upstream. commit 772d6fbcf592209aa1ab1b61714e8ae72a5b1698 Author: Dmitrij Tejblum Date: Sun Jun 2 13:48:44 2013 +0400 Convert some versions of EXTRACT_{16,32,64}BITS() to inline functions. It removes the vast majority of strict-aliasing warnings from GCC. Modified: vendor/tcpdump/dist/extract.h Modified: vendor/tcpdump/dist/extract.h ============================================================================== --- vendor/tcpdump/dist/extract.h Mon Nov 25 18:11:55 2013 (r258570) +++ vendor/tcpdump/dist/extract.h Mon Nov 25 18:28:34 2013 (r258571) @@ -51,13 +51,25 @@ typedef struct { u_int32_t val; } __attribute__((packed)) unaligned_u_int32_t; -#define EXTRACT_16BITS(p) \ - ((u_int16_t)ntohs(((const unaligned_u_int16_t *)(p))->val)) -#define EXTRACT_32BITS(p) \ - ((u_int32_t)ntohl(((const unaligned_u_int32_t *)(p))->val)) -#define EXTRACT_64BITS(p) \ - ((u_int64_t)(((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) + 0)->val)) << 32 | \ - ((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) + 1)->val)) << 0)) +static inline u_int16_t +EXTRACT_16BITS(const void *p) +{ + return ((u_int16_t)ntohs(((const unaligned_u_int16_t *)(p))->val)); +} + +static inline u_int32_t +EXTRACT_32BITS(const void *p) +{ + return ((u_int32_t)ntohl(((const unaligned_u_int32_t *)(p))->val)); +} + +static inline u_int64_t +EXTRACT_64BITS(const void *p) +{ + return ((u_int64_t)(((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) + 0)->val)) << 32 | \ + ((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) + 1)->val)) << 0)); + +} #else /* HAVE___ATTRIBUTE__ */ /* @@ -88,13 +100,26 @@ typedef struct { * The processor natively handles unaligned loads, so we can just * cast the pointer and fetch through it. */ -#define EXTRACT_16BITS(p) \ - ((u_int16_t)ntohs(*(const u_int16_t *)(p))) -#define EXTRACT_32BITS(p) \ - ((u_int32_t)ntohl(*(const u_int32_t *)(p))) -#define EXTRACT_64BITS(p) \ - ((u_int64_t)(((u_int64_t)ntohl(*((const u_int32_t *)(p) + 0))) << 32 | \ - ((u_int64_t)ntohl(*((const u_int32_t *)(p) + 1))) << 0)) +static inline u_int16_t +EXTRACT_16BITS(const void *p) +{ + return ((u_int16_t)ntohs(*(const u_int16_t *)(p))); +} + +static inline u_int32_t +EXTRACT_32BITS(const void *p) +{ + return ((u_int32_t)ntohl(*(const u_int32_t *)(p))); +} + +static inline u_int64_t +EXTRACT_64BITS(const void *p) +{ + return ((u_int64_t)(((u_int64_t)ntohl(*((const u_int32_t *)(p) + 0))) << 32 | \ + ((u_int64_t)ntohl(*((const u_int32_t *)(p) + 1))) << 0)); + +} + #endif /* LBL_ALIGN */ #define EXTRACT_24BITS(p) \ From owner-svn-src-vendor@FreeBSD.ORG Mon Nov 25 18:30:31 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3F5007C8; Mon, 25 Nov 2013 18:30:31 +0000 (UTC) Received: from mail0.glenbarber.us (mail0.glenbarber.us [208.86.227.67]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 15F652E70; Mon, 25 Nov 2013 18:30:30 +0000 (UTC) Received: from glenbarber.us (70.15.88.86.res-cmts.sewb.ptd.net [70.15.88.86]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gjb) by mail0.glenbarber.us (Postfix) with ESMTPSA id 308D015FC7; Mon, 25 Nov 2013 18:30:29 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.8.3 mail0.glenbarber.us 308D015FC7 Authentication-Results: mail0.glenbarber.us; dkim=none reason="no signature"; dkim-adsp=none Date: Mon, 25 Nov 2013 13:30:27 -0500 From: Glen Barber To: "Pedro F. Giffuni" Subject: Re: svn commit: r258571 - vendor/tcpdump/dist Message-ID: <20131125183027.GU2310@glenbarber.us> References: <201311251828.rAPISYuV075476@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="eyYj78xbwv+yMvU1" Content-Disposition: inline In-Reply-To: <201311251828.rAPISYuV075476@svn.freebsd.org> X-Operating-System: FreeBSD 11.0-CURRENT amd64 User-Agent: Mutt/1.5.22 (2013-10-16) Cc: svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-vendor@freebsd.org X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2013 18:30:31 -0000 --eyYj78xbwv+yMvU1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Nov 25, 2013 at 06:28:34PM +0000, Pedro F. Giffuni wrote: > Author: pfg > Date: Mon Nov 25 18:28:34 2013 > New Revision: 258571 > URL: http://svnweb.freebsd.org/changeset/base/258571 >=20 > Log: > tcpdump Bring change from upstream. > =20 > commit 772d6fbcf592209aa1ab1b61714e8ae72a5b1698 > Author: Dmitrij Tejblum > Date: Sun Jun 2 13:48:44 2013 +0400 > =20 > Convert some versions of EXTRACT_{16,32,64}BITS() to inline functio= ns. > =20 > It removes the vast majority of strict-aliasing warnings from GCC. >=20 Thank you. Glen --eyYj78xbwv+yMvU1 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAEBCAAGBQJSk5dDAAoJELls3eqvi17QMF0QANGxtUGSYlAgp0/aPVbVjcIX A3RvhyLR2x6xp+c+Kjf3ZY/q3mZPkipwa23e4YXjiBS+IuTwtzNZ+gjN8NF9w3pm W82SUBzO/w/UCqJ/r3/Vt5AKVn7h3wMqU8oDii+y0tk0SdpBwJlSRnDZ44+d2hOO a/fGQVcw0MmNUtgMJGwRt1h/fgAS6jQsYxEvela2x1iHFa7zhaZ2GketeOdlvBNh CciGODMCVtRHC6AmSYxvLRMktE6zdk4McP0JvOMIe23JLpdX0p65e+2mtWxh36Cp dIMO4qpAZZXPlYYTRbZgzBXHOU58/L9dMDWRj2EyL0IuY2J+bZYrNEOqZaXb9bK9 NuWgyCGLgG8dQ4Q03BUgWc0T0Qu7bxuHzCQ3pdqpl/nvo+4EgcydxZjgWHwe667m Ap0mIkQ+yTEjpPu9QRCM1UaCsKHq7CDZ++FEuPhOt2z1oi3UzwywS4oYOUHPgLmJ cT9KMppc9SuOVttT6nOgQ+MNPqJ7Nx1kHmyTTZQNCPeEf7nzOEvmyYtfdY+jtnPj /B0jcYmVAynz9CEn6ggKbeTqIfS+rXRb5UYdkKx7WB62wMsCsWRLTFX5iG9I0gSO xMCAkKTgYPpyckan3gP/LL9EUwaUxLqDRZSVnRLorsxnX0xvjrs1SzGA41vHG1LH RDCyYj1OXMo+ZMskIit3 =hJS5 -----END PGP SIGNATURE----- --eyYj78xbwv+yMvU1-- From owner-svn-src-vendor@FreeBSD.ORG Mon Nov 25 18:54:58 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2BBF5BEA for ; Mon, 25 Nov 2013 18:54:58 +0000 (UTC) Received: from nm18-vm0.bullet.mail.bf1.yahoo.com (nm18-vm0.bullet.mail.bf1.yahoo.com [98.139.213.138]) by mx1.freebsd.org (Postfix) with SMTP id B7A042073 for ; Mon, 25 Nov 2013 18:54:57 +0000 (UTC) Received: from [66.196.81.173] by nm18.bullet.mail.bf1.yahoo.com with NNFMP; 25 Nov 2013 18:49:26 -0000 Received: from [68.142.230.70] by tm19.bullet.mail.bf1.yahoo.com with NNFMP; 25 Nov 2013 18:49:26 -0000 Received: from [127.0.0.1] by smtp227.mail.bf1.yahoo.com with NNFMP; 25 Nov 2013 18:49:26 -0000 X-Yahoo-Newman-Id: 786079.52285.bm@smtp227.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: kLU_2zwVM1mQglABPgUcouzUOcPP1UA9rVjlzJl.SzC_iVB yomOznyCnU424OBA9gVWvIEIDlMryl4PXPmwKLOVfdhTegm3MQNL3vM30B4N s936vllQbciEFuNhIFU82vlkrkpT5Ycna0zvfsZOTcN6viz6TBOD.h6YAIyi kxluP9qyAXMMhjnHBYHR546eCf4g5PxamD.1vhbSNrYCWYPudGJm6cStxcc9 ZmliIgRUdBBqkxZ1jQ4FRK8GYW1mDG.Ov7o3ddNA5jAfKMsFtqWGvGq918dd IkKtSNa5USVDIW4PnfY3zAI6lf8B00f_eJYxHvnFXEngR5tngs4_2DXO_cJR Vt5j0VdOIyMcMKFatbBswyBluP9KUzUYZNlQ8upIv2OGvJ7uCoPJMPcChna3 U6p3s4EcEig5oGp0qrGHr8TxITX2DB2tJ2zgschBYY5aBPLJouAdIpH3bido HcOGVFrwu3d6Z81.FFwO5Sg.TE18CKk5BJlNicRA9l7avZW1kzctqjftIi.R .cWxLn64iBRG_fpd.gKvfvVmmaGOkt1QIbppURMsiGvErnSDkpr5awDj_Old OfOXXdkLaFtTWAbAxu6B9ubmQ9T7FeOiyv28JGxkG89XGXpJpIBxdz3Dic1w bZ36K18WRohkzoteC3p3sMiVpk6o- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf X-Rocket-Received: from [192.168.0.102] (pfg@190.157.126.109 with ) by smtp227.mail.bf1.yahoo.com with SMTP; 25 Nov 2013 18:49:26 +0000 UTC Message-ID: <52939BB3.9010400@FreeBSD.org> Date: Mon, 25 Nov 2013 13:49:23 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Glen Barber Subject: Re: svn commit: r258571 - vendor/tcpdump/dist References: <201311251828.rAPISYuV075476@svn.freebsd.org> <20131125183027.GU2310@glenbarber.us> In-Reply-To: <20131125183027.GU2310@glenbarber.us> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-vendor@freebsd.org X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2013 18:54:58 -0000 On 25.11.2013 13:30, Glen Barber wrote: > On Mon, Nov 25, 2013 at 06:28:34PM +0000, Pedro F. Giffuni wrote: >> Author: pfg >> Date: Mon Nov 25 18:28:34 2013 >> New Revision: 258571 >> URL: http://svnweb.freebsd.org/changeset/base/258571 >> >> Log: >> tcpdump Bring change from upstream. >> >> commit 772d6fbcf592209aa1ab1b61714e8ae72a5b1698 >> Author: Dmitrij Tejblum >> Date: Sun Jun 2 13:48:44 2013 +0400 >> >> Convert some versions of EXTRACT_{16,32,64}BITS() to inline functions. >> >> It removes the vast majority of strict-aliasing warnings from GCC. >> > Thank you. > > Glen > There are still issues though (?): ... /usr/src10/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/tcpdump.c: In function 'main': /usr/src10/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/tcpdump.c:1210: warning: implicit declaration of function 'cap_rights_init' /usr/src10/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/tcpdump.c:1211: warning: implicit declaration of function 'cap_rights_limit' /usr/src10/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/tcpdump.c:1494: warning: implicit declaration of function 'cap_ioctls_limit' /usr/src10/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/tcpdump.c:1621: warning: implicit declaration of function 'cap_sandboxed' *** [tcpdump.o] Error code 1 Stop in /usr/src10/usr.sbin/tcpdump. _____ Pedro. From owner-svn-src-vendor@FreeBSD.ORG Mon Nov 25 19:03:01 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 52D41EF7 for ; Mon, 25 Nov 2013 19:03:01 +0000 (UTC) Received: from nm11-vm1.bullet.mail.bf1.yahoo.com (nm11-vm1.bullet.mail.bf1.yahoo.com [98.139.213.152]) by mx1.freebsd.org (Postfix) with SMTP id D493B2107 for ; Mon, 25 Nov 2013 19:03:00 +0000 (UTC) Received: from [66.196.81.171] by nm11.bullet.mail.bf1.yahoo.com with NNFMP; 25 Nov 2013 18:57:25 -0000 Received: from [68.142.230.73] by tm17.bullet.mail.bf1.yahoo.com with NNFMP; 25 Nov 2013 18:57:25 -0000 Received: from [127.0.0.1] by smtp230.mail.bf1.yahoo.com with NNFMP; 25 Nov 2013 18:57:25 -0000 X-Yahoo-Newman-Id: 750897.76331.bm@smtp230.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: Aj.ycSUVM1njwBrW.2DJhHd87DE.4qtRm_BPToQCG2T1hEi X20fOEfo96JQ.Nw.gORZqWmIdH0JnAKakQU2nxEcVyPq41lHSfFghx3iMA_j PrWYJW0GKVkvfU3hopqxa04AQbpjSZCfylOXfakBzWi5nbTVy5nWoWebI2_E 8C8iKG8TPea5kQe4xhi0Dqhy5jtozny8ozGS1x3u5FteKZ.XkIeQH4aRWEG2 5U4CHuiAr4xULUavzfz.Q9MmldODdG9Zacb1_WXh389QD4Osb7vnctsoStIi JMmOLfJNlJJfGHVTz.5eNvsdwOXE1457DGcAXkaAOCsNP_jcm5K_9Ygb05JK Kp2SXBKrCZ0qdURuXm6kZhx9yqUXAWayFu9.tN4CU8RYjzsOHqZjcLVTkcGf W0u5dDMJ0MKOZFdYS_uNAJq6XOaxkQH1gotnaiWyOAl5M7kNOyBbhwjy0x4d jZH4WwrRbodR5mTKWZX7BkyKVvWLPZrTyWFMR3wobu7wfh0ZPhWnLdRhFhqr OiuBMaGYnJDZe4jTj2HHDXlSDw4ss2UydJqoY4BnZHyBFjKACyu.3qZeKHA3 fb_wJ1KEU7ihJEsZKD6gOXVao_r8hIWMkoeuTEXaxnz8WRuT.F7zskgKH_5O aeZobw._bRSMp9aEVXIsRYBn2xSc- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf X-Rocket-Received: from [192.168.0.102] (pfg@190.157.126.109 with ) by smtp230.mail.bf1.yahoo.com with SMTP; 25 Nov 2013 18:57:25 +0000 UTC Message-ID: <52939D92.4070409@FreeBSD.org> Date: Mon, 25 Nov 2013 13:57:22 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Glen Barber Subject: Re: svn commit: r258571 - vendor/tcpdump/dist References: <201311251828.rAPISYuV075476@svn.freebsd.org> <20131125183027.GU2310@glenbarber.us> <52939BB3.9010400@FreeBSD.org> In-Reply-To: <52939BB3.9010400@FreeBSD.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-vendor@freebsd.org X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2013 19:03:01 -0000 On 25.11.2013 13:49, Pedro Giffuni wrote: > On 25.11.2013 13:30, Glen Barber wrote: >> On Mon, Nov 25, 2013 at 06:28:34PM +0000, Pedro F. Giffuni wrote: >>> Author: pfg >>> Date: Mon Nov 25 18:28:34 2013 >>> New Revision: 258571 >>> URL: http://svnweb.freebsd.org/changeset/base/258571 >>> >>> Log: >>> tcpdump Bring change from upstream. >>> commit 772d6fbcf592209aa1ab1b61714e8ae72a5b1698 >>> Author: Dmitrij Tejblum >>> Date: Sun Jun 2 13:48:44 2013 +0400 >>> Convert some versions of EXTRACT_{16,32,64}BITS() to >>> inline functions. >>> It removes the vast majority of strict-aliasing warnings >>> from GCC. >>> >> Thank you. >> >> Glen >> > > There are still issues though (?): > ... Nevermind ... that was because I was still using old headers. Build should be fine, thanks to Glebius for the fix and to Glen pinching arm! Pedro. From owner-svn-src-vendor@FreeBSD.ORG Mon Nov 25 22:15:51 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EDEB8C37; Mon, 25 Nov 2013 22:15:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DC2BF2DC7; Mon, 25 Nov 2013 22:15:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPMFpZK060236; Mon, 25 Nov 2013 22:15:51 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPMFlPZ060212; Mon, 25 Nov 2013 22:15:47 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201311252215.rAPMFlPZ060212@svn.freebsd.org> From: Peter Wemm Date: Mon, 25 Nov 2013 22:15:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r258600 - in vendor/apr-util/dist: . crypto dbd dbm include memcache misc test X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2013 22:15:52 -0000 Author: peter Date: Mon Nov 25 22:15:47 2013 New Revision: 258600 URL: http://svnweb.freebsd.org/changeset/base/258600 Log: Import apr-util 1.5.3 Deleted: vendor/apr-util/dist/test/testssl.c Modified: vendor/apr-util/dist/CHANGES vendor/apr-util/dist/apr-util.spec vendor/apr-util/dist/configure vendor/apr-util/dist/crypto/apr_crypto.c vendor/apr-util/dist/dbd/apr_dbd.c vendor/apr-util/dist/dbd/apr_dbd_odbc.c vendor/apr-util/dist/dbm/apr_dbm.c vendor/apr-util/dist/include/apr_buckets.h vendor/apr-util/dist/include/apr_dbd.h vendor/apr-util/dist/include/apr_hooks.h vendor/apr-util/dist/include/apr_optional_hooks.h vendor/apr-util/dist/include/apr_queue.h vendor/apr-util/dist/include/apr_reslist.h vendor/apr-util/dist/include/apu.hw vendor/apr-util/dist/include/apu_version.h vendor/apr-util/dist/libaprutil.rc vendor/apr-util/dist/memcache/apr_memcache.c vendor/apr-util/dist/misc/apu_dso.c vendor/apr-util/dist/test/abts.c vendor/apr-util/dist/test/testpass.c Modified: vendor/apr-util/dist/CHANGES ============================================================================== --- vendor/apr-util/dist/CHANGES Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/CHANGES Mon Nov 25 22:15:47 2013 (r258600) @@ -1,4 +1,23 @@ -*- coding: utf-8 -*- +Changes with APR-util 1.5.3 + + *) Cygwin: Use correct file extension when loading APR DSOs. PR 55587. + [Carlo Bramini ] + + *) Add experimental cmake-based build system for Windows. Refer to + README.cmake for more information. [Jeff Trawick, Tom Donovan] + + *) Fix warnings in odbc driver on 64bit systems. + PR 55197 [Tom Donovan] + + *) Add support to apr_memcache for unix domain sockets. PR 54573 [Remi + Gacogne ] + + *) Add support for Berkeley DB 6.0. [Rainer Jung] + + *) Improve platform detection for bundled expat by updating + config.guess and config.sub. [Rainer Jung] + Changes with APR-util 1.5.2 *) Windows: Add command line makefiles. [Gregg Smith] Modified: vendor/apr-util/dist/apr-util.spec ============================================================================== --- vendor/apr-util/dist/apr-util.spec Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/apr-util.spec Mon Nov 25 22:15:47 2013 (r258600) @@ -3,7 +3,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util -Version: 1.5.2 +Version: 1.5.3 Release: 1 License: Apache Software License Group: System Environment/Libraries Modified: vendor/apr-util/dist/configure ============================================================================== --- vendor/apr-util/dist/configure Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/configure Mon Nov 25 22:15:47 2013 (r258600) @@ -1440,7 +1440,7 @@ Optional Packages: --with-ldap-lib=path path to ldap lib file --with-ldap=library ldap library to use --with-dbm=DBM choose the DBM type to use. - DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X} + DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X} for some X=0,...,9 --with-gdbm=DIR enable GDBM support --with-ndbm=PATH Find the NDBM header and library in `PATH/include' @@ -11218,8 +11218,10 @@ fi fi - test ${apu_has_ldap} != "1" && as_fn_error $? "could not find an LDAP library" "$LINENO" 5 - test ${apu_has_ldap} == "1" && + if test ${apu_has_ldap} != "1"; then + as_fn_error $? "could not find an LDAP library" "$LINENO" 5 + else + if test "x$LDADD_ldap" = "x"; then test "x$silent" != "xyes" && echo " setting LDADD_ldap to \"$LDADD_ldap_found\"" LDADD_ldap="$LDADD_ldap_found" @@ -11240,6 +11242,7 @@ fi done fi + fi as_ac_Lib=`$as_echo "ac_cv_lib_$apu_liblber_name''_ber_init" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_init in -l$apu_liblber_name" >&5 $as_echo_n "checking for ber_init in -l$apu_liblber_name... " >&6; } @@ -11617,6 +11620,7 @@ fi dbm_list="$dbm_list, db$db_version" db_version=`expr $db_version + 1` done + dbm_list="$dbm_list, db60" # Check whether --with-dbm was given. @@ -15708,7 +15712,7 @@ fi as_fn_error $? "Berkeley db3 not found" "$LINENO" 5 fi ;; - db[45][0-9]) + db[456][0-9]) db_major=`echo "$requested" | sed -e 's/db//' -e 's/.$//'` db_minor=`echo "$requested" | sed -e 's/db//' -e 's/.//'` @@ -16113,7 +16117,7 @@ fi as_fn_error $? "Berkeley db$db_major not found" "$LINENO" 5 fi ;; - db[45]) + db[456]) db_major=`echo "$requested" | sed -e 's/db//'` # Start version search at version x.9 db_minor=9 @@ -18561,11 +18565,11 @@ fi eval "apu_use_$requested=1" apu_default_dbm=$requested ;; - db185 | db[12345]) + db185 | db[123456]) apu_use_db=1 apu_default_dbm=$requested ;; - db[45][0-9]) + db[456][0-9]) apu_use_db=1 apu_default_dbm=`echo $requested | sed -e 's/.$//'` ;; Modified: vendor/apr-util/dist/crypto/apr_crypto.c ============================================================================== --- vendor/apr-util/dist/crypto/apr_crypto.c Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/crypto/apr_crypto.c Mon Nov 25 22:15:47 2013 (r258600) @@ -100,7 +100,9 @@ APU_DECLARE(apr_status_t) apr_crypto_ini } /* Top level pool scope, need process-scope lifetime */ - for (parent = pool; parent; parent = apr_pool_parent_get(pool)) + for (parent = apr_pool_parent_get(pool); + parent && parent != pool; + parent = apr_pool_parent_get(pool)) pool = parent; #if APU_DSO_BUILD /* deprecate in 2.0 - permit implicit initialization */ @@ -176,7 +178,7 @@ APU_DECLARE(apr_status_t) apr_crypto_get #if defined(NETWARE) apr_snprintf(modname, sizeof(modname), "crypto%s.nlm", name); -#elif defined(WIN32) +#elif defined(WIN32) || defined(__CYGWIN__) apr_snprintf(modname, sizeof(modname), "apr_crypto_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", name); #else Modified: vendor/apr-util/dist/dbd/apr_dbd.c ============================================================================== --- vendor/apr-util/dist/dbd/apr_dbd.c Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/dbd/apr_dbd.c Mon Nov 25 22:15:47 2013 (r258600) @@ -102,8 +102,10 @@ APU_DECLARE(apr_status_t) apr_dbd_init(a } /* Top level pool scope, need process-scope lifetime */ - for (parent = pool; parent; parent = apr_pool_parent_get(pool)) - pool = parent; + for (parent = apr_pool_parent_get(pool); + parent && parent != pool; + parent = apr_pool_parent_get(pool)) + pool = parent; #if APU_DSO_BUILD /* deprecate in 2.0 - permit implicit initialization */ apu_dso_init(pool); @@ -184,7 +186,7 @@ APU_DECLARE(apr_status_t) apr_dbd_get_dr #if defined(NETWARE) apr_snprintf(modname, sizeof(modname), "dbd%s.nlm", name); -#elif defined(WIN32) +#elif defined(WIN32) || defined(__CYGWIN__) apr_snprintf(modname, sizeof(modname), "apr_dbd_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", name); #else @@ -204,7 +206,7 @@ APU_DECLARE(apr_status_t) apr_dbd_get_dr } apu_dso_mutex_unlock(); -#else /* not builtin and !APR_HAS_DSO => not implemented */ +#else /* not builtin and !APU_DSO_BUILD => not implemented */ rv = APR_ENOTIMPL; #endif Modified: vendor/apr-util/dist/dbd/apr_dbd_odbc.c ============================================================================== --- vendor/apr-util/dist/dbd/apr_dbd_odbc.c Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/dbd/apr_dbd_odbc.c Mon Nov 25 22:15:47 2013 (r258600) @@ -114,9 +114,9 @@ struct apr_dbd_t char lastError[MAX_ERROR_STRING]; int defaultBufferSize; /* used for CLOBs in text mode, * and when fld size is indeterminate */ - int transaction_mode; - int dboptions; /* driver options re SQLGetData */ - int default_transaction_mode; + intptr_t transaction_mode; + intptr_t dboptions; /* driver options re SQLGetData */ + intptr_t default_transaction_mode; int can_commit; /* controls end_trans behavior */ }; @@ -359,7 +359,7 @@ static SQLRETURN odbc_set_result_column( SQLHANDLE stmt) { SQLRETURN rc; - int maxsize, textsize, realsize, type, isunsigned = 1; + intptr_t maxsize, textsize, realsize, type, isunsigned = 1; /* discover the sql type */ rc = SQLColAttribute(stmt, icol + 1, SQL_DESC_UNSIGNED, NULL, 0, NULL, @@ -409,7 +409,7 @@ static SQLRETURN odbc_set_result_column( type = SQL_C_CHAR; } - res->coltypes[icol] = type; + res->coltypes[icol] = (SQLSMALLINT)type; /* size if retrieved as text */ rc = SQLColAttribute(stmt, icol + 1, SQL_DESC_DISPLAY_SIZE, NULL, 0, @@ -441,12 +441,12 @@ static SQLRETURN odbc_set_result_column( res->colptrs[icol] = NULL; res->colstate[icol] = COL_AVAIL; - res->colsizes[icol] = maxsize; + res->colsizes[icol] = (SQLINTEGER)maxsize; rc = SQL_SUCCESS; } else { res->colptrs[icol] = apr_pcalloc(res->pool, maxsize); - res->colsizes[icol] = maxsize; + res->colsizes[icol] = (SQLINTEGER)maxsize; if (res->apr_dbd->dboptions & SQL_GD_BOUND) { /* we are allowed to call SQLGetData if we need to */ rc = SQLBindCol(stmt, icol + 1, res->coltypes[icol], @@ -747,7 +747,7 @@ static void *odbc_get(const apr_dbd_row_ SQLRETURN rc; SQLLEN indicator; int state = row->res->colstate[col]; - int options = row->res->apr_dbd->dboptions; + intptr_t options = row->res->apr_dbd->dboptions; switch (state) { case (COL_UNAVAIL): @@ -817,13 +817,13 @@ static apr_status_t odbc_parse_params(ap int *connect, SQLCHAR **datasource, SQLCHAR **user, SQLCHAR **password, int *defaultBufferSize, int *nattrs, - int **attrs, int **attrvals) + int **attrs, intptr_t **attrvals) { char *seps, *last, *next, *name[MAX_PARAMS], *val[MAX_PARAMS]; int nparams = 0, i, j; *attrs = apr_pcalloc(pool, MAX_PARAMS * sizeof(char *)); - *attrvals = apr_pcalloc(pool, MAX_PARAMS * sizeof(int)); + *attrvals = apr_pcalloc(pool, MAX_PARAMS * sizeof(intptr_t)); *nattrs = 0; seps = DEFAULTSEPS; name[nparams] = apr_strtok(apr_pstrdup(pool, params), seps, &last); @@ -1062,7 +1062,8 @@ static apr_dbd_t *odbc_open(apr_pool_t * SQLHANDLE err_h = NULL; SQLCHAR *datasource = (SQLCHAR *)"", *user = (SQLCHAR *)"", *password = (SQLCHAR *)""; - int nattrs = 0, *attrs = NULL, *attrvals = NULL, connect = 0; + int nattrs = 0, *attrs = NULL, connect = 0; + intptr_t *attrvals = NULL; err_step = "SQLAllocHandle (SQL_HANDLE_DBC)"; err_htype = SQL_HANDLE_ENV; @@ -1116,10 +1117,10 @@ static apr_dbd_t *odbc_open(apr_pool_t * handle->default_transaction_mode = 0; handle->can_commit = APR_DBD_TRANSACTION_IGNORE_ERRORS; SQLGetInfo(hdbc, SQL_DEFAULT_TXN_ISOLATION, - &(handle->default_transaction_mode), sizeof(int), NULL); + &(handle->default_transaction_mode), sizeof(intptr_t), NULL); handle->transaction_mode = handle->default_transaction_mode; SQLGetInfo(hdbc, SQL_GETDATA_EXTENSIONS ,&(handle->dboptions), - sizeof(int), NULL); + sizeof(intptr_t), NULL); apr_pool_cleanup_register(pool, handle, odbc_close_cleanup, apr_pool_cleanup_null); return handle; } Modified: vendor/apr-util/dist/dbm/apr_dbm.c ============================================================================== --- vendor/apr-util/dist/dbm/apr_dbm.c Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/dbm/apr_dbm.c Mon Nov 25 22:15:47 2013 (r258600) @@ -129,8 +129,10 @@ static apr_status_t dbm_open_type(apr_db apr_pool_t *parent; /* Top level pool scope, need process-scope lifetime */ - for (parent = pool; parent; parent = apr_pool_parent_get(pool)) - pool = parent; + for (parent = apr_pool_parent_get(pool); + parent && parent != pool; + parent = apr_pool_parent_get(pool)) + pool = parent; /* deprecate in 2.0 - permit implicit initialization */ apu_dso_init(pool); @@ -162,7 +164,7 @@ static apr_status_t dbm_open_type(apr_db #if defined(NETWARE) apr_snprintf(modname, sizeof(modname), "dbm%s.nlm", type); -#elif defined(WIN32) +#elif defined(WIN32) || defined (__CYGWIN__) apr_snprintf(modname, sizeof(modname), "apr_dbm_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", type); #else Modified: vendor/apr-util/dist/include/apr_buckets.h ============================================================================== --- vendor/apr-util/dist/include/apr_buckets.h Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/include/apr_buckets.h Mon Nov 25 22:15:47 2013 (r258600) @@ -351,9 +351,9 @@ typedef apr_status_t (*apr_brigade_flush #define APR_BRIGADE_LAST(b) APR_RING_LAST(&(b)->list) /** - * Insert a list of buckets at the front of a brigade + * Insert a single bucket at the front of a brigade * @param b The brigade to add to - * @param e The first bucket in a list of buckets to insert + * @param e The bucket to insert */ #define APR_BRIGADE_INSERT_HEAD(b, e) do { \ apr_bucket *ap__b = (e); \ @@ -362,9 +362,9 @@ typedef apr_status_t (*apr_brigade_flush } while (0) /** - * Insert a list of buckets at the end of a brigade + * Insert a single bucket at the end of a brigade * @param b The brigade to add to - * @param e The first bucket in a list of buckets to insert + * @param e The bucket to insert */ #define APR_BRIGADE_INSERT_TAIL(b, e) do { \ apr_bucket *ap__b = (e); \ @@ -393,9 +393,9 @@ typedef apr_status_t (*apr_brigade_flush } while (0) /** - * Insert a list of buckets before a specified bucket + * Insert a single bucket before a specified bucket * @param a The bucket to insert before - * @param b The buckets to insert + * @param b The bucket to insert */ #define APR_BUCKET_INSERT_BEFORE(a, b) do { \ apr_bucket *ap__a = (a), *ap__b = (b); \ @@ -404,9 +404,9 @@ typedef apr_status_t (*apr_brigade_flush } while (0) /** - * Insert a list of buckets after a specified bucket + * Insert a single bucket after a specified bucket * @param a The bucket to insert after - * @param b The buckets to insert + * @param b The bucket to insert */ #define APR_BUCKET_INSERT_AFTER(a, b) do { \ apr_bucket *ap__a = (a), *ap__b = (b); \ Modified: vendor/apr-util/dist/include/apr_dbd.h ============================================================================== --- vendor/apr-util/dist/include/apr_dbd.h Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/include/apr_dbd.h Mon Nov 25 22:15:47 2013 (r258600) @@ -107,10 +107,10 @@ APU_DECLARE(apr_status_t) apr_dbd_get_dr /** apr_dbd_open_ex: open a connection to a backend * + * @param driver - driver struct. * @param pool - working pool * @param params - arguments to driver (implementation-dependent) * @param handle - pointer to handle to return - * @param driver - driver struct. * @param error - descriptive error. * @return APR_SUCCESS for success * @return APR_EGENERAL if driver exists but connection failed @@ -147,10 +147,10 @@ APU_DECLARE(apr_status_t) apr_dbd_open_e /** apr_dbd_open: open a connection to a backend * + * @param driver - driver struct. * @param pool - working pool * @param params - arguments to driver (implementation-dependent) * @param handle - pointer to handle to return - * @param driver - driver struct. * @return APR_SUCCESS for success * @return APR_EGENERAL if driver exists but connection failed * @see apr_dbd_open_ex @@ -161,8 +161,8 @@ APU_DECLARE(apr_status_t) apr_dbd_open(c /** apr_dbd_close: close a connection to a backend * - * @param handle - handle to close * @param driver - driver struct. + * @param handle - handle to close * @return APR_SUCCESS for success or error status */ APU_DECLARE(apr_status_t) apr_dbd_close(const apr_dbd_driver_t *driver, Modified: vendor/apr-util/dist/include/apr_hooks.h ============================================================================== --- vendor/apr-util/dist/include/apr_hooks.h Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/include/apr_hooks.h Mon Nov 25 22:15:47 2013 (r258600) @@ -313,24 +313,24 @@ APU_DECLARE_DATA extern apr_pool_t *apr_ /** * A global variable to determine if debugging information about the - * hooks functions should be printed + * hooks functions should be printed. */ APU_DECLARE_DATA extern int apr_hook_debug_enabled; /** - * The name of the module that is currently registering a function + * The name of the module that is currently registering a function. */ APU_DECLARE_DATA extern const char *apr_hook_debug_current; /** - * Register a hook function to be sorted + * Register a hook function to be sorted. * @param szHookName The name of the Hook the function is registered for * @param aHooks The array which stores all of the functions for this hook */ APU_DECLARE(void) apr_hook_sort_register(const char *szHookName, apr_array_header_t **aHooks); /** - * Sort all of the registerd functions for a given hook + * Sort all of the registered functions for a given hook. */ APU_DECLARE(void) apr_hook_sort_all(void); Modified: vendor/apr-util/dist/include/apr_optional_hooks.h ============================================================================== --- vendor/apr-util/dist/include/apr_optional_hooks.h Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/include/apr_optional_hooks.h Mon Nov 25 22:15:47 2013 (r258600) @@ -33,11 +33,11 @@ extern "C" { * @{ */ /** - * Function to implemnt the APR_OPTIONAL_HOOK Macro + * Function to implement the APR_OPTIONAL_HOOK Macro * @internal * @see APR_OPTIONAL_HOOK * - * @param name The name of the hook + * @param szName The name of the hook * @param pfn A pointer to a function that will be called * @param aszPre a NULL-terminated array of strings that name modules whose hooks should precede this one * @param aszSucc a NULL-terminated array of strings that name modules whose hooks should succeed this one Modified: vendor/apr-util/dist/include/apr_queue.h ============================================================================== --- vendor/apr-util/dist/include/apr_queue.h Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/include/apr_queue.h Mon Nov 25 22:15:47 2013 (r258600) @@ -22,7 +22,7 @@ * @brief Thread Safe FIFO bounded queue * @note Since most implementations of the queue are backed by a condition * variable implementation, it isn't available on systems without threads. - * Although condition variables are some times available without threads. + * Although condition variables are sometimes available without threads. */ #include "apu.h" Modified: vendor/apr-util/dist/include/apr_reslist.h ============================================================================== --- vendor/apr-util/dist/include/apr_reslist.h Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/include/apr_reslist.h Mon Nov 25 22:15:47 2013 (r258600) @@ -44,7 +44,7 @@ typedef struct apr_reslist_t apr_reslist /* Generic constructor called by resource list when it needs to create a * resource. * @param resource opaque resource - * @param param flags + * @param params flags * @param pool Pool */ typedef apr_status_t (*apr_reslist_constructor)(void **resource, void *params, @@ -53,7 +53,7 @@ typedef apr_status_t (*apr_reslist_const /* Generic destructor called by resource list when it needs to destroy a * resource. * @param resource opaque resource - * @param param flags + * @param params flags * @param pool Pool */ typedef apr_status_t (*apr_reslist_destructor)(void *resource, void *params, @@ -111,12 +111,17 @@ APU_DECLARE(apr_status_t) apr_reslist_de * Retrieve a resource from the list, creating a new one if necessary. * If we have met our maximum number of resources, we will block * until one becomes available. + * @param reslist The resource list. + * @param resource An address where the pointer to the resource + * will be stored. */ APU_DECLARE(apr_status_t) apr_reslist_acquire(apr_reslist_t *reslist, void **resource); /** * Return a resource back to the list of available resources. + * @param reslist The resource list. + * @param resource The resource to return to the list. */ APU_DECLARE(apr_status_t) apr_reslist_release(apr_reslist_t *reslist, void *resource); @@ -140,6 +145,8 @@ APU_DECLARE(apr_uint32_t) apr_reslist_ac * Invalidate a resource in the pool - e.g. a database connection * that returns a "lost connection" error and can't be restored. * Use this instead of apr_reslist_release if the resource is bad. + * @param reslist The resource list. + * @param resource The resource to invalidate. */ APU_DECLARE(apr_status_t) apr_reslist_invalidate(apr_reslist_t *reslist, void *resource); Modified: vendor/apr-util/dist/include/apu.hw ============================================================================== --- vendor/apr-util/dist/include/apu.hw Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/include/apu.hw Mon Nov 25 22:15:47 2013 (r258600) @@ -42,6 +42,12 @@ * conventions at compile time. */ +/* Make sure we have our platform identifier macro defined we ask for later. + */ +#if defined(_WIN32) && !defined(WIN32) +#define WIN32 1 +#endif + #if defined(DOXYGEN) || !defined(WIN32) /** * The public APR-UTIL functions are declared with APU_DECLARE(), so they may Modified: vendor/apr-util/dist/include/apu_version.h ============================================================================== --- vendor/apr-util/dist/include/apu_version.h Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/include/apu_version.h Mon Nov 25 22:15:47 2013 (r258600) @@ -38,6 +38,9 @@ */ +#define APU_COPYRIGHT "Copyright (c) 2013 The Apache Software " \ + "Foundation or its licensors, as applicable." + /* The numeric compile-time version constants. These constants are the * authoritative version numbers for APU. */ @@ -59,7 +62,7 @@ * The Patch Level never includes API changes, simply bug fixes. * Reset to 0 when upgrading APR_MINOR_VERSION */ -#define APU_PATCH_VERSION 2 +#define APU_PATCH_VERSION 3 /** * The symbol APU_IS_DEV_VERSION is only defined for internal, @@ -71,7 +74,9 @@ #if defined(APU_IS_DEV_VERSION) || defined(DOXYGEN) /** Internal: string form of the "is dev" flag */ +#ifndef APU_IS_DEV_STRING #define APU_IS_DEV_STRING "-dev" +#endif #else #define APU_IS_DEV_STRING "" #endif Modified: vendor/apr-util/dist/libaprutil.rc ============================================================================== --- vendor/apr-util/dist/libaprutil.rc Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/libaprutil.rc Mon Nov 25 22:15:47 2013 (r258600) @@ -1,8 +1,5 @@ #include "apu_version.h" -#define APU_COPYRIGHT "Copyright (c) 2011 The Apache Software " \ - "Foundation or its licensors, as applicable." - #define APU_LICENSE \ "Licensed to the Apache Software Foundation (ASF) under one or more " \ "contributor license agreements. See the NOTICE file distributed with " \ Modified: vendor/apr-util/dist/memcache/apr_memcache.c ============================================================================== --- vendor/apr-util/dist/memcache/apr_memcache.c Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/memcache/apr_memcache.c Mon Nov 25 22:15:47 2013 (r258600) @@ -181,7 +181,7 @@ apr_memcache_find_server_hash_default(vo #if APR_HAS_THREADS apr_thread_mutex_lock(ms->lock); #endif - /* Try the the dead server, every 5 seconds */ + /* Try the dead server, every 5 seconds */ if (curtime - ms->btime > apr_time_from_sec(5)) { ms->btime = curtime; if (mc_version_ping(ms) == APR_SUCCESS) { @@ -289,8 +289,13 @@ static apr_status_t conn_connect(apr_mem { apr_status_t rv = APR_SUCCESS; apr_sockaddr_t *sa; +#if APR_HAVE_SOCKADDR_UN + apr_int32_t family = conn->ms->host[0] != '/' ? APR_INET : APR_UNIX; +#else + apr_int32_t family = APR_INET; +#endif - rv = apr_sockaddr_info_get(&sa, conn->ms->host, APR_INET, conn->ms->port, 0, conn->p); + rv = apr_sockaddr_info_get(&sa, conn->ms->host, family, conn->ms->port, 0, conn->p); if (rv != APR_SUCCESS) { return rv; } @@ -322,6 +327,11 @@ mc_conn_construct(void **conn_, void *pa apr_pool_t *np; apr_pool_t *tp; apr_memcache_server_t *ms = params; +#if APR_HAVE_SOCKADDR_UN + apr_int32_t family = ms->host[0] != '/' ? APR_INET : APR_UNIX; +#else + apr_int32_t family = APR_INET; +#endif rv = apr_pool_create(&np, pool); if (rv != APR_SUCCESS) { @@ -339,7 +349,7 @@ mc_conn_construct(void **conn_, void *pa conn->p = np; conn->tp = tp; - rv = apr_socket_create(&conn->sock, APR_INET, SOCK_STREAM, 0, np); + rv = apr_socket_create(&conn->sock, family, SOCK_STREAM, 0, np); if (rv != APR_SUCCESS) { apr_pool_destroy(np); Modified: vendor/apr-util/dist/misc/apu_dso.c ============================================================================== --- vendor/apr-util/dist/misc/apu_dso.c Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/misc/apu_dso.c Mon Nov 25 22:15:47 2013 (r258600) @@ -75,7 +75,6 @@ static apr_status_t apu_dso_term(void *p apr_status_t apu_dso_init(apr_pool_t *pool) { apr_status_t ret = APR_SUCCESS; - apr_pool_t *global; apr_pool_t *parent; if (apr_atomic_inc32(&initialised)) { @@ -88,17 +87,19 @@ apr_status_t apu_dso_init(apr_pool_t *po } /* Top level pool scope, need process-scope lifetime */ - for (parent = global = pool; parent; parent = apr_pool_parent_get(global)) - global = parent; + for (parent = apr_pool_parent_get(pool); + parent && parent != pool; + parent = apr_pool_parent_get(pool)) + pool = parent; - dsos = apr_hash_make(global); + dsos = apr_hash_make(pool); #if APR_HAS_THREADS - ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, global); + ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, pool); /* This already registers a pool cleanup */ #endif - apr_pool_cleanup_register(global, NULL, apu_dso_term, + apr_pool_cleanup_register(pool, NULL, apu_dso_term, apr_pool_cleanup_null); apr_atomic_dec32(&in_init); Modified: vendor/apr-util/dist/test/abts.c ============================================================================== --- vendor/apr-util/dist/test/abts.c Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/test/abts.c Mon Nov 25 22:15:47 2013 (r258600) @@ -106,6 +106,9 @@ abts_suite *abts_add_suite(abts_suite *s /* suite_name_full may be an absolute path depending on __FILE__ * expansion */ suite_name = strrchr(suite_name_full, '/'); + if (!suite_name) { + suite_name = strrchr(suite_name_full, '\\'); + } if (suite_name) { suite_name++; } else { @@ -247,7 +250,8 @@ void abts_int_nequal(abts_case *tc, cons tc->failed = TRUE; if (verbose) { - fprintf(stderr, "Line %d: expected <%d>, but saw <%d>\n", lineno, expected, actual); + fprintf(stderr, "Line %d: expected something other than <%d>, but saw <%d>\n", + lineno, expected, actual); fflush(stderr); } } @@ -279,7 +283,8 @@ void abts_str_nequal(abts_case *tc, cons tc->failed = TRUE; if (verbose) { - fprintf(stderr, "Line %d: expected <%s>, but saw <%s>\n", lineno, expected, actual); + fprintf(stderr, "Line %d: expected something other than <%s>, but saw <%s>\n", + lineno, expected, actual); fflush(stderr); } } Modified: vendor/apr-util/dist/test/testpass.c ============================================================================== --- vendor/apr-util/dist/test/testpass.c Mon Nov 25 21:57:15 2013 (r258599) +++ vendor/apr-util/dist/test/testpass.c Mon Nov 25 22:15:47 2013 (r258600) @@ -14,7 +14,6 @@ * limitations under the License. */ -#include #include #include From owner-svn-src-vendor@FreeBSD.ORG Mon Nov 25 22:16:27 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AB563E00; Mon, 25 Nov 2013 22:16:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 821442DD8; Mon, 25 Nov 2013 22:16:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPMGRil060359; Mon, 25 Nov 2013 22:16:27 GMT (envelope-from peter@svn.freebsd.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPMGR37060358; Mon, 25 Nov 2013 22:16:27 GMT (envelope-from peter@svn.freebsd.org) Message-Id: <201311252216.rAPMGR37060358@svn.freebsd.org> From: Peter Wemm Date: Mon, 25 Nov 2013 22:16:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r258601 - vendor/apr-util/apr-util-1.5.3 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2013 22:16:27 -0000 Author: peter Date: Mon Nov 25 22:16:27 2013 New Revision: 258601 URL: http://svnweb.freebsd.org/changeset/base/258601 Log: Tag import of svn-1.5.3 Added: vendor/apr-util/apr-util-1.5.3/ - copied from r258600, vendor/apr-util/dist/ From owner-svn-src-vendor@FreeBSD.ORG Tue Nov 26 20:09:44 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B7324325; Tue, 26 Nov 2013 20:09:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 96D8B2962; Tue, 26 Nov 2013 20:09:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAQK9iwr018201; Tue, 26 Nov 2013 20:09:44 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAQK9iDR018197; Tue, 26 Nov 2013 20:09:44 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201311262009.rAQK9iDR018197@svn.freebsd.org> From: Andriy Gapon Date: Tue, 26 Nov 2013 20:09:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r258665 - vendor-sys/illumos/dist/uts/common/fs/zfs X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Nov 2013 20:09:44 -0000 Author: avg Date: Tue Nov 26 20:09:43 2013 New Revision: 258665 URL: http://svnweb.freebsd.org/changeset/base/258665 Log: 4347 ZPL can use dmu_tx_assign(TXG_WAIT) illumos/illumos-gate@e722410c49fe67cbf0f639cbcc288bd6cbcf7dd1 Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_dir.c vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_znode.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_dir.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_dir.c Tue Nov 26 20:03:25 2013 (r258664) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_dir.c Tue Nov 26 20:09:43 2013 (r258665) @@ -937,7 +937,6 @@ zfs_make_xattrdir(znode_t *zp, vattr_t * return (SET_ERROR(EDQUOT)); } -top: tx = dmu_tx_create(zfsvfs->z_os); dmu_tx_hold_sa_create(tx, acl_ids.z_aclp->z_acl_bytes + ZFS_SA_BASE_ATTR_SIZE); @@ -946,13 +945,8 @@ top: fuid_dirtied = zfsvfs->z_fuid_dirty; if (fuid_dirtied) zfs_fuid_txhold(zfsvfs, tx); - error = dmu_tx_assign(tx, TXG_NOWAIT); + error = dmu_tx_assign(tx, TXG_WAIT); if (error) { - if (error == ERESTART) { - dmu_tx_wait(tx); - dmu_tx_abort(tx); - goto top; - } zfs_acl_ids_free(&acl_ids); dmu_tx_abort(tx); return (error); Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c Tue Nov 26 20:03:25 2013 (r258664) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c Tue Nov 26 20:09:43 2013 (r258665) @@ -111,11 +111,18 @@ * (3) All range locks must be grabbed before calling dmu_tx_assign(), * as they can span dmu_tx_assign() calls. * - * (4) Always pass TXG_NOWAIT as the second argument to dmu_tx_assign(). - * This is critical because we don't want to block while holding locks. - * Note, in particular, that if a lock is sometimes acquired before - * the tx assigns, and sometimes after (e.g. z_lock), then failing to - * use a non-blocking assign can deadlock the system. The scenario: + * (4) If ZPL locks are held, pass TXG_NOWAIT as the second argument to + * dmu_tx_assign(). This is critical because we don't want to block + * while holding locks. + * + * If no ZPL locks are held (aside from ZFS_ENTER()), use TXG_WAIT. This + * reduces lock contention and CPU usage when we must wait (note that if + * throughput is constrained by the storage, nearly every transaction + * must wait). + * + * Note, in particular, that if a lock is sometimes acquired before + * the tx assigns, and sometimes after (e.g. z_lock), then failing + * to use a non-blocking assign can deadlock the system. The scenario: * * Thread A has grabbed a lock before calling dmu_tx_assign(). * Thread B is in an already-assigned tx, and blocks for this lock. @@ -728,7 +735,6 @@ zfs_write(vnode_t *vp, uio_t *uio, int i while (n > 0) { abuf = NULL; woff = uio->uio_loffset; -again: if (zfs_owner_overquota(zfsvfs, zp, B_FALSE) || zfs_owner_overquota(zfsvfs, zp, B_TRUE)) { if (abuf != NULL) @@ -780,13 +786,8 @@ again: dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_FALSE); dmu_tx_hold_write(tx, zp->z_id, woff, MIN(n, max_blksz)); zfs_sa_upgrade_txholds(tx, zp); - error = dmu_tx_assign(tx, TXG_NOWAIT); + error = dmu_tx_assign(tx, TXG_WAIT); if (error) { - if (error == ERESTART) { - dmu_tx_wait(tx); - dmu_tx_abort(tx); - goto again; - } dmu_tx_abort(tx); if (abuf != NULL) dmu_return_arcbuf(abuf); @@ -3043,12 +3044,9 @@ top: zfs_sa_upgrade_txholds(tx, zp); - err = dmu_tx_assign(tx, TXG_NOWAIT); - if (err) { - if (err == ERESTART) - dmu_tx_wait(tx); + err = dmu_tx_assign(tx, TXG_WAIT); + if (err) goto out; - } count = 0; /* @@ -4140,19 +4138,13 @@ zfs_putapage(vnode_t *vp, page_t *pp, u_ err = SET_ERROR(EDQUOT); goto out; } -top: tx = dmu_tx_create(zfsvfs->z_os); dmu_tx_hold_write(tx, zp->z_id, off, len); dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_FALSE); zfs_sa_upgrade_txholds(tx, zp); - err = dmu_tx_assign(tx, TXG_NOWAIT); + err = dmu_tx_assign(tx, TXG_WAIT); if (err != 0) { - if (err == ERESTART) { - dmu_tx_wait(tx); - dmu_tx_abort(tx); - goto top; - } dmu_tx_abort(tx); goto out; } Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_znode.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_znode.c Tue Nov 26 20:03:25 2013 (r258664) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_znode.c Tue Nov 26 20:09:43 2013 (r258665) @@ -1469,7 +1469,6 @@ zfs_extend(znode_t *zp, uint64_t end) zfs_range_unlock(rl); return (0); } -top: tx = dmu_tx_create(zfsvfs->z_os); dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_FALSE); zfs_sa_upgrade_txholds(tx, zp); @@ -1489,13 +1488,8 @@ top: newblksz = 0; } - error = dmu_tx_assign(tx, TXG_NOWAIT); + error = dmu_tx_assign(tx, TXG_WAIT); if (error) { - if (error == ERESTART) { - dmu_tx_wait(tx); - dmu_tx_abort(tx); - goto top; - } dmu_tx_abort(tx); zfs_range_unlock(rl); return (error); @@ -1592,17 +1586,11 @@ zfs_trunc(znode_t *zp, uint64_t end) zfs_range_unlock(rl); return (error); } -top: tx = dmu_tx_create(zfsvfs->z_os); dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_FALSE); zfs_sa_upgrade_txholds(tx, zp); - error = dmu_tx_assign(tx, TXG_NOWAIT); + error = dmu_tx_assign(tx, TXG_WAIT); if (error) { - if (error == ERESTART) { - dmu_tx_wait(tx); - dmu_tx_abort(tx); - goto top; - } dmu_tx_abort(tx); zfs_range_unlock(rl); return (error); @@ -1709,13 +1697,8 @@ log: tx = dmu_tx_create(zfsvfs->z_os); dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_FALSE); zfs_sa_upgrade_txholds(tx, zp); - error = dmu_tx_assign(tx, TXG_NOWAIT); + error = dmu_tx_assign(tx, TXG_WAIT); if (error) { - if (error == ERESTART) { - dmu_tx_wait(tx); - dmu_tx_abort(tx); - goto log; - } dmu_tx_abort(tx); return (error); }