Python2-native: Upgrade from 2.7.11 to 2.7.12

PATCH New Alejandro Hernandez 1 participant 4 messages Aug 3, 2016 1 message not in the archive

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Alejandro Hernandez

author

2016-08-03 18:52 UTC #1 lore raw

PATCH 1/4 Python2-native: Upgrade from 2.7.11 to 2.7.12

LICENSE did not change, only dates changed.

Rebases:
- debug.patch
- multilib.patch

Upstream:
- avoid_parallel_make_races_on_pgen.patch

Signed-off-by Alejandro Hernandez <[email protected]>

---
 .../python/python-native/debug.patch               | 17 ++--
 .../python/python-native/multilib.patch            | 96 +++++++++++-----------
 ...on-native_2.7.11.bb => python-native_2.7.12.bb} |  2 +-
 meta/recipes-devtools/python/python.inc            |  6 +-
 4 files changed, 62 insertions(+), 59 deletions(-)
 rename meta/recipes-devtools/python/{python-native_2.7.11.bb => python-native_2.7.12.bb} (97%)

meta/recipes-devtools/python/python-native/debug.patch +10 -7

index 5ec10d6..3617882 100644
@@ -1,24 +1,27 @@
 Upstream-Status: Pending
 
-Index: Python-2.6.1/Lib/distutils/unixccompiler.py
+Index: Python-2.7.12/Lib/distutils/unixccompiler.py
 ===================================================================
---- Python-2.6.1.orig/Lib/distutils/unixccompiler.py	2009-11-13 16:04:54.000000000 +0000
-+++ Python-2.6.1/Lib/distutils/unixccompiler.py	2009-11-13 16:06:27.000000000 +0000
-@@ -300,6 +300,8 @@
-         dylib_f = self.library_filename(lib, lib_type='dylib')
-         static_f = self.library_filename(lib, lib_type='static')
+--- Python-2.7.12.orig/Lib/distutils/unixccompiler.py
++++ Python-2.7.12/Lib/distutils/unixccompiler.py
+@@ -278,6 +278,8 @@ class UnixCCompiler(CCompiler):
+ 
+ 
  
 +        print "Looking in %s for %s" % (lib, dirs)
 +
          for dir in dirs:
              shared = os.path.join(dir, shared_f)
              dylib = os.path.join(dir, dylib_f)
-@@ -309,10 +311,13 @@
+@@ -298,12 +300,16 @@ class UnixCCompiler(CCompiler):
              # assuming that *all* Unix C compilers do.  And of course I'm
              # ignoring even GCC's "-static" option.  So sue me.
              if os.path.exists(dylib):
 +                print "Found %s" % (dylib)
                  return dylib
+             elif os.path.exists(xcode_stub):
++                print "Found %s" % (xcode_stub)
+                 return xcode_stub
              elif os.path.exists(shared):
 +                print "Found %s" % (shared)
                  return shared

meta/recipes-devtools/python/python-native/multilib.patch +48 ~~-48~~

197 lines not on this page · raw message

meta/recipes-devtools/python/python-native_2.7.12.bb renamed from meta/recipes-devtools/python/python-native_2.7.11.bb +1 -1

similarity index 97%
rename from meta/recipes-devtools/python/python-native_2.7.11.bb
rename to meta/recipes-devtools/python/python-native_2.7.12.bb
index 31192ca..de83cbd 100644
@@ -17,8 +17,8 @@ SRC_URI += "\
             file://builddir.patch \
             file://parallel-makeinst-create-bindir.patch \
             file://revert_use_of_sysconfigdata.patch \
-            file://avoid_parallel_make_races_on_pgen.patch \
            "
+
 S = "${WORKDIR}/Python-${PV}"
 
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:"

meta/recipes-devtools/python/python.inc +3 -3

index f4818c6..79a431c 100644
@@ -5,12 +5,12 @@ SECTION = "devel/python"
 # bump this on every change in contrib/python/generate-manifest-2.7.py
 INC_PR = "r1"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6b60258130e4ed10d3101517eb5b9385"
 
 SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "1dbcc848b4cd8399a8199d000f9f823c"
-SRC_URI[sha256sum] = "962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46"
+SRC_URI[md5sum] = "57dffcee9cee8bb2ab5f82af1d8e9a69"
+SRC_URI[sha256sum] = "d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978"
 
 # python recipe is actually python 2.x
 # also, exclude pre-releases for both python 2.x and 3.x

Signature · 1 line

2.6.6

Alejandro Hernandez

author

2016-08-03 18:52 UTC #2 lore raw

PATCH 2/4 Python2: Upgrade from 2.7.11 to 2.7.12

LICENSE did not change, only dates were changed

