Sat Aug 15 12:38:17 2015 UTC ()
Update net/dnsmasq to dnsmasq-2.75, based on patches from Benedek Gergely via
pkgsrc-users@.

ok wiz@

pkgsrc changes:
o Pass COPTS via MAKE_FLAGS. This avoid to completely rebuild dnsmasq when dbus
option is selected.

Changes:
version 2.75
            Fix reversion on 2.74 which caused 100% CPU use when a
            dhcp-script is configured. Thanks to Adrian Davey for
            reporting the bug and testing the fix.

version 2.74
            Fix reversion in 2.73 where --conf-file would attempt to
            read the default file, rather than no file.

            Fix inotify code to handle dangling symlinks better and
            not SEGV in some circumstances.

            DNSSEC fix. In the case of a signed CNAME generated by a
            wildcard which pointed to an unsigned domain, the wrong
            status would be logged, and some necessary checks omitted.


(leot)
diff -r1.30 -r1.31 pkgsrc/net/dnsmasq/Makefile
diff -r1.28 -r1.29 pkgsrc/net/dnsmasq/distinfo
cvs diff -r1.30 -r1.31 pkgsrc/net/dnsmasq/Makefile (expand / switch to unified diff)

--- pkgsrc/net/dnsmasq/Makefile 2015/07/14 09:57:13 1.30
+++ pkgsrc/net/dnsmasq/Makefile 2015/08/15 12:38:17 1.31
@@ -1,73 +1,73 @@ @@ -1,73 +1,73 @@
1# $NetBSD: Makefile,v 1.30 2015/07/14 09:57:13 fhajny Exp $ 1# $NetBSD: Makefile,v 1.31 2015/08/15 12:38:17 leot Exp $
2 2
3DISTNAME= dnsmasq-2.73 3DISTNAME= dnsmasq-2.75
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ 5MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.thekelleys.org.uk/dnsmasq/doc.html 8HOMEPAGE= http://www.thekelleys.org.uk/dnsmasq/doc.html
9COMMENT= Lightweight, easy to configure DNS forwarder 9COMMENT= Lightweight, easy to configure DNS forwarder
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12RCD_SCRIPTS= dnsmasq 12RCD_SCRIPTS= dnsmasq
13CONF_FILES= ${PREFIX}/share/examples/dnsmasq/dnsmasq.conf.example \ 13EGDIR= ${PREFIX}/share/examples/dnsmasq
14 ${PKG_SYSCONFDIR}/dnsmasq.conf 14CONF_FILES= ${EGDIR}/dnsmasq.conf.example ${PKG_SYSCONFDIR}/dnsmasq.conf
15 15
16.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
17 17
18DNSMASQ_USER?= dnsmasq 18DNSMASQ_USER?= dnsmasq
19.if ${OPSYS} == "Interix" 19.if ${OPSYS} == "Interix"
20DNSMASQ_GROUP?= nogroup 20DNSMASQ_GROUP?= nogroup
21.else 21.else
22DNSMASQ_GROUP?= dnsmasq 22DNSMASQ_GROUP?= dnsmasq
23.endif 23.endif
24 24
25PKG_GROUPS= ${DNSMASQ_GROUP} 25PKG_GROUPS= ${DNSMASQ_GROUP}
26PKG_USERS= ${DNSMASQ_USER}:${DNSMASQ_GROUP} 26PKG_USERS= ${DNSMASQ_USER}:${DNSMASQ_GROUP}
27PKG_GECOS.${DNSMASQ_USER}= DNS\ forwarder\ user 27PKG_GECOS.${DNSMASQ_USER}= DNS\ forwarder\ user
28 28
29PKG_OPTIONS_VAR= PKG_OPTIONS.dnsmasq 29PKG_OPTIONS_VAR= PKG_OPTIONS.dnsmasq
30PKG_SUPPORTED_OPTIONS= dbus inet6 30PKG_SUPPORTED_OPTIONS= dbus inet6
31PKG_SUGGESTED_OPTIONS= inet6 31PKG_SUGGESTED_OPTIONS= inet6
32PLIST_VARS+= dbus 32PLIST_VARS+= dbus
33 33
34.include "../../mk/bsd.options.mk" 34.include "../../mk/bsd.options.mk"
35 35
36.if !empty(PKG_OPTIONS:Mdbus) 36.if !empty(PKG_OPTIONS:Mdbus)
37USE_TOOLS+= pkg-config 37USE_TOOLS+= pkg-config
38CFLAGS+= -DHAVE_DBUS 38CFLAGS+= -DHAVE_DBUS
39.include "../../sysutils/dbus/buildlink3.mk" 39.include "../../sysutils/dbus/buildlink3.mk"
40CONF_FILES+= ${PREFIX}/share/examples/dnsmasq/dnsmasq-dbus.conf \ 40CONF_FILES+= ${EGDIR}/dnsmasq-dbus.conf \
41 ${PKG_SYSCONFDIR}/dbus-1/system.d/dnsmasq-dbus.conf 41 ${PKG_SYSCONFDIR}/dbus-1/system.d/dnsmasq-dbus.conf
42PLIST.dbus= yes 42PLIST.dbus= yes
43.endif 43.endif
44 44
45.if empty(PKG_OPTIONS:Minet6) 45.if empty(PKG_OPTIONS:Minet6)
46CFLAGS+= -DNO_IPV6 46CFLAGS+= -DNO_IPV6
47.endif 47.endif
48 48
49.if ${OPSYS} == "SunOS" 49.if ${OPSYS} == "SunOS"
50CFLAGS+= -DNO_IPSET 50CFLAGS+= -DNO_IPSET
51.endif 51.endif
52 52
53# Override the defaults 53# Override the defaults
54AUTO_MKDIRS=yes 54AUTO_MKDIRS=yes
55CFLAGS+= -DCONFFILE='"${PKG_SYSCONFDIR}/dnsmasq.conf"' 55CFLAGS+= -DCONFFILE='"${PKG_SYSCONFDIR}/dnsmasq.conf"'
56BUILD_MAKE_FLAGS+= COPTS=${CFLAGS:Q} 56MAKE_FLAGS+= COPTS=${CFLAGS:Q}
57INSTALL_MAKE_FLAGS+= PREFIX="${PREFIX}" 57INSTALL_MAKE_FLAGS+= PREFIX="${PREFIX}"
58INSTALL_MAKE_FLAGS+= MANDIR="${PREFIX}/${PKGMANDIR}" 58INSTALL_MAKE_FLAGS+= MANDIR="${PREFIX}/${PKGMANDIR}"
59INSTALL_MAKE_FLAGS+= LOCALEDIR="${PREFIX}/${PKGLOCALEDIR}" 59INSTALL_MAKE_FLAGS+= LOCALEDIR="${PREFIX}/${PKGLOCALEDIR}"
60 60
61# Upstream wants to use nawk, but awk should work just fine here. 61# Upstream wants to use nawk, but awk should work just fine here.
62BUILD_MAKE_FLAGS+= AWK="${AWK}" 62BUILD_MAKE_FLAGS+= AWK="${AWK}"
63INSTALL_MAKE_FLAGS+= AWK="${AWK}" 63INSTALL_MAKE_FLAGS+= AWK="${AWK}"
64 64
65post-install: 65post-install:
66 ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example \ 66 ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example \
67 ${DESTDIR}${PREFIX}/share/examples/dnsmasq/ 67 ${DESTDIR}${EGDIR}
68.if !empty(PKG_OPTIONS:Mdbus) 68.if !empty(PKG_OPTIONS:Mdbus)
69 ${INSTALL_DATA} ${WRKSRC}/dbus/dnsmasq.conf \ 69 ${INSTALL_DATA} ${WRKSRC}/dbus/dnsmasq.conf \
70 ${DESTDIR}${PREFIX}/share/examples/dnsmasq/dnsmasq-dbus.conf 70 ${DESTDIR}${EGDIR}/dnsmasq-dbus.conf
71.endif 71.endif
72 72
73.include "../../mk/bsd.pkg.mk" 73.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.29 pkgsrc/net/dnsmasq/distinfo (expand / switch to unified diff)

