Merge ~ahasenack/ubuntu/+source/mod-wsgi:noble-mod-wsgi-python-3.12-ftbfs into ubuntu/+source/mod-wsgi:ubuntu/devel

[Andreas Hasenack]

Fix build with python 3.12 which dropped the distutils module.

Upstream committed other changes to support 3.12, mainly in their own github test suite configuration, tox, setup.py, but we don't run those, and I opted to pick the simpler patch that works. At some point debian will update to version 5.0.0, which has all of this included, I suppose.

Also note I didn't pick the ./configure changes from the upstream patch, since ./configure is regenerated from configure.ac during package build.

PPA with proposed enabled, showing a good build with python 3.12: https://launchpad.net/~ahasenack/+archive/ubuntu/python312-dropped-distutils/+packages

DEP8: green
Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-noble-ahasenack-python312-dropped-distutils/?format=plain)
  mod-wsgi @ amd64:
    01.12.23 19:04:58 Log 🗒️ ✅ Triggers: mod-wsgi/4.9.4-1ubuntu1~ppa2

https://autopkgtest.ubuntu.com/results/autopkgtest-noble-ahasenack-python312-dropped-distutils/noble/amd64/m/mod-wsgi/20231201_190458_0e266@/log.gz

Salsa MP: https://salsa.debian.org/python-team/packages/mod-wsgi/-/merge_requests/1 (which I also linked to from the debian bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1055566)

[Bryce Harrington (bryce)]

Confirmed the package in the PPA builds, however the build log shows that distutils still is installed, with no mention of setuptools:

     python3-dev (= 3.11.4-5ubuntu1),
     python3-distutils (= 3.11.5-1),
     python3-lib2to3 (= 3.11.5-1),

This isn't mentioned in d/control, however after uninstalling python3-distutils and running `install-build-deps .` on the source package dir, it does try to pull it in:

    The following NEW packages will be installed:
      apache2-dev libapr1-dev libaprutil1-dev libpython3-all-dev libpython3-dev libpython3.11-dev libsctp-dev libsctp1
      python3-all python3-all-dev python3-dev python3-distutils python3-lib2to3 python3.11-dev
    0 upgraded, 14 newly installed, 0 to remove and 287 not upgraded.

Notice though that this is with python3.11. I manually installed python3.12, but my system still builds with python3.12, although it does give an interesting error:

    Unpacking python3-all-dev (3.11.4-5) ...
    Setting up python3-distutils (3.11.5-1) ...
    python3.12: can't get files for byte-compilation
    Setting up python3-all (3.11.4-5) ...

Anyway, I can't point to an actual problem so will give a +1. The changes themselves LGTM, and suspect the problem is more just that the python transition is still ongoing.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: ahasenack, bryce
Uploaders: ahasenack, bryce
MP auto-approved

review: Approve

[Andreas Hasenack (ahasenack)]

python3-distutils 3.11.5-1 has an empty 3.12 directory:

(...)
/usr/lib/python3.11/distutils/util.py
/usr/lib/python3.11/distutils/versionpredicate.py
/usr/lib/python3.12

I would also wait for the transition to be complete.

Thanks for the review, uploading:

Uploading mod-wsgi_4.9.4-1ubuntu1.dsc
Uploading mod-wsgi_4.9.4-1ubuntu1.debian.tar.xz
Uploading mod-wsgi_4.9.4-1ubuntu1_source.buildinfo
Uploading mod-wsgi_4.9.4-1ubuntu1_source.changes

