diff --git a/tar-ignore_lone_zero_blocks.patch b/tar-ignore_lone_zero_blocks.patch new file mode 100644 index 0000000..265189a --- /dev/null +++ b/tar-ignore_lone_zero_blocks.patch @@ -0,0 +1,29 @@ +Index: tar-1.26/src/list.c +=================================================================== +--- tar-1.26.orig/src/list.c 2011-02-16 23:12:16.000000000 +0100 ++++ tar-1.26/src/list.c 2014-06-11 11:48:38.129824435 +0200 +@@ -212,6 +212,14 @@ read_and (void (*do_something) (void)) + + if (!ignore_zeros_option) + { ++ /* ++ * According to POSIX tar specs, this is wrong, but on the web ++ * there are some tar specs that can trigger this, and some tar ++ * implementations create tars according to that spec. For now, ++ * let's not be pedantic about issuing the warning. ++ */ ++#if 0 ++ + char buf[UINTMAX_STRSIZE_BOUND]; + + status = read_header (¤t_header, ¤t_stat_info, +@@ -221,6 +229,9 @@ read_and (void (*do_something) (void)) + WARNOPT (WARN_ALONE_ZERO_BLOCK, + (0, 0, _("A lone zero block at %s"), + STRINGIFY_BIGINT (current_block_ordinal (), buf))); ++#endif ++ status = read_header (¤t_header, ¤t_stat_info, ++ read_header_auto); + break; + } + status = prev_status; diff --git a/tar.changes b/tar.changes index 8413756..d6c27b9 100644 --- a/tar.changes +++ b/tar.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jul 28 20:01:53 UTC 2014 - vcizek@suse.com + +- don't print lone zero blocks warning (bnc#881863) + * there are many tar implementations around that create invalid + archives with a zero block in the middle + * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=235820 + * added tar-ignore_lone_zero_blocks.patch from Fedora + ------------------------------------------------------------------- Wed Mar 26 17:46:39 UTC 2014 - vcizek@suse.com diff --git a/tar.spec b/tar.spec index de633b2..805422a 100644 --- a/tar.spec +++ b/tar.spec @@ -36,6 +36,10 @@ Patch6: tar-backup-spec-fix-paths.patch Patch7: tar-1.26-remove_O_NONBLOCK.patch Patch8: tar-fix_eternal_loop_in_handle_option.patch Patch10: paxutils-rtapelib_mtget.patch +# don't print warning about zero blocks +# the patch is used in Fedora and Debian +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=235820 +Patch11: tar-ignore_lone_zero_blocks.patch Patch20: add_readme-tests.patch %if 0%{?suse_version} >= %min_suse_ver BuildRequires: help2man @@ -80,6 +84,7 @@ Upstream testsuite for the package %patch7 -p1 %patch8 -p1 %patch10 -p1 +%patch11 -p1 %patch20 -p1 %build