[depends] bump python to 2.7.11

6 files changed, 11 insertions, 26 deletions

diff --git a/tools/depends/target/python27/Makefile b/tools/depends/target/python27/Makefile
index 7bfc59fcad..d6a68bdd87 100644
--- a/tools/depends/target/python27/Makefile
+++ b/tools/depends/target/python27/Makefile
@@ -4,7 +4,7 @@ DEPS= ../../Makefile.include Makefile Python-2.7.10-crosscompile.patch Python-2.
 
 # lib name, version
 LIBNAME=Python
-VERSION=2.7.10
+VERSION=2.7.11
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.xz
 
@@ -39,7 +39,6 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	cd $(PLATFORM); patch -p0 < ../Python-2.7.10-android.patch
 	cd $(PLATFORM); patch -p0 < ../Python-no-export-path.patch
 	cd $(PLATFORM); patch -p0 < ../fix-ffi.patch
-	#cd $(PLATFORM); patch -p1 < ../urllib-ssl-no-cert_check.patch
 ifeq ($(OS),ios)
 	cd $(PLATFORM); patch -p0 < ../make-fork-optional.patch
 	cd $(PLATFORM); patch -p0 < ../Python-2.6.5-urllib.diff
diff --git a/tools/depends/target/python27/Python-2.7.10-crosscompile.patch b/tools/depends/target/python27/Python-2.7.10-crosscompile.patch
index 7de1ead296..c7c1c42949 100644
--- a/tools/depends/target/python27/Python-2.7.10-crosscompile.patch
+++ b/tools/depends/target/python27/Python-2.7.10-crosscompile.patch
@@ -1,6 +1,6 @@
 --- Makefile.pre.in.orig	2015-05-23 18:09:16.000000000 +0200
 +++ Makefile.pre.in	2015-10-10 12:29:21.988926069 +0200
-@@ -234,6 +234,7 @@
+@@ -238,6 +238,7 @@
  ##########################################################################
  # Parser
  PGEN=		Parser/pgen$(EXE)
@@ -8,7 +8,7 @@
  
  PSRCS=		\
  		Parser/acceler.c \
-@@ -472,9 +473,9 @@
+@@ -497,9 +498,9 @@
  	    *\ -s*|s*) quiet="-q";; \
  	    *) quiet="";; \
  	esac; \
@@ -20,7 +20,7 @@
  
  # Build static library
  # avoid long command lines, same as LIBRARY_OBJS
-@@ -611,7 +612,7 @@
+@@ -636,7 +637,7 @@
  $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
  		@$(MKDIR_P) Include
  		$(MAKE) $(PGEN)
@@ -29,7 +29,7 @@
  $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
  		$(MAKE) $(GRAMMAR_H)
  		touch $(GRAMMAR_C)
-@@ -1042,12 +1043,12 @@
+@@ -1072,12 +1073,12 @@
  		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
  			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
  	fi
@@ -44,7 +44,7 @@
  		$(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
  		-d $(LIBDEST) -f \
  		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-@@ -1175,11 +1176,13 @@
+@@ -1205,11 +1206,13 @@
  # Install the dynamically loadable modules
  # This goes into $(exec_prefix)
  sharedinstall: sharedmods
diff --git a/tools/depends/target/python27/Python-no-export-path.patch b/tools/depends/target/python27/Python-no-export-path.patch
index 5b001b1ed3..6c486ccc4a 100644
--- a/tools/depends/target/python27/Python-no-export-path.patch
+++ b/tools/depends/target/python27/Python-no-export-path.patch
@@ -1,6 +1,6 @@
 --- Makefile.pre.in.orig	2015-10-09 19:10:15.042905069 +0200
 +++ Makefile.pre.in	2015-10-09 19:11:01.513642241 +0200
-@@ -1070,8 +1070,6 @@
+@@ -1100,8 +1100,6 @@
  $(srcdir)/Lib/$(PLATDIR):
  	mkdir $(srcdir)/Lib/$(PLATDIR)
  	cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
diff --git a/tools/depends/target/python27/Python-setup.patch b/tools/depends/target/python27/Python-setup.patch
index e32dd508ee..e9ff0c2de5 100644
--- a/tools/depends/target/python27/Python-setup.patch
+++ b/tools/depends/target/python27/Python-setup.patch
@@ -1,6 +1,6 @@
 --- setup.py.orig	2015-10-07 16:32:16.219083585 +0200
 +++ setup.py	2015-10-07 16:41:48.563085871 +0200
-@@ -320,6 +320,9 @@
+@@ -321,6 +321,9 @@
              self.announce('WARNING: skipping import check for Cygwin-based "%s"'
                  % ext.name)
              return
@@ -10,7 +10,7 @@
          ext_filename = os.path.join(
              self.build_lib,
              self.get_ext_filename(self.get_ext_fullname(ext.name)))
-@@ -331,27 +334,30 @@
+@@ -335,27 +338,30 @@
          try:
              imp.load_dynamic(ext.name, ext_filename)
          except ImportError, why:
diff --git a/tools/depends/target/python27/fix-ffi.patch b/tools/depends/target/python27/fix-ffi.patch
index 29f8af8575..270ac0a62b 100644
--- a/tools/depends/target/python27/fix-ffi.patch
+++ b/tools/depends/target/python27/fix-ffi.patch
@@ -23,7 +23,7 @@
 +*/
 --- Modules/_ctypes/cfield.c.orig	2015-10-11 20:34:03.034370393 +0200
 +++ Modules/_ctypes/cfield.c	2015-10-11 20:37:04.462377159 +0200
-@@ -1723,6 +1723,7 @@
+@@ -1724,6 +1724,7 @@
  */
  
  /* align and size are bogus for void, but they must not be zero */
@@ -31,7 +31,7 @@
  ffi_type ffi_type_void = { 1, 1, FFI_TYPE_VOID };
  
  ffi_type ffi_type_uint8 = { 1, 1, FFI_TYPE_UINT8 };
-@@ -1739,14 +1740,14 @@
+@@ -1740,14 +1741,14 @@
  
  ffi_type ffi_type_float = { sizeof(float), FLOAT_ALIGN, FFI_TYPE_FLOAT };
  ffi_type ffi_type_double = { sizeof(double), DOUBLE_ALIGN, FFI_TYPE_DOUBLE };
diff --git a/tools/depends/target/python27/urllib-ssl-no-cert_check.patch b/tools/depends/target/python27/urllib-ssl-no-cert_check.patch
deleted file mode 100644
index e57c419234..0000000000
--- a/tools/depends/target/python27/urllib-ssl-no-cert_check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Lib/ssl.py b/Lib/ssl.py
-index 5df6ed3..a871519 100644
---- a/Lib/ssl.py
-+++ b/Lib/ssl.py
-@@ -482,7 +482,7 @@ def _create_unverified_context(protocol=PROTOCOL_SSLv23, cert_reqs=None,
-     return context
- 
- # Used by http.client if no context is explicitly passed.
--_create_default_https_context = create_default_context
-+_create_default_https_context = _create_unverified_context
- 
- 
- # Backwards compatibility alias, even though it's not a public name.
-