latest upstream (1.3.6)
This commit is contained in:
parent
7d39c9e71f
commit
aecbe7d8e7
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@
|
|||||||
/zstd-1.3.3.tar.gz
|
/zstd-1.3.3.tar.gz
|
||||||
/zstd-1.3.4.tar.gz
|
/zstd-1.3.4.tar.gz
|
||||||
/zstd-1.3.5.tar.gz
|
/zstd-1.3.5.tar.gz
|
||||||
|
/zstd-1.3.6.tar.gz
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (zstd-1.3.5.tar.gz) = a5347b132d6b79e6a7f39a4546cafc5cf85e8d01b765477011008908035789e914b1093e2b2405c75086f05a7bc87e29b69e10252260d747c5c056ce16f91661
|
SHA512 (zstd-1.3.6.tar.gz) = f37c3f45ee7b0367c1fd48f572a1931ea4a664a1f5669c56a0f1883c5c9555c3d8b622c1d8bd8c074d157259b4eda24782670137c354c2e2633ec98b235b5625
|
||||||
|
@ -1,70 +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 0175b31..b4eed28 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;
|
|
||||||
--
|
|
||||||
2.9.3
|
|
||||||
|
|
@ -12,8 +12,8 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: zstd
|
Name: zstd
|
||||||
Version: 1.3.5
|
Version: 1.3.6
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Zstd compression library
|
Summary: Zstd compression library
|
||||||
|
|
||||||
License: BSD and GPLv2
|
License: BSD and GPLv2
|
||||||
@ -21,7 +21,6 @@ URL: https://github.com/facebook/zstd
|
|||||||
Source0: https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source0: https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
Patch1: pzstd.1.patch
|
Patch1: pzstd.1.patch
|
||||||
Patch2: zstd-l-stdin.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc gtest-devel
|
BuildRequires: gcc gtest-devel
|
||||||
%if %{with pzstd}
|
%if %{with pzstd}
|
||||||
@ -52,7 +51,6 @@ find -name .gitignore -delete
|
|||||||
%if %{with pzstd}
|
%if %{with pzstd}
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%endif
|
%endif
|
||||||
%patch2 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="$RPM_OPT_FLAGS"
|
export CFLAGS="$RPM_OPT_FLAGS"
|
||||||
@ -116,6 +114,9 @@ install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1
|
|||||||
%ldconfig_scriptlets -n lib%{name}
|
%ldconfig_scriptlets -n lib%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 08 2018 Pádraig Brady <P@draigBrady.com> - 1.3.6-1
|
||||||
|
- Latest upstream
|
||||||
|
|
||||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-2
|
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user