Browse code

Updated python3 to version 3.5.3.

Change-Id: I8ecd4a4ecd8349e0c65d7a4e2b83f05f5047076b
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2095
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

xiaolin-vmware authored on 2017/03/01 08:39:20
Showing 2 changed files
1 1
deleted file mode 100644
... ...
@@ -1,22 +0,0 @@
1
-# HG changeset patch
2
-# User Benjamin Peterson <benjamin@python.org>
3
-# Date 1453357506 28800
4
-# Node ID 10dad6da1b28ea4af78ad9529e469fdbf4ebbc8f
5
-# Parent  a3ac2cd93db9d5336dfd7b5b27efde2c568d8794# Parent  01ddd608b85c85952537d95a43bbabf4fb655057
6
- 
7
-diff --git a/Modules/zipimport.c b/Modules/zipimport.c
8
-+++ b/Modules/zipimport.c
9
-@@ -1127,6 +1127,11 @@ get_data(PyObject *archive, PyObject *to
10
-     }
11
-     file_offset += l;           /* Start of file data */
12
- 
13
-+    if (data_size > LONG_MAX - 1) {
14
-+        fclose(fp);
15
-+        PyErr_NoMemory();
16
-+        return NULL;
17
-+    }
18
-     bytes_size = compress == 0 ? data_size : data_size + 1;
19
-     if (bytes_size == 0)
20
-         bytes_size++;
21
-
... ...
@@ -1,32 +1,31 @@
1
-Summary:	A high-level scripting language
2
-Name:		python3
3
-Version:	3.5.1
4
-Release:	6%{?dist}
5
-License:	PSF
6
-URL:		http://www.python.org/
7
-Group:		System Environment/Programming
8
-Vendor:		VMware, Inc.
9
-Distribution:	Photon
10
-Source0:	https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
11
-%define sha1 Python=0186da436db76776196612b98bb9c2f76acfe90e
1
+Summary:        A high-level scripting language
2
+Name:           python3
3
+Version:        3.5.3
4
+Release:        1%{?dist}
5
+License:        PSF
6
+URL:            http://www.python.org/
7
+Group:          System Environment/Programming
8
+Vendor:         VMware, Inc.
9
+Distribution:   Photon
10
+Source0:        https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
11
+%define         sha1 Python=127121fdca11e735b3686e300d66f73aba663e93
12 12
 Patch0:         cgi3.patch
13
-Patch1:         python3-CVE-2016-5636.patch
14
-BuildRequires:	pkg-config >= 0.28
15
-BuildRequires:	bzip2-devel
16
-BuildRequires:	ncurses-devel
13
+BuildRequires:  pkg-config >= 0.28
14
+BuildRequires:  bzip2-devel
15
+BuildRequires:  ncurses-devel
17 16
 BuildRequires:  openssl-devel
18 17
 BuildRequires:  readline-devel
19 18
 BuildRequires:  xz-devel
20
-Requires:	bzip2
21
-Requires:	ncurses
22
-Requires:  	openssl
23
-Requires:	python3-libs = %{version}-%{release}
24
-Requires:  	readline
25
-Requires:  	xz
26
-Provides: 	python-sqlite
27
-Provides: 	python(abi)
28
-Provides: 	/usr/bin/python
29
-Provides: 	/bin/python
19
+Requires:       bzip2
20
+Requires:       ncurses
21
+Requires:       openssl
22
+Requires:       python3-libs = %{version}-%{release}
23
+Requires:       readline
24
+Requires:       xz
25
+Provides:       python-sqlite
26
+Provides:       python(abi)
27
+Provides:       /usr/bin/python
28
+Provides:       /bin/python
30 29
 
31 30
 %description
32 31
 The Python 3 package contains a new version of Python development environment.
... ...
@@ -35,17 +34,17 @@ strings support, easier and more intuitive syntax, and removes the deprecated
35 35
 code. It is incompatible with Python 2.x releases.
36 36
 
37 37
 %package libs
