[PR PATCH] zstd: update to 1.4.7.

[PR PATCH] zstd: update to 1.4.7.

[4ricci]

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

There is a new pull request by 4ricci against master on the void-packages repository

https://github.com/4ricci/void-packages zstd-1.4.7
https://github.com/void-linux/void-packages/pull/27253

zstd: update to 1.4.7.


A patch file from https://github.com/void-linux/void-packages/pull/27253.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zstd-1.4.7-27253.patch --]
[-- Type: text/x-diff, Size: 992 bytes --]

From f1b7fdbf050dfa77ef41972cb7554c3e3711a745 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 18 Dec 2020 11:27:18 +0100
Subject: [PATCH] zstd: update to 1.4.7.

---
 srcpkgs/zstd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zstd/template b/srcpkgs/zstd/template
index 39ec890a2ee..28ce7b9caaf 100644
--- a/srcpkgs/zstd/template
+++ b/srcpkgs/zstd/template
@@ -1,6 +1,6 @@
 # Template file for 'zstd'
 pkgname=zstd
-version=1.4.5
+version=1.4.7
 revision=1
 bootstrap=yes
 makedepends="zlib-devel liblzma-devel liblz4-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="http://www.zstd.net"
 distfiles="https://github.com/facebook/zstd/archive/v${version}.tar.gz"
