diff options
author | Adam Tkac <atkac@fedoraproject.org> | 2009-11-03 11:06:16 +0000 |
---|---|---|
committer | Adam Tkac <atkac@fedoraproject.org> | 2009-11-03 11:06:16 +0000 |
commit | 2fc1c6e8a506e6206de9bbb9d7e7e3d164224984 (patch) | |
tree | 440f187d192c893a973ec7b40c19353c524e4975 /bind-9.5-libidn.patch | |
parent | 98a514b98b0012ee80d355fb2aa8999b5850bc5f (diff) | |
download | bind-2fc1c6e8a506e6206de9bbb9d7e7e3d164224984.tar.gz bind-2fc1c6e8a506e6206de9bbb9d7e7e3d164224984.tar.xz bind-2fc1c6e8a506e6206de9bbb9d7e7e3d164224984.zip |
- update to 9.7.0b1bind-9_7_0-0_6_b1_fc13
- add bind-pkcs11 subpackage to support PKCS11 compatible keystores for
DNSSEC keys
Diffstat (limited to 'bind-9.5-libidn.patch')
-rw-r--r-- | bind-9.5-libidn.patch | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/bind-9.5-libidn.patch b/bind-9.5-libidn.patch index b8e9ba5..fccfa61 100644 --- a/bind-9.5-libidn.patch +++ b/bind-9.5-libidn.patch @@ -1,6 +1,6 @@ -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 +diff -up bind-9.7.0b1/bin/dig/dighost.c.libidn bind-9.7.0b1/bin/dig/dighost.c +--- bind-9.7.0b1/bin/dig/dighost.c.libidn 2009-09-16 01:48:09.000000000 +0200 ++++ bind-9.7.0b1/bin/dig/dighost.c 2009-10-20 10:49:26.719056220 +0200 @@ -44,6 +44,11 @@ #include <idn/api.h> #endif @@ -13,7 +13,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c.libidn bind-9.7.0a3/bin/dig/dighost.c #include <dns/byaddr.h> #ifdef DIG_SIGCHASE #include <dns/dnssec.h> -@@ -147,6 +152,14 @@ static void idn_check_result(idn_result +@@ -153,6 +158,14 @@ static void idn_check_result(idn_result int idnoptions = 0; #endif @@ -28,7 +28,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c.libidn bind-9.7.0a3/bin/dig/dighost.c /*% * Exit Codes: * -@@ -1029,6 +1042,9 @@ setup_system(void) { +@@ -1184,6 +1197,9 @@ setup_system(void) { dig_searchlist_t *domain = NULL; lwres_result_t lwresult; unsigned int lwresflags; @@ -38,7 +38,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c.libidn bind-9.7.0a3/bin/dig/dighost.c debug("setup_system()"); -@@ -1087,8 +1103,15 @@ setup_system(void) { +@@ -1242,8 +1258,15 @@ setup_system(void) { #ifdef WITH_IDN initialize_idn(); @@ -55,7 +55,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c.libidn bind-9.7.0a3/bin/dig/dighost.c if (keyfile[0] != 0) setup_file_key(); else if (keysecret[0] != 0) -@@ -1789,12 +1812,18 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -1957,12 +1980,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.7.0a3/bin/dig/dighost.c.libidn bind-9.7.0a3/bin/dig/dighost.c REQUIRE(lookup != NULL); INSIST(!free_now); -@@ -1831,6 +1860,16 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -1999,6 +2028,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.7.0a3/bin/dig/dighost.c.libidn bind-9.7.0a3/bin/dig/dighost.c #endif /* -@@ -1850,6 +1889,15 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -2018,6 +2057,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.7.0a3/bin/dig/dighost.c.libidn bind-9.7.0a3/bin/dig/dighost.c #else if ((count_dots(lookup->textname) >= ndots) || !usesearch) { lookup->origin = NULL; /* Force abs lookup */ -@@ -1876,6 +1924,20 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -2044,6 +2092,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,7 +129,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c.libidn bind-9.7.0a3/bin/dig/dighost.c #else if (lookup->origin != NULL) { debug("trying origin %s", lookup->origin->origin); -@@ -1931,6 +1993,13 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -2099,6 +2161,13 @@ setup_lookup(dig_lookup_t *lookup) { result = dns_name_fromtext(lookup->name, &b, dns_rootname, 0, &lookup->namebuf); @@ -143,7 +143,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c.libidn bind-9.7.0a3/bin/dig/dighost.c #else len = strlen(lookup->textname); isc_buffer_init(&b, lookup->textname, len); -@@ -3449,7 +3518,7 @@ destroy_libs(void) { +@@ -3617,7 +3686,7 @@ destroy_libs(void) { void * ptr; dig_message_t *chase_msg; #endif @@ -152,7 +152,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c.libidn bind-9.7.0a3/bin/dig/dighost.c isc_result_t result; #endif -@@ -3488,6 +3557,10 @@ destroy_libs(void) { +@@ -3656,6 +3725,10 @@ destroy_libs(void) { result = dns_name_settotextfilter(NULL); check_result(result, "dns_name_settotextfilter"); #endif @@ -163,7 +163,7 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c.libidn bind-9.7.0a3/bin/dig/dighost.c dns_name_destroy(); if (commctx != NULL) { -@@ -3664,6 +3737,79 @@ idn_check_result(idn_result_t r, const c +@@ -3834,6 +3907,79 @@ idn_check_result(idn_result_t r, const c } } #endif /* WITH_IDN */ @@ -243,19 +243,19 @@ diff -up bind-9.7.0a3/bin/dig/dighost.c.libidn bind-9.7.0a3/bin/dig/dighost.c #ifdef DIG_SIGCHASE void -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 +diff -up bind-9.7.0b1/bin/dig/Makefile.in.libidn bind-9.7.0b1/bin/dig/Makefile.in +--- bind-9.7.0b1/bin/dig/Makefile.in.libidn 2009-09-22 10:47:55.000000000 +0200 ++++ bind-9.7.0b1/bin/dig/Makefile.in 2009-10-20 10:50:06.201543709 +0200 @@ -46,10 +46,10 @@ DEPLIBS = ${DNSDEPLIBS} ${BIND9DEPLIBS} ${LWRESDEPLIBS} - LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCLIBS} \ -- ${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -+ ${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -lidn + LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \ +- ${ISCLIBS} @IDNLIBS@ @LIBS@ ++ ${ISCLIBS} @IDNLIBS@ @LIBS@ -lidn - NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCNOSYMLIBS} \ -- ${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -+ ${ISCCFGLIBS} @IDNLIBS@ @LIBS@ -lidn + NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \ +- ${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@ ++ ${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@ -lidn SUBDIRS = |