Merge pull request cms-sw#2171 from degano/python2711_81X

Update python to 2.7.11

cmssw-tool-conf.spec

@@ -1,4 +1,4 @@
-### RPM cms cmssw-tool-conf 32.0
+### RPM cms cmssw-tool-conf 33.0
 ## NOCOMPILER
 # With cmsBuild, change the above version only when a new
 # tool is added
@@ -155,6 +155,7 @@ Requires: py2-pyparsing-toolfile
 Requires: py2-requests-toolfile
 Requires: giflib-toolfile
 Requires: utm-toolfile
+Requires: libffi-toolfile
 
 # Only for Linux platform.
 %if %islinux

graphviz.spec

@@ -1,21 +1,21 @@
-### RPM external graphviz 2.16.1
+### RPM external graphviz 2.38.0
 Source: http://www.graphviz.org/pub/%{n}/ARCHIVE/%{n}-%{realversion}.tar.gz  
-Requires: expat zlib libjpg libpng 
+Requires: expat zlib libjpg libpng
 
 %prep
 %setup -n %{n}-%{realversion}
 
 %build
-which gcc
 case %cmsplatf in
-    slc*)
+    slc*|fc*)
         ADDITIONAL_OPTIONS="--with-freetype2=no --disable-shared --enable-static --disable-ltdl"
     ;;
     osx*)
         ADDITIONAL_OPTIONS="--with-freetype2=no"
     ;;
 esac
 ./configure \
+  --disable-silent-rules \
   --with-expatlibdir=$EXPAT_ROOT/lib \
   --with-expatincludedir=$EXPAT_ROOT/include \
   --with-zincludedir=$ZLIB_ROOT/include \
@@ -37,6 +37,7 @@ esac
   --without-pangocairo \
   --without-fontconfig \
   --without-gdk-pixbuf \
+  --with-libgd=no \
   --disable-sharp \
   --disable-guile \
   --disable-java \
@@ -45,32 +46,23 @@ esac
   --disable-perl \
   --disable-php \
   --disable-python \
+  --with-qt=no \
   --prefix=%{i} \
   $ADDITIONAL_OPTIONS
 
-# Probably the configure should just be remade on Darwin, but it builds
-# as-is with this small cleanup
-#perl -p -i -e "s|-lexpat||g;s|-ljpeg||g" configure
-# make %makeprocesses
-make 
+make %{makeprocesses}
 
 %install
 make install
 %define drop_files %{i}/share
-# We remove pkg-config files for two reasons:
-# * it's actually not required (macosx does not even have it).
-# * rpm 4.8 adds a dependency on the system /usr/bin/pkg-config 
-#   on linux.
-# In the case at some point we build a package that can be build
-# only via pkg-config we have to think on how to ship our own
-# version.
-rm -rf %i/lib/pkgconfig
+
+rm -rf %{i}/lib/pkgconfig
 
 # To match configure options above
-case %cmsplatf in
-    slc*)
-        ln -s dot_static %i/bin/dot
+case %{cmsplatf} in
+    slc*|fc*)
+        ln -s dot_static %{i}/bin/dot
     ;;
 esac
 # Drop static libraries.
