diff -Nru davfs2-1.5.2/aclocal.m4 davfs2-1.5.4/aclocal.m4 --- davfs2-1.5.2/aclocal.m4 2014-08-23 18:12:17.000000000 +0000 +++ davfs2-1.5.4/aclocal.m4 2016-04-16 07:06:46.000000000 +0000 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.6 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,33 +11,31 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, [m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.6], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -54,24 +51,22 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.6])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -90,7 +85,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -108,30 +103,26 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -150,16 +141,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -169,7 +158,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -182,12 +171,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -195,8 +185,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -236,16 +226,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -254,8 +244,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -263,7 +253,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -311,7 +301,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -321,9 +311,13 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -338,20 +332,18 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -364,7 +356,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -376,21 +368,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -408,7 +398,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -418,18 +408,21 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -442,7 +435,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -471,31 +464,40 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -506,34 +508,79 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -555,15 +602,12 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -577,16 +621,14 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -602,14 +644,12 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -627,7 +667,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -654,15 +694,12 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -670,11 +707,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -687,29 +723,32 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_MKDIR_P # --------------- -# Check for `mkdir -p'. +# Check for 'mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl FIXME we are no longer going to remove this! adjust warning +dnl FIXME message accordingly. +AC_DIAGNOSE([obsolete], +[$0: this macro is deprecated, and will soon be removed. +You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, +and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.]) dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, dnl while keeping a definition of mkdir_p for backward compatibility. dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. @@ -726,15 +765,12 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -744,7 +780,7 @@ # -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -758,24 +794,82 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -786,32 +880,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -821,46 +923,118 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -874,18 +1048,16 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -895,76 +1067,114 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff -Nru davfs2-1.5.2/ChangeLog davfs2-1.5.4/ChangeLog --- davfs2-1.5.2/ChangeLog 2014-08-23 18:11:41.000000000 +0000 +++ davfs2-1.5.4/ChangeLog 2016-04-16 07:06:31.000000000 +0000 @@ -1,6 +1,39 @@ ChangeLog for davfs2 -------------------- +2016-04-16 Werner Baumann (werner.baumann@onlinehome.de) + Release version 1.5.4 + +2016-04-16 Werner Baumann (werner.baumann@onlinehome.de) + * src/Makefile.am: + Use --fstack-protector-strong. + +2016-04-15 Werner Baumann (werner.baumann@onlinehome.de) + * README, mount.davfs.8: + Add information about required local cache space. + +2016-04-08 Werner Baumann (werner.baumann@onlinehome.de) + * dav_fuse.c, dac_coda.c, kernel_interface.h, mount_davfs.c: + For kernel_fs fuse: when getting SIGTERM unmount + while dav_fuse_loop still is running. + +2016-04-08 Werner Baumann (werner.baumann@onlinehome.de) + * dav_fuse.c, dav_fuse_loop: + Remove useless call of is_mounted (sr #109009). + +2016-04-05 Werner Baumann (werner.baumann@onlinehome.de) + * Release version 1.5.3 + +2016-04-04 Werner Baumann (werner.baumann@onlinehome.de) + * mount_davfs.c, parse_line: + Fix stack smashing error (Debian bug #812456). + * mount_davfs.c, kernel_interface.c, webdav.c: + Check result of seteuid. + * cache.c, dav_tidy_cache: + Fix format parameter. + * src/Makefile.am: + Use compiler flag -fstack-protector-all. + 2014-08-23 Werner Baumann (werner.baumann@onlinehome.de) * Release version 1.5.2 diff -Nru davfs2-1.5.2/config/compile davfs2-1.5.4/config/compile --- davfs2-1.5.2/config/compile 1970-01-01 00:00:00.000000000 +0000 +++ davfs2-1.5.4/config/compile 2016-04-16 07:07:21.000000000 +0000 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru davfs2-1.5.2/config/config.guess davfs2-1.5.4/config/config.guess --- davfs2-1.5.2/config/config.guess 2014-08-23 18:13:16.000000000 +0000 +++ davfs2-1.5.4/config/config.guess 2016-04-16 07:07:21.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,10 +820,13 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -852,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,31 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1256,7 +1297,7 @@ NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,157 +1371,6 @@ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <. @@ -26,11 +20,12 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +116,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,10 +252,12 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -270,10 +265,11 @@ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -287,23 +283,26 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -328,7 +327,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -370,13 +369,13 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -385,11 +384,13 @@ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -403,18 +404,22 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -788,11 +793,15 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -820,6 +829,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -828,7 +841,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1019,7 +1032,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1346,29 +1363,29 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1492,9 +1509,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1543,6 +1557,9 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; diff -Nru davfs2-1.5.2/config/depcomp davfs2-1.5.4/config/depcomp --- davfs2-1.5.2/config/depcomp 2014-08-23 18:13:17.000000000 +0000 +++ davfs2-1.5.4/config/depcomp 2016-04-16 07:07:21.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-03-27.16; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -57,11 +56,65 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + # A tabulation character. tab=' ' # A newline character. nl=' ' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -75,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -86,32 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -134,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -143,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -157,15 +216,14 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the "deleted header file" problem. @@ -174,15 +232,15 @@ ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' "$nl" < "$tmpdepfile" | ## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -200,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -209,7 +266,6 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in @@ -217,19 +273,15 @@ # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr "$nl" ' ' >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; @@ -247,9 +299,8 @@ # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -262,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -273,65 +322,113 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependent.h'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. - # However on - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\': + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - # tcc 0.9.26 (FIXME still under development at the moment of writing) - # will emit a similar output, but also prepend the continuation lines - # with horizontal tabulation characters. - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" - # Each line is of the form 'foo.o: dependent.h', - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ - < "$tmpdepfile" > "$depfile" - sed ' - s/[ '"$tab"'][ '"$tab"']*/ /g - s/^ *// - s/ *\\*$// - s/^[^:]*: *// - /^$/d - /:$/d - s/$/ :/ - ' < "$tmpdepfile" >> "$depfile" + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -342,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -355,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -366,76 +461,61 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -446,8 +526,7 @@ "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -473,6 +552,7 @@ G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -524,13 +604,14 @@ # in the target name. This is to cope with DOS-style filenames: # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' "$nl" < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -583,10 +664,12 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -622,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -657,15 +740,15 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | diff -Nru davfs2-1.5.2/config/install-sh davfs2-1.5.4/config/install-sh --- davfs2-1.5.2/config/install-sh 2014-08-23 18:13:17.000000000 +0000 +++ davfs2-1.5.4/config/install-sh 2016-04-16 07:07:21.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,7 +156,7 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -190,7 +190,7 @@ fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,7 +202,7 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi @@ -240,7 +240,7 @@ for src do - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -354,7 +354,7 @@ if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in diff -Nru davfs2-1.5.2/config/missing davfs2-1.5.4/config/missing --- davfs2-1.5.2/config/missing 2014-08-23 18:13:17.000000000 +0000 +++ davfs2-1.5.4/config/missing 2016-04-16 07:07:21.000000000 +0000 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,68 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -99,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -Nru davfs2-1.5.2/config/mkinstalldirs davfs2-1.5.4/config/mkinstalldirs --- davfs2-1.5.2/config/mkinstalldirs 2014-08-23 18:13:17.000000000 +0000 +++ davfs2-1.5.4/config/mkinstalldirs 2016-04-16 07:07:21.000000000 +0000 @@ -81,9 +81,9 @@ echo "mkdir -p -- $*" exec mkdir -p -- "$@" else - # On NextStep and OpenStep, the `mkdir' command does not + # On NextStep and OpenStep, the 'mkdir' command does not # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already + # directories to create, and then abort because '.' already # exists. test -d ./-p && rmdir ./-p test -d ./--version && rmdir ./--version diff -Nru davfs2-1.5.2/configure davfs2-1.5.4/configure --- davfs2-1.5.2/configure 2014-08-23 18:12:21.000000000 +0000 +++ davfs2-1.5.4/configure 2016-04-16 07:06:48.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for davfs2 1.5.2. +# Generated by GNU Autoconf 2.69 for davfs2 1.5.4. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='davfs2' PACKAGE_TARNAME='davfs2' -PACKAGE_VERSION='1.5.2' -PACKAGE_STRING='davfs2 1.5.2' +PACKAGE_VERSION='1.5.4' +PACKAGE_STRING='davfs2 1.5.4' PACKAGE_BUGREPORT='http://savannah.nongnu.org/projects/davfs2' PACKAGE_URL='' @@ -689,6 +689,10 @@ LDFLAGS CFLAGS CC +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -753,6 +757,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_dependency_tracking enable_nls with_gnu_ld @@ -1317,7 +1322,7 @@ # 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 davfs2 1.5.2 to adapt to many kinds of systems. +\`configure' configures davfs2 1.5.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1387,7 +1392,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of davfs2 1.5.2:";; + short | recursive ) echo "Configuration of davfs2 1.5.4:";; esac cat <<\_ACEOF @@ -1395,8 +1400,12 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths --disable-largefile omit support for large files @@ -1495,7 +1504,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -davfs2 configure 1.5.2 +davfs2 configure 1.5.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2288,7 +2297,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by davfs2 $as_me 1.5.2, which was +It was created by davfs2 $as_me 1.5.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2668,7 +2677,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.11' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2765,9 +2774,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2778,32 +2784,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2815,6 +2829,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2825,8 +2849,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2837,12 +2861,12 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2854,10 +2878,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -2996,12 +3020,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -3084,6 +3102,45 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -3106,7 +3163,7 @@ # Define the identity of the package. PACKAGE='davfs2' - VERSION='1.5.2' + VERSION='1.5.4' cat >>confdefs.h <<_ACEOF @@ -3134,12 +3191,22 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -3147,6 +3214,49 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + + ac_config_headers="$ac_config_headers config.h" @@ -3939,6 +4049,65 @@ 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 + +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 whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +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 + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -3958,7 +4127,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -4014,8 +4183,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -4050,16 +4219,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4068,8 +4237,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -4077,7 +4246,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4147,6 +4316,13 @@ # Checks for libraries. +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. @@ -8884,7 +9060,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -8930,7 +9106,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -8954,7 +9130,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -8999,7 +9175,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -9023,7 +9199,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -9205,6 +9381,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -9618,7 +9802,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by davfs2 $as_me 1.5.2, which was +This file was extended by davfs2 $as_me 1.5.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9684,7 +9868,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -davfs2 config.status 1.5.2 +davfs2 config.status 1.5.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -10426,7 +10610,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -10439,7 +10623,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -10473,21 +10657,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -10681,7 +10863,7 @@ cat< were + ignored accidentally in 1.5.4-1 and now they are included (Thanks + Marco, and sorry for the sloppiness). Here, a summary of his changelog: + - Non-maintainer upload. + - Make sure to not install the /sbin/*mount.davfs symlinks. Closes: #767923. + - Create in postinst the /sbin/*mount.davfs compatibility symlinks. + This is needed to support merged /usr systems. + + -- Luciano Bello Fri, 22 Apr 2016 13:19:02 +0200 + +davfs2 (1.5.4-1) unstable; urgency=medium + + * New Standards-Version: 3.9.7 + * New Upstream version: Crash with -fstack-protector-strong fixed. + Closes: #812456. + * Entries Vcs-Git and Vcs-browser added in the control file. - -- Marco d'Itri Sun, 24 Jan 2016 19:17:12 +0100 - -davfs2 (1.5.2-1.1) unstable; urgency=medium - - * Non-maintainer upload. - * Create in postinst the /sbin/*mount.davfs compatibility symlinks. - This is needed to support merged /usr systems. Closes: #767923. - * debian/control: add the Vcs-* headers. - * New Standards-Version: 3.9.6. - - -- Marco d'Itri Wed, 06 Jan 2016 16:42:09 +0100 - -davfs2 (1.5.2-1) unstable; urgency=medium - - * New upstream version: A backward incompatible change in util-linux - caused umount to fail. - - -- Luciano Bello Mon, 25 Aug 2014 03:53:29 +0200 + -- Luciano Bello Wed, 20 Apr 2016 14:16:41 +0200 davfs2 (1.5.1-1) unstable; urgency=medium diff -Nru davfs2-1.5.2/debian/control davfs2-1.5.4/debian/control --- davfs2-1.5.2/debian/control 2016-01-06 15:42:04.000000000 +0000 +++ davfs2-1.5.4/debian/control 2016-04-22 11:07:45.000000000 +0000 @@ -3,10 +3,10 @@ Priority: extra Maintainer: Luciano Bello Build-Depends: debhelper (>= 7.0.0), po-debconf, libneon27-dev, autotools-dev (>= 20100122.1), dh-autoreconf -Standards-Version: 3.9.6 -Homepage: http://savannah.nongnu.org/projects/davfs2 +Standards-Version: 3.9.8 Vcs-Git: git://anonscm.debian.org/collab-maint/davfs2.git Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/davfs2.git +Homepage: http://savannah.nongnu.org/projects/davfs2 Package: davfs2 Architecture: any diff -Nru davfs2-1.5.2/etc/Makefile.in davfs2-1.5.4/etc/Makefile.in --- davfs2-1.5.2/etc/Makefile.in 2014-08-23 18:13:17.000000000 +0000 +++ davfs2-1.5.4/etc/Makefile.in 2016-04-16 07:07:21.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,8 +79,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = etc -DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs $(dist_pkgdata_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/davfs2.m4 \ $(top_srcdir)/config/gettext.m4 $(top_srcdir)/config/iconv.m4 \ @@ -70,6 +97,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -106,9 +145,11 @@ } am__installdirs = "$(DESTDIR)$(pkgdatadir)" DATA = $(dist_pkgdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -290,11 +331,11 @@ @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -432,17 +473,18 @@ .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-local install-dist_pkgdataDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-dist_pkgdataDATA uninstall-local +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-data-local install-dist_pkgdataDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags-am \ + uninstall uninstall-am uninstall-dist_pkgdataDATA \ + uninstall-local install-data-local: $(dist_pkgdata_DATA) diff -Nru davfs2-1.5.2/Makefile.in davfs2-1.5.4/Makefile.in --- davfs2-1.5.2/Makefile.in 2014-08-23 18:13:17.000000000 +0000 +++ davfs2-1.5.4/Makefile.in 2016-04-16 07:07:21.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,12 +79,18 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \ - INSTALL NEWS THANKS TODO config/config.guess \ - config/config.rpath config/config.sub config/depcomp \ - config/install-sh config/missing config/mkinstalldirs +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in $(top_srcdir)/config/mkinstalldirs \ + ABOUT-NLS COPYING THANKS TODO config/compile \ + config/config.guess config/config.rpath config/config.sub \ + config/depcomp config/install-sh config/missing \ + config/mkinstalldirs $(top_srcdir)/config/compile \ + $(top_srcdir)/config/config.guess \ + $(top_srcdir)/config/config.rpath \ + $(top_srcdir)/config/config.sub \ + $(top_srcdir)/config/install-sh $(top_srcdir)/config/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/davfs2.m4 \ $(top_srcdir)/config/gettext.m4 $(top_srcdir)/config/iconv.m4 \ @@ -76,15 +109,28 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -121,11 +167,33 @@ DATA = $(doc_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -136,6 +204,7 @@ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -163,12 +232,14 @@ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -342,8 +413,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -378,22 +449,25 @@ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -408,57 +482,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -474,12 +503,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -491,15 +515,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -508,9 +528,31 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -578,40 +620,42 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -622,8 +666,6 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -635,18 +677,19 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -669,7 +712,7 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -806,13 +849,12 @@ uninstall-am: uninstall-docDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ + dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ distcheck distclean distclean-generic distclean-hdr \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ @@ -823,7 +865,7 @@ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am uninstall-docDATA + tags-am uninstall uninstall-am uninstall-docDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru davfs2-1.5.2/man/de/Makefile.in davfs2-1.5.4/man/de/Makefile.in --- davfs2-1.5.2/man/de/Makefile.in 2014-08-23 18:13:17.000000000 +0000 +++ davfs2-1.5.4/man/de/Makefile.in 2016-04-16 07:07:21.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = man/de -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/davfs2.m4 \ $(top_srcdir)/config/gettext.m4 $(top_srcdir)/config/iconv.m4 \ @@ -69,6 +97,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -105,9 +145,11 @@ } am__installdirs = "$(DESTDIR)$(manual5dir)" "$(DESTDIR)$(manual8dir)" DATA = $(manual5_DATA) $(manual8_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -336,11 +378,11 @@ @list='$(manual8_DATA)'; test -n "$(manual8dir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(manual8dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -479,16 +521,17 @@ .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-manual5DATA install-manual8DATA install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-manual5DATA \ +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-manual5DATA \ + install-manual8DATA install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags-am \ + uninstall uninstall-am uninstall-manual5DATA \ uninstall-manual8DATA diff -Nru davfs2-1.5.2/man/de/mount.davfs.8 davfs2-1.5.4/man/de/mount.davfs.8 --- davfs2-1.5.2/man/de/mount.davfs.8 2014-08-23 18:16:25.000000000 +0000 +++ davfs2-1.5.4/man/de/mount.davfs.8 2016-04-16 07:07:19.000000000 +0000 @@ -3,11 +3,11 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH @PROGRAM_NAME@ 8 2014\-04\-13 @PACKAGE_STRING@ +.TH @PROGRAM_NAME@ 8 2016\-04\-15 @PACKAGE_STRING@ .SH BEZEICHNUNG -@PROGRAM_NAME@ \- Hängt eine WebDAV\-Resource ins Dateisystem ein +@PROGRAM_NAME@ \- Hängt eine WebDAV\-Resource als @PACKAGE@\-Dateisystem ein .SH ÜBERSICHT @@ -148,7 +148,7 @@ das Verzeichnis, in dem sie erzeugt werden. Dies gilt auch für Dateien, die auf dem Server vorhanden sind, aber nicht im lokalen Cache. (Dies wird gemacht, weil die Gruppe nicht auf dem Server gespeichert ist.) -.TP +.br Wenn das Verzeichnis die Gruppe \fIroot\fP hat, wird diese Option ignoriert. .br Voreinstellung: \fBnogrpid\fP. @@ -304,6 +304,11 @@ gehalten und heruntergeladene Dateien werden auf der Festplatte gespeichert. .PP +\fB@PROGRAM_NAME@\fP benötigt von allen offenen Dateien eine Lokale Kopie im +Cache\-Verzeichnis. Stelle bitte sicher, dass dafür ausreichend Platz auf der +Festplatte zur Verfügung steht. + +.PP \fB@PROGRAM_NAME@\fP betrachtet Informationen über Verzeichnisse und Dateiattribute für eine (konfigurierbare) Zeit als gültig. Es holt diese Informationen nur dann erneut vom Server, wenn diese Zeit abgelaufen ist diff -Nru davfs2-1.5.2/man/de/mount.davfs.8.po davfs2-1.5.4/man/de/mount.davfs.8.po --- davfs2-1.5.2/man/de/mount.davfs.8.po 2014-08-23 18:16:24.000000000 +0000 +++ davfs2-1.5.4/man/de/mount.davfs.8.po 2016-04-16 07:07:18.000000000 +0000 @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: davfs2 1.4.0\n" -"POT-Creation-Date: 2014-04-13 10:49+0300\n" -"PO-Revision-Date: 2014-03-13 10:49+0200\n" +"Project-Id-Version: davfs2 1.5.4\n" +"POT-Creation-Date: 2016-04-15 21:32+0200\n" +"PO-Revision-Date: 2016-04-15 21:55+0200\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" "Language: \n" @@ -38,27 +38,27 @@ # type: SH #. type: SH -#: davfs2.conf.5:540 mount.davfs.8:547 umount.davfs.8:79 +#: davfs2.conf.5:568 mount.davfs.8:551 umount.davfs.8:79 #, no-wrap msgid "AUTHORS" msgstr "AUTOREN" # type: SH #. type: SH -#: davfs2.conf.5:546 mount.davfs.8:564 umount.davfs.8:84 +#: davfs2.conf.5:574 mount.davfs.8:568 umount.davfs.8:84 #, no-wrap msgid "DAVFS2 HOME" msgstr "DAVFS2 HOME" # type: TH #. type: Plain text -#: davfs2.conf.5:549 mount.davfs.8:567 umount.davfs.8:87 +#: davfs2.conf.5:577 mount.davfs.8:571 umount.davfs.8:87 msgid "@PACKAGE_BUGREPORT@" msgstr "@PACKAGE_BUGREPORT@" # type: SH #. type: SH -#: davfs2.conf.5:551 mount.davfs.8:569 umount.davfs.8:89 +#: davfs2.conf.5:579 mount.davfs.8:573 umount.davfs.8:89 #, no-wrap msgid "SEE ALSO" msgstr "SIEHE AUCH" @@ -74,14 +74,15 @@ #. type: TH #: mount.davfs.8:1 #, no-wrap -msgid "2014-04-13" -msgstr "2014-04-13" +msgid "2016-04-15" +msgstr "2016-04-15" # type: Plain text #. type: Plain text #: mount.davfs.8:6 -msgid "@PROGRAM_NAME@ - Mount a WebDAV resource in a directory" -msgstr "@PROGRAM_NAME@ - Hängt eine WebDAV-Resource ins Dateisystem ein" +msgid "@PROGRAM_NAME@ - Mount a WebDAV resource as @PACKAGE@ file system" +msgstr "" +"@PROGRAM_NAME@ - Hängt eine WebDAV-Resource als @PACKAGE@-Dateisystem ein" # type: SH #. type: SH @@ -468,11 +469,11 @@ "auf dem Server vorhanden sind, aber nicht im lokalen Cache. (Dies wird " "gemacht, weil die Gruppe nicht auf dem Server gespeichert ist.)" -#. type: TP -#: mount.davfs.8:144 -#, no-wrap +#. type: Plain text +#: mount.davfs.8:146 msgid "If the group id of the directory is I this option is ignored." -msgstr "Wenn das Verzeichnis die Gruppe I hat, wird diese Option ignoriert." +msgstr "" +"Wenn das Verzeichnis die Gruppe I hat, wird diese Option ignoriert." # type: Plain text #. type: Plain text @@ -553,8 +554,8 @@ "program. It will allways be set to B." msgstr "" "In @PACKAGE@-Dateisystemen sind grundsätzlich keine s-Bits für den Besitzer " -"und die Gruppe erlaubt. Die Option ist nur zwecks Kompatibilität mit B" -"(8) vorhanden und wird immer auf B gesetzt." +"und die Gruppe erlaubt. Die Option ist nur zwecks Kompatibilität mit " +"B(8) vorhanden und wird immer auf B gesetzt." # type: TP #. type: TP @@ -867,9 +868,19 @@ "zu verringern. Informationen über Verzeichnisse werden im Hauptspeicher " "gehalten und heruntergeladene Dateien werden auf der Festplatte gespeichert." +#. type: Plain text +#: mount.davfs.8:293 +msgid "" +"B<@PROGRAM_NAME@> needs to hold a local copy of all open files in the cache " +"directory. Please make sure that enough local disk space is available." +msgstr "" +"B<@PROGRAM_NAME@> benötigt von allen offenen Dateien eine Lokale Kopie im " +"Cache-Verzeichnis. Stelle bitte sicher, dass dafür ausreichend Platz auf der " +"Festplatte zur Verfügung steht." + # type: Plain text #. type: Plain text -#: mount.davfs.8:297 +#: mount.davfs.8:301 msgid "" "B<@PROGRAM_NAME@> will consider cached information about directories and " "file attributes valid for a configurable time and look up this information " @@ -887,7 +898,7 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:303 +#: mount.davfs.8:307 msgid "" "This will not affect the content of files and directory listings. Whenever a " "file is opened, the server is looked up for a newer version of the file. " @@ -901,14 +912,14 @@ # type: SH #. type: SH -#: mount.davfs.8:305 +#: mount.davfs.8:309 #, no-wrap msgid "LOCKS, LOST UPDATE PROBLEM AND BACKUP FILES" msgstr "SPERREN, VERLORENGEGANGENE ÄNDERUNGEN UND BACKUP-DATEIEN" # type: Plain text #. type: Plain text -#: mount.davfs.8:310 +#: mount.davfs.8:314 msgid "" "WebDAV introduced locks and B<@PROGRAM_NAME@> uses them by default. This " "will in most cases prevent two people from changing the same file in " @@ -920,7 +931,7 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:315 +#: mount.davfs.8:319 msgid "" "You might have disabled locks in I<@SYS_CONF_DIR@/@CONFIGFILE@> or I<~/." "@PACKAGE@/@CONFIGFILE@>." @@ -930,7 +941,7 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:318 +#: mount.davfs.8:322 msgid "The server might not support locks (they are not mandatory)." msgstr "" "Möglicherweise unterstützt der Server keine Sperren (sie sind in WevDAV " @@ -938,7 +949,7 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:322 +#: mount.davfs.8:326 msgid "" "A bad connection might prevent B<@PROGRAM_NAME@> from refreshing the lock in " "time." @@ -948,7 +959,7 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:326 +#: mount.davfs.8:330 msgid "" "Another WebDAV-client might use your lock (that is not too difficult and " "might even happen without intention)." @@ -958,7 +969,7 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:334 +#: mount.davfs.8:338 msgid "" "B<@PROGRAM_NAME@> will therefore check if the file has been changed on the " "the server before it uploads a new version. If it finds it impossible to " @@ -974,7 +985,7 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:342 +#: mount.davfs.8:346 msgid "" "Sometimes locks held by some client on the server will not be released. " "Maybe the client crashes or the network connection fails. When " @@ -995,7 +1006,7 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:349 +#: mount.davfs.8:353 msgid "" "WebDAV allows to lock files that don't exist (to protect the name when a " "client intends to create a new file). This locks will be displayed as files " @@ -1014,14 +1025,14 @@ # type: SH #. type: SH -#: mount.davfs.8:351 +#: mount.davfs.8:355 #, no-wrap msgid "FILE OWNER AND PERMISSIONS" msgstr "EIGENTÜMER UND DATEIRECHTE" # type: Plain text #. type: Plain text -#: mount.davfs.8:357 +#: mount.davfs.8:361 msgid "" "B<@PACKAGE@> implements Unix permissions for access control. But changing " "owner and permissions of a file is only B. It is intended as a means " @@ -1035,7 +1046,7 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:362 +#: mount.davfs.8:366 msgid "" "The server does not know about this. From the servers point of view there is " "just one user (identified by the credentials) connected. Another WebDAV-" @@ -1048,7 +1059,7 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:368 +#: mount.davfs.8:372 msgid "" "There is one exeption: The B on files is stored as a property " "on the sever. You may think of this property as an information about the " @@ -1063,7 +1074,7 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:374 +#: mount.davfs.8:378 msgid "" "When the file system is unmounted, attributes of cached files (including " "owner and permissions) are stored in cache, as well as the attributs of the " @@ -1077,34 +1088,34 @@ # type: SH #. type: SH -#: mount.davfs.8:376 umount.davfs.8:67 +#: mount.davfs.8:380 umount.davfs.8:67 #, no-wrap msgid "FILES" msgstr "DATEIEN" # type: TP #. type: TP -#: mount.davfs.8:378 +#: mount.davfs.8:382 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CONFIGFILE@>" msgstr "I<@SYS_CONF_DIR@/@CONFIGFILE@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:381 +#: mount.davfs.8:385 msgid "System wide configuration file." msgstr "Systemweite Konfigurationsdatei." # type: TP #. type: TP -#: mount.davfs.8:382 +#: mount.davfs.8:386 #, no-wrap msgid "I<~/.@PACKAGE@/@CONFIGFILE@>" msgstr "I<~/.@PACKAGE@/@CONFIGFILE@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:387 +#: mount.davfs.8:391 msgid "" "Configuration file in the users home directory.The user configuration takes " "precedence over the system wide configuration. If it does not exist, " @@ -1116,14 +1127,14 @@ # type: TP #. type: TP -#: mount.davfs.8:388 +#: mount.davfs.8:392 #, no-wrap msgid "I<@SYS_CONF_DIR@/@SECRETSFILE@>" msgstr "I<@SYS_CONF_DIR@/@SECRETSFILE@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:393 +#: mount.davfs.8:397 msgid "" "Holds the credentials for WebDAV servers and the proxy, as well as " "decryption passwords for client certificates. The file must be read-writable " @@ -1135,14 +1146,14 @@ # type: TP #. type: TP -#: mount.davfs.8:394 +#: mount.davfs.8:398 #, no-wrap msgid "I<~/.@PACKAGE@/@SECRETSFILE@>" msgstr "I<~/.@PACKAGE@/@SECRETSFILE@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:404 +#: mount.davfs.8:408 msgid "" "Holds credentials for WebDAV servers and proxy, as well as decryption " "passwords for client certificates. The file must be read-writable by the " @@ -1163,14 +1174,14 @@ # type: TP #. type: TP -#: mount.davfs.8:405 +#: mount.davfs.8:409 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CERTS_DIR@>" msgstr "I<@SYS_CONF_DIR@/@CERTS_DIR@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:412 +#: mount.davfs.8:416 msgid "" "You may store trusted server certificates here, that can not be verified by " "use of the system wide CA-Certificates. This is useful when your server uses " @@ -1187,20 +1198,20 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:414 mount.davfs.8:423 +#: mount.davfs.8:418 mount.davfs.8:427 msgid "Be sure to verify the certificate." msgstr "Vergiss nicht, das Zertifikat selbst zu prüfen." # type: TP #. type: TP -#: mount.davfs.8:415 +#: mount.davfs.8:419 #, no-wrap msgid "I<~/.@PACKAGE@/@CERTS_DIR@>" msgstr "I<~/.@PACKAGE@/@CERTS_DIR@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:421 +#: mount.davfs.8:425 msgid "" "You may store trusted server certificates here, that can not be verified by " "use of the system wide CA-Certificates. This is useful when your server uses " @@ -1216,14 +1227,14 @@ # type: TP #. type: TP -#: mount.davfs.8:424 +#: mount.davfs.8:428 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CERTS_DIR@/@CLICERTS_DIR@>" msgstr "I<@SYS_CONF_DIR@/@CERTS_DIR@/@CLICERTS_DIR@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:430 +#: mount.davfs.8:434 msgid "" "To store client certificates. Certificates must be in PKCS#12 format. You " "must configure the B option in I<@SYS_CONF_DIR@/@CONFIGFILE@> or " @@ -1237,14 +1248,14 @@ # type: TP #. type: TP -#: mount.davfs.8:431 +#: mount.davfs.8:435 #, no-wrap msgid "I<~/.@PACKAGE@/@CERTS_DIR@/@CLICERTS_DIR@>" msgstr "I<~/.@PACKAGE@/@CERTS_DIR@/@CLICERTS_DIR@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:436 +#: mount.davfs.8:440 msgid "" "To store client certificates. Certificates must be in PKCS#12 format. You " "must configure the B option in I<~/.@PACKAGE@/@CONFIGFILE@> to " @@ -1257,14 +1268,14 @@ # type: TP #. type: TP -#: mount.davfs.8:437 umount.davfs.8:69 +#: mount.davfs.8:441 umount.davfs.8:69 #, no-wrap msgid "I<@SYS_RUN@>" msgstr "I<@SYS_RUN@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:443 +#: mount.davfs.8:447 msgid "" "PID-files of running mount.davfs processes are stored there. This directory " "must belong to group B<@USER@> with write permissions for the group and the " @@ -1278,14 +1289,14 @@ # type: TP #. type: TP -#: mount.davfs.8:444 +#: mount.davfs.8:448 #, no-wrap msgid "I<@SYS_CACHE_DIR@>" msgstr "I<@SYS_CACHE_DIR@>" # type: Plain text #. type: Plain text -#: mount.davfs.8:451 +#: mount.davfs.8:455 msgid "" "System wide directory for cached files. Used when the file system is mounted " "by root. It must belong do group B<@USER@> and read, write and execute bits " @@ -1301,14 +1312,14 @@ # type: TP #. type: TP -#: mount.davfs.8:452 +#: mount.davfs.8:456 #, no-wrap msgid "I<~/.@PACKAGE@/cache>" msgstr "I<~/.@PACKAGE@/cache>" # type: Plain text #. type: Plain text -#: mount.davfs.8:456 +#: mount.davfs.8:460 msgid "" "Cache directory in the mounting users home directory. For every mounted " "WebDAV resource a subdirectory is created." @@ -1318,7 +1329,7 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:460 +#: mount.davfs.8:464 msgid "" "B<@PROGRAM_NAME@> will try to create missing directories, but it will B " "touch I<@SYS_CONF_DIR@>." @@ -1328,21 +1339,21 @@ # type: SH #. type: SH -#: mount.davfs.8:461 +#: mount.davfs.8:465 #, no-wrap msgid "ENVIRONMENT" msgstr "UMGEBUNGSVARIABLEN" # type: TP #. type: TP -#: mount.davfs.8:463 +#: mount.davfs.8:467 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: mount.davfs.8:468 +#: mount.davfs.8:472 msgid "" "If no proxy is defined in the configuration file the value is taken from " "this environment variables. The proxy may be given with or without scheme " @@ -1354,26 +1365,26 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:470 +#: mount.davfs.8:474 msgid "http_proxy=[http://]foo.bar[:3218]" msgstr "http_proxy=[http://]foo.bar[:3218]" # type: Plain text #. type: Plain text -#: mount.davfs.8:472 mount.davfs.8:480 +#: mount.davfs.8:476 mount.davfs.8:484 msgid "Only used when the mounting user is root." msgstr "Wird nur benutzt, wenn der Benutzer root das Dateisystem einhängt." # type: TP #. type: TP -#: mount.davfs.8:473 +#: mount.davfs.8:477 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: mount.davfs.8:478 +#: mount.davfs.8:482 msgid "" "A comma separated list of domain names that shall be accessed directly. " "B<*> matches any domain name. A domain name starting with B<.> (period) " @@ -1385,27 +1396,27 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:482 +#: mount.davfs.8:486 msgid "Not applied when the proxy is defined in I<@SYS_CONF_DIR@>." msgstr "" "Wird nicht benutzt, wenn der Proxy in I<@SYS_CONF_DIR@> festgelegt wird." # type: SH #. type: SH -#: mount.davfs.8:484 +#: mount.davfs.8:488 #, no-wrap msgid "EXAMPLES" msgstr "BEISPIELE" # type: Plain text #. type: Plain text -#: mount.davfs.8:487 +#: mount.davfs.8:491 msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: mount.davfs.8:490 +#: mount.davfs.8:494 msgid "To allow an ordinary user to mount there must be an entry in I" msgstr "" "Damit ein normaler Benutzer ein Dateisystem einhängen kann, ist ein Eintrag " @@ -1413,13 +1424,13 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:492 +#: mount.davfs.8:496 msgid "http://webdav.org/dav /media/dav davfs noauto,user 0 0" msgstr "http://webdav.org/dav /media/dav davfs noauto,user 0 0" # type: Plain text #. type: Plain text -#: mount.davfs.8:497 +#: mount.davfs.8:501 msgid "" "If a proxy must be used this should be configured in I<@SYS_CONF_DIR@/" "@CONFIGFILE@>" @@ -1429,13 +1440,13 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:499 +#: mount.davfs.8:503 msgid "proxy proxy.mycompany.com:8080" msgstr "proxy proxy.mycompany.com:8080" # type: Plain text #. type: Plain text -#: mount.davfs.8:503 +#: mount.davfs.8:507 msgid "Credentials are stored in I" msgstr "" "Die vertraulichen Zugangsdaten für den Server werden in I" msgstr "B" # type: Plain text #. type: Plain text -#: mount.davfs.8:517 +#: mount.davfs.8:521 msgid "and unmounted by user filomena invoking" msgstr "und dieselbe Benutzerin filomena kann es aushängen durch" # type: Plain text #. type: Plain text -#: mount.davfs.8:519 +#: mount.davfs.8:523 msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: mount.davfs.8:523 +#: mount.davfs.8:527 msgid "B" msgstr "B" # type: Plain text #. type: Plain text -#: mount.davfs.8:529 +#: mount.davfs.8:533 msgid "" "Mounts the resource I at mount point I, encrypting all traffic with SSL. Credentials for I" @@ -1510,14 +1521,14 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:535 +#: mount.davfs.8:539 msgid "Mounts the resource I at I." msgstr "" "Die WebDAV-Resource I wird auf I eingehängt." # type: Plain text #. type: Plain text -#: mount.davfs.8:537 +#: mount.davfs.8:541 msgid "" "B" msgstr "" @@ -1525,20 +1536,20 @@ # type: SH #. type: SH -#: mount.davfs.8:540 umount.davfs.8:74 +#: mount.davfs.8:544 umount.davfs.8:74 #, no-wrap msgid "BUGS" msgstr "FEHLER" # type: Plain text #. type: Plain text -#: mount.davfs.8:543 +#: mount.davfs.8:547 msgid "B<@PACKAGE@> does not support links." msgstr "B<@PACKAGE@> unterstützt keine Links." # type: Plain text #. type: Plain text -#: mount.davfs.8:545 +#: mount.davfs.8:549 msgid "A B<@PACKAGE@> file system cannot be moved with I." msgstr "" "Ein B<@PACKAGE@>-Dateisystem kann nicht mit I verschoben " @@ -1546,7 +1557,7 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:551 +#: mount.davfs.8:555 msgid "" "This man page was written by Luciano Bello Eluciano@linux.org.arE " "for Debian, for version 0.2.3 of davfs2." @@ -1556,7 +1567,7 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:555 +#: mount.davfs.8:559 msgid "" "It has been updated for this version by Werner Baumann Ewerner." "baumann@onlinhome.deE." @@ -1566,13 +1577,13 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:558 +#: mount.davfs.8:562 msgid "@PACKAGE@ is developed by Sung Kim Ehunkim@gmail.comE." msgstr "@PACKAGE@ wurde von Sung Kim Ehunkim@gmail.comE entwickelt." # type: Plain text #. type: Plain text -#: mount.davfs.8:562 +#: mount.davfs.8:566 msgid "" "Version 1.0.0 (and later) of @PACKAGE@ is a complete rewrite by Werner " "Baumann." @@ -1582,7 +1593,7 @@ # type: Plain text #. type: Plain text -#: mount.davfs.8:575 +#: mount.davfs.8:579 msgid "" "B(8), B<@CONFIGFILE@>(5), B(8), B(8), " "B(5)" diff -Nru davfs2-1.5.2/man/de/umount.davfs.8.po davfs2-1.5.4/man/de/umount.davfs.8.po --- davfs2-1.5.2/man/de/umount.davfs.8.po 2014-08-23 18:16:24.000000000 +0000 +++ davfs2-1.5.4/man/de/umount.davfs.8.po 2016-04-16 07:07:18.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: davfs2 1.4.0\n" -"POT-Creation-Date: 2014-08-23 20:12+0300\n" +"POT-Creation-Date: 2015-02-01 11:54+0100\n" "PO-Revision-Date: 2014-08-23 20:16+0200\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" @@ -183,10 +183,10 @@ #. type: Plain text #: umount.davfs.8:26 msgid "" -"B is a umount helper program. It is called by the B" -"(8) command. Its purpose is to prevent the umount command from returning " -"unless B<@PROGRAM_NAME@> has synchronized all its cached files with the " -"webdav server." +"B is a umount helper program. It is called by the " +"B(8) command. Its purpose is to prevent the umount command from " +"returning unless B<@PROGRAM_NAME@> has synchronized all its cached files " +"with the webdav server." msgstr "" "B ist ein Hilfsprogramm, das von B(8) aufgerufen " "wird. Es soll verhindern, dass das umount-Kommando zurück kehrt, bevor " diff -Nru davfs2-1.5.2/man/es/Makefile.in davfs2-1.5.4/man/es/Makefile.in --- davfs2-1.5.2/man/es/Makefile.in 2014-08-23 18:13:17.000000000 +0000 +++ davfs2-1.5.4/man/es/Makefile.in 2016-04-16 07:07:21.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = man/es -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/davfs2.m4 \ $(top_srcdir)/config/gettext.m4 $(top_srcdir)/config/iconv.m4 \ @@ -69,6 +97,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -105,9 +145,11 @@ } am__installdirs = "$(DESTDIR)$(manual5dir)" DATA = $(manual5_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -316,11 +358,11 @@ @list='$(manual5_DATA)'; test -n "$(manual5dir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(manual5dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -459,16 +501,17 @@ .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-manual5DATA install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-am uninstall-manual5DATA +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-manual5DATA install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags-am uninstall uninstall-am \ + uninstall-manual5DATA %.gz: % diff -Nru davfs2-1.5.2/man/Makefile.in davfs2-1.5.4/man/Makefile.in --- davfs2-1.5.2/man/Makefile.in 2014-08-23 18:13:17.000000000 +0000 +++ davfs2-1.5.4/man/Makefile.in 2016-04-16 07:07:21.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = man -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/davfs2.m4 \ $(top_srcdir)/config/gettext.m4 $(top_srcdir)/config/iconv.m4 \ @@ -69,15 +97,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -114,9 +155,29 @@ DATA = $(manual5_DATA) $(manual8_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -147,6 +208,7 @@ reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -378,22 +440,25 @@ dir='$(DESTDIR)$(manual8dir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -408,57 +473,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -474,12 +494,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -491,15 +506,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -508,6 +519,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -672,23 +698,21 @@ uninstall-am: uninstall-manual5DATA uninstall-manual8DATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic ctags \ - ctags-recursive distclean distclean-generic distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-manual5DATA install-manual8DATA install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-manual5DATA \ - uninstall-manual8DATA +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic cscopelist-am ctags ctags-am \ + distclean distclean-generic distclean-tags distdir dvi dvi-am \ + html html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-manual5DATA \ + install-manual8DATA install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-manual5DATA uninstall-manual8DATA %.gz: % diff -Nru davfs2-1.5.2/man/mount.davfs.8 davfs2-1.5.4/man/mount.davfs.8 --- davfs2-1.5.2/man/mount.davfs.8 2014-04-13 08:48:55.000000000 +0000 +++ davfs2-1.5.4/man/mount.davfs.8 2016-04-15 19:31:12.000000000 +0000 @@ -1,8 +1,8 @@ -.TH @PROGRAM_NAME@ 8 "2014\-04\-13" @PACKAGE_STRING@ +.TH @PROGRAM_NAME@ 8 "2016\-04\-15" @PACKAGE_STRING@ .SH NAME -@PROGRAM_NAME@ \- Mount a WebDAV resource in a directory +@PROGRAM_NAME@ \- Mount a WebDAV resource as @PACKAGE@ file system .SH SYNOPSIS @@ -141,7 +141,7 @@ of the directory in which it is created. This will also apply to all files that are on the server and not in the local cache. (That is because the group id is not stored on the server.) -.TP +.br If the group id of the directory is \fIroot\fP this option is ignored. .br Default: \fBnogrpid\fR. @@ -288,6 +288,10 @@ files are cached on disk. .PP +\fB@PROGRAM_NAME@\fR needs to hold a local copy of all open files in the +cache directory. Please make sure that enough local disk space is available. + +.PP \fB@PROGRAM_NAME@\fR will consider cached information about directories and file attributes valid for a configurable time and look up this information on the server only after this time has expired (or there is other evidence diff -Nru davfs2-1.5.2/man/mount.davfs.8.pot davfs2-1.5.4/man/mount.davfs.8.pot --- davfs2-1.5.2/man/mount.davfs.8.pot 2014-08-23 18:16:23.000000000 +0000 +++ davfs2-1.5.4/man/mount.davfs.8.pot 2016-04-16 07:07:18.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2014-04-13 10:49+0300\n" +"POT-Creation-Date: 2016-04-15 21:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,24 +35,24 @@ msgstr "" #. type: SH -#: davfs2.conf.5:540 mount.davfs.8:547 umount.davfs.8:79 +#: davfs2.conf.5:568 mount.davfs.8:551 umount.davfs.8:79 #, no-wrap msgid "AUTHORS" msgstr "" #. type: SH -#: davfs2.conf.5:546 mount.davfs.8:564 umount.davfs.8:84 +#: davfs2.conf.5:574 mount.davfs.8:568 umount.davfs.8:84 #, no-wrap msgid "DAVFS2 HOME" msgstr "" #. type: Plain text -#: davfs2.conf.5:549 mount.davfs.8:567 umount.davfs.8:87 +#: davfs2.conf.5:577 mount.davfs.8:571 umount.davfs.8:87 msgid "@PACKAGE_BUGREPORT@" msgstr "" #. type: SH -#: davfs2.conf.5:551 mount.davfs.8:569 umount.davfs.8:89 +#: davfs2.conf.5:579 mount.davfs.8:573 umount.davfs.8:89 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -66,12 +66,12 @@ #. type: TH #: mount.davfs.8:1 #, no-wrap -msgid "2014-04-13" +msgid "2016-04-15" msgstr "" #. type: Plain text #: mount.davfs.8:6 -msgid "@PROGRAM_NAME@ - Mount a WebDAV resource in a directory" +msgid "@PROGRAM_NAME@ - Mount a WebDAV resource as @PACKAGE@ file system" msgstr "" #. type: SH @@ -361,9 +361,8 @@ "not stored on the server.)" msgstr "" -#. type: TP -#: mount.davfs.8:144 -#, no-wrap +#. type: Plain text +#: mount.davfs.8:146 msgid "If the group id of the directory is I this option is ignored." msgstr "" @@ -647,7 +646,14 @@ msgstr "" #. type: Plain text -#: mount.davfs.8:297 +#: mount.davfs.8:293 +msgid "" +"B<@PROGRAM_NAME@> needs to hold a local copy of all open files in the cache " +"directory. Please make sure that enough local disk space is available." +msgstr "" + +#. type: Plain text +#: mount.davfs.8:301 msgid "" "B<@PROGRAM_NAME@> will consider cached information about directories and " "file attributes valid for a configurable time and look up this information " @@ -658,7 +664,7 @@ msgstr "" #. type: Plain text -#: mount.davfs.8:303 +#: mount.davfs.8:307 msgid "" "This will not affect the content of files and directory listings. Whenever a " "file is opened, the server is looked up for a newer version of the file. " @@ -667,13 +673,13 @@ msgstr "" #. type: SH -#: mount.davfs.8:305 +#: mount.davfs.8:309 #, no-wrap msgid "LOCKS, LOST UPDATE PROBLEM AND BACKUP FILES" msgstr "" #. type: Plain text -#: mount.davfs.8:310 +#: mount.davfs.8:314 msgid "" "WebDAV introduced locks and B<@PROGRAM_NAME@> uses them by default. This " "will in most cases prevent two people from changing the same file in " @@ -681,33 +687,33 @@ msgstr "" #. type: Plain text -#: mount.davfs.8:315 +#: mount.davfs.8:319 msgid "" "You might have disabled locks in I<@SYS_CONF_DIR@/@CONFIGFILE@> or I<~/." "@PACKAGE@/@CONFIGFILE@>." msgstr "" #. type: Plain text -#: mount.davfs.8:318 +#: mount.davfs.8:322 msgid "The server might not support locks (they are not mandatory)." msgstr "" #. type: Plain text -#: mount.davfs.8:322 +#: mount.davfs.8:326 msgid "" "A bad connection might prevent B<@PROGRAM_NAME@> from refreshing the lock in " "time." msgstr "" #. type: Plain text -#: mount.davfs.8:326 +#: mount.davfs.8:330 msgid "" "Another WebDAV-client might use your lock (that is not too difficult and " "might even happen without intention)." msgstr "" #. type: Plain text -#: mount.davfs.8:334 +#: mount.davfs.8:338 msgid "" "B<@PROGRAM_NAME@> will therefore check if the file has been changed on the " "the server before it uploads a new version. If it finds it impossible to " @@ -717,7 +723,7 @@ msgstr "" #. type: Plain text -#: mount.davfs.8:342 +#: mount.davfs.8:346 msgid "" "Sometimes locks held by some client on the server will not be released. " "Maybe the client crashes or the network connection fails. When " @@ -729,7 +735,7 @@ msgstr "" #. type: Plain text -#: mount.davfs.8:349 +#: mount.davfs.8:353 msgid "" "WebDAV allows to lock files that don't exist (to protect the name when a " "client intends to create a new file). This locks will be displayed as files " @@ -740,13 +746,13 @@ msgstr "" #. type: SH -#: mount.davfs.8:351 +#: mount.davfs.8:355 #, no-wrap msgid "FILE OWNER AND PERMISSIONS" msgstr "" #. type: Plain text -#: mount.davfs.8:357 +#: mount.davfs.8:361 msgid "" "B<@PACKAGE@> implements Unix permissions for access control. But changing " "owner and permissions of a file is only B. It is intended as a means " @@ -755,7 +761,7 @@ msgstr "" #. type: Plain text -#: mount.davfs.8:362 +#: mount.davfs.8:366 msgid "" "The server does not know about this. From the servers point of view there is " "just one user (identified by the credentials) connected. Another WebDAV-" @@ -763,7 +769,7 @@ msgstr "" #. type: Plain text -#: mount.davfs.8:368 +#: mount.davfs.8:372 msgid "" "There is one exeption: The B on files is stored as a property " "on the sever. You may think of this property as an information about the " @@ -772,7 +778,7 @@ msgstr "" #. type: Plain text -#: mount.davfs.8:374 +#: mount.davfs.8:378 msgid "" "When the file system is unmounted, attributes of cached files (including " "owner and permissions) are stored in cache, as well as the attributs of the " @@ -781,30 +787,30 @@ msgstr "" #. type: SH -#: mount.davfs.8:376 umount.davfs.8:67 +#: mount.davfs.8:380 umount.davfs.8:67 #, no-wrap msgid "FILES" msgstr "" #. type: TP -#: mount.davfs.8:378 +#: mount.davfs.8:382 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CONFIGFILE@>" msgstr "" #. type: Plain text -#: mount.davfs.8:381 +#: mount.davfs.8:385 msgid "System wide configuration file." msgstr "" #. type: TP -#: mount.davfs.8:382 +#: mount.davfs.8:386 #, no-wrap msgid "I<~/.@PACKAGE@/@CONFIGFILE@>" msgstr "" #. type: Plain text -#: mount.davfs.8:387 +#: mount.davfs.8:391 msgid "" "Configuration file in the users home directory.The user configuration takes " "precedence over the system wide configuration. If it does not exist, " @@ -812,13 +818,13 @@ msgstr "" #. type: TP -#: mount.davfs.8:388 +#: mount.davfs.8:392 #, no-wrap msgid "I<@SYS_CONF_DIR@/@SECRETSFILE@>" msgstr "" #. type: Plain text -#: mount.davfs.8:393 +#: mount.davfs.8:397 msgid "" "Holds the credentials for WebDAV servers and the proxy, as well as " "decryption passwords for client certificates. The file must be read-writable " @@ -826,13 +832,13 @@ msgstr "" #. type: TP -#: mount.davfs.8:394 +#: mount.davfs.8:398 #, no-wrap msgid "I<~/.@PACKAGE@/@SECRETSFILE@>" msgstr "" #. type: Plain text -#: mount.davfs.8:404 +#: mount.davfs.8:408 msgid "" "Holds credentials for WebDAV servers and proxy, as well as decryption " "passwords for client certificates. The file must be read-writable by the " @@ -844,13 +850,13 @@ msgstr "" #. type: TP -#: mount.davfs.8:405 +#: mount.davfs.8:409 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CERTS_DIR@>" msgstr "" #. type: Plain text -#: mount.davfs.8:412 +#: mount.davfs.8:416 msgid "" "You may store trusted server certificates here, that can not be verified by " "use of the system wide CA-Certificates. This is useful when your server uses " @@ -860,18 +866,18 @@ msgstr "" #. type: Plain text -#: mount.davfs.8:414 mount.davfs.8:423 +#: mount.davfs.8:418 mount.davfs.8:427 msgid "Be sure to verify the certificate." msgstr "" #. type: TP -#: mount.davfs.8:415 +#: mount.davfs.8:419 #, no-wrap msgid "I<~/.@PACKAGE@/@CERTS_DIR@>" msgstr "" #. type: Plain text -#: mount.davfs.8:421 +#: mount.davfs.8:425 msgid "" "You may store trusted server certificates here, that can not be verified by " "use of the system wide CA-Certificates. This is useful when your server uses " @@ -880,13 +886,13 @@ msgstr "" #. type: TP -#: mount.davfs.8:424 +#: mount.davfs.8:428 #, no-wrap msgid "I<@SYS_CONF_DIR@/@CERTS_DIR@/@CLICERTS_DIR@>" msgstr "" #. type: Plain text -#: mount.davfs.8:430 +#: mount.davfs.8:434 msgid "" "To store client certificates. Certificates must be in PKCS#12 format. You " "must configure the B option in I<@SYS_CONF_DIR@/@CONFIGFILE@> or " @@ -895,13 +901,13 @@ msgstr "" #. type: TP -#: mount.davfs.8:431 +#: mount.davfs.8:435 #, no-wrap msgid "I<~/.@PACKAGE@/@CERTS_DIR@/@CLICERTS_DIR@>" msgstr "" #. type: Plain text -#: mount.davfs.8:436 +#: mount.davfs.8:440 msgid "" "To store client certificates. Certificates must be in PKCS#12 format. You " "must configure the B option in I<~/.@PACKAGE@/@CONFIGFILE@> to " @@ -909,13 +915,13 @@ msgstr "" #. type: TP -#: mount.davfs.8:437 umount.davfs.8:69 +#: mount.davfs.8:441 umount.davfs.8:69 #, no-wrap msgid "I<@SYS_RUN@>" msgstr "" #. type: Plain text -#: mount.davfs.8:443 +#: mount.davfs.8:447 msgid "" "PID-files of running mount.davfs processes are stored there. This directory " "must belong to group B<@USER@> with write permissions for the group and the " @@ -924,13 +930,13 @@ msgstr "" #. type: TP -#: mount.davfs.8:444 +#: mount.davfs.8:448 #, no-wrap msgid "I<@SYS_CACHE_DIR@>" msgstr "" #. type: Plain text -#: mount.davfs.8:451 +#: mount.davfs.8:455 msgid "" "System wide directory for cached files. Used when the file system is mounted " "by root. It must belong do group B<@USER@> and read, write and execute bits " @@ -940,39 +946,39 @@ msgstr "" #. type: TP -#: mount.davfs.8:452 +#: mount.davfs.8:456 #, no-wrap msgid "I<~/.@PACKAGE@/cache>" msgstr "" #. type: Plain text -#: mount.davfs.8:456 +#: mount.davfs.8:460 msgid "" "Cache directory in the mounting users home directory. For every mounted " "WebDAV resource a subdirectory is created." msgstr "" #. type: Plain text -#: mount.davfs.8:460 +#: mount.davfs.8:464 msgid "" "B<@PROGRAM_NAME@> will try to create missing directories, but it will B " "touch I<@SYS_CONF_DIR@>." msgstr "" #. type: SH -#: mount.davfs.8:461 +#: mount.davfs.8:465 #, no-wrap msgid "ENVIRONMENT" msgstr "" #. type: TP -#: mount.davfs.8:463 +#: mount.davfs.8:467 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: mount.davfs.8:468 +#: mount.davfs.8:472 msgid "" "If no proxy is defined in the configuration file the value is taken from " "this environment variables. The proxy may be given with or without scheme " @@ -980,23 +986,23 @@ msgstr "" #. type: Plain text -#: mount.davfs.8:470 +#: mount.davfs.8:474 msgid "http_proxy=[http://]foo.bar[:3218]" msgstr "" #. type: Plain text -#: mount.davfs.8:472 mount.davfs.8:480 +#: mount.davfs.8:476 mount.davfs.8:484 msgid "Only used when the mounting user is root." msgstr "" #. type: TP -#: mount.davfs.8:473 +#: mount.davfs.8:477 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: mount.davfs.8:478 +#: mount.davfs.8:482 msgid "" "A comma separated list of domain names that shall be accessed directly. " "B<*> matches any domain name. A domain name starting with B<.> (period) " @@ -1004,85 +1010,85 @@ msgstr "" #. type: Plain text -#: mount.davfs.8:482 +#: mount.davfs.8:486 msgid "Not applied when the proxy is defined in I<@SYS_CONF_DIR@>." msgstr "" #. type: SH -#: mount.davfs.8:484 +#: mount.davfs.8:488 #, no-wrap msgid "EXAMPLES" msgstr "" #. type: Plain text -#: mount.davfs.8:487 +#: mount.davfs.8:491 msgid "B" msgstr "" #. type: Plain text -#: mount.davfs.8:490 +#: mount.davfs.8:494 msgid "To allow an ordinary user to mount there must be an entry in I" msgstr "" #. type: Plain text -#: mount.davfs.8:492 +#: mount.davfs.8:496 msgid "http://webdav.org/dav /media/dav davfs noauto,user 0 0" msgstr "" #. type: Plain text -#: mount.davfs.8:497 +#: mount.davfs.8:501 msgid "" "If a proxy must be used this should be configured in I<@SYS_CONF_DIR@/" "@CONFIGFILE@>" msgstr "" #. type: Plain text -#: mount.davfs.8:499 +#: mount.davfs.8:503 msgid "proxy proxy.mycompany.com:8080" msgstr "" #. type: Plain text -#: mount.davfs.8:503 +#: mount.davfs.8:507 msgid "Credentials are stored in I" msgstr "" #. type: Plain text -#: mount.davfs.8:505 +#: mount.davfs.8:509 msgid "proxy.mycompany.com filomena \"my secret\"" msgstr "" #. type: Plain text -#: mount.davfs.8:507 +#: mount.davfs.8:511 msgid "/media/dav webdav-username password" msgstr "" #. type: Plain text -#: mount.davfs.8:511 +#: mount.davfs.8:515 msgid "Now the WebDAV resource may be mounted by user filomena invoking" msgstr "" #. type: Plain text -#: mount.davfs.8:513 +#: mount.davfs.8:517 msgid "B" msgstr "" #. type: Plain text -#: mount.davfs.8:517 +#: mount.davfs.8:521 msgid "and unmounted by user filomena invoking" msgstr "" #. type: Plain text -#: mount.davfs.8:519 +#: mount.davfs.8:523 msgid "B" msgstr "" #. type: Plain text -#: mount.davfs.8:523 +#: mount.davfs.8:527 msgid "B" msgstr "" #. type: Plain text -#: mount.davfs.8:529 +#: mount.davfs.8:533 msgid "" "Mounts the resource I at mount point I, encrypting all traffic with SSL. Credentials for I" msgstr "" #. type: Plain text -#: mount.davfs.8:535 +#: mount.davfs.8:539 msgid "Mounts the resource I at I." msgstr "" #. type: Plain text -#: mount.davfs.8:537 +#: mount.davfs.8:541 msgid "" "B" msgstr "" #. type: SH -#: mount.davfs.8:540 umount.davfs.8:74 +#: mount.davfs.8:544 umount.davfs.8:74 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: mount.davfs.8:543 +#: mount.davfs.8:547 msgid "B<@PACKAGE@> does not support links." msgstr "" #. type: Plain text -#: mount.davfs.8:545 +#: mount.davfs.8:549 msgid "A B<@PACKAGE@> file system cannot be moved with I." msgstr "" #. type: Plain text -#: mount.davfs.8:551 +#: mount.davfs.8:555 msgid "" "This man page was written by Luciano Bello Eluciano@linux.org.arE " "for Debian, for version 0.2.3 of davfs2." msgstr "" #. type: Plain text -#: mount.davfs.8:555 +#: mount.davfs.8:559 msgid "" "It has been updated for this version by Werner Baumann Ewerner." "baumann@onlinhome.deE." msgstr "" #. type: Plain text -#: mount.davfs.8:558 +#: mount.davfs.8:562 msgid "@PACKAGE@ is developed by Sung Kim Ehunkim@gmail.comE." msgstr "" #. type: Plain text -#: mount.davfs.8:562 +#: mount.davfs.8:566 msgid "" "Version 1.0.0 (and later) of @PACKAGE@ is a complete rewrite by Werner " "Baumann." msgstr "" #. type: Plain text -#: mount.davfs.8:575 +#: mount.davfs.8:579 msgid "" "B(8), B<@CONFIGFILE@>(5), B(8), B(8), " "B(5)" diff -Nru davfs2-1.5.2/man/umount.davfs.8.pot davfs2-1.5.4/man/umount.davfs.8.pot --- davfs2-1.5.2/man/umount.davfs.8.pot 2014-08-23 18:16:23.000000000 +0000 +++ davfs2-1.5.4/man/umount.davfs.8.pot 2016-04-16 07:07:18.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2014-08-23 20:12+0300\n" +"POT-Creation-Date: 2015-02-01 11:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -157,10 +157,10 @@ #. type: Plain text #: umount.davfs.8:26 msgid "" -"B is a umount helper program. It is called by the B" -"(8) command. Its purpose is to prevent the umount command from returning " -"unless B<@PROGRAM_NAME@> has synchronized all its cached files with the " -"webdav server." +"B is a umount helper program. It is called by the " +"B(8) command. Its purpose is to prevent the umount command from " +"returning unless B<@PROGRAM_NAME@> has synchronized all its cached files " +"with the webdav server." msgstr "" #. type: Plain text Binary files /tmp/tmpXvdEj4/PjrbSo0QSd/davfs2-1.5.2/po/cs.gmo and /tmp/tmpXvdEj4/Me6IUWeU60/davfs2-1.5.4/po/cs.gmo differ diff -Nru davfs2-1.5.2/po/cs.po davfs2-1.5.4/po/cs.po --- davfs2-1.5.2/po/cs.po 2014-08-23 18:17:37.000000000 +0000 +++ davfs2-1.5.4/po/cs.po 2016-04-16 07:08:05.000000000 +0000 @@ -7,7 +7,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2014-08-23 20:17+0200\n" +"POT-Creation-Date: 2016-04-16 09:08+0200\n" "PO-Revision-Date: 2007-05-03 19:50+0200\n" "Last-Translator: Vítězslav Kotrla \n" "Language-Team: \n" @@ -62,127 +62,143 @@ msgid "can't create new index file for %s" msgstr "nemohu vytvořit nový indexový soubor pro %s" -#: src/cache.c:958 +#: src/cache.c:959 #, c-format msgid "" "File %s exists on the server but should not. Maybe it is an error in the " "server's LOCK impementation. You may try option 'use_locks 0' in davfs2.conf." msgstr "" -#: src/cache.c:2568 src/cache.c:2602 +#: src/cache.c:2569 src/cache.c:2603 #, c-format msgid "can't create cache file %s" msgstr "nemohu vytvořit soubor vyrovnávací paměti %s" -#: src/cache.c:2617 +#: src/cache.c:2618 #, c-format msgid "error writing directory %s" msgstr "chyba při zápisu adresáře %s" -#: src/cache.c:2785 src/mount_davfs.c:602 src/mount_davfs.c:604 -#: src/mount_davfs.c:778 src/mount_davfs.c:780 src/mount_davfs.c:797 -#: src/mount_davfs.c:799 src/mount_davfs.c:1735 src/mount_davfs.c:1737 +#: src/cache.c:2786 src/mount_davfs.c:610 src/mount_davfs.c:612 +#: src/mount_davfs.c:786 src/mount_davfs.c:788 src/mount_davfs.c:805 +#: src/mount_davfs.c:807 src/mount_davfs.c:1751 src/mount_davfs.c:1753 msgid "can't read user data base" msgstr "nemohu přečíst údaje o uživatelích" -#: src/cache.c:2796 +#: src/cache.c:2797 #, c-format msgid "can't open cache directory %s" msgstr "nemohu otevřít kešovací adresář %s" -#: src/cache.c:2811 +#: src/cache.c:2812 #, c-format msgid "can't create cache directory %s" msgstr "nemohu vytvořit kešovací adresář %s" -#: src/cache.c:2818 +#: src/cache.c:2819 #, c-format msgid "can't access cache directory %s" msgstr "nemohu přistoupit ke kešovacímu adresáři %s" -#: src/cache.c:2821 +#: src/cache.c:2822 #, c-format msgid "wrong owner of cache directory %s" msgstr "chybný vlastník kešovacího adresáře %s" -#: src/cache.c:2825 +#: src/cache.c:2826 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "pro kešovací adresář %s nastaveno chybné oprávnění" -#: src/cache.c:2855 +#: src/cache.c:2856 msgid "found orphaned file in cache:" msgstr "" -#: src/cache.c:2928 +#: src/cache.c:2929 #, c-format msgid "error parsing %s" msgstr "chyba při zpracování %s" -#: src/cache.c:2929 +#: src/cache.c:2930 #, c-format msgid " at line %i" msgstr "" -#: src/cache.c:2974 +#: src/cache.c:2975 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" "otevřené soubory přesahují limit velikosti vyrovnávací paměti o %llu MiB" -#: src/dav_coda.c:167 src/dav_fuse.c:162 +#: src/dav_coda.c:167 src/dav_fuse.c:164 msgid "can't allocate message buffer" msgstr "nemohu alokovat buffer pro zprávu" -#: src/kernel_interface.c:112 +#: src/dav_fuse.c:185 src/mount_davfs.c:375 +#, c-format +msgid "unmounting %s" +msgstr "odpojuji %s" + +#: src/kernel_interface.c:103 src/kernel_interface.c:151 src/mount_davfs.c:235 +#: src/mount_davfs.c:319 src/mount_davfs.c:429 src/mount_davfs.c:439 +#: src/mount_davfs.c:443 src/mount_davfs.c:483 src/mount_davfs.c:492 +#: src/mount_davfs.c:498 src/mount_davfs.c:524 src/mount_davfs.c:576 +#: src/mount_davfs.c:604 src/mount_davfs.c:849 src/mount_davfs.c:852 +#: src/mount_davfs.c:1118 src/mount_davfs.c:1123 src/mount_davfs.c:1167 +#: src/mount_davfs.c:1170 src/mount_davfs.c:1343 src/mount_davfs.c:1380 +#: src/webdav.c:441 src/webdav.c:444 +msgid "can't change effective user id" +msgstr "nemohu změnit identifikátor efektivního uživatele" + +#: src/kernel_interface.c:113 msgid "trying fuse kernel file system" msgstr "zkouším jaderný souborový systém fuse" -#: src/kernel_interface.c:120 +#: src/kernel_interface.c:121 msgid "fuse device opened successfully" msgstr "zařízení fuse otevřeno úspěšně" -#: src/kernel_interface.c:132 +#: src/kernel_interface.c:133 msgid "trying coda kernel file system" msgstr "zkouším jaderný souborový systém coda" -#: src/kernel_interface.c:138 +#: src/kernel_interface.c:139 msgid "coda device opened successfully" msgstr "zařízení coda otevřeno úspěšně" -#: src/kernel_interface.c:146 +#: src/kernel_interface.c:147 #, c-format msgid "unknown kernel file system %s" msgstr "neznámý jaderný souborový systém %s" -#: src/kernel_interface.c:172 +#: src/kernel_interface.c:174 msgid "no free coda device to mount" msgstr "pro připojení není volné žádné coda zařízení" -#: src/kernel_interface.c:181 +#: src/kernel_interface.c:183 #, c-format msgid "CODA_KERNEL_VERSION %u not supported" msgstr "CODA_KERNEL_VERSION %u není podporováno" -#: src/kernel_interface.c:208 +#: src/kernel_interface.c:210 #, fuzzy msgid "loading kernel module fuse" msgstr "neznámý jaderný souborový systém %s" -#: src/kernel_interface.c:222 +#: src/kernel_interface.c:224 #, fuzzy msgid "loading kernel module fuse failed" msgstr "neznámý jaderný souborový systém %s" -#: src/kernel_interface.c:228 +#: src/kernel_interface.c:230 msgid "waiting for /dev/fuse to be created" msgstr "" -#: src/kernel_interface.c:236 +#: src/kernel_interface.c:238 msgid "can't open fuse device" msgstr "nemohu otevřít fuse zařízení" -#: src/kernel_interface.c:262 +#: src/kernel_interface.c:264 msgid "can't mount using fuse kernel file system" msgstr "nemohu připojit jaderný souborový systém fuse" @@ -190,95 +206,86 @@ msgid "program is not setuid root" msgstr "program není spuštěn jako setuid root" -#: src/mount_davfs.c:235 src/mount_davfs.c:437 src/mount_davfs.c:441 -msgid "can't change effective user id" -msgstr "nemohu změnit identifikátor efektivního uživatele" - #: src/mount_davfs.c:299 msgid "can't start daemon process" msgstr "nemohu spustit proces na pozadí" -#: src/mount_davfs.c:322 +#: src/mount_davfs.c:323 msgid "can't release root privileges" msgstr "nemohu uvolnit oprávnění uživatele root" -#: src/mount_davfs.c:344 +#: src/mount_davfs.c:345 msgid "failed to release tty properly" msgstr "" -#: src/mount_davfs.c:356 +#: src/mount_davfs.c:357 #, c-format msgid "can't write pid file %s" msgstr "nemohu zapsat pid souboru %s" -#: src/mount_davfs.c:374 -#, c-format -msgid "unmounting %s" -msgstr "odpojuji %s" - -#: src/mount_davfs.c:376 +#: src/mount_davfs.c:377 msgid "unmounting failed" msgstr "odpojení selhalo" -#: src/mount_davfs.c:425 src/mount_davfs.c:511 src/mount_davfs.c:588 -#: src/mount_davfs.c:802 +#: src/mount_davfs.c:426 src/mount_davfs.c:516 src/mount_davfs.c:595 +#: src/mount_davfs.c:810 #, c-format msgid "group %s does not exist" msgstr "skupina %s neexistuje" -#: src/mount_davfs.c:429 +#: src/mount_davfs.c:431 msgid "can't change group id" msgstr "nemohu změnit id skupiny" -#: src/mount_davfs.c:434 +#: src/mount_davfs.c:436 #, c-format msgid "user %s does not exist" msgstr "uživatel %s neexistuje" -#: src/mount_davfs.c:463 +#: src/mount_davfs.c:465 #, fuzzy, c-format msgid "can't access file %s" msgstr "nemohu přistupovat k adresáři %s" -#: src/mount_davfs.c:486 src/mount_davfs.c:497 src/mount_davfs.c:573 -#: src/mount_davfs.c:608 +#: src/mount_davfs.c:489 src/mount_davfs.c:502 src/mount_davfs.c:580 +#: src/mount_davfs.c:616 #, c-format msgid "can't create directory %s" msgstr "nemohu vytvořit adresář %s" -#: src/mount_davfs.c:501 src/mount_davfs.c:577 src/mount_davfs.c:612 -#: src/mount_davfs.c:617 src/mount_davfs.c:626 +#: src/mount_davfs.c:506 src/mount_davfs.c:584 src/mount_davfs.c:620 +#: src/mount_davfs.c:625 src/mount_davfs.c:634 #, c-format msgid "can't access directory %s" msgstr "nemohu přistupovat k adresáři %s" -#: src/mount_davfs.c:507 src/mount_davfs.c:583 +#: src/mount_davfs.c:512 src/mount_davfs.c:590 #, c-format msgid "can't change mode of directory %s" msgstr "nemohu změnit oprávnění (mode) adresáře %s" -#: src/mount_davfs.c:516 src/mount_davfs.c:593 +#: src/mount_davfs.c:521 src/mount_davfs.c:600 #, c-format msgid "can't change group of directory %s" msgstr "nemohu změnit skupinu adresáře %s" -#: src/mount_davfs.c:621 src/mount_davfs.c:783 src/mount_davfs.c:811 -#: src/mount_davfs.c:813 +#: src/mount_davfs.c:629 src/mount_davfs.c:791 src/mount_davfs.c:819 +#: src/mount_davfs.c:821 msgid "can't read group data base" msgstr "nemohu přečíst údaje o skupinách" -#: src/mount_davfs.c:644 src/mount_davfs.c:692 src/mount_davfs.c:1417 -#: src/mount_davfs.c:1421 +#: src/mount_davfs.c:652 src/mount_davfs.c:700 src/mount_davfs.c:1433 +#: src/mount_davfs.c:1437 #, c-format msgid "can't open file %s" msgstr "nemohu otevřít soubor %s" -#: src/mount_davfs.c:649 +#: src/mount_davfs.c:657 #, c-format msgid "%s is already mounted on %s" msgstr "%s už je připojeno jako %s" -#: src/mount_davfs.c:672 +#: src/mount_davfs.c:680 #, c-format msgid "" "found PID file %s.\n" @@ -289,89 +296,89 @@ "Buď %s používá jiný proces, nebo\n" "jiné připojení skončilo neobvykle" -#: src/mount_davfs.c:710 +#: src/mount_davfs.c:718 #, c-format msgid "no entry for %s found in %s" msgstr "pro %s nebyla v %s nalezena žádná položka" -#: src/mount_davfs.c:714 +#: src/mount_davfs.c:722 #, c-format msgid "different URL in %s" msgstr "v %s je jiné URL" -#: src/mount_davfs.c:718 +#: src/mount_davfs.c:726 #, c-format msgid "different file system type in %s" msgstr "v %s je jiný souborový systém" -#: src/mount_davfs.c:729 +#: src/mount_davfs.c:737 #, c-format msgid "different config file in %s" msgstr "v %s je jiný konfigurační soubor" -#: src/mount_davfs.c:735 +#: src/mount_davfs.c:743 #, fuzzy, c-format msgid "different username in %s" msgstr "v %s je odlišný dir_mode" -#: src/mount_davfs.c:739 +#: src/mount_davfs.c:747 #, fuzzy, c-format msgid "neither option `user' nor option `users' set in %s" msgstr "volba 'user' není v %s nastavena" -#: src/mount_davfs.c:742 +#: src/mount_davfs.c:750 #, c-format msgid "different mount options in %s" msgstr "v %s jsou jiné parametry připojení" -#: src/mount_davfs.c:745 +#: src/mount_davfs.c:753 #, c-format msgid "different uid in %s" msgstr "v %s je odlišné uid" -#: src/mount_davfs.c:747 +#: src/mount_davfs.c:755 #, c-format msgid "different gid in %s" msgstr "v %s je odlišné gid" -#: src/mount_davfs.c:749 +#: src/mount_davfs.c:757 #, c-format msgid "different dir_mode in %s" msgstr "v %s je odlišný dir_mode" -#: src/mount_davfs.c:751 +#: src/mount_davfs.c:759 #, c-format msgid "different file_mode in %s" msgstr "v %s je odlišný file_mode" -#: src/mount_davfs.c:771 +#: src/mount_davfs.c:779 msgid "you can't set file owner different from your uid" msgstr "nemůžete nastavit jiného vlastníka souboru než je vaše uid" -#: src/mount_davfs.c:789 +#: src/mount_davfs.c:797 msgid "you must be member of the group of the file system" msgstr "musíte být členem skupiny souborového systému" -#: src/mount_davfs.c:822 +#: src/mount_davfs.c:830 #, c-format msgid "user %s must be member of group %s" msgstr "uživatel %s musí být členem skupiny %s" -#: src/mount_davfs.c:845 +#: src/mount_davfs.c:855 #, c-format msgid "can't mount %s on %s" msgstr "není možno připojit %s do %s" -#: src/mount_davfs.c:847 +#: src/mount_davfs.c:857 #, c-format msgid "kernel does not know file system %s" msgstr "kernel nezná souborový systém %s" -#: src/mount_davfs.c:849 +#: src/mount_davfs.c:859 msgid "mount point is busy" msgstr "přípojný bod je zaneprázdněn" -#: src/mount_davfs.c:924 src/umount_davfs.c:88 +#: src/mount_davfs.c:934 src/umount_davfs.c:88 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -382,65 +389,65 @@ "Program je poskytován BEZ JAKÉKOLIV záruky, včetně záruky PRODEJNOSTI či " "VHODNOSTI K URČITÉMU ÚČELU.\n" -#: src/mount_davfs.c:940 src/umount_davfs.c:114 +#: src/mount_davfs.c:950 src/umount_davfs.c:114 msgid "unknown error parsing arguments" msgstr "neznámá chyba při zpracování argumentů" -#: src/mount_davfs.c:949 src/umount_davfs.c:120 +#: src/mount_davfs.c:959 src/umount_davfs.c:120 msgid "missing argument" msgstr "chybějící argument" -#: src/mount_davfs.c:962 +#: src/mount_davfs.c:972 #, c-format msgid "can't evaluate path of mount point %s" msgstr "nemohu vyhodnotit cestu k přípojnému bodu %s" -#: src/mount_davfs.c:965 src/umount_davfs.c:122 +#: src/mount_davfs.c:975 src/umount_davfs.c:122 msgid "too many arguments" msgstr "příliš mnoho argumentů" -#: src/mount_davfs.c:974 +#: src/mount_davfs.c:984 #, c-format msgid "can't get home directory for uid %i" msgstr "nemohu zjistit domovský adresář pro uid %i" -#: src/mount_davfs.c:976 +#: src/mount_davfs.c:986 msgid "A relative mount point must lie within your home directory" msgstr "Relativní přípojný bod musí ležet ve vašem domovském adresáři" -#: src/mount_davfs.c:981 +#: src/mount_davfs.c:991 msgid "no WebDAV-server specified" msgstr "nebyl zadán žádný WebDAV server" -#: src/mount_davfs.c:984 +#: src/mount_davfs.c:994 msgid "invalid URL" msgstr "neplatné URL" -#: src/mount_davfs.c:1003 +#: src/mount_davfs.c:1013 msgid "can't determine home directory" msgstr "nelze určit domovský adresář" -#: src/mount_davfs.c:1109 src/webdav.c:445 +#: src/mount_davfs.c:1120 src/webdav.c:447 #, c-format msgid "can't read client certificate %s" msgstr "nelze přečíst klientský certifikát %s" -#: src/mount_davfs.c:1114 +#: src/mount_davfs.c:1126 #, c-format msgid "client certificate file %s has wrong owner" msgstr "klientský certifikát %s má chybného vlastníka" -#: src/mount_davfs.c:1120 +#: src/mount_davfs.c:1132 #, c-format msgid "client certificate file %s has wrong permissions" msgstr "soubor s klientským certifikátem %s má chybná oprávnění" -#: src/mount_davfs.c:1170 src/mount_davfs.c:1183 src/mount_davfs.c:1185 -#: src/mount_davfs.c:1203 src/mount_davfs.c:1205 src/webdav.c:452 +#: src/mount_davfs.c:1184 src/mount_davfs.c:1197 src/mount_davfs.c:1199 +#: src/mount_davfs.c:1217 src/mount_davfs.c:1219 src/webdav.c:454 msgid "Password: " msgstr "Heslo: " -#: src/mount_davfs.c:1174 +#: src/mount_davfs.c:1188 #, fuzzy, c-format msgid "" "Please enter the username to authenticate with proxy\n" @@ -450,11 +457,11 @@ "%s (pokud žádné zadat nechcete, pouze stiskněte enter).\n" "Uživatelské jméno: " -#: src/mount_davfs.c:1176 src/mount_davfs.c:1196 +#: src/mount_davfs.c:1190 src/mount_davfs.c:1210 msgid "Username:" msgstr "" -#: src/mount_davfs.c:1180 +#: src/mount_davfs.c:1194 #, c-format msgid "" "Please enter the password to authenticate user %s with proxy\n" @@ -463,7 +470,7 @@ "Zadejte prosím heslo pro autentizaci uživatele %s na proxy\n" "%s (pokud žádné zadat nechcete, pouze stiskněte enter).\n" -#: src/mount_davfs.c:1194 +#: src/mount_davfs.c:1208 #, fuzzy, c-format msgid "" "Please enter the username to authenticate with server\n" @@ -473,7 +480,7 @@ "%s (nebo pouze stiskně enter, pokud nic zadat nechcete).\n" "Uživatelské jméno: " -#: src/mount_davfs.c:1200 +#: src/mount_davfs.c:1214 #, c-format msgid "" "Please enter the password to authenticate user %s with server\n" @@ -482,12 +489,12 @@ "Zadejte prosím heslo uživatele %s pro autentizaci na serveru\n" "%s (nebo pouze stiskně enter, pokud nic zadat nechcete).\n" -#: src/mount_davfs.c:1255 +#: src/mount_davfs.c:1269 #, c-format msgid "pid %i, got signal %i" msgstr "pid %i dostal signál %i" -#: src/mount_davfs.c:1278 +#: src/mount_davfs.c:1292 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." @@ -495,78 +502,78 @@ "Varování: nelze přečíst údaje o uživatelích. Přesto připojuji, v mtab ale " "nebude žádný záznam." -#: src/mount_davfs.c:1333 +#: src/mount_davfs.c:1348 #, fuzzy, c-format msgid "can't create file %s" msgstr "nemohu vytvořit soubor vyrovnávací paměti %s" -#: src/mount_davfs.c:1337 +#: src/mount_davfs.c:1352 #, fuzzy, c-format msgid "can't lock file %s" msgstr "nemohu otevřít soubor %s" -#: src/mount_davfs.c:1359 +#: src/mount_davfs.c:1374 #, fuzzy, c-format msgid "" "Warning: can't write entry into %s, but will mount the file system anyway" msgstr "" "Varování: nelze zapsat položku do mtab, přesto souborový systém připojím" -#: src/mount_davfs.c:1396 +#: src/mount_davfs.c:1412 #, c-format msgid "option %s has invalid argument;it must be a decimal number" msgstr "volba %s má neplatný argument; musí to být číslo v desítkové soustavě" -#: src/mount_davfs.c:1399 +#: src/mount_davfs.c:1415 #, c-format msgid "option %s has invalid argument;it must be an octal number" msgstr "volba %s má neplatný argument; musí to být číslo v osmičkové soustavě" -#: src/mount_davfs.c:1402 +#: src/mount_davfs.c:1418 #, c-format msgid "option %s has invalid argument;it must be a number" msgstr "volba %s má neplatný argument; musí to být číslo" -#: src/mount_davfs.c:1428 +#: src/mount_davfs.c:1444 #, fuzzy, c-format msgid "error writing to file %s" msgstr "chyba při zápisu nového indexového souboru %s" -#: src/mount_davfs.c:1630 +#: src/mount_davfs.c:1646 #, c-format msgid "option %s requires argument" msgstr "volba %s vyžaduje argument" -#: src/mount_davfs.c:1717 +#: src/mount_davfs.c:1733 #, c-format msgid "Unknown option %s.\n" msgstr "Neznámá volba %s.\n" -#: src/mount_davfs.c:2134 src/mount_davfs.c:2368 src/mount_davfs.c:2380 +#: src/mount_davfs.c:2165 src/mount_davfs.c:2399 src/mount_davfs.c:2411 #, fuzzy, c-format msgid "opening %s failed" msgstr "odpojení selhalo" -#: src/mount_davfs.c:2155 src/mount_davfs.c:2200 src/mount_davfs.c:2297 -#: src/mount_davfs.c:2396 src/mount_davfs.c:2463 +#: src/mount_davfs.c:2186 src/mount_davfs.c:2231 src/mount_davfs.c:2328 +#: src/mount_davfs.c:2427 src/mount_davfs.c:2494 msgid "malformed line" msgstr "špatně zapsaný řádek" -#: src/mount_davfs.c:2278 src/mount_davfs.c:2291 +#: src/mount_davfs.c:2309 src/mount_davfs.c:2322 msgid "unknown option" msgstr "neznámá volba" -#: src/mount_davfs.c:2372 +#: src/mount_davfs.c:2403 #, c-format msgid "file %s has wrong owner" msgstr "soubor %s má chybného vlastníka" -#: src/mount_davfs.c:2375 +#: src/mount_davfs.c:2406 #, c-format msgid "file %s has wrong permissions" msgstr "soubor %s má chybná oprávnění" -#: src/mount_davfs.c:2598 +#: src/mount_davfs.c:2629 #, c-format msgid "" "Usage:\n" @@ -579,7 +586,7 @@ " %s -h,--help : vytiskne tuto zprávu\n" "\n" -#: src/mount_davfs.c:2602 +#: src/mount_davfs.c:2633 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" @@ -588,7 +595,7 @@ "Pro připojení zdroje WebDAV nevolejte přímo %s, ale\n" "použijte místo toho `mount'.\n" -#: src/mount_davfs.c:2604 +#: src/mount_davfs.c:2635 #, c-format msgid "" " mount : or\n" @@ -599,7 +606,7 @@ " mount : připojí zdroj WebDAV tak, jak je zadáno\n" " v /etc/fstab.\n" -#: src/mount_davfs.c:2607 +#: src/mount_davfs.c:2638 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -616,7 +623,7 @@ " označuje seznam voleb oddělených čárkou.\n" "\n" -#: src/mount_davfs.c:2612 +#: src/mount_davfs.c:2643 #, c-format msgid "" "Recognised options:\n" @@ -635,7 +642,7 @@ " file_mode= : výchozí mode souboru (v osmičkové soustavě)\n" " dir_mode= : výchozí mode adresáře (v osmičkové soustavě)\n" -#: src/mount_davfs.c:2618 +#: src/mount_davfs.c:2649 #, fuzzy, c-format msgid "" " ro : mount read-only\n" @@ -763,7 +770,7 @@ msgid "can't read server certificate %s" msgstr "nemohu přečíst serverový cerifikát %s" -#: src/webdav.c:450 +#: src/webdav.c:452 #, c-format msgid "" "Please enter the password to decrypt client\n" @@ -772,78 +779,78 @@ "Zadejte prosím heslo pro dešifrování klientského\n" "certifikátu %s.\n" -#: src/webdav.c:464 +#: src/webdav.c:466 #, c-format msgid "can't decrypt client certificate %s" msgstr "nemohu dešifrovat klientský certifikát %s" -#: src/webdav.c:530 src/webdav.c:533 +#: src/webdav.c:532 src/webdav.c:535 msgid "mounting failed; the server does not support WebDAV" msgstr "připojení selhalo; server nepodporuje WebDAV" -#: src/webdav.c:541 +#: src/webdav.c:543 msgid "warning: the server does not support locks" msgstr "varování: server nepodporuje zámky" -#: src/webdav.c:1666 +#: src/webdav.c:1668 msgid "authentication failure:" msgstr "selhání autentizace:" -#: src/webdav.c:1704 +#: src/webdav.c:1706 #, c-format msgid "%i can't open cache file" msgstr "%i nemůže otevřít soubor vyrovnávací paměti" -#: src/webdav.c:1712 +#: src/webdav.c:1714 #, c-format msgid "%i error writing to cache file" msgstr "%i chyba při zápisu do souboru vyrovnávací paměti" -#: src/webdav.c:1986 src/webdav.c:2015 src/webdav.c:2052 +#: src/webdav.c:1988 src/webdav.c:2017 src/webdav.c:2054 msgid "the server certificate is not trusted" msgstr "certifikát serveru je nedůvěryhodný" -#: src/webdav.c:1995 src/webdav.c:1998 +#: src/webdav.c:1997 src/webdav.c:2000 msgid "error processing server certificate" msgstr "chyba při zpracování certifikátu serveru" -#: src/webdav.c:2009 src/webdav.c:2043 +#: src/webdav.c:2011 src/webdav.c:2045 msgid "the server certificate is not yet valid" msgstr "certifikát serveru zatím není platný" -#: src/webdav.c:2011 src/webdav.c:2046 +#: src/webdav.c:2013 src/webdav.c:2048 msgid "the server certificate has expired" msgstr "platnost certifikátu serveru vypršela" -#: src/webdav.c:2013 src/webdav.c:2049 +#: src/webdav.c:2015 src/webdav.c:2051 msgid "the server certificate does not match the server name" msgstr "certifikát serveru nedopovídá jménu serveru" -#: src/webdav.c:2017 src/webdav.c:2055 +#: src/webdav.c:2019 src/webdav.c:2057 msgid "unknown certificate error" msgstr "neznámá chyba certifikátu" -#: src/webdav.c:2018 +#: src/webdav.c:2020 #, c-format msgid " issuer: %s" msgstr " vydavatel: %s" -#: src/webdav.c:2020 +#: src/webdav.c:2022 #, c-format msgid " subject: %s" msgstr " subjekt: %s" -#: src/webdav.c:2022 +#: src/webdav.c:2024 #, c-format msgid " identity: %s" msgstr " identita: %s" -#: src/webdav.c:2024 +#: src/webdav.c:2026 #, c-format msgid " fingerprint: %s" msgstr " otisk: %s" -#: src/webdav.c:2026 +#: src/webdav.c:2028 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -854,27 +861,27 @@ "ověřit jeho otisk! Server může být podvržen nebo může\n" "dojít k útoku s prostředníkem (man-in-the-middle attack).\n" -#: src/webdav.c:2029 +#: src/webdav.c:2031 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "Přijmout certifikát pro toto sezení? [y,N] " -#: src/webdav.c:2056 +#: src/webdav.c:2058 #, c-format msgid " issuer: %s" msgstr " vydavatel: %s" -#: src/webdav.c:2057 +#: src/webdav.c:2059 #, c-format msgid " subject: %s" msgstr " subjekt: %s" -#: src/webdav.c:2058 +#: src/webdav.c:2060 #, c-format msgid " identity: %s" msgstr " identita: %s" -#: src/webdav.c:2061 +#: src/webdav.c:2063 msgid " accepted by user" msgstr " přijat uživatelem" diff -Nru davfs2-1.5.2/po/davfs2.pot davfs2-1.5.4/po/davfs2.pot --- davfs2-1.5.2/po/davfs2.pot 2014-08-23 18:17:37.000000000 +0000 +++ davfs2-1.5.4/po/davfs2.pot 2016-04-16 07:08:05.000000000 +0000 @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: davfs2 1.5.2\n" +"Project-Id-Version: davfs2 1.5.4\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2014-08-23 20:17+0200\n" +"POT-Creation-Date: 2016-04-16 09:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -57,124 +57,140 @@ msgid "can't create new index file for %s" msgstr "" -#: src/cache.c:958 +#: src/cache.c:959 #, c-format msgid "" "File %s exists on the server but should not. Maybe it is an error in the " "server's LOCK impementation. You may try option 'use_locks 0' in davfs2.conf." msgstr "" -#: src/cache.c:2568 src/cache.c:2602 +#: src/cache.c:2569 src/cache.c:2603 #, c-format msgid "can't create cache file %s" msgstr "" -#: src/cache.c:2617 +#: src/cache.c:2618 #, c-format msgid "error writing directory %s" msgstr "" -#: src/cache.c:2785 src/mount_davfs.c:602 src/mount_davfs.c:604 -#: src/mount_davfs.c:778 src/mount_davfs.c:780 src/mount_davfs.c:797 -#: src/mount_davfs.c:799 src/mount_davfs.c:1735 src/mount_davfs.c:1737 +#: src/cache.c:2786 src/mount_davfs.c:610 src/mount_davfs.c:612 +#: src/mount_davfs.c:786 src/mount_davfs.c:788 src/mount_davfs.c:805 +#: src/mount_davfs.c:807 src/mount_davfs.c:1751 src/mount_davfs.c:1753 msgid "can't read user data base" msgstr "" -#: src/cache.c:2796 +#: src/cache.c:2797 #, c-format msgid "can't open cache directory %s" msgstr "" -#: src/cache.c:2811 +#: src/cache.c:2812 #, c-format msgid "can't create cache directory %s" msgstr "" -#: src/cache.c:2818 +#: src/cache.c:2819 #, c-format msgid "can't access cache directory %s" msgstr "" -#: src/cache.c:2821 +#: src/cache.c:2822 #, c-format msgid "wrong owner of cache directory %s" msgstr "" -#: src/cache.c:2825 +#: src/cache.c:2826 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "" -#: src/cache.c:2855 +#: src/cache.c:2856 msgid "found orphaned file in cache:" msgstr "" -#: src/cache.c:2928 +#: src/cache.c:2929 #, c-format msgid "error parsing %s" msgstr "" -#: src/cache.c:2929 +#: src/cache.c:2930 #, c-format msgid " at line %i" msgstr "" -#: src/cache.c:2974 +#: src/cache.c:2975 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" -#: src/dav_coda.c:167 src/dav_fuse.c:162 +#: src/dav_coda.c:167 src/dav_fuse.c:164 msgid "can't allocate message buffer" msgstr "" -#: src/kernel_interface.c:112 +#: src/dav_fuse.c:185 src/mount_davfs.c:375 +#, c-format +msgid "unmounting %s" +msgstr "" + +#: src/kernel_interface.c:103 src/kernel_interface.c:151 src/mount_davfs.c:235 +#: src/mount_davfs.c:319 src/mount_davfs.c:429 src/mount_davfs.c:439 +#: src/mount_davfs.c:443 src/mount_davfs.c:483 src/mount_davfs.c:492 +#: src/mount_davfs.c:498 src/mount_davfs.c:524 src/mount_davfs.c:576 +#: src/mount_davfs.c:604 src/mount_davfs.c:849 src/mount_davfs.c:852 +#: src/mount_davfs.c:1118 src/mount_davfs.c:1123 src/mount_davfs.c:1167 +#: src/mount_davfs.c:1170 src/mount_davfs.c:1343 src/mount_davfs.c:1380 +#: src/webdav.c:441 src/webdav.c:444 +msgid "can't change effective user id" +msgstr "" + +#: src/kernel_interface.c:113 msgid "trying fuse kernel file system" msgstr "" -#: src/kernel_interface.c:120 +#: src/kernel_interface.c:121 msgid "fuse device opened successfully" msgstr "" -#: src/kernel_interface.c:132 +#: src/kernel_interface.c:133 msgid "trying coda kernel file system" msgstr "" -#: src/kernel_interface.c:138 +#: src/kernel_interface.c:139 msgid "coda device opened successfully" msgstr "" -#: src/kernel_interface.c:146 +#: src/kernel_interface.c:147 #, c-format msgid "unknown kernel file system %s" msgstr "" -#: src/kernel_interface.c:172 +#: src/kernel_interface.c:174 msgid "no free coda device to mount" msgstr "" -#: src/kernel_interface.c:181 +#: src/kernel_interface.c:183 #, c-format msgid "CODA_KERNEL_VERSION %u not supported" msgstr "" -#: src/kernel_interface.c:208 +#: src/kernel_interface.c:210 msgid "loading kernel module fuse" msgstr "" -#: src/kernel_interface.c:222 +#: src/kernel_interface.c:224 msgid "loading kernel module fuse failed" msgstr "" -#: src/kernel_interface.c:228 +#: src/kernel_interface.c:230 msgid "waiting for /dev/fuse to be created" msgstr "" -#: src/kernel_interface.c:236 +#: src/kernel_interface.c:238 msgid "can't open fuse device" msgstr "" -#: src/kernel_interface.c:262 +#: src/kernel_interface.c:264 msgid "can't mount using fuse kernel file system" msgstr "" @@ -182,95 +198,86 @@ msgid "program is not setuid root" msgstr "" -#: src/mount_davfs.c:235 src/mount_davfs.c:437 src/mount_davfs.c:441 -msgid "can't change effective user id" -msgstr "" - #: src/mount_davfs.c:299 msgid "can't start daemon process" msgstr "" -#: src/mount_davfs.c:322 +#: src/mount_davfs.c:323 msgid "can't release root privileges" msgstr "" -#: src/mount_davfs.c:344 +#: src/mount_davfs.c:345 msgid "failed to release tty properly" msgstr "" -#: src/mount_davfs.c:356 +#: src/mount_davfs.c:357 #, c-format msgid "can't write pid file %s" msgstr "" -#: src/mount_davfs.c:374 -#, c-format -msgid "unmounting %s" -msgstr "" - -#: src/mount_davfs.c:376 +#: src/mount_davfs.c:377 msgid "unmounting failed" msgstr "" -#: src/mount_davfs.c:425 src/mount_davfs.c:511 src/mount_davfs.c:588 -#: src/mount_davfs.c:802 +#: src/mount_davfs.c:426 src/mount_davfs.c:516 src/mount_davfs.c:595 +#: src/mount_davfs.c:810 #, c-format msgid "group %s does not exist" msgstr "" -#: src/mount_davfs.c:429 +#: src/mount_davfs.c:431 msgid "can't change group id" msgstr "" -#: src/mount_davfs.c:434 +#: src/mount_davfs.c:436 #, c-format msgid "user %s does not exist" msgstr "" -#: src/mount_davfs.c:463 +#: src/mount_davfs.c:465 #, c-format msgid "can't access file %s" msgstr "" -#: src/mount_davfs.c:486 src/mount_davfs.c:497 src/mount_davfs.c:573 -#: src/mount_davfs.c:608 +#: src/mount_davfs.c:489 src/mount_davfs.c:502 src/mount_davfs.c:580 +#: src/mount_davfs.c:616 #, c-format msgid "can't create directory %s" msgstr "" -#: src/mount_davfs.c:501 src/mount_davfs.c:577 src/mount_davfs.c:612 -#: src/mount_davfs.c:617 src/mount_davfs.c:626 +#: src/mount_davfs.c:506 src/mount_davfs.c:584 src/mount_davfs.c:620 +#: src/mount_davfs.c:625 src/mount_davfs.c:634 #, c-format msgid "can't access directory %s" msgstr "" -#: src/mount_davfs.c:507 src/mount_davfs.c:583 +#: src/mount_davfs.c:512 src/mount_davfs.c:590 #, c-format msgid "can't change mode of directory %s" msgstr "" -#: src/mount_davfs.c:516 src/mount_davfs.c:593 +#: src/mount_davfs.c:521 src/mount_davfs.c:600 #, c-format msgid "can't change group of directory %s" msgstr "" -#: src/mount_davfs.c:621 src/mount_davfs.c:783 src/mount_davfs.c:811 -#: src/mount_davfs.c:813 +#: src/mount_davfs.c:629 src/mount_davfs.c:791 src/mount_davfs.c:819 +#: src/mount_davfs.c:821 msgid "can't read group data base" msgstr "" -#: src/mount_davfs.c:644 src/mount_davfs.c:692 src/mount_davfs.c:1417 -#: src/mount_davfs.c:1421 +#: src/mount_davfs.c:652 src/mount_davfs.c:700 src/mount_davfs.c:1433 +#: src/mount_davfs.c:1437 #, c-format msgid "can't open file %s" msgstr "" -#: src/mount_davfs.c:649 +#: src/mount_davfs.c:657 #, c-format msgid "%s is already mounted on %s" msgstr "" -#: src/mount_davfs.c:672 +#: src/mount_davfs.c:680 #, c-format msgid "" "found PID file %s.\n" @@ -278,267 +285,267 @@ "or another mount process ended irregular" msgstr "" -#: src/mount_davfs.c:710 +#: src/mount_davfs.c:718 #, c-format msgid "no entry for %s found in %s" msgstr "" -#: src/mount_davfs.c:714 +#: src/mount_davfs.c:722 #, c-format msgid "different URL in %s" msgstr "" -#: src/mount_davfs.c:718 +#: src/mount_davfs.c:726 #, c-format msgid "different file system type in %s" msgstr "" -#: src/mount_davfs.c:729 +#: src/mount_davfs.c:737 #, c-format msgid "different config file in %s" msgstr "" -#: src/mount_davfs.c:735 +#: src/mount_davfs.c:743 #, c-format msgid "different username in %s" msgstr "" -#: src/mount_davfs.c:739 +#: src/mount_davfs.c:747 #, c-format msgid "neither option `user' nor option `users' set in %s" msgstr "" -#: src/mount_davfs.c:742 +#: src/mount_davfs.c:750 #, c-format msgid "different mount options in %s" msgstr "" -#: src/mount_davfs.c:745 +#: src/mount_davfs.c:753 #, c-format msgid "different uid in %s" msgstr "" -#: src/mount_davfs.c:747 +#: src/mount_davfs.c:755 #, c-format msgid "different gid in %s" msgstr "" -#: src/mount_davfs.c:749 +#: src/mount_davfs.c:757 #, c-format msgid "different dir_mode in %s" msgstr "" -#: src/mount_davfs.c:751 +#: src/mount_davfs.c:759 #, c-format msgid "different file_mode in %s" msgstr "" -#: src/mount_davfs.c:771 +#: src/mount_davfs.c:779 msgid "you can't set file owner different from your uid" msgstr "" -#: src/mount_davfs.c:789 +#: src/mount_davfs.c:797 msgid "you must be member of the group of the file system" msgstr "" -#: src/mount_davfs.c:822 +#: src/mount_davfs.c:830 #, c-format msgid "user %s must be member of group %s" msgstr "" -#: src/mount_davfs.c:845 +#: src/mount_davfs.c:855 #, c-format msgid "can't mount %s on %s" msgstr "" -#: src/mount_davfs.c:847 +#: src/mount_davfs.c:857 #, c-format msgid "kernel does not know file system %s" msgstr "" -#: src/mount_davfs.c:849 +#: src/mount_davfs.c:859 msgid "mount point is busy" msgstr "" -#: src/mount_davfs.c:924 src/umount_davfs.c:88 +#: src/mount_davfs.c:934 src/umount_davfs.c:88 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/mount_davfs.c:940 src/umount_davfs.c:114 +#: src/mount_davfs.c:950 src/umount_davfs.c:114 msgid "unknown error parsing arguments" msgstr "" -#: src/mount_davfs.c:949 src/umount_davfs.c:120 +#: src/mount_davfs.c:959 src/umount_davfs.c:120 msgid "missing argument" msgstr "" -#: src/mount_davfs.c:962 +#: src/mount_davfs.c:972 #, c-format msgid "can't evaluate path of mount point %s" msgstr "" -#: src/mount_davfs.c:965 src/umount_davfs.c:122 +#: src/mount_davfs.c:975 src/umount_davfs.c:122 msgid "too many arguments" msgstr "" -#: src/mount_davfs.c:974 +#: src/mount_davfs.c:984 #, c-format msgid "can't get home directory for uid %i" msgstr "" -#: src/mount_davfs.c:976 +#: src/mount_davfs.c:986 msgid "A relative mount point must lie within your home directory" msgstr "" -#: src/mount_davfs.c:981 +#: src/mount_davfs.c:991 msgid "no WebDAV-server specified" msgstr "" -#: src/mount_davfs.c:984 +#: src/mount_davfs.c:994 msgid "invalid URL" msgstr "" -#: src/mount_davfs.c:1003 +#: src/mount_davfs.c:1013 msgid "can't determine home directory" msgstr "" -#: src/mount_davfs.c:1109 src/webdav.c:445 +#: src/mount_davfs.c:1120 src/webdav.c:447 #, c-format msgid "can't read client certificate %s" msgstr "" -#: src/mount_davfs.c:1114 +#: src/mount_davfs.c:1126 #, c-format msgid "client certificate file %s has wrong owner" msgstr "" -#: src/mount_davfs.c:1120 +#: src/mount_davfs.c:1132 #, c-format msgid "client certificate file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:1170 src/mount_davfs.c:1183 src/mount_davfs.c:1185 -#: src/mount_davfs.c:1203 src/mount_davfs.c:1205 src/webdav.c:452 +#: src/mount_davfs.c:1184 src/mount_davfs.c:1197 src/mount_davfs.c:1199 +#: src/mount_davfs.c:1217 src/mount_davfs.c:1219 src/webdav.c:454 msgid "Password: " msgstr "" -#: src/mount_davfs.c:1174 +#: src/mount_davfs.c:1188 #, c-format msgid "" "Please enter the username to authenticate with proxy\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1176 src/mount_davfs.c:1196 +#: src/mount_davfs.c:1190 src/mount_davfs.c:1210 msgid "Username:" msgstr "" -#: src/mount_davfs.c:1180 +#: src/mount_davfs.c:1194 #, c-format msgid "" "Please enter the password to authenticate user %s with proxy\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1194 +#: src/mount_davfs.c:1208 #, c-format msgid "" "Please enter the username to authenticate with server\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1200 +#: src/mount_davfs.c:1214 #, c-format msgid "" "Please enter the password to authenticate user %s with server\n" "%s or hit enter for none.\n" msgstr "" -#: src/mount_davfs.c:1255 +#: src/mount_davfs.c:1269 #, c-format msgid "pid %i, got signal %i" msgstr "" -#: src/mount_davfs.c:1278 +#: src/mount_davfs.c:1292 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." msgstr "" -#: src/mount_davfs.c:1333 +#: src/mount_davfs.c:1348 #, c-format msgid "can't create file %s" msgstr "" -#: src/mount_davfs.c:1337 +#: src/mount_davfs.c:1352 #, c-format msgid "can't lock file %s" msgstr "" -#: src/mount_davfs.c:1359 +#: src/mount_davfs.c:1374 #, c-format msgid "" "Warning: can't write entry into %s, but will mount the file system anyway" msgstr "" -#: src/mount_davfs.c:1396 +#: src/mount_davfs.c:1412 #, c-format msgid "option %s has invalid argument;it must be a decimal number" msgstr "" -#: src/mount_davfs.c:1399 +#: src/mount_davfs.c:1415 #, c-format msgid "option %s has invalid argument;it must be an octal number" msgstr "" -#: src/mount_davfs.c:1402 +#: src/mount_davfs.c:1418 #, c-format msgid "option %s has invalid argument;it must be a number" msgstr "" -#: src/mount_davfs.c:1428 +#: src/mount_davfs.c:1444 #, c-format msgid "error writing to file %s" msgstr "" -#: src/mount_davfs.c:1630 +#: src/mount_davfs.c:1646 #, c-format msgid "option %s requires argument" msgstr "" -#: src/mount_davfs.c:1717 +#: src/mount_davfs.c:1733 #, c-format msgid "Unknown option %s.\n" msgstr "" -#: src/mount_davfs.c:2134 src/mount_davfs.c:2368 src/mount_davfs.c:2380 +#: src/mount_davfs.c:2165 src/mount_davfs.c:2399 src/mount_davfs.c:2411 #, c-format msgid "opening %s failed" msgstr "" -#: src/mount_davfs.c:2155 src/mount_davfs.c:2200 src/mount_davfs.c:2297 -#: src/mount_davfs.c:2396 src/mount_davfs.c:2463 +#: src/mount_davfs.c:2186 src/mount_davfs.c:2231 src/mount_davfs.c:2328 +#: src/mount_davfs.c:2427 src/mount_davfs.c:2494 msgid "malformed line" msgstr "" -#: src/mount_davfs.c:2278 src/mount_davfs.c:2291 +#: src/mount_davfs.c:2309 src/mount_davfs.c:2322 msgid "unknown option" msgstr "" -#: src/mount_davfs.c:2372 +#: src/mount_davfs.c:2403 #, c-format msgid "file %s has wrong owner" msgstr "" -#: src/mount_davfs.c:2375 +#: src/mount_davfs.c:2406 #, c-format msgid "file %s has wrong permissions" msgstr "" -#: src/mount_davfs.c:2598 +#: src/mount_davfs.c:2629 #, c-format msgid "" "Usage:\n" @@ -547,14 +554,14 @@ "\n" msgstr "" -#: src/mount_davfs.c:2602 +#: src/mount_davfs.c:2633 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" "`mount' instead.\n" msgstr "" -#: src/mount_davfs.c:2604 +#: src/mount_davfs.c:2635 #, c-format msgid "" " mount : or\n" @@ -562,7 +569,7 @@ " /etc/fstab.\n" msgstr "" -#: src/mount_davfs.c:2607 +#: src/mount_davfs.c:2638 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -573,7 +580,7 @@ "\n" msgstr "" -#: src/mount_davfs.c:2612 +#: src/mount_davfs.c:2643 #, c-format msgid "" "Recognised options:\n" @@ -584,7 +591,7 @@ " dir_mode= : default directory mode (octal)\n" msgstr "" -#: src/mount_davfs.c:2618 +#: src/mount_davfs.c:2649 #, c-format msgid "" " ro : mount read-only\n" @@ -682,85 +689,85 @@ msgid "can't read server certificate %s" msgstr "" -#: src/webdav.c:450 +#: src/webdav.c:452 #, c-format msgid "" "Please enter the password to decrypt client\n" "certificate %s.\n" msgstr "" -#: src/webdav.c:464 +#: src/webdav.c:466 #, c-format msgid "can't decrypt client certificate %s" msgstr "" -#: src/webdav.c:530 src/webdav.c:533 +#: src/webdav.c:532 src/webdav.c:535 msgid "mounting failed; the server does not support WebDAV" msgstr "" -#: src/webdav.c:541 +#: src/webdav.c:543 msgid "warning: the server does not support locks" msgstr "" -#: src/webdav.c:1666 +#: src/webdav.c:1668 msgid "authentication failure:" msgstr "" -#: src/webdav.c:1704 +#: src/webdav.c:1706 #, c-format msgid "%i can't open cache file" msgstr "" -#: src/webdav.c:1712 +#: src/webdav.c:1714 #, c-format msgid "%i error writing to cache file" msgstr "" -#: src/webdav.c:1986 src/webdav.c:2015 src/webdav.c:2052 +#: src/webdav.c:1988 src/webdav.c:2017 src/webdav.c:2054 msgid "the server certificate is not trusted" msgstr "" -#: src/webdav.c:1995 src/webdav.c:1998 +#: src/webdav.c:1997 src/webdav.c:2000 msgid "error processing server certificate" msgstr "" -#: src/webdav.c:2009 src/webdav.c:2043 +#: src/webdav.c:2011 src/webdav.c:2045 msgid "the server certificate is not yet valid" msgstr "" -#: src/webdav.c:2011 src/webdav.c:2046 +#: src/webdav.c:2013 src/webdav.c:2048 msgid "the server certificate has expired" msgstr "" -#: src/webdav.c:2013 src/webdav.c:2049 +#: src/webdav.c:2015 src/webdav.c:2051 msgid "the server certificate does not match the server name" msgstr "" -#: src/webdav.c:2017 src/webdav.c:2055 +#: src/webdav.c:2019 src/webdav.c:2057 msgid "unknown certificate error" msgstr "" -#: src/webdav.c:2018 +#: src/webdav.c:2020 #, c-format msgid " issuer: %s" msgstr "" -#: src/webdav.c:2020 +#: src/webdav.c:2022 #, c-format msgid " subject: %s" msgstr "" -#: src/webdav.c:2022 +#: src/webdav.c:2024 #, c-format msgid " identity: %s" msgstr "" -#: src/webdav.c:2024 +#: src/webdav.c:2026 #, c-format msgid " fingerprint: %s" msgstr "" -#: src/webdav.c:2026 +#: src/webdav.c:2028 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -768,26 +775,26 @@ "or there might be a man-in-the-middle-attack.\n" msgstr "" -#: src/webdav.c:2029 +#: src/webdav.c:2031 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "" -#: src/webdav.c:2056 +#: src/webdav.c:2058 #, c-format msgid " issuer: %s" msgstr "" -#: src/webdav.c:2057 +#: src/webdav.c:2059 #, c-format msgid " subject: %s" msgstr "" -#: src/webdav.c:2058 +#: src/webdav.c:2060 #, c-format msgid " identity: %s" msgstr "" -#: src/webdav.c:2061 +#: src/webdav.c:2063 msgid " accepted by user" msgstr "" Binary files /tmp/tmpXvdEj4/PjrbSo0QSd/davfs2-1.5.2/po/de.gmo and /tmp/tmpXvdEj4/Me6IUWeU60/davfs2-1.5.4/po/de.gmo differ diff -Nru davfs2-1.5.2/po/de.po davfs2-1.5.4/po/de.po --- davfs2-1.5.2/po/de.po 2014-08-23 18:17:37.000000000 +0000 +++ davfs2-1.5.4/po/de.po 2016-04-16 07:08:05.000000000 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: davfs2 1.4.6\n" "Report-Msgid-Bugs-To: http://savannah.nongnu.org/support/?" "func=additem&group=davfs2\n" -"POT-Creation-Date: 2014-08-23 20:17+0200\n" +"POT-Creation-Date: 2016-04-16 09:08+0200\n" "PO-Revision-Date: 2014-04-19 21:32+0200\n" "Last-Translator: Werner Baumann \n" "Language-Team: \n" @@ -62,7 +62,7 @@ msgid "can't create new index file for %s" msgstr "kann keine neue Indexdatei für %s erzeugen" -#: src/cache.c:958 +#: src/cache.c:959 #, c-format msgid "" "File %s exists on the server but should not. Maybe it is an error in the " @@ -72,119 +72,135 @@ "behandelt der Server LOCK-Requests fehlerhaft. Du kannst es mit der Option " "'use_locks 0' in davfs2.conf versuchen." -#: src/cache.c:2568 src/cache.c:2602 +#: src/cache.c:2569 src/cache.c:2603 #, c-format msgid "can't create cache file %s" msgstr "kann die Cachedatei %s nicht erzeugen" -#: src/cache.c:2617 +#: src/cache.c:2618 #, c-format msgid "error writing directory %s" msgstr "Fehler beim Schreiben des Verzeichnisses %s" -#: src/cache.c:2785 src/mount_davfs.c:602 src/mount_davfs.c:604 -#: src/mount_davfs.c:778 src/mount_davfs.c:780 src/mount_davfs.c:797 -#: src/mount_davfs.c:799 src/mount_davfs.c:1735 src/mount_davfs.c:1737 +#: src/cache.c:2786 src/mount_davfs.c:610 src/mount_davfs.c:612 +#: src/mount_davfs.c:786 src/mount_davfs.c:788 src/mount_davfs.c:805 +#: src/mount_davfs.c:807 src/mount_davfs.c:1751 src/mount_davfs.c:1753 msgid "can't read user data base" msgstr "kann die Benutzerdatenbank nicht lesen" -#: src/cache.c:2796 +#: src/cache.c:2797 #, c-format msgid "can't open cache directory %s" msgstr "kann das Cacheverzeichnis %s nicht öffnen" -#: src/cache.c:2811 +#: src/cache.c:2812 #, c-format msgid "can't create cache directory %s" msgstr "kann das Cacheverzeichnis %s nicht erzeugen" -#: src/cache.c:2818 +#: src/cache.c:2819 #, c-format msgid "can't access cache directory %s" msgstr "Zugriff auf das Cachverzeichnis %s verweigert" -#: src/cache.c:2821 +#: src/cache.c:2822 #, c-format msgid "wrong owner of cache directory %s" msgstr "das Cacheverzeichnis %s hat den falschen Besitzer" -#: src/cache.c:2825 +#: src/cache.c:2826 #, c-format msgid "wrong permissions set for cache directory %s" msgstr "das Cachverzeichnis %s hat die falschen Dateirechte" -#: src/cache.c:2855 +#: src/cache.c:2856 msgid "found orphaned file in cache:" msgstr "fand verwaiste Datei im Cache:" -#: src/cache.c:2928 +#: src/cache.c:2929 #, c-format msgid "error parsing %s" msgstr "Syntaxfehler in %s" -#: src/cache.c:2929 +#: src/cache.c:2930 #, c-format msgid " at line %i" msgstr " in Zeile %i" -#: src/cache.c:2974 +#: src/cache.c:2975 #, c-format msgid "open files exceed max cache size by %llu MiBytes" msgstr "" "Die Größe der offenen Dateien überschreitet die maximale Größe des Cache um " "%llu MiBytes" -#: src/dav_coda.c:167 src/dav_fuse.c:162 +#: src/dav_coda.c:167 src/dav_fuse.c:164 msgid "can't allocate message buffer" msgstr "kein Speicher für den Nachrichtenpuffer verfügbar" -#: src/kernel_interface.c:112 +#: src/dav_fuse.c:185 src/mount_davfs.c:375 +#, c-format +msgid "unmounting %s" +msgstr "hänge %s aus" + +#: src/kernel_interface.c:103 src/kernel_interface.c:151 src/mount_davfs.c:235 +#: src/mount_davfs.c:319 src/mount_davfs.c:429 src/mount_davfs.c:439 +#: src/mount_davfs.c:443 src/mount_davfs.c:483 src/mount_davfs.c:492 +#: src/mount_davfs.c:498 src/mount_davfs.c:524 src/mount_davfs.c:576 +#: src/mount_davfs.c:604 src/mount_davfs.c:849 src/mount_davfs.c:852 +#: src/mount_davfs.c:1118 src/mount_davfs.c:1123 src/mount_davfs.c:1167 +#: src/mount_davfs.c:1170 src/mount_davfs.c:1343 src/mount_davfs.c:1380 +#: src/webdav.c:441 src/webdav.c:444 +msgid "can't change effective user id" +msgstr "kann die effektive Benutzer-ID nicht ändern" + +#: src/kernel_interface.c:113 msgid "trying fuse kernel file system" msgstr "ich versuche es mit dem Kernel-Dateisystem fuse" -#: src/kernel_interface.c:120 +#: src/kernel_interface.c:121 msgid "fuse device opened successfully" msgstr "fuse-Gerätedatei erfolgreich geöffnet" -#: src/kernel_interface.c:132 +#: src/kernel_interface.c:133 msgid "trying coda kernel file system" msgstr "ich versuche es mit dem Kernel-Dateisystem coda" -#: src/kernel_interface.c:138 +#: src/kernel_interface.c:139 msgid "coda device opened successfully" msgstr "coda-Gerätedatei erfolgreich geöffnet" -#: src/kernel_interface.c:146 +#: src/kernel_interface.c:147 #, c-format msgid "unknown kernel file system %s" msgstr "das Kernel-Dateisystem %s ist unbekannt" -#: src/kernel_interface.c:172 +#: src/kernel_interface.c:174 msgid "no free coda device to mount" msgstr "keine freie coda-Gerätedatei gefunden" -#: src/kernel_interface.c:181 +#: src/kernel_interface.c:183 #, c-format msgid "CODA_KERNEL_VERSION %u not supported" msgstr "CODA_KERNEL_VERSION %u wird nicht unterstützt" -#: src/kernel_interface.c:208 +#: src/kernel_interface.c:210 msgid "loading kernel module fuse" msgstr "lade das Kernel_Modul fuse" -#: src/kernel_interface.c:222 +#: src/kernel_interface.c:224 msgid "loading kernel module fuse failed" msgstr "das Laden des Kernel-Moduls fuse schlug fehl" -#: src/kernel_interface.c:228 +#: src/kernel_interface.c:230 msgid "waiting for /dev/fuse to be created" msgstr "warte auf des Einrichten von /dev/fuse" -#: src/kernel_interface.c:236 +#: src/kernel_interface.c:238 msgid "can't open fuse device" msgstr "kann die fuse-Gerätedatei nicht öffnen" -#: src/kernel_interface.c:262 +#: src/kernel_interface.c:264 msgid "can't mount using fuse kernel file system" msgstr "" "mit Kernel-Dateisystem fuse kann das Dateisystem nicht eingehängt werden" @@ -193,95 +209,86 @@ msgid "program is not setuid root" msgstr "die Programmdatei hat das setuid-Bit nicht gesetzt" -#: src/mount_davfs.c:235 src/mount_davfs.c:437 src/mount_davfs.c:441 -msgid "can't change effective user id" -msgstr "kann die effektive Benutzer-ID nicht ändern" - #: src/mount_davfs.c:299 msgid "can't start daemon process" msgstr "kann den Hintergrundprozess nicht starten" -#: src/mount_davfs.c:322 +#: src/mount_davfs.c:323 msgid "can't release root privileges" msgstr "ich werde die root-Rechte nicht los" -#: src/mount_davfs.c:344 +#: src/mount_davfs.c:345 msgid "failed to release tty properly" msgstr "kann das Terminal nicht freigeben" -#: src/mount_davfs.c:356 +#: src/mount_davfs.c:357 #, c-format msgid "can't write pid file %s" msgstr "kann die PID-Datei %s nicht schreiben" -#: src/mount_davfs.c:374 -#, c-format -msgid "unmounting %s" -msgstr "hänge %s aus" - -#: src/mount_davfs.c:376 +#: src/mount_davfs.c:377 msgid "unmounting failed" msgstr "das Aushängen schlug fehl" -#: src/mount_davfs.c:425 src/mount_davfs.c:511 src/mount_davfs.c:588 -#: src/mount_davfs.c:802 +#: src/mount_davfs.c:426 src/mount_davfs.c:516 src/mount_davfs.c:595 +#: src/mount_davfs.c:810 #, c-format msgid "group %s does not exist" msgstr "die Gruppe %s existiert nicht" -#: src/mount_davfs.c:429 +#: src/mount_davfs.c:431 msgid "can't change group id" msgstr "kann die Gruppenkennung nicht ändern" -#: src/mount_davfs.c:434 +#: src/mount_davfs.c:436 #, c-format msgid "user %s does not exist" msgstr "der Benutzer %s existiert nicht" -#: src/mount_davfs.c:463 +#: src/mount_davfs.c:465 #, c-format msgid "can't access file %s" msgstr "kann nicht auf Datei %s zugreifen" -#: src/mount_davfs.c:486 src/mount_davfs.c:497 src/mount_davfs.c:573 -#: src/mount_davfs.c:608 +#: src/mount_davfs.c:489 src/mount_davfs.c:502 src/mount_davfs.c:580 +#: src/mount_davfs.c:616 #, c-format msgid "can't create directory %s" msgstr "kann das Verzeichnis %s nicht erzeugen" -#: src/mount_davfs.c:501 src/mount_davfs.c:577 src/mount_davfs.c:612 -#: src/mount_davfs.c:617 src/mount_davfs.c:626 +#: src/mount_davfs.c:506 src/mount_davfs.c:584 src/mount_davfs.c:620 +#: src/mount_davfs.c:625 src/mount_davfs.c:634 #, c-format msgid "can't access directory %s" msgstr "Zugriff auf das Verzeichnis %s verweigert" -#: src/mount_davfs.c:507 src/mount_davfs.c:583 +#: src/mount_davfs.c:512 src/mount_davfs.c:590 #, c-format msgid "can't change mode of directory %s" msgstr "kann die Rechte des Verzeichnisses %s nicht ändern" -#: src/mount_davfs.c:516 src/mount_davfs.c:593 +#: src/mount_davfs.c:521 src/mount_davfs.c:600 #, c-format msgid "can't change group of directory %s" msgstr "kann die Gruppenkennung des Verneichnisses %s nicht ändern" -#: src/mount_davfs.c:621 src/mount_davfs.c:783 src/mount_davfs.c:811 -#: src/mount_davfs.c:813 +#: src/mount_davfs.c:629 src/mount_davfs.c:791 src/mount_davfs.c:819 +#: src/mount_davfs.c:821 msgid "can't read group data base" msgstr "kann die Gruppendatenbank nicht lesen" -#: src/mount_davfs.c:644 src/mount_davfs.c:692 src/mount_davfs.c:1417 -#: src/mount_davfs.c:1421 +#: src/mount_davfs.c:652 src/mount_davfs.c:700 src/mount_davfs.c:1433 +#: src/mount_davfs.c:1437 #, c-format msgid "can't open file %s" msgstr "kann die Datei %s nicht öffnen" -#: src/mount_davfs.c:649 +#: src/mount_davfs.c:657 #, c-format msgid "%s is already mounted on %s" msgstr "%s ist bereits auf %s eingehängt" -#: src/mount_davfs.c:672 +#: src/mount_davfs.c:680 #, c-format msgid "" "found PID file %s.\n" @@ -292,91 +299,91 @@ "Möglicherweise wird %s von einem anderen Prozess benutzt,\n" "oder ein anderer Mount-Prozess endete irregulär" -#: src/mount_davfs.c:710 +#: src/mount_davfs.c:718 #, c-format msgid "no entry for %s found in %s" msgstr "für %s ist kein Eintrag in %s" -#: src/mount_davfs.c:714 +#: src/mount_davfs.c:722 #, c-format msgid "different URL in %s" msgstr "in %s ist eine andere URL angegeben" -#: src/mount_davfs.c:718 +#: src/mount_davfs.c:726 #, c-format msgid "different file system type in %s" msgstr "in %s ist ein anderer Dateisystemtyp angegeben" -#: src/mount_davfs.c:729 +#: src/mount_davfs.c:737 #, c-format msgid "different config file in %s" msgstr "in %s ist eine andere Konfigurationsdatei angegeben" -#: src/mount_davfs.c:735 +#: src/mount_davfs.c:743 #, c-format msgid "different username in %s" msgstr "in %s ist ein anderer Benutzername angegeben" -#: src/mount_davfs.c:739 +#: src/mount_davfs.c:747 #, c-format msgid "neither option `user' nor option `users' set in %s" msgstr "in %s ist weder die Option „user” noch die Option „users” angegeben" -#: src/mount_davfs.c:742 +#: src/mount_davfs.c:750 #, c-format msgid "different mount options in %s" msgstr "in %s sind andere Mount-Optionen angegeben" -#: src/mount_davfs.c:745 +#: src/mount_davfs.c:753 #, c-format msgid "different uid in %s" msgstr "in %s ist eine andere uid angegeben" -#: src/mount_davfs.c:747 +#: src/mount_davfs.c:755 #, c-format msgid "different gid in %s" msgstr "in %s ist eine andere gid angegeben" -#: src/mount_davfs.c:749 +#: src/mount_davfs.c:757 #, c-format msgid "different dir_mode in %s" msgstr "in %s ist ein anderer dir_mode angegeben" -#: src/mount_davfs.c:751 +#: src/mount_davfs.c:759 #, c-format msgid "different file_mode in %s" msgstr "in %s ist ein anderer file_mode angegeben" -#: src/mount_davfs.c:771 +#: src/mount_davfs.c:779 msgid "you can't set file owner different from your uid" msgstr "" "du kannst als Besitzer des Dateisystems keine fremde Benutzerkennung angeben" -#: src/mount_davfs.c:789 +#: src/mount_davfs.c:797 msgid "you must be member of the group of the file system" msgstr "" "du musst Mitglied in der Gruppe sein, zu der das Dateisystem gehören soll" -#: src/mount_davfs.c:822 +#: src/mount_davfs.c:830 #, c-format msgid "user %s must be member of group %s" msgstr "der Benutzer %s muss Mitglied der Gruppe %s sein" -#: src/mount_davfs.c:845 +#: src/mount_davfs.c:855 #, c-format msgid "can't mount %s on %s" msgstr "kann %s nicht auf %s einhängen" -#: src/mount_davfs.c:847 +#: src/mount_davfs.c:857 #, c-format msgid "kernel does not know file system %s" msgstr "der Kernel kenn das Dateisystem %s nicht" -#: src/mount_davfs.c:849 +#: src/mount_davfs.c:859 msgid "mount point is busy" msgstr "das Einhängepunkt wird anderweitig benutzt" -#: src/mount_davfs.c:924 src/umount_davfs.c:88 +#: src/mount_davfs.c:934 src/umount_davfs.c:88 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -387,69 +394,69 @@ "gibt keine Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE " "ZWECKE.\n" -#: src/mount_davfs.c:940 src/umount_davfs.c:114 +#: src/mount_davfs.c:950 src/umount_davfs.c:114 msgid "unknown error parsing arguments" msgstr "Fehler beim Analysieren der Befehlsargumente" -#: src/mount_davfs.c:949 src/umount_davfs.c:120 +#: src/mount_davfs.c:959 src/umount_davfs.c:120 msgid "missing argument" msgstr "zu wenig Argumente" -#: src/mount_davfs.c:962 +#: src/mount_davfs.c:972 #, c-format msgid "can't evaluate path of mount point %s" msgstr "kann den eindeutigen Pfad des Einhängepunktes %s nicht ermitteln" -#: src/mount_davfs.c:965 src/umount_davfs.c:122 +#: src/mount_davfs.c:975 src/umount_davfs.c:122 msgid "too many arguments" msgstr "zu viele Argumente" -#: src/mount_davfs.c:974 +#: src/mount_davfs.c:984 #, c-format msgid "can't get home directory for uid %i" msgstr "kann das Home-Verzeichnis für die Benutzer-ID %i nicht ermitteln" -#: src/mount_davfs.c:976 +#: src/mount_davfs.c:986 msgid "A relative mount point must lie within your home directory" msgstr "Ein relativer Einhängepunkt muss in deinem Home-Verzeichnis liegen" -#: src/mount_davfs.c:981 +#: src/mount_davfs.c:991 msgid "no WebDAV-server specified" msgstr "es wurde kein WebDAV-Server angegeben" -#: src/mount_davfs.c:984 +#: src/mount_davfs.c:994 msgid "invalid URL" msgstr "die URL ist ungültig" -#: src/mount_davfs.c:1003 +#: src/mount_davfs.c:1013 msgid "can't determine home directory" msgstr "kann das Home-Verzeichnis nicht ermitteln" -#: src/mount_davfs.c:1109 src/webdav.c:445 +#: src/mount_davfs.c:1120 src/webdav.c:447 #, c-format msgid "can't read client certificate %s" msgstr "kann das Client-Zertifikat %s nicht lesen" -#: src/mount_davfs.c:1114 +#: src/mount_davfs.c:1126 #, c-format msgid "client certificate file %s has wrong owner" msgstr "" "die Datei %s\n" "des Client-Zertifikats hat den falschen Besitzer" -#: src/mount_davfs.c:1120 +#: src/mount_davfs.c:1132 #, c-format msgid "client certificate file %s has wrong permissions" msgstr "" "die Dateirechte für das Cient-Zertifikat\n" "%s sind falsch" -#: src/mount_davfs.c:1170 src/mount_davfs.c:1183 src/mount_davfs.c:1185 -#: src/mount_davfs.c:1203 src/mount_davfs.c:1205 src/webdav.c:452 +#: src/mount_davfs.c:1184 src/mount_davfs.c:1197 src/mount_davfs.c:1199 +#: src/mount_davfs.c:1217 src/mount_davfs.c:1219 src/webdav.c:454 msgid "Password: " msgstr "Passwort:" -#: src/mount_davfs.c:1174 +#: src/mount_davfs.c:1188 #, c-format msgid "" "Please enter the username to authenticate with proxy\n" @@ -458,11 +465,11 @@ "Gib bitte den Benutzernamen für den Proxy %s an; wenn du keinen angeben " "willst, drücke Return.\n" -#: src/mount_davfs.c:1176 src/mount_davfs.c:1196 +#: src/mount_davfs.c:1190 src/mount_davfs.c:1210 msgid "Username:" msgstr "Benutzername:" -#: src/mount_davfs.c:1180 +#: src/mount_davfs.c:1194 #, c-format msgid "" "Please enter the password to authenticate user %s with proxy\n" @@ -471,7 +478,7 @@ "Gib bitte das Passwort von %s für den Proxy %s\n" "an; wenn du keines angeben willst, drücke Return.\n" -#: src/mount_davfs.c:1194 +#: src/mount_davfs.c:1208 #, c-format msgid "" "Please enter the username to authenticate with server\n" @@ -480,7 +487,7 @@ "Gib bitte den Benutzernamen für den Server %s an; wenn du keinen angeben " "willst, drücke Return.\n" -#: src/mount_davfs.c:1200 +#: src/mount_davfs.c:1214 #, c-format msgid "" "Please enter the password to authenticate user %s with server\n" @@ -489,12 +496,12 @@ "Gib bitte das Passwort von %s für den Server %s\n" "an; wenn du keines angeben willst, drücke Return.\n" -#: src/mount_davfs.c:1255 +#: src/mount_davfs.c:1269 #, c-format msgid "pid %i, got signal %i" msgstr "PID %i, erhielt Signal %i" -#: src/mount_davfs.c:1278 +#: src/mount_davfs.c:1292 msgid "" "Warning: can't read user data base. Mounting anyway, but there is no entry " "in mtab." @@ -502,17 +509,17 @@ "Warnung: kann die Benutzerdatenbank nicht lesen. Ich hänge das Dateisystem " "trotzdem ein, aber der Eintrag in der mtab wird fehlen." -#: src/mount_davfs.c:1333 +#: src/mount_davfs.c:1348 #, c-format msgid "can't create file %s" msgstr "kann die Datei %s nicht erzeugen" -#: src/mount_davfs.c:1337 +#: src/mount_davfs.c:1352 #, c-format msgid "can't lock file %s" msgstr "kann die Datei %s nicht sperren" -#: src/mount_davfs.c:1359 +#: src/mount_davfs.c:1374 #, c-format msgid "" "Warning: can't write entry into %s, but will mount the file system anyway" @@ -520,61 +527,61 @@ "Warnung: kann keinen Eintrag in die Datei %s schreiben, hänge das " "Dateisystem trotzdem ein." -#: src/mount_davfs.c:1396 +#: src/mount_davfs.c:1412 #, c-format msgid "option %s has invalid argument;it must be a decimal number" msgstr "das Argument der Option %s ist ungültig; es muss eine Dezimalzahl sein" -#: src/mount_davfs.c:1399 +#: src/mount_davfs.c:1415 #, c-format msgid "option %s has invalid argument;it must be an octal number" msgstr "das Argument der Option %s ist ungültig; es muss eine Oktalzahl sein" -#: src/mount_davfs.c:1402 +#: src/mount_davfs.c:1418 #, c-format msgid "option %s has invalid argument;it must be a number" msgstr "das Argument der Option %s ist ungültig; es muss eine Zahl sein" -#: src/mount_davfs.c:1428 +#: src/mount_davfs.c:1444 #, c-format msgid "error writing to file %s" msgstr "Fehler beim Schreiben der Datei %s" -#: src/mount_davfs.c:1630 +#: src/mount_davfs.c:1646 #, c-format msgid "option %s requires argument" msgstr "die Option %s verlangt ein Argument" -#: src/mount_davfs.c:1717 +#: src/mount_davfs.c:1733 #, c-format msgid "Unknown option %s.\n" msgstr "unbekannte Option %s.\n" -#: src/mount_davfs.c:2134 src/mount_davfs.c:2368 src/mount_davfs.c:2380 +#: src/mount_davfs.c:2165 src/mount_davfs.c:2399 src/mount_davfs.c:2411 #, c-format msgid "opening %s failed" msgstr "konnte %s nicht öffnen" -#: src/mount_davfs.c:2155 src/mount_davfs.c:2200 src/mount_davfs.c:2297 -#: src/mount_davfs.c:2396 src/mount_davfs.c:2463 +#: src/mount_davfs.c:2186 src/mount_davfs.c:2231 src/mount_davfs.c:2328 +#: src/mount_davfs.c:2427 src/mount_davfs.c:2494 msgid "malformed line" msgstr "Syntaxfehler in der Zeile" -#: src/mount_davfs.c:2278 src/mount_davfs.c:2291 +#: src/mount_davfs.c:2309 src/mount_davfs.c:2322 msgid "unknown option" msgstr "unbekannte Option" -#: src/mount_davfs.c:2372 +#: src/mount_davfs.c:2403 #, c-format msgid "file %s has wrong owner" msgstr "die Datei %s hat den falschen Besitzer" -#: src/mount_davfs.c:2375 +#: src/mount_davfs.c:2406 #, c-format msgid "file %s has wrong permissions" msgstr "die Dateirechte für %s sind falsch" -#: src/mount_davfs.c:2598 +#: src/mount_davfs.c:2629 #, c-format msgid "" "Usage:\n" @@ -587,7 +594,7 @@ " %s -h, --help : diese Hilfe anzeigen\n" "\n" -#: src/mount_davfs.c:2602 +#: src/mount_davfs.c:2633 #, c-format msgid "" "To mount a WebDAV-resource don't call %s directly, but use\n" @@ -596,7 +603,7 @@ "Um eine WebDAV-Resource zu einzuhängen, sollte %s nicht direkt\n" "aufgerufen werden; stattdessen sollte „mount” benutzt werden.\n" -#: src/mount_davfs.c:2604 +#: src/mount_davfs.c:2635 #, c-format msgid "" " mount : or\n" @@ -607,7 +614,7 @@ " mount : hänge die WebDAV-Resource entsprechend den\n" " Angaben in /etc/fstab ein.\n" -#: src/mount_davfs.c:2607 +#: src/mount_davfs.c:2638 #, c-format msgid "" " mount -t davfs [-o options]\n" @@ -624,7 +631,7 @@ " Kommas unterteilte Liste von Optionen.\n" "\n" -#: src/mount_davfs.c:2612 +#: src/mount_davfs.c:2643 #, c-format msgid "" "Recognised options:\n" @@ -641,7 +648,7 @@ " file_mode= : Standard-Rechte für Dateien (oktal)\n" " dir_mode= : Standard-Rechte für Verzeichnisse (oktal)\n" -#: src/mount_davfs.c:2618 +#: src/mount_davfs.c:2649 #, c-format msgid "" " ro : mount read-only\n" @@ -773,7 +780,7 @@ msgid "can't read server certificate %s" msgstr "kann das Server-Zertifikat %s nicht lesen" -#: src/webdav.c:450 +#: src/webdav.c:452 #, c-format msgid "" "Please enter the password to decrypt client\n" @@ -782,78 +789,78 @@ "Gib bitte das Passwort für die Entschlüsselung des\n" "Client-Zertifikats %s ein.\n" -#: src/webdav.c:464 +#: src/webdav.c:466 #, c-format msgid "can't decrypt client certificate %s" msgstr "kann das Zertifikat %s nicht entschlüsseln" -#: src/webdav.c:530 src/webdav.c:533 +#: src/webdav.c:532 src/webdav.c:535 msgid "mounting failed; the server does not support WebDAV" msgstr "das Einhängen schlug fehl; der Server unterstützt WebDAV nicht" -#: src/webdav.c:541 +#: src/webdav.c:543 msgid "warning: the server does not support locks" msgstr "Warnung: der Server kann Dateien nicht sperren" -#: src/webdav.c:1666 +#: src/webdav.c:1668 msgid "authentication failure:" msgstr "Authentifizierungsfehler" -#: src/webdav.c:1704 +#: src/webdav.c:1706 #, c-format msgid "%i can't open cache file" msgstr "%i kann die Cache-Datei nicht öffnen" -#: src/webdav.c:1712 +#: src/webdav.c:1714 #, c-format msgid "%i error writing to cache file" msgstr "%i Fehler beim Schreiben der Cache-Datei" -#: src/webdav.c:1986 src/webdav.c:2015 src/webdav.c:2052 +#: src/webdav.c:1988 src/webdav.c:2017 src/webdav.c:2054 msgid "the server certificate is not trusted" msgstr "wir trauen dem Zertifikat nicht" -#: src/webdav.c:1995 src/webdav.c:1998 +#: src/webdav.c:1997 src/webdav.c:2000 msgid "error processing server certificate" msgstr "Fehler beim Analysieren des Server-Zertifikats" -#: src/webdav.c:2009 src/webdav.c:2043 +#: src/webdav.c:2011 src/webdav.c:2045 msgid "the server certificate is not yet valid" msgstr "das Server-Zertifikat ist noch nicht gültig" -#: src/webdav.c:2011 src/webdav.c:2046 +#: src/webdav.c:2013 src/webdav.c:2048 msgid "the server certificate has expired" msgstr "das Server-Zertifikat ist nicht mehr gültig" -#: src/webdav.c:2013 src/webdav.c:2049 +#: src/webdav.c:2015 src/webdav.c:2051 msgid "the server certificate does not match the server name" msgstr "das Server-Zertifikat passt nicht zum Namen des Servers" -#: src/webdav.c:2017 src/webdav.c:2055 +#: src/webdav.c:2019 src/webdav.c:2057 msgid "unknown certificate error" msgstr "Fehler beim Analysieren des Server-Zertifikats" -#: src/webdav.c:2018 +#: src/webdav.c:2020 #, c-format msgid " issuer: %s" msgstr " Aussteller: %s" -#: src/webdav.c:2020 +#: src/webdav.c:2022 #, c-format msgid " subject: %s" msgstr " Inhaber: %s" -#: src/webdav.c:2022 +#: src/webdav.c:2024 #, c-format msgid " identity: %s" msgstr " Name: %s" -#: src/webdav.c:2024 +#: src/webdav.c:2026 #, c-format msgid " fingerprint: %s" msgstr " Fingerabdruck: %s" -#: src/webdav.c:2026 +#: src/webdav.c:2028 #, c-format msgid "" "You only should accept this certificate, if you can\n" @@ -864,26 +871,26 @@ "dass der Fingerabdruck stimmt. Der Server könnte gefälscht sein oder\n" "ein Angreifer könnte sich in die Verbindung zum Server eingeschaltet haben.\n" -#: src/webdav.c:2029 +#: src/webdav.c:2031 #, c-format msgid "Accept certificate for this session? [y,N] " msgstr "Ich akzeptiere das Zertifikat für diese Sitzung [j,N]: " -#: src/webdav.c:2056 +#: src/webdav.c:2058 #, c-format msgid " issuer: %s" msgstr " Aussteller des Zertifikats: %s" -#: src/webdav.c:2057 +#: src/webdav.c:2059 #, c-format msgid " subject: %s" msgstr " Inhaber des Zertifikats: %s" -#: src/webdav.c:2058 +#: src/webdav.c:2060 #, c-format msgid " identity: %s" msgstr " Name: %s" -#: src/webdav.c:2061 +#: src/webdav.c:2063 msgid " accepted by user" msgstr " durch den Benutzer akzeptiert" diff -Nru davfs2-1.5.2/README davfs2-1.5.4/README --- davfs2-1.5.2/README 2014-08-10 16:35:30.000000000 +0000 +++ davfs2-1.5.4/README 2016-04-15 19:04:40.000000000 +0000 @@ -1,13 +1,13 @@ -2014-08-10 +2016-04-15 ---------- -# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2014 Werner Baumann +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2014, 2016 Werner Baumann # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty. -DAVFS2 1.5.1 README +DAVFS2 1.5.4 README =================== 1 INTRODUCTION @@ -69,6 +69,11 @@ implementation. But if a free WebDAV enabled application is available, you might try it first. +davfs2 can't (always) replace lodal disk space. Due to the nature of WebDAV +davfs2 can't directly redirect reading and writing to the WebDAV server. davfs2 +always needs local copies of all open files. So if you have not enough sidk +space to hold these local copies, davfs2 will not help. + 2 SECURITY CONSIDERATIONS ========================= @@ -161,6 +166,9 @@ 5 CACHE ======= +davfs2 will store a local copy of all open files in its cache. So make sure +there is enough local disk space available in the cache directory. + There are two reasons for caching: - The coda kernel file system expects a local copy of the file to act on. diff -Nru davfs2-1.5.2/src/cache.c davfs2-1.5.4/src/cache.c --- davfs2-1.5.2/src/cache.c 2014-08-10 16:26:24.000000000 +0000 +++ davfs2-1.5.4/src/cache.c 2016-04-04 09:14:40.000000000 +0000 @@ -819,7 +819,8 @@ minimize_tree(root); if (debug) syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), - "minimize_tree: %llu nodes remaining", fs_stat->n_nodes); + "minimize_tree: %llu nodes remaining", + (unsigned long long) fs_stat->n_nodes); } if (item) diff -Nru davfs2-1.5.2/src/dav_coda.c davfs2-1.5.4/src/dav_coda.c --- davfs2-1.5.2/src/dav_coda.c 2014-07-16 19:00:38.000000000 +0000 +++ davfs2-1.5.4/src/dav_coda.c 2016-04-08 10:51:52.000000000 +0000 @@ -153,9 +153,9 @@ /*==================*/ void -dav_coda_loop(int device, size_t bufsize, time_t idle_time, - dav_is_mounted_fn is_mounted, volatile int *keep_on_running, - int dbg) +dav_coda_loop(int device, char *mpoint, size_t bufsize, time_t idle_time, + dav_is_mounted_fn is_mounted, + volatile int *keep_on_running, int dbg) { debug = dbg; if (debug) diff -Nru davfs2-1.5.2/src/dav_fuse.c davfs2-1.5.4/src/dav_fuse.c --- davfs2-1.5.2/src/dav_fuse.c 2014-08-10 16:27:57.000000000 +0000 +++ davfs2-1.5.4/src/dav_fuse.c 2016-04-08 10:52:39.000000000 +0000 @@ -147,11 +147,13 @@ /*==================*/ void -dav_fuse_loop(int device, size_t bufsize, time_t idle_time, +dav_fuse_loop(int device, char *mpoint, size_t bufsize, time_t idle_time, dav_is_mounted_fn is_mounted, volatile int *keep_on_running, int dbg) { debug = dbg; + char *mountpoint = mpoint; + int unmounting = 0; if (debug) syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "fuse kernel version 7"); @@ -170,7 +172,7 @@ tv.tv_usec = 0; time_t last_tidy_cache = time(NULL); - while (*keep_on_running) { + while (1) { fd_set fds; FD_ZERO(&fds); @@ -179,6 +181,17 @@ if (debug) syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "SELECT: %i", ret); + if (!*keep_on_running && !unmounting) { + syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_ERR), _("unmounting %s"), + mountpoint); + unmounting = 1; + pid_t pid = fork(); + if (pid == 0) { + execl("/bin/umount", "umount", "-il", mountpoint, NULL); + _exit(EXIT_FAILURE); + } + } + if (ret > 0) { ssize_t bytes_read = read(device, buf, buf_size); if (bytes_read <= 0) { @@ -197,8 +210,6 @@ break; } } else if (ret == 0) { - if (!is_mounted()) - break; if (dav_tidy_cache() == 0) { tv.tv_sec = idle_time; last_tidy_cache = time(NULL); @@ -207,6 +218,8 @@ } continue; } else { + if (errno == EINTR) + continue; break; } diff -Nru davfs2-1.5.2/src/kernel_interface.c davfs2-1.5.4/src/kernel_interface.c --- davfs2-1.5.2/src/kernel_interface.c 2014-08-10 16:28:25.000000000 +0000 +++ davfs2-1.5.4/src/kernel_interface.c 2016-04-04 09:57:50.000000000 +0000 @@ -99,7 +99,8 @@ const char *mpoint, const dav_args *args) { uid_t orig = geteuid(); - seteuid(0); + if (seteuid(0) != 0) + error(EXIT_FAILURE, 0, _("can't change effective user id")); if (!*kernel_fs) *kernel_fs = strdup("fuse"); @@ -146,7 +147,8 @@ error(EXIT_FAILURE, 0, _("unknown kernel file system %s"), *kernel_fs); } - seteuid(orig); + if (seteuid(orig) != 0) + error(EXIT_FAILURE, 0, _("can't change effective user id")); return mounted; } diff -Nru davfs2-1.5.2/src/kernel_interface.h davfs2-1.5.4/src/kernel_interface.h --- davfs2-1.5.2/src/kernel_interface.h 2009-04-14 19:54:57.000000000 +0000 +++ davfs2-1.5.4/src/kernel_interface.h 2016-04-08 10:28:34.000000000 +0000 @@ -34,13 +34,15 @@ /* Typedef of the message loop of the specific kernel interfaces. The real function will be returned by dav_init_kernel_interface(). device : File descriptor of the open fuse device. + mpoint : String with the name of the mount point. buf_size : Size of the buffer for communication with the kernel module. idle_t : Time to wait for upcalls before calling dav_tidy_cache(). - is_mounted_fn : Call back function to check of still mounted. + is_mounted_fn : Call back function to check if still mounted. keep_on_running : Pointer to run flag. dbg : send debug messages to syslog if dbg != 0 */ -typedef void (*dav_run_msgloop_fn)(int device, size_t bufsize, time_t idle_time, +typedef void (*dav_run_msgloop_fn)(int device, char *mpoint, size_t bufsize, + time_t idle_time, dav_is_mounted_fn is_mounted, volatile int *keep_on_running, int dbg); @@ -80,7 +82,7 @@ /* Message loop for coda kernel module CODA_KERNEL_VERSION 3. Parameters see dav_run_msgloop_fn(). */ -void dav_coda_loop(int device, size_t bufsize, time_t idle_time, +void dav_coda_loop(int device, char *mpoint, size_t bufsize, time_t idle_time, dav_is_mounted_fn is_mounted, volatile int *keep_on_running, int dbg); @@ -88,7 +90,7 @@ /* Message loop for fuse kernel module with major number 7. Parameters see dav_run_msgloop_fn(). */ void -dav_fuse_loop(int device, size_t bufsize, time_t idle_time, +dav_fuse_loop(int device, char *mpoint, size_t bufsize, time_t idle_time, dav_is_mounted_fn is_mounted, volatile int *keep_on_running, int dbg); diff -Nru davfs2-1.5.2/src/Makefile.am davfs2-1.5.4/src/Makefile.am --- davfs2-1.5.2/src/Makefile.am 2014-04-22 19:19:02.000000000 +0000 +++ davfs2-1.5.4/src/Makefile.am 2016-04-16 07:02:12.000000000 +0000 @@ -33,7 +33,7 @@ umount_davfs_SOURCES = umount_davfs.c defaults.h AM_CFLAGS = -Wall -Werror=format-security \ - -fstack-protector --param=ssp-buffer-size=4 + -fstack-protector-strong --param=ssp-buffer-size=4 DEFS = -DPROGRAM_NAME=\"mount.davfs\" \ -DDAV_SYS_CONF_DIR=\"$(pkgsysconfdir)\" \ -DDAV_LOCALSTATE_DIR=\"$(dav_localstatedir)\" \ diff -Nru davfs2-1.5.2/src/Makefile.in davfs2-1.5.4/src/Makefile.in --- davfs2-1.5.2/src/Makefile.in 2014-08-23 18:13:17.000000000 +0000 +++ davfs2-1.5.4/src/Makefile.in 2016-04-16 07:07:21.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,7 +80,9 @@ host_triplet = @host@ sbin_PROGRAMS = mount.davfs$(EXEEXT) umount.davfs$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/davfs2.m4 \ $(top_srcdir)/config/gettext.m4 $(top_srcdir)/config/iconv.m4 \ @@ -80,14 +109,34 @@ am_umount_davfs_OBJECTS = umount_davfs.$(OBJEXT) umount_davfs_OBJECTS = $(am_umount_davfs_OBJECTS) umount_davfs_LDADD = $(LDADD) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(mount_davfs_SOURCES) $(umount_davfs_SOURCES) DIST_SOURCES = $(mount_davfs_SOURCES) $(umount_davfs_SOURCES) am__can_run_installinfo = \ @@ -95,11 +144,29 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -249,7 +316,7 @@ umount_davfs_SOURCES = umount_davfs.c defaults.h AM_CFLAGS = -Wall -Werror=format-security \ - -fstack-protector --param=ssp-buffer-size=4 + -fstack-protector-strong --param=ssp-buffer-size=4 all: all-am @@ -294,10 +361,11 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -318,19 +386,22 @@ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(sbindir)" && rm -f $$files clean-sbinPROGRAMS: -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) + mount.davfs$(EXEEXT): $(mount_davfs_OBJECTS) $(mount_davfs_DEPENDENCIES) $(EXTRA_mount_davfs_DEPENDENCIES) @rm -f mount.davfs$(EXEEXT) - $(LINK) $(mount_davfs_OBJECTS) $(mount_davfs_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(mount_davfs_OBJECTS) $(mount_davfs_LDADD) $(LIBS) + umount.davfs$(EXEEXT): $(umount_davfs_OBJECTS) $(umount_davfs_DEPENDENCIES) $(EXTRA_umount_davfs_DEPENDENCIES) @rm -f umount.davfs$(EXEEXT) - $(LINK) $(umount_davfs_OBJECTS) $(umount_davfs_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(umount_davfs_OBJECTS) $(umount_davfs_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -347,39 +418,28 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/webdav.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -391,15 +451,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -408,6 +464,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -552,19 +623,19 @@ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: install-am install-exec-am install-strip uninstall-am -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-sbinPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-exec-hook install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-hook \ - uninstall-sbinPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-sbinPROGRAMS cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-exec-hook install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-sbinPROGRAMS install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-hook uninstall-sbinPROGRAMS install-exec-hook: diff -Nru davfs2-1.5.2/src/mount_davfs.c davfs2-1.5.4/src/mount_davfs.c --- davfs2-1.5.2/src/mount_davfs.c 2014-08-10 16:29:52.000000000 +0000 +++ davfs2-1.5.4/src/mount_davfs.c 2016-04-08 10:50:56.000000000 +0000 @@ -315,7 +315,8 @@ if (args->debug & DAV_DBG_CONFIG) syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Releasing root privileges"); uid_t daemon_id = geteuid(); - seteuid(0); + if (seteuid(0) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); ret = setuid(daemon_id); if (ret) { syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_ERR), @@ -361,15 +362,15 @@ if (!ret) { if (debug & DAV_DBG_CONFIG) syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Starting message loop"); - run_msgloop(dev, buf_size, idle_time, is_mounted, &keep_on_running, - debug & DAV_DBG_KERNEL); + run_msgloop(dev, mpoint, buf_size, idle_time, is_mounted, + &keep_on_running, debug & DAV_DBG_KERNEL); } if (debug & DAV_DBG_CONFIG) syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Closing"); dav_close_cache(&got_sigterm); dav_close_webdav(); - if (is_mounted()) { + if (is_mounted() && strcmp(kernel_fs, "coda") == 0) { char *prog = ne_concat("/bin/umount -il ", mpoint, NULL); syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_ERR), _("unmounting %s"), mpoint); if (system(prog) != 0 && is_mounted()) @@ -424,7 +425,8 @@ if (!grp) error(EXIT_FAILURE, errno, _("group %s does not exist"), args->dav_group); - seteuid(0); + if (seteuid(0) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); if (setgid(grp->gr_gid) != 0) error(EXIT_FAILURE, errno, _("can't change group id")); @@ -477,7 +479,8 @@ if (asprintf(&utab_dir,"%s/%s", DAV_LOCALSTATE_DIR, DAV_UTAB_DIR) < 0) abort(); if (stat(utab_dir, &st) != 0) { - seteuid(0); + if (seteuid(0) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); if (mkdir(utab_dir, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0) { syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), " and %s/%s", @@ -485,12 +488,14 @@ } else { error(0, errno, _("can't create directory %s"), utab_dir); } - seteuid(getuid()); + if (seteuid(getuid()) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); } free(utab_dir); } - seteuid(0); + if (seteuid(0) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); if (stat(DAV_SYS_RUN, &st) != 0) { if (mkdir(DAV_SYS_RUN, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH | S_ISVTX) != 0) @@ -515,7 +520,8 @@ error(EXIT_FAILURE, errno, _("can't change group of directory %s"), DAV_SYS_RUN); } - seteuid(getuid()); + if (seteuid(getuid()) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); if (getuid() != 0) { @@ -566,7 +572,8 @@ if (strcmp(args->cache_dir, args->sys_cache) == 0) { - seteuid(0); + if (seteuid(0) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); if (stat(args->sys_cache, &st) != 0) { if (mkdir(args->sys_cache, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) @@ -593,7 +600,8 @@ _("can't change group of directory %s"), args->sys_cache); } - seteuid(getuid()); + if (seteuid(getuid()) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); } else { @@ -837,9 +845,11 @@ do_mount(unsigned long int mopts, void *mdata) { uid_t orig = geteuid(); - seteuid(0); + if (seteuid(0) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); int ret = mount(url, mpoint, kernel_fs, mopts, mdata); - seteuid(orig); + if (seteuid(orig) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); if (ret) { error(0, errno, _("can't mount %s on %s"), url, mpoint); @@ -1104,11 +1114,13 @@ } if (args->clicert) { struct stat st; - seteuid(0); + if (seteuid(0) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); if (stat(args->clicert, &st) < 0) error(EXIT_FAILURE, 0, _("can't read client certificate %s"), args->clicert); - seteuid(getuid()); + if (seteuid(getuid()) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); if (st.st_uid != getuid() && st.st_uid != 0) error(EXIT_FAILURE, 0, _("client certificate file %s has wrong owner"), @@ -1151,9 +1163,11 @@ static void parse_secrets(dav_args *args) { - seteuid(0); + if (seteuid(0) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); read_secrets(args, DAV_SYS_CONF_DIR "/" DAV_SECRETS); - seteuid(getuid()); + if (seteuid(getuid()) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); if (args->secrets) { read_secrets(args, args->secrets); @@ -1325,7 +1339,8 @@ sigprocmask(SIG_BLOCK, &newset, &oldset); uid_t orig = geteuid(); - seteuid(0); + if (seteuid(0) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); int ld = open(lock_file, O_RDONLY | O_CREAT, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH); @@ -1361,7 +1376,8 @@ close(ld); remove(lock_file); - seteuid(orig); + if (seteuid(orig) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); sigprocmask(SIG_SETMASK, &oldset, NULL); if (lock_file) @@ -2002,16 +2018,31 @@ || *p == '\r' || *p == '\v') { state = END; } else if (*p == '\"') { - state = PARM_QUO; + if (parm_no < parmc) { + parmv[parm_no] = pos; + state = PARM_QUO; + } else { + return -1; + } } else if (*p == '\\') { + if (parm_no < parmc) { + parmv[parm_no] = pos; + state = PARM_ESC; + } else { + return -1; + } state = PARM_ESC; } else if (isspace(*p)) { ; } else { - *pos++ = *p; - state = PARM; + if (parm_no < parmc) { + parmv[parm_no] = pos; + *pos++ = *p; + state = PARM; + } else { + return -1; + } } - if (parm_no >= parmc) return -1; break; case SPACE_EXP: if (*p == ' ' || *p == '\t') { @@ -2030,7 +2061,7 @@ state = PARM_ESC; } else if (*p == ' ' || *p == '\t') { *pos++ = '\0'; - parmv[++parm_no] = pos; + parm_no++; state = SPACE; } else if (isspace(*p) || *p == '\0' || *p == '#') { *pos = '\0'; @@ -2054,7 +2085,7 @@ state = PARM_QUO_ESC; } else if (*p == '\"') { *pos++ = '\0'; - parmv[++parm_no] = pos; + parm_no++; state = SPACE_EXP; } else if (*p == '\0' || *p == '\f' || *p == '\n' || *p == '\r' || *p == '\v') { diff -Nru davfs2-1.5.2/src/webdav.c davfs2-1.5.4/src/webdav.c --- davfs2-1.5.2/src/webdav.c 2014-08-10 16:30:10.000000000 +0000 +++ davfs2-1.5.4/src/webdav.c 2016-04-04 09:33:03.000000000 +0000 @@ -437,9 +437,11 @@ = ne_ssl_clicert_read(args->clicert); if (!client_cert) { uid_t orig = geteuid(); - seteuid(0); + if (seteuid(0) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); client_cert = ne_ssl_clicert_read(args->clicert); - seteuid(orig); + if (seteuid(orig) != 0) + error(EXIT_FAILURE, errno, _("can't change effective user id")); } if (!client_cert) error(EXIT_FAILURE, 0, _("can't read client certificate %s"),