python3: don't use Windows cert store for SSL

This commit is contained in:
Ray Donnelly
2014-06-19 20:44:43 +01:00
parent 0b82e81511
commit 6f548ae37b
2 changed files with 25 additions and 1 deletions

View File

@@ -0,0 +1,21 @@
diff -urN Python-3.4.1.orig/Lib/ssl.py Python-3.4.1/Lib/ssl.py
--- Python-3.4.1.orig/Lib/ssl.py 2014-06-19 17:43:06.631281400 +0100
+++ Python-3.4.1/Lib/ssl.py 2014-06-19 17:50:29.817281400 +0100
@@ -144,7 +144,7 @@
_PROTOCOL_NAMES[PROTOCOL_TLSv1_1] = "TLSv1.1"
_PROTOCOL_NAMES[PROTOCOL_TLSv1_2] = "TLSv1.2"
-if sys.platform == "win32":
+if sys.platform == "win32" and sys.version.find("GCC") == -1:
from _ssl import enum_certificates, enum_crls
from socket import socket, AF_INET, SOCK_STREAM, create_connection
@@ -387,7 +387,7 @@
def load_default_certs(self, purpose=Purpose.SERVER_AUTH):
if not isinstance(purpose, _ASN1Object):
raise TypeError(purpose)
- if sys.platform == "win32":
+ if sys.platform == "win32" and sys.version.find("GCC") == -1:
for storename in self._windows_cert_stores:
self._load_windows_store_certs(storename, purpose)
else:

View File

@@ -6,7 +6,7 @@ _realname=python3
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
_pybasever=3.4
pkgver=${_pybasever}.1
pkgrel=1
pkgrel=2
pkgdesc="A high-level scripting language (mingw-w64)"
arch=('any')
license=('PSF')
@@ -102,6 +102,7 @@ source=("http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"
0840-gdbm-module-includes.patch
0850-use-gnu_printf-in-format.patch
0860-fix-_Py_CheckPython3-prototype.patch
0870-mingw-fix-ssl-dont-use-enum_certificates.patch
1000-fix-building-posixmodule.patch)
prepare() {
@@ -194,6 +195,7 @@ prepare() {
patch -Np1 -i "${srcdir}"/0840-gdbm-module-includes.patch
patch -Np1 -i "${srcdir}"/0850-use-gnu_printf-in-format.patch
patch -Np1 -i "${srcdir}"/0860-fix-_Py_CheckPython3-prototype.patch
patch -Np1 -i "${srcdir}"/0870-mingw-fix-ssl-dont-use-enum_certificates.patch
patch -Np1 -i "${srcdir}"/1000-fix-building-posixmodule.patch
@@ -395,4 +397,5 @@ md5sums=('6cafc183b4106476dd73d5738d7f616a'
'0b9999457d955010f3f2a8460a564fea'
'c4a497ac25a8438ea0142000d75f1965'
'abec47dfff50a6b1adf6b78e9466a529'
'501eaec84e4516a8201679ee45797a59'
'38b940ff6ef0652c004c461f4393771a')