/[packages]/updates/3/bind/current/SOURCES/bind-9.5-libidn.patch
ViewVC logotype

Diff of /updates/3/bind/current/SOURCES/bind-9.5-libidn.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 568669 by oden, Mon Jan 13 18:08:34 2014 UTC revision 568670 by oden, Sun Feb 2 14:10:33 2014 UTC
# Line 1  Line 1 
1  diff -Naurp bind-9.9.4-P2/bin/dig/dighost.c bind-9.9.4-P2.oden/bin/dig/dighost.c  diff -Naurp bind-9.9.5/bin/dig/dighost.c bind-9.9.5.oden/bin/dig/dighost.c
2  --- bind-9.9.4-P2/bin/dig/dighost.c     2013-12-20 01:28:28.000000000 +0100  --- bind-9.9.5/bin/dig/dighost.c        2014-01-27 19:58:24.000000000 +0100
3  +++ bind-9.9.4-P2.oden/bin/dig/dighost.c        2014-01-13 18:59:30.000000000 +0100  +++ bind-9.9.5.oden/bin/dig/dighost.c   2014-02-02 13:57:17.399239885 +0100
4  @@ -44,6 +44,11 @@  @@ -44,6 +44,11 @@
5   #include <idn/api.h>   #include <idn/api.h>
6   #endif   #endif
# Line 13  diff -Naurp bind-9.9.4-P2/bin/dig/dighos Line 13  diff -Naurp bind-9.9.4-P2/bin/dig/dighos
13   #include <dns/byaddr.h>   #include <dns/byaddr.h>
14   #ifdef DIG_SIGCHASE   #ifdef DIG_SIGCHASE
15   #include <dns/callbacks.h>   #include <dns/callbacks.h>
16  @@ -157,6 +162,14 @@ static void                idn_check_result(idn_result  @@ -161,6 +166,14 @@ int  idnoptions    = 0;
17   int  idnoptions        = 0;   isc_socket_t *keep = NULL;
18   #endif   isc_sockaddr_t keepaddr;
19    
20  +#ifdef WITH_LIBIDN  +#ifdef WITH_LIBIDN
21  +static isc_result_t    libidn_locale_to_utf8 (const char* from, char **to);  +static isc_result_t    libidn_locale_to_utf8 (const char* from, char **to);
# Line 28  diff -Naurp bind-9.9.4-P2/bin/dig/dighos Line 28  diff -Naurp bind-9.9.4-P2/bin/dig/dighos
28   /*%   /*%
29    * Exit Codes:    * Exit Codes:
30    *    *
31  @@ -1199,6 +1212,9 @@ setup_system(void) {  @@ -1210,6 +1223,9 @@ setup_system(void) {
32          dig_searchlist_t *domain = NULL;          dig_searchlist_t *domain = NULL;
33          lwres_result_t lwresult;          lwres_result_t lwresult;
34          unsigned int lwresflags;          unsigned int lwresflags;
# Line 38  diff -Naurp bind-9.9.4-P2/bin/dig/dighos Line 38  diff -Naurp bind-9.9.4-P2/bin/dig/dighos
38    
39          debug("setup_system()");          debug("setup_system()");
40    
41  @@ -1257,8 +1273,15 @@ setup_system(void) {  @@ -1268,8 +1284,15 @@ setup_system(void) {
42    
43   #ifdef WITH_IDN   #ifdef WITH_IDN
44          initialize_idn();          initialize_idn();
# Line 55  diff -Naurp bind-9.9.4-P2/bin/dig/dighos Line 55  diff -Naurp bind-9.9.4-P2/bin/dig/dighos
55          if (keyfile[0] != 0)          if (keyfile[0] != 0)
56                  setup_file_key();                  setup_file_key();
57          else if (keysecret[0] != 0)          else if (keysecret[0] != 0)
58  @@ -1999,12 +2022,18 @@ setup_lookup(dig_lookup_t *lookup) {  @@ -2028,12 +2051,18 @@ setup_lookup(dig_lookup_t *lookup) {
59          idn_result_t mr;          idn_result_t mr;
60          char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];          char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];
61   #endif   #endif
# Line 75  diff -Naurp bind-9.9.4-P2/bin/dig/dighos Line 75  diff -Naurp bind-9.9.4-P2/bin/dig/dighos
75          REQUIRE(lookup != NULL);          REQUIRE(lookup != NULL);
76          INSIST(!free_now);          INSIST(!free_now);
77    
78  @@ -2041,6 +2070,16 @@ setup_lookup(dig_lookup_t *lookup) {  @@ -2070,6 +2099,16 @@ setup_lookup(dig_lookup_t *lookup) {
79          mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, lookup->textname,          mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, lookup->textname,
80                              utf8_textname, sizeof(utf8_textname));                              utf8_textname, sizeof(utf8_textname));
81          idn_check_result(mr, "convert textname to UTF-8");          idn_check_result(mr, "convert textname to UTF-8");
# Line 92  diff -Naurp bind-9.9.4-P2/bin/dig/dighos Line 92  diff -Naurp bind-9.9.4-P2/bin/dig/dighos
92   #endif   #endif
93    
94          /*          /*
95  @@ -2060,6 +2099,15 @@ setup_lookup(dig_lookup_t *lookup) {  @@ -2089,6 +2128,15 @@ setup_lookup(dig_lookup_t *lookup) {
96                          lookup->origin = ISC_LIST_HEAD(search_list);                          lookup->origin = ISC_LIST_HEAD(search_list);
97                          lookup->need_search = ISC_FALSE;                          lookup->need_search = ISC_FALSE;
98                  }                  }
# Line 108  diff -Naurp bind-9.9.4-P2/bin/dig/dighos Line 108  diff -Naurp bind-9.9.4-P2/bin/dig/dighos
108   #else   #else
109                  if ((count_dots(lookup->textname) >= ndots) || !usesearch) {                  if ((count_dots(lookup->textname) >= ndots) || !usesearch) {
110                          lookup->origin = NULL; /* Force abs lookup */                          lookup->origin = NULL; /* Force abs lookup */
111  @@ -2086,6 +2134,20 @@ setup_lookup(dig_lookup_t *lookup) {  @@ -2115,6 +2163,20 @@ setup_lookup(dig_lookup_t *lookup) {
112                              IDN_IDNCONV | IDN_LENCHECK, utf8_textname,                              IDN_IDNCONV | IDN_LENCHECK, utf8_textname,
113                              idn_textname, sizeof(idn_textname));                              idn_textname, sizeof(idn_textname));
114          idn_check_result(mr, "convert UTF-8 textname to IDN encoding");          idn_check_result(mr, "convert UTF-8 textname to IDN encoding");
# Line 129  diff -Naurp bind-9.9.4-P2/bin/dig/dighos Line 129  diff -Naurp bind-9.9.4-P2/bin/dig/dighos
129   #else   #else
130          if (lookup->origin != NULL) {          if (lookup->origin != NULL) {
131                  debug("trying origin %s", lookup->origin->origin);                  debug("trying origin %s", lookup->origin->origin);
132  @@ -2141,6 +2203,13 @@ setup_lookup(dig_lookup_t *lookup) {  @@ -2170,6 +2232,13 @@ setup_lookup(dig_lookup_t *lookup) {
133                          result = dns_name_fromtext(lookup->name, &b,                          result = dns_name_fromtext(lookup->name, &b,
134                                                     dns_rootname, 0,                                                     dns_rootname, 0,
135                                                     &lookup->namebuf);                                                     &lookup->namebuf);
# Line 143  diff -Naurp bind-9.9.4-P2/bin/dig/dighos Line 143  diff -Naurp bind-9.9.4-P2/bin/dig/dighos
143   #else   #else
144                          len = strlen(lookup->textname);                          len = strlen(lookup->textname);
145                          isc_buffer_init(&b, lookup->textname, len);                          isc_buffer_init(&b, lookup->textname, len);
146  @@ -3703,7 +3772,7 @@ destroy_libs(void) {  @@ -3788,7 +3857,7 @@ destroy_libs(void) {
147          void * ptr;          void * ptr;
148          dig_message_t *chase_msg;          dig_message_t *chase_msg;
149   #endif   #endif
# Line 152  diff -Naurp bind-9.9.4-P2/bin/dig/dighos Line 152  diff -Naurp bind-9.9.4-P2/bin/dig/dighos
152          isc_result_t result;          isc_result_t result;
153   #endif   #endif
154    
155  @@ -3742,6 +3811,10 @@ destroy_libs(void) {  @@ -3829,6 +3898,10 @@ destroy_libs(void) {
156          result = dns_name_settotextfilter(NULL);          result = dns_name_settotextfilter(NULL);
157          check_result(result, "dns_name_settotextfilter");          check_result(result, "dns_name_settotextfilter");
158   #endif   #endif
# Line 163  diff -Naurp bind-9.9.4-P2/bin/dig/dighos Line 163  diff -Naurp bind-9.9.4-P2/bin/dig/dighos
163          dns_name_destroy();          dns_name_destroy();
164    
165          if (commctx != NULL) {          if (commctx != NULL) {
166  @@ -3920,6 +3993,79 @@ idn_check_result(idn_result_t r, const c  @@ -4008,6 +4081,79 @@ idn_check_result(idn_result_t r, const c
167          }          }
168   }   }
169   #endif /* WITH_IDN */   #endif /* WITH_IDN */
# Line 243  diff -Naurp bind-9.9.4-P2/bin/dig/dighos Line 243  diff -Naurp bind-9.9.4-P2/bin/dig/dighos
243    
244   #ifdef DIG_SIGCHASE   #ifdef DIG_SIGCHASE
245   void   void
246  diff -Naurp bind-9.9.4-P2/bin/dig/Makefile.in bind-9.9.4-P2.oden/bin/dig/Makefile.in  diff -Naurp bind-9.9.5/bin/dig/Makefile.in bind-9.9.5.oden/bin/dig/Makefile.in
247  --- bind-9.9.4-P2/bin/dig/Makefile.in   2013-12-20 01:28:28.000000000 +0100  --- bind-9.9.5/bin/dig/Makefile.in      2014-01-27 19:58:24.000000000 +0100
248  +++ bind-9.9.4-P2.oden/bin/dig/Makefile.in      2014-01-13 18:59:30.000000000 +0100  +++ bind-9.9.5.oden/bin/dig/Makefile.in 2014-02-02 13:57:17.399239885 +0100
249  @@ -48,10 +48,10 @@ DEPLIBS =   ${DNSDEPLIBS} ${BIND9DEPLIBS}  @@ -48,10 +48,10 @@ DEPLIBS =   ${DNSDEPLIBS} ${BIND9DEPLIBS}
250                  ${LWRESDEPLIBS}                  ${LWRESDEPLIBS}
251    
Legend:
Removed from v.568669  
changed lines
  Added in v.568670
  ViewVC Help
Powered by ViewVC 1.1.30