diff --git a/debian/changelog b/debian/changelog
index 4d7e070..119c076 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mod-wsgi (4.9.4-1ubuntu1) noble; urgency=medium
+
+  * d/p/no-more-distutils.patch: Migrate from distutils to setuptools +
+    sysconfig since python 3.12 dropped distutils  (LP: #2045416)
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 01 Dec 2023 13:33:53 -0300
+
 mod-wsgi (4.9.4-1build2) noble; urgency=medium
 
   * No-change rebuild with Python 3.12 as supported version
diff --git a/debian/control b/debian/control
index e7781af..32f4024 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: mod-wsgi
 Section: httpd
 Priority: optional
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders: Emmanuel Arias <[e-mail]>,
 Build-Depends: apache2-dev (>= 2.4),
                debhelper-compat (= 13),
diff --git a/debian/patches/no-more-distutils.patch b/debian/patches/no-more-distutils.patch
new file mode 100644
index 0000000..3c73cb0
--- /dev/null
+++ b/debian/patches/no-more-distutils.patch
@@ -0,0 +1,84 @@
+commit 70bed479cb0270ecc5faebcdcad40bc27b866f4f
+Author: Jared Deckard <[e-mail]>
+Date:   Fri Sep 22 11:19:37 2023 -0500
+
+    Migrate from distutils to setuptools + sysconfig
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1055566
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mod-wsgi/+bug/2045416
+Origin: upstream, https://github.com/GrahamDumpleton/mod_wsgi/commit/70bed479cb0270ecc5faebcdcad40bc27b866f4f
+Applied-Upstream: 5.0.0
+Last-Update: 2023-12-01
+
+diff --git a/configure.ac b/configure.ac
+index 25962bc..44f4718 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -141,9 +141,8 @@ PYTHONLIBDIR=`${PYTHON} -c 'from sys import stdout; \
+     import sysconfig; \
+     stdout.write(sysconfig.get_config_var("LIBDIR"))'`
+ PYTHONCFGDIR=`${PYTHON} -c 'from sys import stdout; \
+-    import distutils.sysconfig; \
+-    stdout.write(distutils.sysconfig.get_python_lib(plat_specific=1, \
+-    standard_lib=1) +"/config")'`
++    import sysconfig; \
++    stdout.write(sysconfig.get_path("platstdlib") +"/config")'`
+ PYTHONFRAMEWORKDIR=`${PYTHON} -c 'from sys import stdout; \
+     import sysconfig; \
+     stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKDIR"))'`
+diff --git a/setup.py b/setup.py
+index e0c8c84..4169375 100644
+--- a/setup.py
++++ b/setup.py
+@@ -15,9 +15,9 @@ except ImportError:
+     from urllib import urlretrieve
+ 
+ from setuptools import setup
+-from distutils.core import Extension
+-from distutils.sysconfig import get_config_var as get_python_config
+-from distutils.sysconfig import get_python_lib
++from setuptools.extension import Extension
++from sysconfig import get_config_var as get_python_config
++from sysconfig import get_path as get_python_lib
+ 
+ # First work out what all the available source code files are that should
+ # be compiled.
+@@ -293,7 +293,7 @@ else:
+ 
+     PYTHON_LIBDIR = get_python_config('LIBDIR')
+     APXS_LIBDIR = get_apxs_config('LIBDIR')
+-    PYTHON_CFGDIR =  get_python_lib(plat_specific=1, standard_lib=1) + '/config'
++    PYTHON_CFGDIR =  get_python_lib('platstdlib') + '/config'
+ 
+     if PYTHON_LDVERSION and PYTHON_LDVERSION != PYTHON_VERSION:
+         PYTHON_CFGDIR = '%s-%s' % (PYTHON_CFGDIR, PYTHON_LDVERSION)
+@@ -402,7 +402,7 @@ if os.name != 'nt':
+             not get_python_config('PYTHONFRAMEWORK')):
+         print(SHARED_LIBRARY_WARNING)
+ 
+-# Now finally run distutils.
++# Now finally run setuptools.
+ 
+ package_name = 'mod_wsgi'
+ long_description = open('README.rst').read()
+diff --git a/src/server/__init__.py b/src/server/__init__.py
+index 33f0fad..f2d8632 100644
+--- a/src/server/__init__.py
++++ b/src/server/__init__.py
+@@ -35,7 +35,6 @@ _py_dylib = ''
+ 
+ try:
+     import sysconfig
+-    import distutils.sysconfig
+ 
+     _py_soabi = sysconfig.get_config_var('SOABI')
+ 
+@@ -63,7 +62,7 @@ if not os.path.exists(MOD_WSGI_SO) and _py_soabi:
+     MOD_WSGI_SO = posixpath.join(posixpath.dirname(__file__), MOD_WSGI_SO)
+ 
+ if not os.path.exists(MOD_WSGI_SO) and os.name == 'nt':
+-    MOD_WSGI_SO = 'mod_wsgi%s' % distutils.sysconfig.get_config_var('EXT_SUFFIX')
++    MOD_WSGI_SO = 'mod_wsgi%s' % sysconfig.get_config_var('EXT_SUFFIX')
+     MOD_WSGI_SO = os.path.join(os.path.dirname(__file__), MOD_WSGI_SO)
+     MOD_WSGI_SO = MOD_WSGI_SO.replace('\\', '/')
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d66684d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no-more-distutils.patch