diff options
| author | Liu Yiding <liuyd.fnst@fujitsu.com> | 2026-01-30 16:33:49 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2026-01-31 00:13:43 -0800 |
| commit | 5f6dbb284a16d3e0e85bb9ece7566703c213ba63 (patch) | |
| tree | cd7525f08b4408a7f261bc59ba477d06fe2f1421 /meta-oe/recipes-core/minizip-ng | |
| parent | 6605c61301e67f158725644e2495604a3409d912 (diff) | |
| download | meta-openembedded-5f6dbb284a16d3e0e85bb9ece7566703c213ba63.tar.gz | |
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>
Diffstat (limited to 'meta-oe/recipes-core/minizip-ng')
| -rw-r--r-- | meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch | 35 | ||||
| -rw-r--r-- | meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.10.bb (renamed from meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb) | 3 |
2 files changed, 1 insertions, 37 deletions
diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch b/meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch deleted file mode 100644 index c471b098d4..0000000000 --- a/meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 469beab0747549599959a30188deb3b27df3a346 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Wed, 2 Apr 2025 11:19:54 +0800 | ||
| 4 | Subject: [PATCH] crypt.h: Remove register keyword | ||
| 5 | |||
| 6 | Fixes: | ||
| 7 | | In file included from /buildarea/tmp/work/core2-64-poky-linux/minizip-ng/4.0.8/git/test/test_compat.cc:17: | ||
| 8 | | /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] | ||
| 9 | | 62 | register int keyshift = (int)((*(pkeys + 1)) >> 24); | ||
| 10 | | | ^~~~~~~~ | ||
| 11 | | 1 error generated. | ||
| 12 | |||
| 13 | Upstream-Status: Submitted [https://github.com/zlib-ng/minizip-ng/pull/853] | ||
| 14 | |||
| 15 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 16 | --- | ||
| 17 | compat/crypt.h | 2 +- | ||
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 19 | |||
| 20 | diff --git a/compat/crypt.h b/compat/crypt.h | ||
| 21 | index 41c6454..ccdd83a 100644 | ||
| 22 | --- a/compat/crypt.h | ||
| 23 | +++ b/compat/crypt.h | ||
| 24 | @@ -59,7 +59,7 @@ static int update_keys(unsigned long *pkeys, const z_crc_t *pcrc_32_tab, int c) | ||
| 25 | (*(pkeys + 1)) += (*(pkeys + 0)) & 0xff; | ||
| 26 | (*(pkeys + 1)) = (*(pkeys + 1)) * 134775813L + 1; | ||
| 27 | { | ||
| 28 | - register int keyshift = (int)((*(pkeys + 1)) >> 24); | ||
| 29 | + int keyshift = (int)((*(pkeys + 1)) >> 24); | ||
| 30 | (*(pkeys + 2)) = CRC32((*(pkeys + 2)), keyshift); | ||
| 31 | } | ||
| 32 | return c; | ||
| 33 | -- | ||
| 34 | 2.34.1 | ||
| 35 | |||
diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.10.bb index cf98c0cf2e..2e7f438821 100644 --- a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb +++ b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.10.bb | |||
| @@ -7,11 +7,10 @@ LICENSE = "Zlib" | |||
| 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=36964f044224efeedd694983c34e716f" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=36964f044224efeedd694983c34e716f" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/zlib-ng/minizip-ng.git;protocol=https;branch=master \ | 9 | SRC_URI = "git://github.com/zlib-ng/minizip-ng.git;protocol=https;branch=master \ |
| 10 | file://0001-crypt.h-Remove-register-keyword.patch \ | ||
| 11 | file://run-ptest \ | 10 | file://run-ptest \ |
| 12 | " | 11 | " |
| 13 | 12 | ||
| 14 | SRCREV = "55db144e03027b43263e5ebcb599bf0878ba58de" | 13 | SRCREV = "f3ed731e27a97e30dffe076ed5e0537daae5c1bd" |
| 15 | 14 | ||
| 16 | 15 | ||
| 17 | RCONFLICTS:${PN} += "minizip" | 16 | RCONFLICTS:${PN} += "minizip" |
