Remove remaining traces of variant testing

No more variants are built for RHEL9 anyway, just single build of bind
is made. Engines are used instead from freeipa by -E parameter. Remove
extra changes for testing alternative builds.

Resolves: RHEL-6454

bind-9.11-feature-test-named.patch

@@ -1,70 +0,0 @@
-From e9e7069ede766fa5c881517bdae74e2fc6682398 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Wed, 30 Jan 2019 14:37:17 +0100
-Subject: [PATCH] Create feature-test in source directory
-
-Feature-test tool is used in system tests to test compiled in changes.
-Because we build more variants of named with different configuration,
-compile feature-test for each of them this way.
-
-Make gsstsig test supported
----
- bin/named/Makefile.in       | 14 ++++++++++++--
- bin/tests/system/conf.sh.in |  2 +-
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
-index debb906adc..dd894fe934 100644
---- a/bin/named/Makefile.in
-+++ b/bin/named/Makefile.in
-@@ -56,7 +56,7 @@ CINCLUDES =	-I${srcdir}/include -I${srcdir}/unix/include -I. \
- 		${LIBXML2_CFLAGS} \
- 		${MAXMINDDB_CFLAGS}
- 
--CDEFINES =      @CONTRIB_DLZ@
-+CDEFINES =	@USE_GSSAPI@ @CONTRIB_DLZ@
- 
- CWARNINGS =
- 
-@@ -93,7 +93,7 @@ NOSYMLIBS =	${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \
- 
- SUBDIRS =	unix
- 
--TARGETS =	named@EXEEXT@
-+TARGETS =	named@EXEEXT@ feature-test@EXEEXT@
- 
- GEOIP2LINKOBJS = geoip.@O@
- 
-@@ -156,6 +156,16 @@ named@EXEEXT@: ${OBJS} ${DEPLIBS}
- 	export BASEOBJS="${OBJS} ${UOBJS}"; \
- 	${FINALBUILDCMD}
- 
-+# Bit of hack, do not produce intermediate .o object for featuretest
-+feature-test.@O@: ${top_srcdir}/bin/tests/system/feature-test.c
-+	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
-+		-c ${top_srcdir}/bin/tests/system/feature-test.c
-+
-+feature-test@EXEEXT@: feature-test.@O@
-+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
-+		-o $@ feature-test.@O@ ${ISCLIBS} ${LIBS}
-+
-+
- clean distclean maintainer-clean::
- 	rm -f ${TARGETS} ${OBJS}
- 
-diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
-index 9a61622143..f69c5be334 100644
---- a/bin/tests/system/conf.sh.in
-+++ b/bin/tests/system/conf.sh.in
-@@ -38,7 +38,7 @@ DELV=$TOP/bin/delv/delv
- export DIG=$TOP/bin/dig/dig
- export DNSTAPREAD=$TOP/bin/tools/dnstap-read
- export DSFROMKEY=$TOP/bin/dnssec/dnssec-dsfromkey
--export FEATURETEST=$TOP/bin/tests/system/feature-test
-+export FEATURETEST=$TOP/bin/named/feature-test
- export FSTRM_CAPTURE=@FSTRM_CAPTURE@
- export HOST=$TOP/bin/dig/host
- export IMPORTKEY=$TOP/bin/dnssec/dnssec-importkey
--- 
-2.45.2
-

bind-9.16-system-test-cds.patch

@@ -1,33 +0,0 @@
-From 7cc9fd1870e5264abd885ed2c419034945121d0f Mon Sep 17 00:00:00 2001
-From: Petr Mensik <pemensik@redhat.com>
-Date: Mon, 19 Feb 2024 22:13:52 +0100
-Subject: [PATCH] Define variants to empty values
-
-DNSSEC_VARIANT and NAMED_VARIANT are special Red Hat modifications to
-allow testing or alternative rebuilds, with support for pkcs11 or sdb.
-But undefined value breaks some tests, so define them to empty values.
-That means normal build variant.
-
-Required to pass upstream test suite cds test correctly.
----
- bin/tests/system/conf.sh.in | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
-index 7b2b309..c2d6526 100644
---- a/bin/tests/system/conf.sh.in
-+++ b/bin/tests/system/conf.sh.in
-@@ -24,6 +24,10 @@ TMPDIR=${TMPDIR:-/tmp}
- # This is not the windows build.
- CYGWIN=""
- 
-+# RH specific, allow variants testing
-+: ${DNSSEC_VARIANT:=}
-+: ${NAMED_VARIANT:=}
-+
- # Load common values shared between windows and unix/linux.
- . $TOP/bin/tests/system/conf.sh.common
- 
--- 
-2.43.2
-

bind.spec

@@ -105,11 +105,6 @@ Patch137:bind-9.11-kyua-pkcs11.patch
 
 Patch157:bind-9.11-fips-tests.patch
 Patch164:bind-9.11-rh1666814.patch
-# Is this change still needed?
-#Patch170:bind-9.11-feature-test-named.patch
-#Patch171:bind-9.11-tests-variants.patch
-# Downstream only change, fixes patch 171
-Patch201: bind-9.16-system-test-cds.patch
 # https://gitlab.isc.org/isc-projects/bind9/commit/26c9da5f2857b72077c17e06ac79f068c63782cc
 # https://gitlab.isc.org/isc-projects/bind9/commit/c5ebda6deb0997dc520b26fa0639891459de5cb6
 # https://gitlab.isc.org/isc-projects/bind9/commit/d56d2a32b861e81c2aaaabd309c4c58b629ede32