From aee1cc302f6da050b198ea63a7c78e62579aed97 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 20 Oct 2022 18:33:12 +0200 Subject: [PATCH] package/zlog: bump to version 1.2.16 Drop patch (already in version) https://github.com/HardySimpson/zlog/releases/tag/1.2.16 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...verflow-at-zlog_conf_build_with_file.patch | 25 ------------------- package/zlog/zlog.hash | 2 +- package/zlog/zlog.mk | 5 +--- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 package/zlog/0001-Fix-stack-buffer-overflow-at-zlog_conf_build_with_file.patch diff --git a/package/zlog/0001-Fix-stack-buffer-overflow-at-zlog_conf_build_with_file.patch b/package/zlog/0001-Fix-stack-buffer-overflow-at-zlog_conf_build_with_file.patch deleted file mode 100644 index d5f23e1b26..0000000000 --- a/package/zlog/0001-Fix-stack-buffer-overflow-at-zlog_conf_build_with_file.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a5be8b3a8ddc498de4ad041757285136a55d97e3 Mon Sep 17 00:00:00 2001 -From: XiangfeiCH -Date: Tue, 12 Apr 2022 00:13:35 +0800 -Subject: [PATCH] Fix stack-buffer-overflow at zlog_conf_build_with_file - -[Retrieved from: -https://github.com/HardySimpson/zlog/commit/a5be8b3a8ddc498de4ad041757285136a55d97e3] -Signed-off-by: Fabrice Fontaine ---- - src/conf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/conf.c b/src/conf.c -index 0f862fa..9a4cb75 100644 ---- a/src/conf.c -+++ b/src/conf.c -@@ -305,7 +305,7 @@ static int zlog_conf_build_with_file(zlog_conf_t * a_conf) - /* Oops the buffer is full - what now? */ - pline = line; - } else { -- for (p--; isspace((int)*p); --p) -+ for (p--; p >= line && isspace((int)*p); --p) - /*EMPTY*/; - p++; - *p = 0; diff --git a/package/zlog/zlog.hash b/package/zlog/zlog.hash index c39505b2c6..3b7c6aa78c 100644 --- a/package/zlog/zlog.hash +++ b/package/zlog/zlog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 00037ab8d52772a95d645f1dcfd2c292b7cea326b54e63e219a5b7fdcb7e6508 zlog-1.2.15.tar.gz +sha256 742401902f2134eb272c49631fe5c38d7aeb9a2ad56fa3ec3d15219b371ba655 zlog-1.2.16.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/zlog/zlog.mk b/package/zlog/zlog.mk index 1929a45a3e..329f2cfe2c 100644 --- a/package/zlog/zlog.mk +++ b/package/zlog/zlog.mk @@ -4,16 +4,13 @@ # ################################################################################ -ZLOG_VERSION = 1.2.15 +ZLOG_VERSION = 1.2.16 ZLOG_SITE = $(call github,HardySimpson,zlog,$(ZLOG_VERSION)) ZLOG_LICENSE = LGPL-2.1 ZLOG_LICENSE_FILES = COPYING ZLOG_CPE_ID_VENDOR = zlog_project ZLOG_INSTALL_STAGING = YES -# 0001-Fix-stack-buffer-overflow-at-zlog_conf_build_with_file.patch -ZLOG_IGNORE_CVES += CVE-2021-43521 - define ZLOG_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ -C $(@D) all