regen v9_11_2_patch

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

(cherry picked from commit 124712666e)

CHANGES

@@ -1,5 +1,11 @@
 	--- 9.11.2 released ---
 
+	--- 9.11.2rc2 released ---
+
+4653.	[bug]		Reorder includes to move @DST_OPENSSL_INC@ and
+			@ISC_OPENSSL_INC@ after shipped include directories.
+			[RT #45581]
+
 	--- 9.11.2rc1 released ---
 
 4649.	[bug]		The wrong zone was logged when a catalog zone is added.

bin/delv/Makefile.in

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2017  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -13,7 +13,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}\"

bin/dig/Makefile.in

@@ -1,4 +1,4 @@
-# Copyright (C) 2000-2002, 2004, 2005, 2007, 2009, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000-2002, 2004, 2005, 2007, 2009, 2012-2017  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,9 +14,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 =

bin/nsupdate/Makefile.in

@@ -1,4 +1,4 @@
-# Copyright (C) 2000-2002, 2004, 2006-2009, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000-2002, 2004, 2006-2009, 2012-2017  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19,8 +19,8 @@ READLINE_LIB = @READLINE_LIB@
 DST_GSSAPI_INC = @DST_GSSAPI_INC@
 
 CINCLUDES =	${LWRES_INCLUDES} ${DNS_INCLUDES} \
-		${BIND9_INCLUDES} @DST_OPENSSL_INC@ ${ISC_INCLUDES} \
-		${ISCCFG_INCLUDES} ${DST_GSSAPI_INC}
+		${BIND9_INCLUDES} ${ISC_INCLUDES} \
+		${ISCCFG_INCLUDES} ${DST_GSSAPI_INC} @DST_OPENSSL_INC@
 
 CDEFINES =	-DVERSION=\"${VERSION}\" @CRYPTO@ @USE_GSSAPI@
 CWARNINGS =

bin/tests/Makefile.in

@@ -10,8 +10,8 @@ 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@
 CWARNINGS =

bin/tools/Makefile.in

@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2010, 2012-2017  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,9 +12,9 @@ VERSION=@BIND9_VERSION@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@ \
+CINCLUDES =	${DNS_INCLUDES} ${ISC_INCLUDES} \
 		${ISCCFG_INCLUDES} ${LWRES_INCLUDES} \
-		${OMAPI_INCLUDES} ${BIND9_INCLUDES}
+		${OMAPI_INCLUDES} ${BIND9_INCLUDES} @DST_OPENSSL_INC@
 
 CDEFINES =	@CRYPTO@ -DVERSION=\"${VERSION}\"
 CWARNINGS =

lib/bind9/Makefile.in

@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2004, 2007, 2009, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2004, 2007, 2009, 2012, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -17,7 +17,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 =

lib/irs/Makefile.in

@@ -18,7 +18,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 =

lib/isc/Makefile.in

@@ -20,7 +20,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 =
 

lib/isc/unix/Makefile.in

@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2001, 2004, 2007, 2009, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 1998-2001, 2004, 2007, 2009, 2012, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,8 +11,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 =

lib/samples/Makefile.in

@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2012-2017  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,8 +14,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}\"

util/copyrights

@@ -81,7 +81,7 @@
 ./bin/confgen/win32/rndcconfgen.vcxproj.in	X	2013,2015,2016,2017
 ./bin/confgen/win32/rndcconfgen.vcxproj.user	X	2013
 ./bin/delv/.gitignore				X	2014
-./bin/delv/Makefile.in				MAKE	2014,2015,2016
+./bin/delv/Makefile.in				MAKE	2014,2015,2016,2017
 ./bin/delv/delv.1				MAN	DOCBOOK
 ./bin/delv/delv.c				C	2014,2015,2016
 ./bin/delv/delv.docbook				SGML	2014,2015,2016
@@ -93,7 +93,7 @@
 ./bin/delv/win32/delv.vcxproj.in		X	2014,2015,2016,2017
 ./bin/delv/win32/delv.vcxproj.user		X	2014
 ./bin/dig/.gitignore				X	2012,2014
