diff options
| author | Todd Zullinger <tmz@pobox.com> | 2020-12-29 16:09:16 -0500 |
|---|---|---|
| committer | Todd Zullinger <tmz@pobox.com> | 2020-12-29 16:09:16 -0500 |
| commit | 69270d5765c9fa5c6bd1c8aae3f66dfc4e5ac4a2 (patch) | |
| tree | 4c9d015102a53249b07bc1e84da22b710ab3c893 | |
| parent | 4a586edc7e44dba9f0d4ff80acbc59f04096dd1d (diff) | |
| download | cgit_EL6-69270d5765c9fa5c6bd1c8aae3f66dfc4e5ac4a2.tar.gz | |
update tar/zstd patch from upstream
The patch has been accepted. Use the upstream URL as the patch source.
| -rw-r--r-- | 0001-t0107-support-older-and-or-non-GNU-tar.patch | 18 | ||||
| -rw-r--r-- | cgit.spec | 5 |
2 files changed, 15 insertions, 8 deletions
diff --git a/0001-t0107-support-older-and-or-non-GNU-tar.patch b/0001-t0107-support-older-and-or-non-GNU-tar.patch index d6f8053..5a03859 100644 --- a/0001-t0107-support-older-and-or-non-GNU-tar.patch +++ b/0001-t0107-support-older-and-or-non-GNU-tar.patch @@ -1,7 +1,7 @@ -From 5ced6015ebf6251113cece5281cb091933aa0efc Mon Sep 17 00:00:00 2001 +From bd6f5683f6cde4212364354b3139c1d521f40f39 Mon Sep 17 00:00:00 2001 From: Todd Zullinger <tmz@pobox.com> -Date: Sat, 8 Aug 2020 01:26:55 -0400 -Subject: [PATCH] t0107: support older and/or non-GNU tar +Date: Tue, 29 Dec 2020 14:18:01 -0500 +Subject: tests: t0107: support older and/or non-GNU tar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -27,12 +27,13 @@ snapshot creation code does.) listed on the GNU Tar release page. Signed-off-by: Todd Zullinger <tmz@pobox.com> +Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> --- tests/t0107-snapshot.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh -index c164d3e..8ea95ce 100755 +index 89b9159..0811ec4 100755 --- a/tests/t0107-snapshot.sh +++ b/tests/t0107-snapshot.sh @@ -25,7 +25,7 @@ test_expect_success 'verify gzip format' ' @@ -44,7 +45,7 @@ index c164d3e..8ea95ce 100755 ' test_expect_success 'count files' ' -@@ -67,7 +67,7 @@ test_expect_success LZIP 'verify lzip format' ' +@@ -66,7 +66,7 @@ test_expect_success LZIP 'verify lzip format' ' test_expect_success LZIP 'untar' ' rm -rf master && @@ -53,7 +54,7 @@ index c164d3e..8ea95ce 100755 ' test_expect_success LZIP 'count files' ' -@@ -109,7 +109,7 @@ test_expect_success XZ 'verify xz format' ' +@@ -107,7 +107,7 @@ test_expect_success XZ 'verify xz format' ' test_expect_success XZ 'untar' ' rm -rf master && @@ -62,7 +63,7 @@ index c164d3e..8ea95ce 100755 ' test_expect_success XZ 'count files' ' -@@ -151,7 +151,7 @@ test_expect_success ZSTD 'verify zstd format' ' +@@ -148,7 +148,7 @@ test_expect_success ZSTD 'verify zstd format' ' test_expect_success ZSTD 'untar' ' rm -rf master && @@ -71,3 +72,6 @@ index c164d3e..8ea95ce 100755 ' test_expect_success ZSTD 'count files' ' +-- +cgit v1.2.3-11-g984f + @@ -73,7 +73,7 @@ Patch0: cgit-0.9.1-highlightv3.patch # Improve test suite's support for older tar versions # https://lists.zx2c4.com/pipermail/cgit/2020-August/004513.html -Patch1: 0001-t0107-support-older-and-or-non-GNU-tar.patch +Patch1: https://git.zx2c4.com/cgit/patch/?id=bd6f5683f#/0001-t0107-support-older-and-or-non-GNU-tar.patch # Security guys might try to repoquery for this. Provides: bundled(git) = %gitver @@ -231,6 +231,9 @@ make test * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Tue Dec 29 2020 Todd Zullinger <tmz@pobox.com> +- update tar/zstd patch from upstream + * Sat Aug 08 2020 Todd Zullinger <tmz@pobox.com> - improve test suite's use of zstd to decode a tar file |