[python3] Update to version 3.8.18. JB#61685

rpm/0001-Skip-semaphore-test.patch

@@ -1,7 +1,7 @@
-From ab52252bf7063f38b6a3f242a3f12a40e893a0a5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: David Greaves <david@dgreaves.com>
 Date: Fri, 12 Apr 2019 20:28:32 +0100
-Subject: [PATCH 1/5] Skip semaphore test.
+Subject: [PATCH] Skip semaphore test.
 
 OBS's arm build environment doesn't have /dev/shm
 mounted (real devices do) so this fails, crippling
@@ -16,10 +16,10 @@ Signed-off-by: David Greaves <david.greaves@jolla.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index e02cc2c656..c70bed9956 100644
+index de83332dd3c6e5410a28fff6074c54d7ece630fe..26265b6b1a4a17f214078abe7464ec8af6ef43ef 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4540,7 +4540,7 @@ int main(void) {
+@@ -4542,7 +4542,7 @@ int main(void) {
  }
  ]])],
  [ac_cv_posix_semaphores_enabled=yes],
@@ -28,7 +28,7 @@ index e02cc2c656..c70bed9956 100644
  [ac_cv_posix_semaphores_enabled=yes])
  )
  AC_MSG_RESULT($ac_cv_posix_semaphores_enabled)
-@@ -4576,8 +4576,8 @@ int main(void){
+@@ -4578,8 +4578,8 @@ int main(void){
  }
  ]])],
  [ac_cv_broken_sem_getvalue=no],
@@ -39,6 +39,3 @@ index e02cc2c656..c70bed9956 100644
  )
  AC_MSG_RESULT($ac_cv_broken_sem_getvalue)
  if test $ac_cv_broken_sem_getvalue = yes
--- 
-2.25.1
-

rpm/0002-Disable-parallel-compileall-in-make-install.patch

@@ -1,16 +1,16 @@
-From 114ee979cb90affcdd799d9bc8f77152e4762a53 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Juho=20H=C3=A4m=C3=A4l=C3=A4inen?=
  <juho.hamalainen@jolla.com>
 Date: Thu, 23 Jan 2020 09:42:29 +0200
-Subject: [PATCH 2/5] Disable parallel compileall in make install.
+Subject: [PATCH] Disable parallel compileall in make install.
 
 Parallel compile breaks with old qemu.
 ---
  Makefile.pre.in | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 7e381283fe..fd2f89ace2 100644
+index 7e381283fee886335462bffb73ac464973ee01fa..fd2f89ace2bf21b9b02eda0385e0770a99754cce 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -1479,30 +1479,30 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
@@ -50,6 +50,3 @@ index 7e381283fe..fd2f89ace2 100644
  		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
  	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
  		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
--- 
-2.25.1
-

rpm/0003-00001-Fixup-distutils-unixccompiler.py-to-remove-sta.patch

@@ -1,15 +1,15 @@
-From bb2cc033aa83266856a713729190aa95dbb21b3c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: David Malcolm <dmalcolm@redhat.com>
 Date: Wed, 13 Jan 2010 21:25:18 +0000
-Subject: [PATCH 3/5] 00001: Fixup distutils/unixccompiler.py to remove
- standard library path from rpath Was Patch0 in ivazquez' python3000 specfile
+Subject: [PATCH] 00001: Fixup distutils/unixccompiler.py to remove standard
+ library path from rpath Was Patch0 in ivazquez' python3000 specfile
 
 ---
  Lib/distutils/unixccompiler.py | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
-index f0792de74a..4d837936c6 100644
+index f0792de74a1a489a8232d89b6302c77d91a7552e..4d837936c63a7f43bdf907efc5ab7c508c8c039f 100644
 --- a/Lib/distutils/unixccompiler.py
 +++ b/Lib/distutils/unixccompiler.py
 @@ -82,6 +82,15 @@ class UnixCCompiler(CCompiler):
@@ -28,6 +28,3 @@ index f0792de74a..4d837936c6 100644
      def preprocess(self, source, output_file=None, macros=None,
                     include_dirs=None, extra_preargs=None, extra_postargs=None):
          fixed_args = self._fix_compile_args(None, macros, include_dirs)
--- 
-2.25.1
-

rpm/0004-00102-Change-the-various-install-paths-to-use-usr-li.patch

@@ -1,8 +1,8 @@
-From 2c4e442f87b114961da344b7bfd4e6224d803ad5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: David Malcolm <dmalcolm@redhat.com>
 Date: Wed, 13 Jan 2010 21:25:18 +0000
