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>

diff --git a/tools/7z/Makefile b/tools/7z/Makefile
index 16489590e35d42e562ae7a2d881d2e5bd1182dbf..0241a0c2e2e591be29037eaaee506030a010df6a 100644 (file)
--- 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 a08520a25ffa0c31601ed4586747b098b7f40b1b..1a7a5c30c067d4fcfc84b24350fa20d43db8b306 100644 (file)
--- 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 *
        */\r
  \r
        // ret2 =\r
@@ -9,7 +9,7 @@
        // if (ret2) ret = ret2;\r
  #endif\r
      }\r
-@@ -275,14 +275,12 @@ WRes Thread_Create_With_CpuSet(CThread *
+@@ -482,14 +482,12 @@ WRes Thread_Create_With_CpuSet(CThread *
      if (!ret)\r
      {\r
        p->_created = 1;\r