diff options
| author | tez <tez> | 2010-07-01 15:05:06 +0000 |
|---|---|---|
| committer | tez <tez> | 2010-07-01 15:05:06 +0000 |
| commit | a184dd3745eebcd336d3f3dc1165f848b13887fd (patch) | |
| tree | 8dacab3ddb7c1914d59e58125aa56f2c7d107656 /net/mDNSResponder | |
| parent | e337155b83bef8a79972c1d0e729aca31300e316 (diff) | |
| download | pkgsrc-a184dd3745eebcd336d3f3dc1165f848b13887fd.tar.gz | |
fix off-by-one error parsing resolv.conf
fix fd leak
Diffstat (limited to 'net/mDNSResponder')
| -rw-r--r-- | net/mDNSResponder/Makefile | 4 | ||||
| -rw-r--r-- | net/mDNSResponder/distinfo | 4 | ||||
| -rw-r--r-- | net/mDNSResponder/patches/patch-ab | 32 |
3 files changed, 29 insertions, 11 deletions
diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile index 58bb4229af8..aeb050fa381 100644 --- a/net/mDNSResponder/Makefile +++ b/net/mDNSResponder/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2009/10/18 20:12:57 zafer Exp $ +# $NetBSD: Makefile,v 1.28 2010/07/01 15:05:06 tez Exp $ DISTNAME= mDNSResponder-108 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.opensource.apple.com/tarballs/mDNSResponder/ diff --git a/net/mDNSResponder/distinfo b/net/mDNSResponder/distinfo index fee8c80dd4c..e9c35a0da73 100644 --- a/net/mDNSResponder/distinfo +++ b/net/mDNSResponder/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.17 2007/06/17 19:41:12 minskim Exp $ +$NetBSD: distinfo,v 1.18 2010/07/01 15:05:06 tez Exp $ SHA1 (mDNSResponder-108.tar.gz) = d51509077be75ec8ba49c805fef701c3370428fc RMD160 (mDNSResponder-108.tar.gz) = 3a1961f3267bcf009b52c8d8ce234ee6045aeed2 Size (mDNSResponder-108.tar.gz) = 1362840 bytes SHA1 (patch-aa) = 3e8dec4b8d28ed633818edcdea57881dcbb466dc -SHA1 (patch-ab) = 4903e995df9e895bb1cfc49f7fa0c17c8a5379db +SHA1 (patch-ab) = ca0921175169a007879dc3cea62ee191a969fbdc SHA1 (patch-ac) = 0613bd07f6626e5c06a3584bef8f2372dfef319a SHA1 (patch-udns) = 62710cea2b54af5f5dfca0ba04a36308e4456990 diff --git a/net/mDNSResponder/patches/patch-ab b/net/mDNSResponder/patches/patch-ab index 1b87c862023..8ba205b313d 100644 --- a/net/mDNSResponder/patches/patch-ab +++ b/net/mDNSResponder/patches/patch-ab @@ -1,8 +1,26 @@ -$NetBSD: patch-ab,v 1.5 2006/07/11 14:39:29 drochner Exp $ +$NetBSD: patch-ab,v 1.6 2010/07/01 15:05:06 tez Exp $ +add patch from http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147007 ---- mDNSPosix/mDNSPosix.c.orig 2006-02-20 22:40:36.000000000 +0100 -+++ mDNSPosix/mDNSPosix.c -@@ -852,7 +852,13 @@ mDNSlocal int SetupSocket(struct sockadd +--- mDNSPosix/mDNSPosix.c.orig 2006-02-20 15:40:36.000000000 -0600 ++++ mDNSPosix/mDNSPosix.c 2010-06-30 17:57:01.575378400 -0500 +@@ -633,7 +633,7 @@ + { + char line[256]; + char nameserver[16]; +- char keyword[10]; ++ char keyword[11]; + int numOfServers = 0; + FILE *fp = fopen(filePath, "r"); + if (fp == NULL) return -1; +@@ -652,6 +652,7 @@ + numOfServers++; + } + } ++ fclose(fp); + return (numOfServers > 0) ? 0 : -1; + } + +@@ -852,7 +853,13 @@ { struct ipv6_mreq imr6; struct sockaddr_in6 bindAddr6; @@ -17,7 +35,7 @@ $NetBSD: patch-ab,v 1.5 2006/07/11 14:39:29 drochner Exp $ if (err == 0) { err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_PKTINFO, &kOn, sizeof(kOn)); -@@ -861,7 +867,13 @@ mDNSlocal int SetupSocket(struct sockadd +@@ -861,7 +868,13 @@ #else #warning This platform has no way to get the destination interface information for IPv6 -- will only work for single-homed hosts #endif @@ -32,7 +50,7 @@ $NetBSD: patch-ab,v 1.5 2006/07/11 14:39:29 drochner Exp $ if (err == 0) { err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_HOPLIMIT, &kOn, sizeof(kOn)); -@@ -1339,6 +1351,36 @@ mDNSlocal mDNSBool mDNSPlatformInit_CanR +@@ -1339,6 +1352,36 @@ return(err == 0); } @@ -69,7 +87,7 @@ $NetBSD: patch-ab,v 1.5 2006/07/11 14:39:29 drochner Exp $ // mDNS core calls this routine to initialise the platform-specific data. mDNSexport mStatus mDNSPlatformInit(mDNS *const m) { -@@ -1360,6 +1402,10 @@ mDNSexport mStatus mDNSPlatformInit(mDNS +@@ -1360,6 +1403,10 @@ GetUserSpecifiedRFC1034ComputerName(&m->hostlabel); if (m->hostlabel.c[0] == 0) MakeDomainLabelFromLiteralString(&m->hostlabel, "Computer"); |