From 045face8510cfcce828874be0a946b96e1c7a416 Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Mon, 26 May 2008 17:02:24 +0000
Subject: [PATCH] new upstream release 1.20

---
 .cvsignore                 |    4 +-
 sources                    |    4 +-
 tar-1.19-gcc43.patch       |   32 -
 tar-1.19-xattrs-conf.patch | 1775 +-----------------------------------
 tar-1.19-xattrs.patch      |    2 +-
 tar.spec                   |   12 +-
 6 files changed, 31 insertions(+), 1798 deletions(-)
 delete mode 100644 tar-1.19-gcc43.patch

diff --git a/.cvsignore b/.cvsignore
index 475e133..cce6c3b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-tar-1.19.tar.gz
-tar-1.19.tar.gz.sig
+tar-1.20.tar.gz
+tar-1.20.tar.gz.sig
diff --git a/sources b/sources
index c8168e4..36ed667 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fa22b3092b2c54a3fd3059ebd797c8a2  tar-1.19.tar.gz
-c983c55819c258e7ed61dbac9d3dc232  tar-1.19.tar.gz.sig
+c1a4ff43157ac60dd4b96dab09a3197c  tar-1.20.tar.gz
+0c5eaacc1805750d2701bda133c6f654  tar-1.20.tar.gz.sig
diff --git a/tar-1.19-gcc43.patch b/tar-1.19-gcc43.patch
deleted file mode 100644
index b324f72..0000000
--- a/tar-1.19-gcc43.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -up tar-1.19/lib/argp-fmtstream.h.gcc43 tar-1.19/lib/argp-fmtstream.h
---- tar-1.19/lib/argp-fmtstream.h.gcc43	2007-09-28 15:11:36.000000000 +0200
-+++ tar-1.19/lib/argp-fmtstream.h	2008-02-13 16:56:58.000000000 +0100
-@@ -198,7 +198,11 @@ extern int __argp_fmtstream_ensure (argp
- #endif
- 
- #ifndef ARGP_FS_EI
--#define ARGP_FS_EI extern inline
-+# ifdef __GNUC_STDC_INLINE__
-+#  define ARGP_FS_EI extern inline __attribute__((__gnu_inline__))
-+# else
-+#  define ARGP_FS_EI extern inline
-+# endif
- #endif
- 
- ARGP_FS_EI size_t
-diff -up tar-1.19/lib/argp.h.gcc43 tar-1.19/lib/argp.h
---- tar-1.19/lib/argp.h.gcc43	2007-09-28 15:11:36.000000000 +0200
-+++ tar-1.19/lib/argp.h	2008-02-13 16:55:36.000000000 +0100
-@@ -580,7 +580,11 @@ extern void *__argp_input (const struct 
- # endif
- 
- # ifndef ARGP_EI
--#  define ARGP_EI extern __inline__
-+#  if defined __GNUC_STDC_INLINE__
-+#    define ARGP_EI extern __inline__ __attribute__((__gnu_inline__))
-+#  else
-+#    define ARGP_EI extern __inline__
-+#  endif
- # endif
- 
- ARGP_EI void
diff --git a/tar-1.19-xattrs-conf.patch b/tar-1.19-xattrs-conf.patch
index c531197..e9d270b 100644
--- a/tar-1.19-xattrs-conf.patch
+++ b/tar-1.19-xattrs-conf.patch
@@ -102,8 +102,8 @@ diff -up tar-1.19/config.hin.xattrs-conf tar-1.19/config.hin
 +/* Define to 1 if you have the `fsetxattr' function. */
 +#undef HAVE_FSETXATTR
 +
- /* Define to 1 if you have the `fsync' function. */
- #undef HAVE_FSYNC
+ /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+ #undef HAVE_FSEEKO
  
 @@ -399,6 +411,9 @@
  /* Define to 1 if you have the `gettimeofday' function. */
@@ -195,14 +195,6 @@ diff -up tar-1.19/config.hin.xattrs-conf tar-1.19/config.hin
 diff -up tar-1.19/configure.xattrs-conf tar-1.19/configure
 --- tar-1.19/configure.xattrs-conf	2007-10-10 13:00:16.000000000 +0200
 +++ tar-1.19/configure	2007-12-17 11:47:14.000000000 +0100
-@@ -658,6 +658,7 @@ target_alias
- INSTALL_PROGRAM
- INSTALL_SCRIPT
- INSTALL_DATA
-+am__isrc
- CYGPATH_W
- PACKAGE
- VERSION
 @@ -1963,6 +1964,9 @@ ac_header_list="$ac_header_list sys/tpri
  ac_header_list="$ac_header_list sys/tape.h"
  ac_header_list="$ac_header_list unistd.h"
@@ -213,203 +205,6 @@ diff -up tar-1.19/configure.xattrs-conf tar-1.19/configure
  ac_func_list="$ac_func_list flockfile"
  ac_func_list="$ac_func_list funlockfile"
  ac_header_list="$ac_header_list features.h"
-@@ -2136,7 +2140,8 @@ ac_configure="$SHELL $ac_aux_dir/configu
- ac_config_headers="$ac_config_headers config.h:config.hin"
- 
- 
--am__api_version="1.9"
-+am__api_version='1.10'
-+
- # Find a good install program.  We prefer a C program (faster),
- # so one script is as good as another.  But avoid the broken or
- # incompatible versions:
-@@ -2288,38 +2293,53 @@ else
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
- 
--if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
--  # We used to keeping the `.' as first argument, in order to
--  # allow $(mkdir_p) to be used without argument.  As in
--  #   $(mkdir_p) $(somedir)
--  # where $(somedir) is conditionally defined.  However this is wrong
--  # for two reasons:
--  #  1. if the package is installed by a user who cannot write `.'
--  #     make install will fail,
--  #  2. the above comment should most certainly read
--  #     $(mkdir_p) $(DESTDIR)$(somedir)
--  #     so it does not work when $(somedir) is undefined and
--  #     $(DESTDIR) is not.
--  #  To support the latter case, we have to write
--  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
--  #  so the `.' trick is pointless.
--  mkdir_p='mkdir -p --'
--else
--  # On NextStep and OpenStep, the `mkdir' command does not
--  # recognize any option.  It will interpret all options as
--  # directories to create, and then abort because `.' already
--  # exists.
--  for d in ./-p ./--version;
--  do
--    test -d $d && rmdir $d
--  done
--  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
--  if test -f "$ac_aux_dir/mkinstalldirs"; then
--    mkdir_p='$(mkinstalldirs)'
-+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-+if test -z "$MKDIR_P"; then
-+  if test "${ac_cv_path_mkdir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_prog in mkdir gmkdir; do
-+	 for ac_exec_ext in '' $ac_executable_extensions; do
-+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-+	     'mkdir (GNU coreutils) '* | \
-+	     'mkdir (coreutils) '* | \
-+	     'mkdir (fileutils) '4.1*)
-+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-+	       break 3;;
-+	   esac
-+	 done
-+       done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+
-+  if test "${ac_cv_path_mkdir+set}" = set; then
-+    MKDIR_P="$ac_cv_path_mkdir -p"
-   else
--    mkdir_p='$(install_sh) -d'
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # value for MKDIR_P within a source directory, because that will
-+    # break other packages using the cache if that directory is
-+    # removed, or if the value is a relative name.
-+    test -d ./--version && rmdir ./--version
-+    MKDIR_P="$ac_install_sh -d"
-   fi
- fi
-+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-+echo "${ECHO_T}$MKDIR_P" >&6; }
-+
-+mkdir_p="$MKDIR_P"
-+case $mkdir_p in
-+  [\\/$]* | ?:[\\/]*) ;;
-+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
- 
- for ac_prog in gawk mawk nawk awk
- do
-@@ -2402,12 +2422,16 @@ else
- fi
- rmdir .tst 2>/dev/null
- 
--# test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" &&
--   test -f $srcdir/config.status; then
--  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+  # is not polluted with repeated "-I."
-+  am__isrc=' -I$(srcdir)'
-+  # test to see if srcdir already configured
-+  if test -f $srcdir/config.status; then
-+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
- echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-    { (exit 1); exit 1; }; }
-+  fi
- fi
- 
- # test whether we have cygpath
-@@ -2450,7 +2474,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
- 
- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
- 
--install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
- 
- # Installed binaries are usually stripped using `strip' when the user
- # run `make install-strip'.  However `strip' might not be the right
-@@ -2554,7 +2578,7 @@ else
- fi
- 
- fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
- 
- # We need awk for the "check" target.  The system "awk" is bad on
- # some platforms.
-@@ -3621,9 +3645,7 @@ if test "x$enable_dependency_tracking" !
-   am_depcomp="$ac_aux_dir/depcomp"
-   AMDEPBACKSLASH='\'
- fi
--
--
--if test "x$enable_dependency_tracking" != xno; then
-+ if test "x$enable_dependency_tracking" != xno; then
-   AMDEP_TRUE=
-   AMDEP_FALSE='#'
- else
-@@ -3633,7 +3655,6 @@ fi
- 
- 
- 
--
- depcc="$CC"   am_compiler_list=
- 
- { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-@@ -3701,6 +3722,7 @@ else
-        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-          >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-@@ -3730,9 +3752,7 @@ fi
- echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- 
--
--
--if
-+ if
-   test "x$enable_dependency_tracking" != xno \
-   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-   am__fastdepCC_TRUE=
-@@ -4009,6 +4029,7 @@ if eval "test \"`echo '$ac_cv_prog_cc_'$
- fi
- 
- 
-+
- cat >>confdefs.h <<\_ACEOF
- #define _GNU_SOURCE 1
- _ACEOF
-@@ -5584,14 +5605,12 @@ rm -f conftest*
-   fi
- fi
- 
--
--        { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
--echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; }
--if test "${ac_cv_lib_cposix_strerror+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
-+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
-+if test "${ac_cv_search_strerror+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lcposix  $LIBS"
-+  ac_func_search_save_LIBS=$LIBS
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
 @@ -5614,7 +5633,14 @@ return strerror ();
    return 0;
  }