Rebases:
- multilib.patch
- 01-use-proper-tools-for-cross-build.patch

Upstream:
- avoid_parallel_make_races_on_pgen.patch
- CVE-2016-5636.patch

Signed-off-by Alejandro Hernandez <[email protected]>

---
 .../01-use-proper-tools-for-cross-build.patch      |  40 ++++----
 meta/recipes-devtools/python/python/multilib.patch | 114 ++++++++++-----------
 .../python/{python_2.7.11.bb => python_2.7.12.bb}  |   2 -
 3 files changed, 77 insertions(+), 79 deletions(-)
 rename meta/recipes-devtools/python/{python_2.7.11.bb => python_2.7.12.bb} (98%)

meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch +20 ~~-20~~

index 4d1395d..b2a8c3b 100644
@@ -9,11 +9,11 @@ Signed-off-by: Paul Eggleton <[email protected]>
 Rebased for python-2.7.9
 Signed-off-by: Alejandro Hernandez <[email protected]>
 
-Index: Python-2.7.9/Makefile.pre.in
+Index: Python-2.7.12/Makefile.pre.in
 ===================================================================
---- Python-2.7.9.orig/Makefile.pre.in
-+++ Python-2.7.9/Makefile.pre.in
-@@ -234,6 +234,7 @@ LIBFFI_INCLUDEDIR=	@LIBFFI_INCLUDEDIR@
+--- Python-2.7.12.orig/Makefile.pre.in
++++ Python-2.7.12/Makefile.pre.in
+@@ -246,6 +246,7 @@ LIBFFI_INCLUDEDIR=	@LIBFFI_INCLUDEDIR@
  ##########################################################################
  # Parser
  PGEN=		Parser/pgen$(EXE)

@@ -21,7 +21,7 @@ Index: Python-2.7.9/Makefile.pre.in
  
  PSRCS=		\
  		Parser/acceler.c \
-@@ -445,7 +446,7 @@ $(BUILDPYTHON):	Modules/python.o $(LIBRA
+@@ -513,7 +514,7 @@ $(BUILDPYTHON):	Modules/python.o $(LIBRA
  			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  
  platform: $(BUILDPYTHON) pybuilddir.txt

@@ -30,16 +30,16 @@ Index: Python-2.7.9/Makefile.pre.in
  
  # Create build directory and generate the sysconfig build-time data there.
  # pybuilddir.txt contains the name of the build dir and is used for
-@@ -611,7 +612,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/p
- $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
- 		@$(MKDIR_P) Include
- 		$(MAKE) $(PGEN)
--		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-+		$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
- $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
- 		$(MAKE) $(GRAMMAR_H)
- 		touch $(GRAMMAR_C)
-@@ -1043,27 +1044,27 @@ libinstall:	build_all $(srcdir)/Lib/$(PL
+@@ -684,7 +685,7 @@ $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
+ 	@$(MKDIR_P) Include
+ 	# Avoid copying the file onto itself for an in-tree build
+ 	if test "$(cross_compiling)" != "yes"; then \
+-		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
++		$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
+ 	else \
+ 		cp $(srcdir)/Include/graminit.h $(GRAMMAR_H).tmp; \
+ 		mv $(GRAMMAR_H).tmp $(GRAMMAR_H); \
+@@ -1133,27 +1134,27 @@ libinstall:	build_all $(srcdir)/Lib/$(PL
  			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
  	fi
  	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \

@@ -73,11 +73,11 @@ Index: Python-2.7.9/Makefile.pre.in
  
  # Create the PLATDIR source directory, if one wasn't distributed..
  $(srcdir)/Lib/$(PLATDIR):
-Index: Python-2.7.9/setup.py
+Index: Python-2.7.12/setup.py
 ===================================================================
---- Python-2.7.9.orig/setup.py
-+++ Python-2.7.9/setup.py
-@@ -334,6 +334,7 @@ class PyBuildExt(build_ext):
+--- Python-2.7.12.orig/setup.py
++++ Python-2.7.12/setup.py
+@@ -350,6 +350,7 @@ class PyBuildExt(build_ext):
              self.failed.append(ext.name)
              self.announce('*** WARNING: renaming "%s" since importing it'
                            ' failed: %s' % (ext.name, why), level=3)

@@ -85,7 +85,7 @@ Index: Python-2.7.9/setup.py
              assert not self.inplace
              basename, tail = os.path.splitext(ext_filename)
              newname = basename + "_failed" + tail
-@@ -558,6 +559,9 @@ class PyBuildExt(build_ext):
+@@ -574,6 +575,9 @@ class PyBuildExt(build_ext):
  
          # XXX Omitted modules: gl, pure, dl, SGI-specific modules

meta/recipes-devtools/python/python/multilib.patch +57 ~~-57~~

237 lines not on this page · raw message

meta/recipes-devtools/python/python_2.7.12.bb renamed from meta/recipes-devtools/python/python_2.7.11.bb +0 -2

similarity index 98%
rename from meta/recipes-devtools/python/python_2.7.11.bb
rename to meta/recipes-devtools/python/python_2.7.12.bb
index 1e4a30d..3ee1e38 100644
@@ -25,9 +25,7 @@ SRC_URI += "\
   file://run-ptest \
   file://parallel-makeinst-create-bindir.patch \
   file://use_sysroot_ncurses_instead_of_host.patch \
-  file://avoid_parallel_make_races_on_pgen.patch \
   file://add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch \
-  file://CVE-2016-5636.patch \
 "
 
 S = "${WORKDIR}/Python-${PV}"

Signature · 1 line

2.6.6

Alejandro Hernandez

author

2016-08-03 18:52 UTC #3 lore raw

PATCH 3/4 Python3-native: Upgrade from 3.5.1 to 3.5.2

In reply to Alejandro Hernandez

LICENSE did not change, only dates were changed

Rebases:
- 000-cross-compile.patch
- python-3.3-multilib.patch

Signed-off-by Alejandro Hernandez <[email protected]>

---
 ...on3-native_3.5.1.bb => python3-native_3.5.2.bb} |   7 +-
 .../python/python3/000-cross-compile.patch         |  38 +++----
 .../python/python3/python-3.3-multilib.patch       | 116 ++++++++++-----------
 3 files changed, 81 insertions(+), 80 deletions(-)
 rename meta/recipes-devtools/python/{python3-native_3.5.1.bb => python3-native_3.5.2.bb} (91%)

meta/recipes-devtools/python/python3-native_3.5.2.bb renamed from meta/recipes-devtools/python/python3-native_3.5.1.bb +4 -3

similarity index 91%
rename from meta/recipes-devtools/python/python3-native_3.5.1.bb
rename to meta/recipes-devtools/python/python3-native_3.5.2.bb
index 81ea087..061b595 100644
@@ -26,10 +26,11 @@ file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \
 file://setup.py-check-cross_compiling-when-get-FLAGS.patch \
 file://0001-Do-not-use-the-shell-version-of-python-config-that-w.patch \
 "
-SRC_URI[md5sum] = "e9ea6f2623fffcdd871b7b19113fde80"
-SRC_URI[sha256sum] = "c6d57c0c366d9060ab6c0cdf889ebf3d92711d466cc0119c441dbf2746f725c9"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03"
+SRC_URI[md5sum] = "8906efbacfcdc7c3c9198aeefafd159e"  
+SRC_URI[sha256sum] = "0010f56100b9b74259ebcd5d4b295a32324b58b517403a10d1a2aa7cb22bca40" 
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6b60258130e4ed10d3101517eb5b9385"
 
 # exclude pre-releases for both python 2.x and 3.x
 UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"

meta/recipes-devtools/python/python3/000-cross-compile.patch +19 ~~-19~~

index 28fe70a..2d82221 100644
@@ -9,19 +9,19 @@ Upstream-Status: Inappropriate[Configuration Specific]
  Makefile.pre.in |   25 +++++++++++++------------
  1 file changed, 13 insertions(+), 12 deletions(-)
 
-Index: Python-3.5.1/Makefile.pre.in
+Index: Python-3.5.2/Makefile.pre.in
 ===================================================================
---- Python-3.5.1.orig/Makefile.pre.in
-+++ Python-3.5.1/Makefile.pre.in
+--- Python-3.5.2.orig/Makefile.pre.in
++++ Python-3.5.2/Makefile.pre.in
 @@ -220,6 +220,7 @@ LIBOBJS=	@LIBOBJS@
  
  PYTHON=		python$(EXE)
  BUILDPYTHON=	python$(BUILDEXE)
 +HOSTPYTHON=	$(BUILDPYTHON)
  
+ cross_compiling=@cross_compiling@
  PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
- _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@
-@@ -276,6 +277,7 @@ LIBFFI_INCLUDEDIR=	@LIBFFI_INCLUDEDIR@
+@@ -279,6 +280,7 @@ LIBFFI_INCLUDEDIR=	@LIBFFI_INCLUDEDIR@
  ##########################################################################
  # Parser
  PGEN=		Parser/pgen$(EXE)

@@ -29,7 +29,7 @@ Index: Python-3.5.1/Makefile.pre.in
  
  PSRCS=		\
  		Parser/acceler.c \
-@@ -506,7 +508,7 @@ build_all_generate_profile:
+@@ -509,7 +511,7 @@ build_all_generate_profile:
  
  run_profile_task:
  	: # FIXME: can't run for a cross build

@@ -38,16 +38,16 @@ Index: Python-3.5.1/Makefile.pre.in
  
  build_all_merge_profile:
  	$(LLVM_PROF_MERGER)
-@@ -779,7 +781,7 @@ $(IO_OBJS): $(IO_H)
- 
- $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
- 		@$(MKDIR_P) Include
--		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-+		$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
- $(GRAMMAR_C): $(GRAMMAR_H)
- 		touch $(GRAMMAR_C)
- 
-@@ -968,7 +970,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/pyth
+@@ -792,7 +794,7 @@ $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
+ 	@$(MKDIR_P) Include
+ 	# Avoid copying the file onto itself for an in-tree build
+ 	if test "$(cross_compiling)" != "yes"; then \
+-		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
++		$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
+ 	else \
+ 		cp $(srcdir)/Include/graminit.h $(GRAMMAR_H).tmp; \
+ 		mv $(GRAMMAR_H).tmp $(GRAMMAR_H); \
+@@ -990,7 +992,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/pyth
  ######################################################################
  
  TESTOPTS=	$(EXTRATESTOPTS)

@@ -56,7 +56,7 @@ Index: Python-3.5.1/Makefile.pre.in
  TESTRUNNER=	$(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py
  TESTTIMEOUT=	3600
  
-@@ -1455,7 +1457,7 @@ frameworkinstallstructure:	$(LDLIBRARY)
+@@ -1481,7 +1483,7 @@ frameworkinstallstructure:	$(LDLIBRARY)
  		fi; \
  	done
  	$(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers

@@ -65,7 +65,7 @@ Index: Python-3.5.1/Makefile.pre.in
  	$(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
  	$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
  	$(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
-@@ -1521,7 +1523,7 @@ config.status:	$(srcdir)/configure
+@@ -1547,7 +1549,7 @@ config.status:	$(srcdir)/configure
  
  # Run reindent on the library
  reindent:

@@ -74,7 +74,7 @@ Index: Python-3.5.1/Makefile.pre.in
  
  # Rerun configure with the same options as it was run last time,
  # provided the config.status script exists
-@@ -1656,7 +1658,7 @@ funny:
+@@ -1683,7 +1685,7 @@ funny:
  
  # Perform some verification checks on any modified files.
  patchcheck: all

meta/recipes-devtools/python/python3/python-3.3-multilib.patch +58 ~~-58~~

225 lines not on this page · raw message

Signature · 1 line

2.6.6

Alejandro Hernandez

author

2016-08-03 18:52 UTC #4 lore raw

PATCH 4/4 Python3: Upgrade from 3.5.1 to 3.5.2

In reply to Alejandro Hernandez

LICENSE did not change, only dates were changed

Upstream:
- use_packed_importlib.patch
- CVE-2016-5636.patch

Other patches were rebased on python3-natives patch

Signed-off-by Alejandro Hernandez <[email protected]>

---
 .../python/{python3_3.5.1.bb => python3_3.5.2.bb}              | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
 rename meta/recipes-devtools/python/{python3_3.5.1.bb => python3_3.5.2.bb} (96%)

meta/recipes-devtools/python/python3_3.5.2.bb renamed from meta/recipes-devtools/python/python3_3.5.1.bb +4 -6

similarity index 96%
rename from meta/recipes-devtools/python/python3_3.5.1.bb
rename to meta/recipes-devtools/python/python3_3.5.2.bb
index bf29d12..a41e110 100644
@@ -35,18 +35,16 @@ SRC_URI += "\
             file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \
             file://setup.py-check-cross_compiling-when-get-FLAGS.patch \
             file://setup.py-find-libraries-in-staging-dirs.patch \
-            file://use_packed_importlib.patch \
             file://configure.ac-fix-LIBPL.patch \
-            file://CVE-2016-5636.patch \
            "
-SRC_URI[md5sum] = "e9ea6f2623fffcdd871b7b19113fde80"
-SRC_URI[sha256sum] = "c6d57c0c366d9060ab6c0cdf889ebf3d92711d466cc0119c441dbf2746f725c9"
+SRC_URI[md5sum] = "8906efbacfcdc7c3c9198aeefafd159e"
+SRC_URI[sha256sum] = "0010f56100b9b74259ebcd5d4b295a32324b58b517403a10d1a2aa7cb22bca40"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6b60258130e4ed10d3101517eb5b9385"
 
 # exclude pre-releases for both python 2.x and 3.x
 UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03"
-
 S = "${WORKDIR}/Python-${PV}"
 
 inherit autotools multilib_header python3native pkgconfig

Signature · 1 line

2.6.6