38
-Summary: The libraries for python runtime
39
-Group: Applications/System
40
-BuildRequires:	expat >= 2.1.0
41
-BuildRequires:	libffi >= 3.0.13
42
-BuildRequires:	ncurses-devel
43
-BuildRequires:	sqlite-autoconf
44
-Requires:	coreutils
45
-Requires:	expat >= 2.1.0
46
-Requires:	libffi >= 3.0.13
47
-Requires:	ncurses
48
-Requires:	sqlite-autoconf
38
+Summary:        The libraries for python runtime
39
+Group:          Applications/System
40
+BuildRequires:  expat >= 2.1.0
41
+BuildRequires:  libffi >= 3.0.13
42
+BuildRequires:  ncurses-devel
43
+BuildRequires:  sqlite-autoconf
44
+Requires:       coreutils
45
+Requires:       expat >= 2.1.0
46
+Requires:       libffi >= 3.0.13
47
+Requires:       ncurses
48
+Requires:       sqlite-autoconf
49 49
 
50 50
 
51 51
 %description libs
... ...
@@ -85,20 +84,19 @@ to build python programs.
85 85
 %prep
86 86
 %setup -q -n Python-%{version}
87 87
 %patch0 -p1
88
-%patch1 -p1
89 88
 
90 89
 %build
91 90
 export OPT="${CFLAGS}"
92 91
 ./configure \
93
-	CFLAGS="%{optflags}" \
94
-	CXXFLAGS="%{optflags}" \
95
-	--prefix=%{_prefix} \
96
-	--bindir=%{_bindir} \
97
-	--libdir=%{_libdir} \
98
-	--enable-shared \
99
-	--with-system-expat \
100
-	--with-system-ffi \
101
-	--with-dbmliborder=gdbm:ndbm
92
+    CFLAGS="%{optflags}" \
93
+    CXXFLAGS="%{optflags}" \
94
+    --prefix=%{_prefix} \
95
+    --bindir=%{_bindir} \
96
+    --libdir=%{_libdir} \
97
+    --enable-shared \
98
+    --with-system-expat \
99
+    --with-system-ffi \
100
+    --with-dbmliborder=gdbm:ndbm
102 101
 make %{?_smp_mflags}
103 102
 
104 103
 %install
... ...
@@ -188,21 +186,23 @@ rm -rf %{buildroot}/*
188 188
 %{_bindir}/idle*
189 189
 
190 190
 %changelog
191
-*   	Thu Oct 27 2016 Anish Swaminathan <anishs@vmware.com> 3.5.1-6
192
--   	Patch for CVE-2016-5636
193
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.5.1-5
194
--	GA - Bump release of all rpms
195
-*	Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 3.5.1-4
196
--	Edit scriptlets.
197
-*   	Wed Apr 13 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.5.1-3
198
--   	update python to require python-libs
199
-*   	Thu Apr 07 2016 Mahmoud Bassiouny <mbassiouny@vmware.com> 3.5.1-2
200
--   	Providing python3 binaries instead of the minor versions.
201
-*   	Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.5.1-1
202
--   	Updated to version 3.5.1
203
-*	Wed Dec 09 2015 Anish Swaminathan <anishs@vmware.com> 3.4.3-3
204
--	Edit post script.
205
-*	Mon Aug 17 2015 Vinay Kulkarni <kulkarniv@vmware.com> 3.4.3-2
206
--	Remove python.o file, and minor cleanups.
207
-*	Wed Jul 1 2015 Vinay Kulkarni <kulkarniv@vmware.com> 3.4.3
208
--	Add Python3 package to Photon.
191
+*   Tue Feb 28 2017 Xiaolin Li <xiaolinl@vmware.com> 3.5.3-1
192
+-   Updated to version 3.5.3
193
+*   Thu Oct 27 2016 Anish Swaminathan <anishs@vmware.com> 3.5.1-6
194
+-   Patch for CVE-2016-5636
195
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.5.1-5
196
+-   GA - Bump release of all rpms
197
+*   Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 3.5.1-4
198
+-   Edit scriptlets.
199
+*   Wed Apr 13 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.5.1-3
200
+-   update python to require python-libs
201
+*   Thu Apr 07 2016 Mahmoud Bassiouny <mbassiouny@vmware.com> 3.5.1-2
202
+-   Providing python3 binaries instead of the minor versions.
203
+*   Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.5.1-1
204
+-   Updated to version 3.5.1
205
+*   Wed Dec 09 2015 Anish Swaminathan <anishs@vmware.com> 3.4.3-3
206
+-   Edit post script.
207
+*   Mon Aug 17 2015 Vinay Kulkarni <kulkarniv@vmware.com> 3.4.3-2
208
+-   Remove python.o file, and minor cleanups.
209
+*   Wed Jul 1 2015 Vinay Kulkarni <kulkarniv@vmware.com> 3.4.3
210
+-   Add Python3 package to Photon.