Modify feature test to detect dlz support
System tests are failing for named, because it cannot detect it does not support filesystem SDB. Move feature test to named directory, so it is built for every variant.
This commit is contained in:
Petr Menšík
parent
8da0172aac
commit
d0d728803b
|
|
@ -1,3 +1,22 @@
|
|||
From c6c0dc7addd8b27718247aa9c67e3cf3f80a8be3 Mon Sep 17 00:00:00 2001
|
||||
From: Petr Mensik <pemensik@redhat.com>
|
||||
Date: Fri, 1 Mar 2019 11:10:03 +0100
|
||||
Subject: [PATCH] bind-9.10-dist-native-pkcs11.patch
|
||||
|
||||
---
|
||||
bin/Makefile.in | 4 +--
|
||||
bin/dnssec-pkcs11/Makefile.in | 44 ++++++++++++++---------------
|
||||
bin/dnssec/Makefile.in | 2 +-
|
||||
bin/named-pkcs11/Makefile.in | 45 +++++++++++++----------------
|
||||
bin/named/Makefile.in | 2 +-
|
||||
bin/pkcs11/Makefile.in | 6 ++--
|
||||
configure.in | 53 +++++++++++++++++++++++++++--------
|
||||
lib/Makefile.in | 2 +-
|
||||
lib/dns-pkcs11/Makefile.in | 30 ++++++++++----------
|
||||
lib/isc-pkcs11/Makefile.in | 28 +++++++++---------
|
||||
make/includes.in | 10 +++++++
|
||||
11 files changed, 129 insertions(+), 97 deletions(-)
|
||||
|
||||
diff --git a/bin/Makefile.in b/bin/Makefile.in
|
||||
index f0c504a..ce7a2da 100644
|
||||
--- a/bin/Makefile.in
|
||||
|
|
@ -14,7 +33,7 @@ index f0c504a..ce7a2da 100644
|
|||
|
||||
@BIND9_MAKE_RULES@
|
||||
diff --git a/bin/dnssec-pkcs11/Makefile.in b/bin/dnssec-pkcs11/Makefile.in
|
||||
index ce0a177..f8370cf 100644
|
||||
index ce0a177..8908a45 100644
|
||||
--- a/bin/dnssec-pkcs11/Makefile.in
|
||||
+++ b/bin/dnssec-pkcs11/Makefile.in
|
||||
@@ -17,18 +17,18 @@ VERSION=@BIND9_VERSION@
|
||||
|
|
@ -24,8 +43,9 @@ index ce0a177..f8370cf 100644
|
|||
-CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@
|
||||
+CINCLUDES = ${DNS_PKCS11_INCLUDES} ${ISC_PKCS11_INCLUDES}
|
||||
|
||||
CDEFINES = -DVERSION=\"${VERSION}\" @USE_PKCS11@ @PKCS11_ENGINE@ \
|
||||
-CDEFINES = -DVERSION=\"${VERSION}\" @USE_PKCS11@ @PKCS11_ENGINE@ \
|
||||
- @CRYPTO@ -DPK11_LIB_LOCATION=\"@PKCS11_PROVIDER@\"
|
||||
+CDEFINES = -DVERSION=\"${VERSION}\" @PKCS11_ENGINE@ \
|
||||
+ @CRYPTO_PK11@ -DPK11_LIB_LOCATION=\"@PKCS11_PROVIDER@\"
|
||||
CWARNINGS =
|
||||
|
||||
|
|
@ -142,7 +162,7 @@ index ce0a177..7cede84 100644
|
|||
CWARNINGS =
|
||||
|
||||
diff --git a/bin/named-pkcs11/Makefile.in b/bin/named-pkcs11/Makefile.in
|
||||
index d92bc9a..a8c42a4 100644
|
||||
index c0861f6..df80f81 100644
|
||||
--- a/bin/named-pkcs11/Makefile.in
|
||||
+++ b/bin/named-pkcs11/Makefile.in
|
||||
@@ -43,26 +43,26 @@ DLZDRIVER_INCLUDES = @DLZ_DRIVER_INCLUDES@
|
||||
|
|
@ -189,12 +209,12 @@ index d92bc9a..a8c42a4 100644
|
|||
NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
|
||||
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
|
||||
- ${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBS@
|
||||
+ @LIBS@
|
||||
+ @LIBS@
|
||||
|
||||
SUBDIRS = unix
|
||||
|
||||
-TARGETS = named@EXEEXT@ lwresd@EXEEXT@
|
||||
+TARGETS = named-pkcs11@EXEEXT@
|
||||
-TARGETS = named@EXEEXT@ lwresd@EXEEXT@ feature-test@EXEEXT@
|
||||
+TARGETS = named-pkcs11@EXEEXT@ feature-test-pkcs11@EXEEXT@
|
||||
|
||||
GEOIPLINKOBJS = geoip.@O@
|
||||
|
||||
|
|
@ -218,7 +238,7 @@ index d92bc9a..a8c42a4 100644
|
|||
|
||||
MANPAGES = named.8 lwresd.8 named.conf.5
|
||||
|
||||
@@ -146,14 +144,14 @@ server.@O@: server.c
|
||||
@@ -146,21 +144,21 @@ server.@O@: server.c
|
||||
-DPRODUCT=\"${PRODUCT}\" \
|
||||
-DVERSION=\"${VERSION}\" -c ${srcdir}/server.c
|
||||
|
||||
|
|
@ -234,9 +254,17 @@ index d92bc9a..a8c42a4 100644
|
|||
- @LN@ named@EXEEXT@ lwresd@EXEEXT@
|
||||
+ @LN@ named-pkcs11@EXEEXT@ lwresd@EXEEXT@
|
||||
|
||||
doc man:: ${MANOBJS}
|
||||
# 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
|
||||
|
||||
@@ -184,16 +182,11 @@ install-man8: named.8 lwresd.8
|
||||
-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}
|
||||
|
||||
@@ -193,16 +191,11 @@ install-man8: named.8 lwresd.8
|
||||
|
||||
install-man: install-man5 install-man8
|
||||
|
||||
|
|
@ -257,7 +285,7 @@ index d92bc9a..a8c42a4 100644
|
|||
@DLZ_DRIVER_RULES@
|
||||
|
||||
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
|
||||
index d92bc9a..6d2bfd1 100644
|
||||
index c0861f6..04dea99 100644
|
||||
--- a/bin/named/Makefile.in
|
||||
+++ b/bin/named/Makefile.in
|
||||
@@ -47,7 +47,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
|
||||
|
|
@ -291,7 +319,7 @@ index a058c91..d4b689a 100644
|
|||
DEPLIBS = ${ISCDEPLIBS}
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 898b4ac..1edafd1 100644
|
||||
index b2bb268..d9e0797 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -1109,12 +1109,14 @@ AC_SUBST(USE_GSSAPI)
|
||||
|
|
@ -369,7 +397,7 @@ index 898b4ac..1edafd1 100644
|
|||
then
|
||||
AC_MSG_RESULT()
|
||||
AC_MSG_ERROR([OpenSSL and native PKCS11 cannot be used together.])
|
||||
@@ -2011,6 +2015,7 @@ AC_SUBST(OPENSSL_ED25519)
|
||||
@@ -2016,6 +2020,7 @@ AC_SUBST(OPENSSL_ED25519)
|
||||
AC_SUBST(OPENSSL_GOST)
|
||||
|
||||
DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DST_OPENSSL_LIBS"
|
||||
|
|
@ -377,7 +405,7 @@ index 898b4ac..1edafd1 100644
|
|||
|
||||
ISC_PLATFORM_WANTAES="#undef ISC_PLATFORM_WANTAES"
|
||||
if test "yes" = "$with_aes"
|
||||
@@ -2329,6 +2334,7 @@ esac
|
||||
@@ -2334,6 +2339,7 @@ esac
|
||||
AC_SUBST(PKCS11LINKOBJS)
|
||||
AC_SUBST(PKCS11LINKSRCS)
|
||||
AC_SUBST(CRYPTO)
|
||||
|
|
@ -385,7 +413,7 @@ index 898b4ac..1edafd1 100644
|
|||
AC_SUBST(PKCS11_ECDSA)
|
||||
AC_SUBST(PKCS11_GOST)
|
||||
AC_SUBST(PKCS11_ED25519)
|
||||
@@ -5401,8 +5407,11 @@ AC_CONFIG_FILES([
|
||||
@@ -5406,8 +5412,11 @@ AC_CONFIG_FILES([
|
||||
bin/delv/Makefile
|
||||
bin/dig/Makefile
|
||||
bin/dnssec/Makefile
|
||||
|
|
@ -397,7 +425,7 @@ index 898b4ac..1edafd1 100644
|
|||
bin/nsupdate/Makefile
|
||||
bin/pkcs11/Makefile
|
||||
bin/python/Makefile
|
||||
@@ -5476,6 +5485,10 @@ AC_CONFIG_FILES([
|
||||
@@ -5480,6 +5489,10 @@ AC_CONFIG_FILES([
|
||||
lib/dns/include/dns/Makefile
|
||||
lib/dns/include/dst/Makefile
|
||||
lib/dns/tests/Makefile
|
||||
|
|
@ -408,7 +436,7 @@ index 898b4ac..1edafd1 100644
|
|||
lib/irs/Makefile
|
||||
lib/irs/include/Makefile
|
||||
lib/irs/include/irs/Makefile
|
||||
@@ -5500,6 +5513,24 @@ AC_CONFIG_FILES([
|
||||
@@ -5504,6 +5517,24 @@ AC_CONFIG_FILES([
|
||||
lib/isc/unix/include/Makefile
|
||||
lib/isc/unix/include/isc/Makefile
|
||||
lib/isc/unix/include/pkcs11/Makefile
|
||||
|
|
@ -610,3 +638,6 @@ index fa86ad1..3cfbe9f 100644
|
|||
+
|
||||
+DNS_PKCS11_INCLUDES = @BIND9_DNS_BUILDINCLUDE@ \
|
||||
+ -I${top_srcdir}/lib/dns-pkcs11/include
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,17 @@
|
|||
From 09b71a1994d7ea3b299746167b6bcf24021edd76 Mon Sep 17 00:00:00 2001
|
||||
From: Petr Mensik <pemensik@redhat.com>
|
||||
Date: Thu, 28 Feb 2019 18:37:01 +0100
|
||||
Subject: [PATCH] bind-9.10-sdb.patch
|
||||
|
||||
---
|
||||
bin/Makefile.in | 4 +-
|
||||
bin/named-sdb/Makefile.in | 25 +++++-------
|
||||
bin/named-sdb/main.c | 83 +++++++++++++++++++++++++++++++++++++++
|
||||
bin/named/Makefile.in | 16 +++-----
|
||||
bin/sdb_tools/Makefile.in | 10 +++--
|
||||
configure.in | 3 ++
|
||||
6 files changed, 110 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/bin/Makefile.in b/bin/Makefile.in
|
||||
index ce7a2da..4e6a824 100644
|
||||
--- a/bin/Makefile.in
|
||||
|
|
@ -14,7 +28,7 @@ index ce7a2da..4e6a824 100644
|
|||
|
||||
@BIND9_MAKE_RULES@
|
||||
diff --git a/bin/named-sdb/Makefile.in b/bin/named-sdb/Makefile.in
|
||||
index 6d2bfd1..d3f42e8 100644
|
||||
index 04dea99..4ff053e 100644
|
||||
--- a/bin/named-sdb/Makefile.in
|
||||
+++ b/bin/named-sdb/Makefile.in
|
||||
@@ -30,10 +30,10 @@ VERSION=@BIND9_VERSION@
|
||||
|
|
@ -35,8 +49,8 @@ index 6d2bfd1..d3f42e8 100644
|
|||
|
||||
SUBDIRS = unix
|
||||
|
||||
-TARGETS = named@EXEEXT@ lwresd@EXEEXT@
|
||||
+TARGETS = named-sdb@EXEEXT@
|
||||
-TARGETS = named@EXEEXT@ lwresd@EXEEXT@ feature-test@EXEEXT@
|
||||
+TARGETS = named-sdb@EXEEXT@ feature-test-sdb@EXEEXT@
|
||||
|
||||
GEOIPLINKOBJS = geoip.@O@
|
||||
|
||||
|
|
@ -49,7 +63,16 @@ index 6d2bfd1..d3f42e8 100644
|
|||
export MAKE_SYMTABLE="yes"; \
|
||||
export BASEOBJS="${OBJS} ${UOBJS}"; \
|
||||
${FINALBUILDCMD}
|
||||
@@ -173,8 +173,6 @@ statschannel.@O@: bind9.xsl.h
|
||||
@@ -160,7 +160,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-sdb@EXEEXT@: feature-test.@O@
|
||||
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
|
||||
-o $@ feature-test.@O@ ${ISCLIBS} ${LIBS}
|
||||
|
||||
@@ -182,8 +182,6 @@ statschannel.@O@: bind9.xsl.h
|
||||
|
||||
installdirs:
|
||||
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
|
||||
|
|
@ -58,7 +81,7 @@ index 6d2bfd1..d3f42e8 100644
|
|||
|
||||
install-man5: named.conf.5
|
||||
${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man5
|
||||
@@ -184,16 +182,11 @@ install-man8: named.8 lwresd.8
|
||||
@@ -193,16 +191,11 @@ install-man8: named.8 lwresd.8
|
||||
|
||||
install-man: install-man5 install-man8
|
||||
|
||||
|
|
@ -79,10 +102,10 @@ index 6d2bfd1..d3f42e8 100644
|
|||
@DLZ_DRIVER_RULES@
|
||||
|
||||
diff --git a/bin/named-sdb/main.c b/bin/named-sdb/main.c
|
||||
index bb639d9..555c4d9 100644
|
||||
index 8cec1ad..de5e5bb 100644
|
||||
--- a/bin/named-sdb/main.c
|
||||
+++ b/bin/named-sdb/main.c
|
||||
@@ -91,6 +91,10 @@
|
||||
@@ -93,6 +93,10 @@
|
||||
* Include header files for database drivers here.
|
||||
*/
|
||||
/* #include "xxdb.h" */
|
||||
|
|
@ -93,7 +116,7 @@ index bb639d9..555c4d9 100644
|
|||
|
||||
#ifdef CONTRIB_DLZ
|
||||
/*
|
||||
@@ -1061,6 +1065,11 @@ setup(void) {
|
||||
@@ -1063,6 +1067,11 @@ setup(void) {
|
||||
ns_main_earlyfatal("isc_app_start() failed: %s",
|
||||
isc_result_totext(result));
|
||||
|
||||
|
|
@ -105,7 +128,7 @@ index bb639d9..555c4d9 100644
|
|||
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
|
||||
ISC_LOG_NOTICE, "starting %s %s%s%s <id:%s>",
|
||||
ns_g_product, ns_g_version,
|
||||
@@ -1261,6 +1270,75 @@ setup(void) {
|
||||
@@ -1263,6 +1272,75 @@ setup(void) {
|
||||
isc_result_totext(result));
|
||||
#endif
|
||||
|
||||
|
|
@ -181,7 +204,7 @@ index bb639d9..555c4d9 100644
|
|||
ns_server_create(ns_g_mctx, &ns_g_server);
|
||||
|
||||
#ifdef HAVE_LIBSECCOMP
|
||||
@@ -1303,6 +1381,11 @@ cleanup(void) {
|
||||
@@ -1305,6 +1383,11 @@ cleanup(void) {
|
||||
|
||||
dns_name_destroy();
|
||||
|
||||
|
|
@ -194,7 +217,7 @@ index bb639d9..555c4d9 100644
|
|||
ISC_LOG_NOTICE, "exiting");
|
||||
ns_log_shutdown();
|
||||
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
|
||||
index 6d2bfd1..86f8587 100644
|
||||
index 04dea99..9ed9637 100644
|
||||
--- a/bin/named/Makefile.in
|
||||
+++ b/bin/named/Makefile.in
|
||||
@@ -45,9 +45,9 @@ DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@
|
||||
|
|
@ -243,7 +266,7 @@ index 6d2bfd1..86f8587 100644
|
|||
|
||||
MANPAGES = named.8 lwresd.8 named.conf.5
|
||||
|
||||
@@ -195,7 +193,5 @@ uninstall::
|
||||
@@ -204,7 +202,5 @@ uninstall::
|
||||
rm -f ${DESTDIR}${sbindir}/lwresd@EXEEXT@
|
||||
${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${sbindir}/named@EXEEXT@
|
||||
|
||||
|
|
@ -287,10 +310,10 @@ index c7e0868..95ab742 100644
|
|||
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite@EXEEXT@ ${DESTDIR}${sbindir}
|
||||
${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 62536a6..f571a4f 100644
|
||||
index c09c21a..e48bd2e 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -5445,6 +5445,8 @@ AC_CONFIG_FILES([
|
||||
@@ -5417,6 +5417,8 @@ AC_CONFIG_FILES([
|
||||
bin/named/unix/Makefile
|
||||
bin/named-pkcs11/Makefile
|
||||
bin/named-pkcs11/unix/Makefile
|
||||
|
|
@ -299,7 +322,7 @@ index 62536a6..f571a4f 100644
|
|||
bin/nsupdate/Makefile
|
||||
bin/pkcs11/Makefile
|
||||
bin/python/Makefile
|
||||
@@ -5469,6 +5471,7 @@ AC_CONFIG_FILES([
|
||||
@@ -5441,6 +5443,7 @@ AC_CONFIG_FILES([
|
||||
bin/python/isc/tests/dnskey_test.py
|
||||
bin/python/isc/tests/policy_test.py
|
||||
bin/rndc/Makefile
|
||||
|
|
@ -307,3 +330,6 @@ index 62536a6..f571a4f 100644
|
|||
bin/tests/Makefile
|
||||
bin/tests/headerdep_test.sh
|
||||
bin/tests/optional/Makefile
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,85 @@
|
|||
From fe4074d27f642dd93afb5988a2edc7c173b22520 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 15:12:54 +0100
|
||||
Subject: [PATCH] Support DLZ filesystem detection in feature-test
|
||||
|
||||
Do not use variable from configure to detect the feature.
|
||||
---
|
||||
bin/tests/system/Makefile.in | 2 +-
|
||||
bin/tests/system/dlz/{prereq.sh.in => prereq.sh} | 2 +-
|
||||
bin/tests/system/feature-test.c | 9 +++++++++
|
||||
configure.in | 1 -
|
||||
4 files changed, 11 insertions(+), 3 deletions(-)
|
||||
rename bin/tests/system/dlz/{prereq.sh.in => prereq.sh} (91%)
|
||||
|
||||
diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
|
||||
index c18b4c5..dea2f75 100644
|
||||
--- a/bin/tests/system/Makefile.in
|
||||
+++ b/bin/tests/system/Makefile.in
|
||||
@@ -19,7 +19,7 @@ SUBDIRS = dlzexternal dyndb lwresd pipelined rndc rsabigexponent tkey
|
||||
|
||||
CINCLUDES = ${ISC_INCLUDES} ${DNS_INCLUDES}
|
||||
|
||||
-CDEFINES = @USE_GSSAPI@
|
||||
+CDEFINES = @USE_GSSAPI@ @CONTRIB_DLZ@
|
||||
CWARNINGS =
|
||||
|
||||
DNSLIBS =
|
||||
diff --git a/bin/tests/system/dlz/prereq.sh.in b/bin/tests/system/dlz/prereq.sh
|
||||
similarity index 91%
|
||||
rename from bin/tests/system/dlz/prereq.sh.in
|
||||
rename to bin/tests/system/dlz/prereq.sh
|
||||
index afec653..fb3328e 100644
|
||||
--- a/bin/tests/system/dlz/prereq.sh.in
|
||||
+++ b/bin/tests/system/dlz/prereq.sh
|
||||
@@ -12,7 +12,7 @@
|
||||
SYSTEMTESTTOP=..
|
||||
. $SYSTEMTESTTOP/conf.sh
|
||||
|
||||
-if [ "@DLZ_SYSTEM_TEST@" != "filesystem" ]; then
|
||||
+if ! $FEATURETEST --with-dlz-filesystem; then
|
||||
echo_i "DLZ filesystem driver not supported"
|
||||
exit 255
|
||||
fi
|
||||
diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c
|
||||
index 5eee6aa..78bd3b9 100644
|
||||
--- a/bin/tests/system/feature-test.c
|
||||
+++ b/bin/tests/system/feature-test.c
|
||||
@@ -51,6 +51,7 @@ usage() {
|
||||
fprintf(stderr, " --rpz-nsip\n");
|
||||
fprintf(stderr, " --with-idn\n");
|
||||
fprintf(stderr, " --with-lmdb\n");
|
||||
+ fprintf(stderr, " --with-dlz-filesystem\n");
|
||||
}
|
||||
|
||||
int
|
||||
@@ -182,6 +183,14 @@ main(int argc, char **argv) {
|
||||
#endif
|
||||
}
|
||||
|
||||
+ if (strcmp(argv[1], "--with-dlz-filesystem") == 0) {
|
||||
+#ifdef DLZ_FILESYSTEM
|
||||
+ return (0);
|
||||
+#else
|
||||
+ return (1);
|
||||
+#endif
|
||||
+ }
|
||||
+
|
||||
if (strcmp(argv[1], "--ipv6only=no") == 0) {
|
||||
#ifdef WIN32
|
||||
return (0);
|
||||
diff --git a/configure.in b/configure.in
|
||||
index fc1ad41..b2bb268 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -5439,7 +5439,6 @@ AC_CONFIG_FILES([
|
||||
bin/tests/pkcs11/benchmarks/Makefile
|
||||
bin/tests/system/Makefile
|
||||
bin/tests/system/conf.sh
|
||||
- bin/tests/system/dlz/prereq.sh
|
||||
bin/tests/system/dlzexternal/Makefile
|
||||
bin/tests/system/dlzexternal/ns1/dlzs.conf
|
||||
bin/tests/system/dyndb/Makefile
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
From 4293078b294cbb766abe84d3b1618b1cb5413c82 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 2/2] 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 | 11 ++++++++++-
|
||||
bin/tests/system/conf.sh.in | 2 +-
|
||||
2 files changed, 11 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
|
||||
index 1c413973d0..b31df9a718 100644
|
||||
--- a/bin/named/Makefile.in
|
||||
+++ b/bin/named/Makefile.in
|
||||
@@ -79,7 +79,7 @@ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
|
||||
|
||||
SUBDIRS = unix
|
||||
|
||||
-TARGETS = named@EXEEXT@ lwresd@EXEEXT@
|
||||
+TARGETS = named@EXEEXT@ lwresd@EXEEXT@ feature-test@EXEEXT@
|
||||
|
||||
GEOIPLINKOBJS = geoip.@O@
|
||||
|
||||
@@ -151,6 +151,15 @@ lwresd@EXEEXT@: named@EXEEXT@
|
||||
rm -f lwresd@EXEEXT@
|
||||
@LN@ named@EXEEXT@ lwresd@EXEEXT@
|
||||
|
||||
+# 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}
|
||||
+
|
||||
doc man:: ${MANOBJS}
|
||||
|
||||
docclean manclean maintainer-clean::
|
||||
diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
|
||||
index 2236f0a151..b072af8467 100644
|
||||
--- a/bin/tests/system/conf.sh.in
|
||||
+++ b/bin/tests/system/conf.sh.in
|
||||
@@ -64,7 +64,7 @@ DNSTAPREAD=$TOP/bin/tools/dnstap-read
|
||||
MDIG=$TOP/bin/tools/mdig
|
||||
NZD2NZF=$TOP/bin/tools/named-nzd2nzf
|
||||
FSTRM_CAPTURE=@FSTRM_CAPTURE@
|
||||
-FEATURETEST=$TOP/bin/tests/system/feature-test
|
||||
+FEATURETEST=$TOP/bin/named/feature-test
|
||||
|
||||
RANDFILE=$TOP/bin/tests/system/random.data
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -54,7 +54,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
|
|||
Name: bind
|
||||
License: MPLv2.0
|
||||
Version: 9.11.5
|
||||
Release: 13%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
|
||||
Release: 14%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
|
||||
Epoch: 32
|
||||
Url: https://www.isc.org/downloads/bind/
|
||||
#
|
||||
|
|
@ -142,6 +142,8 @@ Patch166:bind-9.11-rh1647829-2.patch
|
|||
Patch167:bind-9.11-ed448-disable.patch
|
||||
# random_test fails too often by random, disable it
|
||||
Patch168:bind-9.11-unit-disable-random.patch
|
||||
Patch169:bind-9.11-feature-test-dlz.patch
|
||||
Patch170:bind-9.11-feature-test-named.patch
|
||||
|
||||
# SDB patches
|
||||
Patch11: bind-9.3.2b2-sdbsrc.patch
|
||||
|
|
@ -523,6 +525,8 @@ are used for building ISC DHCP.
|
|||
%patch166 -p1 -b .rh1647829-2
|
||||
%patch167 -p1 -b .noed448
|
||||
%patch168 -p1 -b .random_test-disable
|
||||
%patch169 -p1 -b .featuretest-dlz
|
||||
%patch170 -p1 -b .featuretest-named
|
||||
|
||||
mkdir lib/dns/tests/testdata/dstrandom
|
||||
cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data
|
||||
|
|
@ -1530,6 +1534,9 @@ fi;
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 28 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.5-14.P4
|
||||
- Modify feature-test detection of dlz-filesystem
|
||||
|
||||
* Fri Feb 22 2019 Petr Menšík <pemensik@redhat.com> - 32:9.11.5-13.P4
|
||||
- Update to 9.11.5-P4
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue