Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Mar 2017 22:43:56 +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: r436660 - head/dns/dnsmasq
Message-ID:  <201703212243.v2LMhuRY062339@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Tue Mar 21 22:43:56 2017
New Revision: 436660
URL: https://svnweb.freebsd.org/changeset/ports/436660

Log:
  Allow build on PF-less (NO_IPSET) systems.
  
  This adds a new ports option, IPSET, defaulting to on.
  
  Use the opportunity to use the options helpers OPT_CFLAGS[_OFF] on the
  trivial options.
  
  PR:		217900
  Submitted by:	Oliver Pinter <oliver.pinter@hardenedbsd.org>

Modified:
  head/dns/dnsmasq/Makefile

Modified: head/dns/dnsmasq/Makefile
==============================================================================
--- head/dns/dnsmasq/Makefile	Tue Mar 21 21:59:31 2017	(r436659)
+++ head/dns/dnsmasq/Makefile	Tue Mar 21 22:43:56 2017	(r436660)
@@ -24,14 +24,15 @@ CFLAGS+=	-Wall -Wno-unused-value -Wno-un
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" COPTS="${CFLAGS}" LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}"
 
-OPTIONS_DEFINE=		IPV6 DBUS LUA DNSSEC DOCS
-OPTIONS_DEFAULT=	DNSSEC
+OPTIONS_DEFINE=		IPSET IPV6 DBUS LUA DNSSEC DOCS
+OPTIONS_DEFAULT=	DNSSEC IPSET
 OPTIONS_EXCLUDE+=	EXAMPLES
 OPTIONS_RADIO=		INTL
 OPTIONS_RADIO_INTL=	IDN NLS
 INTL_DESC=	Internationalization Support Level
 NLS_DESC=	IDN+NLS: Int'l Domain Names & National Language support
 IDN_DESC=	IDN: Int'l Domain Names WITHOUT full NLS
+IPSET_DESC=	Dynamic firewall managment of resolved names (require PF)
 LUA_DESC=	Support lease-change scripts written in Lua
 DNSSEC_DESC=	Enable DNSSEC caching and validation
 USES=		cpe shebangfix tar:xz
@@ -41,9 +42,8 @@ CPE_VENDOR=	thekelleys
 
 .include <bsd.port.options.mk>
 
-.if empty(PORT_OPTIONS:MIPV6)
-CFLAGS+=	-DNO_IPV6
-.endif
+IPV6_CFLAGS_OFF=-DNO_IPV6
+IPSET_CFLAGS_OFF=-DNO_IPSET
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext gmake iconv pkgconfig



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703212243.v2LMhuRY062339>