PR#17: Rebase to version 1.35 - rpms/tar

rpms / tar

#17 Rebase to version 1.35

Merged 10 months ago by ljavorsk. Opened 10 months ago by ljavorsk.

rpms/ ljavorsk/tar rawhide into rawhide

Add exclude17 and exclude18 tests which were forgotten

Lukas Javorsky • 10 months ago

7025c42

Rebase to version 1.35

Lukas Javorsky • 10 months ago

d354596

sources

file modified

+2 -2

		`@@ -1,2 +1,2 @@`
		`- SHA512 (tar-1.34.tar.xz) = 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902`
		`- SHA512 (tar-1.34.tar.xz.sig) = 55297f41549deee511f5b14c6b5dc7bb3d9282dad52bcc85f9dddfad24b677f989ba86387ad9b133c3698feedbd6b6cd7e9f005e8e4c89f72c80543eeceb78f7`
		`+ SHA512 (tar-1.35.tar.xz) = 8b84ed661e6c878fa33eb5c1808d20351e6f40551ac63f96014fb0d0b9c72d5d94d8865d39e36bcb184fd250f84778a3b271bbd8bd2ceb69eece0c3568577510`
		`+ SHA512 (tar-1.35.tar.xz.sig) = 00e5c95bf8015f75f59556a82ed7f50bddefe89754c7ff3c19411aee2f37626a5d65c33e18b87f7f8f96388d3f175fd095917419a3ad1c0fc9d6188088bac944`

tar-1.28-atime-rofs.patch

file modified

+7 -7

		`@@ -1,6 +1,6 @@`
		`- From 71769b9ea3c12b7fbb39fee2e9f4a4c1c36c0d0b Mon Sep 17 00:00:00 2001`
		`- From: rpm-build <rpm-build>`
		`- Date: Mon, 28 Jul 2014 08:13:31 +0200`
		`+ From c4d06365aef1539853e1dd41c539173809760cd0 Mon Sep 17 00:00:00 2001`
		`+ From: Lukas Javorsky <ljavorsk@redhat.com>`
		`+ Date: Tue, 18 Jul 2023 12:27:38 +0000`
		`Subject: [PATCH 4/9] utime & read-only FS`

		`Ignore errors from setting utime() for source file on read-only`
		`@@ -16,13 +16,13 @@`
		`1 file changed, 2 insertions(+), 1 deletion(-)`

		`diff --git a/src/create.c b/src/create.c`
		`- index e2f4ede..f644f23 100644`
		`+ index d20178c..b31fbe5 100644`
		`--- a/src/create.c`
		`+++ b/src/create.c`
		`- @@ -1824,7 +1824,8 @@ dump_file0 (struct tar_stat_info st, char const name, char const *p)`
		`+ @@ -1851,7 +1851,8 @@ dump_file0 (struct tar_stat_info st, char const name, char const *p)`
		`}`
		`else if (atime_preserve_option == replace_atime_preserve`
		`- && fd && (is_dir \|\| original_size != 0)`
		`+ && timespec_cmp (st->atime, get_stat_atime (&st2)) != 0`
		`- && set_file_atime (fd, parentfd, name, st->atime) != 0)`
		`+ && set_file_atime (fd, parentfd, name, st->atime) != 0`
		`+ && errno != EROFS )`
		`@@ -30,5 +30,5 @@`
		`}`

		`--`
		`- 1.9.3`
		`+ 2.41.0`

tar-1.30-CVE-2022-48303.patch

file removed

