Hello community,
here is the log from the commit of package cifs-utils for openSUSE:Factory checked in at 2016-02-25 21:43:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cifs-utils (Old)
and /work/SRC/openSUSE:Factory/.cifs-utils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cifs-utils"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cifs-utils/cifs-utils.changes 2015-10-24 18:56:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cifs-utils.new/cifs-utils.changes 2016-02-25 21:43:42.000000000 +0100
@@ -1,0 +2,14 @@
+Mon Feb 22 18:20:05 UTC 2016 - lmuelle@suse.com
+
+- Don't ignore libldb, libtalloc, libtevent, and samba-client-libs at build
+ time; (bsc#966174).
+
+-------------------------------------------------------------------
+Mon Feb 22 18:05:33 UTC 2016 - lmuelle@suse.com
+
+- Update to cifs-utils 6.5.
+ + mount.cifs: ignore x- mount options
+ + minor build fixes; obsoletes include_paths.h_for__PATH_MOUNTED.patch
+ + minor manpage fix
+
+-------------------------------------------------------------------
Old:
----
cifs-utils-6.4.tar.bz2
cifs-utils-6.4.tar.bz2.asc
include_paths.h_for__PATH_MOUNTED.patch
New:
----
cifs-utils-6.5.tar.bz2
cifs-utils-6.5.tar.bz2.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cifs-utils.spec ++++++
--- /var/tmp/diff_new_pack.EUnVLl/_old 2016-02-25 21:43:43.000000000 +0100
+++ /var/tmp/diff_new_pack.EUnVLl/_new 2016-02-25 21:43:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cifs-utils
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: cifs-utils
-Version: 6.4
+Version: 6.5
Release: 0
Summary: Utilities for doing and managing mounts of the Linux CIFS filesystem
License: GPL-3.0+
@@ -28,7 +28,6 @@
# http://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-pubkey_70F3B981.as...
Source6: cifs-utils.keyring
Source100: README.cifstab.migration
-Patch: include_paths.h_for__PATH_MOUNTED.patch
%if "%{_vendor}" == "suse"
%define NET_CFGDIR network
%else
@@ -56,10 +55,6 @@
%else
BuildRequires: libcap-devel
%endif
-#!BuildIgnore: libldb
-#!BuildIgnore: libtalloc
-#!BuildIgnore: libtevent
-#!BuildIgnore: samba-client-libs
#!BuildIgnore: samba4-libs
BuildRequires: libtalloc-devel
%if 0%{?suse_version} > 1110
@@ -113,7 +108,6 @@
%prep
%setup -q
-%patch -p1
cp -a ${RPM_SOURCE_DIR}/README.cifstab.migration .
%build
++++++ cifs-utils-6.4.tar.bz2 -> cifs-utils-6.5.tar.bz2 ++++++
++++ 3814 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cifs-utils-6.4/INSTALL new/cifs-utils-6.5/INSTALL
--- old/cifs-utils-6.4/INSTALL 2014-07-11 17:21:48.000000000 +0200
+++ new/cifs-utils-6.5/INSTALL 2016-02-22 17:05:50.000000000 +0100
@@ -12,8 +12,8 @@
Basic Installation
==================
- Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
+ Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package. Some packages provide this
`INSTALL' file but do not implement all of the features documented
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cifs-utils-6.4/Makefile.am new/cifs-utils-6.5/Makefile.am
--- old/cifs-utils-6.4/Makefile.am 2014-07-11 17:14:06.000000000 +0200
+++ new/cifs-utils-6.5/Makefile.am 2016-02-22 16:31:25.000000000 +0100
@@ -84,7 +84,7 @@
man_MANS += idmapwb.8
idmapwb.so: idmapwb.c
- $(CC) $(CFLAGS) $(AM_CFLAGS) $(WBCLIENT_CFLAGS) $(LDFLAGS) -shared -fpic -o $@ $+ $(WBCLIENT_LIBS)
+ $(CC) $(DEFS) $(CFLAGS) $(AM_CFLAGS) $(WBCLIENT_CFLAGS) $(LDFLAGS) -shared -fpic -o $@ $+ $(WBCLIENT_LIBS)
idmapwb.8: idmapwb.8.in
$(SED) 's,[@]pluginpath@,$(pluginpath),' $(srcdir)/$@.in > $@-t && mv $@-t $@
@@ -95,7 +95,7 @@
pam_PROGRAMS = pam_cifscreds.so
pam_cifscreds.so: pam_cifscreds.c cifskey.c resolve_host.c util.c
- $(CC) $(CFLAGS) $(AM_CFLAGS) $(LDFLAGS) -shared -fpic -o $@ $+ -lpam -lkeyutils
+ $(CC) $(DEFS) $(CFLAGS) $(AM_CFLAGS) $(LDFLAGS) -shared -fpic -o $@ $+ -lpam -lkeyutils
man_MANS += pam_cifscreds.8
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cifs-utils-6.4/autom4te.cache/output.0 new/cifs-utils-6.5/autom4te.cache/output.0
--- old/cifs-utils-6.4/autom4te.cache/output.0 2014-07-11 17:21:47.000000000 +0200
+++ new/cifs-utils-6.5/autom4te.cache/output.0 2016-02-22 17:05:49.000000000 +0100
@@ -1,6 +1,6 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for cifs-utils 6.4.
+@%:@ Generated by GNU Autoconf 2.69 for cifs-utils 6.5.
@%:@
@%:@ Report bugs to .
@%:@
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='cifs-utils'
PACKAGE_TARNAME='cifs-utils'
-PACKAGE_VERSION='6.4'
-PACKAGE_STRING='cifs-utils 6.4'
+PACKAGE_VERSION='6.5'
+PACKAGE_STRING='cifs-utils 6.5'
PACKAGE_BUGREPORT='linux-cifs@vger.kernel.org'
PACKAGE_URL='https://wiki.samba.org/index.php/LinuxCIFS_utils'
@@ -1319,7 +1319,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 cifs-utils 6.4 to adapt to many kinds of systems.
+\`configure' configures cifs-utils 6.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1389,7 +1389,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of cifs-utils 6.4:";;
+ short | recursive ) echo "Configuration of cifs-utils 6.5:";;
esac
cat <<\_ACEOF
@@ -1514,7 +1514,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-cifs-utils configure 6.4
+cifs-utils configure 6.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1983,7 +1983,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by cifs-utils $as_me 6.4, which was
+It was created by cifs-utils $as_me 6.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2338,7 +2338,7 @@
-am__api_version='1.13'
+am__api_version='1.15'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2539,8 +2539,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
@@ -2559,7 +2559,7 @@
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2853,7 +2853,7 @@
# Define the identity of the package.
PACKAGE='cifs-utils'
- VERSION='6.4'
+ VERSION='6.5'
cat >>confdefs.h <<_ACEOF
@@ -2887,8 +2887,8 @@
# http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). 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}'
@@ -2904,6 +2904,48 @@
+# 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: http://austingroupbugs.net/view.php?id=542
+
+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: http://www.gnu.org/software/coreutils/.
+
+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
+
# "enable" options
@%:@ Check whether --enable-pie was given.
@@ -3793,6 +3835,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"
@@ -4444,131 +4545,6 @@
$as_echo "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
-if test "x$CC" != xcc; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
- { $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; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
- sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_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.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } &&
- test -f conftest2.$ac_objext && { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; };
-then
- eval ac_cv_prog_cc_${ac_cc}_c_o=yes
- if test "x$CC" != xcc; then
- # Test first that cc exists at all.
- if { ac_try='cc -c conftest.$ac_ext >&5'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
- rm -f conftest2.*
- if { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } &&
- test -f conftest2.$ac_objext && { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; };
- then
- # cc works too.
- :
- else
- # cc exists but doesn't like -o.
- eval ac_cv_prog_cc_${ac_cc}_c_o=no
- fi
- fi
- fi
-else
- eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "@%:@define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != 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_PROG_SED is only avaliable in recent autoconf versions.
@@ -6810,7 +6786,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by cifs-utils $as_me 6.4, which was
+This file was extended by cifs-utils $as_me 6.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6877,7 +6853,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-cifs-utils config.status 6.4
+cifs-utils config.status 6.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cifs-utils-6.4/autom4te.cache/output.1 new/cifs-utils-6.5/autom4te.cache/output.1
--- old/cifs-utils-6.4/autom4te.cache/output.1 2014-07-11 17:21:48.000000000 +0200
+++ new/cifs-utils-6.5/autom4te.cache/output.1 2016-02-22 17:05:50.000000000 +0100
@@ -1,6 +1,6 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for cifs-utils 6.4.
+@%:@ Generated by GNU Autoconf 2.69 for cifs-utils 6.5.
@%:@
@%:@ Report bugs to .
@%:@
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='cifs-utils'
PACKAGE_TARNAME='cifs-utils'
-PACKAGE_VERSION='6.4'
-PACKAGE_STRING='cifs-utils 6.4'
+PACKAGE_VERSION='6.5'
+PACKAGE_STRING='cifs-utils 6.5'
PACKAGE_BUGREPORT='linux-cifs@vger.kernel.org'
PACKAGE_URL='https://wiki.samba.org/index.php/LinuxCIFS_utils'
@@ -1319,7 +1319,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 cifs-utils 6.4 to adapt to many kinds of systems.
+\`configure' configures cifs-utils 6.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1389,7 +1389,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of cifs-utils 6.4:";;
+ short | recursive ) echo "Configuration of cifs-utils 6.5:";;
esac
cat <<\_ACEOF
@@ -1514,7 +1514,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-cifs-utils configure 6.4
+cifs-utils configure 6.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1983,7 +1983,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by cifs-utils $as_me 6.4, which was
+It was created by cifs-utils $as_me 6.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2338,7 +2338,7 @@
-am__api_version='1.13'
+am__api_version='1.15'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2539,8 +2539,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
@@ -2559,7 +2559,7 @@
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2853,7 +2853,7 @@
# Define the identity of the package.
PACKAGE='cifs-utils'
- VERSION='6.4'
+ VERSION='6.5'
cat >>confdefs.h <<_ACEOF
@@ -2887,8 +2887,8 @@
# http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). 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}'
@@ -2904,6 +2904,48 @@
+# 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: http://austingroupbugs.net/view.php?id=542
+
+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: http://www.gnu.org/software/coreutils/.
+
+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
+
# "enable" options
@%:@ Check whether --enable-pie was given.
@@ -3793,6 +3835,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"
@@ -4444,131 +4545,6 @@
$as_echo "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
-if test "x$CC" != xcc; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
- { $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; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
- sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_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.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } &&
- test -f conftest2.$ac_objext && { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; };
-then
- eval ac_cv_prog_cc_${ac_cc}_c_o=yes
- if test "x$CC" != xcc; then
- # Test first that cc exists at all.
- if { ac_try='cc -c conftest.$ac_ext >&5'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
- rm -f conftest2.*
- if { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } &&
- test -f conftest2.$ac_objext && { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; };
- then
- # cc works too.
- :
- else
- # cc exists but doesn't like -o.
- eval ac_cv_prog_cc_${ac_cc}_c_o=no
- fi
- fi
- fi
-else
- eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "@%:@define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != 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_PROG_SED is only avaliable in recent autoconf versions.
@@ -6810,7 +6786,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by cifs-utils $as_me 6.4, which was
+This file was extended by cifs-utils $as_me 6.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6877,7 +6853,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-cifs-utils config.status 6.4
+cifs-utils config.status 6.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cifs-utils-6.4/autom4te.cache/requests new/cifs-utils-6.5/autom4te.cache/requests
--- old/cifs-utils-6.4/autom4te.cache/requests 2014-07-11 17:21:48.000000000 +0200
+++ new/cifs-utils-6.5/autom4te.cache/requests 2016-02-22 17:05:50.000000000 +0100
@@ -12,83 +12,84 @@
[
'/usr/share/autoconf/autoconf/autoconf.m4f',
'-',
- '/usr/share/aclocal-1.13/internal/ac-config-macro-dirs.m4',
+ '/usr/share/aclocal-1.15/internal/ac-config-macro-dirs.m4',
'/usr/share/aclocal/cap-ng.m4',
'/usr/share/aclocal/pkg.m4',
- '/usr/share/aclocal-1.13/amversion.m4',
- '/usr/share/aclocal-1.13/auxdir.m4',
- '/usr/share/aclocal-1.13/cond.m4',
- '/usr/share/aclocal-1.13/depend.m4',
- '/usr/share/aclocal-1.13/depout.m4',
- '/usr/share/aclocal-1.13/init.m4',
- '/usr/share/aclocal-1.13/install-sh.m4',
- '/usr/share/aclocal-1.13/lead-dot.m4',
- '/usr/share/aclocal-1.13/make.m4',
- '/usr/share/aclocal-1.13/minuso.m4',
- '/usr/share/aclocal-1.13/missing.m4',
- '/usr/share/aclocal-1.13/options.m4',
- '/usr/share/aclocal-1.13/runlog.m4',
- '/usr/share/aclocal-1.13/sanity.m4',
- '/usr/share/aclocal-1.13/silent.m4',
- '/usr/share/aclocal-1.13/strip.m4',
- '/usr/share/aclocal-1.13/substnot.m4',
- '/usr/share/aclocal-1.13/tar.m4',
+ '/usr/share/aclocal-1.15/amversion.m4',
+ '/usr/share/aclocal-1.15/auxdir.m4',
+ '/usr/share/aclocal-1.15/cond.m4',
+ '/usr/share/aclocal-1.15/depend.m4',
+ '/usr/share/aclocal-1.15/depout.m4',
+ '/usr/share/aclocal-1.15/init.m4',
+ '/usr/share/aclocal-1.15/install-sh.m4',
+ '/usr/share/aclocal-1.15/lead-dot.m4',
+ '/usr/share/aclocal-1.15/make.m4',
+ '/usr/share/aclocal-1.15/missing.m4',
+ '/usr/share/aclocal-1.15/options.m4',
+ '/usr/share/aclocal-1.15/prog-cc-c-o.m4',
+ '/usr/share/aclocal-1.15/runlog.m4',
+ '/usr/share/aclocal-1.15/sanity.m4',
+ '/usr/share/aclocal-1.15/silent.m4',
+ '/usr/share/aclocal-1.15/strip.m4',
+ '/usr/share/aclocal-1.15/substnot.m4',
+ '/usr/share/aclocal-1.15/tar.m4',
'aclocal/idmap.m4',
'aclocal/libcap.m4',
'configure.ac'
],
{
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'LIBCAP_NG_PATH' => 1,
- '_AM_PROG_TAR' => 1,
- '_m4_warn' => 1,
+ '_AM_SET_OPTION' => 1,
+ 'AM_CONDITIONAL' => 1,
+ 'PKG_CHECK_VAR' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AC_DEFUN' => 1,
- 'AM_PROG_CC_C_O' => 1,
- '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
- 'AM_SUBST_NOTMAKE' => 1,
- '_AM_MANGLE_OPTION' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AM_SANITY_CHECK' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
'AM_AUTOMAKE_VERSION' => 1,
- 'AM_MAKE_INCLUDE' => 1,
+ 'PKG_CHECK_MODULES' => 1,
+ 'AC_TEST_WBCHL' => 1,
+ 'AC_TEST_WBC_IDMAP_BOTH' => 1,
+ '_AM_DEPENDENCIES' => 1,
'PKG_INSTALLDIR' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
'AM_PROG_INSTALL_STRIP' => 1,
- 'AU_DEFUN' => 1,
- 'PKG_CHECK_MODULES' => 1,
+ 'PKG_CHECK_EXISTS' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ '_AM_CONFIG_MACRO_DIRS' => 1,
'AM_SET_LEADING_DOT' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ '_AM_PROG_TAR' => 1,
+ 'PKG_NOARCH_INSTALLDIR' => 1,
+ 'LIBCAP_NG_PATH' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
'AM_RUN_LOG' => 1,
- 'm4_pattern_forbid' => 1,
- 'AC_DEFUN_ONCE' => 1,
- 'AM_CONDITIONAL' => 1,
- '_AM_SET_OPTION' => 1,
- 'AC_CONFIG_MACRO_DIR' => 1,
+ 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
+ 'AM_SET_DEPDIR' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AM_MISSING_PROG' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
'_AM_IF_OPTION' => 1,
- 'PKG_CHECK_EXISTS' => 1,
- 'AC_TEST_WBC_IDMAP_BOTH' => 1,
- 'PKG_NOARCH_INSTALLDIR' => 1,
'AM_DEP_TRACK' => 1,
- '_AM_DEPENDENCIES' => 1,
- 'AM_SET_DEPDIR' => 1,
- 'PKG_CHECK_VAR' => 1,
- 'm4_include' => 1,
- '_AM_AUTOCONF_VERSION' => 1,
+ '_AM_MANGLE_OPTION' => 1,
+ '_m4_warn' => 1,
'_AM_SET_OPTIONS' => 1,
- '_AM_CONFIG_MACRO_DIRS' => 1,
- 'AM_SILENT_RULES' => 1,
- 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
- 'AC_TEST_WBCHL' => 1,
- 'AM_SANITY_CHECK' => 1,
- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'PKG_PROG_PKG_CONFIG' => 1,
- 'include' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
+ 'AC_CONFIG_MACRO_DIR' => 1,
'm4_pattern_allow' => 1,
+ 'AU_DEFUN' => 1,
+ 'include' => 1,
+ 'm4_include' => 1,
+ 'AM_SUBST_NOTMAKE' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
'AC_LIBCAP' => 1,
- 'AM_MISSING_HAS_RUN' => 1
+ '_AM_PROG_CC_C_O' => 1,
+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+ 'AC_DEFUN_ONCE' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'AM_MAKE_INCLUDE' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -103,65 +104,65 @@
'configure.ac'
],
{
- 'AH_OUTPUT' => 1,
- 'AC_CONFIG_SUBDIRS' => 1,
- '_AM_COND_IF' => 1,
- '_AM_COND_ELSE' => 1,
- 'AC_CONFIG_HEADERS' => 1,
- 'include' => 1,
- 'AC_DEFINE_TRACE_LITERAL' => 1,
- 'AM_MAINTAINER_MODE' => 1,
- 'AM_PROG_CXX_C_O' => 1,
'AM_EXTRA_RECURSIVE_TARGETS' => 1,
- 'AM_PROG_AR' => 1,
- 'AM_PATH_GUILE' => 1,
+ 'AM_PROG_CXX_C_O' => 1,
'AC_PROG_LIBTOOL' => 1,
- 'AC_SUBST_TRACE' => 1,
- 'AC_SUBST' => 1,
- 'AC_INIT' => 1,
+ 'AM_PATH_GUILE' => 1,
'AM_XGETTEXT_OPTION' => 1,
- 'm4_pattern_allow' => 1,
- 'AC_CANONICAL_HOST' => 1,
- 'm4_sinclude' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- 'LT_INIT' => 1,
- '_AM_COND_ENDIF' => 1,
- 'AM_SILENT_RULES' => 1,
- 'm4_include' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
- 'AM_NLS' => 1,
- 'AM_PROG_FC_C_O' => 1,
+ 'm4_include' => 1,
+ 'AM_PROG_MKDIR_P' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'AC_SUBST_TRACE' => 1,
'AM_PROG_F77_C_O' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'AC_CONFIG_LINKS' => 1,
- 'AC_FC_SRCEXT' => 1,
- 'AC_FC_PP_SRCEXT' => 1,
- 'AM_MAKEFILE_INCLUDE' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
'_AM_MAKEFILE_INCLUDE' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AM_PROG_MOC' => 1,
- 'm4_pattern_forbid' => 1,
- 'AM_ENABLE_MULTILIB' => 1,
'_m4_warn' => 1,
- 'AM_PROG_MKDIR_P' => 1,
- 'AC_FC_FREEFORM' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'AC_CONFIG_FILES' => 1,
+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+ 'm4_pattern_allow' => 1,
+ '_AM_COND_ENDIF' => 1,
+ 'include' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'AM_PROG_MOC' => 1,
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
+ 'AC_INIT' => 1,
+ '_AM_COND_IF' => 1,
+ 'AC_FC_SRCEXT' => 1,
+ 'AM_PROG_AR' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'AC_SUBST' => 1,
+ 'AC_CONFIG_FILES' => 1,
+ 'AM_MAKEFILE_INCLUDE' => 1,
+ 'AM_PROG_FC_C_O' => 1,
'AC_CANONICAL_BUILD' => 1,
- 'AC_FC_PP_DEFINE' => 1,
+ 'AM_ENABLE_MULTILIB' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'LT_INIT' => 1,
+ 'AC_FC_PP_SRCEXT' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'sinclude' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'm4_sinclude' => 1,
+ '_AM_COND_ELSE' => 1,
+ 'AC_LIBSOURCE' => 1,
+ 'AC_FC_FREEFORM' => 1,
'AC_CANONICAL_TARGET' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
+ 'AM_CONDITIONAL' => 1,
+ 'AH_OUTPUT' => 1,
+ 'AC_CANONICAL_HOST' => 1,
+ 'AM_NLS' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'AM_SILENT_RULES' => 1,
'AM_POT_TOOLS' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'AC_LIBSOURCE' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'LT_SUPPORTED_TAG' => 1,
- 'sinclude' => 1
+ 'AC_FC_PP_DEFINE' => 1,
+ 'AM_GNU_GETTEXT' => 1
}
], 'Autom4te::Request' )
);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cifs-utils-6.4/autom4te.cache/traces.0 new/cifs-utils-6.5/autom4te.cache/traces.0
--- old/cifs-utils-6.4/autom4te.cache/traces.0 2014-07-11 17:21:47.000000000 +0200
+++ new/cifs-utils-6.5/autom4te.cache/traces.0 2016-02-22 17:05:49.000000000 +0100
@@ -150,22 +150,21 @@
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])
-m4trace:/usr/share/aclocal-1.13/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.13'
+m4trace:/usr/share/aclocal-1.15/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.15'
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.13.4], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
-m4trace:/usr/share/aclocal-1.13/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.13.4])dnl
+m4trace:/usr/share/aclocal-1.15/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-m4trace:/usr/share/aclocal-1.13/auxdir.m4:47: -1- 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`
+m4trace:/usr/share/aclocal-1.15/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
-m4trace:/usr/share/aclocal-1.13/cond.m4:12: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ([2.52])dnl
+m4trace:/usr/share/aclocal-1.15/cond.m4:12: -1- AC_DEFUN([AM_CONDITIONAL], [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
@@ -185,7 +184,7 @@
AC_MSG_ERROR([[conditional "$1" was never defined.
Usually this means the macro was only invoked conditionally.]])
fi])])
-m4trace:/usr/share/aclocal-1.13/depend.m4:26: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
+m4trace:/usr/share/aclocal-1.15/depend.m4:26: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
@@ -315,10 +314,10 @@
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_$1_dependencies_compiler_type" = gcc3])
])
-m4trace:/usr/share/aclocal-1.13/depend.m4:163: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+m4trace:/usr/share/aclocal-1.15/depend.m4:163: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
])
-m4trace:/usr/share/aclocal-1.13/depend.m4:171: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE([dependency-tracking], [dnl
+m4trace:/usr/share/aclocal-1.15/depend.m4:171: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE([dependency-tracking], [dnl
AS_HELP_STRING(
[--enable-dependency-tracking],
[do not reject slow dependency extractors])
@@ -336,7 +335,7 @@
AC_SUBST([am__nodep])dnl
_AM_SUBST_NOTMAKE([am__nodep])dnl
])
-m4trace:/usr/share/aclocal-1.13/depout.m4:12: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{
+m4trace:/usr/share/aclocal-1.15/depout.m4:12: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{
# 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.
@@ -385,11 +384,11 @@
done
}
])
-m4trace:/usr/share/aclocal-1.13/depout.m4:71: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
+m4trace:/usr/share/aclocal-1.15/depout.m4:71: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
-m4trace:/usr/share/aclocal-1.13/init.m4:23: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl
+m4trace:/usr/share/aclocal-1.15/init.m4:29: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [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
@@ -452,8 +451,8 @@
# http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html
# http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -485,8 +484,53 @@
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: http://austingroupbugs.net/view.php?id=542
+
+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: http://www.gnu.org/software/coreutils/.
+
+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 The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
])
-m4trace:/usr/share/aclocal-1.13/init.m4:136: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
+m4trace:/usr/share/aclocal-1.15/init.m4:186: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
@@ -498,8 +542,8 @@
esac
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-m4trace:/usr/share/aclocal-1.13/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+m4trace:/usr/share/aclocal-1.15/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -508,7 +552,7 @@
esac
fi
AC_SUBST([install_sh])])
-m4trace:/usr/share/aclocal-1.13/lead-dot.m4:10: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
+m4trace:/usr/share/aclocal-1.15/lead-dot.m4:10: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
mkdir .tst 2>/dev/null
if test -d .tst; then
am__leading_dot=.
@@ -517,7 +561,7 @@
fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
-m4trace:/usr/share/aclocal-1.13/make.m4:12: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
+m4trace:/usr/share/aclocal-1.15/make.m4:12: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
@echo this is the am__doit target
@@ -554,31 +598,10 @@
AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
-m4trace:/usr/share/aclocal-1.13/minuso.m4:11: -1- AC_DEFUN([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != 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
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-m4trace:/usr/share/aclocal-1.13/missing.m4:11: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
+m4trace:/usr/share/aclocal-1.15/missing.m4:11: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
-m4trace:/usr/share/aclocal-1.13/missing.m4:20: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+m4trace:/usr/share/aclocal-1.15/missing.m4:20: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -596,16 +619,49 @@
AC_MSG_WARN(['missing' script is too old or missing])
fi
])
-m4trace:/usr/share/aclocal-1.13/options.m4:11: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-m4trace:/usr/share/aclocal-1.13/options.m4:17: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), [1])])
-m4trace:/usr/share/aclocal-1.13/options.m4:23: -1- AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-m4trace:/usr/share/aclocal-1.13/options.m4:29: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-m4trace:/usr/share/aclocal-1.13/runlog.m4:12: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+m4trace:/usr/share/aclocal-1.15/options.m4:11: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+m4trace:/usr/share/aclocal-1.15/options.m4:17: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+m4trace:/usr/share/aclocal-1.15/options.m4:23: -1- AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+m4trace:/usr/share/aclocal-1.15/options.m4:29: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+m4trace:/usr/share/aclocal-1.15/prog-cc-c-o.m4:12: -1- 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])])
+m4trace:/usr/share/aclocal-1.15/prog-cc-c-o.m4:47: -1- AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+m4trace:/usr/share/aclocal-1.15/runlog.m4:12: -1- 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); }])
-m4trace:/usr/share/aclocal-1.13/sanity.m4:11: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
+m4trace:/usr/share/aclocal-1.15/sanity.m4:11: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -676,7 +732,7 @@
AC_MSG_RESULT([done])])
rm -f conftest.file
])
-m4trace:/usr/share/aclocal-1.13/silent.m4:12: -1- AC_DEFUN([AM_SILENT_RULES], [AC_ARG_ENABLE([silent-rules], [dnl
+m4trace:/usr/share/aclocal-1.15/silent.m4:12: -1- 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")])
@@ -724,7 +780,7 @@
AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-m4trace:/usr/share/aclocal-1.13/strip.m4:17: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+m4trace:/usr/share/aclocal-1.15/strip.m4:17: -1- 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
# tool to use in cross-compilation environments, therefore Automake
@@ -735,9 +791,9 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-m4trace:/usr/share/aclocal-1.13/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
-m4trace:/usr/share/aclocal-1.13/substnot.m4:17: -1- AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-m4trace:/usr/share/aclocal-1.13/tar.m4:23: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used
+m4trace:/usr/share/aclocal-1.15/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE])
+m4trace:/usr/share/aclocal-1.15/substnot.m4:17: -1- AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+m4trace:/usr/share/aclocal-1.15/tar.m4:23: -1- 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}'])
@@ -998,7 +1054,7 @@
m4trace:configure.ac:10: -1- AM_INIT_AUTOMAKE
m4trace:configure.ac:10: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
m4trace:configure.ac:10: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
-m4trace:configure.ac:10: -1- AM_AUTOMAKE_VERSION([1.13.4])
+m4trace:configure.ac:10: -1- AM_AUTOMAKE_VERSION([1.15])
m4trace:configure.ac:10: -1- _AM_AUTOCONF_VERSION([2.69])
m4trace:configure.ac:10: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
m4trace:configure.ac:10: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
@@ -1095,6 +1151,8 @@
m4trace:configure.ac:76: -1- m4_pattern_allow([^ac_ct_CC$])
m4trace:configure.ac:76: -1- m4_pattern_allow([^EXEEXT$])
m4trace:configure.ac:76: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.ac:76: -1- _AM_PROG_CC_C_O
+m4trace:configure.ac:76: -1- AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext])
m4trace:configure.ac:76: -1- _AM_DEPENDENCIES([CC])
m4trace:configure.ac:76: -1- AM_SET_DEPDIR
m4trace:configure.ac:76: -1- m4_pattern_allow([^DEPDIR$])
@@ -1135,7 +1193,6 @@
m4trace:configure.ac:77: -1- m4_pattern_allow([^_POSIX_PTHREAD_SEMANTICS$])
m4trace:configure.ac:77: -1- m4_pattern_allow([^_TANDEM_SOURCE$])
m4trace:configure.ac:78: -1- AM_PROG_CC_C_O
-m4trace:configure.ac:78: -1- m4_pattern_allow([^NO_MINUS_C_MINUS_O$])
m4trace:configure.ac:82: -1- m4_pattern_allow([^SED$])
m4trace:configure.ac:87: -1- m4_pattern_allow([^HAVE__BOOL$])
m4trace:configure.ac:87: -1- m4_pattern_allow([^HAVE_STDBOOL_H$])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cifs-utils-6.4/autom4te.cache/traces.1 new/cifs-utils-6.5/autom4te.cache/traces.1
--- old/cifs-utils-6.4/autom4te.cache/traces.1 2014-07-11 17:21:48.000000000 +0200
+++ new/cifs-utils-6.5/autom4te.cache/traces.1 2016-02-22 17:05:50.000000000 +0100
@@ -1,6 +1,6 @@
-m4trace:aclocal.m4:1328: -1- m4_include([aclocal/idmap.m4])
-m4trace:aclocal.m4:1329: -1- m4_include([aclocal/libcap.m4])
-m4trace:configure.ac:4: -1- AC_INIT([cifs-utils], [6.4], [linux-cifs@vger.kernel.org], [cifs-utils], [https://wiki.samba.org/index.php/LinuxCIFS_utils])
+m4trace:aclocal.m4:1409: -1- m4_include([aclocal/idmap.m4])
+m4trace:aclocal.m4:1410: -1- m4_include([aclocal/libcap.m4])
+m4trace:configure.ac:4: -1- AC_INIT([cifs-utils], [6.5], [linux-cifs@vger.kernel.org], [cifs-utils], [https://wiki.samba.org/index.php/LinuxCIFS_utils])
m4trace:configure.ac:4: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.ac:4: -1- m4_pattern_forbid([_AC_])
m4trace:configure.ac:4: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -152,7 +152,7 @@
m4trace:configure.ac:7: -1- AC_CONFIG_FILES([Makefile contrib/Makefile contrib/request-key.d/Makefile])
m4trace:configure.ac:10: -1- AM_INIT_AUTOMAKE
m4trace:configure.ac:10: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-m4trace:configure.ac:10: -1- AM_AUTOMAKE_VERSION([1.13.4])
+m4trace:configure.ac:10: -1- AM_AUTOMAKE_VERSION([1.15])
m4trace:configure.ac:10: -1- AC_REQUIRE_AUX_FILE([install-sh])
m4trace:configure.ac:10: -1- AC_SUBST([INSTALL_PROGRAM])
m4trace:configure.ac:10: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
@@ -304,6 +304,7 @@
m4trace:configure.ac:76: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
m4trace:configure.ac:76: -1- AC_SUBST_TRACE([OBJEXT])
m4trace:configure.ac:76: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.ac:76: -1- AC_REQUIRE_AUX_FILE([compile])
m4trace:configure.ac:76: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
m4trace:configure.ac:76: -1- AC_SUBST_TRACE([DEPDIR])
m4trace:configure.ac:76: -1- m4_pattern_allow([^DEPDIR$])
@@ -426,11 +427,6 @@
m4trace:configure.ac:77: -1- AC_DEFINE_TRACE_LITERAL([_TANDEM_SOURCE])
m4trace:configure.ac:77: -1- m4_pattern_allow([^_TANDEM_SOURCE$])
m4trace:configure.ac:78: -1- AM_PROG_CC_C_O
-m4trace:configure.ac:78: -1- AC_DEFINE_TRACE_LITERAL([NO_MINUS_C_MINUS_O])
-m4trace:configure.ac:78: -1- m4_pattern_allow([^NO_MINUS_C_MINUS_O$])
-m4trace:configure.ac:78: -1- AH_OUTPUT([NO_MINUS_C_MINUS_O], [/* Define to 1 if your C compiler doesn\'t accept -c and -o together. */
-@%:@undef NO_MINUS_C_MINUS_O])
-m4trace:configure.ac:78: -1- AC_REQUIRE_AUX_FILE([compile])
m4trace:configure.ac:82: -1- AC_SUBST([SED])
m4trace:configure.ac:82: -1- AC_SUBST_TRACE([SED])
m4trace:configure.ac:82: -1- m4_pattern_allow([^SED$])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cifs-utils-6.4/compile new/cifs-utils-6.5/compile
--- old/cifs-utils-6.4/compile 2014-07-11 17:21:48.000000000 +0200
+++ new/cifs-utils-6.5/compile 2016-02-22 17:05:50.000000000 +0100
@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey .
#
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cifs-utils-6.4/config.h.in new/cifs-utils-6.5/config.h.in
--- old/cifs-utils-6.4/config.h.in 2014-07-11 17:21:47.000000000 +0200
+++ new/cifs-utils-6.5/config.h.in 2016-02-22 17:05:49.000000000 +0100
@@ -236,9 +236,6 @@
slash. */
#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
/* Name of package */
#undef PACKAGE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cifs-utils-6.4/configure.ac new/cifs-utils-6.5/configure.ac
--- old/cifs-utils-6.4/configure.ac 2014-07-11 17:14:06.000000000 +0200
+++ new/cifs-utils-6.5/configure.ac 2016-02-22 16:31:25.000000000 +0100
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_INIT([cifs-utils],[6.4],[linux-cifs@vger.kernel.org],[cifs-utils],[https://wiki.samba.org/index.php/LinuxCIFS_utils])
+AC_INIT([cifs-utils],[6.5],[linux-cifs@vger.kernel.org],[cifs-utils],[https://wiki.samba.org/index.php/LinuxCIFS_utils])
AC_CONFIG_SRCDIR([replace.h])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([Makefile contrib/Makefile contrib/request-key.d/Makefile])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cifs-utils-6.4/missing new/cifs-utils-6.5/missing
--- old/cifs-utils-6.4/missing 2014-07-11 17:21:48.000000000 +0200
+++ new/cifs-utils-6.5/missing 2016-02-22 17:05:50.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -160,7 +160,7 @@
;;
autom4te*)
echo "You might have modified some maintainer files that require"
- echo "the 'automa4te' program to be rebuilt."
+ echo "the 'autom4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cifs-utils-6.4/mount.cifs.8 new/cifs-utils-6.5/mount.cifs.8
--- old/cifs-utils-6.4/mount.cifs.8 2014-07-11 17:14:06.000000000 +0200
+++ new/cifs-utils-6.5/mount.cifs.8 2016-02-22 16:31:25.000000000 +0100
@@ -310,14 +310,14 @@
.PP
backupuid=\fIarg\fR
.RS 4
-Restrict access to files with the backup intent to a user. Either a name or an id must be provided as an argument, there are no default values.
+File access by this user shall be done with the backup intent flag set. Either a name or an id must be provided as an argument, there are no default values.
.sp
See section \fIACCESSING FILES WITH BACKUP INTENT\fR for more details
.RE
.PP
backupgid=\fIarg\fR
.RS 4
-Restrict access to files with the backup intent to a group. Either a name or an id must be provided as an argument, there are no default values.
+File access by users who are members of this group shall be done with the backup intent flag set. Either a name or an id must be provided as an argument, there are no default values.
.sp
See section \fIACCESSING FILES WITH BACKUP INTENT\fR for more details
.RE
@@ -767,7 +767,7 @@
Any user on the client side who can authenticate as such a user on the server,
can access the files with the backup intent. But it is desirable and preferable for security reasons amongst many, to restrict this special right.
-The mount option backupuid is used to restrict this special right to a user which is specified by either a name or an id. The mount option backupgid is used to restrict this special right to the users in a group which is specified by either a name or an id. These two mount options can be used together.
+The mount option backupuid is used to restrict this special right to a user which is specified by either a name or an id. The mount option backupgid is used to restrict this special right to the users in a group which is specified by either a name or an id. Only users maching either backupuid or backupgid shall attempt to access files with backup intent. These two mount options can be used together.
.SH "FILE AND DIRECTORY OWNERSHIP AND PERMISSIONS"
.PP
The core CIFS protocol does not provide unix ownership information or mode for files and directories\&. Because of this, files and directories will generally appear to be owned by whatever values the uid= or gid= options are set, and will have permissions set to the default file_mode and dir_mode for the mount\&. Attempting to change these values via chmod/chown will return success but have no effect\&.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cifs-utils-6.4/mount.cifs.c new/cifs-utils-6.5/mount.cifs.c
--- old/cifs-utils-6.4/mount.cifs.c 2014-07-11 17:14:06.000000000 +0200
+++ new/cifs-utils-6.5/mount.cifs.c 2016-02-22 16:31:25.000000000 +0100
@@ -756,6 +756,8 @@
return OPT_BKUPGID;
if (strncmp(token, "nofail", 6) == 0)
return OPT_NOFAIL;
+ if (strncmp(token, "x-", 2) == 0)
+ return OPT_IGNORE;
return OPT_ERROR;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cifs-utils-6.4/mtab.c new/cifs-utils-6.5/mtab.c
--- old/cifs-utils-6.4/mtab.c 2014-07-11 17:14:06.000000000 +0200
+++ new/cifs-utils-6.5/mtab.c 2016-02-22 16:31:25.000000000 +0100
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
#include "mount.h"
#include "config.h"