Skip to content

Commit 0054595

Browse files
dex4erdex4er
committed
Imported Upstream version 2.17.2
1 parent ab51e05 commit 0054595

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+534
-234
lines changed

‎Makefile.am‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ SUBDIRS = man src scripts test
55

66
EXTRA_DIST = COPYING LICENSE NEWS.md README.md THANKS autogen.sh makedist.sh
77

8+
prove: all
9+
cd test && $(MAKE) $(AM_MAKEFLAGS) prove
10+
811
test: all
9-
( cd test && $(MAKE) $(AM_MAKEFLAGS) test )
12+
cd test && $(MAKE) $(AM_MAKEFLAGS) test
1013

11-
.PHONY: test
14+
.PHONY: prove test

‎Makefile.in‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/check_c_alignof.m4 \
102102
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
103103
$(top_srcdir)/m4/lt~obsolete.m4 \
104104
$(top_srcdir)/m4/no_cross_compiling.m4 \
105-
$(top_srcdir)/configure.ac
105+
$(top_srcdir)/m4/prog_prove_opt.m4 $(top_srcdir)/configure.ac
106106
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
107107
$(ACLOCAL_M4)
108108
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -279,6 +279,9 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
279279
PERL = @PERL@
280280
POD2MAN = @POD2MAN@
281281
PROVE = @PROVE@
282+
PROVEFLAGS = @PROVEFLAGS@
283+
PROVE_HAVE_OPT___EXEC__BIN_SH = @PROVE_HAVE_OPT___EXEC__BIN_SH@
284+
PROVE_HAVE_OPT___FAILURES = @PROVE_HAVE_OPT___FAILURES@
282285
RANLIB = @RANLIB@
283286
SED = @SED@
284287
SEQ = @SEQ@
@@ -824,10 +827,13 @@ uninstall-am:
824827
uninstall-am
825828

826829

830+
prove: all
831+
cd test && $(MAKE) $(AM_MAKEFLAGS) prove
832+
827833
test: all
828-
( cd test && $(MAKE) $(AM_MAKEFLAGS) test )
834+
cd test && $(MAKE) $(AM_MAKEFLAGS) test
829835

830-
.PHONY: test
836+
.PHONY: prove test
831837

832838
# Tell versions [3.59,3.63) of GNU make to not export all variables.
833839
# Otherwise a system limit (for SysV at least) may be exceeded.

‎NEWS.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## Version 2.17.2
2+
3+
24 Dec 2013
4+
5+
* Fixes were made for `fakechroot`(1) command with `-h` option.
6+
* The path for function `chroot`(2) is sanitized so it works correctly when
7+
path is ended with `/`.
8+
* The `make -n test` was fixed and doesn't call any command.
9+
110
## Version 2.17.1
211

312
5 Dec 2013

‎aclocal.m4‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,3 +1197,4 @@ m4_include([m4/ltsugar.m4])
11971197
m4_include([m4/ltversion.m4])
11981198
m4_include([m4/lt~obsolete.m4])
11991199
m4_include([m4/no_cross_compiling.m4])
1200+
m4_include([m4/prog_prove_opt.m4])

‎config.h.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,12 @@
216216
/* Define to 1 if you have the `freopen64' function. */
217217
#undef HAVE_FREOPEN64
218218

219+
/* Define to 1 if you have the `fstat' function. */
220+
#undef HAVE_FSTAT
221+
222+
/* Define to 1 if you have the `fstat64' function. */
223+
#undef HAVE_FSTAT64
224+
219225
/* Define to 1 if you have the `fts_children' function. */
220226
#undef HAVE_FTS_CHILDREN
221227

‎configure‎