-30

		`@@ -1,30 +0,0 @@`
		`- From 3da78400eafcccb97e2f2fd4b227ea40d794ede8 Mon Sep 17 00:00:00 2001`
		`- From: Sergey Poznyakoff <gray@gnu.org>`
		`- Date: Sat, 11 Feb 2023 11:57:39 +0200`
		`- Subject: [PATCH] Fix boundary checking in base-256 decoder`
		`-`
		`- * src/list.c (from_header): Base-256 encoding is at least 2 bytes`
		`- long.`
		`- ---`
		`- src/list.c \| 5 +++--`
		`- 1 file changed, 3 insertions(+), 2 deletions(-)`
		`-`
		`- diff --git a/src/list.c b/src/list.c`
		`- index 9fafc425..86bcfdd1 100644`
		`- --- a/src/list.c`
		`- +++ b/src/list.c`
		`- @@ -881,8 +881,9 @@ from_header (char const where0, size_t digs, char const type,`
		`- where++;`
		`- }`
		`- }`
		`- - else if (where == '\200' / positive base-256 */`
		`- - \|\| where == '\377' / negative base-256 */)`
		`- + else if (where <= lim - 2`
		`- + && (where == '\200' / positive base-256 */`
		`- + \|\| where == '\377' / negative base-256 */))`
		`- {`
		`- /* Parse base-256 output. A nonnegative number N is`
		`- represented as (256**DIGS)/2 + N; a negative number -N is`
		`- --`
		`- 2.38.1`
		`-`

tar-1.35-add-forgotten-tests-from-upstream.patch

file added

+156

		`@@ -0,0 +1,156 @@`
		`+ From 7fac753fb6e6c0459788ee9015b984dba1de5402 Mon Sep 17 00:00:00 2001`
		`+ From: Lukas Javorsky <ljavorsk@redhat.com>`
		`+ Date: Tue, 18 Jul 2023 14:10:12 +0000`
		`+ Subject: [PATCH] Add exclude17 and exclude18 tests which were forgotten by`
		`+ upstream`
		`+`
		`+ Sources:`
		`+ *https://git.savannah.gnu.org/cgit/tar.git/tree/tests/exclude17.at`
		`+ *https://git.savannah.gnu.org/cgit/tar.git/tree/tests/exclude18.at`
		`+`
		`+ Repoted to upstream in ML:`
		`+ *https://lists.gnu.org/archive/html/bug-tar/2023-07/msg00002.html`
		`+ ---`
		`+ tests/exclude17.at \| 35 +++++++++++++++++++`
		`+ tests/exclude18.at \| 87 ++++++++++++++++++++++++++++++++++++++++++++++`
		`+ 2 files changed, 122 insertions(+)`
		`+ create mode 100644 tests/exclude17.at`
		`+ create mode 100644 tests/exclude18.at`
		`+`
		`+ diff --git a/tests/exclude17.at b/tests/exclude17.at`
		`+ new file mode 100644`
		`+ index 0000000..5539ef3`
		`+ --- /dev/null`
		`+ +++ b/tests/exclude17.at`
		`+ @@ -0,0 +1,35 @@`
		`+ +# Process this file with autom4te to create testsuite. -- Autotest --`
		`+ +#`
		`+ +# Test suite for GNU tar.`
		`+ +# Copyright 2013-2023 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/>.`
		`+ +`
		`+ +AT_SETUP([--exclude-vcs-ignores memory allocation])`
		`+ +AT_KEYWORDS([exclude exclude17])`
		`+ +`
		`+ +AT_TAR_CHECK([`
		`+ +mkdir dir`
		`+ +cd dir`
		`+ +echo '*.o' >.cvsignore`
		`+ +tar -cf - --exclude-vcs-ignores . \| tar -tf -`
		`+ +],`
		`+ +[0],`
		`+ +[./`
		`+ +./.cvsignore`
		`+ +])`
		`+ +`
		`+ +AT_CLEANUP`
		`+ diff --git a/tests/exclude18.at b/tests/exclude18.at`
		`+ new file mode 100644`
		`+ index 0000000..64aaa52`
		`+ --- /dev/null`
		`+ +++ b/tests/exclude18.at`
		`+ @@ -0,0 +1,87 @@`
		`+ +# Process this file with autom4te to create testsuite. -- Autotest --`
		`+ +`
		`+ +# Test suite for GNU tar.`
		`+ +# Copyright 2004-2023 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/>.`
		`+ +`
		`+ +# Test --exclude-vcs option with subcommands: EXTRACT, LIST, DIFF.`
		`+ +# Check VCS directory with files, and empty.`
		`+ +#`
		`+ +# Ref: https://savannah.gnu.org/bugs/?62859`
		`+ +# Wed 03 Aug 2022 04:06:28 PM UTC, original submission: Quote`
		`+ +# Mohamed Akram <mohdakram>`
		`+ +# > The --exclude-vcs flag seems to exclude .gitignore but not .git when`
		`+ +# extracting.`
		`+ +`
		`+ +AT_SETUP([--exclude-vcs extract list compare])`
		`+ +AT_KEYWORDS([exclude-vcs extract list compare exclude18])`
		`+ +`
		`+ +AT_TAR_CHECK([`
		`+ +AT_SORT_PREREQ`
		`+ +mkdir gitrepo`
		`+ +cd gitrepo`
		`+ +`
		`+ +# Make an empty VCS directory:`
		`+ +mkdir .svn`
		`+ +`
		`+ +# Make a VCS directory with a file:`
		`+ +mkdir .git`
		`+ +touch .git/_A`
		`+ +`
		`+ +# Make a VCS file:`
		`+ +touch .gitignore`
		`+ +`
		`+ +# Make non-VCS files:`
		`+ +touch .git_B`
		`+ +touch _C`
		`+ +`
		`+ +# Create an archive, include VCS:`
		`+ +cd ..`
		`+ +tar -cf gitrepo.tar gitrepo`
		`+ +rm -r gitrepo`
		`+ +`
		`+ +echo Extract:`
		`+ +tar -xvf gitrepo.tar --exclude-vcs \| sort`
		`+ +`
		`+ +echo`
		`+ +echo List:`
		`+ +tar -tf gitrepo.tar --exclude-vcs \| sort`
		`+ +`
		`+ +echo`
		`+ +echo Diff:`
		`+ +tar -dvf gitrepo.tar --exclude-vcs gitrepo \| sort`
		`+ +`
		`+ +],`
		`+ +[0],`
		`+ +[Extract:`
		`+ +gitrepo/`
		`+ +gitrepo/.git_B`
		`+ +gitrepo/_C`
		`+ +`
		`+ +List:`
		`+ +gitrepo/`
		`+ +gitrepo/.git_B`
		`+ +gitrepo/_C`
		`+ +`
		`+ +Diff:`
		`+ +gitrepo/`
		`+ +gitrepo/.git_B`
		`+ +gitrepo/_C`
		`+ +],`
		`+ +[])`
		`+ +`
		`+ +AT_CLEANUP`
		`+ --`
		`+ 2.41.0`
		`+`

