Do not skip gsstsig test in any named variants

Feature was skipped by mistake when moving feature-test into separate
directory.
This commit is contained in:
Petr Menšík 2019-09-05 11:17:26 +02:00
parent d568c54c25
commit 841d8832b4
3 changed files with 50 additions and 37 deletions

View File

@ -143,10 +143,10 @@ index 4b8ca13..4175996 100644
CWARNINGS = CWARNINGS =
diff --git a/bin/named-pkcs11/Makefile.in b/bin/named-pkcs11/Makefile.in diff --git a/bin/named-pkcs11/Makefile.in b/bin/named-pkcs11/Makefile.in
index df1f7ee..f397ab0 100644 index 70e5571..b5a4a6b 100644
--- a/bin/named-pkcs11/Makefile.in --- a/bin/named-pkcs11/Makefile.in
+++ b/bin/named-pkcs11/Makefile.in +++ b/bin/named-pkcs11/Makefile.in
@@ -43,27 +43,28 @@ DLZDRIVER_INCLUDES = @DLZ_DRIVER_INCLUDES@ @@ -43,27 +43,27 @@ DLZDRIVER_INCLUDES = @DLZ_DRIVER_INCLUDES@
DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@ DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@
CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
@ -157,12 +157,12 @@ index df1f7ee..f397ab0 100644
${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} ${MAXMINDDB_CFLAGS} \ ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} ${MAXMINDDB_CFLAGS} \
@DST_OPENSSL_INC@ @DST_OPENSSL_INC@
-CDEFINES = @CONTRIB_DLZ@ @USE_PKCS11@ @PKCS11_ENGINE@ @CRYPTO@ -CDEFINES = @CONTRIB_DLZ@ @USE_PKCS11@ @PKCS11_ENGINE@ @USE_GSSAPI@ @CRYPTO@
+CDEFINES = @USE_PKCS11@ @PKCS11_ENGINE@ @CRYPTO_PK11@ +CDEFINES = @USE_PKCS11@ @PKCS11_ENGINE@ @CRYPTO_PK11@ @USE_GSSAPI@
CWARNINGS = CWARNINGS =
DNSLIBS = ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@ -DNSLIBS = ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
+DNSLIBS = ../../lib/dns-pkcs11/libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@ +DNSLIBS = ../../lib/dns-pkcs11/libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
ISCCCLIBS = ../../lib/isccc/libisccc.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@
@ -182,7 +182,7 @@ index df1f7ee..f397ab0 100644
LWRESDEPLIBS = ../../lib/lwres/liblwres.@A@ LWRESDEPLIBS = ../../lib/lwres/liblwres.@A@
BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@ BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
@@ -72,15 +73,15 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \ @@ -72,15 +72,15 @@ DEPLIBS = ${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \ ${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
@ -201,7 +201,7 @@ index df1f7ee..f397ab0 100644
GEOIPLINKOBJS = geoip.@O@ GEOIPLINKOBJS = geoip.@O@
GEOIP2LINKOBJS = geoip.@O@ GEOIP2LINKOBJS = geoip.@O@
@@ -94,8 +95,7 @@ OBJS = builtin.@O@ client.@O@ config.@O@ control.@O@ \ @@ -94,8 +94,7 @@ OBJS = builtin.@O@ client.@O@ config.@O@ control.@O@ \
tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \ tkeyconf.@O@ tsigconf.@O@ update.@O@ xfrout.@O@ \
zoneconf.@O@ \ zoneconf.@O@ \
lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \ lwaddr.@O@ lwresd.@O@ lwdclient.@O@ lwderror.@O@ lwdgabn.@O@ \
@ -211,7 +211,7 @@ index df1f7ee..f397ab0 100644
UOBJS = unix/os.@O@ unix/dlz_dlopen_driver.@O@ UOBJS = unix/os.@O@ unix/dlz_dlopen_driver.@O@
@@ -113,8 +113,7 @@ SRCS = builtin.c client.c config.c control.c \ @@ -113,8 +112,7 @@ SRCS = builtin.c client.c config.c control.c \
tkeyconf.c tsigconf.c update.c xfrout.c \ tkeyconf.c tsigconf.c update.c xfrout.c \
zoneconf.c \ zoneconf.c \
lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \ lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
@ -221,7 +221,7 @@ index df1f7ee..f397ab0 100644
MANPAGES = named.8 lwresd.8 named.conf.5 MANPAGES = named.8 lwresd.8 named.conf.5
@@ -154,21 +153,21 @@ server.@O@: server.c @@ -154,21 +152,21 @@ server.@O@: server.c
-DPRODUCT=\"${PRODUCT}\" \ -DPRODUCT=\"${PRODUCT}\" \
-DVERSION=\"${VERSION}\" -c ${srcdir}/server.c -DVERSION=\"${VERSION}\" -c ${srcdir}/server.c
@ -247,7 +247,7 @@ index df1f7ee..f397ab0 100644
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
-o $@ feature-test.@O@ ${ISCLIBS} ${LIBS} -o $@ feature-test.@O@ ${ISCLIBS} ${LIBS}
@@ -201,16 +200,11 @@ install-man8: named.8 lwresd.8 @@ -201,16 +199,11 @@ install-man8: named.8 lwresd.8
install-man: install-man5 install-man8 install-man: install-man5 install-man8
@ -268,15 +268,15 @@ index df1f7ee..f397ab0 100644
@DLZ_DRIVER_RULES@ @DLZ_DRIVER_RULES@
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index df1f7ee..9660965 100644 index 70e5571..4cfed4d 100644
--- a/bin/named/Makefile.in --- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in +++ b/bin/named/Makefile.in
@@ -48,7 +48,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \ @@ -48,7 +48,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} ${MAXMINDDB_CFLAGS} \ ${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} ${MAXMINDDB_CFLAGS} \
@DST_OPENSSL_INC@ @DST_OPENSSL_INC@
-CDEFINES = @CONTRIB_DLZ@ @USE_PKCS11@ @PKCS11_ENGINE@ @CRYPTO@ -CDEFINES = @CONTRIB_DLZ@ @USE_PKCS11@ @PKCS11_ENGINE@ @USE_GSSAPI@ @CRYPTO@
+CDEFINES = @CONTRIB_DLZ@ @CRYPTO@ +CDEFINES = @CONTRIB_DLZ@ @USE_GSSAPI@ @CRYPTO@
CWARNINGS = CWARNINGS =
@ -302,7 +302,7 @@ index a058c91..d4b689a 100644
DEPLIBS = ${ISCDEPLIBS} DEPLIBS = ${ISCDEPLIBS}
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 3b88105..0532feb 100644 index 9b7d778..59ba20b 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1139,12 +1139,14 @@ AC_SUBST(USE_GSSAPI) @@ -1139,12 +1139,14 @@ AC_SUBST(USE_GSSAPI)
@ -320,7 +320,7 @@ index 3b88105..0532feb 100644
# #
# was --with-randomdev specified? # was --with-randomdev specified?
@@ -1529,11 +1531,11 @@ fi @@ -1494,11 +1496,11 @@ AC_ARG_ENABLE(openssl-hash,
AC_MSG_CHECKING(for OpenSSL library) AC_MSG_CHECKING(for OpenSSL library)
OPENSSL_WARNING= OPENSSL_WARNING=
openssldirs="/usr /usr/local /usr/local/ssl /opt/local /usr/pkg /usr/sfw" openssldirs="/usr /usr/local /usr/local/ssl /opt/local /usr/pkg /usr/sfw"
@ -337,7 +337,7 @@ index 3b88105..0532feb 100644
if test "auto" = "$use_openssl" if test "auto" = "$use_openssl"
then then
@@ -1546,6 +1548,7 @@ then @@ -1511,6 +1513,7 @@ then
fi fi
done done
fi fi
@ -345,7 +345,7 @@ index 3b88105..0532feb 100644
OPENSSL_ECDSA="" OPENSSL_ECDSA=""
OPENSSL_GOST="" OPENSSL_GOST=""
OPENSSL_ED25519="" OPENSSL_ED25519=""
@@ -1567,11 +1570,10 @@ case "$with_gost" in @@ -1532,11 +1535,10 @@ case "$with_gost" in
;; ;;
esac esac
@ -360,7 +360,7 @@ index 3b88105..0532feb 100644
CRYPTOLIB="pkcs11" CRYPTOLIB="pkcs11"
OPENSSLECDSALINKOBJS="" OPENSSLECDSALINKOBJS=""
OPENSSLECDSALINKSRCS="" OPENSSLECDSALINKSRCS=""
@@ -1581,7 +1583,9 @@ case "$use_openssl" in @@ -1546,7 +1548,9 @@ case "$use_openssl" in
OPENSSLGOSTLINKSRCS="" OPENSSLGOSTLINKSRCS=""
OPENSSLLINKOBJS="" OPENSSLLINKOBJS=""
OPENSSLLINKSRCS="" OPENSSLLINKSRCS=""
@ -371,7 +371,7 @@ index 3b88105..0532feb 100644
no) no)
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
DST_OPENSSL_INC="" DST_OPENSSL_INC=""
@@ -1613,7 +1617,7 @@ case "$use_openssl" in @@ -1578,7 +1582,7 @@ case "$use_openssl" in
If you do not want OpenSSL, use --without-openssl]) If you do not want OpenSSL, use --without-openssl])
;; ;;
*) *)
@ -380,7 +380,7 @@ index 3b88105..0532feb 100644
then then
AC_MSG_RESULT() AC_MSG_RESULT()
AC_MSG_ERROR([OpenSSL and native PKCS11 cannot be used together.]) AC_MSG_ERROR([OpenSSL and native PKCS11 cannot be used together.])
@@ -2041,6 +2045,7 @@ AC_SUBST(OPENSSL_ED25519) @@ -2006,6 +2010,7 @@ AC_SUBST(OPENSSL_ED25519)
AC_SUBST(OPENSSL_GOST) AC_SUBST(OPENSSL_GOST)
DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS" DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS"
@ -388,7 +388,7 @@ index 3b88105..0532feb 100644
ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES" ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES"
if test "yes" = "$with_aes" if test "yes" = "$with_aes"
@@ -2364,6 +2369,7 @@ esac @@ -2291,6 +2296,7 @@ esac
AC_SUBST(PKCS11LINKOBJS) AC_SUBST(PKCS11LINKOBJS)
AC_SUBST(PKCS11LINKSRCS) AC_SUBST(PKCS11LINKSRCS)
AC_SUBST(CRYPTO) AC_SUBST(CRYPTO)
@ -396,7 +396,7 @@ index 3b88105..0532feb 100644
AC_SUBST(PKCS11_ECDSA) AC_SUBST(PKCS11_ECDSA)
AC_SUBST(PKCS11_GOST) AC_SUBST(PKCS11_GOST)
AC_SUBST(PKCS11_ED25519) AC_SUBST(PKCS11_ED25519)
@@ -5491,8 +5497,11 @@ AC_CONFIG_FILES([ @@ -5405,8 +5411,11 @@ AC_CONFIG_FILES([
bin/delv/Makefile bin/delv/Makefile
bin/dig/Makefile bin/dig/Makefile
bin/dnssec/Makefile bin/dnssec/Makefile
@ -408,7 +408,7 @@ index 3b88105..0532feb 100644
bin/nsupdate/Makefile bin/nsupdate/Makefile
bin/pkcs11/Makefile bin/pkcs11/Makefile
bin/python/Makefile bin/python/Makefile
@@ -5565,6 +5574,10 @@ AC_CONFIG_FILES([ @@ -5479,6 +5488,10 @@ AC_CONFIG_FILES([
lib/dns/include/dns/Makefile lib/dns/include/dns/Makefile
lib/dns/include/dst/Makefile lib/dns/include/dst/Makefile
lib/dns/tests/Makefile lib/dns/tests/Makefile
@ -419,7 +419,7 @@ index 3b88105..0532feb 100644
lib/irs/Makefile lib/irs/Makefile
lib/irs/include/Makefile lib/irs/include/Makefile
lib/irs/include/irs/Makefile lib/irs/include/irs/Makefile
@@ -5589,6 +5602,24 @@ AC_CONFIG_FILES([ @@ -5503,6 +5516,24 @@ AC_CONFIG_FILES([
lib/isc/unix/include/Makefile lib/isc/unix/include/Makefile
lib/isc/unix/include/isc/Makefile lib/isc/unix/include/isc/Makefile
lib/isc/unix/include/pkcs11/Makefile lib/isc/unix/include/pkcs11/Makefile
@ -533,7 +533,7 @@ index 7f09bd6..c388d9e 100644
rm -f include/dns/rdatastruct.h rm -f include/dns/rdatastruct.h
rm -f dnstap.pb-c.c dnstap.pb-c.h rm -f dnstap.pb-c.c dnstap.pb-c.h
diff --git a/lib/isc-pkcs11/Makefile.in b/lib/isc-pkcs11/Makefile.in diff --git a/lib/isc-pkcs11/Makefile.in b/lib/isc-pkcs11/Makefile.in
index 98acfff..2fd6981 100644 index 8ad54bb..a3ecdfb 100644
--- a/lib/isc-pkcs11/Makefile.in --- a/lib/isc-pkcs11/Makefile.in
+++ b/lib/isc-pkcs11/Makefile.in +++ b/lib/isc-pkcs11/Makefile.in
@@ -23,8 +23,8 @@ CINCLUDES = -I${srcdir}/unix/include \ @@ -23,8 +23,8 @@ CINCLUDES = -I${srcdir}/unix/include \

View File

@ -14,7 +14,7 @@ index ce7a2da..4e6a824 100644
@BIND9_MAKE_RULES@ @BIND9_MAKE_RULES@
diff --git a/bin/named-sdb/Makefile.in b/bin/named-sdb/Makefile.in diff --git a/bin/named-sdb/Makefile.in b/bin/named-sdb/Makefile.in
index 9660965..184fbb2 100644 index 4cfed4d..c6b42b2 100644
--- a/bin/named-sdb/Makefile.in --- a/bin/named-sdb/Makefile.in
+++ b/bin/named-sdb/Makefile.in +++ b/bin/named-sdb/Makefile.in
@@ -30,10 +30,10 @@ VERSION=@BIND9_VERSION@ @@ -30,10 +30,10 @@ VERSION=@BIND9_VERSION@
@ -203,7 +203,7 @@ index 108b8d6..a943421 100644
ISC_LOG_NOTICE, "exiting"); ISC_LOG_NOTICE, "exiting");
ns_log_shutdown(); ns_log_shutdown();
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 9660965..03f7c05 100644 index 4cfed4d..f4bce7b 100644
--- a/bin/named/Makefile.in --- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in +++ b/bin/named/Makefile.in
@@ -45,10 +45,10 @@ DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@ @@ -45,10 +45,10 @@ DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@
@ -214,8 +214,8 @@ index 9660965..03f7c05 100644
+ ${MAXMINDDB_CFLAGS} \ + ${MAXMINDDB_CFLAGS} \
@DST_OPENSSL_INC@ @DST_OPENSSL_INC@
-CDEFINES = @CONTRIB_DLZ@ @CRYPTO@ -CDEFINES = @CONTRIB_DLZ@ @USE_GSSAPI@ @CRYPTO@
+CDEFINES = @CRYPTO@ +CDEFINES = @USE_GSSAPI@ @CRYPTO@
CWARNINGS = CWARNINGS =
@ -297,10 +297,10 @@ index c7e0868..95ab742 100644
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir} + ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir}
${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1 ${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index d8147ae..930cd1c 100644 index f6380b1..318e533 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -5532,6 +5532,8 @@ AC_CONFIG_FILES([ @@ -5416,6 +5416,8 @@ AC_CONFIG_FILES([
bin/named/unix/Makefile bin/named/unix/Makefile
bin/named-pkcs11/Makefile bin/named-pkcs11/Makefile
bin/named-pkcs11/unix/Makefile bin/named-pkcs11/unix/Makefile
@ -309,7 +309,7 @@ index d8147ae..930cd1c 100644
bin/nsupdate/Makefile bin/nsupdate/Makefile
bin/pkcs11/Makefile bin/pkcs11/Makefile
bin/python/Makefile bin/python/Makefile
@@ -5556,6 +5558,7 @@ AC_CONFIG_FILES([ @@ -5440,6 +5442,7 @@ AC_CONFIG_FILES([
bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/dnskey_test.py
bin/python/isc/tests/policy_test.py bin/python/isc/tests/policy_test.py
bin/rndc/Makefile bin/rndc/Makefile

View File

@ -1,4 +1,4 @@
From d394129acaa40ec7fc68ab27802f0a01fcd50f3d Mon Sep 17 00:00:00 2001 From 3f2fafe5368655225eddf0537e58e425bbc297be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com> From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Wed, 30 Jan 2019 14:37:17 +0100 Date: Wed, 30 Jan 2019 14:37:17 +0100
Subject: [PATCH] Create feature-test in source directory Subject: [PATCH] Create feature-test in source directory
@ -6,15 +6,28 @@ Subject: [PATCH] Create feature-test in source directory
Feature-test tool is used in system tests to test compiled in changes. Feature-test tool is used in system tests to test compiled in changes.
Because we build more variants of named with different configuration, Because we build more variants of named with different configuration,
compile feature-test for each of them this way. compile feature-test for each of them this way.
Named variant specific feature-test does not have defined gss support,
even when it was enabled by configure. bin/tests/system Makefile defines
it, so define it also in named variants.
--- ---
bin/named/Makefile.in | 11 ++++++++++- bin/named/Makefile.in | 13 +++++++++++--
bin/tests/system/conf.sh.in | 2 +- bin/tests/system/conf.sh.in | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-) 2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 3166368..df1f7ee 100644 index 3166368..70e5571 100644
--- a/bin/named/Makefile.in --- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in +++ b/bin/named/Makefile.in
@@ -48,7 +48,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES} ${MAXMINDDB_CFLAGS} \
@DST_OPENSSL_INC@
-CDEFINES = @CONTRIB_DLZ@ @USE_PKCS11@ @PKCS11_ENGINE@ @CRYPTO@
+CDEFINES = @CONTRIB_DLZ@ @USE_PKCS11@ @PKCS11_ENGINE@ @USE_GSSAPI@ @CRYPTO@
CWARNINGS =
@@ -80,7 +80,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \ @@ -80,7 +80,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
SUBDIRS = unix SUBDIRS = unix
@ -41,7 +54,7 @@ index 3166368..df1f7ee 100644
docclean manclean maintainer-clean:: docclean manclean maintainer-clean::
diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 65c0c5a..117d6ec 100644 index cedabbe..e1bf5da 100644
--- a/bin/tests/system/conf.sh.in --- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in
@@ -71,7 +71,7 @@ DNSTAPREAD=$TOP/bin/tools/dnstap-read @@ -71,7 +71,7 @@ DNSTAPREAD=$TOP/bin/tools/dnstap-read