Sun Jul 21 07:59:26 2013 UTC ()
Support partial FQDN option


(roy)
diff -r1.22 -r1.23 pkgsrc/net/dnsmasq/Makefile
diff -r1.19 -r1.20 pkgsrc/net/dnsmasq/distinfo
diff -r0 -r1.1 pkgsrc/net/dnsmasq/patches/patch-src_rfc2131.c
cvs diff -r1.22 -r1.23 pkgsrc/net/dnsmasq/Makefile (switch to unified diff)

--- pkgsrc/net/dnsmasq/Makefile 2013/05/28 09:32:00 1.22
+++ pkgsrc/net/dnsmasq/Makefile 2013/07/21 07:59:26 1.23
@@ -1,57 +1,58 @@ @@ -1,57 +1,58 @@
1# $NetBSD: Makefile,v 1.22 2013/05/28 09:32:00 fhajny Exp $ 1# $NetBSD: Makefile,v 1.23 2013/07/21 07:59:26 roy Exp $
2# 2#
3 3
4DISTNAME= dnsmasq-2.66 4DISTNAME= dnsmasq-2.66
 5PKGREVISION= 1
5CATEGORIES= net 6CATEGORIES= net
6MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ 7MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/
7LICENSE= gnu-gpl-v3 8LICENSE= gnu-gpl-v3
8 9
9MAINTAINER= roy@NetBSD.org 10MAINTAINER= roy@NetBSD.org
10HOMEPAGE= http://www.thekelleys.org.uk/dnsmasq/doc.html 11HOMEPAGE= http://www.thekelleys.org.uk/dnsmasq/doc.html
11COMMENT= Lightweight, easy to configure DNS forwarder 12COMMENT= Lightweight, easy to configure DNS forwarder
12 13
13RCD_SCRIPTS= dnsmasq 14RCD_SCRIPTS= dnsmasq
14CONF_FILES= ${PREFIX}/share/examples/dnsmasq/dnsmasq.conf.example \ 15CONF_FILES= ${PREFIX}/share/examples/dnsmasq/dnsmasq.conf.example \
15 ${PKG_SYSCONFDIR}/dnsmasq.conf 16 ${PKG_SYSCONFDIR}/dnsmasq.conf
16 17
17PKG_OPTIONS_VAR= PKG_OPTIONS.dnsmasq 18PKG_OPTIONS_VAR= PKG_OPTIONS.dnsmasq
18PKG_SUPPORTED_OPTIONS= dbus inet6 19PKG_SUPPORTED_OPTIONS= dbus inet6
19PKG_SUGGESTED_OPTIONS= inet6 20PKG_SUGGESTED_OPTIONS= inet6
20PLIST_VARS+= dbus 21PLIST_VARS+= dbus
21 22
22.include "../../mk/bsd.options.mk" 23.include "../../mk/bsd.options.mk"
23 24
24.if !empty(PKG_OPTIONS:Mdbus) 25.if !empty(PKG_OPTIONS:Mdbus)
25USE_TOOLS+= pkg-config 26USE_TOOLS+= pkg-config
26CFLAGS+= -DHAVE_DBUS 27CFLAGS+= -DHAVE_DBUS
27.include "../../sysutils/dbus/buildlink3.mk" 28.include "../../sysutils/dbus/buildlink3.mk"
28CONF_FILES+= ${PREFIX}/share/examples/dnsmasq/dnsmasq-dbus.conf \ 29CONF_FILES+= ${PREFIX}/share/examples/dnsmasq/dnsmasq-dbus.conf \
29 ${PKG_SYSCONFDIR}/dbus-1/system.d/dnsmasq-dbus.conf 30 ${PKG_SYSCONFDIR}/dbus-1/system.d/dnsmasq-dbus.conf
30PLIST.dbus= yes 31PLIST.dbus= yes
31.endif 32.endif
32 33
33.if empty(PKG_OPTIONS:Minet6) 34.if empty(PKG_OPTIONS:Minet6)
34CFLAGS+= -DNO_IPV6 35CFLAGS+= -DNO_IPV6
35.endif 36.endif
36 37
37# Override the defaults 38# Override the defaults
38AUTO_MKDIRS=yes 39AUTO_MKDIRS=yes
39CFLAGS+= -DCONFFILE=\\\"${PKG_SYSCONFDIR}/dnsmasq.conf\\\" 40CFLAGS+= -DCONFFILE=\\\"${PKG_SYSCONFDIR}/dnsmasq.conf\\\"
40BUILD_MAKE_FLAGS+= COPTS="${CFLAGS}" 41BUILD_MAKE_FLAGS+= COPTS="${CFLAGS}"
41INSTALL_MAKE_FLAGS+= PREFIX="${PREFIX}" 42INSTALL_MAKE_FLAGS+= PREFIX="${PREFIX}"
42INSTALL_MAKE_FLAGS+= MANDIR="${PREFIX}/${PKGMANDIR}" 43INSTALL_MAKE_FLAGS+= MANDIR="${PREFIX}/${PKGMANDIR}"
43INSTALL_MAKE_FLAGS+= LOCALEDIR="${PREFIX}/${PKGLOCALEDIR}" 44INSTALL_MAKE_FLAGS+= LOCALEDIR="${PREFIX}/${PKGLOCALEDIR}"
44 45
45# Upstream wants to use nawk, but awk should work just fine here. 46# Upstream wants to use nawk, but awk should work just fine here.
46BUILD_MAKE_FLAGS+= AWK="${AWK}" 47BUILD_MAKE_FLAGS+= AWK="${AWK}"
47INSTALL_MAKE_FLAGS+= AWK="${AWK}" 48INSTALL_MAKE_FLAGS+= AWK="${AWK}"
48 49
49post-install: 50post-install:
50 ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example \ 51 ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example \
51 ${DESTDIR}${PREFIX}/share/examples/dnsmasq/ 52 ${DESTDIR}${PREFIX}/share/examples/dnsmasq/
52.if !empty(PKG_OPTIONS:Mdbus) 53.if !empty(PKG_OPTIONS:Mdbus)
53 ${INSTALL_DATA} ${WRKSRC}/dbus/dnsmasq.conf \ 54 ${INSTALL_DATA} ${WRKSRC}/dbus/dnsmasq.conf \
54 ${DESTDIR}${PREFIX}/share/examples/dnsmasq/dnsmasq-dbus.conf 55 ${DESTDIR}${PREFIX}/share/examples/dnsmasq/dnsmasq-dbus.conf
55.endif 56.endif
56 57
57.include "../../mk/bsd.pkg.mk" 58.include "../../mk/bsd.pkg.mk"
cvs diff -r1.19 -r1.20 pkgsrc/net/dnsmasq/distinfo (switch to unified diff)

