gnu: zstd: Update to 1.3.6.
* gnu/packages/compression.scm (zstd): Update to 1.3.6. [source]: Remove merged patches. * gnu/packages/patches/zstd-fix-stdin-list-test.patch, gnu/packages/patches/zstd-fix-stdin-list-without-tty.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them.
This commit is contained in:
Tobias Geerinckx-Rice
parent
65b8d61073
commit
de68ad095d
|
|
@ -1247,9 +1247,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/xinetd-CVE-2013-4342.patch \
|
||||
%D%/packages/patches/xmodmap-asprintf.patch \
|
||||
%D%/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch \
|
||||
%D%/packages/patches/zathura-plugindir-environment-variable.patch \
|
||||
%D%/packages/patches/zstd-fix-stdin-list-without-tty.patch \
|
||||
%D%/packages/patches/zstd-fix-stdin-list-test.patch
|
||||
%D%/packages/patches/zathura-plugindir-environment-variable.patch
|
||||
|
||||
MISC_DISTRO_FILES = \
|
||||
%D%/packages/ld-wrapper.in
|
||||
|
|
|
|||
|
|
@ -1694,7 +1694,7 @@ or junctions, and always follows hard links.")
|
|||
(define-public zstd
|
||||
(package
|
||||
(name "zstd")
|
||||
(version "1.3.5")
|
||||
(version "1.3.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/facebook/zstd/archive/v"
|
||||
|
|
@ -1702,11 +1702,7 @@ or junctions, and always follows hard links.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1sifbq18p0hc978g0pq8fymrlpzz1fcxqkbxfqk44z6v9jg5bqfn"))
|
||||
;; Fix a regression that causes the tests to fail. Both patches
|
||||
;; have been merged upstream and will be part of the next release.
|
||||
(patches (search-patches "zstd-fix-stdin-list-without-tty.patch"
|
||||
"zstd-fix-stdin-list-test.patch"))))
|
||||
"1iwxcpxg51yskiwfw5nhsflvcm3pk4184kkfpm61hsxniwa1cmbz"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
From 8e7bdc18d62632adcee029b2f8f5013d11549dd7 Mon Sep 17 00:00:00 2001
|
||||
From: "W. Felix Handte" <w@felixhandte.com>
|
||||
Date: Fri, 29 Jun 2018 16:31:22 -0400
|
||||
Subject: [PATCH] Fix Tests of `--list` Behavior with `stdin`
|
||||
|
||||
---
|
||||
tests/playTests.sh | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/playTests.sh b/tests/playTests.sh
|
||||
index 09a7377f2..aa5535d59 100755
|
||||
--- a/tests/playTests.sh
|
||||
+++ b/tests/playTests.sh
|
||||
@@ -731,8 +731,14 @@ $ECHO "\n===> zstd --list/-l error detection tests "
|
||||
! $ZSTD -lv tmp1*
|
||||
! $ZSTD --list -v tmp2 tmp12.zst
|
||||
|
||||
-$ECHO "\n===> zstd --list/-l exits 1 when stdin is piped in"
|
||||
-! echo "piped STDIN" | $ZSTD --list
|
||||
+$ECHO "\n===> zstd --list/-l errors when presented with stdin / no files"
|
||||
+! $ZSTD -l
|
||||
+! $ZSTD -l -
|
||||
+! $ZSTD -l < tmp1.zst
|
||||
+! $ZSTD -l - < tmp1.zst
|
||||
+! $ZSTD -l - tmp1.zst
|
||||
+! $ZSTD -l - tmp1.zst < tmp1.zst
|
||||
+$ZSTD -l tmp1.zst < tmp1.zst # but doesn't error just because stdin is not a tty
|
||||
|
||||
$ECHO "\n===> zstd --list/-l test with null files "
|
||||
./datagen -g0 > tmp5
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
From 712a9fd9721c314f4b0238577d803b012845f6d2 Mon Sep 17 00:00:00 2001
|
||||
From: "W. Felix Handte" <w@felixhandte.com>
|
||||
Date: Fri, 29 Jun 2018 15:33:44 -0400
|
||||
Subject: [PATCH] Allow Invoking `zstd --list` When `stdin` is not a `tty`
|
||||
|
||||
Also now returns an error when no inputs are given.
|
||||
|
||||
New proposed behavior:
|
||||
|
||||
```
|
||||
felix@odin:~/prog/zstd (list-stdin-check)$ ./zstd -l; echo $?
|
||||
No files given
|
||||
1
|
||||
felix@odin:~/prog/zstd (list-stdin-check)$ ./zstd -l Makefile.zst; echo $?
|
||||
Frames Skips Compressed Uncompressed Ratio Check Filename
|
||||
1 0 3.08 KB 10.92 KB 3.544 XXH64 Makefile.zst
|
||||
0
|
||||
felix@odin:~/prog/zstd (list-stdin-check)$ ./zstd -l <Makefile.zst; echo $?
|
||||
zstd: --list does not support reading from standard input
|
||||
No files given
|
||||
1
|
||||
felix@odin:~/prog/zstd (list-stdin-check)$ ./zstd -l Makefile.zst <Makefile.zst; echo $?
|
||||
Frames Skips Compressed Uncompressed Ratio Check Filename
|
||||
1 0 3.08 KB 10.92 KB 3.544 XXH64 Makefile.zst
|
||||
0
|
||||
felix@odin:~/prog/zstd (list-stdin-check)$
|
||||
```
|
||||
---
|
||||
programs/fileio.c | 16 ++++++++++------
|
||||
1 file changed, 10 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/programs/fileio.c b/programs/fileio.c
|
||||
index 0175b3163..b4eed28d1 100644
|
||||
--- a/programs/fileio.c
|
||||
+++ b/programs/fileio.c
|
||||
@@ -2017,21 +2017,25 @@ static int FIO_listFile(fileInfo_t* total, const char* inFileName, int displayLe
|
||||
}
|
||||
|
||||
int FIO_listMultipleFiles(unsigned numFiles, const char** filenameTable, int displayLevel){
|
||||
-
|
||||
- if (!IS_CONSOLE(stdin)) {
|
||||
- DISPLAYOUT("zstd: --list does not support reading from standard input\n");
|
||||
- return 1;
|
||||
+ unsigned u;
|
||||
+ for (u=0; u<numFiles;u++) {
|
||||
+ if (!strcmp (filenameTable[u], stdinmark)) {
|
||||
+ DISPLAYOUT("zstd: --list does not support reading from standard input\n");
|
||||
+ return 1;
|
||||
+ }
|
||||
}
|
||||
|
||||
if (numFiles == 0) {
|
||||
+ if (!IS_CONSOLE(stdin)) {
|
||||
+ DISPLAYOUT("zstd: --list does not support reading from standard input\n");
|
||||
+ }
|
||||
DISPLAYOUT("No files given\n");
|
||||
- return 0;
|
||||
+ return 1;
|
||||
}
|
||||
if (displayLevel <= 2) {
|
||||
DISPLAYOUT("Frames Skips Compressed Uncompressed Ratio Check Filename\n");
|
||||
}
|
||||
{ int error = 0;
|
||||
- unsigned u;
|
||||
fileInfo_t total;
|
||||
memset(&total, 0, sizeof(total));
|
||||
total.usesCheck = 1;
|
||||
Loading…
Reference in New Issue