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. This is a second try, - I found my mistake when attempted to check the return code of the autoconf test. Fixed it now. The change is a one-liner. 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 fix-wrong-python-distutils-configure-check.diff to fix 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/fix-wrong-python-distutils-configure-check.diff ldns-1.7.1/debian/patches/fix-wrong-python-distutils-configure-check.diff --- ldns-1.7.1/debian/patches/fix-wrong-python-distutils-configure-check.diff 1970-01-01 03:00:00.000000000 +0300 +++ ldns-1.7.1/debian/patches/fix-wrong-python-distutils-configure-check.diff 2022-04-07 16:03:29.000000000 +0300 @@ -0,0 +1,22 @@ +Subject: fix the wrong distutils python check in configure +From: Michael Tokarev <m...@tls.msk.ru> +Date: Thu, 07 Apr 2022 17:22:05 +0300 + +The check is implemented in the wrong way: instead of checking for +the return value of an attempt to import the given module (which is 0), +it is checking the returned _text_. And with python3.10, this module +is deprecated, so python gives a warning. It is not fatal but the +wrong test made it so by checking for the output to be empty. + +Fix it by checking for the error code instead of checking emptiness +of output. + +diff --git a/ax_python_devel.m4 b/ax_python_devel.m4 +index 87e7c8c..6a7cd3e 100644 +--- a/ax_python_devel.m4 ++++ b/ax_python_devel.m4 +@@ -139,3 +139,3 @@ variable to configure. See ``configure --help'' for reference. + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ if test $? -eq 0; then + AC_MSG_RESULT([yes]) 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:29.000000000 +0300 @@ -1 +1,2 @@ Makefile-remove-install-libldns-pc.patch +fix-wrong-python-distutils-configure-check.diff