@@ -471,52 +266,6 @@ diff -up tar-1.19/configure.xattrs-conf tar-1.19/configure
  
  { echo "$as_me:$LINENO: checking for inline" >&5
  echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
-@@ -5952,6 +5988,18 @@ done
- 
- 
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- for ac_header in sys/buf.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-@@ -16192,7 +16240,6 @@ fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--
-       if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -16502,7 +16549,6 @@ fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--
-       if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
-         if test $fits_in_uint = 1; then
-                               cat >conftest.$ac_ext <<_ACEOF
-@@ -16576,9 +16622,7 @@ _ACEOF
- 
- 
- 
--
--
--if false; then
-+   if false; then
-   GL_COND_LIBTOOL_TRUE=
-   GL_COND_LIBTOOL_FALSE='#'
- else
 @@ -32646,6 +32690,257 @@ _ACEOF
  fi
  done
@@ -1072,267 +821,29 @@ diff -up tar-1.19/configure.xattrs-conf tar-1.19/configure
  { echo "$as_me:$LINENO: checking for iconv_t" >&5
  echo $ECHO_N "checking for iconv_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_iconv_t+set}" = set; then
-@@ -36695,6 +37280,7 @@ target_alias!$target_alias$ac_delim
- INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
- INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
- INSTALL_DATA!$INSTALL_DATA$ac_delim
-+am__isrc!$am__isrc$ac_delim
- CYGPATH_W!$CYGPATH_W$ac_delim
- PACKAGE!$PACKAGE$ac_delim
- VERSION!$VERSION$ac_delim
-@@ -36751,7 +37337,6 @@ GNULIB_GETLOGIN_R!$GNULIB_GETLOGIN_R$ac_
- GNULIB_LCHOWN!$GNULIB_LCHOWN$ac_delim
- GNULIB_LSEEK!$GNULIB_LSEEK$ac_delim
- GNULIB_READLINK!$GNULIB_READLINK$ac_delim
--GNULIB_SLEEP!$GNULIB_SLEEP$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -36793,6 +37378,7 @@ _ACEOF
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
-+GNULIB_SLEEP!$GNULIB_SLEEP$ac_delim
- HAVE_DUP2!$HAVE_DUP2$ac_delim
- HAVE_FTRUNCATE!$HAVE_FTRUNCATE$ac_delim
- HAVE_READLINK!$HAVE_READLINK$ac_delim
-@@ -36889,7 +37475,6 @@ WINT_T_SUFFIX!$WINT_T_SUFFIX$ac_delim
- STDINT_H!$STDINT_H$ac_delim
- PRI_MACROS_BROKEN!$PRI_MACROS_BROKEN$ac_delim
- GNULIB_IMAXABS!$GNULIB_IMAXABS$ac_delim
--GNULIB_IMAXDIV!$GNULIB_IMAXDIV$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -36931,6 +37516,7 @@ _ACEOF
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
-+GNULIB_IMAXDIV!$GNULIB_IMAXDIV$ac_delim
- GNULIB_STRTOIMAX!$GNULIB_STRTOIMAX$ac_delim
- GNULIB_STRTOUMAX!$GNULIB_STRTOUMAX$ac_delim
- HAVE_DECL_IMAXABS!$HAVE_DECL_IMAXABS$ac_delim
-@@ -37027,7 +37613,6 @@ WCHAR_H!$WCHAR_H$ac_delim
- HAVE_WCHAR_H!$HAVE_WCHAR_H$ac_delim
- NEXT_WCHAR_H!$NEXT_WCHAR_H$ac_delim
- HAVE_ISWCNTRL!$HAVE_ISWCNTRL$ac_delim
--HAVE_WINT_T!$HAVE_WINT_T$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -37069,6 +37654,7 @@ _ACEOF
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
-+HAVE_WINT_T!$HAVE_WINT_T$ac_delim
- NEXT_WCTYPE_H!$NEXT_WCTYPE_H$ac_delim
- HAVE_WCTYPE_H!$HAVE_WCTYPE_H$ac_delim
- WCTYPE_H!$WCTYPE_H$ac_delim
-@@ -37105,7 +37691,7 @@ gl_LIBOBJS!$gl_LIBOBJS$ac_delim
- gl_LTLIBOBJS!$gl_LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 34; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -37555,8 +38141,9 @@ echo "$as_me: executing $ac_file command
-   # some people rename them; so instead we look at the file content.
-   # Grep'ing the first line is not enough: some people post-process
-   # each Makefile.in and add a new line on top of each file to say so.
--  # So let's grep whole file.
--  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+  # Grep'ing the whole file is not good either: AIX grep has a line
-+  # limit of 2048, but all sed's we know have understand at least 4000.
-+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-     dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$mf" : 'X\(//\)[^/]' \| \
-diff -up tar-1.19/src/Makefile.in.xattrs-conf tar-1.19/src/Makefile.in
---- tar-1.19/src/Makefile.in.xattrs-conf	2007-10-10 13:00:21.000000000 +0200
-+++ tar-1.19/src/Makefile.in	2007-12-17 11:47:13.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -20,17 +20,11 @@
- # 2007 Free Software Foundation, Inc.
- 
- 
--SOURCES = $(tar_SOURCES)
--
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -100,34 +94,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \
- 	$(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \
- 	$(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \
--	$(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/sleep.m4 \
--	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \
--	$(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \
--	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \
--	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
--	$(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \
--	$(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \
--	$(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \
--	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
--	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
--	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
--	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
--	$(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \
--	$(top_srcdir)/m4/sysexits.m4 $(top_srcdir)/m4/system.m4 \
--	$(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/time_h.m4 \
--	$(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timespec.m4 \
--	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd-safer.m4 \
--	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlinkdir.m4 \
--	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \
--	$(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimens.m4 \
--	$(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \
--	$(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vsnprintf.m4 \
--	$(top_srcdir)/m4/wchar.m4 $(top_srcdir)/m4/wchar_t.m4 \
--	$(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wcwidth.m4 \
--	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
--	$(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xsize.m4 \
--	$(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \
--	$(top_srcdir)/configure.ac
-+	$(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/size_max.m4 \
-+	$(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/ssize_t.m4 \
-+	$(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stdarg.m4 \
-+	$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stdint.m4 \
-+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \
-+	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \
-+	$(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \
-+	$(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \
-+	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strndup.m4 \
-+	$(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtoimax.m4 \
-+	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-+	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-+	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/sys_stat_h.m4 \
-+	$(top_srcdir)/m4/sys_time_h.m4 $(top_srcdir)/m4/sysexits.m4 \
-+	$(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \
-+	$(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \
-+	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-+	$(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \
-+	$(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \
-+	$(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \
-+	$(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
-+	$(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-+	$(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wchar.m4 \
-+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wctype.m4 \
-+	$(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \
-+	$(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
-+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \
-+	$(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
-@@ -141,13 +135,14 @@ am_tar_OBJECTS = buffer.$(OBJEXT) compar
- 	incremen.$(OBJEXT) list.$(OBJEXT) misc.$(OBJEXT) \
- 	names.$(OBJEXT) sparse.$(OBJEXT) system.$(OBJEXT) \
- 	tar.$(OBJEXT) transform.$(OBJEXT) update.$(OBJEXT) \
--	utf8.$(OBJEXT)
-+	utf8.$(OBJEXT) xattrs.$(OBJEXT)
+diff -urNp tar-1.20-orig/src/Makefile.in tar-1.20/src/Makefile.in
+--- tar-1.20-orig/src/Makefile.in	2008-04-14 14:04:00.000000000 +0200
++++ tar-1.20/src/Makefile.in	2008-05-26 18:18:42.000000000 +0200
+@@ -137,7 +137,8 @@ am_tar_OBJECTS = buffer.$(OBJEXT) checkp
+ 	extract.$(OBJEXT) xheader.$(OBJEXT) incremen.$(OBJEXT) \
+ 	list.$(OBJEXT) misc.$(OBJEXT) names.$(OBJEXT) sparse.$(OBJEXT) \
+ 	suffix.$(OBJEXT) system.$(OBJEXT) tar.$(OBJEXT) \
+-	transform.$(OBJEXT) update.$(OBJEXT) utf8.$(OBJEXT)
++	transform.$(OBJEXT) update.$(OBJEXT) utf8.$(OBJEXT) \
++	xattrs.$(OBJEXT)
  tar_OBJECTS = $(am_tar_OBJECTS)
  am__DEPENDENCIES_1 =
  am__DEPENDENCIES_2 = ../lib/libtar.a $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
--tar_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+tar_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
-+	$(am__DEPENDENCIES_1)
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -163,8 +158,6 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
- ALLOCA_H = @ALLOCA_H@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
-@@ -205,8 +198,6 @@ FLOAT_H = @FLOAT_H@
- FNMATCH_H = @FNMATCH_H@
- GETOPT_H = @GETOPT_H@
- GLIBC21 = @GLIBC21@
--GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
--GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
- GMSGFMT = @GMSGFMT@
- GMSGFMT_015 = @GMSGFMT_015@
- GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
-@@ -337,6 +328,7 @@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
- HAVE_WINT_T = @HAVE_WINT_T@
- HAVE__BOOL = @HAVE__BOOL@
- INCLUDE_NEXT = @INCLUDE_NEXT@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -357,6 +349,7 @@ LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -439,9 +432,11 @@ XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -453,6 +448,7 @@ build_alias = @build_alias@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -482,9 +478,12 @@ program_transform_name = @program_transf
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
+@@ -526,7 +527,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -noinst_HEADERS = arith.h common.h tar.h
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
 +noinst_HEADERS = arith.h common.h tar.h xattrs.h
  tar_SOURCES = \
   buffer.c\
-  compare.c\
-@@ -501,11 +500,12 @@ tar_SOURCES = \
+  checkpoint.c\
+@@ -545,11 +546,12 @@ tar_SOURCES = \
   tar.c\
   transform.c\
   update.c\
@@ -1347,25 +858,7 @@ diff -up tar-1.19/src/Makefile.in.xattrs-conf tar-1.19/src/Makefile.in
  all: all-am
  
  .SUFFIXES:
-@@ -541,7 +541,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
-@@ -580,7 +580,7 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS
- 	done; rm -f c$${pid}_.???; exit $$bad
- tar$(EXEEXT): $(tar_OBJECTS) $(tar_DEPENDENCIES) 
- 	@rm -f tar$(EXEEXT)
--	$(LINK) $(tar_LDFLAGS) $(tar_OBJECTS) $(tar_LDADD) $(LIBS)
-+	$(LINK) $(tar_OBJECTS) $(tar_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -603,22 +603,22 @@ distclean-compile:
+@@ -649,6 +651,7 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transform.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/update.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8.Po@am__quote@
@@ -1373,1235 +866,3 @@ diff -up tar-1.19/src/Makefile.in.xattrs-conf tar-1.19/src/Makefile.in
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xheader.Po@am__quote@
  
  .c.o:
--@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
--uninstall-info-am:
- 
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -669,22 +669,21 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -700,7 +699,7 @@ check: check-am
- all-am: Makefile $(PROGRAMS) $(HEADERS)
- installdirs:
- 	for dir in "$(DESTDIR)$(bindir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -748,12 +747,20 @@ info-am:
- 
- install-data-am:
- 
-+install-dvi: install-dvi-am
-+
- install-exec-am: install-binPROGRAMS
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man:
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am: installcheck-binPROGRAMS
- 
- maintainer-clean: maintainer-clean-am
-@@ -773,19 +780,22 @@ ps: ps-am
- 
- ps-am:
- 
--uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-+uninstall-am: uninstall-binPROGRAMS
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- 	clean-generic ctags distclean distclean-compile \
- 	distclean-generic distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-binPROGRAMS \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installcheck-binPROGRAMS \
- 	installdirs maintainer-clean maintainer-clean-generic \
- 	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
--	ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \
--	uninstall-info-am
-+	ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS
- 
- # 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.
-diff -up tar-1.19/Makefile.in.xattrs-conf tar-1.19/Makefile.in
---- tar-1.19/Makefile.in.xattrs-conf	2007-10-10 13:00:22.000000000 +0200
-+++ tar-1.19/Makefile.in	2007-12-17 11:47:13.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,15 +18,11 @@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, 2007 Free
- # Software Foundation, Inc.
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = .
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -40,6 +36,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-+subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/config.hin \
- 	$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
-@@ -47,8 +44,7 @@ DIST_COMMON = README $(am__configure_dep
- 	build-aux/config.guess build-aux/config.rpath \
- 	build-aux/config.sub build-aux/depcomp build-aux/install-sh \
- 	build-aux/mdate-sh build-aux/missing build-aux/mkinstalldirs \
--	build-aux/texinfo.tex
--subdir = .
-+	build-aux/texinfo.tex build-aux/ylwrap
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \
- 	$(top_srcdir)/m4/argmatch.m4 $(top_srcdir)/m4/argp.m4 \
-@@ -101,38 +97,38 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
- 	$(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \
- 	$(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \
- 	$(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \
--	$(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/sleep.m4 \
--	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \
--	$(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \
--	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \
--	$(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \
--	$(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \
--	$(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \
--	$(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \
--	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
--	$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
--	$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
--	$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
--	$(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \
--	$(top_srcdir)/m4/sysexits.m4 $(top_srcdir)/m4/system.m4 \
--	$(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/time_h.m4 \
--	$(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timespec.m4 \
--	$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd-safer.m4 \
--	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlinkdir.m4 \
--	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \
--	$(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimens.m4 \
--	$(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \
--	$(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vsnprintf.m4 \
--	$(top_srcdir)/m4/wchar.m4 $(top_srcdir)/m4/wchar_t.m4 \
--	$(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wcwidth.m4 \
--	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
--	$(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xsize.m4 \
--	$(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \
--	$(top_srcdir)/configure.ac
-+	$(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/size_max.m4 \
-+	$(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/ssize_t.m4 \
-+	$(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stdarg.m4 \
-+	$(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stdint.m4 \
-+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \
-+	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \
-+	$(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \
-+	$(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \
-+	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strndup.m4 \
-+	$(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtoimax.m4 \
-+	$(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \
-+	$(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \
-+	$(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/sys_stat_h.m4 \
-+	$(top_srcdir)/m4/sys_time_h.m4 $(top_srcdir)/m4/sysexits.m4 \
-+	$(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \
-+	$(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \
-+	$(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
-+	$(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \
-+	$(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \
-+	$(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \
-+	$(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
-+	$(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-+	$(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wchar.m4 \
-+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wctype.m4 \
-+	$(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \
-+	$(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
-+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \
-+	$(top_srcdir)/m4/xstrtol.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 \
-- configure.lineno configure.status.lineno
-+ configure.lineno config.status.lineno
- mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES =
-@@ -140,10 +136,13 @@ SOURCES =
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
-@@ -162,8 +161,6 @@ distcleancheck_listfiles = find . -type 
- ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
- ALLOCA_H = @ALLOCA_H@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
-@@ -204,8 +201,6 @@ FLOAT_H = @FLOAT_H@
- FNMATCH_H = @FNMATCH_H@
- GETOPT_H = @GETOPT_H@
- GLIBC21 = @GLIBC21@
--GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
--GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
- GMSGFMT = @GMSGFMT@
- GMSGFMT_015 = @GMSGFMT_015@
- GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
-@@ -336,6 +331,7 @@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
- HAVE_WINT_T = @HAVE_WINT_T@
- HAVE__BOOL = @HAVE__BOOL@
- INCLUDE_NEXT = @INCLUDE_NEXT@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -356,6 +352,7 @@ LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -438,9 +435,11 @@ XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -452,6 +451,7 @@ build_alias = @build_alias@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -481,8 +481,11 @@ program_transform_name = @program_transf
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4
- EXTRA_DIST = ChangeLog.1 PORTS
- SUBDIRS = doc lib rmt src scripts po tests
-@@ -527,7 +530,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
- config.h: stamp-h1
- 	@if test ! -f $@; then \
- 	  rm -f stamp-h1; \
--	  $(MAKE) stamp-h1; \
-+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- 	else :; fi
- 
- stamp-h1: $(srcdir)/config.hin $(top_builddir)/config.status
-@@ -540,7 +543,6 @@ $(srcdir)/config.hin:  $(am__configure_d
- 
- distclean-hdr:
- 	-rm -f config.h stamp-h1
--uninstall-info-am:
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -573,8 +575,7 @@ $(RECURSIVE_TARGETS):
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -682,24 +683,22 @@ distdir: $(DISTFILES)
- 	  exit 1;; \
- 	esac
- 	$(am__remove_distdir)
--	mkdir $(distdir)
--	$(mkdir_p) $(distdir)/build-aux $(distdir)/m4 $(distdir)/po $(distdir)/tests
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	test -d $(distdir) || mkdir $(distdir)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -713,7 +712,7 @@ distdir: $(DISTFILES)
- 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    distdir=`$(am__cd) $(distdir) && pwd`; \
- 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -721,6 +720,8 @@ distdir: $(DISTFILES)
- 	      $(MAKE) $(AM_MAKEFLAGS) \
- 	        top_distdir="$$top_distdir" \
- 	        distdir="$$distdir/$$subdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -731,7 +732,7 @@ distdir: $(DISTFILES)
- 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
--	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- 	|| chmod -R a+r $(distdir)
- dist-gzip: distdir
- 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-@@ -806,7 +807,7 @@ distcheck: dist
- 	$(am__remove_distdir)
- 	@(echo "$(distdir) archives ready for distribution: "; \
- 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
--	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
- distuninstallcheck:
- 	@cd $(distuninstallcheck_dir) \
- 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -876,12 +877,20 @@ info-am:
- 
- install-data-am:
- 
-+install-dvi: install-dvi-recursive
-+
- install-exec-am:
- 
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
- 
- install-man:
- 
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -902,24 +911,25 @@ ps: ps-recursive
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
- 
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+	install-strip
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
--	check-am clean clean-generic clean-recursive ctags \
--	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
--	dist-shar dist-tarZ dist-zip distcheck distclean \
--	distclean-generic distclean-hdr distclean-local \
--	distclean-recursive distclean-tags distcleancheck distdir \
--	distuninstallcheck dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
--	install-strip installcheck installcheck-am installdirs \
--	installdirs-am maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am am--refresh check check-am clean clean-generic \
-+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-+	dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
-+	distclean-generic distclean-hdr distclean-local distclean-tags \
-+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
- 
- 
- dist-hook: 
-diff -up /dev/null tar-1.19/build-aux/ylwrap
---- /dev/null	2007-12-17 10:53:34.527001576 +0100
-+++ tar-1.19/build-aux/ylwrap	2007-12-17 11:46:35.000000000 +0100
-@@ -0,0 +1,223 @@
-+#! /bin/sh
-+# ylwrap - wrapper for lex/yacc invocations.
-+
-+scriptversion=2005-05-14.22
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
-+#   Free Software Foundation, Inc.
-+#
-+# Written by Tom Tromey <tromey@cygnus.com>.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake@gnu.org> or send patches to
-+# <automake-patches@gnu.org>.
-+
-+case "$1" in
-+  '')
-+    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
-+    exit 1
-+    ;;
-+  --basedir)
-+    basedir=$2
-+    shift 2
-+    ;;
-+  -h|--h*)
-+    cat <<\EOF
-+Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
-+
-+Wrapper for lex/yacc invocations, renaming files as desired.
-+
-+  INPUT is the input file
-+  OUTPUT is one file PROG generates
-+  DESIRED is the file we actually want instead of OUTPUT
-+  PROGRAM is program to run
-+  ARGS are passed to PROG
-+
-+Any number of OUTPUT,DESIRED pairs may be used.
-+
-+Report bugs to <bug-automake@gnu.org>.
-+EOF
-+    exit $?
-+    ;;
-+  -v|--v*)
-+    echo "ylwrap $scriptversion"
-+    exit $?
-+    ;;
-+esac
-+
-+
-+# The input.
-+input="$1"
-+shift
-+case "$input" in
-+  [\\/]* | ?:[\\/]*)
-+    # Absolute path; do nothing.
-+    ;;
-+  *)
-+    # Relative path.  Make it absolute.
-+    input="`pwd`/$input"
-+    ;;
-+esac
-+
-+pairlist=
-+while test "$#" -ne 0; do
-+  if test "$1" = "--"; then
-+    shift
-+    break
-+  fi
-+  pairlist="$pairlist $1"
-+  shift
-+done
-+
-+# The program to run.
-+prog="$1"
-+shift
-+# Make any relative path in $prog absolute.
-+case "$prog" in
-+  [\\/]* | ?:[\\/]*) ;;
-+  *[\\/]*) prog="`pwd`/$prog" ;;
-+esac
-+
-+# FIXME: add hostname here for parallel makes that run commands on
-+# other machines.  But that might take us over the 14-char limit.
-+dirname=ylwrap$$
-+trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
-+mkdir $dirname || exit 1
-+
-+cd $dirname
-+
-+case $# in
-+  0) $prog "$input" ;;
-+  *) $prog "$@" "$input" ;;
-+esac
-+ret=$?
-+
-+if test $ret -eq 0; then
-+  set X $pairlist
-+  shift
-+  first=yes
-+  # Since DOS filename conventions don't allow two dots,
-+  # the DOS version of Bison writes out y_tab.c instead of y.tab.c
-+  # and y_tab.h instead of y.tab.h. Test to see if this is the case.
-+  y_tab_nodot="no"
-+  if test -f y_tab.c || test -f y_tab.h; then
-+    y_tab_nodot="yes"
-+  fi
-+
-+  # The directory holding the input.
-+  input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
-+  # Quote $INPUT_DIR so we can use it in a regexp.
-+  # FIXME: really we should care about more than `.' and `\'.
-+  input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
-+
-+  while test "$#" -ne 0; do
-+    from="$1"
-+    # Handle y_tab.c and y_tab.h output by DOS
-+    if test $y_tab_nodot = "yes"; then
-+      if test $from = "y.tab.c"; then
-+    	from="y_tab.c"
-+      else
-+    	if test $from = "y.tab.h"; then
-+    	  from="y_tab.h"
-+    	fi
-+      fi
-+    fi
-+    if test -f "$from"; then
-+      # If $2 is an absolute path name, then just use that,
-+      # otherwise prepend `../'.
-+      case "$2" in
-+    	[\\/]* | ?:[\\/]*) target="$2";;
-+    	*) target="../$2";;
-+      esac
-+
-+      # We do not want to overwrite a header file if it hasn't
-+      # changed.  This avoid useless recompilations.  However the
-+      # parser itself (the first file) should always be updated,
-+      # because it is the destination of the .y.c rule in the
-+      # Makefile.  Divert the output of all other files to a temporary
-+      # file so we can compare them to existing versions.
-+      if test $first = no; then
-+	realtarget="$target"
-+	target="tmp-`echo $target | sed s/.*[\\/]//g`"
-+      fi
-+      # Edit out `#line' or `#' directives.
-+      #
-+      # We don't want the resulting debug information to point at
-+      # an absolute srcdir; it is better for it to just mention the
-+      # .y file with no path.
-+      #
-+      # We want to use the real output file name, not yy.lex.c for
-+      # instance.
-+      #
-+      # We want the include guards to be adjusted too.
-+      FROM=`echo "$from" | sed \
-+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-+      TARGET=`echo "$2" | sed \
-+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-+
-+      sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
-+          -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
-+
-+      # Check whether header files must be updated.
-+      if test $first = no; then
-+	if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
-+	  echo "$2" is unchanged
-+	  rm -f "$target"
-+	else
-+          echo updating "$2"
-+          mv -f "$target" "$realtarget"
-+        fi
-+      fi
-+    else
-+      # A missing file is only an error for the first file.  This
-+      # is a blatant hack to let us support using "yacc -d".  If -d
-+      # is not specified, we don't want an error when the header
-+      # file is "missing".
-+      if test $first = yes; then
-+        ret=1
-+      fi
-+    fi
-+    shift
-+    shift
-+    first=no
-+  done
-+else
-+  ret=$?
-+fi
-+
-+# Remove the directory.
-+cd ..
-+rm -rf $dirname
-+
-+exit $ret
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -up tar-1.19/aclocal.m4.xattrs-conf tar-1.19/aclocal.m4
---- tar-1.19/aclocal.m4.xattrs-conf	2007-10-10 12:59:59.000000000 +0200
-+++ tar-1.19/aclocal.m4	2007-12-17 11:47:06.000000000 +0100
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10 -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005  Free Software Foundation, Inc.
-+# 2005, 2006  Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,144 +11,12 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--# isc-posix.m4 serial 2 (gettext-0.11.2)
--dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
--
--# This test replaces the one in autoconf.
--# Currently this macro should have the same name as the autoconf macro
--# because gettext's gettext.m4 (distributed in the automake package)
--# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
--# give these diagnostics:
--#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
--#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
--
--undefine([AC_ISC_POSIX])
--
--AC_DEFUN([AC_ISC_POSIX],
--  [
--    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
--    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
--  ]
--)
--
--# size_max.m4 serial 5
--dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Bruno Haible.
--
--AC_DEFUN([gl_SIZE_MAX],
--[
--  AC_CHECK_HEADERS(stdint.h)
--  dnl First test whether the system already has SIZE_MAX.
--  AC_MSG_CHECKING([for SIZE_MAX])
--  AC_CACHE_VAL([gl_cv_size_max], [
--    gl_cv_size_max=
--    AC_EGREP_CPP([Found it], [
--#include <limits.h>
--#if HAVE_STDINT_H
--#include <stdint.h>
--#endif
--#ifdef SIZE_MAX
--Found it
--#endif
--], gl_cv_size_max=yes)
--    if test -z "$gl_cv_size_max"; then
--      dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
--      dnl than the type 'unsigned long'. Try hard to find a definition that can
--      dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
--      _AC_COMPUTE_INT([sizeof (size_t) * CHAR_BIT - 1], size_t_bits_minus_1,
--        [#include <stddef.h>
--#include <limits.h>], size_t_bits_minus_1=)
--      _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
--        [#include <stddef.h>], fits_in_uint=)
--      if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
--        if test $fits_in_uint = 1; then
--          dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
--          dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
--          AC_TRY_COMPILE([#include <stddef.h>
--            extern size_t foo;
--            extern unsigned long foo;
--            ], [], fits_in_uint=0)
--        fi
--        dnl We cannot use 'expr' to simplify this expression, because 'expr'
--        dnl works only with 'long' integers in the host environment, while we
--        dnl might be cross-compiling from a 32-bit platform to a 64-bit platform.
--        if test $fits_in_uint = 1; then
--          gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
--        else
--          gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
--        fi
--      else
--        dnl Shouldn't happen, but who knows...
--        gl_cv_size_max='((size_t)~(size_t)0)'
--      fi
--    fi
--  ])
--  AC_MSG_RESULT([$gl_cv_size_max])
--  if test "$gl_cv_size_max" != yes; then
--    AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max],
--      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
--  fi
--])
-+m4_if(m4_PACKAGE_VERSION, [2.61],,
-+[m4_fatal([this file was generated for autoconf 2.61.
-+You have another version of autoconf.  If you want to use that,
-+you should regenerate the build system entirely.], [63])])
- 
--# ulonglong.m4 serial 6
--dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Paul Eggert.
--
--# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
--# This fixes a bug in Autoconf 2.60, but can be removed once we
--# assume 2.61 everywhere.
--
--# Note: If the type 'unsigned long long int' exists but is only 32 bits
--# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
--# will not be defined. In this case you can treat 'unsigned long long int'
--# like 'unsigned long int'.
--
--AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
--[
--  AC_CACHE_CHECK([for unsigned long long int],
--    [ac_cv_type_unsigned_long_long_int],
--    [AC_LINK_IFELSE(
--       [AC_LANG_PROGRAM(
--	  [[unsigned long long int ull = 18446744073709551615ULL;
--	    typedef int a[(18446744073709551615ULL <= (unsigned long long int) -1
--			   ? 1 : -1)];
--	   int i = 63;]],
--	  [[unsigned long long int ullmax = 18446744073709551615ull;
--	    return (ull << 63 | ull >> 63 | ull << i | ull >> i
--		    | ullmax / ull | ullmax % ull);]])],
--       [ac_cv_type_unsigned_long_long_int=yes],
--       [ac_cv_type_unsigned_long_long_int=no])])
--  if test $ac_cv_type_unsigned_long_long_int = yes; then
--    AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1,
--      [Define to 1 if the system has the type `unsigned long long int'.])
--  fi
--])
--
--# This macro is obsolescent and should go away soon.
--AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
--[
--  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
--  ac_cv_type_unsigned_long_long=$ac_cv_type_unsigned_long_long_int
--  if test $ac_cv_type_unsigned_long_long = yes; then
--    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
--      [Define if you have the 'unsigned long long' type.])
--  fi
--])
--
--# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -158,14 +26,29 @@ AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG]
- # ----------------------------
- # Automake X.Y traces this macro to ensure aclocal.m4 has been
- # generated from the m4 files accompanying Automake X.Y.
--AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+# (This private macro should not be called outside this file.)
-+AC_DEFUN([AM_AUTOMAKE_VERSION],
-+[am__api_version='1.10'
-+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.10], [],
-+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-+])
-+
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too.  Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
- 
- # AM_SET_CURRENT_AUTOMAKE_VERSION
- # -------------------------------
--# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.9.5])])
-+[AM_AUTOMAKE_VERSION([1.10])dnl
-+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
- 
- # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
-@@ -222,14 +105,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
- 
- # AM_CONDITIONAL                                            -*- Autoconf -*-
- 
--# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- 
--# serial 7
-+# serial 8
- 
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
-@@ -238,8 +121,10 @@ AC_DEFUN([AM_CONDITIONAL],
- [AC_PREREQ(2.52)dnl
-  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
- 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
--AC_SUBST([$1_TRUE])
--AC_SUBST([$1_FALSE])
-+AC_SUBST([$1_TRUE])dnl
-+AC_SUBST([$1_FALSE])dnl
-+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
- if $2; then
-   $1_TRUE=
-   $1_FALSE='#'
-@@ -253,15 +138,14 @@ AC_CONFIG_COMMANDS_PRE(
- Usually this means the macro was only invoked conditionally.]])
- fi])])
- 
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- 
--# serial 8
-+# serial 9
- 
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
-@@ -289,6 +173,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
- ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
- 
-@@ -354,6 +239,7 @@ AC_CACHE_CHECK([dependency style of $dep
-        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-          >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-@@ -406,7 +292,8 @@ if test "x$enable_dependency_tracking" !
-   AMDEPBACKSLASH='\'
- fi
- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])
-+AC_SUBST([AMDEPBACKSLASH])dnl
-+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
- ])
- 
- # Generate code to set up dependency tracking.              -*- Autoconf -*-
-@@ -431,8 +318,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
-   # some people rename them; so instead we look at the file content.
-   # Grep'ing the first line is not enough: some people post-process
-   # each Makefile.in and add a new line on top of each file to say so.
--  # So let's grep whole file.
--  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+  # Grep'ing the whole file is not good either: AIX grep has a line
-+  # limit of 2048, but all sed's we know have understand at least 4000.
-+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-     dirpart=`AS_DIRNAME("$mf")`
-   else
-     continue
-@@ -479,8 +367,8 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
- 
- # Do all the work for Automake.                             -*- Autoconf -*-
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -503,16 +391,20 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
- # arguments mandatory, and then we can depend on a new Autoconf
- # release and drop the old call support.
- AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.58])dnl
-+[AC_PREREQ([2.60])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
- AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
--# test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" &&
--   test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+  # is not polluted with repeated "-I."
-+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-+  # test to see if srcdir already configured
-+  if test -f $srcdir/config.status; then
-+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+  fi
- fi
- 
- # test whether we have cygpath
-@@ -532,6 +424,9 @@ m4_ifval([$2],
-  AC_SUBST([PACKAGE], [$1])dnl
-  AC_SUBST([VERSION], [$2])],
- [_AM_SET_OPTIONS([$1])dnl
-+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
- 
-@@ -567,6 +462,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                   [_AM_DEPENDENCIES(CXX)],
-                   [define([AC_PROG_CXX],
-                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-+                  [_AM_DEPENDENCIES(OBJC)],
-+                  [define([AC_PROG_OBJC],
-+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
- ])
- ])
- 
-@@ -602,7 +501,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1
- # Define $install_sh.
- AC_DEFUN([AM_PROG_INSTALL_SH],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
- AC_SUBST(install_sh)])
- 
- # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-@@ -678,13 +577,14 @@ AC_MSG_RESULT([$_am_result])
- rm -f confinc confmf
- ])
- 
--# Copyright (C) 1999, 2000, 2001, 2003, 2005  Free Software Foundation, Inc.
-+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- 
--# serial 3
-+# serial 5
- 
- # AM_PROG_CC_C_O
- # --------------
-@@ -692,6 +592,7 @@ rm -f confinc confmf
- 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
-@@ -704,18 +605,22 @@ if eval "test \"`echo '$ac_cv_prog_cc_'$
-    # 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])])
- ])
- 
- # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
- 
--# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- 
--# serial 4
-+# serial 5
- 
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
-@@ -731,6 +636,7 @@ AC_SUBST($1)])
- # If it does, set am_missing_run to use it, otherwise, to nothing.
- AC_DEFUN([AM_MISSING_HAS_RUN],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([missing])dnl
- test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
- # Use eval to expand $SHELL
- if eval "$MISSING --run true"; then
-@@ -741,7 +647,7 @@ else
- fi
- ])
- 
--# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -749,60 +655,23 @@ fi
- 
- # AM_PROG_MKDIR_P
- # ---------------
--# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--#
--# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
--# created by `make install' are always world readable, even if the
--# installer happens to have an overly restrictive umask (e.g. 077).
--# This was a mistake.  There are at least two reasons why we must not
--# use `-m 0755':
--#   - it causes special bits like SGID to be ignored,
--#   - it may be too restrictive (some setups expect 775 directories).
--#
--# Do not use -m 0755 and let people choose whatever they expect by
--# setting umask.
--#
--# We cannot accept any implementation of `mkdir' that recognizes `-p'.
--# Some implementations (such as Solaris 8's) are not thread-safe: if a
--# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
--# concurrently, both version can detect that a/ is missing, but only
--# one can create it and the other will error out.  Consequently we
--# restrict ourselves to GNU make (using the --version option ensures
--# this.)
-+# Check for `mkdir -p'.
- AC_DEFUN([AM_PROG_MKDIR_P],
--[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
--  # We used to keeping the `.' as first argument, in order to
--  # allow $(mkdir_p) to be used without argument.  As in
--  #   $(mkdir_p) $(somedir)
--  # where $(somedir) is conditionally defined.  However this is wrong
--  # for two reasons:
--  #  1. if the package is installed by a user who cannot write `.'
--  #     make install will fail,
--  #  2. the above comment should most certainly read
--  #     $(mkdir_p) $(DESTDIR)$(somedir)
--  #     so it does not work when $(somedir) is undefined and
--  #     $(DESTDIR) is not.
--  #  To support the latter case, we have to write
--  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
--  #  so the `.' trick is pointless.
--  mkdir_p='mkdir -p --'
--else
--  # On NextStep and OpenStep, the `mkdir' command does not
--  # recognize any option.  It will interpret all options as
--  # directories to create, and then abort because `.' already
--  # exists.
--  for d in ./-p ./--version;
--  do
--    test -d $d && rmdir $d
--  done
--  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
--  if test -f "$ac_aux_dir/mkinstalldirs"; then
--    mkdir_p='$(mkinstalldirs)'
--  else
--    mkdir_p='$(install_sh) -d'
--  fi
--fi
--AC_SUBST([mkdir_p])])
-+[AC_PREREQ([2.60])dnl
-+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-+dnl while keeping a definition of mkdir_p for backward compatibility.
-+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-+dnl adjustment using top_builddir (which is defined more often than
-+dnl MKDIR_P).
-+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-+case $mkdir_p in
-+  [[\\/$]]* | ?:[[\\/]]*) ;;
-+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+])
- 
- # Helper functions for option handling.                     -*- Autoconf -*-
- 
-@@ -931,9 +800,21 @@ dnl Don't test for $cross_compiling = ye
- if test "$cross_compiling" != no; then
-   AC_CHECK_TOOL([STRIP], [strip], :)
- fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
- AC_SUBST([INSTALL_STRIP_PROGRAM])])
- 
-+# Copyright (C) 2006  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# _AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-+# This macro is traced by Automake.
-+AC_DEFUN([_AM_SUBST_NOTMAKE])
-+
- # Check how to create a tarball.                            -*- Autoconf -*-
- 
- # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-@@ -1128,6 +1009,7 @@ m4_include([m4/safe-write.m4])
- m4_include([m4/save-cwd.m4])
- m4_include([m4/savedir.m4])
- m4_include([m4/setenv.m4])
-+m4_include([m4/size_max.m4])
- m4_include([m4/sleep.m4])
- m4_include([m4/ssize_t.m4])
- m4_include([m4/stat-time.m4])
diff --git a/tar-1.19-xattrs.patch b/tar-1.19-xattrs.patch
index bf44d9e..56d8b30 100644
--- a/tar-1.19-xattrs.patch
+++ b/tar-1.19-xattrs.patch
@@ -13,7 +13,7 @@ diff -up tar-1.17/configure.ac.xattrs tar-1.17/configure.ac
 @@ -88,6 +88,13 @@ gl_INIT
  tar_PAXUTILS
  
- AC_CHECK_FUNCS(fsync getdtablesize lstat mkfifo readlink strerror symlink setlocale utimes)
+ AC_CHECK_FUNCS(fsync getdtablesize lstat mkfifo readlink symlink setlocale utimes)
 +AC_CHECK_FUNCS(getxattr  fgetxattr  lgetxattr \
 +               setxattr  fsetxattr  lsetxattr \
 +               listxattr flistxattr llistxattr,
diff --git a/tar.spec b/tar.spec
index 80e9ef7..13dadb5 100644
--- a/tar.spec
+++ b/tar.spec
@@ -1,8 +1,8 @@
 Summary: A GNU file archiving program
 Name: tar
 Epoch: 2
-Version: 1.19
-Release: 3%{?dist}
+Version: 1.20
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -14,7 +14,6 @@ Patch2: tar-1.15.1-vfatTruncate.patch
 Patch3: tar-1.19-xattrs.patch
 Patch4: tar-1.19-xattrs-conf.patch
 Patch5: tar-1.17-wildcards.patch
-Patch6: tar-1.19-gcc43.patch
 Prereq: info
 BuildRequires: autoconf automake gzip texinfo gettext libacl-devel libselinux-devel gawk
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -40,7 +39,6 @@ the rmt package.
 %patch3 -p1 -b .xattrs
 %patch4 -p1 -b .xattrs-conf
 %patch5 -p1 -b .wildcards
-%patch6 -p1 -b .gcc43
 
 %build
 %configure --bindir=/bin --libexecdir=/sbin
@@ -91,6 +89,12 @@ fi
 %{_infodir}/tar.info*
 
 %changelog
+* Mon May 26 2008 Ondrej Vasik <ovasik@redhat.com> 2:1.20-1
+- new upstream release 1.20 (lzma support, few new options
+  and bugfixes)
+- heavily modified xattrs patches(as tar-1.20 now uses automake
+  1.10.1)
+
 * Tue Feb 12 2008 Radek Brich <rbrich@redhat.com> 2:1.19-3
 - do not print getfilecon/setfilecon warnings when SELinux is disabled
   or SELinux data are not available (bz#431879)