mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

zabbix: upgrade 4.4.6 -> 5.2.5

Browse Source 
Drop CVE patch that is not needed for 5.2.5. Add Upstream-Status: tag
for the configure patch which specifies the kernel version.
Specify the recipe specific sysroot path to avoid:
   QA Issue: ... [configure-unsafe]
for libpcre and iconv.

Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Randy MacLeod
2021-03-06 21:58:27 -05:00
committed by Khem Raj
parent c64ab8ac63
commit b17210e410
3 changed files with 7 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-connectivity/zabbix/zabbix/0001-Fix-configure.ac.patch
+2
View File
@@ -1,5 +1,7 @@
uname can not get version of kernel correctly while cross compile
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
---
configure.ac | 2 +-
meta-oe/recipes-connectivity/zabbix/zabbix/CVE-2020-15803.patch
-36
View File
@@ -1,36 +0,0 @@
From 4943334fd9bf7dffd49f9e86251ad40b3efe2135 Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@cn.fujitsu.com>
Date: Fri, 11 Dec 2020 17:02:20 +0900
Subject: [PATCH] Fix bug for CVE-2020-15803
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
frontends/php/include/classes/html/CIFrame.php | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/frontends/php/include/classes/html/CIFrame.php b/frontends/php/include/classes/html/CIFrame.php
index 32220cd..70f2ab5 100644
--- a/frontends/php/include/classes/html/CIFrame.php
+++ b/frontends/php/include/classes/html/CIFrame.php
@@ -29,6 +29,7 @@ class CIFrame extends CTag {
$this->setHeight($height);
$this->setScrolling($scrolling);
$this->setId($id);
+ $this->setSandbox();
}
public function setSrc($value = null) {
@@ -69,4 +70,10 @@ class CIFrame extends CTag {
$this->setAttribute('scrolling', $value);
return $this;
}
+
+ private function setSandbox() {
+ if (ZBX_IFRAME_SANDBOX !== false) {
+ $this->setAttribute('sandbox', ZBX_IFRAME_SANDBOX);
+ }
+ }
}
--
2.25.1
meta-oe/recipes-connectivity/zabbix/zabbix_4.4.6.bb → meta-oe/recipes-connectivity/zabbix/zabbix_5.2.5.bb
+5 -5
View File
@@ -23,14 +23,13 @@ DEPENDS = "libevent libpcre openldap virtual/libiconv zlib"
PACKAGE_ARCH = "${MACHINE_ARCH}"
SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${BPN}-${PV}.tar.gz \
SRC_URI = "https://cdn.zabbix.com/zabbix/sources/stable/5.2/${BPN}-${PV}.tar.gz \
file://0001-Fix-configure.ac.patch \
file://zabbix-agent.service \
file://CVE-2020-15803.patch \
"
SRC_URI[md5sum] = "e666539220be93b1af38e40f5fbb1f79"
SRC_URI[sha256sum] = "22bb28e667424ad4688f47732853f4241df0e78a7607727b043d704ba726ae0e"
SRC_URI[md5sum] = "e90822716c5c241890f6fed1588b5451"
SRC_URI[sha256sum] = "ce0d9745a8b9154e87d6906edd0fce7b7ec298acd34a0543ea53d1a5f2f14bc5"
inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd
@@ -58,7 +57,8 @@ EXTRA_OECONF = " \
--with-zlib \
--with-libpthread \
--with-libevent \
--with-libpcre \
--with-libpcre=${STAGING_EXECPREFIXDIR} \
--with-iconv=${STAGING_EXECPREFIXDIR} \
"
CFLAGS_append = " -lldap -llber -pthread"