-Subject: [PATCH 4/5] 00102: Change the various install paths to use
- /usr/lib64/ instead or /usr/lib/
+Subject: [PATCH] 00102: Change the various install paths to use /usr/lib64/
+ instead or /usr/lib/
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -33,7 +33,7 @@ Co-authored-by: Iryna Shcherbina <shcherbina.iryna@gmail.com>
  11 files changed, 32 insertions(+), 23 deletions(-)
 
 diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
-index c625c95bf7..ae4f915669 100644
+index c625c95bf7e8cf938b409e218026382a52824491..ae4f915669c302f7ba16857d42d9906c479f3f92 100644
 --- a/Lib/distutils/command/install.py
 +++ b/Lib/distutils/command/install.py
 @@ -30,14 +30,14 @@ WINDOWS_SCHEME = {
@@ -54,7 +54,7 @@ index c625c95bf7..ae4f915669 100644
          'scripts': '$base/bin',
          'data'   : '$base',
 diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index b51629eb94..9a4892a737 100644
+index b51629eb94f825d8d0f857b8aa5b431814199d72..9a4892a737ee0a56bd01328323933ff8da326cb3 100644
 --- a/Lib/distutils/sysconfig.py
 +++ b/Lib/distutils/sysconfig.py
 @@ -146,8 +146,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
@@ -72,7 +72,7 @@ index b51629eb94..9a4892a737 100644
              return libpython
          else:
 diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py
-index 287ab1989e..d4c05e0ab1 100644
+index 287ab1989e40836de196d3cfe560afbe6fb79a29..d4c05e0ab1aeff3bf68e9b1502c5e8448d7b56ff 100644
 --- a/Lib/distutils/tests/test_install.py
 +++ b/Lib/distutils/tests/test_install.py
 @@ -57,8 +57,9 @@ class InstallTestCase(support.TempdirManager,
@@ -87,7 +87,7 @@ index 287ab1989e..d4c05e0ab1 100644
          check_path(cmd.install_headers,
                     os.path.join(destination, "include", "python", "foopkg"))
 diff --git a/Lib/site.py b/Lib/site.py
-index 9fa21cca38..2e24e86988 100644
+index 9fa21cca3866747ab3e074777e90e497c35a348d..2e24e86988fcdf6556e8d4dab18bf97e8d9e6a9b 100644
 --- a/Lib/site.py
 +++ b/Lib/site.py
 @@ -335,11 +335,15 @@ def getsitepackages(prefixes=None):
@@ -107,7 +107,7 @@ index 9fa21cca38..2e24e86988 100644
      return sitepackages
 
 diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index 3f702d7ea5..df4f720804 100644
+index 3f702d7ea5a86aa9ef922fe91833e8adf3115c5f..df4f7208042eca7ed47de0abdafca8a07e99ebcc 100644
 --- a/Lib/sysconfig.py
 +++ b/Lib/sysconfig.py
 @@ -25,10 +25,10 @@ _ALWAYS_STR = {
@@ -139,7 +139,7 @@ index 3f702d7ea5..df4f720804 100644
          'scripts': '{userbase}/bin',
          'data': '{userbase}',
 diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
-index 9b2df6bfc3..e75ae44637 100644
+index 9b2df6bfc39ee80ea6e00a4baf550a687fa5153c..e75ae446375554200eeb2da19eea928eb7246d40 100644
 --- a/Lib/test/test_site.py
 +++ b/Lib/test/test_site.py
 @@ -268,8 +268,8 @@ class HelperFunctionsTests(unittest.TestCase):
@@ -154,7 +154,7 @@ index 9b2df6bfc3..e75ae44637 100644
                                    'site-packages')
              self.assertEqual(dirs[0], wanted)
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index fd2f89ace2..5d7bc4e13a 100644
+index fd2f89ace2bf21b9b02eda0385e0770a99754cce..5d7bc4e13ad743d9630fa9319533b76dfa967dd6 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -143,7 +143,7 @@ LIBDIR=		@libdir@
@@ -167,7 +167,7 @@ index fd2f89ace2..5d7bc4e13a 100644
 
  # Detailed destination directories
 diff --git a/Modules/getpath.c b/Modules/getpath.c
-index 63815c5fed..ca5f481bc6 100644
+index 63815c5fed831b7a1133722da0b6f4cd7cdca30e..ca5f481bc6d79909a0971a99dc26bd8e5438a02e 100644
 --- a/Modules/getpath.c
 +++ b/Modules/getpath.c
 @@ -730,7 +730,7 @@ calculate_exec_prefix(PyCalculatePath *calculate, _PyPathConfig *pathconfig,
@@ -198,10 +198,10 @@ index 63815c5fed..ca5f481bc6 100644
          return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
      }
 diff --git a/configure b/configure
-index 936f3d4596..92879d3bac 100755
+index c091865aff7502ecb85732a402aad3dee22f08e5..cb75b6373732849270bf84f70d45fa4a46cdca85 100755
 --- a/configure
 +++ b/configure
-@@ -15262,9 +15262,9 @@ fi
+@@ -15264,9 +15264,9 @@ fi
 
 
  if test x$PLATFORM_TRIPLET = x; then
@@ -214,10 +214,10 @@ index 936f3d4596..92879d3bac 100755
 
 
 diff --git a/configure.ac b/configure.ac
-index c70bed9956..e0ba29ce54 100644
+index 26265b6b1a4a17f214078abe7464ec8af6ef43ef..3e466e8a248be8eed2fce6d7b32705ce971c0351 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4720,9 +4720,9 @@ fi
+@@ -4722,9 +4722,9 @@ fi
  dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
  AC_SUBST(PY_ENABLE_SHARED)
  if test x$PLATFORM_TRIPLET = x; then
@@ -230,7 +230,7 @@ index c70bed9956..e0ba29ce54 100644
  AC_SUBST(LIBPL)
 
 diff --git a/setup.py b/setup.py
-index 0a2a435c60..c28c096d57 100644
+index 57be07a7e0f824471451ab9f02a9679c1552397a..0b24dd602e89e1a1e2f646a6d1fbffa31d2d7b2a 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -634,7 +634,7 @@ class PyBuildExt(build_ext):
@@ -256,6 +256,3 @@ index 0a2a435c60..c28c096d57 100644
                                 extra_link_args=readline_extra_link_args,
                                 libraries=readline_libs))
          else:
