rpms/tar
7
0
Fork 0
Code Issues Pull Requests Releases Activity

rediffed to defuzz :(

Browse Source
This commit is contained in:
Ondrej Vasik 2009-03-05 09:07:03 +00:00
parent f7288fe86e
commit 2de9cec649
3 changed files with 779 additions and 1024 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
tar-1.19-xattrs-conf.patch
View File

@ -1,7 +1,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 @@
diff -urNp tar-1.22-orig/config.hin tar-1.22/config.hin
--- tar-1.22-orig/config.hin 2009-03-05 08:08:07.000000000 +0100
+++ tar-1.22/config.hin 2009-03-05 09:57:06.000000000 +0100
@@ -131,6 +131,9 @@
*/
#undef HAVE_ALLOCA_H
@ -11,7 +11,7 @@ diff -up tar-1.19/config.hin.xattrs-conf tar-1.19/config.hin
/* Define to 1 if you have the `btowc' function. */
#undef HAVE_BTOWC
@@ -354,12 +357,21 @@
@@ -372,12 +375,21 @@
/* Define to 1 if you have the <features.h> header file. */
#undef HAVE_FEATURES_H
@ -33,7 +33,7 @@ diff -up tar-1.19/config.hin.xattrs-conf tar-1.19/config.hin
/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
#undef HAVE_FSEEKO
@@ -399,6 +411,9 @@
@@ -423,6 +435,9 @@
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
@ -43,7 +43,7 @@ diff -up tar-1.19/config.hin.xattrs-conf tar-1.19/config.hin
/* Define to 1 if you have the <grp.h> header file. */
#undef HAVE_GRP_H
@@ -444,15 +459,30 @@
@@ -468,15 +483,30 @@
/* Define to 1 if you have the `lchown' function. */
#undef HAVE_LCHOWN
@ -55,10 +55,10 @@ diff -up tar-1.19/config.hin.xattrs-conf tar-1.19/config.hin
+
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
+
+/* Define to 1 if you have the `selinux' library (-lselinux). */
+#undef HAVE_LIBSELINUX
+
/* Define to 1 if you have the <linewrap.h> header file. */
#undef HAVE_LINEWRAP_H
@ -74,7 +74,7 @@ diff -up tar-1.19/config.hin.xattrs-conf tar-1.19/config.hin
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
@@ -462,6 +492,9 @@
@@ -486,6 +516,9 @@
/* Define to 1 if the system has the type `long long int'. */
#undef HAVE_LONG_LONG_INT
@ -84,7 +84,7 @@ diff -up tar-1.19/config.hin.xattrs-conf tar-1.19/config.hin
/* Define to 1 if you have the `lstat' function. */
#undef HAVE_LSTAT
@@ -568,12 +601,18 @@
@@ -589,12 +622,18 @@
/* Define to 1 if you have the <search.h> header file. */
#undef HAVE_SEARCH_H
@ -103,7 +103,7 @@ diff -up tar-1.19/config.hin.xattrs-conf tar-1.19/config.hin
/* Define to 1 if you have the <sgtty.h> header file. */
#undef HAVE_SGTTY_H
@@ -713,6 +752,9 @@
@@ -734,6 +773,9 @@
/* Define to 1 if you have the <sysexits.h> header file. */
#undef HAVE_SYSEXITS_H
@ -113,7 +113,7 @@ diff -up tar-1.19/config.hin.xattrs-conf tar-1.19/config.hin
/* Define to 1 if you have the <sys/bitypes.h> header file. */
#undef HAVE_SYS_BITYPES_H
@@ -861,6 +903,9 @@
@@ -891,6 +933,9 @@
/* Define if utimes works properly. */
#undef HAVE_WORKING_UTIMES
@ -123,10 +123,10 @@ diff -up tar-1.19/config.hin.xattrs-conf tar-1.19/config.hin
/* Define to 1 if the system has the type `_Bool'. */
#undef HAVE__BOOL
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
@@ -1963,6 +1964,9 @@ ac_header_list="$ac_header_list sys/tpri
diff -urNp tar-1.22-orig/configure tar-1.22/configure
--- tar-1.22-orig/configure 2009-03-05 08:05:20.000000000 +0100
+++ tar-1.22/configure 2009-03-05 09:57:06.000000000 +0100
@@ -2127,6 +2127,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"
ac_header_list="$ac_header_list locale.h"
@ -136,7 +136,7 @@ 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"
@@ -5614,7 +5633,14 @@ return strerror ();
@@ -6022,7 +6025,14 @@ return strerror ();
return 0;
}
_ACEOF
@ -152,7 +152,7 @@ diff -up tar-1.19/configure.xattrs-conf tar-1.19/configure
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -5632,25 +5658,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
@@ -6040,25 +6050,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@ -197,7 +197,7 @@ 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; }
@@ -32646,6 +32690,257 @@ _ACEOF
@@ -38773,6 +38793,257 @@ _ACEOF
fi
done
@ -455,7 +455,7 @@ diff -up tar-1.19/configure.xattrs-conf tar-1.19/configure
{ echo "$as_me:$LINENO: checking whether getgrgid is declared" >&5
echo $ECHO_N "checking whether getgrgid is declared... $ECHO_C" >&6; }
if test "${ac_cv_have_decl_getgrgid+set}" = set; then
@@ -34374,6 +34669,296 @@ fi
@@ -40571,6 +40842,296 @@ fi
done
@ -752,10 +752,10 @@ 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
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
diff -urNp tar-1.22-orig/src/Makefile.in tar-1.22/src/Makefile.in
--- tar-1.22-orig/src/Makefile.in 2009-03-05 08:05:26.000000000 +0100
+++ tar-1.22/src/Makefile.in 2009-03-05 09:57:06.000000000 +0100
@@ -143,7 +143,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) \
@ -765,7 +765,7 @@ diff -urNp tar-1.20-orig/src/Makefile.in tar-1.20/src/Makefile.in
tar_OBJECTS = $(am_tar_OBJECTS)
am__DEPENDENCIES_1 =
am__DEPENDENCIES_2 = ../lib/libtar.a $(am__DEPENDENCIES_1) \
@@ -526,7 +527,7 @@ sysconfdir = @sysconfdir@
@@ -653,7 +654,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@ -774,7 +774,7 @@ diff -urNp tar-1.20-orig/src/Makefile.in tar-1.20/src/Makefile.in
tar_SOURCES = \
buffer.c\
checkpoint.c\
@@ -545,11 +546,12 @@ tar_SOURCES = \
@@ -672,11 +673,12 @@ tar_SOURCES = \
tar.c\
transform.c\
update.c\
@ -789,7 +789,7 @@ diff -urNp tar-1.20-orig/src/Makefile.in tar-1.20/src/Makefile.in
all: all-am
.SUFFIXES:
@@ -649,6 +651,7 @@ distclean-compile:
@@ -776,6 +778,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@