--- pkgsrc/net/dnsmasq/distinfo 2013/05/28 09:32:00 1.19
+++ pkgsrc/net/dnsmasq/distinfo 2013/07/21 07:59:26 1.20
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.19 2013/05/28 09:32:00 fhajny Exp $ 1$NetBSD: distinfo,v 1.20 2013/07/21 07:59:26 roy Exp $
2 2
3SHA1 (dnsmasq-2.66.tar.gz) = fb6b1690de53014a8e6c8bfa6f1653062b965741 3SHA1 (dnsmasq-2.66.tar.gz) = fb6b1690de53014a8e6c8bfa6f1653062b965741
4RMD160 (dnsmasq-2.66.tar.gz) = fd5492852a933b54bb38f9e0c531c6c6e4325862 4RMD160 (dnsmasq-2.66.tar.gz) = fd5492852a933b54bb38f9e0c531c6c6e4325862
5Size (dnsmasq-2.66.tar.gz) = 574715 bytes 5Size (dnsmasq-2.66.tar.gz) = 574715 bytes
 6SHA1 (patch-src_rfc2131.c) = c136273e0026452ff9f1a929474663a4b56631de
File Added: pkgsrc/net/dnsmasq/patches/patch-src_rfc2131.c
$NetBSD: patch-src_rfc2131.c,v 1.1 2013/07/21 07:59:26 roy Exp $

Don't assume a trailing terminator.

--- src/rfc2131.c.orig	2013-04-17 12:52:49.000000000 +0000
+++ src/rfc2131.c
@@ -534,7 +534,7 @@ size_t dhcp_reply(struct dhcp_context *c
 	}
       
       if (fqdn_flags & 0x04)
-	while (*op != 0 && ((op + (*op) + 1) - pp) < len)
+	while (*op != 0 && ((op + (*op)) - pp) < len)
 	  {
 	    memcpy(pq, op+1, *op);
 	    pq += *op;