Imported Upstream version 2.17.2

Makefile.am

@@ -5,7 +5,10 @@ SUBDIRS = man src scripts test
 
 EXTRA_DIST = COPYING LICENSE NEWS.md README.md THANKS autogen.sh makedist.sh
 
+prove: all
+	cd test && $(MAKE) $(AM_MAKEFLAGS) prove
+
 test: all
-	( cd test && $(MAKE) $(AM_MAKEFLAGS) test )
+	cd test && $(MAKE) $(AM_MAKEFLAGS) test
 
-.PHONY: test
+.PHONY: prove test

Makefile.in

@@ -102,7 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/check_c_alignof.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 \
 	$(top_srcdir)/m4/no_cross_compiling.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/prog_prove_opt.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -279,6 +279,9 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POD2MAN = @POD2MAN@
 PROVE = @PROVE@
+PROVEFLAGS = @PROVEFLAGS@
+PROVE_HAVE_OPT___EXEC__BIN_SH = @PROVE_HAVE_OPT___EXEC__BIN_SH@
+PROVE_HAVE_OPT___FAILURES = @PROVE_HAVE_OPT___FAILURES@
 RANLIB = @RANLIB@
 SED = @SED@
 SEQ = @SEQ@
@@ -824,10 +827,13 @@ uninstall-am:
 	uninstall-am
 
 
+prove: all
+	cd test && $(MAKE) $(AM_MAKEFLAGS) prove
+
 test: all
-	( cd test && $(MAKE) $(AM_MAKEFLAGS) test )
+	cd test && $(MAKE) $(AM_MAKEFLAGS) test
 
-.PHONY: test
+.PHONY: prove test
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

NEWS.md

@@ -1,3 +1,12 @@
+## Version 2.17.2
+
+24 Dec 2013
+
+* Fixes were made for `fakechroot`(1) command with `-h` option.
+* The path for function `chroot`(2) is sanitized so it works correctly when
+  path is ended with `/`.
+* The `make -n test` was fixed and doesn't call any command.
+
 ## Version 2.17.1
 
 5 Dec 2013

aclocal.m4

@@ -1197,3 +1197,4 @@ m4_include([m4/ltsugar.m4])
 m4_include([m4/ltversion.m4])
 m4_include([m4/lt~obsolete.m4])
 m4_include([m4/no_cross_compiling.m4])
+m4_include([m4/prog_prove_opt.m4])

config.h.in

@@ -216,6 +216,12 @@
 /* Define to 1 if you have the `freopen64' function. */
 #undef HAVE_FREOPEN64
 
+/* Define to 1 if you have the `fstat' function. */
+#undef HAVE_FSTAT
+
+/* Define to 1 if you have the `fstat64' function. */
+#undef HAVE_FSTAT64
+
 /* Define to 1 if you have the `fts_children' function. */
 #undef HAVE_FTS_CHILDREN
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for fakechroot 2.17.1.
+# Generated by GNU Autoconf 2.69 for fakechroot 2.17.2.
 #
 # Report bugs to <dexter@debian.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='fakechroot'
 PACKAGE_TARNAME='fakechroot'
-PACKAGE_VERSION='2.17.1'
-PACKAGE_STRING='fakechroot 2.17.1'
+PACKAGE_VERSION='2.17.2'
+PACKAGE_STRING='fakechroot 2.17.2'
 PACKAGE_BUGREPORT='dexter@debian.org'
 PACKAGE_URL='http://fakechroot.alioth.debian.org/'
 
@@ -635,6 +635,9 @@ ac_includes_default="\
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
+PROVE_HAVE_OPT___EXEC__BIN_SH
+PROVE_HAVE_OPT___FAILURES
+PROVEFLAGS
 LIBOBJS
 ALLOCA
 HAVE_VISIBILITY
