Fri Dec 19 07:53:43 2008 UTC ()
Update to dnsmasq-2.46
Noteable changes include:
   NetBSD-5 support
   Optional DBus and IPv6 support
   ISC leasefile support removed
   Support DHCP clients in multiple DNS domains
   Re-read /etc/resolv.conf when an "interface up" event occurs


(roy)
diff -r1.8 -r1.9 pkgsrc/net/dnsmasq/Makefile
diff -r1.7 -r1.8 pkgsrc/net/dnsmasq/distinfo
diff -r0 -r1.1 pkgsrc/net/dnsmasq/options.mk
diff -r1.3 -r0 pkgsrc/net/dnsmasq/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/net/dnsmasq/patches/patch-ab
diff -r1.1 -r0 pkgsrc/net/dnsmasq/patches/patch-ac
diff -r1.1 -r0 pkgsrc/net/dnsmasq/patches/patch-ad
diff -r0 -r1.1 pkgsrc/net/dnsmasq/patches/patch-ae
diff -r0 -r1.1 pkgsrc/net/dnsmasq/patches/patch-af
cvs diff -r1.8 -r1.9 pkgsrc/net/dnsmasq/Makefile (expand / switch to unified diff)

--- pkgsrc/net/dnsmasq/Makefile 2008/11/22 18:59:54 1.8
+++ pkgsrc/net/dnsmasq/Makefile 2008/12/19 07:53:43 1.9
@@ -1,25 +1,36 @@ @@ -1,25 +1,36 @@
1# $NetBSD: Makefile,v 1.8 2008/11/22 18:59:54 ahoka Exp $ 1# $NetBSD: Makefile,v 1.9 2008/12/19 07:53:43 roy Exp $
2# 2#
3 3
4DISTNAME= dnsmasq-2.45 4DISTNAME= dnsmasq-2.46
5PKGREVISION= 3 
6CATEGORIES= net 5CATEGORIES= net
7MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ 6MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/
8 7
9MAINTAINER= pancake@phreaker.net 8MAINTAINER= roy@NetBSD.org
10HOMEPAGE= http://www.thekelleys.org.uk/dnsmasq/doc.html 9HOMEPAGE= http://www.thekelleys.org.uk/dnsmasq/doc.html
11COMMENT= Lightweight, easy to configure DNS forwarder 10COMMENT= Lightweight, easy to configure DNS forwarder
12 11
13USE_TOOLS+= gmake 12RCD_SCRIPTS= dnsmasq
 13CONF_FILES= ${PREFIX}/share/examples/dnsmasq/dnsmasq.conf.example \
 14 ${PKG_SYSCONFDIR}/dnsmasq.conf
 15
 16PKG_DESTDIR_SUPPORT= user-destdir
 17
 18.include "options.mk"
 19
 20# Override the defaults
 21CFLAGS+= -DCONFFILE=\\\"${PKG_SYSCONFDIR}/dnsmasq.conf\\\"
 22BUILD_MAKE_FLAGS+= COPTS="${CFLAGS}"
 23INSTALL_MAKE_FLAGS+= PREFIX="${PREFIX}"
 24INSTALL_MAKE_FLAGS+= MANDIR="${PREFIX}/${PKGMANDIR}"
 25INSTALL_MAKE_FLAGS+= LOCALEDIR="${PREFIX}/${PKGLOCALEDIR}"
 26
 27# Upstream wants to use nawk, but awk should work just fine here.
 28BUILD_MAKE_FLAGS+= AWK="${AWK}"
 29INSTALL_MAKE_FLAGS+= AWK="${AWK}"
14 30
15RCD_SCRIPTS= dnsmasq 
16CONF_FILES= ${PREFIX}/share/examples/dnsmasq/dnsmasq.conf.example \ 
17 ${PKG_SYSCONFDIR}/dnsmasq.conf 
18 
19CFLAGS+= -DCONFFILE=\"${PKG_SYSCONFDIR}/dnsmasq.conf\" 
20post-install: 31post-install:
21 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dnsmasq 32 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/dnsmasq
22 ${INSTALL} ${WRKSRC}/dnsmasq.conf.example \ 33 ${INSTALL} ${WRKSRC}/dnsmasq.conf.example \
23 ${PREFIX}/share/examples/dnsmasq/ 34 ${DESTDIR}${PREFIX}/share/examples/dnsmasq/
24 35
25.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/net/dnsmasq/distinfo (expand / switch to unified diff)