-./bin/dig/Makefile.in				MAKE	2000,2001,2002,2004,2005,2007,2009,2012,2013,2014,2015,2016
+./bin/dig/Makefile.in				MAKE	2000,2001,2002,2004,2005,2007,2009,2012,2013,2014,2015,2016,2017
 ./bin/dig/dig.1					MAN	DOCBOOK
 ./bin/dig/dig.c					C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./bin/dig/dig.docbook				SGML	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017
@@ -312,7 +312,7 @@
 ./bin/named/xfrout.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./bin/named/zoneconf.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
 ./bin/nsupdate/.gitignore			X	2012
-./bin/nsupdate/Makefile.in			MAKE	2000,2001,2002,2004,2006,2007,2008,2009,2012,2013,2014,2015,2016
+./bin/nsupdate/Makefile.in			MAKE	2000,2001,2002,2004,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017
 ./bin/nsupdate/nsupdate.1			MAN	DOCBOOK
 ./bin/nsupdate/nsupdate.c			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./bin/nsupdate/nsupdate.docbook			SGML	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016
@@ -2645,7 +2645,7 @@
 ./bin/tests/wire_test.data4			X	1999,2000,2001
 ./bin/tests/zone_test.c				C	1999,2000,2001,2002,2004,2005,2007,2009,2012,2014,2015,2016
 ./bin/tools/.gitignore				X	2012,2014,2015,2016
-./bin/tools/Makefile.in				MAKE	2009,2010,2012,2013,2014,2015,2016
+./bin/tools/Makefile.in				MAKE	2009,2010,2012,2013,2014,2015,2016,2017
 ./bin/tools/arpaname.1				MAN	DOCBOOK
 ./bin/tools/arpaname.c				C	2009,2015,2016
 ./bin/tools/arpaname.docbook			SGML	2009,2014,2015,2016
@@ -3472,7 +3472,7 @@
 ./lib/.gitignore				X	2012
 ./lib/Atffile					X	2011,2014,2016
 ./lib/Makefile.in				MAKE	1998,1999,2000,2001,2003,2004,2007,2012,2013,2014,2016
-./lib/bind9/Makefile.in				MAKE	2001,2004,2007,2009,2012,2014,2015,2016
+./lib/bind9/Makefile.in				MAKE	2001,2004,2007,2009,2012,2014,2015,2016,2017
 ./lib/bind9/api					X	2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./lib/bind9/check.c				C	2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./lib/bind9/getaddresses.c			C	2001,2002,2004,2005,2007,2014,2015,2016
@@ -4255,7 +4255,7 @@
 ./lib/isc/timer.c				C	1998,1999,2000,2001,2002,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
 ./lib/isc/timer_p.h				C	2000,2001,2004,2005,2007,2009,2016
 ./lib/isc/tm.c					C	2014,2016
-./lib/isc/unix/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2009,2012,2014,2015,2016
+./lib/isc/unix/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2009,2012,2014,2015,2016,2017
 ./lib/isc/unix/app.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2013,2014,2015,2016,2017
 ./lib/isc/unix/dir.c				C	1999,2000,2001,2004,2005,2007,2008,2009,2011,2012,2016,2017
 ./lib/isc/unix/entropy.c			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2012,2016
@@ -4567,7 +4567,7 @@
 ./lib/lwres/win32/version.c			C	1998,1999,2000,2001,2004,2007,2016
 ./lib/samples/.gitignore			X	2013,2014
 ./lib/samples/Makefile-postinstall.in		MAKE	2009,2012,2013,2014,2016
-./lib/samples/Makefile.in			MAKE	2009,2012,2013,2014,2015,2016
+./lib/samples/Makefile.in			MAKE	2009,2012,2013,2014,2015,2016,2017
 ./lib/samples/nsprobe.c				C	2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/samples/resolve.c				C	2009,2012,2013,2014,2015,2016
 ./lib/samples/rootkey.sh			SH	2013,2016