tar-configure-c99.patch

file removed

-45

		`@@ -1,45 +0,0 @@`
		`- Avoid an implicit declaration of utime in the configure script. This`
		`- ensures that the package continues to build with future compilers`
		`- which do not support such implicit declarations by default.`
		`-`
		`- This is a downstream-only patch. Upstream, the configure file is`
		`- generated correctly since the following gnulib commit:`
		`-`
		`- commit c20ba6929e5ac4a9cc72cd2b1f2d938e219adb01`
		`- Author: Bruno Haible <bruno@clisp.org>`
		`- Date: Sat Jan 23 22:10:25 2021 +0100`
		`-`
		`- utime: Fix configure test (regression 2020-12-04).`
		`-`
		`- Reported by Ryan Schmidt <wget@ryandesign.com> via Tim Rühsen in`
		`- <https://lists.gnu.org/archive/html/bug-gnulib/2021-01/msg00282.html>.`
		`-`
		`- * m4/utime.m4 (gl_FUNC_UTIME): In the test program, include <utime.h>,`
		`- not <time.h>.`
		`-`
		`- diff --git a/configure b/configure`
		`- index 129500e018d38aa5..7ed132239c78d2ac 100755`
		`- --- a/configure`
		`- +++ b/configure`
		`- @@ -36685,7 +36685,7 @@ else`
		`- cat confdefs.h - <<_ACEOF >conftest.$ac_ext`
		`- /* end confdefs.h. */`
		`- #include <stddef.h>`
		`- - #include <time.h>`
		`- +#include <utime.h>`
		`-`
		`- int`
		`- main ()`
		`- diff --git a/m4/utime.m4 b/m4/utime.m4`
		`- index 03df7b7282500c73..bdff29d85982cd68 100644`
		`- --- a/m4/utime.m4`
		`- +++ b/m4/utime.m4`
		`- @@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_UTIME],`
		`- AC_RUN_IFELSE(`
		`- [AC_LANG_PROGRAM(`
		`- [[#include <stddef.h>`
		`- - #include <time.h>`
		`- + #include <utime.h>`
		`- ]],`
		`- [[int result = 0;`
		`- if (!utime ("conftest.tmp/", NULL))`

