[pkgsrc/trunk]: pkgsrc/net/bind9 Fix build on OpenSolaris

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2dd17d746187
branches:  trunk
changeset: 554838:2dd17d746187
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sat Feb 21 14:42:02 2009 +0000

description:
Fix build on OpenSolaris
http://src.opensolaris.org/source/xref/sfw/usr/src/cmd/bind/getaddrinfo.c.patch

diffstat:

 net/bind9/distinfo         |   4 ++--
 net/bind9/patches/patch-ac |  30 ++++++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 6 deletions(-)

diffs (66 lines):

diff -r 4b40d43324ca -r 2dd17d746187 net/bind9/distinfo
--- a/net/bind9/distinfo        Sat Feb 21 14:39:03 2009 +0000
+++ b/net/bind9/distinfo        Sat Feb 21 14:42:02 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.40 2009/01/08 09:02:19 adrianp Exp $
+$NetBSD: distinfo,v 1.41 2009/02/21 14:42:02 adrianp Exp $
 
 SHA1 (bind-9.4.3-P1.tar.gz) = 3aff02f8c7c0c79dc589b9ce9af28bae386d44cf
 RMD160 (bind-9.4.3-P1.tar.gz) = f7bc80a50c03f241d37c3bc4cfe52d936675f8c3
 Size (bind-9.4.3-P1.tar.gz) = 6544583 bytes
 SHA1 (patch-ab) = dd12c457791a75a8b43d9dfd0c0b236dcdbe31a5
-SHA1 (patch-ac) = 4df1ece91d59b2b36fc7a4316604f1c112cf70ba
+SHA1 (patch-ac) = d862218c833dbb129b5104ad26872cd4bf3e7c5f
 SHA1 (patch-ad) = 0851864c896c2f0eb63cb58da39e12cfa89f1b7c
 SHA1 (patch-af) = b21bb5195cdb4deec00e5abd39f5bf2137549c3f
 SHA1 (patch-ag) = 9d61e0f527a76977bf8457355997d201fa37dd4e
diff -r 4b40d43324ca -r 2dd17d746187 net/bind9/patches/patch-ac
--- a/net/bind9/patches/patch-ac        Sat Feb 21 14:39:03 2009 +0000
+++ b/net/bind9/patches/patch-ac        Sat Feb 21 14:42:02 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2006/08/17 14:14:18 taca Exp $
+$NetBSD: patch-ac,v 1.7 2009/02/21 14:42:02 adrianp Exp $
 
---- lib/lwres/getaddrinfo.c.orig       2005-06-10 08:54:33.000000000 +0900
+--- lib/lwres/getaddrinfo.c.orig       2007-09-13 16:46:26.000000000 -0700
 +++ lib/lwres/getaddrinfo.c
-@@ -30,6 +30,10 @@
+@@ -142,6 +142,10 @@
  #include <lwres/netdb.h>
  #include <lwres/stdlib.h>
  
@@ -13,7 +13,7 @@
  #define SA(addr)      ((struct sockaddr *)(addr))
  #define SIN(addr)     ((struct sockaddr_in *)(addr))
  #define SIN6(addr)    ((struct sockaddr_in6 *)(addr))
-@@ -252,14 +256,22 @@ lwres_getaddrinfo(const char *hostname, 
+@@ -366,14 +370,22 @@ lwres_getaddrinfo(const char *hostname, 
                        p = strchr(ntmp, '%');
                        ep = NULL;
  
@@ -37,3 +37,25 @@
                        if (p != NULL && ep != NULL && ep[0] == '\0')
                                *p = '\0';
                        else {
+@@ -709,17 +721,17 @@ lwres_freeaddrinfo(struct addrinfo *ai) 
+ static int
+ get_local(const char *name, int socktype, struct addrinfo **res) {
+       struct addrinfo *ai;
+-      struct sockaddr_un *sun;
++      struct sockaddr_un *un;
+ 
+       if (socktype == 0)
+               return (EAI_SOCKTYPE);
+ 
+-      ai = ai_alloc(AF_LOCAL, sizeof(*sun));
++      ai = ai_alloc(AF_LOCAL, sizeof(*un));
+       if (ai == NULL)
+               return (EAI_MEMORY);
+ 
+-      sun = SUN(ai->ai_addr);
+-      strncpy(sun->sun_path, name, sizeof(sun->sun_path));
++      un = SUN(ai->ai_addr);
++      strncpy(un->sun_path, name, sizeof(un->sun_path));
+ 
+       ai->ai_socktype = socktype;
+       /*