mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-07-19 15:29:08 +02:00

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>
24 lines
878 B
Diff
24 lines
878 B
Diff
Filter out '/usr/include' for swig to avoid host contamination issue.
|
|
|
|
Upstream-Status: Inappropriate [cross compile specific]
|
|
|
|
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
|
---
|
|
setup.py | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 5a12981..389d49f 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -153,7 +153,8 @@ class _M2CryptoBuildExt(build_ext.build_ext):
|
|
self.swig_opts.append('-py3')
|
|
|
|
# swig seems to need the default header file directories
|
|
- self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()])
|
|
+ self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()
|
|
+ if i != '/usr/include'])
|
|
|
|
log.debug('self.include_dirs = %s', self.include_dirs)
|
|
log.debug('self.library_dirs = %s', self.library_dirs)
|