tar.spec

file modified

+6 -4

		`@@ -9,8 +9,8 @@`
		`Summary: GNU file archiving program`
		`Name: tar`
		`Epoch: 2`
		`- Version: 1.34`
		`- Release: 9%{?dist}`
		`+ Version: 1.35`
		`+ Release: 1%{?dist}`
		`License: GPL-3.0-or-later`
		`URL: https://www.gnu.org/software/tar/`

		`@@ -24,8 +24,7 @@`
		`Patch4: tar-1.28-atime-rofs.patch`
		`Patch9: tar-1.28-document-exclude-mistakes.patch`
		`Patch10: tar-1.33-fix-capabilities-test.patch`
		`- Patch11: tar-configure-c99.patch`
		`- Patch12: tar-1.30-CVE-2022-48303.patch`
		`+ Patch11: tar-1.35-add-forgotten-tests-from-upstream.patch`

		`BuildRequires: autoconf`
		`BuildRequires: automake`
		`@@ -124,6 +123,9 @@`


		`%changelog`
		`+ * Tue Jul 18 2023 Lukas Javorsky <ljavorsk@redhat.com> - 2:1.35-1`
		`+ - Rebase to version 1.35`
		`+`
		`* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.34-9`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild`

ljavorsk commented 10 months ago

Also adding forgotten exclude17 and exclude18 tests
Reported: https://lists.gnu.org/archive/html/bug-tar/2023-07/msg00002.html

zuul commented 10 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/c1b94053338347da81c0b34baae08f3c

check-for-arches : SUCCESS in 2m 03s
check-for-eln : SUCCESS in 18s
eln-rpm-scratch-build : SUCCESS in 16m 24s
rpm-scratch-build : SUCCESS in 16m 44s
rpm-scratch-build-s390x : SUCCESS in 14m 38s (non-voting)
rpm-scratch-build-ppc64le : SUCCESS in 16m 33s (non-voting)
rpm-scratch-build-i686 : SUCCESS in 15m 16s (non-voting)
rpm-scratch-build-aarch64 : SUCCESS in 17m 31s (non-voting)
rpm-linter : SUCCESS in 5m 26s (non-voting)
rpm-rpminspect : FAILURE in 4m 19s (non-voting)
check-for-sti-tests : SUCCESS in 16s
check-for-fmf-tests : SUCCESS in 17s
rpm-install-test : SUCCESS in 4m 25s
rpm-sti-test : FAILURE in 8m 03s
Skipped 1 job

praiskup commented 10 months ago

Looks good to me. Any idea why are the CI badges red?

ljavorsk commented 10 months ago

Need to investigate it, not sure. I won't merge it until I know what is wrong if that's okay with you

ljavorsk commented 10 months ago

[citest]

ljavorsk commented 10 months ago

rpminspect is a known issue: https://pagure.io/fedora-ci/general/issue/421

I've tried to test the tests manually, but the tar-testsuite was not working as it depends on the src.rpm and the test itself needs to be rewritten for Fedora

ljavorsk commented 10 months ago

[citest]

ljavorsk commented 10 months ago

[citest]

rebased onto d354596

10 months ago

zuul commented 10 months ago