Merge ~ahasenack/ubuntu/+source/freeradius:jammy-freeradius-fix-python3-linking-1873923 into ubuntu/+source/freeradius:ubuntu/devel

[Andreas Hasenack]

Fix linking of the rlm_python3 module with python3

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/freeradius-python3

I'm not super proud of this fix, but I figured it was the smallest one we could do at this stage. Running autoreconf makes a lot of other changes, and also produces warnings. It's likely upstream isn't fully ready for autoconf 2.7x. We had to fix other packages in the recent past due to this autoconf version bump, and I don't think we should do it now just days before beta freeze.

Note that this is a configure (and configure.ac) script deep inside the soruce tree, and not the main one at the root.

That being said, the one-liner fix comes exactly from such an autoreconf run.

I grepped the code and the only other place where the python version is parsed like that is in rlm-python, which we don't build:

=== configuring in src/modules/rlm_python (/<<PKGBUILDDIR>>/src/modules/rlm_python)
...
configure: WARNING: silently not building rlm_python.
configure: WARNING: FAILURE: rlm_python requires: python-binary.

Another option I entertained for a while was to export EMBED=--embed in d/rules, which would also accomplish this. But rely on configure being the same going forward, still using that variable or detection mechanism, and we wouldn't notice a breakage again, unless we added a DEP8 test specifically for this.

To test:
apt update
apt install freeradius freeradius-python3 -y
ln -s /etc/freeradius/3.0/mods-available/python3 /etc/freeradius/3.0/mods-enabled/
systemctl stop freeradius
freeradius -Xx 2>&1 | tee output.log

In jammy, freeradius will exit with this:
Thu Mar 24 14:23:46 2022 : Error: /etc/freeradius/3.0/mods-enabled/python3[9]: Failed to link to module 'rlm_python3': /usr/lib/freeradius/rlm_python3.so: undefined symbol: PyTuple_Type

With the fix, it will stay running.

Another quick check is verify the python3 module was linked with python3:
root@j1:~# ldd /usr/lib/freeradius/rlm_python3.so | grep python
root@j1:~#

versus

root@j1:~# ldd /usr/lib/freeradius/rlm_python3.so | grep python
 libpython3.10.so.1.0 => /lib/x86_64-linux-gnu/libpython3.10.so.1.0 (0x00007f15225c3000)

[Utkarsh Gupta (utkarsh)]

Looks good with one trivial comment.

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, uploaded

$ dput ubuntu ../freeradius_3.0.26~dfsg~git20220223.1.00ed0241fa-0ubuntu3_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../freeradius_3.0.26~dfsg~git20220223.1.00ed0241fa-0ubuntu3_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../freeradius_3.0.26~dfsg~git20220223.1.00ed0241fa-0ubuntu3.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading freeradius_3.0.26~dfsg~git20220223.1.00ed0241fa-0ubuntu3.dsc: done.
  Uploading freeradius_3.0.26~dfsg~git20220223.1.00ed0241fa-0ubuntu3.debian.tar.xz: done.
  Uploading freeradius_3.0.26~dfsg~git20220223.1.00ed0241fa-0ubuntu3_source.buildinfo: done.
  Uploading freeradius_3.0.26~dfsg~git20220223.1.00ed0241fa-0ubuntu3_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 79e713c..41187e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+freeradius (3.0.26~dfsg~git20220223.1.00ed0241fa-0ubuntu3) jammy; urgency=medium
+
+  * d/p/fix-python-version-parsing.patch: fix parsing of python versions
+    with multiple digits (LP: #1873923)
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 23 Mar 2022 20:13:55 -0300
+
 freeradius (3.0.26~dfsg~git20220223.1.00ed0241fa-0ubuntu2) jammy; urgency=medium
 
   * Fix radtest client crash when using mschap auth (LP: #1962046):
diff --git a/debian/patches/fix-python-version-parsing.patch b/debian/patches/fix-python-version-parsing.patch
new file mode 100644
index 0000000..3ea219a
--- /dev/null
+++ b/debian/patches/fix-python-version-parsing.patch
@@ -0,0 +1,26 @@
+Description: fix python version parsing
+ The rlm_python3 configure script failed to correctly parse python minor
+ versions with more than one digit, like 3.10, which it parsed as being just
+ 3.1.
+ It's ugly to patch generated files like ./configure directly, but I think it's
+ the minimal fix we can apply now, instead of regenerating all autoconf scripts,
+ which would introduce many more changes.
+ FWIW, this is the change we get when autoreconf is run.
+Author: Andreas Hasenack <[e-mail]>
+Bug: https://github.com/FreeRADIUS/freeradius-server/issues/4441
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/freeradius/+bug/1873923
+Last-Update: 2022-03-23
+
+diff --git a/src/modules/rlm_python3/configure b/src/modules/rlm_python3/configure
+index 52bc177d..48139223 100755
+--- a/src/modules/rlm_python3/configure
++++ b/src/modules/rlm_python3/configure
+@@ -2951,7 +2951,7 @@ $as_echo_n "checking for $am_display_PYTHON version... " >&6; }
+ if ${am_cv_python_version+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
++  am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[:2])"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+ $as_echo "$am_cv_python_version" >&6; }
diff --git a/debian/patches/series b/debian/patches/series
index 4b4a67b..ddc5db9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ mkdirp.diff
 snakeoil-certs.diff
 fix-mschap-client-crash-1.patch
 fix-mschap-client-crash-2.patch
+fix-python-version-parsing.patch