--- 
-2.25.1
-

rpm/0005-bpo-31046-ensurepip-does-not-honour-the-value-of-pre.patch

@@ -1,8 +1,7 @@
-From c1b053a19eeed77ebe73166743061189ff96ebfd Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zackery Spytz <zspytz@gmail.com>
 Date: Mon, 16 Dec 2019 18:24:08 -0700
-Subject: [PATCH 5/5] bpo-31046: ensurepip does not honour the value of
- $(prefix)
+Subject: [PATCH] bpo-31046: ensurepip does not honour the value of $(prefix)
 
 Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
 ---
@@ -15,7 +14,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
  create mode 100644 Misc/NEWS.d/next/Build/2019-12-16-17-50-42.bpo-31046.XA-Qfr.rst
 
 diff --git a/Doc/library/ensurepip.rst b/Doc/library/ensurepip.rst
-index a5221250c4..6cedc89c6e 100644
+index a5221250c40486af667f398d22db9d830452baab..6cedc89c6ef37357a8a01309396434bc1b6c0826 100644
 --- a/Doc/library/ensurepip.rst
 +++ b/Doc/library/ensurepip.rst
 @@ -56,8 +56,9 @@ is at least as recent as the one bundled with ``ensurepip``, pass the
@@ -57,10 +56,10 @@ index a5221250c4..6cedc89c6e 100644
 
     .. note::
 diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
-index 597a1ef9ee..bfc48913af 100644
+index 3dfc2da945cdbca34e60a174e66c252ea0833774..039e01dc75efa56c7fec1140fad36ae5ddafc69b 100644
 --- a/Lib/ensurepip/__init__.py
 +++ b/Lib/ensurepip/__init__.py
-@@ -52,27 +52,27 @@ def _disable_pip_configuration_settings():
+@@ -55,27 +55,27 @@ def _disable_pip_configuration_settings():
      os.environ['PIP_CONFIG_FILE'] = os.devnull
 
 
