diff options
| author | leot <leot> | 2015-08-15 12:38:17 +0000 |
|---|---|---|
| committer | leot <leot> | 2015-08-15 12:38:17 +0000 |
| commit | a7d05eda32362f3cf877e8d525bdb06bba2c2498 (patch) | |
| tree | ec697d85fbbdb7ba76d2ffc5e000ec7619e80854 | |
| parent | 8ebd4e16b0771b1985a2480aac138db474040a11 (diff) | |
| download | pkgsrc-a7d05eda32362f3cf877e8d525bdb06bba2c2498.tar.gz | |
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.
| -rw-r--r-- | net/dnsmasq/Makefile | 16 | ||||
| -rw-r--r-- | net/dnsmasq/distinfo | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/net/dnsmasq/Makefile b/net/dnsmasq/Makefile index 27a9cdad9fb..c46553971f0 100644 --- a/net/dnsmasq/Makefile +++ b/net/dnsmasq/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.30 2015/07/14 09:57:13 fhajny Exp $ +# $NetBSD: Makefile,v 1.31 2015/08/15 12:38:17 leot Exp $ -DISTNAME= dnsmasq-2.73 +DISTNAME= dnsmasq-2.75 CATEGORIES= net MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ @@ -10,8 +10,8 @@ COMMENT= Lightweight, easy to configure DNS forwarder LICENSE= gnu-gpl-v3 RCD_SCRIPTS= dnsmasq -CONF_FILES= ${PREFIX}/share/examples/dnsmasq/dnsmasq.conf.example \ - ${PKG_SYSCONFDIR}/dnsmasq.conf +EGDIR= ${PREFIX}/share/examples/dnsmasq +CONF_FILES= ${EGDIR}/dnsmasq.conf.example ${PKG_SYSCONFDIR}/dnsmasq.conf .include "../../mk/bsd.prefs.mk" @@ -37,7 +37,7 @@ PLIST_VARS+= dbus USE_TOOLS+= pkg-config CFLAGS+= -DHAVE_DBUS .include "../../sysutils/dbus/buildlink3.mk" -CONF_FILES+= ${PREFIX}/share/examples/dnsmasq/dnsmasq-dbus.conf \ +CONF_FILES+= ${EGDIR}/dnsmasq-dbus.conf \ ${PKG_SYSCONFDIR}/dbus-1/system.d/dnsmasq-dbus.conf PLIST.dbus= yes .endif @@ -53,7 +53,7 @@ CFLAGS+= -DNO_IPSET # Override the defaults AUTO_MKDIRS=yes CFLAGS+= -DCONFFILE='"${PKG_SYSCONFDIR}/dnsmasq.conf"' -BUILD_MAKE_FLAGS+= COPTS=${CFLAGS:Q} +MAKE_FLAGS+= COPTS=${CFLAGS:Q} INSTALL_MAKE_FLAGS+= PREFIX="${PREFIX}" INSTALL_MAKE_FLAGS+= MANDIR="${PREFIX}/${PKGMANDIR}" INSTALL_MAKE_FLAGS+= LOCALEDIR="${PREFIX}/${PKGLOCALEDIR}" @@ -64,10 +64,10 @@ INSTALL_MAKE_FLAGS+= AWK="${AWK}" post-install: ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example \ - ${DESTDIR}${PREFIX}/share/examples/dnsmasq/ + ${DESTDIR}${EGDIR} .if !empty(PKG_OPTIONS:Mdbus) ${INSTALL_DATA} ${WRKSRC}/dbus/dnsmasq.conf \ - ${DESTDIR}${PREFIX}/share/examples/dnsmasq/dnsmasq-dbus.conf + ${DESTDIR}${EGDIR}/dnsmasq-dbus.conf .endif .include "../../mk/bsd.pkg.mk" diff --git a/net/dnsmasq/distinfo b/net/dnsmasq/distinfo index cb81f51e5ee..f821e107843 100644 --- a/net/dnsmasq/distinfo +++ b/net/dnsmasq/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.28 2015/07/14 09:57:13 fhajny Exp $ +$NetBSD: distinfo,v 1.29 2015/08/15 12:38:17 leot Exp $ -SHA1 (dnsmasq-2.73.tar.gz) = 2bea70fed6b43d69d58ee0f473e3b0c2f4cd2feb -RMD160 (dnsmasq-2.73.tar.gz) = c7d49a608ba73bd6f075878f8bf24e1677b6aebb -Size (dnsmasq-2.73.tar.gz) = 681245 bytes +SHA1 (dnsmasq-2.75.tar.gz) = 17ce713b770a54c2cc9195f6142f9c7d642f6ea4 +RMD160 (dnsmasq-2.75.tar.gz) = 266e7005253f15ce1fe750c9e1ca99f7b8623c29 +Size (dnsmasq-2.75.tar.gz) = 684014 bytes SHA1 (patch-dnsmasq.conf.example) = 2974c722a26400915037259c79899e8a3e95bf8f SHA1 (patch-src_bpf.c) = 51e1341d940304a5246ee87d5e3b07faf7d70cf1 |