bind 9.9.6
authorYaakov Selkowitz <yselkowi@redhat.com>
Wed, 15 Oct 2014 16:59:03 +0000 (11:59 -0500)
committerYaakov Selkowitz <yselkowi@redhat.com>
Wed, 15 Oct 2014 16:59:03 +0000 (11:59 -0500)
9.7.1-configure.patch [deleted file]
9.7.1-lwconfig-win32.patch [deleted file]
9.7.2-libidn.patch [deleted file]
9.9.3-python-install.patch
9.9.6-configure.patch [new file with mode: 0644]
9.9.6-lwconfig-win32.patch [new file with mode: 0644]
bind.cygport

diff --git a/9.7.1-configure.patch b/9.7.1-configure.patch
deleted file mode 100644 (file)
index 8a4ce43..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
---- origsrc/bind-9.7.1/configure.in    2010-05-26 18:46:00.000000000 -0500
-+++ src/bind-9.7.1/configure.in        2010-07-01 04:57:40.730499800 -0500
-@@ -76,7 +76,7 @@ AC_SUBST(ARFLAGS)
- # The POSIX ln(1) program.  Non-POSIX systems may substitute
- # "copy" or something.
--LN=ln
-+LN="ln -s"
- AC_SUBST(LN)
- case "$AR" in
-@@ -2824,7 +2824,7 @@ NOM_PATH_FILE(XSLT_DOCBOOK_MAKETOC_XHTML
- # No idea where this lives except on FreeBSD.
- #
--db2latex_xsl_trees="/usr/local/share"
-+db2latex_xsl_trees="/usr/local/share /usr/share"
- #
- # Look for stylesheets we need.
---- origsrc/bind-9.7.1/contrib/dlz/config.dlz.in       2008-06-16 22:54:30.000000000 -0500
-+++ src/bind-9.7.1/contrib/dlz/config.dlz.in   2010-07-01 03:41:37.580502500 -0500
-@@ -105,7 +105,7 @@ case "$use_dlz_postgres" in
-       *)
-               DLZ_ADD_DRIVER(POSTGRES, dlz_postgres_driver,
-                               [-I$use_dlz_postgres],
--                              [-L$use_dlz_postgres_lib -lpq])
-+                              [-L$use_dlz_postgres/lib -lpq])
-               AC_MSG_RESULT(
- [using PostgreSQL from $use_dlz_postgres_lib and $use_dlz_postgres])
-@@ -253,7 +253,7 @@ case "$use_dlz_bdb" in
-                       bdb_incdirs="/ /db42/ /db41/ /db4/ /db/"
-                       for d in $bdb_incdirs
-                       do
--                              if test -f "$dd/include${d}db.h"
-+                              if test -r "$dd/include${d}db.h"
-                               then
-                                       dlz_bdb_inc="-I$dd/include${d}"
-                                       break
-@@ -274,7 +274,7 @@ case "$use_dlz_bdb" in
-                       bdb_libnames="db42 db-4.2 db41 db-4.1 db"
-                       for d in $bdb_libnames
-                       do
--                              if test -f "$dd/lib/lib${d}.so"
-+                              if test -r "$dd/lib/lib${d}.dll.a"
-                               then
-                                       if test "$dd" != "/usr"
-                                       then
diff --git a/9.7.1-lwconfig-win32.patch b/9.7.1-lwconfig-win32.patch
deleted file mode 100644 (file)
index d05c009..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
---- origsrc/bind-9.7.1/lib/lwres/Makefile.in   2010-07-01 13:09:41.870012400 -0500
-+++ src/bind-9.7.1/lib/lwres/Makefile.in       2010-07-01 13:15:17.903232400 -0500
-@@ -46,7 +46,7 @@ SRCS =               context.c gai_strerror.c getaddr
-               lwinetaton.c lwinetpton.c lwinetntop.c print.c \
-               strtoul.c
--LIBS =                @LIBS@
-+LIBS =                @LIBS@ -liphlpapi
- SUBDIRS =     include man unix
- TARGETS =     timestamp
---- origsrc/bind-9.7.1/lib/lwres/lwconfig.c    2008-12-17 17:47:58.000000000 -0600
-+++ src/bind-9.7.1/lib/lwres/lwconfig.c        2010-07-01 02:40:22.549302800 -0500
-@@ -53,6 +53,11 @@
-  *    /etc/resolv.conf
-  */
-+#if defined(__CYGWIN__) && !defined(CYGWIN_LWCONFIG_C)
-+#define CYGWIN_LWCONFIG_C
-+#include "win32/lwconfig.c"
-+#else
-+
- #include <config.h>
- #include <assert.h>
-@@ -726,3 +731,5 @@ lwres_conf_get(lwres_context_t *ctx) {
-       return (&ctx->confdata);
- }
-+
-+#endif /* __CYGWIN__ */
---- origsrc/bind-9.7.1/lib/lwres/win32/lwconfig.c      2007-12-13 19:40:42.000000000 -0600
-+++ src/bind-9.7.1/lib/lwres/win32/lwconfig.c  2010-07-01 04:00:44.476101200 -0500
-@@ -39,6 +39,7 @@
- #include "../lwconfig.c"
- #undef lwres_conf_parse
-+#include <windows.h>
- #include <iphlpapi.h>
- #define TCPIP_SUBKEY  \
diff --git a/9.7.2-libidn.patch b/9.7.2-libidn.patch
deleted file mode 100644 (file)
index c8978d2..0000000
+++ /dev/null
@@ -1,298 +0,0 @@
-Fedora patches:
-bind-9.5-libidn.patch
-bind-9.5-libidn2.patch
-bind95-rh461409.patch
-bind-9.5-libidn3.patch
-
---- origsrc/bind-9.7.2-P3/bin/dig/Makefile.in  2010-12-24 00:18:37.679834200 -0600
-+++ src/bind-9.7.2-P3/bin/dig/Makefile.in      2010-12-24 00:16:51.000000000 -0600
-@@ -46,10 +46,10 @@ DEPLIBS =  ${DNSDEPLIBS} ${BIND9DEPLIBS}
-               ${LWRESDEPLIBS}
- LIBS =                ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
--              ${ISCLIBS} @IDNLIBS@ @LIBS@
-+              ${ISCLIBS} @IDNLIBS@ @LIBS@ -lidn
- NOSYMLIBS =   ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
--              ${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@
-+              ${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@ -lidn
- SUBDIRS =
-@@ -67,6 +67,8 @@ HTMLPAGES =  dig.html host.html nslookup.
- MANOBJS =     ${MANPAGES} ${HTMLPAGES}
-+EXT_CFLAGS = -DWITH_LIBIDN
-+
- @BIND9_MAKE_RULES@
- dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
---- origsrc/bind-9.7.2-P3/bin/dig/dighost.c    2010-12-24 00:18:37.679834200 -0600
-+++ src/bind-9.7.2-P3/bin/dig/dighost.c        2010-12-24 00:16:52.000000000 -0600
-@@ -44,6 +44,11 @@
- #include <idn/api.h>
- #endif
-+#ifdef WITH_LIBIDN
-+#include <stringprep.h>
-+#include <idna.h>
-+#endif
-+
- #include <dns/byaddr.h>
- #ifdef DIG_SIGCHASE
- #include <dns/dnssec.h>
-@@ -153,6 +158,14 @@ static void               idn_check_result(idn_result
- int  idnoptions       = 0;
- #endif
-+#ifdef WITH_LIBIDN
-+static isc_result_t   libidn_locale_to_utf8 (const char* from, char *to);
-+static isc_result_t   libidn_utf8_to_ascii (const char* from, char *to);
-+static isc_result_t   output_filter (isc_buffer_t *buffer,
-+                                     unsigned int used_org,
-+                                     isc_boolean_t absolute);
-+#endif
-+
- /*%
-  * Exit Codes:
-  *
-@@ -1193,6 +1206,9 @@ 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()");
-@@ -1251,8 +1267,15 @@ setup_system(void) {
- #ifdef WITH_IDN
-       initialize_idn();
-+      
-+#endif
-+#ifdef WITH_LIBIDN
-+      result = dns_name_settotextfilter(output_filter);
-+      check_result(result, "dns_name_settotextfilter");
-+#ifdef HAVE_SETLOCALE
-+      setlocale (LC_ALL, "");
-+#endif
- #endif
--
-       if (keyfile[0] != 0)
-               setup_file_key();
-       else if (keysecret[0] != 0)
-@@ -1958,12 +1981,14 @@ setup_lookup(dig_lookup_t *lookup) {
-       idn_result_t mr;
-       char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];
- #endif
-+#ifdef WITH_LIBIDN
-+      char utf8_str[MXNAME], utf8_name[MXNAME], ascii_name[MXNAME];
-+#endif
--#ifdef WITH_IDN
-+#if defined (WITH_IDN) || defined (WITH_LIBIDN)
-       result = dns_name_settotextfilter(output_filter);
-       check_result(result, "dns_name_settotextfilter");
- #endif
--
-       REQUIRE(lookup != NULL);
-       INSIST(!free_now);
-@@ -2000,6 +2025,14 @@ 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");
-+#elif defined (WITH_LIBIDN)
-+      result = libidn_locale_to_utf8 (lookup->textname, utf8_str);
-+      check_result (result, "convert textname to UTF-8");
-+      len = strlen (utf8_str);
-+      if (len < MXNAME)
-+              (void) strcpy (utf8_name, utf8_str);
-+      else
-+              fatal ("Too long name");
- #endif
-       /*
-@@ -2012,15 +2045,11 @@ setup_lookup(dig_lookup_t *lookup) {
-       if (lookup->new_search) {
- #ifdef WITH_IDN
-               if ((count_dots(utf8_textname) >= ndots) || !usesearch) {
--                      lookup->origin = NULL; /* Force abs lookup */
--                      lookup->done_as_is = ISC_TRUE;
--                      lookup->need_search = usesearch;
--              } else if (lookup->origin == NULL && usesearch) {
--                      lookup->origin = ISC_LIST_HEAD(search_list);
--                      lookup->need_search = ISC_FALSE;
--              }
-+#elif defined (WITH_LIBIDN)
-+              if ((count_dots(utf8_name) >= ndots) || !usesearch) {
- #else
-               if ((count_dots(lookup->textname) >= ndots) || !usesearch) {
-+#endif
-                       lookup->origin = NULL; /* Force abs lookup */
-                       lookup->done_as_is = ISC_TRUE;
-                       lookup->need_search = usesearch;
-@@ -2028,7 +2057,6 @@ setup_lookup(dig_lookup_t *lookup) {
-                       lookup->origin = ISC_LIST_HEAD(search_list);
-                       lookup->need_search = ISC_FALSE;
-               }
--#endif
-       }
- #ifdef WITH_IDN
-@@ -2045,6 +2073,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");
-+#elif defined (WITH_LIBIDN)
-+      if (lookup->origin != NULL) {
-+              result = libidn_locale_to_utf8 (lookup->origin->origin, utf8_str);
-+              check_result (result, "convert origin to UTF-8");
-+              if (len > 0 && utf8_name[len - 1] != '.') {
-+                      utf8_name[len++] = '.';
-+                      if (len + strlen (utf8_str) < MXNAME)
-+                              (void) strcpy (utf8_name + len, utf8_str);
-+                      else
-+                              fatal ("Too long name + origin");
-+              }
-+      }
-+
-+      result = libidn_utf8_to_ascii (utf8_name, ascii_name);
- #else
-       if (lookup->origin != NULL) {
-               debug("trying origin %s", lookup->origin->origin);
-@@ -2100,6 +2142,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, 0,
-+                                                 &lookup->namebuf);
- #else
-                       len = strlen(lookup->textname);
-                       isc_buffer_init(&b, lookup->textname, len);
-@@ -3625,7 +3674,7 @@ destroy_libs(void) {
-       void * ptr;
-       dig_message_t *chase_msg;
- #endif
--#ifdef WITH_IDN
-+#if defined (WITH_IDN) || defined (WITH_LIBIDN)
-       isc_result_t result;
- #endif
-@@ -3664,6 +3713,10 @@ destroy_libs(void) {
-       result = dns_name_settotextfilter(NULL);
-       check_result(result, "dns_name_settotextfilter");
- #endif
-+#ifdef WITH_LIBIDN
-+      result = dns_name_settotextfilter (NULL);
-+      check_result(result, "clearing dns_name_settotextfilter");
-+#endif
-       dns_name_destroy();
-       if (commctx != NULL) {
-@@ -3842,6 +3895,97 @@ idn_check_result(idn_result_t r, const c
-       }
- }
- #endif /* WITH_IDN */
-+#ifdef WITH_LIBIDN
-+static isc_result_t
-+libidn_locale_to_utf8 (const char *from, char *to) {
-+      char *utf8_str;
-+
-+      debug ("libidn_locale_to_utf8");
-+      utf8_str = stringprep_locale_to_utf8 (from);
-+      if (utf8_str != NULL) {
-+              (void) strcpy (to, utf8_str);
-+              free (utf8_str);
-+              return ISC_R_SUCCESS;
-+      }
-+
-+      debug ("libidn_locale_to_utf8: failure");
-+      return ISC_R_FAILURE;
-+}
-+static isc_result_t
-+libidn_utf8_to_ascii (const char *from, char *to) {
-+      char *ascii;
-+      int iresult;
-+
-+      debug ("libidn_utf8_to_ascii");
-+      iresult = idna_to_ascii_8z (from, &ascii, 0);
-+      if (iresult != IDNA_SUCCESS) {
-+              debug ("idna_to_ascii_8z: %s", idna_strerror (iresult));
-+              return ISC_R_FAILURE;
-+      }
-+
-+      (void) strcpy (to, ascii);
-+      free (ascii);
-+      return ISC_R_SUCCESS;
-+}
-+
-+static isc_result_t
-+output_filter (isc_buffer_t *buffer, unsigned int used_org,
-+             isc_boolean_t absolute) {
-+
-+      char tmp1[MXNAME], *tmp2;
-+        size_t fromlen, tolen;
-+        isc_boolean_t end_with_dot;
-+      int iresult;
-+
-+      debug ("output_filter");
-+
-+        fromlen = isc_buffer_usedlength (buffer) - used_org;
-+      if (fromlen >= MXNAME)
-+              return ISC_R_SUCCESS;
-+        memcpy (tmp1, (char *) isc_buffer_base (buffer) + used_org, fromlen);
-+        end_with_dot = (tmp1[fromlen - 1] == '.') ? ISC_TRUE : ISC_FALSE;
-+        if (absolute && !end_with_dot) {
-+                fromlen++;
-+              if (fromlen >= MXNAME)
-+                      return ISC_R_SUCCESS;
-+                tmp1[fromlen - 1] = '.';
-+        }
-+        tmp1[fromlen] = '\0';
-+
-+      iresult = idna_to_unicode_8z8z (tmp1, &tmp2, 0);
-+      if (iresult != IDNA_SUCCESS) {
-+              debug ("output_filter: %s", idna_strerror (iresult));
-+              return ISC_R_SUCCESS;
-+      }
-+
-+      (void) strcpy (tmp1, tmp2);
-+      free (tmp2);
-+
-+      tmp2 = stringprep_utf8_to_locale (tmp1);
-+      if (tmp2 == NULL) {
-+              debug ("output_filter: stringprep_utf8_to_locale failed");
-+              return ISC_R_SUCCESS;
-+      }
-+
-+      (void) strcpy (tmp1, tmp2);
-+      free (tmp2);
-+
-+        tolen = strlen (tmp1);
-+        if (absolute && !end_with_dot && tmp1[tolen - 1] == '.')
-+                tolen--;
-+
-+        if (isc_buffer_length (buffer) < used_org + tolen)
-+                return ISC_R_NOSPACE;
-+
-+      debug ("%s", tmp1);
-+
-+        isc_buffer_subtract (buffer, isc_buffer_usedlength (buffer) - used_org);
-+        memcpy (isc_buffer_used (buffer), tmp1, tolen);
-+        isc_buffer_add (buffer, tolen);
-+
-+        return ISC_R_SUCCESS;
-+}
-+#endif /* WITH_LIBIDN*/
- #ifdef DIG_SIGCHASE
- void
index b7f88635ee98c385cc42c55841553f57f580202d..eba5426ad60d6f3805679017e2af4f9269364bf2 100644 (file)
@@ -4,10 +4,10 @@
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
  
  install:: ${TARGETS} installdirs
--      ${INSTALL_PROGRAM} dnssec-checkds@EXEEXT@ ${DESTDIR}${sbindir}
--      ${INSTALL_PROGRAM} dnssec-coverage@EXEEXT@ ${DESTDIR}${sbindir}
-+      ${INSTALL_PROGRAM} dnssec-checkds ${DESTDIR}${sbindir}
-+      ${INSTALL_PROGRAM} dnssec-coverage ${DESTDIR}${sbindir}
+-      ${INSTALL_SCRIPT} dnssec-checkds@EXEEXT@ ${DESTDIR}${sbindir}
+-      ${INSTALL_SCRIPT} dnssec-coverage@EXEEXT@ ${DESTDIR}${sbindir}
++      ${INSTALL_SCRIPT} dnssec-checkds ${DESTDIR}${sbindir}
++      ${INSTALL_SCRIPT} dnssec-coverage ${DESTDIR}${sbindir}
        ${INSTALL_DATA} ${srcdir}/dnssec-checkds.8 ${DESTDIR}${mandir}/man8
        ${INSTALL_DATA} ${srcdir}/dnssec-coverage.8 ${DESTDIR}${mandir}/man8
  
diff --git a/9.9.6-configure.patch b/9.9.6-configure.patch
new file mode 100644 (file)
index 0000000..60c9c71
--- /dev/null
@@ -0,0 +1,60 @@
+--- origsrc/bind-9.9.6/configure.in    2014-09-16 14:27:20.000000000 -0500
++++ src/bind-9.9.6/configure.in        2014-10-12 13:30:24.055416500 -0500
+@@ -100,7 +100,7 @@ AC_SUBST(ARFLAGS)
+ # The POSIX ln(1) program.  Non-POSIX systems may substitute
+ # "copy" or something.
+-LN=ln
++LN="ln -s"
+ AC_SUBST(LN)
+ case "$AR" in
+@@ -2869,7 +2869,7 @@ esac
+ case $ac_cv_have_if_nametoindex in
+ yes)
+       ISC_PLATFORM_HAVEIFNAMETOINDEX="#define ISC_PLATFORM_HAVEIFNAMETOINDEX 1"
+-      AC_DEFINE(HAVE_IF_NAMETOINDEX, 1)
++      AC_DEFINE(HAVE_IF_NAMETOINDEX, 1, [Define if if_nametoindex is available])
+       ;;
+ *)
+       ISC_PLATFORM_HAVEIFNAMETOINDEX="#undef ISC_PLATFORM_HAVEIFNAMETOINDEX"
+@@ -3294,7 +3294,7 @@ NOM_PATH_FILE(XSLT_DOCBOOK_MAKETOC_XHTML
+ # No idea where this lives except on FreeBSD.
+ #
+-db2latex_xsl_trees="/usr/local/share"
++db2latex_xsl_trees="/usr/local/share /usr/share"
+ #
+ # Look for stylesheets we need.
+--- origsrc/bind-9.9.6/contrib/dlz/config.dlz.in       2014-09-16 14:27:20.000000000 -0500
++++ src/bind-9.9.6/contrib/dlz/config.dlz.in   2014-10-12 13:45:58.989138000 -0500
+@@ -110,7 +110,7 @@ case "$use_dlz_postgres" in
+       *)
+               DLZ_ADD_DRIVER(POSTGRES, dlz_postgres_driver,
+                               [-I$use_dlz_postgres],
+-                              [-L$use_dlz_postgres_lib -lpq])
++                              [-L$use_dlz_postgres/lib -lpq])
+               AC_MSG_RESULT(
+ [using PostgreSQL from $use_dlz_postgres_lib and $use_dlz_postgres])
+@@ -288,7 +288,7 @@ case "$use_dlz_bdb" in
+                                       then
+                                               break
+                                       fi
+-                              elif test -f "$dd/lib/lib${d}.so"
++                              elif test -f "$dd/lib/lib${d}.dll.a"
+                               then
+                                       dlz_bdb_libs="-L${dd}/lib -l${d}"
+                                       break
+@@ -447,8 +447,8 @@ case "$use_dlz_odbc" in
+               ;;
+       *)
+               DLZ_ADD_DRIVER(ODBC, dlz_odbc_driver,
+-                              [$dlz_odbc_include],
+-                              [$dlz_odbc_libs])
++                              [-I$use_dlz_odbc/include],
++                              [-L$use_dlz_odbc/lib -lodbc])
+               AC_MSG_RESULT([using ODBC from $use_dlz_odbc])
+               ;;
diff --git a/9.9.6-lwconfig-win32.patch b/9.9.6-lwconfig-win32.patch
new file mode 100644 (file)
index 0000000..9066b0e
--- /dev/null
@@ -0,0 +1,61 @@
+--- origsrc/bind-9.9.6/lib/lwres/lwconfig.c    2014-10-12 13:53:08.206641700 -0500
++++ src/bind-9.9.6/lib/lwres/lwconfig.c        2014-10-08 15:57:40.000000000 -0500
+@@ -51,6 +51,11 @@
+  *    /etc/resolv.conf
+  */
++#if defined(__CYGWIN__) && !defined(CYGWIN_LWCONFIG_C)
++#define CYGWIN_LWCONFIG_C
++#include "win32/lwconfig.c"
++#else
++
+ #include <config.h>
+ #include <assert.h>
+@@ -774,3 +779,5 @@ lwres_conf_get(lwres_context_t *ctx) {
+       return (&ctx->confdata);
+ }
++
++#endif /* __CYGWIN__ && !CYGWIN_LWCONFIG_C */
+--- origsrc/bind-9.9.6/lib/lwres/win32/lwconfig.c      2014-10-12 13:53:08.214642700 -0500
++++ src/bind-9.9.6/lib/lwres/win32/lwconfig.c  2014-10-12 13:35:06.706308600 -0500
+@@ -39,7 +39,12 @@
+ #include "../lwconfig.c"
+ #undef lwres_conf_parse
++#ifdef __CYGWIN__
++#include <windows.h>
++#include <iptypes.h>
++#else
+ #include <iphlpapi.h>
++#endif
+ #define TCPIP_SUBKEY  \
+       "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters"
+@@ -95,6 +100,10 @@ lwres_conf_parse(lwres_context_t *ctx, c
+       ULONG    BufLen = sizeof(FIXED_INFO);
+       DWORD    dwRetVal;
+       IP_ADDR_STRING *pIPAddr;
++#ifdef __CYGWIN__
++      static HMODULE hIphlpapi = NULL;
++      static DWORD (WINAPI *GetNetworkParams)(PFIXED_INFO, PULONG) = NULL;
++#endif
+       REQUIRE(ctx != NULL);
+       confdata = &ctx->confdata;
+@@ -109,6 +118,14 @@ lwres_conf_parse(lwres_context_t *ctx, c
+       /*
+        * We didn't get any nameservers so we need to do this ourselves
+        */
++#ifdef __CYGWIN__
++      if (!GetNetworkParams) {
++              hIphlpapi = LoadLibraryEx ("iphlpapi.dll", NULL,
++                                         LOAD_LIBRARY_SEARCH_SYSTEM32);
++              GetNetworkParams = (typeof (GetNetworkParams)) GetProcAddress (hIphlpapi, "GetNetworkParams");
++              if (!GetNetworkParams) return (LWRES_R_FAILURE);
++      }
++#endif
+       FixedInfo = (FIXED_INFO *) GlobalAlloc(GPTR, BufLen);
+       dwRetVal = GetNetworkParams(FixedInfo, &BufLen);
+       if (dwRetVal == ERROR_BUFFER_OVERFLOW) {
index f0c5afd570be767f21f35be8b73e9f1908a3b2a0..7b11696ed1bcc1cdcfe5ae0a7587d043a2a9eddc 100644 (file)
@@ -1,6 +1,6 @@
 NAME="bind"
-VERSION=9.9.5
-RELEASE=3
+VERSION=9.9.6
+RELEASE=1
 CATEGORY="Net"
 SUMMARY="DNS server and utilities suite"
 DESCRIPTION="BIND is an implementation of the Domain Name System (DNS)
@@ -15,9 +15,9 @@ SRC_URI="http://ftp.isc.org/isc/bind9/${VERSION}/bind-${VERSION}.tar.gz
          named-config"
 
 PATCH_URI="
-       9.7.1-configure.patch
-       9.7.1-lwconfig-win32.patch
-       9.7.2-libidn.patch
+       http://pkgs.fedoraproject.org/cgit/bind.git/plain/bind-99-libidn.patch?h=f21
+       9.9.6-configure.patch
+       9.9.6-lwconfig-win32.patch
        9.5.0-parallel-build.patch
        9.9.3-python-install.patch
 "
@@ -29,10 +29,11 @@ bind_SUMMARY="DNS server"
 bind_REQUIRES="bind-utils"
 bind_CONTENTS="etc/ usr/sbin/ usr/share/man/man1/arpaname* usr/share/man/man[58]/"
 bind_utils_CONTENTS="DNS utilities"
-bind_utils_CONTENTS="--exclude=arpaname* --exclude=isc-config.sh* --exclude=bind9-config
+bind_utils_CONTENTS="--exclude=arpaname* --exclude=isc-config.sh* --exclude=bind9-config*
                      usr/bin/ usr/share/doc/ usr/share/man/man1/"
 libbind9_devel_CONTENTS="usr/bin/bind9-config usr/bin/isc-config.sh usr/include/ usr/lib/
-                         usr/share/man/man1/isc-config.sh* usr/share/man/man3/"
+                         usr/share/man/man1/bind9-config* usr/share/man/man1/isc-config.sh*
+                         usr/share/man/man3/"
 PKG_IGNORE=${libbind9_devel_CONTENTS}
 
 DISTCLEANFILES="aclocal.m4"
@@ -55,8 +56,7 @@ CYGCONF_ARGS="
 "
 # see config.h.win32
 CPPFLAGS+=" -DFD_SETSIZE=16384"
-LIBS=-liphlpapi
-DOCS="RELEASE-NOTES-BIND-${PV%-*}.txt"
+DOCS="RELEASE-NOTES-BIND-${VERSION%-*}.txt"
 
 src_install() {
        cd ${B}
This page took 0.033762 seconds and 5 git commands to generate.