Browse code
Updated Python to version 2.7.13
Change-Id: Id282feadf685f4feeec0654217611b630ed682b0
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2170
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
dthaluru authored on 2017/03/23 09:35:18Showing 2 changed files
| ... | ... |
@@ -1,9 +1,9 @@ |
| 1 |
-+++ b/Lib/ssl.py |
|
| 2 |
-@@ -137,6 +137,11 @@ from socket import socket, AF_INET, SOCK_STREAM, create_connection |
|
| 3 |
- from socket import SOL_SOCKET, SO_TYPE |
|
| 1 |
+--- a/Lib/ssl.py 2016-12-17 12:05:06.000000000 -0800 |
|
| 2 |
+@@ -146,6 +146,11 @@ |
|
| 4 | 3 |
import base64 # for DER-to-PEM translation |
| 5 | 4 |
import errno |
| 5 |
+ import warnings |
|
| 6 | 6 |
+try: |
| 7 | 7 |
+ from ipaddr import IPAddress |
| 8 | 8 |
+except ImportError: |
| ... | ... |
@@ -12,7 +12,7 @@ |
| 12 | 12 |
|
| 13 | 13 |
if _ssl.HAS_TLS_UNIQUE: |
| 14 | 14 |
CHANNEL_BINDING_TYPES = ['tls-unique'] |
| 15 |
-@@ -232,7 +237,15 @@ def _dnsname_match(dn, hostname, max_wildcards=1): |
|
| 15 |
+@@ -245,7 +250,15 @@ |
|
| 16 | 16 |
pat = re.compile(r'\A' + r'\.'.join(pats) + r'\Z', re.IGNORECASE) |
| 17 | 17 |
return pat.match(hostname) |
| 18 | 18 |
|
| ... | ... |
@@ -28,7 +28,7 @@ |
| 28 | 28 |
def match_hostname(cert, hostname): |
| 29 | 29 |
"""Verify that *cert* (in decoded format as returned by |
| 30 | 30 |
SSLSocket.getpeercert()) matches the *hostname*. RFC 2818 and RFC 6125 |
| 31 |
-@@ -245,13 +258,24 @@ def match_hostname(cert, hostname): |
|
| 31 |
+@@ -258,6 +271,13 @@ |
|
| 32 | 32 |
raise ValueError("empty or no certificate, match_hostname needs a "
|
| 33 | 33 |
"SSL socket or SSL context with either " |
| 34 | 34 |
"CERT_OPTIONAL or CERT_REQUIRED") |
| ... | ... |
@@ -42,7 +42,7 @@ |
| 42 | 42 |
dnsnames = [] |
| 43 | 43 |
san = cert.get('subjectAltName', ())
|
| 44 | 44 |
for key, value in san: |
| 45 |
- if key == 'DNS': |
|
| 45 |
+@@ -265,6 +285,10 @@ |
|
| 46 | 46 |
if _dnsname_match(value, hostname): |
| 47 | 47 |
return |
| 48 | 48 |
dnsnames.append(value) |
| ... | ... |
@@ -1,18 +1,17 @@ |
| 1 | 1 |
Summary: A high-level scripting language |
| 2 | 2 |
Name: python2 |
| 3 |
-Version: 2.7.11 |
|
| 4 |
-Release: 9%{?dist}
|
|
| 3 |
+Version: 2.7.13 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: PSF |
| 6 | 6 |
URL: http://www.python.org/ |
| 7 | 7 |
Group: System Environment/Programming |
| 8 | 8 |
Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 |
-Source0: http://www.python.org/ftp/python/2.7.11/Python-%{version}.tar.xz
|
|
| 11 |
-%define sha1 Python=c3b8bbe3f084c4d4ea13ffb03d75a5e22f9756ff |
|
| 10 |
+Source0: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
|
|
| 11 |
+%define sha1 Python=18a8f30a0356c751b8d0ea6f76e764cab13ee046 |
|
| 12 | 12 |
Patch0: cgi.patch |
| 13 | 13 |
Patch1: added-compiler-flags-for-curses-module.patch |
| 14 | 14 |
Patch2: added-pyopenssl-ipaddress-certificate-validation.patch |
| 15 |
-Patch3: python2-CVE-2016-5636.patch |
|
| 16 | 15 |
BuildRequires: pkg-config >= 0.28 |
| 17 | 16 |
BuildRequires: bzip2-devel |
| 18 | 17 |
BuildRequires: openssl-devel |
| ... | ... |
@@ -103,7 +102,6 @@ to build python programs. |
| 103 | 103 |
%patch0 -p1 |
| 104 | 104 |
%patch1 -p1 |
| 105 | 105 |
%patch2 -p1 |
| 106 |
-%patch3 -p1 |
|
| 107 | 106 |
|
| 108 | 107 |
%build |
| 109 | 108 |
export OPT="${CFLAGS}"
|
| ... | ... |
@@ -221,6 +219,8 @@ rm -rf %{buildroot}/*
|
| 221 | 221 |
%{_bindir}/idle*
|
| 222 | 222 |
|
| 223 | 223 |
%changelog |
| 224 |
+* Wed Mar 22 2017 Divya Thaluru <dthaluru@vmware.com> 2.7.13-1 |
|
| 225 |
+- Updated to version 2.7.13 |
|
| 224 | 226 |
* Fri Mar 10 2017 Xiaolin Li <xiaolinl@vmware.com> 2.7.11-9 |
| 225 | 227 |
- Provides /bin/python2. |
| 226 | 228 |
* Thu Oct 27 2016 Anish Swaminathan <anishs@vmware.com> 2.7.11-8 |