mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 14:01:57 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/zlog: bump to version 1.2.16

Browse Source 
Drop patch (already in version)

https://github.com/HardySimpson/zlog/releases/tag/1.2.16

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2022-10-20 18:33:12 +02:00
committed by Peter Korsgaard
parent 49b11f5e78
commit aee1cc302f
3 changed files with 2 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
package/zlog/0001-Fix-stack-buffer-overflow-at-zlog_conf_build_with_file.patch
View File

@@ -1,25 +0,0 @@
From a5be8b3a8ddc498de4ad041757285136a55d97e3 Mon Sep 17 00:00:00 2001
From: XiangfeiCH <chenthrone@163.com>
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 <fontaine.fabrice@gmail.com>
---
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;

2
package/zlog/zlog.hash
View File

@@ -1,3 +1,3 @@
# Locally computed # Locally computed
sha256 00037ab8d52772a95d645f1dcfd2c292b7cea326b54e63e219a5b7fdcb7e6508 zlog-1.2.15.tar.gz sha256 742401902f2134eb272c49631fe5c38d7aeb9a2ad56fa3ec3d15219b371ba655 zlog-1.2.16.tar.gz
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING

5
package/zlog/zlog.mk
View File

@@ -4,16 +4,13 @@
# #
################################################################################ ################################################################################
ZLOG_VERSION = 1.2.15 ZLOG_VERSION = 1.2.16
ZLOG_SITE = $(call github,HardySimpson,zlog,$(ZLOG_VERSION)) ZLOG_SITE = $(call github,HardySimpson,zlog,$(ZLOG_VERSION))
ZLOG_LICENSE = LGPL-2.1 ZLOG_LICENSE = LGPL-2.1
ZLOG_LICENSE_FILES = COPYING ZLOG_LICENSE_FILES = COPYING
ZLOG_CPE_ID_VENDOR = zlog_project ZLOG_CPE_ID_VENDOR = zlog_project
ZLOG_INSTALL_STAGING = YES 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 define ZLOG_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
-C $(@D) all -C $(@D) all