Accepting request 705919 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/705919
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tar?expand=0&rev=66

tar-1.31-racy_compress_tests.patch

@@ -1,271 +0,0 @@
-From 9af3ae33108e5a1d281d75d29938fe8c6ffcd218 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Mon, 14 Jan 2019 18:08:21 +0200
-Subject: [PATCH] Fix compression tests
-
-Existing compression tests used tar with compiled-in defaults. However,
-some of the defaults are sure to create archives that are not byte-to-byte
-reproducible (e.g. DEFAULT_ARCHIVE_FORMAT=POSIX, because the name field
-in posix extended headers uses PID of the creating process by default).
-Moreover, some compressors (e.g. gzip) store current timestamp in
-the file header when compressing from stdin, so that using cmp on the
-two created archives as the tests did is error-prone. Another problem
-is that the tests implicitly assumed that tar uses archive suffix to
-recognize its format when extracting, which isn't the case. Finally,
-there's hardly any reason in using sed to create m4 sources, when
-everything can be achieved by m4 itself.
-
-* tests/Makefile.am: Remove generation of compress-*.at files.
-* tests/compress.at.in: Remove.
-* tests/compress.m4: New file.
-* tests/testsuite.at: Include compress.m4, use TAR_CHECK_COMPRESS to
-check compression options.
----
- tests/Makefile.am    | 45 ++---------------------------
- tests/compress.at.in | 67 --------------------------------------------
- tests/compress.m4    | 56 ++++++++++++++++++++++++++++++++++++
- tests/testsuite.at   | 13 +++++----
- 4 files changed, 65 insertions(+), 116 deletions(-)
- delete mode 100644 tests/compress.at.in
- create mode 100644 tests/compress.m4
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 4750acb..a29f626 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -19,7 +19,7 @@
- 
- EXTRA_DIST = $(TESTSUITE_AT) \
-   testsuite package.m4 star/README star/quicktest.sh \
--  compress.at.in
-+  compress.m4
- 
- DISTCLEANFILES       = atconfig $(check_SCRIPTS)
- MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
-@@ -47,6 +47,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
- 
- TESTSUITE_AT = \
-  testsuite.at\
-+ compress.m4\
-  T-cd.at\
-  T-dir00.at\
-  T-dir01.at\
-@@ -70,12 +71,6 @@ TESTSUITE_AT = \
-  chtype.at\
-  comprec.at\
-  comperr.at\
-- compress-zstd.at\
-- compress-xz.at\
-- compress-bzip2.at\
-- compress-gzip.at\
-- compress-lzip.at\
-- compress-lzop.at\
-  delete01.at\
-  delete02.at\
-  delete03.at\
-@@ -277,42 +272,6 @@ TESTSUITE_AT = \
-  selacl01.at\
-  capabs_raw01.at
- 
--CLEANFILES += compress-zstd.at
--compress-zstd.at: compress.at.in
--	$(AM_V_GEN)rm -rf $@ $@-t
--	$(AM_V_at)sed 's/@tool@/zstd/g;s/@suff@/zst/g;s/@suff2@/tzst/g;' \
--	  $(srcdir)/compress.at.in > $@-t && chmod a-w $@-t && mv $@-t $@
--
--CLEANFILES += compress-gzip.at
--compress-gzip.at: compress.at.in
--	$(AM_V_GEN)rm -rf $@ $@-t
--	$(AM_V_at)sed 's/@tool@/gzip/g;s/@suff@/gz/g;s/@suff2@/tgz/g;' \
--	  $(srcdir)/compress.at.in > $@-t && chmod a-w $@-t && mv $@-t $@
--
--CLEANFILES += compress-xz.at
--compress-xz.at: compress.at.in
--	$(AM_V_GEN)rm -rf $@ $@-t
--	$(AM_V_at)sed 's/@tool@/xz/g;s/@suff@/xz/g;s/@suff2@/txz/g;' \
--	  $(srcdir)/compress.at.in > $@-t && chmod a-w $@-t && mv $@-t $@
--
--CLEANFILES += compress-bzip2.at
--compress-bzip2.at: compress.at.in
--	$(AM_V_GEN)rm -rf $@ $@-t
--	$(AM_V_at)sed 's/@tool@/bzip2/g;s/@suff@/bz2/g;s/@suff2@/tbz2/g;' \
--	  $(srcdir)/compress.at.in > $@-t && chmod a-w $@-t && mv $@-t $@
--
--CLEANFILES += compress-lzip.at
--compress-lzip.at: compress.at.in
--	$(AM_V_GEN)rm -rf $@ $@-t
--	$(AM_V_at)sed 's/@tool@/lzip/g;s/@suff@/lz/g;s/@suff2@//g;' \
--	  $(srcdir)/compress.at.in > $@-t && chmod a-w $@-t && mv $@-t $@
--
--CLEANFILES += compress-lzop.at
--compress-lzop.at: compress.at.in
--	$(AM_V_GEN)rm -rf $@ $@-t
--	$(AM_V_at)sed 's/@tool@/lzop/g;s/@suff@/lzo/g;s/@suff2@//g;' \
--	  $(srcdir)/compress.at.in > $@-t && chmod a-w $@-t && mv $@-t $@
--
- distclean-local:
- 	-rm -rf download
- 
-diff --git a/tests/compress.at.in b/tests/compress.at.in
-deleted file mode 100644
-index 91a6af2..0000000
---- a/tests/compress.at.in
-+++ /dev/null
-@@ -1,67 +0,0 @@
--# Process this file with autom4te to create testsuite. -*- Autotest -*-
--
--# Test suite for GNU tar.
--# Copyright 2018-2019 Free Software Foundation, Inc.
--
--# This file is part of GNU tar.
--
--# GNU tar 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 3 of the License, or
--# (at your option) any later version.
--
--# GNU tar 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, see <http://www.gnu.org/licenses/>.
--
--# tar can create/decompress @tool@-compressed tarballs
--
--AT_SETUP([compress: @tool@])
--AT_KEYWORDS([compression @tool@])
--
--unset TAR_OPTIONS
--
--AT_CHECK([
--AT_GZIP_PREREQ([@tool@])
--
--touch empty
--# Create with --@tool@:
--tar --@tool@ -cf - empty 2>err > k.tar.@suff@ || exit 1
--test -s err && exit 1
--tar tf k.tar.@suff@ 2>err > out || exit 1
--test "$(cat out)" = empty || exit 1
--test -s err && exit 1
--
--# Ensure -ac works with an -f-specified .@suff@-suffixed name.
--tar -acf k2.tar.@suff@ empty 2>err > out || exit 1
--cmp k2.tar.@suff@ k.tar.@suff@ || exit 1
--test -s err && exit 1
--
--# Extraction: ensure the .@suff@ suffix is recognized.
--rm -f empty || exit 1
--tar xf k.tar.@suff@ 2>err > out || exit 1
--test -s err && exit 1
--test -f empty || exit 1
--
--if test -n '@suff2@'; then
--  # Extraction: ensure the .@suff2@ suffix is also recognized.
--  mv k.tar.@suff@ k.@suff2@ || exit 1
--  rm -f empty
--  tar xf k.@suff2@ 2>err > out || exit 1
--  test -s err && exit 1
--  test -f empty || exit 1
--else
--  :
--fi
--
--],
--[0],
--[],
--[],
--[],[])
--
--AT_CLEANUP
-diff --git a/tests/compress.m4 b/tests/compress.m4
-new file mode 100644
-index 0000000..1f22632
---- /dev/null
-+++ b/tests/compress.m4
-@@ -0,0 +1,56 @@
-+# This file is part of GNU tar testsuite. -*- Autotest -*-
-+# Copyright 2018-2019 Free Software Foundation, Inc.
-+#
-+# GNU tar 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 3 of the License, or
-+# (at your option) any later version.
-+#
-+# GNU tar 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, see <http://www.gnu.org/licenses/>.
-+
-+dnl TAR_CHECK_COMPRESS(TOOL, SUF[, SUF2])
-+dnl Tests whether tar can create archives using TOOL (i.e. using the --TOOL
-+dnl command line option). SUF and optional SUF2 are suffixes for created
-+dnl archives (without leading dot). Tar should be able to use TOOL to
-+dnl automatically decompress archives with names ending on these suffixes.
-+m4_define([TAR_CHECK_COMPRESS],
-+[AT_SETUP([compress: $1])
-+AT_KEYWORDS([compression compress-$1 $1])
-+
-+AT_CHECK([
-+AT_GZIP_PREREQ($1)
-+unset TAR_OPTIONS
-+
-+touch empty
-+set -e
-+: create with --$1
-+tar --$1 -cf k.tar.$2 empty
-+tar tf k.tar.$2
-+
-+m4_foreach([SUF], m4_quote(m4_shift($@)),
-+[
-+echo testing .SUF
-+tar -acf k2.tar.SUF empty
-+cat k2.tar.SUF | $1 -d > k.SUF.tar
-+tar tf k.SUF.tar
-+])
-+
-+# Extraction: ensure compressed format is correctly recognized
-+rm -f empty
-+tar xf k.tar.$2
-+test -f empty
-+],
-+[0],
-+[empty
-+m4_foreach([SUF],m4_quote(m4_shift($@)),[testing .SUF
-+empty
-+])])
-+
-+AT_CLEANUP
-+])
-diff --git a/tests/testsuite.at b/tests/testsuite.at
-index f751bcf..ce25c96 100644
---- a/tests/testsuite.at
-+++ b/tests/testsuite.at
-@@ -217,13 +217,14 @@ m4_include([opcomp05.at])
- m4_include([opcomp06.at])
- 
- AT_BANNER([Compression])
--m4_include([compress-gzip.at])
--m4_include([compress-bzip2.at])
--m4_include([compress-xz.at])
-+m4_include([compress.m4])
-+TAR_CHECK_COMPRESS(gzip, gz, tgz)
-+TAR_CHECK_COMPRESS(bzip2, bz2, tbz2)
-+TAR_CHECK_COMPRESS(xz, xz, txz)
- dnl: omit lzma, because it would fail due to magic number mismatch
--m4_include([compress-lzip.at])
--m4_include([compress-lzop.at])
--m4_include([compress-zstd.at])
-+TAR_CHECK_COMPRESS(lzip, lz)
-+TAR_CHECK_COMPRESS(lzop, lzo)
-+TAR_CHECK_COMPRESS(zstd, zst, tzst)
- 
- AT_BANNER([Positional options])
- m4_include([positional01.at])
--- 
-2.20.1
-

