Update to 9.10.4-P1

1 files changed, 47 insertions, 44 deletions

diff --git a/bind-99-libidn.patch b/bind-99-libidn.patch
index c86be93..a03cc96 100644
--- a/bind-99-libidn.patch
+++ b/bind-99-libidn.patch
@@ -1,7 +1,34 @@
-diff -up bind-9.10.1b1/bin/dig/dig.docbook.libidn bind-9.10.1b1/bin/dig/dig.docbook
---- bind-9.10.1b1/bin/dig/dig.docbook.libidn	2014-06-23 06:47:35.000000000 +0200
-+++ bind-9.10.1b1/bin/dig/dig.docbook	2014-07-29 15:30:42.808679630 +0200
-@@ -1012,8 +1012,8 @@ dig +qr www.isc.org any -x 127.0.0.1 isc
+diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
+index 5e9febc..b1861a5 100644
+--- a/bin/dig/Makefile.in
++++ b/bin/dig/Makefile.in
+@@ -48,10 +48,10 @@ DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} \
+ 		${ISCCFGDEPLIBS} ${LWRESDEPLIBS}
+ 
+ LIBS =		${LWRESLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
+-		${ISCLIBS} @IDNLIBS@ @LIBS@
++		${ISCLIBS} @IDNLIBS@ @LIBS@ -lidn
+ 
+ NOSYMLIBS =	${LWRESLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
+-		${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@
++		${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@ -lidn
+ 
+ SUBDIRS =
+ 
+@@ -69,6 +69,8 @@ HTMLPAGES =	dig.html host.html nslookup.html
+ 
+ MANOBJS =	${MANPAGES} ${HTMLPAGES}
+ 
++EXT_CFLAGS = -DWITH_LIBIDN
++
+ @BIND9_MAKE_RULES@
+ 
+ dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
+diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
+index c54d677..1079421 100644
+--- a/bin/dig/dig.docbook
++++ b/bin/dig/dig.docbook
+@@ -1170,8 +1170,8 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
        <command>dig</command> appropriately converts character encoding of
        domain name before sending a request to DNS server or displaying a
        reply from the server.
@@ -9,12 +36,13 @@ diff -up bind-9.10.1b1/bin/dig/dig.docbook.libidn bind-9.10.1b1/bin/dig/dig.docb
 -      the <envar>IDN_DISABLE</envar> environment variable.
 +      If you'd like to turn off the IDN support for some reason, define
 +      the <envar>CHARSET=ASCII</envar> environment variable.
-       The IDN support is disabled if the variable is set when 
+       The IDN support is disabled if the variable is set when
        <command>dig</command> runs.
      </para>
-diff -up bind-9.10.1b1/bin/dig/dighost.c.libidn bind-9.10.1b1/bin/dig/dighost.c
---- bind-9.10.1b1/bin/dig/dighost.c.libidn	2014-06-23 06:47:35.000000000 +0200
-+++ bind-9.10.1b1/bin/dig/dighost.c	2014-07-29 15:44:43.114012448 +0200
+diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
+index 3ca7cb9..f11884e 100644
+--- a/bin/dig/dighost.c
++++ b/bin/dig/dighost.c
 @@ -44,6 +44,11 @@
  #include <idn/api.h>
  #endif
@@ -27,7 +55,7 @@ diff -up bind-9.10.1b1/bin/dig/dighost.c.libidn bind-9.10.1b1/bin/dig/dighost.c
  #include <dns/byaddr.h>
  #ifdef DIG_SIGCHASE
  #include <dns/callbacks.h>
-@@ -158,6 +163,14 @@ static void		idn_check_result(idn_result
+@@ -168,6 +173,14 @@ static void		idn_check_result(idn_result_t r, const char *msg);
  int  idnoptions	= 0;
  #endif
  
@@ -42,7 +70,7 @@ diff -up bind-9.10.1b1/bin/dig/dighost.c.libidn bind-9.10.1b1/bin/dig/dighost.c
  isc_socket_t *keep = NULL;
  isc_sockaddr_t keepaddr;
  
-@@ -1355,8 +1371,15 @@ setup_system(void) {
+@@ -1404,8 +1417,15 @@ setup_system(void) {
  
  #ifdef WITH_IDN
  	initialize_idn();
@@ -59,7 +87,7 @@ diff -up bind-9.10.1b1/bin/dig/dighost.c.libidn bind-9.10.1b1/bin/dig/dighost.c
  	if (keyfile[0] != 0)
  		setup_file_key();
  	else if (keysecret[0] != 0)
-@@ -2106,12 +2129,14 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -2191,12 +2211,14 @@ setup_lookup(dig_lookup_t *lookup) {
  	idn_result_t mr;
  	char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];
  #endif
@@ -76,7 +104,7 @@ diff -up bind-9.10.1b1/bin/dig/dighost.c.libidn bind-9.10.1b1/bin/dig/dighost.c
  	REQUIRE(lookup != NULL);
  	INSIST(!free_now);
  
-@@ -2148,6 +2173,14 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -2233,6 +2255,14 @@ setup_lookup(dig_lookup_t *lookup) {
  	mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, lookup->textname,
  			    utf8_textname, sizeof(utf8_textname));
  	idn_check_result(mr, "convert textname to UTF-8");
@@ -91,7 +119,7 @@ diff -up bind-9.10.1b1/bin/dig/dighost.c.libidn bind-9.10.1b1/bin/dig/dighost.c
  #endif
  
  	/*
-@@ -2160,15 +2193,11 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -2245,15 +2275,11 @@ setup_lookup(dig_lookup_t *lookup) {
  	if (lookup->new_search) {
  #ifdef WITH_IDN
  		if ((count_dots(utf8_textname) >= ndots) || !usesearch) {
@@ -110,7 +138,7 @@ diff -up bind-9.10.1b1/bin/dig/dighost.c.libidn bind-9.10.1b1/bin/dig/dighost.c
  			lookup->origin = NULL; /* Force abs lookup */
  			lookup->done_as_is = ISC_TRUE;
  			lookup->need_search = usesearch;
-@@ -2176,7 +2205,6 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -2261,7 +2287,6 @@ setup_lookup(dig_lookup_t *lookup) {
  			lookup->origin = ISC_LIST_HEAD(search_list);
  			lookup->need_search = ISC_FALSE;
  		}
@@ -118,7 +146,7 @@ diff -up bind-9.10.1b1/bin/dig/dighost.c.libidn bind-9.10.1b1/bin/dig/dighost.c
  	}
  
  #ifdef WITH_IDN
-@@ -2193,6 +2221,20 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -2278,6 +2303,20 @@ setup_lookup(dig_lookup_t *lookup) {
  			    IDN_IDNCONV | IDN_LENCHECK, utf8_textname,
  			    idn_textname, sizeof(idn_textname));
  	idn_check_result(mr, "convert UTF-8 textname to IDN encoding");
@@ -139,7 +167,7 @@ diff -up bind-9.10.1b1/bin/dig/dighost.c.libidn bind-9.10.1b1/bin/dig/dighost.c
  #else
  	if (lookup->origin != NULL) {
  		debug("trying origin %s", lookup->origin->origin);
-@@ -2248,6 +2290,13 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -2348,6 +2387,13 @@ setup_lookup(dig_lookup_t *lookup) {
  			result = dns_name_fromtext(lookup->name, &b,
  						   dns_rootname, 0,
  						   &lookup->namebuf);
@@ -153,7 +181,7 @@ diff -up bind-9.10.1b1/bin/dig/dighost.c.libidn bind-9.10.1b1/bin/dig/dighost.c
  #else
  			len = strlen(lookup->textname);
  			isc_buffer_init(&b, lookup->textname, len);
-@@ -4031,7 +4080,7 @@ destroy_libs(void) {
+@@ -4227,7 +4273,7 @@ destroy_libs(void) {
  	void * ptr;
  	dig_message_t *chase_msg;
  #endif
@@ -162,7 +190,7 @@ diff -up bind-9.10.1b1/bin/dig/dighost.c.libidn bind-9.10.1b1/bin/dig/dighost.c
  	isc_result_t result;
  #endif
  
-@@ -4072,6 +4121,10 @@ destroy_libs(void) {
+@@ -4268,6 +4314,10 @@ destroy_libs(void) {
  	result = dns_name_settotextfilter(NULL);
  	check_result(result, "dns_name_settotextfilter");
  #endif
@@ -173,7 +201,7 @@ diff -up bind-9.10.1b1/bin/dig/dighost.c.libidn bind-9.10.1b1/bin/dig/dighost.c
  	dns_name_destroy();
  
  	if (commctx != NULL) {
-@@ -4251,6 +4304,97 @@ idn_check_result(idn_result_t r, const c
+@@ -4453,6 +4503,97 @@ idn_check_result(idn_result_t r, const char *msg) {
  	}
  }
  #endif /* WITH_IDN */
@@ -271,28 +299,3 @@ diff -up bind-9.10.1b1/bin/dig/dighost.c.libidn bind-9.10.1b1/bin/dig/dighost.c
  
  #ifdef DIG_SIGCHASE
  void
-diff -up bind-9.10.1b1/bin/dig/Makefile.in.libidn bind-9.10.1b1/bin/dig/Makefile.in
---- bind-9.10.1b1/bin/dig/Makefile.in.libidn	2014-06-23 06:47:35.000000000 +0200
-+++ bind-9.10.1b1/bin/dig/Makefile.in	2014-07-29 15:47:00.566230478 +0200
-@@ -48,10 +48,10 @@ DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS}
- 		${ISCCFGDEPLIBS} ${LWRESDEPLIBS}
- 
- LIBS =		${LWRESLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
--		${ISCLIBS} @IDNLIBS@ @LIBS@
-+		${ISCLIBS} @IDNLIBS@ @LIBS@ -lidn
- 
- NOSYMLIBS =	${LWRESLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
--		${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@
-+		${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@ -lidn
- 
- SUBDIRS =
- 
-@@ -69,6 +69,8 @@ HTMLPAGES =	dig.html host.html nslookup.
- 
- MANOBJS =	${MANPAGES} ${HTMLPAGES}
- 
-+EXT_CFLAGS = -DWITH_LIBIDN
-+
- @BIND9_MAKE_RULES@
- 
- dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}