minizip-ng: 4.0.8 -> 4.0.10

1.Changelog:
  https://github.com/zlib-ng/minizip-ng/releases/tag/4.0.10

2.Remove 0001-crypt.h-Remove-register-keyword.patch as it was merged upstream.

Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Liu Yiding 2026-01-30 16:33:49 +08:00 committed by Khem Raj
parent 6605c61301
commit 5f6dbb284a
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 1 additions and 37 deletions

View File

@ -1,35 +0,0 @@
From 469beab0747549599959a30188deb3b27df3a346 Mon Sep 17 00:00:00 2001
From: Mingli Yu <mingli.yu@windriver.com>
Date: Wed, 2 Apr 2025 11:19:54 +0800
Subject: [PATCH] crypt.h: Remove register keyword
Fixes:
| In file included from /buildarea/tmp/work/core2-64-poky-linux/minizip-ng/4.0.8/git/test/test_compat.cc:17:
| /buildarea/tmp/work/core2-64-poky-linux/minizip-ng/4.0.8/git/compat/crypt.h:62:9: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
| 62 | register int keyshift = (int)((*(pkeys + 1)) >> 24);
| | ^~~~~~~~
| 1 error generated.
Upstream-Status: Submitted [https://github.com/zlib-ng/minizip-ng/pull/853]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
compat/crypt.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compat/crypt.h b/compat/crypt.h
index 41c6454..ccdd83a 100644
--- a/compat/crypt.h
+++ b/compat/crypt.h
@@ -59,7 +59,7 @@ static int update_keys(unsigned long *pkeys, const z_crc_t *pcrc_32_tab, int c)
(*(pkeys + 1)) += (*(pkeys + 0)) & 0xff;
(*(pkeys + 1)) = (*(pkeys + 1)) * 134775813L + 1;
{
- register int keyshift = (int)((*(pkeys + 1)) >> 24);
+ int keyshift = (int)((*(pkeys + 1)) >> 24);
(*(pkeys + 2)) = CRC32((*(pkeys + 2)), keyshift);
}
return c;
--
2.34.1

View File

@ -7,11 +7,10 @@ LICENSE = "Zlib"
LIC_FILES_CHKSUM = "file://LICENSE;md5=36964f044224efeedd694983c34e716f"
SRC_URI = "git://github.com/zlib-ng/minizip-ng.git;protocol=https;branch=master \
file://0001-crypt.h-Remove-register-keyword.patch \
file://run-ptest \
"
SRCREV = "55db144e03027b43263e5ebcb599bf0878ba58de"
SRCREV = "f3ed731e27a97e30dffe076ed5e0537daae5c1bd"
RCONFLICTS:${PN} += "minizip"