--- pkgsrc/net/dnsmasq/distinfo 2015/07/14 09:57:13 1.28
+++ pkgsrc/net/dnsmasq/distinfo 2015/08/15 12:38:17 1.29
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.28 2015/07/14 09:57:13 fhajny Exp $ 1$NetBSD: distinfo,v 1.29 2015/08/15 12:38:17 leot Exp $
2 2
3SHA1 (dnsmasq-2.73.tar.gz) = 2bea70fed6b43d69d58ee0f473e3b0c2f4cd2feb 3SHA1 (dnsmasq-2.75.tar.gz) = 17ce713b770a54c2cc9195f6142f9c7d642f6ea4
4RMD160 (dnsmasq-2.73.tar.gz) = c7d49a608ba73bd6f075878f8bf24e1677b6aebb 4RMD160 (dnsmasq-2.75.tar.gz) = 266e7005253f15ce1fe750c9e1ca99f7b8623c29
5Size (dnsmasq-2.73.tar.gz) = 681245 bytes 5Size (dnsmasq-2.75.tar.gz) = 684014 bytes
6SHA1 (patch-dnsmasq.conf.example) = 2974c722a26400915037259c79899e8a3e95bf8f 6SHA1 (patch-dnsmasq.conf.example) = 2974c722a26400915037259c79899e8a3e95bf8f
7SHA1 (patch-src_bpf.c) = 51e1341d940304a5246ee87d5e3b07faf7d70cf1 7SHA1 (patch-src_bpf.c) = 51e1341d940304a5246ee87d5e3b07faf7d70cf1