diff --git a/ldns-1.7.0-multilib.patch b/ldns-1.7.0-multilib.patch
index e38112c..61f8de9 100644
--- a/ldns-1.7.0-multilib.patch
+++ b/ldns-1.7.0-multilib.patch
@@ -1,46 +1,23 @@
-diff --git a/ldns-1.7.1/configure b/ldns-1.7.1/configure
-index b79067e..543806e 100755
---- a/ldns-1.7.1/configure
-+++ b/ldns-1.7.1/configure
-@@ -684,6 +684,7 @@ PYTHON_SITE_PKG
- PYTHON_LDFLAGS
- PYTHON_CPPFLAGS
- PYTHON
-+PYTHON_LIB
- PYTHON_VERSION
- UNINSTALL_CONFIG_MANPAGE
- UNINSTALL_CONFIG
-@@ -14324,6 +14325,7 @@ EOD`
- 			# 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_LIB="$ac_python_library"
- 		else
- 			# old way: use libpython from python_configdir
- 			ac_python_libdir=`$PYTHON -c \
-@@ -14331,6 +14333,7 @@ EOD`
- 			  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_LIB="python$ac_python_version"
- 		fi
- 
- 		if test -z "PYTHON_LDFLAGS"; then
-diff --git a/ldns-1.7.1/packaging/ldns-config.in b/ldns-1.7.1/packaging/ldns-config.in
-index f147920..5235c7a 100755
---- a/ldns-1.7.1/packaging/ldns-config.in
-+++ b/ldns-1.7.1/packaging/ldns-config.in
-@@ -1,11 +1,26 @@
- #!/bin/sh
- 
+diff --git a/ldns-1.8.1/packaging/ldns-config.in b/ldns-1.8.1/packaging/ldns-config.in
+index 623f77e..2b961f9 100755
+--- a/ldns-1.8.1/packaging/ldns-config.in
++++ b/ldns-1.8.1/packaging/ldns-config.in
+@@ -3,16 +3,28 @@
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
  VERSION="@PACKAGE_VERSION@"
--LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ @PYTHON_LDFLAGS@"
+-CFLAGS="@CFLAGS@"
+ CPPFLAGS="@CPPFLAGS@ @LIBSSL_CPPFLAGS@"
+-LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@"
+ PYTHON_CPPFLAGS="@PYTHON_CPPFLAGS@"
+-PYTHON_LDFLAGS="@PYTHON_LDFLAGS@"
++PYTHON_LDFLAGS="@PYTHON_LIBS@"
  LIBS="@LIBS@ @LIBSSL_LIBS@"
- LIBDIR="@libdir@"
+-LIBDIR="@libdir@"
  INCLUDEDIR="@includedir@"
  LIBVERSION="@VERSION_INFO@"
 +ARCH="`uname -m`"
-+
+ 
 +case $ARCH in
 +       x86_64 | amd64 | sparc64 | s390x | ppc64)
 +
@@ -53,23 +30,40 @@ index f147920..5235c7a 100755
 +               ;;
 +esac
 +
-+LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR -l@PYTHON_LIB@"
-+LDFLAGS_SEC="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR_SEC -l@PYTHON_LIB@"
++LDFLAGS_SEC="@LDFLAGS@ -L$LIBDIR_SEC"
++LDFLAGS="@LDFLAGS@ -L$LIBDIR"
  
  for arg in $@
  do
-@@ -17,9 +32,13 @@ do
+@@ -28,13 +40,17 @@ do
      then
          echo "${LDFLAGS} -L${LIBDIR} ${LIBS} -lldns"
      fi
-+    if [ $arg = "--libs_sec" ]
++    if [ $arg = "--libs_sec" ] || [ $arg = "--libs-sec" ]
 +    then
-+        echo "${LDFLAGS_SEC} -L${LIBDIR_SEC} ${LIBS} -lldns"
++        echo "${LDFLAGS_SEC} ${LIBS} -lldns"
 +    fi
+     if [ $arg = "--python-libs" ]
+     then
+         echo "${LDFLAGS} ${PYTHON_LDFLAGS} -L${LIBDIR} ${LIBS} -lldns"
+     fi
      if [ $arg = "-h" ] || [ $arg = "--help" ]
      then
--        echo "Usage: $0 [--cflags] [--libs] [--version]"
-+        echo "Usage: $0 [--cflags] [--libs] [--libs_sec] [--version]"
+-        echo "Usage: $0 [--cflags] [--python-cflags] [--libs] [--python-libs] [--version]"
++        echo "Usage: $0 [--cflags] [--python-cflags] [--libs] [--libs-sec] [--python-libs] [--version]"
      fi
      if [ $arg = "--version" ]
      then
+diff --git a/ldns-1.8.1/packaging/libldns.pc.in b/ldns-1.8.1/packaging/libldns.pc.in
+index 923b688..3c30db8 100644
+--- a/ldns-1.8.1/packaging/libldns.pc.in
++++ b/ldns-1.8.1/packaging/libldns.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=@includedir@
++includedir=@includedir@/ldns
+ 
+ Name: ldns
+ Description: Library for DNS programming
diff --git a/ldns-1.7.1-autoconf.patch b/ldns-1.7.1-autoconf.patch
deleted file mode 100644
index ad0e0fa..0000000
--- a/ldns-1.7.1-autoconf.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-From 2403972d987e50e8ba97a3f8f2deaa64f5e804f9 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
-PatchNumber: 2
----
- ldns-1.7.1/ax_pkg_swig.m4          | 14 +++++------
- ldns-1.7.1/ax_python_devel.m4      | 39 ++++++++++++++++--------------
- ldns-1.7.1/m4/ax_config_feature.m4 |  6 ++---
- ldns-1.7.1/m4/ax_have_poll.m4      |  4 +--
- 4 files changed, 33 insertions(+), 30 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..aff04f6 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
-@@ -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-1.7.1-openssl-build.patch b/ldns-1.7.1-openssl-build.patch
deleted file mode 100644
index 41834ad..0000000
--- a/ldns-1.7.1-openssl-build.patch
+++ /dev/null
@@ -1,369 +0,0 @@
---- a/ldns-1.7.1/acx_nlnetlabs.m4
-+++ b/ldns-1.7.1/acx_nlnetlabs.m4
-@@ -2,7 +2,15 @@
- # Copyright 2009, Wouter Wijngaards, NLnet Labs.   
- # BSD licensed.
- #
--# Version 34
-+# Version 41
-+# 2021-07-30 fix for openssl use of lib64 directory.
-+# 2021-06-14 fix nonblocking test to use host instead of target for mingw test.
-+# 2021-05-17 fix nonblocking socket test from grep on mingw32 to mingw for
-+# 	     64bit compatibility.
-+# 2021-03-24 fix ACX_FUNC_DEPRECATED to use CPPFLAGS and CFLAGS.
-+# 2021-01-05 fix defun for aclocal
-+# 2021-01-05 autoconf 2.70 autoupdate and fixes, no AC_TRY_COMPILE
-+# 2020-08-24 Use EVP_sha256 instead of HMAC_Update (for openssl-3.0.0).
- # 2016-03-21 Check -ldl -pthread for libcrypto for ldns and openssl 1.1.0.
- # 2016-03-21 Use HMAC_Update instead of HMAC_CTX_Init (for openssl-1.1.0).
- # 2016-01-04 -D_DEFAULT_SOURCE defined with -D_BSD_SOURCE for Linux glibc 2.20
-@@ -446,15 +454,12 @@
- AC_MSG_CHECKING(whether the C compiler (${CC-cc}) accepts the "format" attribute)
- AC_CACHE_VAL(ac_cv_c_format_attribute,
- [ac_cv_c_format_attribute=no
--AC_TRY_COMPILE(
--[#include <stdio.h>
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
- void f (char *format, ...) __attribute__ ((format (printf, 1, 2)));
- void (*pf) (char *format, ...) __attribute__ ((format (printf, 1, 2)));
--], [
-+]], [[
-    f ("%s", "str");
--],
--[ac_cv_c_format_attribute="yes"],
--[ac_cv_c_format_attribute="no"])
-+]])],[ac_cv_c_format_attribute="yes"],[ac_cv_c_format_attribute="no"])
- ])
- 
- AC_MSG_RESULT($ac_cv_c_format_attribute)
-@@ -483,14 +488,11 @@
- AC_MSG_CHECKING(whether the C compiler (${CC-cc}) accepts the "unused" attribute)
- AC_CACHE_VAL(ac_cv_c_unused_attribute,
- [ac_cv_c_unused_attribute=no
--AC_TRY_COMPILE(
--[#include <stdio.h>
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
- void f (char *u __attribute__((unused)));
--], [
-+]], [[
-    f ("x");
--],
--[ac_cv_c_unused_attribute="yes"],
--[ac_cv_c_unused_attribute="no"])
-+]])],[ac_cv_c_unused_attribute="yes"],[ac_cv_c_unused_attribute="no"])
- ])
- 
- dnl Setup ATTR_UNUSED config.h parts.
-@@ -547,7 +549,7 @@
- dnl because libtools 'AC_REQUIRE' names are right after this one, before
- dnl this function contents.
- AC_REQUIRE([ACX_LIBTOOL_C_PRE])
--AC_PROG_LIBTOOL
-+LT_INIT
- ])
- 
- dnl Detect if u_char type is defined, otherwise define it.
-@@ -646,7 +648,7 @@
-     if test x_$withval != x_no; then
-         AC_MSG_CHECKING(for SSL)
-         if test x_$withval = x_ -o x_$withval = x_yes; then
--            withval="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/local/opt/openssl /usr/sfw /usr"
-+            withval="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/sfw /usr"
-         fi
-         for dir in $withval; do
-             ssldir="$dir"
-@@ -668,22 +670,28 @@
-             HAVE_SSL=yes
-             dnl assume /usr is already in the lib and dynlib paths.
-             if test "$ssldir" != "/usr" -a "$ssldir" != ""; then
--                LDFLAGS="$LDFLAGS -L$ssldir/lib"
--                LIBSSL_LDFLAGS="$LIBSSL_LDFLAGS -L$ssldir/lib"
--                ACX_RUNTIME_PATH_ADD([$ssldir/lib])
-+		if test ! -d "$ssldir/lib" -a -d "$ssldir/lib64"; then
-+			LDFLAGS="$LDFLAGS -L$ssldir/lib64"
-+			LIBSSL_LDFLAGS="$LIBSSL_LDFLAGS -L$ssldir/lib64"
-+			ACX_RUNTIME_PATH_ADD([$ssldir/lib64])
-+		else
-+			LDFLAGS="$LDFLAGS -L$ssldir/lib"
-+			LIBSSL_LDFLAGS="$LIBSSL_LDFLAGS -L$ssldir/lib"
-+			ACX_RUNTIME_PATH_ADD([$ssldir/lib])
-+		fi
-             fi
-         
--            AC_MSG_CHECKING([for HMAC_Update in -lcrypto])
-+            AC_MSG_CHECKING([for EVP_sha256 in -lcrypto])
-             LIBS="$LIBS -lcrypto"
-             LIBSSL_LIBS="$LIBSSL_LIBS -lcrypto"
--            AC_TRY_LINK(, [
--                int HMAC_Update(void);
--                (void)HMAC_Update();
--              ], [
-+            AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
-+                int EVP_sha256(void);
-+                (void)EVP_sha256();
-+              ]])],[
-                 AC_MSG_RESULT(yes)
--                AC_DEFINE([HAVE_HMAC_UPDATE], 1, 
--                          [If you have HMAC_Update])
--              ], [
-+                AC_DEFINE([HAVE_EVP_SHA256], 1,
-+                          [If you have EVP_sha256])
-+              ],[
-                 AC_MSG_RESULT(no)
-                 # check if -lwsock32 or -lgdi32 are needed.	
-                 BAKLIBS="$LIBS"
-@@ -691,12 +699,12 @@
- 		LIBS="$LIBS -lgdi32 -lws2_32"
- 		LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32"
-                 AC_MSG_CHECKING([if -lcrypto needs -lgdi32])
--                AC_TRY_LINK([], [
--                    int HMAC_Update(void);
--                    (void)HMAC_Update();
--                  ],[
--                    AC_DEFINE([HAVE_HMAC_UPDATE], 1, 
--                        [If you have HMAC_Update])
-+                AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
-+                    int EVP_sha256(void);
-+                    (void)EVP_sha256();
-+                  ]])],[
-+                    AC_DEFINE([HAVE_EVP_SHA256], 1,
-+                        [If you have EVP_sha256])
-                     AC_MSG_RESULT(yes) 
-                   ],[
-                     AC_MSG_RESULT(no)
-@@ -705,12 +713,12 @@
-                     LIBS="$LIBS -ldl"
-                     LIBSSL_LIBS="$LIBSSL_LIBS -ldl"
-                     AC_MSG_CHECKING([if -lcrypto needs -ldl])
--                    AC_TRY_LINK([], [
--                        int HMAC_Update(void);
--                        (void)HMAC_Update();
--                      ],[
--                        AC_DEFINE([HAVE_HMAC_UPDATE], 1, 
--                            [If you have HMAC_Update])
-+                    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
-+                        int EVP_sha256(void);
-+                        (void)EVP_sha256();
-+                      ]])],[
-+                        AC_DEFINE([HAVE_EVP_SHA256], 1,
-+                            [If you have EVP_sha256])
-                         AC_MSG_RESULT(yes) 
-                       ],[
-                         AC_MSG_RESULT(no)
-@@ -719,12 +727,12 @@
-                         LIBS="$LIBS -ldl -pthread"
-                         LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread"
-                         AC_MSG_CHECKING([if -lcrypto needs -ldl -pthread])
--                        AC_TRY_LINK([], [
--                            int HMAC_Update(void);
--                            (void)HMAC_Update();
--                          ],[
--                            AC_DEFINE([HAVE_HMAC_UPDATE], 1, 
--                                [If you have HMAC_Update])
-+                        AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
-+                            int EVP_sha256(void);
-+                            (void)EVP_sha256();
-+                          ]])],[
-+                            AC_DEFINE([HAVE_EVP_SHA256], 1,
-+                                [If you have EVP_sha256])
-                             AC_MSG_RESULT(yes) 
-                           ],[
-                             AC_MSG_RESULT(no)
-@@ -749,9 +757,8 @@
- dnl
- AC_DEFUN([ACX_WITH_SSL],
- [
--AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl=pathname],
--                                    [enable SSL (will check /usr/local/ssl
--                            /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/local/opt/openssl /usr/sfw /usr)]),[
-+AC_ARG_WITH(ssl, AS_HELP_STRING([--with-ssl=pathname],[enable SSL (will check /usr/local/ssl
-+                            /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/sfw /usr)]),[
-         ],[
-             withval="yes"
-         ])
-@@ -768,9 +775,8 @@
- dnl
- AC_DEFUN([ACX_WITH_SSL_OPTIONAL],
- [
--AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl=pathname],
--                                [enable SSL (will check /usr/local/ssl
--                                /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/local/opt/openssl /usr/sfw /usr)]),[
-+AC_ARG_WITH(ssl, AS_HELP_STRING([--with-ssl=pathname],[enable SSL (will check /usr/local/ssl
-+                                /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/sfw /usr)]),[
-         ],[
-             withval="yes"
-         ])
-@@ -893,7 +899,7 @@
- [
- echo '$3' >conftest.c
- echo 'void f(){ $2 }' >>conftest.c
--if test -z "`$CC -c conftest.c 2>&1 | grep deprecated`"; then
-+if test -z "`$CC $CPPFLAGS $CFLAGS -c conftest.c 2>&1 | grep -e deprecated -e unavailable`"; then
- eval "cv_cc_deprecated_$cache=no"
- else
- eval "cv_cc_deprecated_$cache=yes"
-@@ -919,7 +925,7 @@
- AC_DEFUN([ACX_CHECK_NONBLOCKING_BROKEN],
- [
- AC_MSG_CHECKING([if nonblocking sockets work])
--if echo $target | grep mingw32 >/dev/null; then 
-+if echo $host | grep mingw >/dev/null; then
- 	AC_MSG_RESULT([no (windows)])
- 	AC_DEFINE([NONBLOCKING_IS_BROKEN], 1, [Define if the network stack does not fully support nonblocking io (causes lower performance).])
- else
-@@ -1061,7 +1067,7 @@
- AC_DEFUN([ACX_MKDIR_ONE_ARG],
- [
- AC_MSG_CHECKING([whether mkdir has one arg])
--AC_TRY_COMPILE([
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <stdio.h>
- #include <unistd.h>
- #ifdef HAVE_WINSOCK2_H
-@@ -1070,14 +1076,12 @@
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
- #endif
--], [
-+]], [[
- 	(void)mkdir("directory");
--],
--AC_MSG_RESULT(yes)
-+]])],[AC_MSG_RESULT(yes)
- AC_DEFINE(MKDIR_HAS_ONE_ARG, 1, [Define if mkdir has one argument.])
--,
--AC_MSG_RESULT(no)
--)
-+],[AC_MSG_RESULT(no)
-+])
- ])dnl end of ACX_MKDIR_ONE_ARG
- 
- dnl Check for ioctlsocket function. works on mingw32 too.
-
---- a/ldns-1.7.1/dnssec_sign.c
-+++ b/ldns-1.7.1/dnssec_sign.c
-
-@@ -413,11 +416,14 @@
- {
-         EC_KEY* ec;
-         const EC_GROUP* g;
--#ifdef HAVE_EVP_PKEY_BASE_ID
-+#ifdef HAVE_EVP_PKEY_GET_BASE_ID
-+        if(EVP_PKEY_get_base_id(pkey) != EVP_PKEY_EC)
-+                return 0;
-+#elif defined(HAVE_EVP_PKEY_BASE_ID)
-         if(EVP_PKEY_base_id(pkey) != EVP_PKEY_EC)
-                 return 0;
- #else
--        if(EVP_PKEY_type(key->type) != EVP_PKEY_EC)
-+        if(EVP_PKEY_type(pkey->type) != EVP_PKEY_EC)
-                 return 0;
- #endif
-         ec = EVP_PKEY_get1_EC_KEY(pkey);
-@@ -529,7 +535,9 @@
- #ifdef USE_DSA
- #ifndef S_SPLINT_S
- 	/* unfortunately, OpenSSL output is different from DNS DSA format */
--# ifdef HAVE_EVP_PKEY_BASE_ID
-+# ifdef HAVE_EVP_PKEY_GET_BASE_ID
-+	if (EVP_PKEY_get_base_id(key) == EVP_PKEY_DSA) {
-+# elif defined(HAVE_EVP_PKEY_BASE_ID)
- 	if (EVP_PKEY_base_id(key) == EVP_PKEY_DSA) {
- # else
- 	if (EVP_PKEY_type(key->type) == EVP_PKEY_DSA) {
-@@ -541,7 +549,9 @@
- #endif
- #if defined(USE_ECDSA)
- 	if(
--#  ifdef HAVE_EVP_PKEY_BASE_ID
-+#  ifdef HAVE_EVP_PKEY_GET_BASE_ID
-+		EVP_PKEY_get_base_id(key)
-+#  elif defined(HAVE_EVP_PKEY_BASE_ID)
- 		EVP_PKEY_base_id(key)
- #  else
- 		EVP_PKEY_type(key->type)
-
---- a/ldns-1.7.1/configure.ac
-+++ b/ldns-1.7.1/configure.ac
-@@ -332,7 +356,8 @@
- else
- 	AC_MSG_RESULT([no])
- fi
--AC_CHECK_FUNCS([EVP_sha256 EVP_sha384 EVP_sha512 ENGINE_load_cryptodev EVP_PKEY_keygen ECDSA_SIG_get0 EVP_MD_CTX_new EVP_PKEY_base_id DSA_SIG_set0 DSA_SIG_get0 EVP_dss1 DSA_get0_pqg DSA_get0_key OPENSSL_init_ssl OPENSSL_init_crypto ERR_load_crypto_strings])
-+AC_CHECK_HEADERS([openssl/ssl.h openssl/evp.h openssl/engine.h openssl/conf.h])
-+AC_CHECK_FUNCS([EVP_sha256 EVP_sha384 EVP_sha512 EVP_PKEY_keygen ECDSA_SIG_get0 EVP_MD_CTX_new EVP_PKEY_base_id DSA_SIG_set0 DSA_SIG_get0 EVP_dss1 DSA_get0_pqg DSA_get0_key EVP_cleanup ENGINE_cleanup ENGINE_free CRYPTO_cleanup_all_ex_data ERR_free_strings CONF_modules_unload OPENSSL_init_ssl OPENSSL_init_crypto ERR_load_crypto_strings CRYPTO_memcmp EVP_PKEY_get_base_id])
- 
- # for macosx, see if glibtool exists and use that
- # BSD's need to know the version...
-@@ -355,21 +380,33 @@
-         ;;
- esac
- 
--# check wether gost also works
-+# check whether gost also works
- AC_DEFUN([AC_CHECK_GOST_WORKS],
- [AC_REQUIRE([AC_PROG_CC])
- AC_MSG_CHECKING([if GOST works])
- if test c${cross_compiling} = cno; then
- BAKCFLAGS="$CFLAGS"
- if test -n "$ssldir"; then
-+    if test ! -d "$ssldir/lib" -a -d "$ssldir/lib64"; then
-+	CFLAGS="$CFLAGS -Wl,-rpath,$ssldir/lib64"
-+    else
- 	CFLAGS="$CFLAGS -Wl,-rpath,$ssldir/lib"
-+    fi
- fi
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <string.h>
-+#ifdef HAVE_OPENSSL_SSL_H
- #include <openssl/ssl.h>
-+#endif
-+#ifdef HAVE_OPENSSL_EVP_H
- #include <openssl/evp.h>
-+#endif
-+#ifdef HAVE_OPENSSL_ENGINE_H
- #include <openssl/engine.h>
-+#endif
-+#ifdef HAVE_OPENSSL_CONF_H
- #include <openssl/conf.h>
-+#endif
- /* routine to load gost (from sldns) */
- int load_gost_id(void)
- {
-@@ -464,7 +501,7 @@
-         AC_CHECK_FUNC(EVP_PKEY_set_type_str, [],[AC_MSG_ERROR([OpenSSL >= 1.0.0 is needed for GOST support or rerun with --disable-gost])])
-         AC_CHECK_FUNC(EC_KEY_new, [], [AC_MSG_ERROR([No ECC functions found in OpenSSL: please upgrade OpenSSL or rerun with --disable-gost])])
- 	AC_CHECK_GOST_WORKS
--	AC_ARG_ENABLE(gost-anyway, AC_HELP_STRING([--enable-gost-anyway], [Enable GOST even whithout a GOST engine installed]))
-+	AC_ARG_ENABLE(gost-anyway, AC_HELP_STRING([--enable-gost-anyway], [Enable GOST even without a GOST engine installed]))
- 	if test "$ac_cv_c_gost_works" != "no" -o "$enable_gost_anyway" = "yes"; then
- 		if test "$ac_cv_c_gost_works" = "no"; then
- 			AC_MSG_RESULT([no, but compiling with GOST support anyway])
-@@ -584,9 +621,11 @@
-                   AC_SUBST(ldns_build_config_use_dane_ta_usage, 0)
-                   ;;
-                 *) dnl default
--      	    LIBS="-lssl $LIBS"
-+		  danetmpLIBS="$LIBS"
-+                  LIBS="-lssl -lcrypto $LIBS"
-                   AC_CHECK_FUNC(SSL_get0_dane, [], [AC_MSG_ERROR([OpenSSL does not support offline DANE verification (Needed for the DANE-TA usage type).  Please upgrade OpenSSL to version >= 1.1.0 or rerun with --disable-dane-verify or --disable-dane-ta-usage])])
-                   LIBSSL_LIBS="-lssl $LIBSSL_LIBS"
-+		  LIBS="$danetmpLIBS"
-                   AC_SUBST(ldns_build_config_use_dane_ta_usage, 1)
-                   AC_DEFINE_UNQUOTED([USE_DANE_TA_USAGE], [1], [Define this to enable DANE-TA usage type support.])
-                   ;;
-@@ -658,7 +697,12 @@
- AC_SUBST(LIBSSL_LDFLAGS)
- AC_SUBST(LIBSSL_LIBS)
- if test "x$HAVE_SSL" = "xyes"; then
--AC_SUBST(LIBSSL_SSL_LIBS, ["-lssl $LIBSSL_LIBS"])
-+    if echo "$LIBSSL_LIBS" | grep -- "-lssl" >/dev/null 2>&1; then
-+	LIBSSL_SSL_LIBS="$LIBSSL_LIBS"
-+    else
-+	LIBSSL_SSL_LIBS="-lssl $LIBSSL_LIBS"
-+    fi
-+    AC_SUBST(LIBSSL_SSL_LIBS, "$LIBSSL_SSL_LIBS")
- fi
- CPPFLAGS=$tmp_CPPFLAGS
- LDFLAGS=$tmp_LDFLAGS
-
diff --git a/ldns-1.7.1-python-libs.patch b/ldns-1.7.1-python-libs.patch
deleted file mode 100644
index c24a2a9..0000000
--- a/ldns-1.7.1-python-libs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b0eacc1e20b7882111149ec720786ace554a65fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Thu, 3 Jun 2021 10:51:15 +0200
-Subject: [PATCH] Use PYTHON_LIBS instead of PYTHON_LDFLAGS
-
-Definition was changed to more obvious variable in ax_python_devel.m4
----
- ldns-1.7.1/Makefile.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ldns-1.7.1/Makefile.in b/ldns-1.7.1/Makefile.in
-index 442067d..9edbef1 100644
---- a/ldns-1.7.1/Makefile.in
-+++ b/ldns-1.7.1/Makefile.in
-@@ -48,7 +48,7 @@ LIBS 		= @LIBS@
- LIBOBJDIR	= compat/
- LIBOBJS		= @LIBOBJS@
- PYTHON_CPPFLAGS	= @PYTHON_CPPFLAGS@
--PYTHON_LDFLAGS	= @PYTHON_LDFLAGS@
-+PYTHON_LIBS	= @PYTHON_LIBS@
- PYTHON_X_CFLAGS = @PYTHON_X_CFLAGS@
- LIBSSL_CPPFLAGS = @LIBSSL_CPPFLAGS@
- LIBSSL_LDFLAGS  = @LIBSSL_LDFLAGS@
-@@ -301,7 +301,7 @@ ldns_wrapper.lo: $(pywrapdir)/ldns_wrapper.c ldns/config.h
- 	$(COMP_LIB) -I./include/ldns $(LIBSSL_CPPFLAGS) $(PYTHON_CPPFLAGS) $(PYTHON_X_CFLAGS) -c $(pywrapdir)/ldns_wrapper.c -o $@
- 
- _ldns.la: ldns_wrapper.lo libldns.la 
--	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(LIBS)
-+	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(PYTHON_LIBS) $(LIBS)
- 
- $(p5_dns_ldns_dir)/Makefile: $(p5_dns_ldns_dir)/Makefile.PL
- 	BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); LD_LIBRARY_PATH="$$BUILDDIR/.libs:$$LD_LIBRARY_PATH" DYLD_LIBRARY_PATH="$$BUILDDIR/.libs:$$DYLD_LIBRARY_PATH" $(PERL) Makefile.PL LIBS="-L$$BUILDDIR/.libs -lldns" INC="-I$$BUILDDIR"
--- 
-2.26.3
-
diff --git a/ldns.spec b/ldns.spec
index 32d96e9..f065585 100644
--- a/ldns.spec
+++ b/ldns.spec
@@ -47,6 +47,7 @@ Source0: https://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
 Source1: https://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz.asc
 # 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
 
 # Only needed for builds from svn snapshot
 %if 0%{snapshot}
@@ -235,6 +236,9 @@ pushd %{pkgname}
 %make_build
 %make_build doc
 
+# Multilib conflict avoidance
+sed -e "s,-L%{_libdir},," -i packaging/ldns-config
+
 # We cannot use the built-in --with-p5-dns-ldns
 %if %{with perl}
   pushd contrib/DNS-LDNS
@@ -255,6 +259,7 @@ popd
     --with-pyldns PYTHON=%{__python2}
 
   %make_build
+  sed -e "s,-L%{_libdir},," -i packaging/ldns-config
   popd
 %endif
 
@@ -352,6 +357,7 @@ rm -rf doc/man
 %changelog
 * Mon Dec 06 2021 Petr Menšík <pemensik@redhat.com> - 1.8.1-2
 - Enable svcb and https record type support
+- Remove multilib conflict in ldns-devel
 
 * Mon Dec 06 2021 Paul Wouters <paul.wouters@aiven.io> - 1.8.1-1
 - Resolves: rhbz#2028465 Heap out-of-bound read vulnerability in rr_frm_str_internal function