--- pkgsrc/net/dnsmasq/distinfo 2008/11/22 18:59:54 1.7
+++ pkgsrc/net/dnsmasq/distinfo 2008/12/19 07:53:43 1.8
@@ -1,9 +1,8 @@ @@ -1,9 +1,8 @@
1$NetBSD: distinfo,v 1.7 2008/11/22 18:59:54 ahoka Exp $ 1$NetBSD: distinfo,v 1.8 2008/12/19 07:53:43 roy Exp $
2 2
3SHA1 (dnsmasq-2.45.tar.gz) = 12f8cffd657f674fbf4bf4f670a0dcb65ea4a5ae 3SHA1 (dnsmasq-2.46.tar.gz) = 472ef663b2b433d599f62cb6ca03eb6f7ce25bc2
4RMD160 (dnsmasq-2.45.tar.gz) = b8ebf9dfeff26c18664a917cd32cb9b6a53852cb 4RMD160 (dnsmasq-2.46.tar.gz) = 684864b3bb71ea1d054efef0d9489cac12df9e82
5Size (dnsmasq-2.45.tar.gz) = 380877 bytes 5Size (dnsmasq-2.46.tar.gz) = 386318 bytes
6SHA1 (patch-aa) = f6d1d9d80a283d4270950031ec67c0b4e37920d7 6SHA1 (patch-ab) = 1762cb1b0acb93ff1ffb65451d6eb430cb5d87c5
7SHA1 (patch-ab) = 7bb6cb585f813a5fe9eddfdedda71a14740d8c4d 7SHA1 (patch-ae) = 155a4665ff70f6987241971077eafcd6f5da1e08
8SHA1 (patch-ac) = a07c71502399a7835cbb8b8e5136553305113e6e 8SHA1 (patch-af) = 4c40ca2509f90afcb52d097f5dde4691d6124c92
9SHA1 (patch-ad) = 297486a45555df6dd1ca995a9e3866dd3368fbb6 
File Added: pkgsrc/net/dnsmasq/options.mk
# $NetBSD: options.mk,v 1.1 2008/12/19 07:53:43 roy Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.dnsmasq

PKG_SUPPORTED_OPTIONS=	dbus inet6

.include "../../mk/bsd.options.mk"

.if !empty(PKG_OPTIONS:Mdbus)
CFLAGS+=	-DHAVE_DBUS
.include "../../sysutils/dbus/buildlink3.mk"
.endif

.if empty(PKG_OPTIONS:Minet6)
CFLAGS+=	-DNO_IPV6
.endif
File Deleted: pkgsrc/net/dnsmasq/patches/Attic/patch-aa
cvs diff -r1.1 -r1.2 pkgsrc/net/dnsmasq/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/dnsmasq/patches/Attic/patch-ab 2008/09/25 20:33:53 1.1
+++ pkgsrc/net/dnsmasq/patches/Attic/patch-ab 2008/12/19 07:53:43 1.2
@@ -1,27 +1,41 @@ @@ -1,27 +1,41 @@
1$NetBSD: patch-ab,v 1.1 2008/09/25 20:33:53 ahoka Exp $ 1$NetBSD: patch-ab,v 1.2 2008/12/19 07:53:43 roy Exp $
2 2
3--- src/config.h.orig 2008-07-20 20:26:32.000000000 +0200 3--- src/config.h 2008-11-10 21:47:46.000000000 +0000
4+++ src/config.h 4+++ src/config.h 2008-11-18 20:51:27.000000000 +0000
5@@ -38,17 +38,19 @@ 5@@ -38,18 +38,25 @@
6 # define RESOLVFILE "/etc/resolv.conf" 6 # define RESOLVFILE "/etc/resolv.conf"
7 #endif 7 #endif
8 #define RUNFILE "/var/run/dnsmasq.pid" 8 #define RUNFILE "/var/run/dnsmasq.pid"
9-#if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__) 9-#if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__)
10+#if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__) 10-# define LEASEFILE "/var/db/dnsmasq.leases"
11 # define LEASEFILE "/var/db/dnsmasq.leases" 11-#elif defined(__sun__) || defined (__sun)
12 #elif defined(__sun__) || defined (__sun) 12-# define LEASEFILE "/var/cache/dnsmasq.leases"
13 # define LEASEFILE "/var/cache/dnsmasq.leases" 13-#else
14 #else 14-# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
15 # define LEASEFILE "/var/lib/misc/dnsmasq.leases" 15-#endif
16 #endif 
17-#if defined(__FreeBSD__) 16-#if defined(__FreeBSD__)
18+#ifndef CONFFILE 17-# define CONFFILE "/usr/local/etc/dnsmasq.conf"
19+# if defined(__FreeBSD__) 
20 # define CONFFILE "/usr/local/etc/dnsmasq.conf" 
21-#else 18-#else
22+# else 19-# define CONFFILE "/etc/dnsmasq.conf"
23 # define CONFFILE "/etc/dnsmasq.conf" 20+
24+# endif 21+#ifndef LEASEFILE
 22+# if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
 23+# define LEASEFILE "/var/db/dnsmasq.leases"
 24+# elif defined (__sun)
 25+# define LEASEFILE "/var/cache/dnsmasq.leases"
 26+# else
 27+# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
 28+# endif
 29+#endif
 30+
 31+#ifndef CONFFILE
 32+# if defined(__FreeBSD__)
 33+# define CONFFILE "/usr/local/etc/dnsmasq.conf"
 34+# else
 35+# define CONFFILE "/etc/dnsmasq.conf"
 36+# endif
25 #endif 37 #endif
 38+
26 #define DEFLEASE 3600 /* default lease time, 1 hour */ 39 #define DEFLEASE 3600 /* default lease time, 1 hour */
27 #define CHUSER "nobody" 40 #define CHUSER "nobody"
 41 #define CHGRP "dip"
File Deleted: pkgsrc/net/dnsmasq/patches/Attic/patch-ac
File Deleted: pkgsrc/net/dnsmasq/patches/Attic/patch-ad
File Added: pkgsrc/net/dnsmasq/patches/Attic/patch-ae
$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;
File Added: pkgsrc/net/dnsmasq/patches/Attic/patch-af
$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)