@@ -1329,7 +1332,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures fakechroot 2.17.1 to adapt to many kinds of systems.
+\`configure' configures fakechroot 2.17.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1399,7 +1402,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of fakechroot 2.17.1:";;
+     short | recursive ) echo "Configuration of fakechroot 2.17.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1511,7 +1514,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-fakechroot configure 2.17.1
+fakechroot configure 2.17.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2045,7 +2048,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by fakechroot $as_me 2.17.1, which was
+It was created by fakechroot $as_me 2.17.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2914,7 +2917,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='fakechroot'
- VERSION='2.17.1'
+ VERSION='2.17.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13806,7 +13809,7 @@ fi
 
 
 # Checks for library functions.
-for ac_func in __chk_fail __fxstat64 __fxstatat __fxstatat64 __getcwd_chk __getwd_chk __lxstat __lxstat64 __open __open_2 __open64 __open64_2 __openat_2 __openat64_2 __opendir2 __realpath_chk __readlink_chk __readlinkat_chk __statfs __xmknod __xmknodat __xstat __xstat64 _xftw _xftw64 access acct bind bindtextdomain canonicalize_file_name chdir chmod chown chroot clearenv connect creat creat64 dlmopen dlopen eaccess euidaccess execl execle execlp execv execve execvp faccessat fchdir fchmodat fchownat fopen fopen64 freopen freopen64 fts_children fts_open fts_read ftw ftw64 futimesat get_current_dir_name getcwd getpeername getsockname getwd getxattr glob glob64 glob_pattern_p inotify_add_watch lchmod lchown lckpwdf lgetxattr link linkat listxattr llistxattr lremovexattr lsetxattr lstat lstat64 lutimes mempcpy mkdir mkdirat mkdtemp mkfifo mkfifoat mknod mknodat mkostemp mkostemp64 mkostemps mkostemps64 mkstemp mkstemp64 mkstemps mkstemps64 mktemp nftw nftw64 open open64 openat openat64 opendir pathconf popen rawmemchr readlink readlinkat realpath remove removexattr rename renameat revoke rmdir scandir scandir64 setenv setxattr stat stat64 statfs statfs64 statvfs statvfs64 stpcpy strchrnul strlcpy symlink symlinkat system tempnam tmpnam truncate truncate64 unlink unlinkat unsetenv ulckpwdf utime utimensat utimes vfork
+for ac_func in __chk_fail __fxstat64 __fxstatat __fxstatat64 __getcwd_chk __getwd_chk __lxstat __lxstat64 __open __open_2 __open64 __open64_2 __openat_2 __openat64_2 __opendir2 __realpath_chk __readlink_chk __readlinkat_chk __statfs __xmknod __xmknodat __xstat __xstat64 _xftw _xftw64 access acct bind bindtextdomain canonicalize_file_name chdir chmod chown chroot clearenv connect creat creat64 dlmopen dlopen eaccess euidaccess execl execle execlp execv execve execvp faccessat fchdir fchmodat fchownat fopen fopen64 freopen freopen64 fstat fstat64 fts_children fts_open fts_read ftw ftw64 futimesat get_current_dir_name getcwd getpeername getsockname getwd getxattr glob glob64 glob_pattern_p inotify_add_watch lchmod lchown lckpwdf lgetxattr link linkat listxattr llistxattr lremovexattr lsetxattr lstat lstat64 lutimes mempcpy mkdir mkdirat mkdtemp mkfifo mkfifoat mknod mknodat mkostemp mkostemp64 mkostemps mkostemps64 mkstemp mkstemp64 mkstemps mkstemps64 mktemp nftw nftw64 open open64 openat openat64 opendir pathconf popen rawmemchr readlink readlinkat realpath remove removexattr rename renameat revoke rmdir scandir scandir64 setenv setxattr stat stat64 statfs statfs64 statvfs statvfs64 stpcpy strchrnul strlcpy symlink symlinkat system tempnam tmpnam truncate truncate64 unlink unlinkat unsetenv ulckpwdf utime utimensat utimes vfork
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -15610,6 +15613,174 @@ _ACEOF
 ac_config_files="$ac_config_files Makefile man/Makefile src/Makefile scripts/Makefile test/Makefile test/src/Makefile"
 
 
+# prove --failures --exec /bin/sh
+
+        for ac_prog in prove
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_PROVE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$PROVE"; then
+  ac_cv_prog_PROVE="$PROVE" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_PROVE="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+PROVE=$ac_cv_prog_PROVE
+if test -n "$PROVE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROVE" >&5
+$as_echo "$PROVE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PROVE" && break
+done
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PROVE accepts --failures" >&5
+$as_echo_n "checking whether $PROVE accepts --failures... " >&6; }
+if ${acx_cv_prog_prove_opt___failures+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat <<_ACEOF >conftest.pl
+
+printf "1..1\n";
+printf "ok 1\n";
+exit 0;
+
+_ACEOF
+        ac_try='$PROVE --failures conftest.pl >&5'
+        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; }; then :
+  acx_cv_prog_prove_opt___failures=yes
+else
+  acx_cv_prog_prove_opt___failures=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_prog_prove_opt___failures" >&5
+$as_echo "$acx_cv_prog_prove_opt___failures" >&6; }
+        if test "x$acx_cv_prog_prove_opt___failures" = xyes; then :
+  as_fn_append PROVEFLAGS " --failures"
+
+                PROVE_HAVE_OPT___FAILURES=true
+
+                acx_cv_prog_prove_opt___failures=yes
+fi
+
+
+
+        for ac_prog in prove
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_PROVE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$PROVE"; then
+  ac_cv_prog_PROVE="$PROVE" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_PROVE="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+PROVE=$ac_cv_prog_PROVE
+if test -n "$PROVE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROVE" >&5
+$as_echo "$PROVE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PROVE" && break
+done
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PROVE accepts --exec /bin/sh" >&5
+$as_echo_n "checking whether $PROVE accepts --exec /bin/sh... " >&6; }
+if ${acx_cv_prog_prove_opt___exec__bin_sh+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat <<_ACEOF >conftest.pl
+
+printf "1..1\n";
+printf "ok 1\n";
+exit 0;
+
+_ACEOF
+        ac_try='$PROVE --exec /bin/sh conftest.pl >&5'
+        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; }; then :
+  acx_cv_prog_prove_opt___exec__bin_sh=yes
+else
+  acx_cv_prog_prove_opt___exec__bin_sh=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_prog_prove_opt___exec__bin_sh" >&5
+$as_echo "$acx_cv_prog_prove_opt___exec__bin_sh" >&6; }
+        if test "x$acx_cv_prog_prove_opt___exec__bin_sh" = xyes; then :
+  as_fn_append PROVEFLAGS " --exec /bin/sh"
+
+                PROVE_HAVE_OPT___EXEC__BIN_SH=true
+
+                acx_cv_prog_prove_opt___exec__bin_sh=yes
+fi
+
+
+
 # Generate output
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -16149,7 +16320,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by fakechroot $as_me 2.17.1, which was
+This file was extended by fakechroot $as_me 2.17.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16216,7 +16387,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-fakechroot config.status 2.17.1
+fakechroot config.status 2.17.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.64)
-AC_INIT([fakechroot], [2.17.1], [dexter@debian.org], [fakechroot], [http://fakechroot.alioth.debian.org/])
+AC_INIT([fakechroot], [2.17.2], [dexter@debian.org], [fakechroot], [http://fakechroot.alioth.debian.org/])
 
 AC_CONFIG_SRCDIR([src/libfakechroot.c])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -173,6 +173,8 @@ AC_CHECK_FUNCS(m4_normalize([
     fopen64
     freopen
     freopen64
+    fstat
+    fstat64
     fts_children
     fts_open
     fts_read
@@ -355,5 +357,9 @@ AC_CONFIG_FILES(m4_normalize([
     test/src/Makefile
 ]))
 
+# prove --failures --exec /bin/sh
+ACX_PROG_PROVE_OPT([--failures])
+ACX_PROG_PROVE_OPT([--exec /bin/sh])
+
 # Generate output
 AC_OUTPUT