From: Adrian Bunk <bunk@stusta.de>
Date: Sat, 29 Feb 2020 09:51:04 +0000 (+0200)
Subject: ncurses: Comment out version parsing that broke CVE checking
X-Git-Tag: 2020-04-dunfell~291
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=7939288700ad35ed43e5988371e16d5afc594a57;p=openembedded-core.git

ncurses: Comment out version parsing that broke CVE checking

This will be needed again when using patchlevel versions again.
Also make it more generic.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/ncurses/ncurses_6.2.bb b/meta/recipes-core/ncurses/ncurses_6.2.bb
index b6d899c878..723e685a9b 100644
--- a/meta/recipes-core/ncurses/ncurses_6.2.bb
+++ b/meta/recipes-core/ncurses/ncurses_6.2.bb
@@ -10,4 +10,5 @@ S = "${WORKDIR}/git"
 EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"
 
-CVE_VERSION = "6.1.${@d.getVar("PV").split('+')[1]}"
+# This is needed when using patchlevel versions like 6.1+20181013
+#CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}"