-rm -rf %i/lib/*.{l,}a
+rm -rf %{i}/lib/*.{l,}a

libffi-3.2.1-fix-include-path.patch

@@ -0,0 +1,37 @@
+diff --git a/include/Makefile.am b/include/Makefile.am
+index fd28024..8090684 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
+ DISTCLEANFILES=ffitarget.h
+ EXTRA_DIST=ffi.h.in ffi_common.h
+
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includesdir = $(includedir)/
+ nodist_includes_HEADERS = ffi.h ffitarget.h
+diff --git a/include/Makefile.in b/include/Makefile.in
+index 9d747e8..b1c939e 100644
+--- a/include/Makefile.in
++++ b/include/Makefile.in
+@@ -314,7 +314,7 @@ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign
+ DISTCLEANFILES = ffitarget.h
+ EXTRA_DIST = ffi.h.in ffi_common.h
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includesdir = $(includedir)/
+ nodist_includes_HEADERS = ffi.h ffitarget.h
+ all: all-am
+
+diff --git a/libffi.pc.in b/libffi.pc.in
+index edf6fde..6fad83b 100644
+--- a/libffi.pc.in
++++ b/libffi.pc.in
+@@ -2,7 +2,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ toolexeclibdir=@toolexeclibdir@
+-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includedir=@includedir@
+
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces

libffi-toolfile.spec

@@ -0,0 +1,21 @@
+### RPM external libffi-toolfile 1.0
+Requires: libffi
+%prep
+
+%build
+
+%install
+
+mkdir -p %{i}/etc/scram.d
+cat << \EOF_TOOLFILE >%{i}/etc/scram.d/libffi.xml
+<tool name="libffi" version="@TOOL_VERSION@">
+  <lib name="ffi"/>
+  <client>
+    <environment name="LIBFFI_BASE" default="@TOOL_ROOT@"/>
+    <environment name="LIBDIR" default="$LIBFFI_BASE/lib64"/>
+    <environment name="INCLUDE" default="$LIBFFI_BASE/include"/>
+  </client>
+</tool>
+EOF_TOOLFILE
+
+## IMPORT scram-tools-post

libffi.spec

@@ -0,0 +1,27 @@
+### RPM external libffi 3.2.1
+## INITENV +PATH LD_LIBRARY_PATH %{i}/lib64
+
+Source: ftp://sourceware.org/pub/%{n}/%{n}-%{realversion}.tar.gz
+
+Patch0: libffi-3.2.1-fix-include-path
+
+%prep
+%setup -n %{n}-%{realversion}
+%patch0 -p1
+
+%build
+./configure \
+  --prefix=%{i} \
+  --enable-portable-binary \
+  --disable-dependency-tracking \
+  --disable-static
+
+make %{makeprocesses}
+
+%install
+make %{makeprocesses} install
+
+rm -rf %{i}/lib
+rm -rf %{i}/lib64/*.la
+
+%define drop_files %{i}/share

openssl-1.0.2d-disable-install-openssldir.patch

@@ -0,0 +1,38 @@
+diff --git a/apps/Makefile b/apps/Makefile
+index cafe554..547fc41 100644
+--- a/apps/Makefile
++++ b/apps/Makefile
+@@ -109,16 +109,6 @@ install:
+ 	 chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
+ 	 mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \
+ 	 done;
+-	@set -e; for i in $(SCRIPTS); \
+-	do  \
+-	(echo installing $$i; \
+-	 cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
+-	 chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
+-	 mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
+-	 done
+-	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
+-	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
+-	mv -f  $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
+
+ tags:
+ 	ctags $(SRC)
+diff --git a/tools/Makefile b/tools/Makefile
+index c1a2f6b..6e7c104 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -26,12 +26,6 @@ install:
+ 	chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
+ 	mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \
+ 	done;
+-	@for i in $(MISC_APPS) ; \
+-	do  \
+-	(cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
+-	chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
+-	mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
+-	done;
+
+ files:
+ 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO

openssl-1.0.2d-pr3979.patch

@@ -0,0 +1,44 @@
+diff --git a/crypto/x509v3/v3_purp.c b/crypto/x509v3/v3_purp.c
+index 36b0d87..845be67 100644
+--- a/crypto/x509v3/v3_purp.c
++++ b/crypto/x509v3/v3_purp.c
+@@ -380,6 +380,14 @@ static void setup_crldp(X509 *x)
+         setup_dp(x, sk_DIST_POINT_value(x->crldp, i));
+ }
+
++#define V1_ROOT (EXFLAG_V1|EXFLAG_SS)
++#define ku_reject(x, usage) \
++        (((x)->ex_flags & EXFLAG_KUSAGE) && !((x)->ex_kusage & (usage)))
++#define xku_reject(x, usage) \
++        (((x)->ex_flags & EXFLAG_XKUSAGE) && !((x)->ex_xkusage & (usage)))
++#define ns_reject(x, usage) \
++        (((x)->ex_flags & EXFLAG_NSCERT) && !((x)->ex_nscert & (usage)))
++
+ static void x509v3_cache_extensions(X509 *x)
+ {
+     BASIC_CONSTRAINTS *bs;
+@@ -499,7 +507,8 @@ static void x509v3_cache_extensions(X509 *x)
+     if (!X509_NAME_cmp(X509_get_subject_name(x), X509_get_issuer_name(x))) {
+         x->ex_flags |= EXFLAG_SI;
+         /* If SKID matches AKID also indicate self signed */
+-        if (X509_check_akid(x, x->akid) == X509_V_OK)
++        if (X509_check_akid(x, x->akid) == X509_V_OK &&
++            !ku_reject(x, KU_KEY_CERT_SIGN))
+             x->ex_flags |= EXFLAG_SS;
+     }
+     x->altname = X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL);
+@@ -538,14 +547,6 @@ static void x509v3_cache_extensions(X509 *x)
+  * 4 basicConstraints absent but keyUsage present and keyCertSign asserted.
+  */
+
+-#define V1_ROOT (EXFLAG_V1|EXFLAG_SS)
+-#define ku_reject(x, usage) \
+-        (((x)->ex_flags & EXFLAG_KUSAGE) && !((x)->ex_kusage & (usage)))
+-#define xku_reject(x, usage) \
+-        (((x)->ex_flags & EXFLAG_XKUSAGE) && !((x)->ex_xkusage & (usage)))
+-#define ns_reject(x, usage) \
+-        (((x)->ex_flags & EXFLAG_NSCERT) && !((x)->ex_nscert & (usage)))
+-
+ static int check_ca(const X509 *x)
+ {
+     /* keyUsage if present should allow cert signing */