diff options
| author | adrianp <adrianp> | 2009-02-21 14:51:43 +0000 |
|---|---|---|
| committer | adrianp <adrianp> | 2009-02-21 14:51:43 +0000 |
| commit | 7235b5240399bd82a5794ed6c7f53d136fe3ac39 (patch) | |
| tree | 72d11bb928f1599234b24a3062ea971f2fed9cbd /net | |
| parent | 7157c8f263c9e0d943e1d685f480c8781fefb721 (diff) | |
| download | pkgsrc-7235b5240399bd82a5794ed6c7f53d136fe3ac39.tar.gz | |
Fix build on OpenSolaris
http://src.opensolaris.org/source/xref/sfw/usr/src/cmd/bind/getaddrinfo.c.patch
Diffstat (limited to 'net')
| -rw-r--r-- | net/bind96/distinfo | 4 | ||||
| -rw-r--r-- | net/bind96/patches/patch-ac | 30 |
2 files changed, 28 insertions, 6 deletions
diff --git a/net/bind96/distinfo b/net/bind96/distinfo index 9d215dc368d..3f71b8f7db6 100644 --- a/net/bind96/distinfo +++ b/net/bind96/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.2 2009/01/08 09:03:15 adrianp Exp $ +$NetBSD: distinfo,v 1.3 2009/02/21 14:51:43 adrianp Exp $ SHA1 (bind-9.6.0-P1.tar.gz) = c2b703d05fc768f63f028b0812c46d6eb81c145d RMD160 (bind-9.6.0-P1.tar.gz) = 4507987e293b79e57ad6b87dd84012030d5b1d6e Size (bind-9.6.0-P1.tar.gz) = 6526739 bytes SHA1 (patch-ab) = dd12c457791a75a8b43d9dfd0c0b236dcdbe31a5 -SHA1 (patch-ac) = 4df1ece91d59b2b36fc7a4316604f1c112cf70ba +SHA1 (patch-ac) = 71a379fcb128013bfbacd87002c27dd90c1844b1 SHA1 (patch-ad) = b229db208df08efe25aa8840d62904f39b88aecf SHA1 (patch-ag) = 9d61e0f527a76977bf8457355997d201fa37dd4e SHA1 (patch-aj) = c3bbf84a8a735298552f918ac38331e06a1b68a1 diff --git a/net/bind96/patches/patch-ac b/net/bind96/patches/patch-ac index 951698ec361..7fe1517a59a 100644 --- a/net/bind96/patches/patch-ac +++ b/net/bind96/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.1.1 2009/01/04 00:21:36 adrianp Exp $ +$NetBSD: patch-ac,v 1.2 2009/02/21 14:51:43 adrianp Exp $ ---- lib/lwres/getaddrinfo.c.orig 2005-06-10 08:54:33.000000000 +0900 +--- lib/lwres/getaddrinfo.c.orig 2007-09-12 21:45:18.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 @@ $NetBSD: patch-ac,v 1.1.1.1 2009/01/04 00:21:36 adrianp Exp $ #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 @@ $NetBSD: patch-ac,v 1.1.1.1 2009/01/04 00:21:36 adrianp Exp $ 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; + /* |