summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python/python2.7.3-nossl3.patch
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2015-02-11 17:57:49 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-23 17:35:29 +0000
commitcb02ecb507ddad3cb17c78020b42c004aa2903ae (patch)
tree0f30353b3c8a3aaf6294f8db9c8fb7cff5575ab9 /meta/recipes-devtools/python/python/python2.7.3-nossl3.patch
parent122ee11bd1817f776336e54898cb36162fe527df (diff)
downloadpoky-cb02ecb507ddad3cb17c78020b42c004aa2903ae.tar.gz
Python: Upgrade from 2.7.3 to 2.7.9:
- Based on Paul Eggletons work to partially upgrade to Python 2.7.6 Modified: default-versions.inc: switched to python 2.7.9 generate-manifest-2.7.py: fixed _sysconfigdata python-2.7-manifest.inc: fixed _sysconfigdata python.inc: Updated checksums and source, no LICENSE change just updated some dates python-native_2.7.3 -> python-native_2.7.9 and updated patches python_2.7.3 -> python_2.7.9, and added ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no in EXTRA_OECONF to solve python issue #3754, only needed when cross compiling, also updated patches use_sysroot_ncurses_instead_of_host.patch: New patch to use ncursesw from sysroot instead of hosts, introduced by fix for python issue #15268 Rebased: 01-use-proper-tools-for-cross-build.patch 03-fix-tkinter-detection.patch 05-enable-ctypes-cross-build.patch 06-avoid_usr_lib_termcap_path_in_linking.patch avoid_warning_about_tkinter.patch builddir.patch fix_for_using_different_libdir.patch host_include_contamination.patch multilib.patch nohostlibs.patch search_db_h_in_inc_dirs_and_avoid_warning.patch Deleted (fixed on upstream): 06-ctypes-libffi-fix-configure.patch CVE-2013-4073_py27.patch gcc-4.8-fix-configure-Wformat.patch json-flaw-fix.patch posix_close.patch pypirc-secure.patch python-2.7.3-CVE-2012-2135.patch python-2.7.3-CVE-2013-1752-smtplib-fix.patch python-2.7.3-CVE-2014-1912.patch python-2.7.3-CVE-2014-7185.patch python-2.7.3-berkeley-db-5.3.patch python-fix-build-error-with-Readline-6.3.patch remove-BOM-insection-code.patch remove_sqlite_rpath.patch python2.7.3-nossl3.patch [YOCTO #7059] (From OE-Core rev: d4ad95f0d5f08891637c644e85b09da9c4585059) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python/python2.7.3-nossl3.patch')
-rw-r--r--meta/recipes-devtools/python/python/python2.7.3-nossl3.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/meta/recipes-devtools/python/python/python2.7.3-nossl3.patch b/meta/recipes-devtools/python/python/python2.7.3-nossl3.patch
deleted file mode 100644
index 2d35520a6d..0000000000
--- a/meta/recipes-devtools/python/python/python2.7.3-nossl3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1python: Building without SSLv3 support
2
3Building without SSLv3 support when openssl is built
4without any support for SSLv3
5
6Upstream-Status: Backport
7
8Reference:
9https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=76A8611#22
10
11Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
12---
13diff -ruN a/Modules/_ssl.c b/Modules/_ssl.c
14--- a/Modules/_ssl.c 2014-11-26 07:43:58.755679939 +0100
15+++ b/Modules/_ssl.c 2014-11-26 07:49:10.454182400 +0100
16@@ -302,8 +302,10 @@
17 PySSL_BEGIN_ALLOW_THREADS
18 if (proto_version == PY_SSL_VERSION_TLS1)
19 self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */
20+#ifndef OPENSSL_NO_SSL3
21 else if (proto_version == PY_SSL_VERSION_SSL3)
22 self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */
23+#endif
24 #ifndef OPENSSL_NO_SSL2
25 else if (proto_version == PY_SSL_VERSION_SSL2)
26 self->ctx = SSL_CTX_new(SSLv2_method()); /* Set up context */
27@@ -1777,8 +1779,10 @@
28 PyModule_AddIntConstant(m, "PROTOCOL_SSLv2",
29 PY_SSL_VERSION_SSL2);
30 #endif
31+#ifndef OPENSSL_NO_SSL3
32 PyModule_AddIntConstant(m, "PROTOCOL_SSLv3",
33 PY_SSL_VERSION_SSL3);
34+#endif
35 PyModule_AddIntConstant(m, "PROTOCOL_SSLv23",
36 PY_SSL_VERSION_SSL23);
37 PyModule_AddIntConstant(m, "PROTOCOL_TLSv1",