python: version bump 2.7.16 -> 2.7.18ptxdist-2020.05.0

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

12 files changed, 23 insertions, 23 deletions

diff --git a/patches/Python-2.7.16/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch b/patches/Python-2.7.18/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
index 65366650e..6eeecd140 100644
--- a/patches/Python-2.7.16/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
+++ b/patches/Python-2.7.18/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
@@ -35,7 +35,7 @@ index ad307f65398b..f72ae886cad8 100644
  AF_MAX = PF_MAX
  SOL_RAW = 255
 diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
-index 8d3670529e85..f1c0bab247b0 100644
+index 4d5a8f6f0170..8636a8d6ca5e 100644
 --- a/Modules/socketmodule.c
 +++ b/Modules/socketmodule.c
 @@ -448,6 +448,10 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
@@ -116,7 +116,7 @@ index 8d3670529e85..f1c0bab247b0 100644
  #ifdef USE_BLUETOOTH
      case AF_BLUETOOTH:
      {
-@@ -4798,6 +4848,10 @@ init_socket(void)
+@@ -4813,6 +4863,10 @@ init_socket(void)
      PyModule_AddIntConstant(m, "AF_LLC", AF_LLC);
  #endif
  
@@ -127,7 +127,7 @@ index 8d3670529e85..f1c0bab247b0 100644
  #ifdef USE_BLUETOOTH
      PyModule_AddIntConstant(m, "AF_BLUETOOTH", AF_BLUETOOTH);
      PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
-@@ -5154,6 +5208,41 @@ init_socket(void)
+@@ -5169,6 +5223,41 @@ init_socket(void)
      PyModule_AddIntConstant(m, "IPPROTO_MAX", IPPROTO_MAX);
  #endif
  
@@ -199,10 +199,10 @@ index d98e00e88d27..3b6e22e29d3a 100644
      struct sockaddr_l2 bt_l2;
      struct sockaddr_rc bt_rc;
 diff --git a/configure.ac b/configure.ac
-index 913d5469d06e..675f56835e59 100644
+index efe6922b5de2..14cc590e55d7 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1746,6 +1746,19 @@ AC_CHECK_HEADERS(linux/netlink.h,,,[
+@@ -1753,6 +1753,19 @@ AC_CHECK_HEADERS(linux/netlink.h,,,[
  #endif
  ])
  
diff --git a/patches/Python-2.7.16/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch b/patches/Python-2.7.18/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch
index 58058cfde..d1d5647b9 100644
--- a/patches/Python-2.7.16/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch
+++ b/patches/Python-2.7.18/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch
@@ -12,10 +12,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 4 insertions(+), 8 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 675f56835e59..c9cb9c802882 100644
+index 14cc590e55d7..04e713acd089 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1883,15 +1883,11 @@ AC_CHECK_SIZEOF(fpos_t, 4)
+@@ -1890,15 +1890,11 @@ AC_CHECK_SIZEOF(fpos_t, 4)
  AC_CHECK_SIZEOF(size_t, 4)
  AC_CHECK_SIZEOF(pid_t, 4)
  
diff --git a/patches/Python-2.7.16/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch b/patches/Python-2.7.18/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch
index f6c3f9143..b6ef13c1e 100644
--- a/patches/Python-2.7.16/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch
+++ b/patches/Python-2.7.18/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch
@@ -11,10 +11,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 2 insertions(+), 10 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index c9cb9c802882..c89e4a601cf1 100644
+index 04e713acd089..5899a7d819b5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1890,16 +1890,8 @@ if test "$ac_cv_type_long_long_int" = "yes" ; then
+@@ -1897,16 +1897,8 @@ if test "$ac_cv_type_long_long_int" = "yes" ; then
    AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.])
  fi
  
diff --git a/patches/Python-2.7.16/0004-setup.py-don-t-leak-host-path-into-cross-compilation.patch b/patches/Python-2.7.18/0004-setup.py-don-t-leak-host-path-into-cross-compilation.patch
index 95a97e3f4..1cabdcec5 100644
--- a/patches/Python-2.7.16/0004-setup.py-don-t-leak-host-path-into-cross-compilation.patch
+++ b/patches/Python-2.7.18/0004-setup.py-don-t-leak-host-path-into-cross-compilation.patch
@@ -12,10 +12,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 3 insertions(+)
 
 diff --git a/setup.py b/setup.py
-index 33cecc687573..521b6e77c234 100644
+index f764223d0627..53161c941ff8 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1228,6 +1228,9 @@ class PyBuildExt(build_ext):
+@@ -1274,6 +1274,9 @@ class PyBuildExt(build_ext):
          # the more recent berkeleydb's db.h file first in the include path
          # when attempting to compile and it will fail.
          f = "/usr/include/db.h"
diff --git a/patches/Python-2.7.16/0005-add-cross-compilation-support.patch b/patches/Python-2.7.18/0005-add-cross-compilation-support.patch
index 79efeba4e..f7812e732 100644
--- a/patches/Python-2.7.16/0005-add-cross-compilation-support.patch
+++ b/patches/Python-2.7.18/0005-add-cross-compilation-support.patch
@@ -11,7 +11,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  2 files changed, 15 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 9297e7fc89c4..1400c8ca6f97 100644
+index 2a14f3323bc3..c1e8839a2d21 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -88,6 +88,10 @@ CFLAGSFORSHARED=@CFLAGSFORSHARED@
@@ -42,7 +42,7 @@ index 9297e7fc89c4..1400c8ca6f97 100644
  # Detailed destination directories
  BINLIBDEST=	$(LIBDIR)/python$(VERSION)
 diff --git a/configure.ac b/configure.ac
-index c89e4a601cf1..863d7929507b 100644
+index 5899a7d819b5..0dd23a07d73e 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -980,6 +980,13 @@ if test "$cross_compiling" = yes; then
diff --git a/patches/Python-2.7.16/0006-python-don-t-add-rpaths-in-setup.py.patch b/patches/Python-2.7.18/0006-python-don-t-add-rpaths-in-setup.py.patch
index d9fa6fe92..b51ad1887 100644
--- a/patches/Python-2.7.16/0006-python-don-t-add-rpaths-in-setup.py.patch
+++ b/patches/Python-2.7.18/0006-python-don-t-add-rpaths-in-setup.py.patch
@@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 521b6e77c234..213a4d969fbc 100644
+index 53161c941ff8..4abd73317729 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1101,7 +1101,6 @@ class PyBuildExt(build_ext):
+@@ -1147,7 +1147,6 @@ class PyBuildExt(build_ext):
              exts.append(Extension('_bsddb', ['_bsddb.c'],
                                    depends = ['bsddb.h'],
                                    library_dirs=dblib_dir,
@@ -21,7 +21,7 @@ index 521b6e77c234..213a4d969fbc 100644
                                    include_dirs=db_incs,
                                    libraries=dblibs))
          else:
-@@ -1318,7 +1317,6 @@ class PyBuildExt(build_ext):
+@@ -1364,7 +1363,6 @@ class PyBuildExt(build_ext):
                          print "building dbm using bdb"
                          dbmext = Extension('dbm', ['dbmmodule.c'],
                                             library_dirs=dblib_dir,
diff --git a/patches/Python-2.7.16/0007-add-more-search-paths.patch b/patches/Python-2.7.18/0007-add-more-search-paths.patch
index 3e6e234ee..ea1e2fc77 100644
--- a/patches/Python-2.7.16/0007-add-more-search-paths.patch
+++ b/patches/Python-2.7.18/0007-add-more-search-paths.patch
@@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 213a4d969fbc..4ce7075150d1 100644
+index 4abd73317729..67f867ce1123 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -502,8 +502,10 @@ class PyBuildExt(build_ext):
+@@ -548,8 +548,10 @@ class PyBuildExt(build_ext):
              # (PYTHONFRAMEWORK is set) to avoid # linking problems when
              # building a framework with different architectures than
              # the one that is currently installed (issue #7473)
diff --git a/patches/Python-2.7.16/0008-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch b/patches/Python-2.7.18/0008-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch
index bd98f681c..474a1a4c6 100644
--- a/patches/Python-2.7.16/0008-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch
+++ b/patches/Python-2.7.18/0008-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch
@@ -11,7 +11,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 863d7929507b..661cd3dcb76c 100644
+index 0dd23a07d73e..2c21a989e012 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -926,7 +926,7 @@ if test $enable_shared = "yes"; then
diff --git a/patches/Python-2.7.16/0009-python2-prevent-host-path-leakage.patch b/patches/Python-2.7.18/0009-python2-prevent-host-path-leakage.patch
index ab5e0d42f..0888a62c4 100644
--- a/patches/Python-2.7.16/0009-python2-prevent-host-path-leakage.patch
+++ b/patches/Python-2.7.18/0009-python2-prevent-host-path-leakage.patch
@@ -23,10 +23,10 @@ Signed-off-by: Bastian Stender <bst@pengutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index 4ce7075150d1..29b9de4a4607 100644
+index 67f867ce1123..d7b1991f93ca 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -458,9 +458,9 @@ class PyBuildExt(build_ext):
+@@ -504,9 +504,9 @@ class PyBuildExt(build_ext):
          if not cross_compiling:
              add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
              add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
diff --git a/patches/Python-2.7.16/autogen.sh b/patches/Python-2.7.18/autogen.sh
index 903ce7847..903ce7847 100755
--- a/patches/Python-2.7.16/autogen.sh
+++ b/patches/Python-2.7.18/autogen.sh
diff --git a/patches/Python-2.7.16/series b/patches/Python-2.7.18/series
index 476244734..476244734 100644
--- a/patches/Python-2.7.16/series
+++ b/patches/Python-2.7.18/series
diff --git a/rules/python.make b/rules/python.make
index 3cdeabd94..61642cf14 100644
--- a/rules/python.make
+++ b/rules/python.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON) += python
 #
 # Paths and names
 #
-PYTHON_VERSION		:= 2.7.16
-PYTHON_MD5		:= 30157d85a2c0479c09ea2cbe61f2aaf5
+PYTHON_VERSION		:= 2.7.18
+PYTHON_MD5		:= fd6cc8ec0a78c44036f825e739f36e5a
 PYTHON_MAJORMINOR	:= $(basename $(PYTHON_VERSION))
 PYTHON_SITEPACKAGES	:= /usr/lib/python$(PYTHON_MAJORMINOR)/site-packages
 PYTHON			:= Python-$(PYTHON_VERSION)