Update to dnsmasq-2.47

Fixes from 2.46 include:
 * NetBSD-5 support
 * Better duplicate IPv6 address detection
 * DBus introspection
 * work with blank lines in /etc/ethers

5 files changed, 6 insertions, 86 deletions

diff --git a/net/dnsmasq/Makefile b/net/dnsmasq/Makefile
index 8b408d4e8da..ac259cd1ab5 100644
--- a/net/dnsmasq/Makefile
+++ b/net/dnsmasq/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2008/12/19 07:53:43 roy Exp $
+# $NetBSD: Makefile,v 1.10 2009/02/19 11:17:19 roy Exp $
 #
 
-DISTNAME=		dnsmasq-2.46
+DISTNAME=		dnsmasq-2.47
 CATEGORIES=		net
 MASTER_SITES=		http://www.thekelleys.org.uk/dnsmasq/
 
diff --git a/net/dnsmasq/distinfo b/net/dnsmasq/distinfo
index 4f03f39d514..c4dbe78f6cb 100644
--- a/net/dnsmasq/distinfo
+++ b/net/dnsmasq/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.8 2008/12/19 07:53:43 roy Exp $
+$NetBSD: distinfo,v 1.9 2009/02/19 11:17:19 roy Exp $
 
-SHA1 (dnsmasq-2.46.tar.gz) = 472ef663b2b433d599f62cb6ca03eb6f7ce25bc2
-RMD160 (dnsmasq-2.46.tar.gz) = 684864b3bb71ea1d054efef0d9489cac12df9e82
-Size (dnsmasq-2.46.tar.gz) = 386318 bytes
-SHA1 (patch-ab) = 1762cb1b0acb93ff1ffb65451d6eb430cb5d87c5
-SHA1 (patch-ae) = 155a4665ff70f6987241971077eafcd6f5da1e08
-SHA1 (patch-af) = 4c40ca2509f90afcb52d097f5dde4691d6124c92
+SHA1 (dnsmasq-2.47.tar.gz) = a01ae622410636c5cdad9b789e69fb4bbc3a5d6a
+RMD160 (dnsmasq-2.47.tar.gz) = 79c7c4f2fac483f237401294747dfda93921ab1d
+Size (dnsmasq-2.47.tar.gz) = 396967 bytes
diff --git a/net/dnsmasq/patches/patch-ab b/net/dnsmasq/patches/patch-ab
deleted file mode 100644
index 94e20dbcb40..00000000000
--- a/net/dnsmasq/patches/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2008/12/19 07:53:43 roy Exp $
-
---- src/config.h	2008-11-10 21:47:46.000000000 +0000
-+++ src/config.h	2008-11-18 20:51:27.000000000 +0000
-@@ -38,18 +38,25 @@
- #  define RESOLVFILE "/etc/resolv.conf"
- #endif
- #define RUNFILE "/var/run/dnsmasq.pid"
--#if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__)
--#   define LEASEFILE "/var/db/dnsmasq.leases"
--#elif defined(__sun__) || defined (__sun)
--#   define LEASEFILE "/var/cache/dnsmasq.leases"
--#else
--#   define LEASEFILE "/var/lib/misc/dnsmasq.leases"
--#endif
--#if defined(__FreeBSD__)
--#   define CONFFILE "/usr/local/etc/dnsmasq.conf"
--#else
--#   define CONFFILE "/etc/dnsmasq.conf"
-+
-+#ifndef LEASEFILE
-+#   if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
-+#      define LEASEFILE "/var/db/dnsmasq.leases"
-+#   elif defined (__sun)
-+#      define LEASEFILE "/var/cache/dnsmasq.leases"
-+#   else
-+#      define LEASEFILE "/var/lib/misc/dnsmasq.leases"
-+#   endif
-+#endif
-+
-+#ifndef CONFFILE
-+#   if defined(__FreeBSD__)
-+#      define CONFFILE "/usr/local/etc/dnsmasq.conf"
-+#   else
-+#      define CONFFILE "/etc/dnsmasq.conf"
-+#   endif
- #endif
-+
- #define DEFLEASE 3600 /* default lease time, 1 hour */
- #define CHUSER "nobody"
- #define CHGRP "dip"
diff --git a/net/dnsmasq/patches/patch-ae b/net/dnsmasq/patches/patch-ae
deleted file mode 100644
index 523e16cf587..00000000000
--- a/net/dnsmasq/patches/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2008/12/19 07:53:43 roy Exp $
-
---- src/bpf.c	2008-11-03 16:26:06.000000000 +0000
-+++ src/bpf.c	2008-11-18 20:51:27.000000000 +0000
-@@ -68,11 +68,15 @@
-       /* 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);
--#else
-+
-       len = sizeof(struct ifreq);
-+      
-+#ifdef HAVE_SOCKADDR_SA_LEN
-+      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);
- #endif
-+      
-       if (!expand_buf(&ifreq, len))
- 	goto err;
- 
diff --git a/net/dnsmasq/patches/patch-af b/net/dnsmasq/patches/patch-af
deleted file mode 100644
index dbaad69de19..00000000000
--- a/net/dnsmasq/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2008/12/19 07:53:43 roy Exp $
-
---- src/rfc1035.c	2008-11-03 16:28:39.000000000 +0000
-+++ src/rfc1035.c	2008-11-18 20:51:27.000000000 +0000
-@@ -25,7 +25,7 @@
-     ((size_t)((pp) - (unsigned char *)(header) + (len)) <= (plen))
- 
- #define ADD_RDLEN(header, pp, plen, len) \
--    (!CHECK_LEN(header, pp, plen, len) ? 0 : (int)((pp) += (len)), 1)
-+    (!CHECK_LEN(header, pp, plen, len) ? 0 : (long)((pp) += (len)), 1)
- 
- static int extract_name(HEADER *header, size_t plen, unsigned char **pp, 
- 			char *name, int isExtract, int extrabytes)