diff --git a/tar-1.19-xattrs-conf.patch b/tar-1.19-xattrs-conf.patch index e9d270b..1d58db3 100644 --- a/tar-1.19-xattrs-conf.patch +++ b/tar-1.19-xattrs-conf.patch @@ -74,7 +74,7 @@ diff -up tar-1.19/config.hin.xattrs-conf tar-1.19/config.hin --- tar-1.19/config.hin.xattrs-conf 2007-10-10 13:01:17.000000000 +0200 +++ tar-1.19/config.hin 2007-12-17 11:47:38.000000000 +0100 @@ -121,6 +121,9 @@ - includes only if HAVE_ALLOCA_H is defined. */ + */ #undef HAVE_ALLOCA_H +/* Define to 1 if you have the header file. */ @@ -112,8 +112,8 @@ diff -up tar-1.19/config.hin.xattrs-conf tar-1.19/config.hin +/* Define to 1 if you have the `getxattr' function. */ +#undef HAVE_GETXATTR + - /* Define if you have the iconv() function and it works. */ - #undef HAVE_ICONV + /* Define to 1 if you have the header file. */ + #undef HAVE_GRP_H @@ -444,12 +459,27 @@ /* Define to 1 if you have the `lchown' function. */ diff --git a/tar-1.19-xattrs.patch b/tar-1.19-xattrs.patch index 56d8b30..df74919 100644 --- a/tar-1.19-xattrs.patch +++ b/tar-1.19-xattrs.patch @@ -647,15 +647,15 @@ diff -up tar-1.17/src/tar.c.xattrs tar-1.17/src/tar.c + ANCHORED_OPTION, ATIME_PRESERVE_OPTION, BACKUP_OPTION, - CHECKPOINT_OPTION, + CHECK_DEVICE_OPTION, @@ -271,6 +272,7 @@ enum MODE_OPTION, MTIME_OPTION, NEWER_MTIME_OPTION, + NO_ACLS_OPTION, NO_ANCHORED_OPTION, + NO_CHECK_DEVICE_OPTION, NO_DELAY_DIRECTORY_RESTORE_OPTION, - NO_IGNORE_CASE_OPTION, @@ -280,9 +282,11 @@ enum NO_RECURSION_OPTION, NO_SAME_OWNER_OPTION, @@ -1126,7 +1126,7 @@ diff -up tar-1.17/src/Makefile.am.xattrs tar-1.17/src/Makefile.am +noinst_HEADERS = arith.h common.h tar.h xattrs.h tar_SOURCES = \ buffer.c\ - compare.c\ + checkpoint.c\ @@ -37,10 +37,11 @@ tar_SOURCES = \ tar.c\ transform.c\ diff --git a/tar.spec b/tar.spec index 13dadb5..93b1751 100644 --- a/tar.spec +++ b/tar.spec @@ -2,7 +2,7 @@ Summary: A GNU file archiving program Name: tar Epoch: 2 Version: 1.20 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.gnu.org/software/tar/ @@ -89,6 +89,9 @@ fi %{_infodir}/tar.info* %changelog +* Fri Aug 29 2008 Ondrej Vasik 2:1.20-2 +- patch fuzz clean up + * Mon May 26 2008 Ondrej Vasik 2:1.20-1 - new upstream release 1.20 (lzma support, few new options and bugfixes)