tar-1.31-tests_dirrem.patch

@@ -1,81 +0,0 @@
-From f86722c34c92f265bc9a20cb171d2fcfeab7d341 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Mon, 14 Jan 2019 12:26:59 +0200
-Subject: [PATCH] Fix expected output in dirrem tests.
-
-In both tests, the "file changed as we read it" warning might be
-produced for dir/sub, depending on the ctime resolution and timing.
-The problem was fixed by 64b43fdf70d82c39eb2ca900cd4f8e49, but regressed
-after e7cd377f7801d42aa8e07addff93d2150666c237, which removed 1 second
-delays between each pair of checkpoints. Since the presense or absense
-of this warning is irrelevant for the test, it is now suppressed.
-
-* tests/dirrem01.at: Suppress the file-changed warning.
-* tests/dirrem02.at: Likewise.
----
- tests/dirrem01.at | 15 ++++++++++-----
- tests/dirrem02.at |  5 +++--
- 2 files changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/tests/dirrem01.at b/tests/dirrem01.at
-index 0a9c9e5..24bf392 100644
---- a/tests/dirrem01.at
-+++ b/tests/dirrem01.at
-@@ -27,9 +27,13 @@
- # it prints a warning and exits with TAREXIT_DIFFERS.
- #
- # This test checks whether this behaviour is mimicked for directories, too.
--
--# Remark: This file is based on 'filerem01.at', which is the test-case for
--# a vanishing file.
-+#
-+# Notes:
-+#   1. This file is based on 'filerem01.at', which is the test-case for
-+#   a vanishing file.
-+#   2. Depending on the stat.st_ctime resolution, the "file changed as we
-+#   read it" warning might be issued for dir/sub. The test takes care to
-+#   suppress it.
- 
- AT_SETUP([directory removed before reading])
- AT_KEYWORDS([create incremental listed dirchange dirrem dirrem01])
-@@ -48,13 +52,14 @@ esac
- 
- genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \
-        tar --blocking-factor=1 -c -f archive.tar \
--       --listed-incremental db -v dir >/dev/null
-+       --listed-incremental db \
-+       --warning=no-file-changed \
-+       -v dir >/dev/null
- ],
- [1],
- [ignore],
- [tar: dir: Directory is new
- tar: dir/sub: Directory is new
--tar: dir/sub: file changed as we read it
- tar: dir/sub: File removed before we read it
- ],[],[],[gnu,posix])
- 
-diff --git a/tests/dirrem02.at b/tests/dirrem02.at
-index c314484..3c63bbe 100644
---- a/tests/dirrem02.at
-+++ b/tests/dirrem02.at
-@@ -45,13 +45,14 @@ esac
- 
- genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \
-        tar --blocking-factor=1 -c -f archive.tar \
--       --listed-incremental db -v dir dir/sub >/dev/null
-+       --listed-incremental db \
-+       --warning=no-file-changed \
-+       -v dir dir/sub >/dev/null
- ],
- [2],
- [ignore],
- [tar: dir: Directory is new
- tar: dir/sub: Directory is new
--tar: dir/sub: file changed as we read it
- tar: dir/sub: Cannot open: No such file or directory
- tar: Exiting with failure status due to previous errors
- ],[],[],[gnu,posix])
--- 
-2.20.1
-

