summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShiji Yang2025-07-10 12:02:24 +0000
committerNick Hainke2025-07-12 08:06:29 +0000
commit01654bc2ad747ace71720aa2567992403a9aebed (patch)
treec9f89bbabd2d2b2f75402282f389e49680825113
parent5e0fbca9b98e9bc415bbaa9aeeecb95848699a3f (diff)
downloadopenwrt-01654bc2ad747ace71720aa2567992403a9aebed.tar.gz
tools/7z: update to 25.00
Changelog: https://www.7-zip.org/history.txt All patches are automatically refreshed. Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/19360 Signed-off-by: Nick Hainke <vincent@systemli.org>
-rw-r--r--tools/7z/Makefile4
-rw-r--r--tools/7z/patches/7-zip-musl.patch4
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/7z/Makefile b/tools/7z/Makefile
index 16489590e3..0241a0c2e2 100644
--- a/tools/7z/Makefile
+++ b/tools/7z/Makefile
@@ -1,11 +1,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=7z
-PKG_VERSION:=24.09
+PKG_VERSION:=25.00
PKG_SOURCE:=$(PKG_NAME)$(subst .,,$(PKG_VERSION))-src.tar.xz
PKG_SOURCE_URL:=https://7-zip.org/a/
-PKG_HASH:=49c05169f49572c1128453579af1632a952409ced028259381dac30726b6133a
+PKG_HASH:=bff9e69b6ca73a5b8715d7623870a39dc90ad6ce1f4d1070685843987af1af9b
PKG_CPE_ID:=cpe:/a:7-zip:7-zip
diff --git a/tools/7z/patches/7-zip-musl.patch b/tools/7z/patches/7-zip-musl.patch
index a08520a25f..1a7a5c30c0 100644
--- a/tools/7z/patches/7-zip-musl.patch
+++ b/tools/7z/patches/7-zip-musl.patch
@@ -1,6 +1,6 @@
--- a/C/Threads.c
+++ b/C/Threads.c
-@@ -265,7 +265,7 @@ WRes Thread_Create_With_CpuSet(CThread *
+@@ -472,7 +472,7 @@ WRes Thread_Create_With_CpuSet(CThread *
*/
// ret2 =
@@ -9,7 +9,7 @@
// if (ret2) ret = ret2;
#endif
}
-@@ -275,14 +275,12 @@ WRes Thread_Create_With_CpuSet(CThread *
+@@ -482,14 +482,12 @@ WRes Thread_Create_With_CpuSet(CThread *
if (!ret)
{
p->_created = 1;