diff --git a/.gitignore b/.gitignore index 29fccf5..219786f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /zstd-1.4.4.tar.gz /zstd-1.4.5.tar.gz /zstd-1.4.7.tar.gz +/zstd-1.4.9.tar.gz diff --git a/alignment.patch b/alignment.patch deleted file mode 100644 index 39f5137..0000000 --- a/alignment.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ae85676d44baee3d12168a5c929347b3836f2cf2 Mon Sep 17 00:00:00 2001 -From: Nick Terrell -Date: Thu, 17 Dec 2020 14:27:53 -0800 -Subject: [PATCH] Fix alignment of scratchBuffer in HUF_compressWeights() - -The scratch buffer must be 4-byte aligned. This causes test failures in -32-bit systems, where the stack isn't aligned. - -Fixes Issue #2428. ---- - lib/common/fse.h | 5 +++-- - lib/compress/huf_compress.c | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/lib/common/fse.h b/lib/common/fse.h -index 83a07847a..dd5fc44e8 100644 ---- a/lib/common/fse.h -+++ b/lib/common/fse.h -@@ -335,9 +335,10 @@ size_t FSE_buildCTable_rle (FSE_CTable* ct, unsigned char symbolValue); - - /* FSE_buildCTable_wksp() : - * Same as FSE_buildCTable(), but using an externally allocated scratch buffer (`workSpace`). -- * `wkspSize` must be >= `FSE_BUILD_CTABLE_WORKSPACE_SIZE(maxSymbolValue, tableLog)`. -+ * `wkspSize` must be >= `FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(maxSymbolValue, tableLog)` of `unsigned`. - */ --#define FSE_BUILD_CTABLE_WORKSPACE_SIZE(maxSymbolValue, tableLog) (sizeof(unsigned) * (maxSymbolValue + 2) + (1ull << tableLog)) -+#define FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(maxSymbolValue, tableLog) (maxSymbolValue + 2 + (1ull << (tableLog - 2))) -+#define FSE_BUILD_CTABLE_WORKSPACE_SIZE(maxSymbolValue, tableLog) (sizeof(unsigned) * FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(maxSymbolValue, tableLog)) - size_t FSE_buildCTable_wksp(FSE_CTable* ct, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize); - - #define FSE_BUILD_DTABLE_WKSP_SIZE(maxTableLog, maxSymbolValue) (sizeof(short) * (maxSymbolValue + 1) + (1ULL << maxTableLog) + 8) -diff --git a/lib/compress/huf_compress.c b/lib/compress/huf_compress.c -index abbcc3192..00c593d7e 100644 ---- a/lib/compress/huf_compress.c -+++ b/lib/compress/huf_compress.c -@@ -69,7 +69,7 @@ static size_t HUF_compressWeights (void* dst, size_t dstSize, const void* weight - U32 tableLog = MAX_FSE_TABLELOG_FOR_HUFF_HEADER; - - FSE_CTable CTable[FSE_CTABLE_SIZE_U32(MAX_FSE_TABLELOG_FOR_HUFF_HEADER, HUF_TABLELOG_MAX)]; -- BYTE scratchBuffer[FSE_BUILD_CTABLE_WORKSPACE_SIZE(HUF_TABLELOG_MAX, MAX_FSE_TABLELOG_FOR_HUFF_HEADER)]; -+ U32 scratchBuffer[FSE_BUILD_CTABLE_WORKSPACE_SIZE_U32(HUF_TABLELOG_MAX, MAX_FSE_TABLELOG_FOR_HUFF_HEADER)]; - - unsigned count[HUF_TABLELOG_MAX+1]; - S16 norm[HUF_TABLELOG_MAX+1]; diff --git a/sources b/sources index 111ae64..5aa4a51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zstd-1.4.7.tar.gz) = 43b2292e6518123bebfe0623ec8d7f832850ad1f4fd5b845328665330dd104574a27debd5530c204bf44d0d36737b3e57e07097e5ac6e8bb3bae4e9eeb0f2e0c +SHA512 (zstd-1.4.9.tar.gz) = 10d325c844be43f801c798158c6f1d1ab57401abf1e783e04f6b9e4ac0ba53cf487204fa3244370b1ade239d5f3a784bf1829e206c4ba61fdd9c2f4e9502b238 diff --git a/zstd.spec b/zstd.spec index e4a6c2e..d7a1f59 100644 --- a/zstd.spec +++ b/zstd.spec @@ -12,8 +12,8 @@ %endif Name: zstd -Version: 1.4.7 -Release: 2%{?dist} +Version: 1.4.9 +Release: 1%{?dist} Summary: Zstd compression library 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 Patch1: pzstd.1.patch -Patch2: alignment.patch BuildRequires: make BuildRequires: gcc gtest-devel @@ -59,7 +58,6 @@ find -name .gitignore -delete %if %{with pzstd} %patch1 -p1 %endif -%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -123,6 +121,9 @@ install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1 %ldconfig_scriptlets -n lib%{name} %changelog +* Fri Mar 05 2021 Pádraig Brady - 1.4.9-1 +- Latest upstream + * Thu Jan 28 2021 Fedora Release Engineering - 1.4.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild