From e34d0baee96856323ae516227aa9eadc5fa43111 Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Wed, 29 Apr 2020 05:33:21 +0800
Subject: [PATCH] python: Update to 2.7.18, refresh patches

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
---
 lang/python/python-version.mk                          |  2 +-
 lang/python/python/Makefile                            |  4 ++--
 ...-runtime-test-to-get-float-byte-order-GH-9085.patch | 10 +---------
 .../027-bpo-34585-run-autoconf-GH-9411-edited.patch    | 10 ++--------
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/lang/python/python-version.mk b/lang/python/python-version.mk
index 8950904c46..16562c538b 100644
--- a/lang/python/python-version.mk
+++ b/lang/python/python-version.mk
@@ -6,7 +6,7 @@
 #
 
 PYTHON_VERSION:=2.7
-PYTHON_VERSION_MICRO:=17
+PYTHON_VERSION_MICRO:=18
 
 PYTHON_SETUPTOOLS_PKG_RELEASE:=1
 PYTHON_PIP_PKG_RELEASE:=2
diff --git a/lang/python/python/Makefile b/lang/python/python/Makefile
index d6fe87400d..8ce9e8be22 100644
--- a/lang/python/python/Makefile
+++ b/lang/python/python/Makefile
@@ -12,11 +12,11 @@ include ../python-version.mk
 
 PKG_NAME:=python
 PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
-PKG_RELEASE:=4
+PKG_RELEASE:=1
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
-PKG_HASH:=4d43f033cdbd0aa7b7023c81b0e986fd11e653b5248dac9144d508f11812ba41
+PKG_HASH:=b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43
 
 PKG_LICENSE:=Python/2.0
 PKG_LICENSE_FILES:=LICENSE Doc/copyright.rst Doc/license.rst Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Modules/expat/COPYING
diff --git a/lang/python/python/patches/026-bpo-34585-Dont-do-runtime-test-to-get-float-byte-order-GH-9085.patch b/lang/python/python/patches/026-bpo-34585-Dont-do-runtime-test-to-get-float-byte-order-GH-9085.patch
index c72748d05d..10842759ca 100644
--- a/lang/python/python/patches/026-bpo-34585-Dont-do-runtime-test-to-get-float-byte-order-GH-9085.patch
+++ b/lang/python/python/patches/026-bpo-34585-Dont-do-runtime-test-to-get-float-byte-order-GH-9085.patch
@@ -17,20 +17,15 @@ RFC because this doesn't yet handle the weird ancient ARMv4 OABI 'mixed-endian'
  create mode 100644 Misc/NEWS.d/next/Build/2018-09-18-16-28-31.bpo-34585.CGMu0h.rst
  create mode 100644 m4/ax_c_float_words_bigendian.m4
 
-diff --git a/Misc/NEWS.d/next/Build/2018-09-18-16-28-31.bpo-34585.CGMu0h.rst b/Misc/NEWS.d/next/Build/2018-09-18-16-28-31.bpo-34585.CGMu0h.rst
-new file mode 100644
-index 0000000000000..01318e6e46a32
 --- /dev/null
 +++ b/Misc/NEWS.d/next/Build/2018-09-18-16-28-31.bpo-34585.CGMu0h.rst
 @@ -0,0 +1,3 @@
 +Check for floating-point byte order in configure.ac using compilation tests
 +instead of executing code, so that these checks work in cross-compiled
 +builds.
-diff --git a/configure.ac b/configure.ac
-index 03638f8ae9bc7..96331ec221be2 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4206,74 +4206,24 @@ fi
+@@ -3862,74 +3862,24 @@ fi],
  # * Check for various properties of floating point *
  # **************************************************
  
@@ -118,9 +113,6 @@ index 03638f8ae9bc7..96331ec221be2 100644
    AC_DEFINE(DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754, 1,
    [Define if C doubles are 64-bit IEEE 754 binary format, stored
     in ARM mixed-endian order (byte order 45670123)])
-diff --git a/m4/ax_c_float_words_bigendian.m4 b/m4/ax_c_float_words_bigendian.m4
-new file mode 100644
-index 0000000000000..216b90d803187
 --- /dev/null
 +++ b/m4/ax_c_float_words_bigendian.m4
 @@ -0,0 +1,83 @@
diff --git a/lang/python/python/patches/027-bpo-34585-run-autoconf-GH-9411-edited.patch b/lang/python/python/patches/027-bpo-34585-run-autoconf-GH-9411-edited.patch
index 137ed9a25a..d566773844 100644
--- a/lang/python/python/patches/027-bpo-34585-run-autoconf-GH-9411-edited.patch
+++ b/lang/python/python/patches/027-bpo-34585-run-autoconf-GH-9411-edited.patch
@@ -10,8 +10,6 @@ Follow up to 2a9c3805ddedf282881ef7811a561c70b74f80b1 (bpo-34585).
  pyconfig.h.in |   4 ++
  3 files changed, 51 insertions(+), 100 deletions(-)
 
-diff --git a/aclocal.m4 b/aclocal.m4
-index 6a24d8e6b9c00..030e6877de9f7 100644
 --- a/aclocal.m4
 +++ b/aclocal.m4
 @@ -288,3 +288,4 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
@@ -19,11 +17,9 @@ index 6a24d8e6b9c00..030e6877de9f7 100644
  ])dnl PKG_CHECK_VAR
  
 +m4_include([m4/ax_c_float_words_bigendian.m4])
-diff --git a/configure b/configure
-index 7b0c734b5e25e..38546d6ca7b40 100755
 --- a/configure
 +++ b/configure
-@@ -13853,131 +13853,77 @@ fi
+@@ -13022,131 +13022,77 @@ fi
  # * Check for various properties of floating point *
  # **************************************************
  
@@ -201,11 +197,9 @@ index 7b0c734b5e25e..38546d6ca7b40 100755
  
  $as_echo "#define DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754 1" >>confdefs.h
  
-diff --git a/pyconfig.h.in b/pyconfig.h.in
-index 360f79994fafe..41e0479cad2e3 100644
 --- a/pyconfig.h.in
 +++ b/pyconfig.h.in
-@@ -30,6 +30,10 @@
+@@ -36,6 +36,10 @@
  /* Define if --enable-ipv6 is specified */
  #undef ENABLE_IPV6
  
-- 
2.30.2