ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

4653. [bug] Reorder includes to move @DST_OPENSSL_INC@ and

Browse Source 
@ISC_OPENSSL_INC@ after shipped include directories.
                        [RT #45581]

(cherry picked from commit 124712666e)
This commit is contained in:
Mark Andrews
2017-07-20 11:52:03 +10:00
parent 033ed86a4e
commit e271a20f1f
10 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,4 +1,5 @@
4653. [bug] Reorder includes in bin/nsupdate/Makefile.in.
4653. [bug] Reorder includes to move @DST_OPENSSL_INC@ and
@ISC_OPENSSL_INC@ after shipped include directories.
[RT #45581]
4652. [bug] Nsupdate could attempt to use a zeroed address on

2
bin/delv/Makefile.in
View File

@@ -21,7 +21,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} ${ISC_INCLUDES} \
@DST_OPENSSL_INC@ ${IRS_INCLUDES} ${ISCCFG_INCLUDES}
${IRS_INCLUDES} ${ISCCFG_INCLUDES} @DST_OPENSSL_INC@
CDEFINES = @CRYPTO@ -DVERSION=\"${VERSION}\" \
-DSYSCONFDIR=\"${sysconfdir}\"

6
bin/dig/Makefile.in
View File

@@ -25,9 +25,9 @@ VERSION=@BIND9_VERSION@
READLINE_LIB = @READLINE_LIB@
CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} ${BIND9_INCLUDES} \
${ISC_INCLUDES} @DST_OPENSSL_INC@ \
${LWRES_INCLUDES} ${ISCCFG_INCLUDES}
CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} \
${BIND9_INCLUDES} ${ISC_INCLUDES} \
${LWRES_INCLUDES} ${ISCCFG_INCLUDES} @DST_OPENSSL_INC@
CDEFINES = -DVERSION=\"${VERSION}\" @CRYPTO@
CWARNINGS =

6
bin/tests/Makefile.in
View File

@@ -19,9 +19,9 @@ top_srcdir = @top_srcdir@
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@ \
${ISCCFG_INCLUDES} ${LWRES_INCLUDES} ${OMAPI_INCLUDES} \
${BIND9_INCLUDES}
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
${LWRES_INCLUDES} ${OMAPI_INCLUDES} \
${BIND9_INCLUDES} @DST_OPENSSL_INC@
CDEFINES = @CRYPTO@
CWARNINGS =

5
bin/tools/Makefile.in
View File

@@ -18,8 +18,9 @@ top_srcdir = @top_srcdir@
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@ \
${ISCCFG_INCLUDES} ${LWRES_INCLUDES} ${OMAPI_INCLUDES}
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} \
${ISCCFG_INCLUDES} ${LWRES_INCLUDES} \
${OMAPI_INCLUDES} @DST_OPENSSL_INC@
CDEFINES = @CRYPTO@

2
lib/bind9/Makefile.in
View File

@@ -26,7 +26,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I. ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
@ISC_OPENSSL_INC@ ${ISCCFG_INCLUDES}
${ISCCFG_INCLUDES} @ISC_OPENSSL_INC@
CDEFINES = @CRYPTO@
CWARNINGS =

2
lib/irs/Makefile.in
View File

@@ -26,7 +26,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = -I. -I./include -I${srcdir}/include \
${DNS_INCLUDES} ${ISC_INCLUDES} \
@ISC_OPENSSL_INC@ ${ISCCFG_INCLUDES}
${ISCCFG_INCLUDES} @ISC_OPENSSL_INC@
CDEFINES = @CRYPTO@
CWARNINGS =

2
lib/isc/Makefile.in
View File

@@ -29,7 +29,7 @@ CINCLUDES = -I${srcdir}/unix/include \
-I${srcdir}/@ISC_THREAD_DIR@/include \
-I${srcdir}/@ISC_ARCH_DIR@/include \
-I./include \
-I${srcdir}/include @ISC_OPENSSL_INC@ ${DNS_INCLUDES}
-I${srcdir}/include ${DNS_INCLUDES} @ISC_OPENSSL_INC@
CDEFINES = @CRYPTO@ -DPK11_LIB_LOCATION=\"${PROVIDER}\"
CWARNINGS =

4
lib/isc/unix/Makefile.in
View File

@@ -20,8 +20,8 @@ top_srcdir = @top_srcdir@
CINCLUDES = -I${srcdir}/include \
-I${srcdir}/../@ISC_THREAD_DIR@/include \
-I../include \
-I${srcdir}/../include @ISC_OPENSSL_INC@ \
-I${srcdir}/..
-I${srcdir}/../include \
-I${srcdir}/.. @ISC_OPENSSL_INC@
CDEFINES = @CRYPTO@
CWARNINGS =

4
lib/samples/Makefile.in
View File

@@ -22,8 +22,8 @@ VERSION=@BIND9_VERSION@
CINCLUDES = -I${srcdir}/include -I../dns/include \
${DNS_INCLUDES} ${ISC_INCLUDES} \
@ISC_OPENSSL_INC@ -I${top_srcdir}/lib/irs/include \
-I../../lib/irs/include
-I${top_srcdir}/lib/irs/include \
-I../../lib/irs/include @ISC_OPENSSL_INC@
CDEFINES = @CRYPTO@ -DVERSION=\"${VERSION}\" \
-DSYSCONFDIR=\"${sysconfdir}\"