diff options
| author | Kai Kang <kai.kang@windriver.com> | 2022-11-25 10:38:44 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-11-25 18:11:10 -0800 |
| commit | 71fc24398981e68d50c94cbaf294e38a81b8db36 (patch) | |
| tree | 2ea8ac1335cec978b31863574a706352e8d5de7e /meta-python/recipes-devtools/python/python3-m2crypto_0.38.0.bb | |
| parent | ea94889e88d6389337f8b53d69d4129095cc3b77 (diff) | |
| download | meta-openembedded-71fc24398981e68d50c94cbaf294e38a81b8db36.tar.gz | |
python3-m2crypto: fix CVE-2020-25657 and buildpaths qa issue
Backport patch to fix CVE-2020-25657 for python3-m2crypto. Adjust indent
as well.
Remove duplicate 'Upstream-Status:' from avoid-host-contamination.patch.
Add swig option '-DOPENSSL_FILE' to fix buildpaths qa issues.
WARNING: python3-m2crypto-0.38.0-r0 do_package_qa: QA Issue: File
/usr/lib/python3.11/site-packages/M2Crypto/_m2crypto.cpython-311-x86_64-linux-gnu.so
in package python3-m2crypto contains reference to TMPDIR [buildpaths]
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools/python/python3-m2crypto_0.38.0.bb')
| -rw-r--r-- | meta-python/recipes-devtools/python/python3-m2crypto_0.38.0.bb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto_0.38.0.bb b/meta-python/recipes-devtools/python/python3-m2crypto_0.38.0.bb index 51a0dd676e..40e3bfb316 100644 --- a/meta-python/recipes-devtools/python/python3-m2crypto_0.38.0.bb +++ b/meta-python/recipes-devtools/python/python3-m2crypto_0.38.0.bb | |||
| @@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" | |||
| 7 | FILESEXTRAPATHS:prepend := "${THISDIR}/python-m2crypto:" | 7 | FILESEXTRAPATHS:prepend := "${THISDIR}/python-m2crypto:" |
| 8 | 8 | ||
| 9 | SRC_URI += "file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \ | 9 | SRC_URI += "file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \ |
| 10 | file://cross-compile-platform.patch \ | 10 | file://cross-compile-platform.patch \ |
| 11 | file://avoid-host-contamination.patch \ | 11 | file://avoid-host-contamination.patch \ |
| 12 | file://0001-setup.py-address-openssl-3.x-build-issue.patch \ | 12 | file://0001-setup.py-address-openssl-3.x-build-issue.patch \ |
| 13 | " | 13 | file://CVE-2020-25657.patch \ |
| 14 | " | ||
| 14 | SRC_URI[sha256sum] = "99f2260a30901c949a8dc6d5f82cd5312ffb8abc92e76633baf231bbbcb2decb" | 15 | SRC_URI[sha256sum] = "99f2260a30901c949a8dc6d5f82cd5312ffb8abc92e76633baf231bbbcb2decb" |
| 15 | 16 | ||
| 16 | PYPI_PACKAGE = "M2Crypto" | 17 | PYPI_PACKAGE = "M2Crypto" |
| @@ -34,7 +35,7 @@ DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR}" | |||
| 34 | SWIG_FEATURES:x86 = "-D__i386__" | 35 | SWIG_FEATURES:x86 = "-D__i386__" |
| 35 | SWIG_FEATURES:x32 = "-D__ILP32__" | 36 | SWIG_FEATURES:x32 = "-D__ILP32__" |
| 36 | 37 | ||
| 37 | SWIG_FEATURES ?= "-D__${HOST_ARCH}__ ${@['-D__ILP32__','-D__LP64__'][d.getVar('SITEINFO_BITS') != '32']}" | 38 | SWIG_FEATURES ?= "-D__${HOST_ARCH}__ ${@['-D__ILP32__','-D__LP64__'][d.getVar('SITEINFO_BITS') != '32']} -DOPENSSL_FILE='openssl/macros.h'" |
| 38 | 39 | ||
| 39 | SWIG_FEATURES:append:riscv64 = " -D__SIZEOF_POINTER__=${SITEINFO_BITS}/8 -D__riscv_xlen=${SITEINFO_BITS}" | 40 | SWIG_FEATURES:append:riscv64 = " -D__SIZEOF_POINTER__=${SITEINFO_BITS}/8 -D__riscv_xlen=${SITEINFO_BITS}" |
| 40 | SWIG_FEATURES:append:riscv32 = " -D__SIZEOF_POINTER__=${SITEINFO_BITS}/8 -D__riscv_xlen=${SITEINFO_BITS}" | 41 | SWIG_FEATURES:append:riscv32 = " -D__SIZEOF_POINTER__=${SITEINFO_BITS}/8 -D__riscv_xlen=${SITEINFO_BITS}" |