patch fuzz clean up

This commit is contained in:
Ondrej Vasik 2008-08-29 16:02:24 +00:00
parent 045face851
commit 7ba1de606a
3 changed files with 10 additions and 7 deletions

View File

@ -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.xattrs-conf 2007-10-10 13:01:17.000000000 +0200
+++ tar-1.19/config.hin 2007-12-17 11:47:38.000000000 +0100 +++ tar-1.19/config.hin 2007-12-17 11:47:38.000000000 +0100
@@ -121,6 +121,9 @@ @@ -121,6 +121,9 @@
includes <alloca.h> only if HAVE_ALLOCA_H is defined. */ */
#undef HAVE_ALLOCA_H #undef HAVE_ALLOCA_H
+/* Define to 1 if you have the <attr/xattr.h> header file. */ +/* Define to 1 if you have the <attr/xattr.h> 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. */ +/* Define to 1 if you have the `getxattr' function. */
+#undef HAVE_GETXATTR +#undef HAVE_GETXATTR
+ +
/* Define if you have the iconv() function and it works. */ /* Define to 1 if you have the <grp.h> header file. */
#undef HAVE_ICONV #undef HAVE_GRP_H
@@ -444,12 +459,27 @@ @@ -444,12 +459,27 @@
/* Define to 1 if you have the `lchown' function. */ /* Define to 1 if you have the `lchown' function. */

View File

@ -647,15 +647,15 @@ diff -up tar-1.17/src/tar.c.xattrs tar-1.17/src/tar.c
+ ANCHORED_OPTION, + ANCHORED_OPTION,
ATIME_PRESERVE_OPTION, ATIME_PRESERVE_OPTION,
BACKUP_OPTION, BACKUP_OPTION,
CHECKPOINT_OPTION, CHECK_DEVICE_OPTION,
@@ -271,6 +272,7 @@ enum @@ -271,6 +272,7 @@ enum
MODE_OPTION, MODE_OPTION,
MTIME_OPTION, MTIME_OPTION,
NEWER_MTIME_OPTION, NEWER_MTIME_OPTION,
+ NO_ACLS_OPTION, + NO_ACLS_OPTION,
NO_ANCHORED_OPTION, NO_ANCHORED_OPTION,
NO_CHECK_DEVICE_OPTION,
NO_DELAY_DIRECTORY_RESTORE_OPTION, NO_DELAY_DIRECTORY_RESTORE_OPTION,
NO_IGNORE_CASE_OPTION,
@@ -280,9 +282,11 @@ enum @@ -280,9 +282,11 @@ enum
NO_RECURSION_OPTION, NO_RECURSION_OPTION,
NO_SAME_OWNER_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 +noinst_HEADERS = arith.h common.h tar.h xattrs.h
tar_SOURCES = \ tar_SOURCES = \
buffer.c\ buffer.c\
compare.c\ checkpoint.c\
@@ -37,10 +37,11 @@ tar_SOURCES = \ @@ -37,10 +37,11 @@ tar_SOURCES = \
tar.c\ tar.c\
transform.c\ transform.c\

View File

@ -2,7 +2,7 @@ Summary: A GNU file archiving program
Name: tar Name: tar
Epoch: 2 Epoch: 2
Version: 1.20 Version: 1.20
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/Archiving Group: Applications/Archiving
URL: http://www.gnu.org/software/tar/ URL: http://www.gnu.org/software/tar/
@ -89,6 +89,9 @@ fi
%{_infodir}/tar.info* %{_infodir}/tar.info*
%changelog %changelog
* Fri Aug 29 2008 Ondrej Vasik <ovasik@redhat.com> 2:1.20-2
- patch fuzz clean up
* Mon May 26 2008 Ondrej Vasik <ovasik@redhat.com> 2:1.20-1 * Mon May 26 2008 Ondrej Vasik <ovasik@redhat.com> 2:1.20-1
- new upstream release 1.20 (lzma support, few new options - new upstream release 1.20 (lzma support, few new options
and bugfixes) and bugfixes)