zlog: update to 1.2.18

Changelog:
- Fix CVE-2024-22857 security vulnerability

Signed-off-by: Alexandru Ardelean <redacted>

diff --git a/libs/zlog/Makefile b/libs/zlog/Makefile
index 09f861ae3fe16c9cf12ff7fb59ba572c58779964..0713d4b860ded864d577c1cacfe1eecfce93cfbb 100644 (file)
--- a/libs/zlog/Makefile
+++ b/libs/zlog/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlog
-PKG_VERSION:=1.2.17
-PKG_RELEASE:=3
+PKG_VERSION:=1.2.18
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/HardySimpson/zlog
 PKG_SOURCE_VERSION:=$(PKG_VERSION)
-PKG_MIRROR_HASH:=501d89c6883de14e8e6c53e1597f425814b3b467b31da04c50390d4924efecf3
+PKG_MIRROR_HASH:=947645c75a07cdf0228c6b8aed34d2e3e95ef0d6feaa524625b59f4711b066fc
 
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
 PKG_LICENSE:=Apache-2.0

diff --git a/libs/zlog/patches/010-cmake.patch b/libs/zlog/patches/010-cmake.patch
index 736185a84cfc0cf9ab785081a0ae04c99b531e8b..19e01a4dcf320a6b5291c3fd294ac086aa680d04 100644 (file)
--- a/libs/zlog/patches/010-cmake.patch
+++ b/libs/zlog/patches/010-cmake.patch
@@ -1,7 +1,7 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -25,7 +25,6 @@ SET(zlog_so_ver ${CPACK_PACKAGE_VERSION_
- message(STATUS "plateform : ${CMAKE_SYSTEM}")
+@@ -33,7 +33,6 @@ SET(ZLOG_SO_VERSION ${CPACK_PACKAGE_VERS
+ message(STATUS "platform : ${CMAKE_SYSTEM}")
  
  add_definitions("-g -Wall -Wstrict-prototypes")
 -set(CMAKE_C_FLAGS "-std=c99 -pedantic -D_DEFAULT_SOURCE")

diff --git a/libs/zlog/patches/011-upgrade-cmake-minimum-version.patch b/libs/zlog/patches/011-upgrade-cmake-minimum-version.patch
index 43349ec6c19a9b5accc4b60876c27221059bd15c..0868674691c2acec9c00893f7d1f2895aaa26b37 100644 (file)
--- a/libs/zlog/patches/011-upgrade-cmake-minimum-version.patch
+++ b/libs/zlog/patches/011-upgrade-cmake-minimum-version.patch
@@ -1,17 +1,8 @@
-From 3715879775f725260aeda14f94887bbc7a007e29 Mon Sep 17 00:00:00 2001
-From: haydenZhou <mfkhao2009@outlook.com>
-Date: Sun, 8 Jun 2025 10:45:05 +0800
-Subject: [PATCH] upgrade cmake minimum version
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # create by lsm <lsm@skybility.com>
- # cmake
+@@ -14,7 +14,7 @@
+ # limitations under the License.
+ #/
  
 -cmake_minimum_required(VERSION 2.8.5)
 +cmake_minimum_required(VERSION 3.12)