- update to 9.7.0a3bind-9_7_0-0_3_a3_fc13

1 files changed, 25 insertions, 22 deletions

diff --git a/bind-9.5-libidn.patch b/bind-9.5-libidn.patch
index bb0070a..b8e9ba5 100644
--- a/bind-9.5-libidn.patch
+++ b/bind-9.5-libidn.patch
@@ -1,6 +1,6 @@
-diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c
---- bind-9.6.1b1/bin/dig/dighost.c.libidn	2009-02-25 03:39:21.000000000 +0100
-+++ bind-9.6.1b1/bin/dig/dighost.c	2009-03-30 15:01:41.350136527 +0200
+diff -up bind-9.7.0a3/bin/dig/dighost.c.libidn bind-9.7.0a3/bin/dig/dighost.c
+--- bind-9.7.0a3/bin/dig/dighost.c.libidn	2009-09-01 02:22:24.000000000 +0200
++++ bind-9.7.0a3/bin/dig/dighost.c	2009-09-16 12:58:36.044643387 +0200
 @@ -44,6 +44,11 @@
  #include <idn/api.h>
  #endif
@@ -28,7 +28,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c
  /*%
   * Exit Codes:
   *
-@@ -1012,6 +1025,9 @@ setup_system(void) {
+@@ -1029,6 +1042,9 @@ setup_system(void) {
  	dig_searchlist_t *domain = NULL;
  	lwres_result_t lwresult;
  	unsigned int lwresflags;
@@ -38,7 +38,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c
  
  	debug("setup_system()");
  
-@@ -1068,8 +1084,15 @@ setup_system(void) {
+@@ -1087,8 +1103,15 @@ setup_system(void) {
  
  #ifdef WITH_IDN
  	initialize_idn();
@@ -55,7 +55,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c
  	if (keyfile[0] != 0)
  		setup_file_key();
  	else if (keysecret[0] != 0)
-@@ -1770,12 +1793,18 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1789,12 +1812,18 @@ setup_lookup(dig_lookup_t *lookup) {
  	idn_result_t mr;
  	char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];
  #endif
@@ -75,7 +75,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c
  	REQUIRE(lookup != NULL);
  	INSIST(!free_now);
  
-@@ -1812,6 +1841,16 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1831,6 +1860,16 @@ 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");
@@ -92,7 +92,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c
  #endif
  
  	/*
-@@ -1831,6 +1870,15 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1850,6 +1889,15 @@ setup_lookup(dig_lookup_t *lookup) {
  			lookup->origin = ISC_LIST_HEAD(search_list);
  			lookup->need_search = ISC_FALSE;
  		}
@@ -108,7 +108,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c
  #else
  		if ((count_dots(lookup->textname) >= ndots) || !usesearch) {
  			lookup->origin = NULL; /* Force abs lookup */
-@@ -1857,6 +1905,20 @@ setup_lookup(dig_lookup_t *lookup) {
+@@ -1876,6 +1924,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");
@@ -129,22 +129,21 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c
  #else
  	if (lookup->origin != NULL) {
  		debug("trying origin %s", lookup->origin->origin);
-@@ -1913,6 +1975,14 @@ setup_lookup(dig_lookup_t *lookup) {
- 						   dns_rootname,
- 						   ISC_FALSE,
+@@ -1931,6 +1993,13 @@ setup_lookup(dig_lookup_t *lookup) {
+ 			result = dns_name_fromtext(lookup->name, &b,
+ 						   dns_rootname, 0,
  						   &lookup->namebuf);
 +#elif defined (WITH_LIBIDN)
 +			len = strlen (ascii_name);
 +			isc_buffer_init(&b, ascii_name, len);
 +			isc_buffer_add(&b, len);
 +			result = dns_name_fromtext(lookup->name, &b,
-+						   dns_rootname,
-+						   ISC_FALSE,
++						   dns_rootname, 0,
 +						   &lookup->namebuf);
  #else
  			len = strlen(lookup->textname);
  			isc_buffer_init(&b, lookup->textname, len);
-@@ -3432,7 +3502,7 @@ destroy_libs(void) {
+@@ -3449,7 +3518,7 @@ destroy_libs(void) {
  	void * ptr;
  	dig_message_t *chase_msg;
  #endif
@@ -153,7 +152,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c
  	isc_result_t result;
  #endif
  
-@@ -3471,6 +3541,10 @@ destroy_libs(void) {
+@@ -3488,6 +3557,10 @@ destroy_libs(void) {
  	result = dns_name_settotextfilter(NULL);
  	check_result(result, "dns_name_settotextfilter");
  #endif
@@ -164,7 +163,7 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c
  	dns_name_destroy();
  
  	if (commctx != NULL) {
-@@ -3647,6 +3721,79 @@ idn_check_result(idn_result_t r, const c
+@@ -3664,6 +3737,79 @@ idn_check_result(idn_result_t r, const c
  	}
  }
  #endif /* WITH_IDN */
@@ -244,19 +243,23 @@ diff -up bind-9.6.1b1/bin/dig/dighost.c.libidn bind-9.6.1b1/bin/dig/dighost.c
  
  #ifdef DIG_SIGCHASE
  void
-diff -up bind-9.6.1b1/bin/dig/Makefile.in.libidn bind-9.6.1b1/bin/dig/Makefile.in
---- bind-9.6.1b1/bin/dig/Makefile.in.libidn	2007-06-20 01:46:59.000000000 +0200
-+++ bind-9.6.1b1/bin/dig/Makefile.in	2009-03-30 15:00:42.883135505 +0200
-@@ -45,7 +45,7 @@ DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS} 
+diff -up bind-9.7.0a3/bin/dig/Makefile.in.libidn bind-9.7.0a3/bin/dig/Makefile.in
+--- bind-9.7.0a3/bin/dig/Makefile.in.libidn	2009-09-03 01:48:01.000000000 +0200
++++ bind-9.7.0a3/bin/dig/Makefile.in	2009-09-16 12:59:00.314643312 +0200
+@@ -46,10 +46,10 @@ DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS} 
  		${LWRESDEPLIBS}
  
  LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCLIBS} \
 -		${ISCCFGLIBS} @IDNLIBS@ @LIBS@
 +		${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -lidn
  
+ NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCNOSYMLIBS} \
+-		${ISCCFGLIBS} @IDNLIBS@ @LIBS@
++		${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -lidn
+ 
  SUBDIRS =
  
-@@ -63,6 +63,8 @@ HTMLPAGES =	dig.html host.html nslookup.
+@@ -67,6 +67,8 @@ HTMLPAGES =	dig.html host.html nslookup.
  
  MANOBJS =	${MANPAGES} ${HTMLPAGES}