-checksum=734d1f565c42f691f8420c8d06783ad818060fc390dee43ae0a89f86d0a4f8c2
+checksum=085500c8d0b9c83afbc1dc0d8b4889336ad019eba930c5d6a9c6c86c20c769c8
 
 do_build() {
 	make ${makejobs}

Re: [PR PATCH] [Updated] zstd: update to 1.4.7.

[4ricci]

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

There is an updated pull request by 4ricci against master on the void-packages repository

https://github.com/4ricci/void-packages zstd-1.4.7
https://github.com/void-linux/void-packages/pull/27253

zstd: update to 1.4.7.


A patch file from https://github.com/void-linux/void-packages/pull/27253.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zstd-1.4.7-27253.patch --]
[-- Type: text/x-diff, Size: 992 bytes --]

From 0d3802efcbff13532d01477112024e19cb785c84 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 18 Dec 2020 11:27:18 +0100
Subject: [PATCH] zstd: update to 1.4.7.

---
 srcpkgs/zstd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zstd/template b/srcpkgs/zstd/template
index 39ec890a2ee..28ce7b9caaf 100644
--- a/srcpkgs/zstd/template
+++ b/srcpkgs/zstd/template
@@ -1,6 +1,6 @@
 # Template file for 'zstd'
 pkgname=zstd
-version=1.4.5
+version=1.4.7
 revision=1
 bootstrap=yes
 makedepends="zlib-devel liblzma-devel liblz4-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="http://www.zstd.net"
 distfiles="https://github.com/facebook/zstd/archive/v${version}.tar.gz"
-checksum=734d1f565c42f691f8420c8d06783ad818060fc390dee43ae0a89f86d0a4f8c2
+checksum=085500c8d0b9c83afbc1dc0d8b4889336ad019eba930c5d6a9c6c86c20c769c8
 
 do_build() {
 	make ${makejobs}

Re: zstd: update to 1.4.7.

[4ricci]

[-- Attachment #1: Type: text/plain, Size: 279 bytes --]

New comment by 4ricci on void-packages repository

https://github.com/void-linux/void-packages/pull/27253#issuecomment-748039086

Comment:
`do_check()` is failing on the (i686, i686, 1). I tested locally on x86_64-glibc with a i686 masterdir, but I cannot reproduce the failure.

Re: zstd: update to 1.4.7.

[4ricci]

[-- Attachment #1: Type: text/plain, Size: 285 bytes --]

New comment by 4ricci on void-packages repository

https://github.com/void-linux/void-packages/pull/27253#issuecomment-748039086

Comment:
`do_check()` is failing on the (i686, i686, 1) build. I tested locally on x86_64-glibc with a i686 masterdir, but I cannot reproduce the failure.

Re: zstd: update to 1.4.7.

[4ricci]

[-- Attachment #1: Type: text/plain, Size: 392 bytes --]

New comment by 4ricci on void-packages repository

https://github.com/void-linux/void-packages/pull/27253#issuecomment-748039086

Comment:
`do_check()` is failing on the (i686, i686, 1) build. I tested locally on x86_64-glibc with a i686 masterdir, but I cannot reproduce the failure.

**EDIT:** I forgot to checkout the right branch. I can reproduce, but I don't know what is the problem.

Re: zstd: update to 1.4.7.

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 418 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/27253#issuecomment-748124920

Comment:
The check prints the problem:
```
zstd: util.c:351: readLinesFromFile: Assertion `pos + lineLength < dstCapacity' failed.
```
Seems like this could be an integer overrun. Hint: `sizeof(long)` is 4 for 32 bit vs. 8  for 32 bit.
No time to further investigate this, though.

Re: zstd: update to 1.4.7.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27253#issuecomment-748163376

Comment:
I will try to check upstream.

Re: [PR PATCH] [Updated] zstd: update to 1.4.7.

[4ricci]

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

There is an updated pull request by 4ricci against master on the void-packages repository

https://github.com/4ricci/void-packages zstd-1.4.7
https://github.com/void-linux/void-packages/pull/27253

zstd: update to 1.4.7.


A patch file from https://github.com/void-linux/void-packages/pull/27253.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zstd-1.4.7-27253.patch --]
[-- Type: text/x-diff, Size: 3112 bytes --]

From f43099ca2f10e976e1ba7044e989f3b02e921bb6 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 18 Dec 2020 11:27:18 +0100
Subject: [PATCH] zstd: update to 1.4.7.

---
 srcpkgs/zstd/patches/32bit.diff | 26 ++++++++++++++++++++++++++
 srcpkgs/zstd/template           |  4 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/zstd/patches/32bit.diff

diff --git a/srcpkgs/zstd/patches/32bit.diff b/srcpkgs/zstd/patches/32bit.diff
new file mode 100644
index 00000000000..797aa254fae
--- /dev/null
+++ b/srcpkgs/zstd/patches/32bit.diff
@@ -0,0 +1,26 @@
+--- lib/common/fse.h
++++ 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)
+--- lib/compress/huf_compress.c
++++ 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/srcpkgs/zstd/template b/srcpkgs/zstd/template
index 39ec890a2ee..28ce7b9caaf 100644
--- a/srcpkgs/zstd/template
+++ b/srcpkgs/zstd/template
@@ -1,6 +1,6 @@
 # Template file for 'zstd'
 pkgname=zstd
-version=1.4.5
+version=1.4.7
 revision=1
 bootstrap=yes
 makedepends="zlib-devel liblzma-devel liblz4-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="http://www.zstd.net"
 distfiles="https://github.com/facebook/zstd/archive/v${version}.tar.gz"
-checksum=734d1f565c42f691f8420c8d06783ad818060fc390dee43ae0a89f86d0a4f8c2
+checksum=085500c8d0b9c83afbc1dc0d8b4889336ad019eba930c5d6a9c6c86c20c769c8
 
 do_build() {
 	make ${makejobs}

Re: zstd: update to 1.4.7.

[4ricci]

[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

New comment by 4ricci on void-packages repository

https://github.com/void-linux/void-packages/pull/27253#issuecomment-748194234

Comment:
The problem was fixed [here](https://github.com/facebook/zstd/commit/ae85676d44baee3d12168a5c929347b3836f2cf2).

Re: zstd: update to 1.4.7.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 359 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27253#issuecomment-748198572

Comment:
I think they are going to make a hot fix release, we can probably wait for that. It's good that their code caught alignment issues; on i686 it's indeed not an issue, but it could kill the process with SIGBUS on `armv*`

Re: [PR PATCH] [Updated] zstd: update to 1.4.7.

[4ricci]

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

There is an updated pull request by 4ricci against master on the void-packages repository

https://github.com/4ricci/void-packages zstd-1.4.7
https://github.com/void-linux/void-packages/pull/27253

zstd: update to 1.4.7.


A patch file from https://github.com/void-linux/void-packages/pull/27253.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zstd-1.4.7-27253.patch --]
[-- Type: text/x-diff, Size: 991 bytes --]

From d121f6cce93ff478c64d8229f77e900fb9ddeff6 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 18 Dec 2020 11:27:18 +0100
Subject: [PATCH] zstd: update to 1.4.7

---
 srcpkgs/zstd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zstd/template b/srcpkgs/zstd/template
index 39ec890a2ee..be4ca70abe6 100644
--- a/srcpkgs/zstd/template
+++ b/srcpkgs/zstd/template
@@ -1,6 +1,6 @@
 # Template file for 'zstd'
 pkgname=zstd
-version=1.4.5
+version=1.4.8
 revision=1
 bootstrap=yes
 makedepends="zlib-devel liblzma-devel liblz4-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="http://www.zstd.net"
 distfiles="https://github.com/facebook/zstd/archive/v${version}.tar.gz"
-checksum=734d1f565c42f691f8420c8d06783ad818060fc390dee43ae0a89f86d0a4f8c2
+checksum=f176f0626cb797022fbf257c3c644d71c1c747bb74c32201f9203654da35e9fa
 
 do_build() {
 	make ${makejobs}

Re: [PR PATCH] [Closed]: zstd: update to 1.4.8

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

There's a closed pull request on the void-packages repository

zstd: update to 1.4.8
https://github.com/void-linux/void-packages/pull/27253

Description:

Re: zstd: update to 1.4.8

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27253#issuecomment-748549820

Comment:
I fixed the commit message before pushing, thanks!