tar-1.31.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:577bd4463eea103bdfc662fc385789e2228dbeb399a1d0b98571ed9ce044f763
-size 2946047

tar-1.31.tar.bz2.sig

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iG4EABECAC4WIQQyX2UMTCtq1YgHMno2ArB/VdDHMgUCXC0H2RAcZ3JheUBnbnUu
-b3JnLnVhAAoJEDYCsH9V0McydREAoI/F9a+XwDVL+FC7kE5xcZp9ZETwAJwMbKr9
-U+J2kZEqlnzS2Ig0f3PTKQ==
-=Ws0e
------END PGP SIGNATURE-----

tar-1.32.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4bb9e08e12e7fa9f11fef544efc85e59ba34538593d9ad38148c7ca2bfbb566
+size 2947264

tar-1.32.tar.bz2.sig

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+
+iG4EABECAC4WIQQyX2UMTCtq1YgHMno2ArB/VdDHMgUCXHFHdRAcZ3JheUBnbnUu
+b3JnLnVhAAoJEDYCsH9V0McyYi0AmgJv/s/nIl4dtt//QEF46p44c74nAJ463o3A
+iLL6xTjoZWJIkvb6ogqoVQ==
+=5Uc2
+-----END PGP SIGNATURE-----

tar.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Mar 25 15:07:06 UTC 2019 - Kristýna Streitová <kstreitova@suse.com>
+
+- update to version 1.32
+  * Fix the use of --checkpoint without explicit --checkpoint-action
+  * Fix extraction with the -U option
+  * Fix iconv usage on BSD-based systems
+  * Fix possible NULL dereference (savannah bug #55369)
+    [bsc#1130496] [CVE-2019-9923]
+  * Improve the testsuite
+- remove tar-1.31-tests_dirrem.patch and 
+  tar-1.31-racy_compress_tests.patch that are no longer needed
+  (applied usptream)
+
 -------------------------------------------------------------------
 Fri Mar 15 13:47:43 UTC 2019 - Cristian Rodríguez <crrodriguez@opensuse.org>
 

tar.spec

@@ -12,14 +12,14 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
 # For correct subpackages docs installation into tar doc directory
 %global _docdir_fmt %{name}
 Name:           tar
-Version:        1.31
+Version:        1.32
 Release:        0
 Summary:        GNU implementation of ((t)ape (ar)chiver)
 License:        GPL-3.0-or-later
@@ -40,8 +40,6 @@ Patch3:         %{name}-ignore_lone_zero_blocks.patch
 #https://bugzilla.opensuse.org/show_bug.cgi?id=918487
 Patch4:         %{name}-recursive--files-from.patch
 Patch5:         add_readme-tests.patch
-Patch6:         tar-1.31-tests_dirrem.patch
-Patch7:         tar-1.31-racy_compress_tests.patch
 BuildRequires:  automake
 BuildRequires:  libacl-devel
 BuildRequires:  libselinux-devel
@@ -114,8 +112,6 @@ it may as well access remote devices or files.
 %patch3 -p1
 #%patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 %define my_cflags -W -Wall -Wpointer-arith -Wstrict-prototypes -Wformat-security -Wno-unused-parameter -fPIE