Lines changed: 182 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for fakechroot 2.17.1.
3+
# Generated by GNU Autoconf 2.69 for fakechroot 2.17.2.
44
#
55
# Report bugs to <dexter@debian.org>.
66
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
590590
# Identity of this package.
591591
PACKAGE_NAME='fakechroot'
592592
PACKAGE_TARNAME='fakechroot'
593-
PACKAGE_VERSION='2.17.1'
594-
PACKAGE_STRING='fakechroot 2.17.1'
593+
PACKAGE_VERSION='2.17.2'
594+
PACKAGE_STRING='fakechroot 2.17.2'
595595
PACKAGE_BUGREPORT='dexter@debian.org'
596596
PACKAGE_URL='http://fakechroot.alioth.debian.org/'
597597

@@ -635,6 +635,9 @@ ac_includes_default="\
635635
ac_subst_vars='am__EXEEXT_FALSE
636636
am__EXEEXT_TRUE
637637
LTLIBOBJS
638+
PROVE_HAVE_OPT___EXEC__BIN_SH
639+
PROVE_HAVE_OPT___FAILURES
640+
PROVEFLAGS
638641
LIBOBJS
639642
ALLOCA
640643
HAVE_VISIBILITY
@@ -1329,7 +1332,7 @@ if test "$ac_init_help" = "long"; then
13291332
# Omit some internal or obsolete options to make the list less imposing.
13301333
# This message is too long to be a string in the A/UX 3.1 sh.
13311334
cat <<_ACEOF
1332-
\`configure' configures fakechroot 2.17.1 to adapt to many kinds of systems.
1335+
\`configure' configures fakechroot 2.17.2 to adapt to many kinds of systems.
13331336

13341337
Usage: $0 [OPTION]... [VAR=VALUE]...
13351338

@@ -1399,7 +1402,7 @@ fi
13991402

14001403
if test -n "$ac_init_help"; then
14011404
case $ac_init_help in
1402-
short | recursive ) echo "Configuration of fakechroot 2.17.1:";;
1405+
short | recursive ) echo "Configuration of fakechroot 2.17.2:";;
14031406
esac
14041407
cat <<\_ACEOF
14051408

@@ -1511,7 +1514,7 @@ fi
15111514
test -n "$ac_init_help" && exit $ac_status
15121515
if $ac_init_version; then
15131516
cat <<\_ACEOF
1514-
fakechroot configure 2.17.1
1517+
fakechroot configure 2.17.2
15151518
generated by GNU Autoconf 2.69
15161519

15171520
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2045,7 +2048,7 @@ cat >config.log <<_ACEOF
20452048
This file contains any messages produced by compilers while
20462049
running configure, to aid debugging if configure makes a mistake.
20472050

2048-
It was created by fakechroot $as_me 2.17.1, which was
2051+
It was created by fakechroot $as_me 2.17.2, which was
20492052
generated by GNU Autoconf 2.69. Invocation command line was
20502053

20512054
$ $0 $@
@@ -2914,7 +2917,7 @@ fi
29142917

29152918
# Define the identity of the package.
29162919
PACKAGE='fakechroot'
2917-
VERSION='2.17.1'
2920+
VERSION='2.17.2'
29182921

29192922

29202923
cat >>confdefs.h <<_ACEOF
@@ -13806,7 +13809,7 @@ fi
1380613809

1380713810

1380813811
# Checks for library functions.
13809-
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
13812+
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
1381013813
do :
1381113814
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1381213815
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -15610,6 +15613,174 @@ _ACEOF
1561015613
ac_config_files="$ac_config_files Makefile man/Makefile src/Makefile scripts/Makefile test/Makefile test/src/Makefile"
1561115614

1561215615

15616+
# prove --failures --exec /bin/sh
15617+
15618+
for ac_prog in prove
15619+
do
15620+
# Extract the first word of "$ac_prog", so it can be a program name with args.
15621+
set dummy $ac_prog; ac_word=$2
15622+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15623+
$as_echo_n "checking for $ac_word... " >&6; }
15624+
if ${ac_cv_prog_PROVE+:} false; then :
15625+
$as_echo_n "(cached) " >&6
15626+
else
15627+
if test -n "$PROVE"; then
15628+
ac_cv_prog_PROVE="$PROVE" # Let the user override the test.
15629+
else
15630+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15631+
for as_dir in $PATH
15632+
do
15633+
IFS=$as_save_IFS
15634+
test -z "$as_dir" && as_dir=.
15635+
for ac_exec_ext in '' $ac_executable_extensions; do
15636+
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
15637+
ac_cv_prog_PROVE="$ac_prog"
15638+
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15639+
break 2
15640+
fi
15641+
done
15642+
done
15643+
IFS=$as_save_IFS
15644+
15645+
fi
15646+
fi
15647+
PROVE=$ac_cv_prog_PROVE
15648+
if test -n "$PROVE"; then
15649+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROVE" >&5
15650+
$as_echo "$PROVE" >&6; }
15651+
else
15652+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15653+
$as_echo "no" >&6; }
15654+
fi
15655+
15656+
15657+
test -n "$PROVE" && break
15658+
done
15659+
15660+
15661+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PROVE accepts --failures" >&5
15662+
$as_echo_n "checking whether $PROVE accepts --failures... " >&6; }
15663+
if ${acx_cv_prog_prove_opt___failures+:} false; then :
15664+
$as_echo_n "(cached) " >&6
15665+
else
15666+
cat <<_ACEOF >conftest.pl
15667+
15668+
printf "1..1\n";
15669+
printf "ok 1\n";
15670+
exit 0;
15671+
15672+
_ACEOF
15673+
ac_try='$PROVE --failures conftest.pl >&5'
15674+
if { { case "(($ac_try" in
15675+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15676+
*) ac_try_echo=$ac_try;;
15677+
esac
15678+
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
15679+
$as_echo "$ac_try_echo"; } >&5
15680+
(eval "$ac_try") 2>&5
15681+
ac_status=$?
15682+
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15683+
test $ac_status = 0; }; then :
15684+
acx_cv_prog_prove_opt___failures=yes
15685+
else
15686+
acx_cv_prog_prove_opt___failures=no
15687+
fi
15688+
fi
15689+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_prog_prove_opt___failures" >&5
15690+
$as_echo "$acx_cv_prog_prove_opt___failures" >&6; }
15691+
if test "x$acx_cv_prog_prove_opt___failures" = xyes; then :
15692+
as_fn_append PROVEFLAGS " --failures"
15693+
15694+
PROVE_HAVE_OPT___FAILURES=true
15695+
15696+
acx_cv_prog_prove_opt___failures=yes
15697+
fi
15698+
15699+
15700+
15701+
for ac_prog in prove
15702+
do
15703+
# Extract the first word of "$ac_prog", so it can be a program name with args.
15704+
set dummy $ac_prog; ac_word=$2
15705+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15706+
$as_echo_n "checking for $ac_word... " >&6; }
15707+
if ${ac_cv_prog_PROVE+:} false; then :
15708+
$as_echo_n "(cached) " >&6
15709+
else
15710+
if test -n "$PROVE"; then
15711+
ac_cv_prog_PROVE="$PROVE" # Let the user override the test.
15712+
else
15713+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15714+
for as_dir in $PATH
15715+
do
15716+
IFS=$as_save_IFS
15717+
test -z "$as_dir" && as_dir=.
15718+
for ac_exec_ext in '' $ac_executable_extensions; do
15719+
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
15720+
ac_cv_prog_PROVE="$ac_prog"
15721+
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15722+
break 2
15723+
fi
15724+
done
15725+
done
15726+
IFS=$as_save_IFS
15727+
15728+
fi
15729+
fi
15730+
PROVE=$ac_cv_prog_PROVE
15731+
if test -n "$PROVE"; then
15732+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROVE" >&5
15733+
$as_echo "$PROVE" >&6; }
15734+
else
15735+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15736+
$as_echo "no" >&6; }
15737+
fi
15738+
15739+
15740+
test -n "$PROVE" && break
15741+
done
15742+
15743+
15744+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PROVE accepts --exec /bin/sh" >&5
15745+
$as_echo_n "checking whether $PROVE accepts --exec /bin/sh... " >&6; }
15746+
if ${acx_cv_prog_prove_opt___exec__bin_sh+:} false; then :
15747+
$as_echo_n "(cached) " >&6
15748+
else
15749+
cat <<_ACEOF >conftest.pl
15750+
15751+
printf "1..1\n";
15752+
printf "ok 1\n";
15753+
exit 0;
15754+
15755+
_ACEOF
15756+
ac_try='$PROVE --exec /bin/sh conftest.pl >&5'
15757+
if { { case "(($ac_try" in
15758+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15759+
*) ac_try_echo=$ac_try;;
15760+
esac
15761+
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
15762+
$as_echo "$ac_try_echo"; } >&5
15763+
(eval "$ac_try") 2>&5
15764+
ac_status=$?
15765+
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15766+
test $ac_status = 0; }; then :
15767+
acx_cv_prog_prove_opt___exec__bin_sh=yes
15768+
else
15769+
acx_cv_prog_prove_opt___exec__bin_sh=no
15770+
fi
15771+
fi
15772+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_prog_prove_opt___exec__bin_sh" >&5
15773+
$as_echo "$acx_cv_prog_prove_opt___exec__bin_sh" >&6; }
15774+
if test "x$acx_cv_prog_prove_opt___exec__bin_sh" = xyes; then :
15775+
as_fn_append PROVEFLAGS " --exec /bin/sh"
15776+
15777+
PROVE_HAVE_OPT___EXEC__BIN_SH=true
15778+
15779+
acx_cv_prog_prove_opt___exec__bin_sh=yes
15780+
fi
15781+
15782+
15783+
1561315784
# Generate output
1561415785
cat >confcache <<\_ACEOF
1561515786
# This file is a shell script that caches the results of configure
@@ -16149,7 +16320,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1614916320
# report actual input values of CONFIG_FILES etc. instead of their
1615016321
# values after options handling.
1615116322
ac_log="
16152-
This file was extended by fakechroot $as_me 2.17.1, which was
16323+
This file was extended by fakechroot $as_me 2.17.2, which was
1615316324
generated by GNU Autoconf 2.69. Invocation command line was
1615416325

1615516326
CONFIG_FILES = $CONFIG_FILES
@@ -16216,7 +16387,7 @@ _ACEOF
1621616387
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1621716388
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1621816389
ac_cs_version="\\
16219-
fakechroot config.status 2.17.1
16390+
fakechroot config.status 2.17.2
1622016391
configured by $0, generated by GNU Autoconf 2.69,
1622116392
with options \\"\$ac_cs_config\\"
1622216393

‎configure.ac‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AC_PREREQ(2.64)
2-
AC_INIT([fakechroot], [2.17.1], [dexter@debian.org], [fakechroot], [http://fakechroot.alioth.debian.org/])
2+
AC_INIT([fakechroot], [2.17.2], [dexter@debian.org], [fakechroot], [http://fakechroot.alioth.debian.org/])
33

44
AC_CONFIG_SRCDIR([src/libfakechroot.c])
55
AC_CONFIG_AUX_DIR([build-aux])
@@ -173,6 +173,8 @@ AC_CHECK_FUNCS(m4_normalize([
173173
fopen64
174174
freopen
175175
freopen64
176+
fstat
177+
fstat64
176178
fts_children
177179
fts_open
178180
fts_read
@@ -355,5 +357,9 @@ AC_CONFIG_FILES(m4_normalize([
355357
test/src/Makefile
356358
]))
357359

360+
# prove --failures --exec /bin/sh
361+
ACX_PROG_PROVE_OPT([--failures])
362+
ACX_PROG_PROVE_OPT([--exec /bin/sh])
363+
358364
# Generate output
359365
AC_OUTPUT

0 commit comments

Comments
 (0)