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

Diff of /cauldron/bind/current/SOURCES/bind-9.5-libidn.patch

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

revision 621432 by oden, Sun Feb 2 14:06:11 2014 UTC revision 621433 by oden, Fri May 9 08:04:07 2014 UTC
# Line 1  Line 1 
1  diff -Naurp bind-9.9.5/bin/dig/dighost.c bind-9.9.5.oden/bin/dig/dighost.c  diff -Naurp bind-9.10.0-P1/bin/dig/dighost.c bind-9.10.0-P1.oden/bin/dig/dighost.c
2  --- bind-9.9.5/bin/dig/dighost.c        2014-01-27 19:58:24.000000000 +0100  --- bind-9.10.0-P1/bin/dig/dighost.c    2014-05-05 02:15:51.000000000 +0200
3  +++ bind-9.9.5.oden/bin/dig/dighost.c   2014-02-02 13:57:17.399239885 +0100  +++ bind-9.10.0-P1.oden/bin/dig/dighost.c       2014-05-09 08:13:40.000000000 +0200
4  @@ -44,6 +44,11 @@  @@ -44,6 +44,11 @@
5   #include <idn/api.h>   #include <idn/api.h>
6   #endif   #endif
# Line 28  diff -Naurp bind-9.9.5/bin/dig/dighost.c Line 28  diff -Naurp bind-9.9.5/bin/dig/dighost.c
28   /*%   /*%
29    * Exit Codes:    * Exit Codes:
30    *    *
31  @@ -1210,6 +1223,9 @@ setup_system(void) {  @@ -1353,8 +1366,15 @@ setup_system(void) {
         dig_searchlist_t *domain = NULL;  
         lwres_result_t lwresult;  
         unsigned int lwresflags;  
 +#ifdef WITH_LIBIDN  
 +       isc_result_t result;  
 +#endif  
   
         debug("setup_system()");  
   
 @@ -1268,8 +1284,15 @@ setup_system(void) {  
32    
33   #ifdef WITH_IDN   #ifdef WITH_IDN
34          initialize_idn();          initialize_idn();
# Line 55  diff -Naurp bind-9.9.5/bin/dig/dighost.c Line 45  diff -Naurp bind-9.9.5/bin/dig/dighost.c
45          if (keyfile[0] != 0)          if (keyfile[0] != 0)
46                  setup_file_key();                  setup_file_key();
47          else if (keysecret[0] != 0)          else if (keysecret[0] != 0)
48  @@ -2028,12 +2051,18 @@ setup_lookup(dig_lookup_t *lookup) {  @@ -2104,12 +2124,18 @@ setup_lookup(dig_lookup_t *lookup) {
49          idn_result_t mr;          idn_result_t mr;
50          char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];          char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];
51   #endif   #endif
# Line 75  diff -Naurp bind-9.9.5/bin/dig/dighost.c Line 65  diff -Naurp bind-9.9.5/bin/dig/dighost.c
65          REQUIRE(lookup != NULL);          REQUIRE(lookup != NULL);
66          INSIST(!free_now);          INSIST(!free_now);
67    
68  @@ -2070,6 +2099,16 @@ setup_lookup(dig_lookup_t *lookup) {  @@ -2146,6 +2172,16 @@ setup_lookup(dig_lookup_t *lookup) {
69          mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, lookup->textname,          mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, lookup->textname,
70                              utf8_textname, sizeof(utf8_textname));                              utf8_textname, sizeof(utf8_textname));
71          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.5/bin/dig/dighost.c Line 82  diff -Naurp bind-9.9.5/bin/dig/dighost.c
82   #endif   #endif
83    
84          /*          /*
85  @@ -2089,6 +2128,15 @@ setup_lookup(dig_lookup_t *lookup) {  @@ -2165,6 +2201,15 @@ setup_lookup(dig_lookup_t *lookup) {
86                          lookup->origin = ISC_LIST_HEAD(search_list);                          lookup->origin = ISC_LIST_HEAD(search_list);
87                          lookup->need_search = ISC_FALSE;                          lookup->need_search = ISC_FALSE;
88                  }                  }
# Line 108  diff -Naurp bind-9.9.5/bin/dig/dighost.c Line 98  diff -Naurp bind-9.9.5/bin/dig/dighost.c
98   #else   #else
99                  if ((count_dots(lookup->textname) >= ndots) || !usesearch) {                  if ((count_dots(lookup->textname) >= ndots) || !usesearch) {
100                          lookup->origin = NULL; /* Force abs lookup */                          lookup->origin = NULL; /* Force abs lookup */
101  @@ -2115,6 +2163,20 @@ setup_lookup(dig_lookup_t *lookup) {  @@ -2191,6 +2236,20 @@ setup_lookup(dig_lookup_t *lookup) {
102                              IDN_IDNCONV | IDN_LENCHECK, utf8_textname,                              IDN_IDNCONV | IDN_LENCHECK, utf8_textname,
103                              idn_textname, sizeof(idn_textname));                              idn_textname, sizeof(idn_textname));
104          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.5/bin/dig/dighost.c Line 119  diff -Naurp bind-9.9.5/bin/dig/dighost.c
119   #else   #else
120          if (lookup->origin != NULL) {          if (lookup->origin != NULL) {
121                  debug("trying origin %s", lookup->origin->origin);                  debug("trying origin %s", lookup->origin->origin);
122  @@ -2170,6 +2232,13 @@ setup_lookup(dig_lookup_t *lookup) {  @@ -2246,6 +2305,13 @@ setup_lookup(dig_lookup_t *lookup) {
123                          result = dns_name_fromtext(lookup->name, &b,                          result = dns_name_fromtext(lookup->name, &b,
124                                                     dns_rootname, 0,                                                     dns_rootname, 0,
125                                                     &lookup->namebuf);                                                     &lookup->namebuf);
# Line 143  diff -Naurp bind-9.9.5/bin/dig/dighost.c Line 133  diff -Naurp bind-9.9.5/bin/dig/dighost.c
133   #else   #else
134                          len = strlen(lookup->textname);                          len = strlen(lookup->textname);
135                          isc_buffer_init(&b, lookup->textname, len);                          isc_buffer_init(&b, lookup->textname, len);
136  @@ -3788,7 +3857,7 @@ destroy_libs(void) {  @@ -4029,7 +4095,7 @@ destroy_libs(void) {
137          void * ptr;          void * ptr;
138          dig_message_t *chase_msg;          dig_message_t *chase_msg;
139   #endif   #endif
# Line 152  diff -Naurp bind-9.9.5/bin/dig/dighost.c Line 142  diff -Naurp bind-9.9.5/bin/dig/dighost.c
142          isc_result_t result;          isc_result_t result;
143   #endif   #endif
144    
145  @@ -3829,6 +3898,10 @@ destroy_libs(void) {  @@ -4070,6 +4136,10 @@ destroy_libs(void) {
146          result = dns_name_settotextfilter(NULL);          result = dns_name_settotextfilter(NULL);
147          check_result(result, "dns_name_settotextfilter");          check_result(result, "dns_name_settotextfilter");
148   #endif   #endif
# Line 163  diff -Naurp bind-9.9.5/bin/dig/dighost.c Line 153  diff -Naurp bind-9.9.5/bin/dig/dighost.c
153          dns_name_destroy();          dns_name_destroy();
154    
155          if (commctx != NULL) {          if (commctx != NULL) {
156  @@ -4008,6 +4081,79 @@ idn_check_result(idn_result_t r, const c  @@ -4249,6 +4319,79 @@ idn_check_result(idn_result_t r, const c
157          }          }
158   }   }
159   #endif /* WITH_IDN */   #endif /* WITH_IDN */
# Line 243  diff -Naurp bind-9.9.5/bin/dig/dighost.c Line 233  diff -Naurp bind-9.9.5/bin/dig/dighost.c
233    
234   #ifdef DIG_SIGCHASE   #ifdef DIG_SIGCHASE
235   void   void
236  diff -Naurp bind-9.9.5/bin/dig/Makefile.in bind-9.9.5.oden/bin/dig/Makefile.in  diff -Naurp bind-9.10.0-P1/bin/dig/Makefile.in bind-9.10.0-P1.oden/bin/dig/Makefile.in
237  --- bind-9.9.5/bin/dig/Makefile.in      2014-01-27 19:58:24.000000000 +0100  --- bind-9.10.0-P1/bin/dig/Makefile.in  2014-05-05 02:15:51.000000000 +0200
238  +++ bind-9.9.5.oden/bin/dig/Makefile.in 2014-02-02 13:57:17.399239885 +0100  +++ bind-9.10.0-P1.oden/bin/dig/Makefile.in     2014-05-09 08:14:37.000000000 +0200
239  @@ -48,10 +48,10 @@ DEPLIBS =   ${DNSDEPLIBS} ${BIND9DEPLIBS}  @@ -48,10 +48,10 @@ DEPLIBS =   ${DNSDEPLIBS} ${BIND9DEPLIBS}
240                  ${LWRESDEPLIBS}                  ${ISCCFGDEPLIBS} ${LWRESDEPLIBS}
241    
242   LIBS =         ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \   LIBS =         ${LWRESLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
243  -               ${ISCLIBS} @IDNLIBS@ @LIBS@  -               ${ISCLIBS} @IDNLIBS@ @LIBS@
244  +               ${ISCLIBS} @IDNLIBS@ @LIBS@ -lidn  +               ${ISCLIBS} @IDNLIBS@ @LIBS@ -lidn
245    
246   NOSYMLIBS =    ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \   NOSYMLIBS =    ${LWRESLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
247  -               ${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@  -               ${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@
248  +               ${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@ -lidn  +               ${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@ -lidn
249    
Legend:
Removed from v.621432  
changed lines
  Added in v.621433
  ViewVC Help
Powered by ViewVC 1.1.30