summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2015-11-20 09:32:53 +0000
committerjperkin <jperkin@pkgsrc.org>2015-11-20 09:32:53 +0000
commitd8a25ecd8685284219f783245de92c9a7357b10a (patch)
tree6183ceb3fe983ef248c73877f8ae34d9abecf768
parent8bcef8c7ca4dfb1207e0e1ef2501f112b1c2d855 (diff)
downloadpkgsrc-d8a25ecd8685284219f783245de92c9a7357b10a.tar.gz
Fix the HAVE_BROKEN_RECVDSTADDR patch which was masking a call to memset().
Noted by Edgar Fuß in private mail. Bump PKGREVISION.
-rw-r--r--net/mDNSResponder/Makefile4
-rw-r--r--net/mDNSResponder/distinfo4
-rw-r--r--net/mDNSResponder/patches/patch-ac7
3 files changed, 7 insertions, 8 deletions
diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index b37aa5fdd19..15d5e3e1f31 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2015/08/29 17:41:07 jperkin Exp $
+# $NetBSD: Makefile,v 1.40 2015/11/20 09:32:53 jperkin Exp $
DISTNAME= mDNSResponder-258.14
-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 816b1e8c6c2..d3def064f1a 100644
--- a/net/mDNSResponder/distinfo
+++ b/net/mDNSResponder/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2015/11/04 00:35:11 agc Exp $
+$NetBSD: distinfo,v 1.35 2015/11/20 09:32:53 jperkin Exp $
SHA1 (mDNSResponder-258.14.tar.gz) = 2a34794ff9a5184ce1e57ccea4001b5af6635f7b
RMD160 (mDNSResponder-258.14.tar.gz) = fbd9dcfa84dbeb9de379066958a0b509af074dbc
@@ -7,7 +7,7 @@ Size (mDNSResponder-258.14.tar.gz) = 1833244 bytes
SHA1 (patch-Clients_dns-sd.c) = 5adac63ba76497056c1abfd426460560b8a3f012
SHA1 (patch-aa) = d6659292433dce614fe60cd4190445393d364801
SHA1 (patch-ab) = 473db16e4d454899c364fb2d9fa8d344d47ca008
-SHA1 (patch-ac) = 1dd233e060f980eda9b11fbbf62f619e533ee96f
+SHA1 (patch-ac) = 9907f0e55d421fccd3d491d4f0d872f328198c19
SHA1 (patch-ad) = b4ae68358c1c7ad1d7477e88aa5f7822d0d01978
SHA1 (patch-ae) = 49091d627fd3a800ed027566c728022b901d126b
SHA1 (patch-af) = c0787da4901a9dd4ff02063e11bcd9daf2a5c6b4
diff --git a/net/mDNSResponder/patches/patch-ac b/net/mDNSResponder/patches/patch-ac
index 023ae0e66d8..78dd4058f38 100644
--- a/net/mDNSResponder/patches/patch-ac
+++ b/net/mDNSResponder/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.10 2014/05/12 15:06:56 ryoon Exp $
+$NetBSD: patch-ac,v 1.11 2015/11/20 09:32:53 jperkin Exp $
* Fix build on FreeBSD and DragonFly, as shown in recent bulk builds and
PR 34022.
@@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.10 2014/05/12 15:06:56 ryoon Exp $
plen_to_mask(plen, ipv6addr);
ifi->ifi_netmask = calloc(1, sizeof(struct sockaddr_in6));
if (ifi->ifi_addr == NULL) {
-@@ -488,7 +491,15 @@ recvfrom_flags(int fd, void *ptr, size_t
+@@ -488,6 +491,14 @@ recvfrom_flags(int fd, void *ptr, size_t
set the value to 0, but I'm concerned that 0
might be a valid interface value.
*/
@@ -48,9 +48,8 @@ $NetBSD: patch-ac,v 1.10 2014/05/12 15:06:56 ryoon Exp $
+ */
+ struct in_pktinfo *tmp;
+ struct sockaddr_in *sin = (struct sockaddr_in*)&pktp->ipi_addr;
- memset(pktp, 0, sizeof(struct my_in_pktinfo));
+ sin->sin_family = AF_INET;
+#endif
+ memset(pktp, 0, sizeof(struct my_in_pktinfo));
pktp->ipi_ifindex = -1;
}
- /* end recvfrom_flags1 */