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

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

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

revision 568669 by umeabot, Wed May 22 00:29:21 2013 UTC revision 568670 by oden, Sun Feb 2 14:10:33 2014 UTC
# Line 1  Line 1 
1  diff -up bind-9.5.0b1/bin/dig/dighost.c.libidn2 bind-9.5.0b1/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.5.0b1/bin/dig/dighost.c.libidn2      2007-12-10 13:12:26.000000000 +0100  --- bind-9.9.5/bin/dig/dighost.c        2014-02-02 13:58:37.507244365 +0100
3  +++ bind-9.5.0b1/bin/dig/dighost.c      2007-12-10 14:21:09.000000000 +0100  +++ bind-9.9.5.oden/bin/dig/dighost.c   2014-02-02 13:58:48.478244978 +0100
4  @@ -153,7 +153,7 @@ int  idnoptions     = 0;  @@ -167,7 +167,7 @@ isc_socket_t *keep = NULL;
5   #endif   isc_sockaddr_t keepaddr;
6    
7   #ifdef WITH_LIBIDN   #ifdef WITH_LIBIDN
8  -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 10  diff -up bind-9.5.0b1/bin/dig/dighost.c. Line 10  diff -up bind-9.5.0b1/bin/dig/dighost.c.
10   static isc_result_t    libidn_utf8_to_ascii (const char* from, char *to);   static isc_result_t    libidn_utf8_to_ascii (const char* from, char *to);
11   static isc_result_t    output_filter (isc_buffer_t *buffer,   static isc_result_t    output_filter (isc_buffer_t *buffer,
12                                         unsigned int used_org,                                         unsigned int used_org,
13  @@ -1764,17 +1764,13 @@ setup_lookup(dig_lookup_t *lookup) {  @@ -2052,17 +2052,13 @@ setup_lookup(dig_lookup_t *lookup) {
14          char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];          char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];
15   #endif   #endif
16   #ifdef WITH_LIBIDN   #ifdef WITH_LIBIDN
# Line 30  diff -up bind-9.5.0b1/bin/dig/dighost.c. Line 30  diff -up bind-9.5.0b1/bin/dig/dighost.c.
30          REQUIRE(lookup != NULL);          REQUIRE(lookup != NULL);
31          INSIST(!free_now);          INSIST(!free_now);
32    
33  @@ -1812,15 +1808,13 @@ setup_lookup(dig_lookup_t *lookup) {  @@ -2100,15 +2096,13 @@ setup_lookup(dig_lookup_t *lookup) {
34                              utf8_textname, sizeof(utf8_textname));                              utf8_textname, sizeof(utf8_textname));
35          idn_check_result(mr, "convert textname to UTF-8");          idn_check_result(mr, "convert textname to UTF-8");
36   #elif defined (WITH_LIBIDN)   #elif defined (WITH_LIBIDN)
# Line 50  diff -up bind-9.5.0b1/bin/dig/dighost.c. Line 50  diff -up bind-9.5.0b1/bin/dig/dighost.c.
50   #endif   #endif
51    
52          /*          /*
53  @@ -1833,24 +1827,11 @@ setup_lookup(dig_lookup_t *lookup) {  @@ -2121,24 +2115,11 @@ setup_lookup(dig_lookup_t *lookup) {
54          if (lookup->new_search) {          if (lookup->new_search) {
55   #ifdef WITH_IDN   #ifdef WITH_IDN
56                  if ((count_dots(utf8_textname) >= ndots) || !usesearch) {                  if ((count_dots(utf8_textname) >= ndots) || !usesearch) {
# Line 76  diff -up bind-9.5.0b1/bin/dig/dighost.c. Line 76  diff -up bind-9.5.0b1/bin/dig/dighost.c.
76                          lookup->origin = NULL; /* Force abs lookup */                          lookup->origin = NULL; /* Force abs lookup */
77                          lookup->done_as_is = ISC_TRUE;                          lookup->done_as_is = ISC_TRUE;
78                          lookup->need_search = usesearch;                          lookup->need_search = usesearch;
79  @@ -1858,7 +1839,6 @@ setup_lookup(dig_lookup_t *lookup) {  @@ -2146,7 +2127,6 @@ setup_lookup(dig_lookup_t *lookup) {
80                          lookup->origin = ISC_LIST_HEAD(search_list);                          lookup->origin = ISC_LIST_HEAD(search_list);
81                          lookup->need_search = ISC_FALSE;                          lookup->need_search = ISC_FALSE;
82                  }                  }
# Line 84  diff -up bind-9.5.0b1/bin/dig/dighost.c. Line 84  diff -up bind-9.5.0b1/bin/dig/dighost.c.
84          }          }
85    
86   #ifdef WITH_IDN   #ifdef WITH_IDN
87  @@ -1877,15 +1857,12 @@ setup_lookup(dig_lookup_t *lookup) {  @@ -2165,15 +2145,12 @@ setup_lookup(dig_lookup_t *lookup) {
88          idn_check_result(mr, "convert UTF-8 textname to IDN encoding");          idn_check_result(mr, "convert UTF-8 textname to IDN encoding");
89   #elif defined (WITH_LIBIDN)   #elif defined (WITH_LIBIDN)
90          if (lookup->origin != NULL) {          if (lookup->origin != NULL) {
# Line 103  diff -up bind-9.5.0b1/bin/dig/dighost.c. Line 103  diff -up bind-9.5.0b1/bin/dig/dighost.c.
103          }          }
104    
105          result = libidn_utf8_to_ascii (utf8_name, ascii_name);          result = libidn_utf8_to_ascii (utf8_name, ascii_name);
106  @@ -3600,76 +3577,85 @@ idn_check_result(idn_result_t r, const c  @@ -4082,76 +4059,85 @@ idn_check_result(idn_result_t r, const c
107   }   }
108   #endif /* WITH_IDN */   #endif /* WITH_IDN */
109   #ifdef WITH_LIBIDN   #ifdef WITH_LIBIDN
Legend:
Removed from v.568669  
changed lines
  Added in v.568670
  ViewVC Help
Powered by ViewVC 1.1.30