@@ -93,7 +92,7 @@ index 597a1ef9ee..bfc48913af 100644
 
      Note that calling this function will alter both sys.path and os.environ.
      """
-@@ -115,6 +115,8 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
+@@ -118,6 +118,8 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
          args = ["install", "--no-cache-dir", "--no-index", "--find-links", tmpdir]
          if root:
              args += ["--root", root]
@@ -102,7 +101,7 @@ index 597a1ef9ee..bfc48913af 100644
          if upgrade:
              args += ["--upgrade"]
          if user:
-@@ -186,6 +188,11 @@ def _main(argv=None):
+@@ -189,6 +191,11 @@ def _main(argv=None):
          default=None,
          help="Install everything relative to this alternate root directory.",
      )
@@ -114,7 +113,7 @@ index 597a1ef9ee..bfc48913af 100644
      parser.add_argument(
          "--altinstall",
          action="store_true",
-@@ -205,6 +212,7 @@ def _main(argv=None):
+@@ -208,6 +215,7 @@ def _main(argv=None):
 
      return _bootstrap(
          root=args.root,
@@ -123,7 +122,7 @@ index 597a1ef9ee..bfc48913af 100644
          user=args.user,
          verbosity=args.verbosity,
 diff --git a/Lib/test/test_ensurepip.py b/Lib/test/test_ensurepip.py
-index 4786d28f39..8425487d9e 100644
+index 4786d28f39a3d049cdfed71d7b54bfdbfa6d3a49..8425487d9ed3204f72d4b6dde8fefb2a66941dbf 100644
 --- a/Lib/test/test_ensurepip.py
 +++ b/Lib/test/test_ensurepip.py
 @@ -61,6 +61,17 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
@@ -145,7 +144,7 @@ index 4786d28f39..8425487d9e 100644
          ensurepip.bootstrap(user=True)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 5d7bc4e13a..51d9ca09f3 100644
+index 5d7bc4e13ad743d9630fa9319533b76dfa967dd6..51d9ca09f3a12157f111d8bd1119f88678e98d6a 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -1189,7 +1189,7 @@ install: @FRAMEWORKINSTALLFIRST@ commoninstall bininstall maninstall @FRAMEWORKI
@@ -168,11 +167,8 @@ index 5d7bc4e13a..51d9ca09f3 100644
  commoninstall:  check-clean-src @FRAMEWORKALTINSTALLFIRST@ \
 diff --git a/Misc/NEWS.d/next/Build/2019-12-16-17-50-42.bpo-31046.XA-Qfr.rst b/Misc/NEWS.d/next/Build/2019-12-16-17-50-42.bpo-31046.XA-Qfr.rst
 new file mode 100644
-index 0000000000..07eb89d4d2
+index 0000000000000000000000000000000000000000..07eb89d4d23e507908ea267f87c55a06372b2851
 --- /dev/null
 +++ b/Misc/NEWS.d/next/Build/2019-12-16-17-50-42.bpo-31046.XA-Qfr.rst
 @@ -0,0 +1 @@
 +A directory prefix can now be specified when using :mod:`ensurepip`.
--- 
-2.25.1
-

rpm/0006-pyc-timestamp-invalidation-mode.patch

@@ -19,7 +19,7 @@ Ideally, we should talk to upstream and explain why we don't want this
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/Lib/py_compile.py b/Lib/py_compile.py
-index a81f493731..bba3642bf2 100644
+index a81f4937310bf81b7e9da68dd7c669dad85b9019..bba3642bf2eebd98711d4e7d33564d4194114ea6 100644
 --- a/Lib/py_compile.py
 +++ b/Lib/py_compile.py
 @@ -70,7 +70,8 @@ class PycInvalidationMode(enum.Enum):
@@ -33,7 +33,7 @@ index a81f493731..bba3642bf2 100644
      else:
          return PycInvalidationMode.TIMESTAMP
 diff --git a/Lib/test/test_py_compile.py b/Lib/test/test_py_compile.py
-index e6791c6916..b2d3dcf7fb 100644
+index e6791c6916ea7fcabaf8873c5ad0620fa9564877..b2d3dcf7fbcccb8071a93fe95d509b4d62e3d13f 100644
 --- a/Lib/test/test_py_compile.py
 +++ b/Lib/test/test_py_compile.py
 @@ -19,6 +19,7 @@ def without_source_date_epoch(fxn):

rpm/python3-extra.spec

@@ -25,7 +25,7 @@ BuildRequires:  sqlite-devel
 Url:            http://www.python.org/
 Summary:        Python3 Interpreter extra modules
 License:        Python
-Version:        3.8.11
+Version:        3.8.18
 Release:        0
 Source0:        %{name}-%{version}.tar.gz
 Source1:        python3-rpmlintrc

rpm/python3.spec

@@ -44,7 +44,7 @@ BuildRequires:  python3-rpm-generators
 Url:            http://www.python.org/
 Summary:        Python3 Interpreter
 License:        Python
-Version:        3.8.11
+Version:        3.8.18
 Release:        0
 Source0:        %{name}-%{version}.tar.gz
 Source1:        python3-rpmlintrc