|
 |
6a048c |
From f354e06035a6661b29f665890933c9d0108cd3e5 Mon Sep 17 00:00:00 2001
|
|
|
6a048c |
From: Petr Mensik <pemensik@redhat.com>
|
|
|
6a048c |
Date: Fri, 18 Oct 2019 21:55:19 +0200
|
|
|
6a048c |
Subject: [PATCH] Do not define ISC_PKCS11_INCLUDES
|
|
|
6a048c |
|
|
|
6a048c |
isc library is no longer different. Just dns library is different.
|
|
|
6a048c |
Do not try to use isc-pkcs11 library for no reason.
|
|
|
6a048c |
---
|
|
|
6a048c |
bin/dnssec-pkcs11/Makefile.in | 8 ++++----
|
|
|
6a048c |
bin/named-pkcs11/Makefile.in | 10 +++++-----
|
|
|
6a048c |
bin/pkcs11/Makefile.in | 6 +++---
|
|
|
6a048c |
configure.ac | 15 ---------------
|
|
|
6a048c |
lib/Makefile.in | 2 +-
|
|
|
6a048c |
lib/dns-pkcs11/tests/Makefile.in | 4 ++--
|
|
|
6a048c |
make/includes.in | 6 ------
|
|
|
6a048c |
7 files changed, 15 insertions(+), 36 deletions(-)
|
|
|
6a048c |
|
|
|
6a048c |
diff --git a/bin/dnssec-pkcs11/Makefile.in b/bin/dnssec-pkcs11/Makefile.in
|
|
|
6a048c |
index 5067ee1..54b9f10 100644
|
|
|
6a048c |
--- a/bin/dnssec-pkcs11/Makefile.in
|
|
|
6a048c |
+++ b/bin/dnssec-pkcs11/Makefile.in
|
|
|
6a048c |
@@ -15,17 +15,17 @@ VERSION=@BIND9_VERSION@
|
|
|
6a048c |
|
|
|
6a048c |
@BIND9_MAKE_INCLUDES@
|
|
|
6a048c |
|
|
|
6a048c |
-CINCLUDES = ${DNS_PKCS11_INCLUDES} ${ISC_PKCS11_INCLUDES} @OPENSSL_INCLUDES@
|
|
|
6a048c |
+CINCLUDES = ${DNS_PKCS11_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@
|
|
|
6a048c |
|
|
|
6a048c |
CDEFINES = -DVERSION=\"${VERSION}\"
|
|
|
6a048c |
CWARNINGS =
|
|
|
6a048c |
|
|
|
6a048c |
DNSLIBS = ../../lib/dns-pkcs11/libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
|
|
|
6a048c |
-ISCLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@ @OPENSSL_LIBS@
|
|
|
6a048c |
-ISCNOSYMLIBS = ../../lib/isc-pkcs11/libisc-pkcs11-nosymtbl.@A@ @OPENSSL_LIBS@
|
|
|
6a048c |
+ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
|
|
6a048c |
+ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
|
|
|
6a048c |
|
|
|
6a048c |
DNSDEPLIBS = ../../lib/dns-pkcs11/libdns-pkcs11.@A@
|
|
|
6a048c |
-ISCDEPLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@
|
|
|
6a048c |
+ISCDEPLIBS = ../../lib/isc/libisc.@A@
|
|
|
6a048c |
|
|
|
6a048c |
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
|
|
|
6a048c |
|
|
|
6a048c |
diff --git a/bin/named-pkcs11/Makefile.in b/bin/named-pkcs11/Makefile.in
|
|
|
6a048c |
index 416e12e..a0e8314 100644
|
|
|
6a048c |
--- a/bin/named-pkcs11/Makefile.in
|
|
|
6a048c |
+++ b/bin/named-pkcs11/Makefile.in
|
|
|
6a048c |
@@ -43,9 +43,9 @@ DLZDRIVER_INCLUDES = @DLZ_DRIVER_INCLUDES@
|
|
|
6a048c |
DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@
|
|
|
6a048c |
|
|
|
6a048c |
CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
|
|
|
6a048c |
- ${NS_INCLUDES} ${DNS_PKCS11_INCLUDES} \
|
|
|
6a048c |
+ ${NS_PKCS11_INCLUDES} ${DNS_PKCS11_INCLUDES} \
|
|
|
6a048c |
${BIND9_INCLUDES} ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \
|
|
|
6a048c |
- ${ISC_PKCS11_INCLUDES} ${DLZDRIVER_INCLUDES} \
|
|
|
6a048c |
+ ${ISC_INCLUDES} ${DLZDRIVER_INCLUDES} \
|
|
|
6a048c |
${DBDRIVER_INCLUDES} ${MAXMINDDB_CFLAGS} \
|
|
|
6a048c |
@OPENSSL_INCLUDES@
|
|
|
6a048c |
|
|
|
6a048c |
@@ -56,15 +56,15 @@ CWARNINGS =
|
|
|
6a048c |
DNSLIBS = ../../lib/dns-pkcs11/libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
|
|
|
6a048c |
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
|
|
|
6a048c |
ISCCCLIBS = ../../lib/isccc/libisccc.@A@
|
|
|
6a048c |
-ISCLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@ @OPENSSL_LIBS@
|
|
|
6a048c |
-ISCNOSYMLIBS = ../../lib/isc-pkcs11/libisc-pkcs11-nosymtbl.@A@ @OPENSSL_LIBS@
|
|
|
6a048c |
+ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
|
|
6a048c |
+ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
|
|
|
6a048c |
BIND9LIBS = ../../lib/bind9/libbind9.@A@
|
|
|
6a048c |
NSLIBS = ../../lib/ns/libns.@A@
|
|
|
6a048c |
|
|
|
6a048c |
DNSDEPLIBS = ../../lib/dns-pkcs11/libdns-pkcs11.@A@
|
|
|
6a048c |
ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
|
|
|
6a048c |
ISCCCDEPLIBS = ../../lib/isccc/libisccc.@A@
|
|
|
6a048c |
-ISCDEPLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@
|
|
|
6a048c |
+ISCDEPLIBS = ../../lib/isc/libisc.@A@
|
|
|
6a048c |
BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
|
|
|
6a048c |
NSDEPLIBS = ../../lib/ns/libns.@A@
|
|
|
6a048c |
|
|
|
6a048c |
diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in
|
|
|
6a048c |
index 0e542f3..96aec05 100644
|
|
|
6a048c |
--- a/bin/pkcs11/Makefile.in
|
|
|
6a048c |
+++ b/bin/pkcs11/Makefile.in
|
|
|
6a048c |
@@ -13,13 +13,13 @@ top_srcdir = @top_srcdir@
|
|
|
6a048c |
|
|
|
6a048c |
@BIND9_MAKE_INCLUDES@
|
|
|
6a048c |
|
|
|
6a048c |
-CINCLUDES = ${ISC_PKCS11_INCLUDES}
|
|
|
6a048c |
+CINCLUDES = ${ISC_INCLUDES}
|
|
|
6a048c |
|
|
|
6a048c |
CDEFINES =
|
|
|
6a048c |
|
|
|
6a048c |
-ISCLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@ @OPENSSL_LIBS@
|
|
|
6a048c |
+ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
|
|
6a048c |
|
|
|
6a048c |
-ISCDEPLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@
|
|
|
6a048c |
+ISCDEPLIBS = ../../lib/isc/libisc.@A@
|
|
|
6a048c |
|
|
|
6a048c |
DEPLIBS = ${ISCDEPLIBS}
|
|
|
6a048c |
|
|
|
6a048c |
diff --git a/configure.ac b/configure.ac
|
|
|
6a048c |
index 6d4cdcc..39c1d95 100644
|
|
|
6a048c |
--- a/configure.ac
|
|
|
6a048c |
+++ b/configure.ac
|
|
|
6a048c |
@@ -2535,7 +2535,6 @@ if test "X$srcdir" != "X"; then
|
|
|
6a048c |
BIND9_NS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/ns/include"
|
|
|
6a048c |
BIND9_BIND9_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/bind9/include"
|
|
|
6a048c |
BIND9_IRS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/irs/include"
|
|
|
6a048c |
- BIND9_ISC_PKCS11_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isc-pkcs11/include"
|
|
|
6a048c |
BIND9_DNS_PKCS11_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/dns-pkcs11/include"
|
|
|
6a048c |
BIND9_NS_PKCS11_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/ns-pkcs11/include"
|
|
|
6a048c |
else
|
|
|
6a048c |
@@ -3114,20 +3113,6 @@ AC_CONFIG_FILES([
|
|
|
6a048c |
lib/isc/unix/include/Makefile
|
|
|
6a048c |
lib/isc/unix/include/isc/Makefile
|
|
|
6a048c |
lib/isc/unix/include/pkcs11/Makefile
|
|
|
6a048c |
- lib/isc-pkcs11/pthreads/Makefile
|
|
|
6a048c |
- lib/isc-pkcs11/pthreads/include/Makefile
|
|
|
6a048c |
- lib/isc-pkcs11/pthreads/include/isc/Makefile
|
|
|
6a048c |
- lib/isc-pkcs11/Makefile
|
|
|
6a048c |
- lib/isc-pkcs11/include/Makefile
|
|
|
6a048c |
- lib/isc-pkcs11/include/isc/Makefile
|
|
|
6a048c |
- lib/isc-pkcs11/include/isc/platform.h
|
|
|
6a048c |
- lib/isc-pkcs11/include/pk11/Makefile
|
|
|
6a048c |
- lib/isc-pkcs11/include/pkcs11/Makefile
|
|
|
6a048c |
- lib/isc-pkcs11/tests/Makefile
|
|
|
6a048c |
- lib/isc-pkcs11/unix/Makefile
|
|
|
6a048c |
- lib/isc-pkcs11/unix/include/Makefile
|
|
|
6a048c |
- lib/isc-pkcs11/unix/include/isc/Makefile
|
|
|
6a048c |
- lib/isc-pkcs11/unix/include/pkcs11/Makefile
|
|
|
6a048c |
lib/isccc/Makefile
|
|
|
6a048c |
lib/isccc/include/Makefile
|
|
|
6a048c |
lib/isccc/include/isccc/Makefile
|
|
|
6a048c |
diff --git a/lib/Makefile.in b/lib/Makefile.in
|
|
|
6a048c |
index 439d748..3f655e8 100644
|
|
|
6a048c |
--- a/lib/Makefile.in
|
|
|
6a048c |
+++ b/lib/Makefile.in
|
|
|
6a048c |
@@ -15,7 +15,7 @@ top_srcdir = @top_srcdir@
|
|
|
6a048c |
# Attempt to disable parallel processing.
|
|
|
6a048c |
.NOTPARALLEL:
|
|
|
6a048c |
.NO_PARALLEL:
|
|
|
6a048c |
-SUBDIRS = isc isc-pkcs11 isccc dns dns-pkcs11 ns isccfg bind9 irs samples
|
|
|
6a048c |
+SUBDIRS = isc isccc dns dns-pkcs11 ns isccfg bind9 irs samples
|
|
|
6a048c |
TARGETS =
|
|
|
6a048c |
|
|
|
6a048c |
@BIND9_MAKE_RULES@
|
|
|
6a048c |
diff --git a/lib/dns-pkcs11/tests/Makefile.in b/lib/dns-pkcs11/tests/Makefile.in
|
|
|
6a048c |
index 9f78596..ac187c9 100644
|
|
|
6a048c |
--- a/lib/dns-pkcs11/tests/Makefile.in
|
|
|
6a048c |
+++ b/lib/dns-pkcs11/tests/Makefile.in
|
|
|
6a048c |
@@ -19,8 +19,8 @@ CINCLUDES = -I. -Iinclude ${DNS_PKCS11_INCLUDES} ${ISC_PKCS11_INCLUDES} \
|
|
|
6a048c |
@OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
|
|
|
6a048c |
CDEFINES = -DTESTS="\"${top_builddir}/lib/dns-pkcs11/tests/\""
|
|
|
6a048c |
|
|
|
6a048c |
-ISCLIBS = ../../isc-pkcs11/libisc-pkcs11.@A@
|
|
|
6a048c |
-ISCDEPLIBS = ../../isc-pkcs11/libisc-pkcs11.@A@
|
|
|
6a048c |
+ISCLIBS = ../../isc/libisc.@A@
|
|
|
6a048c |
+ISCDEPLIBS = ../../isc/libisc.@A@
|
|
|
6a048c |
DNSLIBS = ../libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
|
|
|
6a048c |
DNSDEPLIBS = ../libdns-pkcs11.@A@
|
|
|
6a048c |
|
|
|
6a048c |
diff --git a/make/includes.in b/make/includes.in
|
|
|
6a048c |
index 6e6572b..7b17738 100644
|
|
|
6a048c |
--- a/make/includes.in
|
|
|
6a048c |
+++ b/make/includes.in
|
|
|
6a048c |
@@ -40,12 +40,6 @@ BIND9_INCLUDES = @BIND9_BIND9_BUILDINCLUDE@ \
|
|
|
6a048c |
TEST_INCLUDES = \
|
|
|
6a048c |
-I${top_srcdir}/lib/tests/include
|
|
|
6a048c |
|
|
|
6a048c |
-ISC_PKCS11_INCLUDES = @BIND9_ISC_PKCS11_BUILDINCLUDE@ \
|
|
|
6a048c |
- -I${top_srcdir}/lib/isc-pkcs11 \
|
|
|
6a048c |
- -I${top_srcdir}/lib/isc-pkcs11/include \
|
|
|
6a048c |
- -I${top_srcdir}/lib/isc-pkcs11/unix/include \
|
|
|
6a048c |
- -I${top_srcdir}/lib/isc-pkcs11/pthreads/include
|
|
|
6a048c |
-
|
|
|
6a048c |
DNS_PKCS11_INCLUDES = @BIND9_DNS_PKCS11_BUILDINCLUDE@ \
|
|
|
6a048c |
-I${top_srcdir}/lib/dns-pkcs11/include
|
|
|
6a048c |
|
|
|
6a048c |
--
|
|
|
6a048c |
2.20.1
|
|
|
6a048c |
|