Control: tags 1008638 + patch
Control: tags 1008638 + pending

Dear maintainer,

I've prepared an NMU for ldns (versioned as 1.7.1-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru ldns-1.7.1/debian/changelog ldns-1.7.1/debian/changelog
--- ldns-1.7.1/debian/changelog 2020-06-24 15:08:14.000000000 +0300
+++ ldns-1.7.1/debian/changelog 2022-04-07 16:03:29.000000000 +0300
@@ -1,3 +1,15 @@
+ldns (1.7.1-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * add skip-wrong-python-distutils-configure-check.diff to skip the
+    incorrect distutils package check (it should be checking the
+    return code not the emptiness of the output). This fixes FTBFS
+    with new python (3.10) and allows the python3.10 transition to
+    happen, but it is not fixing the actual issiue with ldns using
+    distutils which should be addressed later.  Closes: #1008638
+
+ -- Michael Tokarev <m...@tls.msk.ru>  Thu, 07 Apr 2022 16:03:29 +0300
+
 ldns (1.7.1-2) unstable; urgency=low
 
   * Team upload.
diff -Nru ldns-1.7.1/debian/patches/series ldns-1.7.1/debian/patches/series
--- ldns-1.7.1/debian/patches/series    2020-06-03 23:55:03.000000000 +0300
+++ ldns-1.7.1/debian/patches/series    2022-04-07 16:03:17.000000000 +0300
@@ -1 +1,2 @@
 Makefile-remove-install-libldns-pc.patch
+skip-wrong-python-distutils-configure-check.diff
diff -Nru 
ldns-1.7.1/debian/patches/skip-wrong-python-distutils-configure-check.diff 
ldns-1.7.1/debian/patches/skip-wrong-python-distutils-configure-check.diff
--- ldns-1.7.1/debian/patches/skip-wrong-python-distutils-configure-check.diff  
1970-01-01 03:00:00.000000000 +0300
+++ ldns-1.7.1/debian/patches/skip-wrong-python-distutils-configure-check.diff  
2022-04-07 16:03:29.000000000 +0300
@@ -0,0 +1,33 @@
+Subject: disable 
+
+--- a/ax_python_devel.m4       2019-07-26 18:07:44.000000000 +0300
++++ b/ax_python_devel.m4       2022-04-07 16:02:18.383039533 +0300
+@@ -135,17 +135,17 @@
+       #
+       # Check if you have distutils, else fail
+       #
+-      AC_MSG_CHECKING([for the distutils Python package])
+-      ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-      if test -z "$ac_distutils_result"; then
+-              AC_MSG_RESULT([yes])
+-      else
+-              AC_MSG_RESULT([no])
+-              AC_MSG_ERROR([cannot import Python module "distutils".
+-Please check your Python installation. The error was:
+-$ac_distutils_result])
+-              PYTHON_VERSION=""
+-      fi
++#     AC_MSG_CHECKING([for the distutils Python package])
++#     ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
++#     if test -z "$ac_distutils_result"; then
++#             AC_MSG_RESULT([yes])
++#     else
++#             AC_MSG_RESULT([no])
++#             AC_MSG_ERROR([cannot import Python module "distutils".
++#Please check your Python installation. The error was:
++#$ac_distutils_result])
++#             PYTHON_VERSION=""
++#     fi
+ 
+       #
+       # Check for Python include path

Reply via email to