Date: Tue, 16 Jun 2015 00:48:02 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r389788 - in head/dns: dnsmasq dnsmasq-devel dnsmasq-devel/files dnsmasq/files Message-ID: <201506160048.t5G0m28a087619@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Tue Jun 16 00:48:01 2015 New Revision: 389788 URL: https://svnweb.freebsd.org/changeset/ports/389788 Log: Upgrade dnsmasq to new release 2.73. Changelog: http://www.thekelleys.org.uk/dnsmasq/CHANGELOGDisable dnsmasq-devel (older than stable). Switch to using @sample keyword [1]. PR: 200717 [1] Submitted by: Jimmy Olgeni Deleted: head/dns/dnsmasq/files/patch-CVE-2015-3294 Modified: head/dns/dnsmasq-devel/Makefile head/dns/dnsmasq-devel/files/dnsmasq.in head/dns/dnsmasq/Makefile head/dns/dnsmasq/distinfo head/dns/dnsmasq/files/patch-dnsmasq.conf.example head/dns/dnsmasq/pkg-plist Modified: head/dns/dnsmasq-devel/Makefile ============================================================================== --- head/dns/dnsmasq-devel/Makefile Tue Jun 16 00:47:17 2015 (r389787) +++ head/dns/dnsmasq-devel/Makefile Tue Jun 16 00:48:01 2015 (r389788) @@ -12,7 +12,7 @@ COMMENT= Lightweight DNS forwarder, DHCP LICENSE= GPLv2 -#IGNORE= build stable version instead, it is newer than this release candidate +IGNORE= build stable version instead, it is newer than this release candidate CONFLICTS_INSTALL=dnsmasq-2* PORTDOCS= CHANGELOG CHANGELOG.archive FAQ doc.html setup.html Modified: head/dns/dnsmasq-devel/files/dnsmasq.in ============================================================================== --- head/dns/dnsmasq-devel/files/dnsmasq.in Tue Jun 16 00:47:17 2015 (r389787) +++ head/dns/dnsmasq-devel/files/dnsmasq.in Tue Jun 16 00:48:01 2015 (r389788) @@ -3,7 +3,7 @@ # $FreeBSD$ # # PROVIDE: dnsmasq -# REQUIRE: SERVERS +# REQUIRE: SERVERS ldconfig # BEFORE: DAEMON named # KEYWORD: shutdown # Modified: head/dns/dnsmasq/Makefile ============================================================================== --- head/dns/dnsmasq/Makefile Tue Jun 16 00:47:17 2015 (r389787) +++ head/dns/dnsmasq/Makefile Tue Jun 16 00:48:01 2015 (r389788) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= dnsmasq -DISTVERSION= 2.72 -PORTREVISION= 1 +DISTVERSION= 2.73 PORTEPOCH= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ \ @@ -46,7 +45,7 @@ CFLAGS+= -DNO_IPV6 .endif .if ${PORT_OPTIONS:MNLS} -USES+= pkgconfig gettext iconv gmake +USES+= gettext gmake iconv pkgconfig LIB_DEPENDS+= libidn.so:${PORTSDIR}/dns/libidn PLIST_SUB+= NLS="" ALL_TARGET= all-i18n @@ -108,8 +107,8 @@ pre-configure: pretty-print-config do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${STAGEDIR}${PREFIX}/etc - ${REINPLACE_CMD} -i '' 's}%%PREFIX%%}${PREFIX}}' ${STAGEDIR}${PREFIX}/etc/dnsmasq.conf.example + ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${STAGEDIR}${PREFIX}/etc/dnsmasq.conf.sample + ${REINPLACE_CMD} -i '' 's}%%PREFIX%%}${PREFIX}}' ${STAGEDIR}${PREFIX}/etc/dnsmasq.conf.sample ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8 ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/trust-anchors.conf ${STAGEDIR}${DATADIR}/ Modified: head/dns/dnsmasq/distinfo ============================================================================== --- head/dns/dnsmasq/distinfo Tue Jun 16 00:47:17 2015 (r389787) +++ head/dns/dnsmasq/distinfo Tue Jun 16 00:48:01 2015 (r389788) @@ -1,2 +1,2 @@ -SHA256 (dnsmasq-2.72.tar.xz) = 7d0bd23f5d74b3a6b26a75d5ffcf9db81d461b47cbe578cb65a83a98008600b1 -SIZE (dnsmasq-2.72.tar.xz) = 454048 +SHA256 (dnsmasq-2.73.tar.xz) = 0bff81103e53fcab3a3c4d0fd6df1882f9446dca4fa74ff8270e1d2ab872d8f6 +SIZE (dnsmasq-2.73.tar.xz) = 470420 Modified: head/dns/dnsmasq/files/patch-dnsmasq.conf.example ============================================================================== --- head/dns/dnsmasq/files/patch-dnsmasq.conf.example Tue Jun 16 00:47:17 2015 (r389787) +++ head/dns/dnsmasq/files/patch-dnsmasq.conf.example Tue Jun 16 00:48:01 2015 (r389788) @@ -1,5 +1,5 @@ ---- ./dnsmasq.conf.example.orig 2014-04-09 21:36:53.000000000 +0200 -+++ ./dnsmasq.conf.example 2014-04-15 19:32:54.000000000 +0200 +--- dnsmasq.conf.example.orig 2015-06-12 20:39:11 UTC ++++ dnsmasq.conf.example @@ -123,6 +123,12 @@ # running another nameserver on the same machine. #bind-interfaces Modified: head/dns/dnsmasq/pkg-plist ============================================================================== --- head/dns/dnsmasq/pkg-plist Tue Jun 16 00:47:17 2015 (r389787) +++ head/dns/dnsmasq/pkg-plist Tue Jun 16 00:48:01 2015 (r389788) @@ -1,7 +1,5 @@ sbin/dnsmasq -@unexec if cmp -s %D/etc/dnsmasq.conf %D/etc/dnsmasq.conf.example ; then rm -f %D/etc/dnsmasq.conf ; fi -etc/dnsmasq.conf.example -@exec if [ ! -f %D/etc/dnsmasq.conf ]; then cp -p %D/%F %B/dnsmasq.conf; fi +@sample etc/dnsmasq.conf.sample man/man8/dnsmasq.8.gz %%DATADIR%%/trust-anchors.conf %%EXAMPLESDIR%%/dnslist/dhcp.css
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506160048.t5G0m28a087619>