* Python 3.12.2 release.

  * Refresh patches.

Author: doko42

debian/changelog

@@ -1,8 +1,10 @@
-python3.12 (3.12.1-3) UNRELEASED; urgency=medium
+python3.12 (3.12.2-1) unstable; urgency=medium
 
+  * Python 3.12.2 release.
   * Don't build-depend on systemtap-sdt-dev on the Hurd.
+  * Refresh patches.
 
- -- Matthias Klose <[email protected]>  Fri, 08 Dec 2023 20:27:44 +0100
+ -- Matthias Klose <[email protected]>  Wed, 07 Feb 2024 21:47:03 +0100
 
 python3.12 (3.12.1-2) unstable; urgency=medium
 

debian/patches/ctypes-arm.diff

@@ -8,7 +8,7 @@ Forwarded: yes
 
 --- a/Lib/ctypes/util.py
 +++ b/Lib/ctypes/util.py
-@@ -269,16 +269,27 @@
+@@ -272,16 +272,27 @@ elif os.name == "posix":
 
          def _findSoname_ldconfig(name):
              import struct

debian/patches/disable-sem-check.diff

@@ -6,7 +6,7 @@ Forwarded: not-needed
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -5687,10 +5687,15 @@ AC_CACHE_CHECK([whether POSIX semaphores
+@@ -5790,10 +5790,15 @@ AC_CACHE_CHECK([whether POSIX semaphores
    [ac_cv_posix_semaphores_enabled=yes])
  )
  AS_VAR_IF([ac_cv_posix_semaphores_enabled], [no], [

debian/patches/distutils-install-layout.diff

@@ -34,7 +34,7 @@ Forwarded: not-needed
  If a file named "pyvenv.cfg" exists one directory above sys.executable,
  sys.prefix and sys.exec_prefix are set to that directory and
  it is also checked for site-packages (sys.base_prefix and
-@@ -356,6 +362,8 @@ def getsitepackages(prefixes=None):
+@@ -366,6 +372,8 @@ def getsitepackages(prefixes=None):
      if prefixes is None:
          prefixes = PREFIXES
 
@@ -43,7 +43,7 @@ Forwarded: not-needed
      for prefix in prefixes:
          if not prefix or prefix in seen:
              continue
-@@ -366,10 +374,21 @@ def getsitepackages(prefixes=None):
+@@ -376,10 +384,21 @@ def getsitepackages(prefixes=None):
              if sys.platlibdir != "lib":
                  libdirs.append("lib")
 
@@ -68,7 +68,7 @@ Forwarded: not-needed
              sitepackages.append(prefix)
 --- a/Lib/test/test_site.py
 +++ b/Lib/test/test_site.py
-@@ -285,16 +285,16 @@ class HelperFunctionsTests(unittest.Test
+@@ -325,16 +325,16 @@ class HelperFunctionsTests(unittest.Test
          if os.sep == '/':
              # OS X, Linux, FreeBSD, etc
              if sys.platlibdir != "lib":

debian/patches/gh-112867.diff

@@ -1,8 +1,6 @@
-Index: python3.11-3.11.6/configure.ac
-===================================================================
---- python3.11-3.11.6.orig/configure.ac
-+++ python3.11-3.11.6/configure.ac
-@@ -1066,7 +1066,13 @@ cat > conftest.c <<EOF
+--- a/configure.ac
++++ b/configure.ac
+@@ -1075,7 +1075,13 @@ cat > conftest.c <<EOF
  #   error unknown platform triplet
  # endif
  #elif defined(__gnu_hurd__)

debian/patches/issue108447.diff

@@ -9,7 +9,7 @@ Forwarded: not-needed
 
 --- a/Lib/gettext.py
 +++ b/Lib/gettext.py
-@@ -492,11 +492,26 @@
+@@ -504,11 +504,26 @@ def find(domain, localedir=None, languag
          if lang == 'C':
              break
          mofile = os.path.join(localedir, lang, 'LC_MESSAGES', '%s.mo' % domain)

debian/patches/langpack-gettext.diff

@@ -5,7 +5,7 @@ Forwarded: no
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3270,8 +3270,8 @@ then
+@@ -3334,8 +3334,8 @@ then
  		LDSHARED='$(CC) -shared'
  		LDCXXSHARED='$(CXX) -shared';;
  	Linux*|GNU*|QNX*|VxWorks*|Haiku*)
@@ -16,7 +16,7 @@ Forwarded: no
  	FreeBSD*)
  		if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
  		then
-@@ -3384,7 +3384,7 @@ then
+@@ -3448,7 +3448,7 @@ then
  	    LINKFORSHARED="-Wl,-E -Wl,+s";;
  #	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
  	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;

debian/patches/link-opt.diff

@@ -15,10 +15,10 @@ Forwarded: not-needed
        <script type="text/javascript" src="{{ pathto('_static/changelog_search.js', 1) }}"></script>{% endif %}
 --- a/Lib/idlelib/help.html
 +++ b/Lib/idlelib/help.html
-@@ -28,7 +28,7 @@
+@@ -26,7 +26,7 @@
      <link rel="copyright" title="Copyright" href="../copyright.html" />
      <link rel="next" title="Development Tools" href="development.html" />
-     <link rel="prev" title="tkinter.tix — Extension widgets for Tk" href="tkinter.tix.html" />
+     <link rel="prev" title="tkinter.ttk — Tk themed widgets" href="tkinter.ttk.html" />
 -    <link rel="canonical" href="https://docs.python.org/3/library/idle.html" />
 +    <link rel="canonical" href="file:///usr/share/doc/python3.12/html/library/idle.html" />
 

debian/patches/local-doc-references.diff

@@ -3,11 +3,9 @@ Description: Use glibc's name for the UTF-8 locale
 
 Forwarded: no
 
-Index: b/Lib/locale.py
-===================================================================
 --- a/Lib/locale.py
 +++ b/Lib/locale.py
-@@ -1430,8 +1430,8 @@ locale_alias = {
+@@ -1432,8 +1432,8 @@ locale_alias = {
      'ug_cn':                                'ug_CN.UTF-8',
      'uk':                                   'uk_UA.KOI8-U',
      'uk_ua':                                'uk_UA.KOI8-U',

debian/patches/locale-module.diff

@@ -22,7 +22,7 @@ Forwarded: no
      if os.name == 'posix':
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1374,6 +1374,7 @@ Modules/signalmodule.o: $(srcdir)/Module
+@@ -1377,6 +1377,7 @@ Modules/signalmodule.o: $(srcdir)/Module
 
  Python/dynload_shlib.o: $(srcdir)/Python/dynload_shlib.c Makefile
  	$(CC) -c $(PY_CORE_CFLAGS) \

debian/patches/multiarch.diff

@@ -10,23 +10,23 @@
  import os
  import posixpath
  import re
-@@ -349,6 +348,7 @@ class PurePath(object):
+@@ -356,6 +355,7 @@ class PurePath(object):
          return (self.__class__, self.parts)
 
      def __init__(self, *args):
 +        import ntpath
          paths = []
          for arg in args:
              if isinstance(arg, PurePath):
-@@ -736,6 +736,7 @@ class PurePath(object):
+@@ -748,6 +748,7 @@ class PurePath(object):
      def is_absolute(self):
          """True if the path is absolute (has both a root and, if applicable,
          a drive)."""
 +        import ntpath
          if self._flavour is ntpath:
              # ntpath.isabs() is defective - see GH-44626.
              return bool(self.drive and self.root)
-@@ -802,6 +803,7 @@ class PureWindowsPath(PurePath):
+@@ -814,6 +815,7 @@ class PureWindowsPath(PurePath):
      On a Windows system, instantiating a PurePath should return this object.
      However, you can also instantiate it directly on any system.
      """

debian/patches/ntpath-import.diff

@@ -5,7 +5,7 @@ Forwarded: no
 
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -655,7 +655,16 @@ profile-run-stamp:
+@@ -659,7 +659,16 @@ profile-run-stamp:
  	$(MAKE) profile-gen-stamp
  	# Next, run the profile task to generate the profile information.
  	@ # FIXME: can't run for a cross build

debian/patches/profiled-build.diff

@@ -6,7 +6,7 @@ Forwarded: no
 
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1344,6 +1344,8 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
+@@ -1347,6 +1347,8 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
  	      -DGITVERSION="\"`LC_ALL=C $(GITVERSION)`\"" \
  	      -DGITTAG="\"`LC_ALL=C $(GITTAG)`\"" \
  	      -DGITBRANCH="\"`LC_ALL=C $(GITBRANCH)`\"" \

debian/patches/reproducible-buildinfo.diff

@@ -31,4 +31,3 @@ fix-py_compile.diff
 ntpath-import.diff
 python3.12-updates.diff
 issue108447.diff
-gh-112867.diff

debian/patches/series

@@ -6,7 +6,7 @@ Origin: upstream, https://github.com/python/cpython/commit/423e77d6de497931585d1
 
 --- a/Doc/conf.py
 +++ b/Doc/conf.py
-@@ -96,6 +96,10 @@ gettext_additional_targets = [
+@@ -280,6 +280,10 @@ gettext_additional_targets = [
      'index',
  ]
 
@@ -19,7 +19,7 @@ Origin: upstream, https://github.com/python/cpython/commit/423e77d6de497931585d1
 
 --- a/Doc/Makefile
 +++ b/Doc/Makefile
-@@ -14,7 +14,7 @@ PAPER        =
+@@ -13,7 +13,7 @@ PAPER        =
  SOURCES      =
  DISTVERSION  = $(shell $(PYTHON) tools/extensions/patchlevel.py)
  REQUIREMENTS = requirements.txt

debian/patches/sphinx3.diff

@@ -18,7 +18,7 @@ Forwarded: no
 
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -2306,8 +2306,10 @@ libinstall:	all $(srcdir)/Modules/xxmodu
+@@ -2328,8 +2328,10 @@ libinstall:	all $(srcdir)/Modules/xxmodu
  			esac; \
  		done; \
  	done
@@ -33,7 +33,7 @@ Forwarded: no
  	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
 --- a/configure.ac
 +++ b/configure.ac
-@@ -161,7 +161,7 @@ AC_ARG_WITH(
+@@ -164,7 +164,7 @@ AC_ARG_WITH([build-python],
      dnl Build Python interpreter is used for regeneration and freezing.
      ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python
      PYTHON_FOR_FREEZE="$with_build_python"

debian/patches/sysconfigdata-name.diff

@@ -4,8 +4,6 @@ Description: Debian: Degrade tempfile gracefully without shutil
 
 Forwarded: not-needed
 
-Index: b/Lib/tempfile.py
-===================================================================
 --- a/Lib/tempfile.py
 +++ b/Lib/tempfile.py
 @@ -40,7 +40,146 @@ import functools as _functools
@@ -156,7 +154,7 @@ Index: b/Lib/tempfile.py
  import errno as _errno
  from random import Random as _Random
  import sys as _sys
-@@ -900,7 +1039,7 @@ class TemporaryDirectory:
+@@ -927,7 +1066,7 @@ class TemporaryDirectory:
                  if not ignore_errors:
                      raise
 

debian/patches/tempfile-minimal.diff

@@ -1183,7 +1183,7 @@ endif
 
 	: # IDLE has its own changelogs, docs...
 	dh_installchangelogs -p$(p_idle) Lib/idlelib/ChangeLog
-	dh_installdocs -p$(p_idle) Lib/idlelib/{NEWS,README,TODO,extend}.txt
+	dh_installdocs -p$(p_idle) Lib/idlelib/{NEWS2x,News3,README,TODO,extend}.txt
 
 	mkdir -p $(d_idle)/usr/share/applications
 	cp -p debian/idle.desktop \