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 <[email protected]> --- .../zabbix/zabbix/0001-Fix-configure.ac.patch | 2 ++ .../zabbix/zabbix/CVE-2020-15803.patch | 36 ------------------- .../{zabbix_4.4.6.bb => zabbix_5.2.5.bb} | 10 +++--- 3 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/zabbix/zabbix/CVE-2020-15803.patch rename meta-oe/recipes-connectivity/zabbix/{zabbix_4.4.6.bb => zabbix_5.2.5.bb} (89%) diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix/0001-Fix-configure.ac.patch b/meta-oe/recipes-connectivity/zabbix/zabbix/0001-Fix-configure.ac.patch index af14a1a56..97339d3ff 100644 --- a/meta-oe/recipes-connectivity/zabbix/zabbix/0001-Fix-configure.ac.patch +++ b/meta-oe/recipes-connectivity/zabbix/zabbix/0001-Fix-configure.ac.patch @@ -1,5 +1,7 @@ uname can not get version of kernel correctly while cross compile +Upstream-Status: Inappropriate [configuration] + Signed-off-by: Bian Naimeng <[email protected]> --- configure.ac | 2 +- diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix/CVE-2020-15803.patch b/meta-oe/recipes-connectivity/zabbix/zabbix/CVE-2020-15803.patch deleted file mode 100644 index 2eec4bf32..000000000 --- a/meta-oe/recipes-connectivity/zabbix/zabbix/CVE-2020-15803.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4943334fd9bf7dffd49f9e86251ad40b3efe2135 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu <[email protected]> -Date: Fri, 11 Dec 2020 17:02:20 +0900 -Subject: [PATCH] Fix bug for CVE-2020-15803 - -Signed-off-by: Wang Mingyu <[email protected]> ---- - 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 - diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.6.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_5.2.5.bb similarity index 89% rename from meta-oe/recipes-connectivity/zabbix/zabbix_4.4.6.bb rename to meta-oe/recipes-connectivity/zabbix/zabbix_5.2.5.bb index 98a31879c..2bbfec9dc 100644 --- a/meta-oe/recipes-connectivity/zabbix/zabbix_4.4.6.bb +++ b/meta-oe/recipes-connectivity/zabbix/zabbix_5.2.5.bb @@ -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" -- 2.27.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#89928): https://lists.openembedded.org/g/openembedded-devel/message/89928 Mute This Topic: https://lists.openembedded.org/mt/81142224/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
