From 32ee97f516c864592e9771fc18b9bb8833f12e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Wed, 25 Aug 2021 15:38:17 +0200 Subject: [PATCH] Remove unneeded test variants changes Variants for testing were planned to test also named-sdb and named-pkcs11 builds. Instead, those build were deprecated, named-sdb no longer exists with possible replacement of named-dlz plugins. named-pkcs11 would not be built soon, it can be replaced by using -E pkcs11 parameter to named and some dnssec-* tools. Testing those variants should not be required this way. --- bind-9.10-dist-native-pkcs11.patch | 43 ++++++++------------ bind-9.11-feature-test-named.patch | 59 --------------------------- bind-9.11-tests-variants.patch | 65 ------------------------------ bind.spec | 6 +-- 4 files changed, 19 insertions(+), 154 deletions(-) delete mode 100644 bind-9.11-feature-test-named.patch delete mode 100644 bind-9.11-tests-variants.patch diff --git a/bind-9.10-dist-native-pkcs11.patch b/bind-9.10-dist-native-pkcs11.patch index 85ece30..e4f1ebd 100644 --- a/bind-9.10-dist-native-pkcs11.patch +++ b/bind-9.10-dist-native-pkcs11.patch @@ -1,4 +1,4 @@ -From 040227009453b3f0aa7914c7a6a94dc57ad5269b Mon Sep 17 00:00:00 2001 +From 1cbffe7e8b5bced9134abbae23a2a20c83d39a6a Mon Sep 17 00:00:00 2001 From: Petr Mensik Date: Thu, 21 Jan 2021 10:46:20 +0100 Subject: [PATCH] Enable custom pkcs11 native build @@ -9,7 +9,7 @@ pkcs11 libraries as a new copy of libdns and libns. bin/Makefile.in | 2 +- bin/confgen/Makefile.in | 2 +- bin/dnssec-pkcs11/Makefile.in | 39 +++++++++++++++++--------------- - bin/named-pkcs11/Makefile.in | 33 ++++++++++++++------------- + bin/named-pkcs11/Makefile.in | 31 +++++++++++++------------ configure.ac | 19 ++++++++++++++++ lib/Makefile.in | 2 +- lib/dns-pkcs11/Makefile.in | 22 +++++++++--------- @@ -17,7 +17,7 @@ pkcs11 libraries as a new copy of libdns and libns. lib/ns-pkcs11/Makefile.in | 26 ++++++++++----------- lib/ns-pkcs11/tests/Makefile.in | 12 +++++----- make/includes.in | 7 ++++++ - 11 files changed, 101 insertions(+), 71 deletions(-) + 11 files changed, 100 insertions(+), 70 deletions(-) diff --git a/bin/Makefile.in b/bin/Makefile.in index 9ad7f62..094775a 100644 @@ -151,7 +151,7 @@ index ace0e5a..e0f6a00 100644 dnssec-importkey.@O@ ${OBJS} ${LIBS} diff --git a/bin/named-pkcs11/Makefile.in b/bin/named-pkcs11/Makefile.in -index 98125dd..518a75f 100644 +index debb906..ecfdb6c 100644 --- a/bin/named-pkcs11/Makefile.in +++ b/bin/named-pkcs11/Makefile.in @@ -37,13 +37,14 @@ DBDRIVER_LIBS = @@ -208,8 +208,8 @@ index 98125dd..518a75f 100644 SUBDIRS = unix --TARGETS = named@EXEEXT@ feature-test@EXEEXT@ -+TARGETS = named-pkcs11@EXEEXT@ feature-test-pkcs11@EXEEXT@ +-TARGETS = named@EXEEXT@ ++TARGETS = named-pkcs11@EXEEXT@ GEOIP2LINKOBJS = geoip.@O@ @@ -222,16 +222,7 @@ index 98125dd..518a75f 100644 export MAKE_SYMTABLE="yes"; \ export BASEOBJS="${OBJS} ${UOBJS}"; \ ${FINALBUILDCMD} -@@ -161,7 +162,7 @@ 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@ -+feature-test-pkcs11@EXEEXT@: feature-test.@O@ - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \ - -o $@ feature-test.@O@ ${ISCLIBS} ${LIBS} - -@@ -180,11 +181,11 @@ statschannel.@O@: bind9.xsl.h +@@ -170,11 +171,11 @@ statschannel.@O@: bind9.xsl.h installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir} @@ -247,10 +238,10 @@ index 98125dd..518a75f 100644 @DLZ_DRIVER_RULES@ diff --git a/configure.ac b/configure.ac -index 032228b..64e3da0 100644 +index e405eaf..efaa5a7 100644 --- a/configure.ac +++ b/configure.ac -@@ -1251,12 +1251,14 @@ AC_SUBST(USE_GSSAPI) +@@ -1269,12 +1269,14 @@ AC_SUBST(USE_GSSAPI) AC_SUBST(DST_GSSAPI_INC) AC_SUBST(DNS_GSSAPI_LIBS) DNS_CRYPTO_LIBS="$DNS_GSSAPI_LIBS" @@ -265,7 +256,7 @@ index 032228b..64e3da0 100644 # # was --with-lmdb specified? -@@ -2327,6 +2329,8 @@ AC_SUBST(BIND9_DNS_BUILDINCLUDE) +@@ -2345,6 +2347,8 @@ AC_SUBST(BIND9_DNS_BUILDINCLUDE) AC_SUBST(BIND9_NS_BUILDINCLUDE) AC_SUBST(BIND9_BIND9_BUILDINCLUDE) AC_SUBST(BIND9_IRS_BUILDINCLUDE) @@ -274,7 +265,7 @@ index 032228b..64e3da0 100644 if test "X$srcdir" != "X"; then BIND9_ISC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isc/include" BIND9_ISCCC_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isccc/include" -@@ -2335,6 +2339,8 @@ if test "X$srcdir" != "X"; then +@@ -2353,6 +2357,8 @@ if test "X$srcdir" != "X"; then BIND9_NS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/ns/include" BIND9_BIND9_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/bind9/include" BIND9_IRS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/irs/include" @@ -283,7 +274,7 @@ index 032228b..64e3da0 100644 else BIND9_ISC_BUILDINCLUDE="" BIND9_ISCCC_BUILDINCLUDE="" -@@ -2343,6 +2349,8 @@ else +@@ -2361,6 +2367,8 @@ else BIND9_NS_BUILDINCLUDE="" BIND9_BIND9_BUILDINCLUDE="" BIND9_IRS_BUILDINCLUDE="" @@ -292,7 +283,7 @@ index 032228b..64e3da0 100644 fi AC_SUBST_FILE(BIND9_MAKE_INCLUDES) -@@ -2798,8 +2806,11 @@ AC_CONFIG_FILES([ +@@ -2816,8 +2824,11 @@ AC_CONFIG_FILES([ bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile @@ -304,7 +295,7 @@ index 032228b..64e3da0 100644 bin/nsupdate/Makefile bin/pkcs11/Makefile bin/plugins/Makefile -@@ -2861,6 +2872,10 @@ AC_CONFIG_FILES([ +@@ -2879,6 +2890,10 @@ AC_CONFIG_FILES([ lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile @@ -315,7 +306,7 @@ index 032228b..64e3da0 100644 lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile -@@ -2893,6 +2908,10 @@ AC_CONFIG_FILES([ +@@ -2911,6 +2926,10 @@ AC_CONFIG_FILES([ lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/Makefile @@ -410,7 +401,7 @@ index 58bda3c..d6a45df 100644 rm -f include/dns/rdatastruct.h rm -f dnstap.pb-c.c dnstap.pb-c.h diff --git a/lib/dns-pkcs11/tests/Makefile.in b/lib/dns-pkcs11/tests/Makefile.in -index 3bb5e01..c96fe7d 100644 +index da91394..aadb73f 100644 --- a/lib/dns-pkcs11/tests/Makefile.in +++ b/lib/dns-pkcs11/tests/Makefile.in @@ -15,15 +15,15 @@ VERSION=@BIND9_VERSION@ @@ -546,5 +537,5 @@ index b8317d3..b73b0c4 100644 + -I${top_srcdir}/lib/ns-pkcs11/include + -- -2.26.3 +2.31.1 diff --git a/bind-9.11-feature-test-named.patch b/bind-9.11-feature-test-named.patch deleted file mode 100644 index 9af8d73..0000000 --- a/bind-9.11-feature-test-named.patch +++ /dev/null @@ -1,59 +0,0 @@ -From e645046202006750f87531e21e3ff7c26fba3466 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= -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. ---- - bin/named/Makefile.in | 12 +++++++++++- - bin/tests/system/conf.sh.in | 2 +- - 2 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in -index 37053a7..ed9add2 100644 ---- a/bin/named/Makefile.in -+++ b/bin/named/Makefile.in -@@ -91,7 +91,7 @@ NOSYMLIBS = ${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \ - - SUBDIRS = unix - --TARGETS = named@EXEEXT@ -+TARGETS = named@EXEEXT@ feature-test@EXEEXT@ - - GEOIP2LINKOBJS = geoip.@O@ - -@@ -154,6 +154,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 7934930..e84fde2 100644 ---- a/bin/tests/system/conf.sh.in -+++ b/bin/tests/system/conf.sh.in -@@ -37,7 +37,7 @@ DELV=$TOP/bin/delv/delv - DIG=$TOP/bin/dig/dig - DNSTAPREAD=$TOP/bin/tools/dnstap-read - DSFROMKEY=$TOP/bin/dnssec/dnssec-dsfromkey --FEATURETEST=$TOP/bin/tests/system/feature-test -+FEATURETEST=$TOP/bin/named/feature-test - FSTRM_CAPTURE=@FSTRM_CAPTURE@ - HOST=$TOP/bin/dig/host - IMPORTKEY=$TOP/bin/dnssec/dnssec-importkey --- -2.26.2 - diff --git a/bind-9.11-tests-variants.patch b/bind-9.11-tests-variants.patch deleted file mode 100644 index 2b29b99..0000000 --- a/bind-9.11-tests-variants.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 953e480044f61dd162726f8345acf450d6ddbecc Mon Sep 17 00:00:00 2001 -From: Petr Mensik -Date: Fri, 1 Mar 2019 15:48:20 +0100 -Subject: [PATCH] Make alternative named builds testable in system tests - -Red Hat has alternative variant builds of named, which are not ever -tested by system tests. New variables make it relatively easy to test -alternative variants. - -For sdb variant use: -export NAMED_VARIANT=-sdb DNSSEC_VARIANT= - -For pkcs variant use: -export NAMED_VARIANT=-pkcs11 DNSSEC_VARIANT=-pkcs11 ---- - bin/tests/system/conf.sh.in | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in -index d859909..db2bafb 100644 ---- a/bin/tests/system/conf.sh.in -+++ b/bin/tests/system/conf.sh.in -@@ -37,17 +37,17 @@ DDNSCONFGEN=$TOP/bin/confgen/ddns-confgen - DELV=$TOP/bin/delv/delv - DIG=$TOP/bin/dig/dig - DNSTAPREAD=$TOP/bin/tools/dnstap-read --DSFROMKEY=$TOP/bin/dnssec/dnssec-dsfromkey --FEATURETEST=$TOP/bin/named/feature-test -+DSFROMKEY=$TOP/bin/dnssec${DNSSEC_VARIANT:-}/dnssec-dsfromkey${DNSSEC_VARIANT:-} -+FEATURETEST=$TOP/bin/named${NAMED_VARIANT:-}/feature-test${NAMED_VARIANT:-} - FSTRM_CAPTURE=@FSTRM_CAPTURE@ - HOST=$TOP/bin/dig/host --IMPORTKEY=$TOP/bin/dnssec/dnssec-importkey -+IMPORTKEY=$TOP/bin/dnssec${DNSSEC_VARIANT:-}/dnssec-importkey${DNSSEC_VARIANT:-} - JOURNALPRINT=$TOP/bin/tools/named-journalprint --KEYFRLAB=$TOP/bin/dnssec/dnssec-keyfromlabel --KEYGEN=$TOP/bin/dnssec/dnssec-keygen -+KEYFRLAB=$TOP/bin/dnssec${DNSSEC_VARIANT:-}/dnssec-keyfromlabel${DNSSEC_VARIANT:-} -+KEYGEN=$TOP/bin/dnssec${DNSSEC_VARIANT:-}/dnssec-keygen${DNSSEC_VARIANT:-} - KEYMGR=$TOP/bin/python/dnssec-keymgr - MDIG=$TOP/bin/tools/mdig --NAMED=$TOP/bin/named/named -+NAMED=$TOP/bin/named${NAMED_VARIANT:-}/named${NAMED_VARIANT:-} - NSEC3HASH=$TOP/bin/tools/nsec3hash - NSLOOKUP=$TOP/bin/dig/nslookup - NSUPDATE=$TOP/bin/nsupdate/nsupdate -@@ -56,12 +56,12 @@ PK11DEL="$TOP/bin/pkcs11/pkcs11-destroy -s ${SLOT:-0} -p ${HSMPIN:-1234} -w 0" - PK11GEN="$TOP/bin/pkcs11/pkcs11-keygen -q -s ${SLOT:-0} -p ${HSMPIN:-1234}" - PK11LIST="$TOP/bin/pkcs11/pkcs11-list -s ${SLOT:-0} -p ${HSMPIN:-1234}" - RESOLVE=$TOP/bin/tests/system/resolve --REVOKE=$TOP/bin/dnssec/dnssec-revoke -+REVOKE=$TOP/bin/dnssec${DNSSEC_VARIANT:-}/dnssec-revoke${DNSSEC_VARIANT:-} - RNDC=$TOP/bin/rndc/rndc - RNDCCONFGEN=$TOP/bin/confgen/rndc-confgen - RRCHECKER=$TOP/bin/tools/named-rrchecker --SETTIME=$TOP/bin/dnssec/dnssec-settime --SIGNER=$TOP/bin/dnssec/dnssec-signzone -+SETTIME=$TOP/bin/dnssec${DNSSEC_VARIANT:-}/dnssec-settime${DNSSEC_VARIANT:-} -+SIGNER=$TOP/bin/dnssec${DNSSEC_VARIANT:-}/dnssec-signzone${DNSSEC_VARIANT:-} - TSIGKEYGEN=$TOP/bin/confgen/tsig-keygen - VERIFY=$TOP/bin/dnssec/dnssec-verify - WIRETEST=$TOP/bin/tests/wire_test --- -2.31.1 - diff --git a/bind.spec b/bind.spec index d020de0..5a86ee0 100644 --- a/bind.spec +++ b/bind.spec @@ -102,8 +102,6 @@ Patch149:bind-9.11-kyua-pkcs11.patch Patch157:bind-9.11-fips-tests.patch Patch164:bind-9.11-rh1666814.patch -Patch170:bind-9.11-feature-test-named.patch -Patch171:bind-9.11-tests-variants.patch # https://gitlab.isc.org/isc-projects/bind9/-/issues/2872 Patch172:https://downloads.isc.org/isc/bind9/9.16.20/patches/bind-9.16.20-map-format-fix.patch @@ -404,8 +402,6 @@ in HTML and PDF format. %patch130 -p1 -b .libdb %patch157 -p1 -b .fips-tests %patch164 -p1 -b .rh1666814 -%patch170 -p1 -b .featuretest-named -%patch171 -p1 -b .test-variant %patch172 -p1 -b .map-format %if %{with PKCS11} @@ -1130,8 +1126,10 @@ fi; %endif %changelog + * Wed Aug 25 2021 Petr Menšík - 32:9.16.20-3 - Increase map format version, lower memory consuption a bit (#1997504) +- Remove unneeded test variants changes * Thu Aug 19 2021 Petr Menšík - 32:9.16.20-2 - Fix map file format regression