From fcd5da72b257067c31e8944ffaaf4e5698ab2419 Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik@redhat.com>
Date: Jun 02 2021 13:22:15 +0000
Subject: Support python3.10 builds (#1948435)


---

diff --git a/ldns-1.7.1-autoconf.patch b/ldns-1.7.1-autoconf.patch
new file mode 100644
index 0000000..fd55daa
--- /dev/null
+++ b/ldns-1.7.1-autoconf.patch
@@ -0,0 +1,259 @@
+From 72a9efa27fd36f2f3ca2eaa0e688b69f04151706 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
+Date: Wed, 2 Jun 2021 13:49:27 +0200
+Subject: [PATCH] Update m4 files from autoconf-archive
+
+---
+ ldns-1.7.1/ax_pkg_swig.m4          | 14 +++++-----
+ ldns-1.7.1/ax_python_devel.m4      | 41 ++++++++++++++++--------------
+ ldns-1.7.1/m4/ax_config_feature.m4 |  6 ++---
+ ldns-1.7.1/m4/ax_have_poll.m4      |  4 +--
+ 4 files changed, 34 insertions(+), 31 deletions(-)
+
+diff --git a/ldns-1.7.1/ax_pkg_swig.m4 b/ldns-1.7.1/ax_pkg_swig.m4
+index a1a58dc..1d467de 100644
+--- a/ldns-1.7.1/ax_pkg_swig.m4
++++ b/ldns-1.7.1/ax_pkg_swig.m4
+@@ -1,5 +1,5 @@
+ # ===========================================================================
+-#        http://www.gnu.org/software/autoconf-archive/ax_pkg_swig.html
++#       https://www.gnu.org/software/autoconf-archive/ax_pkg_swig.html
+ # ===========================================================================
+ #
+ # SYNOPSIS
+@@ -32,9 +32,9 @@
+ # LICENSE
+ #
+ #   Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
+-#   Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
++#   Copyright (c) 2008 Alan W. Irwin
+ #   Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
+-#   Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
++#   Copyright (c) 2008 Andrew Collier
+ #   Copyright (c) 2011 Murray Cumming <murrayc@openismus.com>
+ #
+ #   This program is free software; you can redistribute it and/or modify it
+@@ -48,7 +48,7 @@
+ #   Public License for more details.
+ #
+ #   You should have received a copy of the GNU General Public License along
+-#   with this program. If not, see <http://www.gnu.org/licenses/>.
++#   with this program. If not, see <https://www.gnu.org/licenses/>.
+ #
+ #   As a special exception, the respective Autoconf Macro's copyright owner
+ #   gives unlimited permission to copy, distribute and modify the configure
+@@ -63,11 +63,11 @@
+ #   modified version of the Autoconf Macro, you may extend this special
+ #   exception to the GPL to apply to your modified version as well.
+ 
+-#serial 8
++#serial 13
+ 
+ AC_DEFUN([AX_PKG_SWIG],[
+-        # Ubuntu has swig 2.0 as /usr/bin/swig2.0
+-        AC_PATH_PROGS([SWIG],[swig2.0 swig])
++        # Find path to the "swig" executable.
++        AC_PATH_PROGS([SWIG],[swig swig3.0 swig2.0])
+         if test -z "$SWIG" ; then
+                 m4_ifval([$3],[$3],[:])
+         elif test -n "$1" ; then
+diff --git a/ldns-1.7.1/ax_python_devel.m4 b/ldns-1.7.1/ax_python_devel.m4
+index 87e7c8c..44dbd83 100644
+--- a/ldns-1.7.1/ax_python_devel.m4
++++ b/ldns-1.7.1/ax_python_devel.m4
+@@ -1,5 +1,5 @@
+ # ===========================================================================
+-#      http://www.gnu.org/software/autoconf-archive/ax_python_devel.html
++#     https://www.gnu.org/software/autoconf-archive/ax_python_devel.html
+ # ===========================================================================
+ #
+ # SYNOPSIS
+@@ -12,8 +12,8 @@
+ #   in your configure.ac.
+ #
+ #   This macro checks for Python and tries to get the include path to
+-#   'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS)
+-#   output variables. It also exports $(PYTHON_EXTRA_LIBS) and
++#   'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output
++#   variables. It also exports $(PYTHON_EXTRA_LIBS) and
+ #   $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code.
+ #
+ #   You can search for some particular version of Python by passing a
+@@ -52,7 +52,7 @@
+ #   Public License for more details.
+ #
+ #   You should have received a copy of the GNU General Public License along
+-#   with this program. If not, see <http://www.gnu.org/licenses/>.
++#   with this program. If not, see <https://www.gnu.org/licenses/>.
+ #
+ #   As a special exception, the respective Autoconf Macro's copyright owner
+ #   gives unlimited permission to copy, distribute and modify the configure
+@@ -67,7 +67,7 @@
+ #   modified version of the Autoconf Macro, you may extend this special
+ #   exception to the GPL to apply to your modified version as well.
+ 
+-#serial 16
++#serial 21
+ 
+ AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL])
+ AC_DEFUN([AX_PYTHON_DEVEL],[
+@@ -99,7 +99,7 @@ AC_DEFUN([AX_PYTHON_DEVEL],[
+ This version of the AC@&t@_PYTHON_DEVEL macro
+ doesn't work properly with versions of Python before
+ 2.1.0. You may need to re-run configure, setting the
+-variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
++variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG,
+ PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
+ Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
+ to something else than an empty string.
+@@ -137,7 +137,7 @@ variable to configure. See ``configure --help'' for reference.
+ 	#
+ 	AC_MSG_CHECKING([for the distutils Python package])
+ 	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])
+ 	else
+ 		AC_MSG_RESULT([no])
+@@ -172,7 +172,7 @@ $ac_distutils_result])
+ 	# Check for Python library path
+ 	#
+ 	AC_MSG_CHECKING([for Python library path])
+-	if test -z "$PYTHON_LDFLAGS"; then
++	if test -z "$PYTHON_LIBS"; then
+ 		# (makes two attempts to ensure we've got a version number
+ 		# from the interpreter)
+ 		ac_python_version=`cat<<EOD | $PYTHON -
+@@ -227,25 +227,25 @@ EOD`
+ 		then
+ 			# use the official shared library
+ 			ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
+-			PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
++			PYTHON_LIBS="-L$ac_python_libdir -l$ac_python_library"
+ 		else
+ 			# old way: use libpython from python_configdir
+ 			ac_python_libdir=`$PYTHON -c \
+ 			  "from distutils.sysconfig import get_python_lib as f; \
+ 			  import os; \
+ 			  print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
+-			PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
++			PYTHON_LIBS="-L$ac_python_libdir -lpython$ac_python_version"
+ 		fi
+ 
+-		if test -z "PYTHON_LDFLAGS"; then
++		if test -z "PYTHON_LIBS"; then
+ 			AC_MSG_ERROR([
+   Cannot determine location of your Python DSO. Please check it was installed with
+-  dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand.
++  dynamic libraries enabled, or try setting PYTHON_LIBS by hand.
+ 			])
+ 		fi
+ 	fi
+-	AC_MSG_RESULT([$PYTHON_LDFLAGS])
+-	AC_SUBST([PYTHON_LDFLAGS])
++	AC_MSG_RESULT([$PYTHON_LIBS])
++	AC_SUBST([PYTHON_LIBS])
+ 
+ 	#
+ 	# Check for site packages
+@@ -253,7 +253,7 @@ EOD`
+ 	AC_MSG_CHECKING([for Python site-packages path])
+ 	if test -z "$PYTHON_SITE_PKG"; then
+ 		PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
+-			print (distutils.sysconfig.get_python_lib(1,0));"`
++			print (distutils.sysconfig.get_python_lib(0,0));"`
+ 	fi
+ 	AC_MSG_RESULT([$PYTHON_SITE_PKG])
+ 	AC_SUBST([PYTHON_SITE_PKG])
+@@ -265,7 +265,7 @@ EOD`
+ 	if test -z "$PYTHON_EXTRA_LIBS"; then
+ 	   PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
+                 conf = distutils.sysconfig.get_config_var; \
+-                print (conf('LIBS'))"`
++                print (conf('LIBS') + ' ' + conf('SYSLIBS'))"`
+ 	fi
+ 	AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
+ 	AC_SUBST(PYTHON_EXTRA_LIBS)
+@@ -288,8 +288,10 @@ EOD`
+ 	AC_MSG_CHECKING([consistency of all components of python development environment])
+ 	# save current global flags
+ 	ac_save_LIBS="$LIBS"
++	ac_save_LDFLAGS="$LDFLAGS"
+ 	ac_save_CPPFLAGS="$CPPFLAGS"
+-	LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
++	LIBS="$ac_save_LIBS $PYTHON_LIBS $PYTHON_EXTRA_LIBS $PYTHON_EXTRA_LIBS"
++	LDFLAGS="$ac_save_LDFLAGS $PYTHON_EXTRA_LDFLAGS"
+ 	CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
+ 	AC_LANG_PUSH([C])
+ 	AC_LINK_IFELSE([
+@@ -300,6 +302,7 @@ EOD`
+ 	# turn back to default flags
+ 	CPPFLAGS="$ac_save_CPPFLAGS"
+ 	LIBS="$ac_save_LIBS"
++	LDFLAGS="$ac_save_LDFLAGS"
+ 
+ 	AC_MSG_RESULT([$pythonexists])
+ 
+@@ -307,8 +310,8 @@ EOD`
+ 	   AC_MSG_FAILURE([
+   Could not link test program to Python. Maybe the main Python library has been
+   installed in some non-standard library path. If so, pass it to configure,
+-  via the LDFLAGS environment variable.
+-  Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
++  via the LIBS environment variable.
++  Example: ./configure LIBS="-L/usr/non-standard-path/python/lib"
+   ============================================================================
+    ERROR!
+    You probably have to install the development version of the Python package
+diff --git a/ldns-1.7.1/m4/ax_config_feature.m4 b/ldns-1.7.1/m4/ax_config_feature.m4
+index e205723..3c2f2ef 100644
+--- a/ldns-1.7.1/m4/ax_config_feature.m4
++++ b/ldns-1.7.1/m4/ax_config_feature.m4
+@@ -1,5 +1,5 @@
+ # ===========================================================================
+-#     http://www.gnu.org/software/autoconf-archive/ax_config_feature.html
++#    https://www.gnu.org/software/autoconf-archive/ax_config_feature.html
+ # ===========================================================================
+ #
+ # SYNOPSIS
+@@ -73,7 +73,7 @@
+ #   Public License for more details.
+ #
+ #   You should have received a copy of the GNU General Public License along
+-#   with this program. If not, see <http://www.gnu.org/licenses/>.
++#   with this program. If not, see <https://www.gnu.org/licenses/>.
+ #
+ #   As a special exception, the respective Autoconf Macro's copyright owner
+ #   gives unlimited permission to copy, distribute and modify the configure
+@@ -88,7 +88,7 @@
+ #   modified version of the Autoconf Macro, you may extend this special
+ #   exception to the GPL to apply to your modified version as well.
+ 
+-#serial 10
++#serial 11
+ 
+ AC_DEFUN([AX_CONFIG_FEATURE],[ dnl
+ m4_pushdef([FEATURE], patsubst([$1], -, _))dnl
+diff --git a/ldns-1.7.1/m4/ax_have_poll.m4 b/ldns-1.7.1/m4/ax_have_poll.m4
+index 14d3d4b..b90cda6 100644
+--- a/ldns-1.7.1/m4/ax_have_poll.m4
++++ b/ldns-1.7.1/m4/ax_have_poll.m4
+@@ -1,5 +1,5 @@
+ # ===========================================================================
+-#       http://www.gnu.org/software/autoconf-archive/ax_have_poll.html
++#       https://www.gnu.org/software/autoconf-archive/ax_have_poll.html
+ # ===========================================================================
+ #
+ # SYNOPSIS
+@@ -34,7 +34,7 @@
+ #   and this notice are preserved. This file is offered as-is, without any
+ #   warranty.
+ 
+-#serial 7
++#serial 8
+ 
+ AC_DEFUN([AX_HAVE_POLL], [dnl
+   AC_MSG_CHECKING([for poll(2)])
+-- 
+2.26.3
+
diff --git a/ldns.spec b/ldns.spec
index b3a41d8..1b40cfd 100644
--- a/ldns.spec
+++ b/ldns.spec
@@ -39,7 +39,7 @@
 Summary: Low-level DNS(SEC) library with API
 Name: ldns
 Version: 1.7.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: BSD
 Url: https://www.nlnetlabs.nl/%{name}/
@@ -48,6 +48,7 @@ Source1: https://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz.as
 # Willem Toorop, https://www.nlnetlabs.nl/people/
 Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/DC34EE5DB2417BCC151E5100E5F8F8212F77A498#/wtoorop.asc
 Patch1: ldns-1.7.0-multilib.patch
+Patch2: ldns-1.7.1-autoconf.patch
 
 # Only needed for builds from svn snapshot
 %if 0%{snapshot}
@@ -349,6 +350,9 @@ rm -rf doc/man
 %doc doc
 
 %changelog
+* Wed Jun 02 2021 Petr Menšík <pemensik@redhat.com> - 1.7.1-6
+- Support python3.10 builds (#1948435)
+
 * Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.1-5
 - Perl 5.34 rebuild