1501
tar-1.19-xattrs.patch
View File

File diff suppressed because it is too large Load Diff

246
tar-1.21-testsuite.patch
View File

@ -1,246 +0,0 @@
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Mon, 29 Dec 2008 09:27:00 +0000 (+0000)
Subject: Fix testsuite and bootstrap. Implement -I.
X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=tar.git;a=commitdiff_plain;h=7b68ef3d918603f3afb03e939ba72f5cad10edf4;hp=970f999818a52a107a89697666c54397403c09be
Fix testsuite. Implement -I.
* src/tar.c: Implement -I as a shorthand for --use-compress-program.
* doc/tar.texi: Document -I.
* tests/pipe.at, tests/shortrec.at: Account for eventual 'Record
size' output.
* tests/testsuite.at (AT_TAR_CHECK_HOOK): New define
(AT_TAR_WITH_HOOK, TAR_IGNREC_HOOK): New macros.
---
diff --git a/ChangeLog b/ChangeLog
index 7dd05f8..68fe50a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-29 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ * src/tar.c: Implement -I as a shorthand for --use-compress-program.
+ * doc/tar.texi: Document -I.
+ * tests/pipe.at, tests/shortrec.at: Account for eventual 'Record
+ size' output.
+ * tests/testsuite.at (AT_TAR_CHECK_HOOK): New define
+ (AT_TAR_WITH_HOOK, TAR_IGNREC_HOOK): New macros.
+
2008-11-30 Sergey Poznyakoff <gray@gnu.org.ua>
* src/xheader.c: Remove duplicate inclusion of fnmatch.h. Reported
diff --git a/doc/tar.texi b/doc/tar.texi
index cb8bd19..210639e 100644
--- a/doc/tar.texi
+++ b/doc/tar.texi
@@ -3309,6 +3309,7 @@ name quoting}.
@opsummary{use-compress-program}
@item --use-compress-program=@var{prog}
+@itemx -I=@var{prog}
Instructs @command{tar} to access the archive through @var{prog}, which is
presumed to be a compression program of some sort. @xref{gzip}.
@@ -8570,6 +8571,7 @@ Filter the archive through @command{compress}. Otherwise like @option{--gzip}.
@opindex use-compress-program
@item --use-compress-program=@var{prog}
+@itemx -I=@var{prog}
Use external compression program @var{prog}. Use this option if you
have a compression program that @GNUTAR{} does not support. There
are two requirements to which @var{prog} should comply:
@@ -8608,14 +8610,14 @@ Suppose you name it @file{gpgz} and save it somewhere in your
archive signed with your private key:
@smallexample
-$ @kbd{tar -cf foo.tar.gpgz --use-compress=gpgz .}
+$ @kbd{tar -cf foo.tar.gpgz -Igpgz .}
@end smallexample
@noindent
-Likewise, the following command will list its contents:
+Likewise, the command below will list its contents:
@smallexample
-$ @kbd{tar -tf foo.tar.gpgz --use-compress=gpgz .}
+$ @kbd{tar -tf foo.tar.gpgz -Igpgz .}
@end smallexample
@ignore
diff --git a/src/tar.c b/src/tar.c
index ae0c739..8396ad5 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -323,7 +323,6 @@ enum
TRANSFORM_OPTION,
UNQUOTE_OPTION,
USAGE_OPTION,
- USE_COMPRESS_PROGRAM_OPTION,
UTC_OPTION,
VERSION_OPTION,
VOLNO_FILE_OPTION,
@@ -352,7 +351,7 @@ The version control may be set with --backup or VERSION_CONTROL, values are:\n\n
/* NOTE:
- Available option letters are DEIQY and eqy. Consider the following
+ Available option letters are DEQY and eqy. Consider the following
assignments:
[For Solaris tar compatibility =/= Is it important at all?]
@@ -360,7 +359,6 @@ The version control may be set with --backup or VERSION_CONTROL, values are:\n\n
E use extended headers (--format=posix)
[q alias for --occurrence=1 =/= this would better be used for quiet?]
- [I same as T =/= will harm star compatibility]
y per-file gzip compression
Y per-block gzip compression */
@@ -610,7 +608,7 @@ static struct argp_option options[] = {
N_("filter the archive through lzma"), GRID+1 },
{"lzop", LZOP_OPTION, 0, 0,
N_("filter the archive through lzop"), GRID+8 },
- {"use-compress-program", USE_COMPRESS_PROGRAM_OPTION, N_("PROG"), 0,
+ {"use-compress-program", 'I', N_("PROG"), 0,
N_("filter through PROG (must accept -d)"), GRID+1 },
#undef GRID
@@ -1364,12 +1362,6 @@ parse_opt (int key, char *arg, struct argp_state *state)
ignore_zeros_option = true;
break;
- case 'I':
- USAGE_ERROR ((0, 0,
- _("Warning: the -I option is not supported;"
- " perhaps you meant -j or -T?")));
- break;
-
case 'j':
set_use_compress_program_option ("bzip2");
break;
@@ -1905,7 +1897,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
set_transform_expr (arg);
break;
- case USE_COMPRESS_PROGRAM_OPTION:
+ case 'I':
set_use_compress_program_option (arg);
break;
diff --git a/tests/pipe.at b/tests/pipe.at
index efca65b..be99212 100644
--- a/tests/pipe.at
+++ b/tests/pipe.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# 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
@@ -30,7 +30,8 @@ AT_SETUP([decompressing from stdin])
AT_KEYWORDS([pipe])
-AT_TAR_CHECK([
+AT_TAR_WITH_HOOK([TAR_IGNREC_HOOK],
+[AT_TAR_CHECK([
AT_SORT_PREREQ
mkdir directory
@@ -49,6 +50,7 @@ directory/file1
directory/file2
separator
separator
-])
+],
+[stderr])])
AT_CLEANUP
diff --git a/tests/shortrec.at b/tests/shortrec.at
index 3e009fd..179f365 100644
--- a/tests/shortrec.at
+++ b/tests/shortrec.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
# 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
@@ -23,17 +23,22 @@
# used to create the archive.
AT_SETUP([short records])
-AT_KEYWORDS([shortrec.at])
+AT_KEYWORDS([shortrec])
-AT_TAR_CHECK([
+AT_TAR_WITH_HOOK([TAR_IGNREC_HOOK],
+[AT_TAR_CHECK([
mkdir directory
(cd directory && touch a b c d e f g h i j k l m n o p q r)
-tar -c -b 1 -f - directory | tar -t -f - >/dev/null
+tar -c -b 1 -f - directory | tar -t -f -
tar -c -b 1 -f archive directory
-tar -t -f archive >/dev/null
-tar -t -f - < archive >/dev/null
+tar -t -f archive
+tar -t -f - < archive
rm -r directory
+],
+[0],
+[ignore],
+[stderr])
])
AT_CLEANUP
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 2fa5392..a12477d 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,7 +1,7 @@
# Process this file with autom4te to create testsuite. -*- Autotest -*-
# Test suite for GNU tar.
-# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# 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
@@ -21,6 +21,7 @@
# We need a recent Autotest.
m4_version_prereq([2.52g])
+m4_define([AT_TAR_CHECK_HOOK])
m4_define([AT_TAR_CHECK],[
AT_XFAIL_IF(test -f $[]XFAILFILE)
m4_foreach([FMT],
@@ -33,9 +34,20 @@ export TEST_TAR_FORMAT
TAR_OPTIONS="-H FMT"
export TAR_OPTIONS
rm -rf *
-$1)],$2,$3,$4,$5,$6)])
+$1)],$2,$3,$4,$5,$6)
+ AT_TAR_CHECK_HOOK])
])
+m4_define([AT_TAR_WITH_HOOK],[
+ m4_pushdef([AT_TAR_CHECK_HOOK],[$1])
+ $2
+
+ m4_popdef([AT_TAR_CHECK_HOOK])])
+
+m4_define([TAR_IGNREC_HOOK],[
+ AT_CHECK([grep -v '^.*tar: Record size = ' stderr; exit 0])
+])
+
m4_define([RE_CHECK],[
AT_DATA([$1.re],[$2])
awk '{print NR " " $[]0}' $1 > $[]$.1