diff options
| author | Konstantin Shemyak <konstantin.shemyak@ge.com> | 2018-02-19 16:35:54 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-24 10:31:35 +0000 |
| commit | 17db210975c740aff12732c511cf4fb32b507365 (patch) | |
| tree | 373dc25bbe901fd58150e9cff52d090b1b2a4f53 | |
| parent | bff4ad7d6f62131a9b91a4063600e6f3edb8843c (diff) | |
| download | openembedded-core-17db210975c740aff12732c511cf4fb32b507365.tar.gz openembedded-core-17db210975c740aff12732c511cf4fb32b507365.tar.bz2 openembedded-core-17db210975c740aff12732c511cf4fb32b507365.zip | |
cve-check-tool: correctly exported web proxies
The binary 'cve-check-update' downloads the CVE database from the Internet.
If the system is behind a web proxy, the download fails, as proxy-related
variables are not exported.
In turn, 'cve-check-tool' does not connect to the network and correspondingly
does not need exported proxies.
Exported all proxy-related environment variables to 'cve-check-update' and
removed the unneeded export from 'cve-check-tool'.
Signed-off-by: Konstantin Shemyak <konstantin.shemyak@ge.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/cve-check.bbclass | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/cve-check-tool/cve-check-tool_5.6.4.bb | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index d8087dd7c6..537659df12 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -184,9 +184,6 @@ def check_cves(d, patched_cves): bb.note("Recipe has been whitelisted, skipping check") return ([], []) - # It is needed to export the proxies to download the database using HTTP - bb.utils.export_proxies(d) - try: # Write the faux CSV file to be used with cve-check-tool fd, faux = tempfile.mkstemp(prefix="cve-faux-") diff --git a/meta/recipes-devtools/cve-check-tool/cve-check-tool_5.6.4.bb b/meta/recipes-devtools/cve-check-tool/cve-check-tool_5.6.4.bb index 7b70daa323..1c84fb1cf2 100644 --- a/meta/recipes-devtools/cve-check-tool/cve-check-tool_5.6.4.bb +++ b/meta/recipes-devtools/cve-check-tool/cve-check-tool_5.6.4.bb @@ -41,6 +41,7 @@ do_populate_cve_db() { [ -z "${cve_dir}" ] && cve_dir="${DL_DIR}/CVE_CHECK" [ -z "${cve_file}" ] && cve_file="${TMPDIR}/cve_check" + unused="${@bb.utils.export_proxies(d)}" bbdebug 2 "Updating cve-check-tool database located in $cve_dir" # --cacert works around curl-native not finding the CA bundle if cve-check-update --cacert ${sysconfdir}/ssl/certs/ca-certificates.crt -d "$cve_dir" ; then |