Change-Id: I6fa8ba8c72c455fb86a5c1891e7564edfbcf2e80
Reviewed-on: http://photon-jenkins.eng.vmware.com/1104
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: Sharath George
(cherry picked from commit 45bcf469454ad21af59e397fec91244d23859501)
Reviewed-on: http://photon-jenkins.eng.vmware.com/1108
Reviewed-by: suezzelur <anishs@vmware.com>
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,13 @@ |
| 0 |
+#Forcing ncurses module to compile with stack-protector flag |
|
| 1 |
+--- a/setup.py 2016-06-20 18:19:56.332815511 -0700 |
|
| 2 |
+@@ -1354,7 +1354,8 @@ |
|
| 3 |
+ [os.path.join(d, 'ncursesw') for d in inc_dirs]) |
|
| 4 |
+ exts.append( Extension('_curses', ['_cursesmodule.c'],
|
|
| 5 |
+ include_dirs = curses_incs, |
|
| 6 |
+- libraries = curses_libs) ) |
|
| 7 |
++ libraries = curses_libs, |
|
| 8 |
++ extra_compile_args=['-fstack-protector']) ) |
|
| 9 |
+ elif curses_library == 'curses' and host_platform != 'darwin': |
|
| 10 |
+ # OSX has an old Berkeley curses, not good enough for |
|
| 11 |
+ # the _curses module. |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: A high-level scripting language |
| 2 | 2 |
Name: python2 |
| 3 | 3 |
Version: 2.7.11 |
| 4 |
-Release: 4%{?dist}
|
|
| 4 |
+Release: 5%{?dist}
|
|
| 5 | 5 |
License: PSF |
| 6 | 6 |
URL: http://www.python.org/ |
| 7 | 7 |
Group: System Environment/Programming |
| ... | ... |
@@ -9,7 +9,8 @@ Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
Source0: http://www.python.org/ftp/python/2.7.11/Python-%{version}.tar.xz
|
| 11 | 11 |
%define sha1 Python=c3b8bbe3f084c4d4ea13ffb03d75a5e22f9756ff |
| 12 |
-Patch: cgi.patch |
|
| 12 |
+Patch0: cgi.patch |
|
| 13 |
+Patch1: added-compiler-flags-for-curses-module.patch |
|
| 13 | 14 |
BuildRequires: pkg-config >= 0.28 |
| 14 | 15 |
BuildRequires: bzip2-devel |
| 15 | 16 |
BuildRequires: openssl-devel |
| ... | ... |
@@ -96,7 +97,8 @@ to build python programs. |
| 96 | 96 |
|
| 97 | 97 |
%prep |
| 98 | 98 |
%setup -q -n Python-%{version}
|
| 99 |
-%patch -p1 |
|
| 99 |
+%patch0 -p1 |
|
| 100 |
+%patch1 -p1 |
|
| 100 | 101 |
%build |
| 101 | 102 |
export OPT="${CFLAGS}"
|
| 102 | 103 |
./configure \ |
| ... | ... |
@@ -213,6 +215,8 @@ rm -rf %{buildroot}/*
|
| 213 | 213 |
%{_bindir}/idle*
|
| 214 | 214 |
|
| 215 | 215 |
%changelog |
| 216 |
+* Mon Jun 20 2016 Divya Thaluru <dthaluru@vmware.com> 2.7.11-5 |
|
| 217 |
+- Added stack-protector flag for ncurses module |
|
| 216 | 218 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.7.11-4 |
| 217 | 219 |
- GA - Bump release of all rpms |
| 218 | 220 |
* Tue Apr 26 2016 Nick Shi <nshi@vmware.com> 2.7.11-3 |