[pkgsrc/trunk]: pkgsrc/net/dnsmasq Add missed file in previous commit.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/40ec51463178
branches:  trunk
changeset: 550481:40ec51463178
user:      ahoka <ahoka%pkgsrc.org@localhost>
date:      Sat Nov 22 18:59:54 2008 +0000

description:
Add missed file in previous commit.

diffstat:

 net/dnsmasq/Makefile         |   4 ++--
 net/dnsmasq/distinfo         |   4 ++--
 net/dnsmasq/patches/patch-ad |  36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 4 deletions(-)

diffs (69 lines):

diff -r 179ed79ee0d1 -r 40ec51463178 net/dnsmasq/Makefile
--- a/net/dnsmasq/Makefile      Sat Nov 22 17:59:49 2008 +0000
+++ b/net/dnsmasq/Makefile      Sat Nov 22 18:59:54 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2008/11/17 23:12:12 ahoka Exp $
+# $NetBSD: Makefile,v 1.8 2008/11/22 18:59:54 ahoka Exp $
 #
 
 DISTNAME=              dnsmasq-2.45
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            net
 MASTER_SITES=          http://www.thekelleys.org.uk/dnsmasq/
 
diff -r 179ed79ee0d1 -r 40ec51463178 net/dnsmasq/distinfo
--- a/net/dnsmasq/distinfo      Sat Nov 22 17:59:49 2008 +0000
+++ b/net/dnsmasq/distinfo      Sat Nov 22 18:59:54 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2008/11/17 23:12:12 ahoka Exp $
+$NetBSD: distinfo,v 1.7 2008/11/22 18:59:54 ahoka Exp $
 
 SHA1 (dnsmasq-2.45.tar.gz) = 12f8cffd657f674fbf4bf4f670a0dcb65ea4a5ae
 RMD160 (dnsmasq-2.45.tar.gz) = b8ebf9dfeff26c18664a917cd32cb9b6a53852cb
@@ -6,4 +6,4 @@
 SHA1 (patch-aa) = f6d1d9d80a283d4270950031ec67c0b4e37920d7
 SHA1 (patch-ab) = 7bb6cb585f813a5fe9eddfdedda71a14740d8c4d
 SHA1 (patch-ac) = a07c71502399a7835cbb8b8e5136553305113e6e
-SHA1 (patch-ad) = 6ffd1fd39f5f4c0d1ab8650e8fc8f4b7f8c05617
+SHA1 (patch-ad) = 297486a45555df6dd1ca995a9e3866dd3368fbb6
diff -r 179ed79ee0d1 -r 40ec51463178 net/dnsmasq/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/dnsmasq/patches/patch-ad      Sat Nov 22 18:59:54 2008 +0000
@@ -0,0 +1,36 @@
+--- src/bpf.c  2008-11-18 14:01:26.000000000 +0000
++++ src/bpf.c  2008-11-18 14:09:21.000000000 +0000
+@@ -30,7 +30,7 @@
+ 
+ int iface_enumerate(void *parm, int (*ipv4_callback)(), int (*ipv6_callback)())
+ {
+-  char *ptr;
++  char *ptr, *end;
+   struct ifreq *ifr;
+   struct ifconf ifc;
+   int fd, errsav, ret = 0;
+@@ -62,16 +62,20 @@
+         lastlen = ifc.ifc_len;
+       }
+     }
+-  
+-  for (ptr = ifc.ifc_buf; ptr < ifc.ifc_buf + ifc.ifc_len; ptr += len )
++ 
++  end = ifc.ifc_buf + ifc.ifc_len;
++  for (ptr = ifc.ifc_buf; ptr < end; ptr += len)
+     {
+       /* subsequent entries may not be aligned, so copy into
+        an aligned buffer to avoid nasty complaints about 
+        unaligned accesses. */
+ #ifdef HAVE_SOCKADDR_SA_LEN
+-      len = ((struct ifreq *)ptr)->ifr_addr.sa_len + offsetof(struct ifreq, ifr_ifru);
++      ifr = (struct ifreq *)ptr;
++      if (ifr->ifr_addr.sa_len > sizeof(ifr->ifr_ifru))
++        len = ifr->ifr_addr.sa_len + offsetof(struct ifreq, ifr_ifru);
++      else
+ #else
+-      len = sizeof(struct ifreq);
++        len = sizeof(struct ifreq);
+ #endif
+       if (!expand_buf(&ifreq, len))
+       goto err;