zstd: 1.4.8 -> 1.4.9
Fixes CVE-2021-24032.
This commit is contained in:
parent
f5dc3f9e06
commit
aea3ad0d4d
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "zstd";
|
pname = "zstd";
|
||||||
version = "1.4.8";
|
version = "1.4.9";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "facebook";
|
owner = "facebook";
|
||||||
repo = "zstd";
|
repo = "zstd";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "018zgigp5xlrb4mgshgrvns0cfbhhcg89cifbjj4rv6s3n9riphw";
|
sha256 = "18alxnym54gswsmsr5ra82q4k1q5fyzsyx0jykb2sk2nkpvx7334";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ]
|
nativeBuildInputs = [ cmake ]
|
||||||
|
@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = lib.optional stdenv.hostPlatform.isUnix bash;
|
buildInputs = lib.optional stdenv.hostPlatform.isUnix bash;
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
# This patches makes sure we do not attempt to use the MD5 implementation
|
||||||
|
# of the host platform when running the tests
|
||||||
./playtests-darwin.patch
|
./playtests-darwin.patch
|
||||||
] # This I didn't upstream because if you use posix threads with MinGW it will
|
] # This I didn't upstream because if you use posix threads with MinGW it will
|
||||||
# work fine, and I'm not sure how to write the condition.
|
# work fine, and I'm not sure how to write the condition.
|
||||||
|
|
|
@ -1,18 +1,28 @@
|
||||||
--- a/tests/playTests.sh
|
--- a/tests/playTests.sh
|
||||||
+++ b/tests/playTests.sh
|
+++ b/tests/playTests.sh
|
||||||
@@ -109,5 +109,2 @@ esac
|
@@ -112,17 +112,10 @@ case "$OS" in
|
||||||
|
esac
|
||||||
|
|
||||||
case "$UNAME" in
|
case "$UNAME" in
|
||||||
- Darwin) MD5SUM="md5 -r" ;;
|
- Darwin) MD5SUM="md5 -r" ;;
|
||||||
- FreeBSD) MD5SUM="gmd5sum" ;;
|
- FreeBSD) MD5SUM="gmd5sum" ;;
|
||||||
|
- NetBSD) MD5SUM="md5 -n" ;;
|
||||||
- OpenBSD) MD5SUM="md5" ;;
|
- OpenBSD) MD5SUM="md5" ;;
|
||||||
*) MD5SUM="md5sum" ;;
|
*) MD5SUM="md5sum" ;;
|
||||||
@@ -116,5 +113,2 @@ esac
|
esac
|
||||||
|
|
||||||
MTIME="stat -c %Y"
|
MTIME="stat -c %Y"
|
||||||
-case "$UNAME" in
|
-case "$UNAME" in
|
||||||
- Darwin | FreeBSD | OpenBSD) MTIME="stat -f %m" ;;
|
- Darwin | FreeBSD | OpenBSD | NetBSD) MTIME="stat -f %m" ;;
|
||||||
-esac
|
-esac
|
||||||
|
|
||||||
@@ -752,3 +746,2 @@ zstd -d --rm dirTestDict/*.zst -D tmpDictC # note : use internal checksum by de
|
DIFF="diff"
|
||||||
|
case "$UNAME" in
|
||||||
|
@@ -842,7 +835,6 @@ $MD5SUM dirTestDict/* > tmph1
|
||||||
|
zstd -f --rm dirTestDict/* -D tmpDictC
|
||||||
|
zstd -d --rm dirTestDict/*.zst -D tmpDictC # note : use internal checksum by default
|
||||||
case "$UNAME" in
|
case "$UNAME" in
|
||||||
- Darwin) println "md5sum -c not supported on OS-X : test skipped" ;; # not compatible with OS-X's md5
|
- Darwin) println "md5sum -c not supported on OS-X : test skipped" ;; # not compatible with OS-X's md5
|
||||||
*) $MD5SUM -c tmph1 ;;
|
*) $MD5SUM -c tmph1 ;;
|
||||||
|
esac
|
||||||
|
rm -rf dirTestDict
|
Loading…
Reference in a new issue