From be6481ca9f144708c8d6f741396be6e597eb8f18 Mon Sep 17 00:00:00 2001 From: "Hongzhi.Song" Date: Wed, 10 Apr 2019 23:13:42 -0700 Subject: [PATCH] lua: upgrade from v5.3.4 to v5.3.5 The v5.3.5 release covers CVE-2019-6706 which is vulnerable. Signed-off-by: Hongzhi.Song Signed-off-by: Khem Raj --- .../lua/{lua_5.3.4.bb => lua_5.3.5.bb} | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) rename meta-oe/recipes-devtools/lua/{lua_5.3.4.bb => lua_5.3.5.bb} (80%) diff --git a/meta-oe/recipes-devtools/lua/lua_5.3.4.bb b/meta-oe/recipes-devtools/lua/lua_5.3.5.bb similarity index 80% rename from meta-oe/recipes-devtools/lua/lua_5.3.4.bb rename to meta-oe/recipes-devtools/lua/lua_5.3.5.bb index 8f4e8fe68c..265e2519e0 100644 --- a/meta-oe/recipes-devtools/lua/lua_5.3.4.bb +++ b/meta-oe/recipes-devtools/lua/lua_5.3.5.bb @@ -8,13 +8,17 @@ DEPENDS = "readline" SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \ file://lua.pc.in \ " + +# if no test suite matches PV release of Lua exactly, download the suite for the closest Lua release. +PV_testsuites = "5.3.4" + SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', \ - 'http://www.lua.org/tests/lua-${PV}-tests.tar.gz;name=tarballtest \ + 'http://www.lua.org/tests/lua-${PV_testsuites}-tests.tar.gz;name=tarballtest \ file://run-ptest \ ', '', d)}" -SRC_URI[tarballsrc.md5sum] = "53a9c68bcc0eda58bdc2095ad5cdfc63" -SRC_URI[tarballsrc.sha256sum] = "f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c" +SRC_URI[tarballsrc.md5sum] = "4f4b4f323fd3514a68e0ab3da8ce3455" +SRC_URI[tarballsrc.sha256sum] = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac" SRC_URI[tarballtest.md5sum] = "b14fe3748c1cb2d74e3acd1943629ba3" SRC_URI[tarballtest.sha256sum] = "b80771238271c72565e5a1183292ef31bd7166414cd0d43a8eb79845fa7f599f" @@ -53,7 +57,7 @@ do_install () { } do_install_ptest () { - cp -R --no-dereference --preserve=mode,links -v ${WORKDIR}/lua-${PV}-tests ${D}${PTEST_PATH}/test + cp -R --no-dereference --preserve=mode,links -v ${WORKDIR}/lua-${PV_testsuites}-tests ${D}${PTEST_PATH}/test } BBCLASSEXTEND = "native nativesdk"