diff options
author | Armin Kuster <akuster@mvista.com> | 2016-03-09 09:06:57 -0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-03-09 20:10:13 +0100 |
commit | c305ac5d2f5285d5eec8952a4ca7f3b4f89aed96 (patch) | |
tree | b81ca9656878dc155246bfb55c243644fe899b83 | |
parent | a80a886056f1f6d763776db7baf6df77fd12cbaf (diff) | |
download | meta-openembedded-c305ac5d2f5285d5eec8952a4ca7f3b4f89aed96.tar.gz |
python-m2crypto: fix SSLv2 symbol issue
missed using "-D" for OPENSSL_NO_SSL2 swig_features.
ERROR: Failed to import the "M2Crypto" module: .../usr/lib/python2.7/site-packages/M2Crypto/__m2crypto.so: undefined symbol: SSLv2_method
disable using SSLv2_method if not supported in openssl. This is now the case
with the advent of CVE-2016-0800
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch | 20 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb | 4 |
2 files changed, 23 insertions, 1 deletions
diff --git a/meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch b/meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch new file mode 100644 index 000000000..526c23fa8 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-m2crypto/dont_try_build_with_SSLv2_when_it_is_not_available.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Upstream-Status: Backport | ||
2 | https://gitlab.com/m2crypto/m2crypto/commit/ac01b38302474920288c1a9eb63fd35fa8d1db5b | ||
3 | |||
4 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
5 | |||
6 | Index: M2Crypto-0.21.1/SWIG/_ssl.i | ||
7 | =================================================================== | ||
8 | --- M2Crypto-0.21.1.orig/SWIG/_ssl.i | ||
9 | +++ M2Crypto-0.21.1/SWIG/_ssl.i | ||
10 | @@ -48,8 +48,10 @@ extern const char *SSL_alert_desc_string | ||
11 | %rename(ssl_get_alert_desc_v) SSL_alert_desc_string_long; | ||
12 | extern const char *SSL_alert_desc_string_long(int); | ||
13 | |||
14 | +#ifndef OPENSSL_NO_SSL2 | ||
15 | %rename(sslv2_method) SSLv2_method; | ||
16 | extern SSL_METHOD *SSLv2_method(void); | ||
17 | +#endif | ||
18 | %rename(sslv3_method) SSLv3_method; | ||
19 | extern SSL_METHOD *SSLv3_method(void); | ||
20 | %rename(sslv23_method) SSLv23_method; | ||
diff --git a/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb b/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb index ff6203f20..9daea5e41 100644 --- a/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb +++ b/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb | |||
@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" | |||
8 | 8 | ||
9 | SRC_URI = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz \ | 9 | SRC_URI = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz \ |
10 | file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \ | 10 | file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \ |
11 | file://0001-M2Crypto-Error-fix.patch" | 11 | file://0001-M2Crypto-Error-fix.patch \ |
12 | file://dont_try_build_with_SSLv2_when_it_is_not_available.patch" | ||
12 | 13 | ||
13 | SRC_URI[md5sum] = "f93d8462ff7646397a9f77a2fe602d17" | 14 | SRC_URI[md5sum] = "f93d8462ff7646397a9f77a2fe602d17" |
14 | SRC_URI[sha256sum] = "25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a" | 15 | SRC_URI[sha256sum] = "25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a" |
@@ -19,6 +20,7 @@ inherit setuptools | |||
19 | 20 | ||
20 | SWIG_FEATURES_x86-64 = "-D__x86_64__" | 21 | SWIG_FEATURES_x86-64 = "-D__x86_64__" |
21 | SWIG_FEATURES ?= "" | 22 | SWIG_FEATURES ?= "" |
23 | SWIG_FEATURES += "-DOPENSSL_NO_SSL2" | ||
22 | export SWIG_FEATURES | 24 | export SWIG_FEATURES |
23 | 25 | ||
24 | # Get around a problem with swig, but only if the | 26 | # Get around a problem with swig, but only if the |