Index: head/dns/powerdns/Makefile =================================================================== --- head/dns/powerdns/Makefile (revision 378860) +++ head/dns/powerdns/Makefile (revision 378861) @@ -1,163 +1,172 @@ # $FreeBSD$ PORTNAME= powerdns -PORTVERSION= 3.4.1 +PORTVERSION= 3.4.2 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ DISTNAME= pdns-${PORTVERSION} MAINTAINER= tremere@cainites.net COMMENT= Advanced DNS server with multiple backends including SQL LICENSE= GPLv2 LIB_DEPENDS= libboost_serialization.so:${PORTSDIR}/devel/boost-libs CONFLICTS= powerdns-devel-[2-3].[0-9]* -USES= gmake libtool lua:51 pkgconfig tar:bzip2 +USES= gmake libtool lua pkgconfig tar:bzip2 USE_LDCONFIG= YES USE_SUBMAKE= YES GNU_CONFIGURE= YES INSTALL_TARGET= install-strip CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" \ + LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" CONFIGURE_ARGS= --disable-static \ --with-modules="" \ --with-dynmodules="pipe bind ${MODULES}" \ --docdir="${PREFIX}/share/doc/powerdns" \ --sysconfdir="${PREFIX}/etc/pdns" \ --with-boost="${LOCALBASE}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ CURDIR2="${.CURDIR}" \ MKDIR="${MKDIR}" \ DISTNAME="${DISTNAME}" \ POWERDNS_OPTIONS="${POWERDNS_OPTIONS}" SUB_FILES= pkg-message USE_RC_SUBR= pdns -OPTIONS_DEFINE= GEO MYSQL OPENDBX OPENLDAP PGSQL POLARSSL REMOTE SQLITE3 TOOLS -OPTIONS_GROUP= DNSSEC EXPERIMENTAL -OPTIONS_GROUP_DNSSEC= BOTAN110 -OPTIONS_GROUP_EXPERIMENTAL= GEOIP LMDB LUA MYDNS TINYDNS +OPTIONS_DEFINE= GEO GEOIP LMDB MYSQL OPENDBX OPENLDAP PGSQL POLARSSL REMOTE SQLITE3 TOOLS +OPTIONS_GROUP= DNSSEC EXPERIMENTAL REMOTEOPT +OPTIONS_GROUP_DNSSEC= BOTAN110 +OPTIONS_GROUP_EXPERIMENTAL= LUA MYDNS TINYDNS +OPTIONS_GROUP_REMOTEOPT= ZEROMQ PGSQL_DESC= PostgreSQL backend MYSQL_DESC= MySQL backend OPENDBX_DESC= OpenDBX backend OPENLDAP_DESC= OpenLDAP backend SQLITE3_DESC= SQLite 3 backend GEO_DESC= Geo backend GEOIP_DESC= GeoIP backend DNSSEC_DESC= Extra DNSSEC options BOTAN110_DESC= Faster signing + ECDSA & GOST algorithms POLARSSL_DESC= Use embedded PolarSSL LMDB_DESC= LMDB backend LUA_DESC= Lua backend MYDNS_DESC= MyDNS backend REMOTE_DESC= Remote backend TINYDNS_DESC= TinyDNS backend TOOLS_DESC= Build extra tools +REMOTEOPT_DESC= Remote backend connectors +ZEROMQ_DESC= Enable ZeroMQ connector OPTIONS_DEFAULT= PGSQL DNSSEC BOTAN110 POLARSSL OPTIONS_SUB= yes # Don't use CONFIGURE_ENABLE, the configure script # has a bug. The options are being enabled even using --disable- TOOLS_CONFIGURE_ON= --enable-tools PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} PGSQL_CONFIGURE_OFF= --without-pgsql PGSQL_USES= pgsql MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} MYSQL_CONFIGURE_OFF= --without-mysql MYSQL_USE= MYSQL=YES MYDNS_CONFIGURE_ON= --with-mysql=${LOCALBASE} MYDNS_USE= MYSQL=YES OPENLDAP_CXXFLAGS= -DLDAP_DEPRECATED=1 OPENLDAP_USE= OPENLDAP=YES SQLITE3_USE= SQLITE=3 OPENDBX_LIB_DEPENDS= libopendbx.so:${PORTSDIR}/databases/opendbx BOTAN110_CONFIGURE_ON= --enable-botan1.10 BOTAN110_LIB_DEPENDS= libbotan-1.10.so:${PORTSDIR}/security/botan110 TINYDNS_LIB_DEPENDS= libcdb.so:${PORTSDIR}/databases/tinycdb TINYDNS_CONFIGURE_ON= CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include" LMDB_LIB_DEPENDS= liblmdb.so:${PORTSDIR}/databases/lmdb GEOIP_LIB_DEPENDS= libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp \ libGeoIP.so:${PORTSDIR}/net/GeoIP .include .if ${PORT_OPTIONS:MGEO} MODULES+= geo .endif .if ${PORT_OPTIONS:MGEOIP} MODULES+= geoip .endif .if ${PORT_OPTIONS:MPGSQL} MODULES+= gpgsql .endif .if ${PORT_OPTIONS:MMYSQL} MODULES+= gmysql .endif .if ${PORT_OPTIONS:MOPENLDAP} MODULES+= ldap .endif .if ${PORT_OPTIONS:MSQLITE3} MODULES+= gsqlite3 .endif .if ${PORT_OPTIONS:MLMDB} MODULES+= lmdb .endif .if ${PORT_OPTIONS:MLUA} MODULES+= lua .endif .if ${PORT_OPTIONS:MMYDNS} MODULES+= mydns .endif .if ${PORT_OPTIONS:MREMOTE} MODULES+= remote +. if ${PORT_OPTIONS:MZEROMQ} +CONFIGURE_ARGS+= --enable-remotebackend-zeromq +LIB_DEPENDS+= libzmq.so:${PORTSDIR}/net/libzmq4 +. endif .endif .if ${PORT_OPTIONS:MTINYDNS} MODULES+= tinydns .endif .if ${PORT_OPTIONS:MOPENDBX} MODULES+= opendbx .endif .if ${PORT_OPTIONS:MPOLARSSL} CONFIGURE_ARGS+= --without-system-polarssl .else LIB_DEPENDS+= libpolarssl.so:${PORTSDIR}/security/polarssl .endif post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for i in pdns.conf ${INSTALL_DATA} ${FILESDIR}/$i ${STAGEDIR}${EXAMPLESDIR}/ .endfor .include Index: head/dns/powerdns/distinfo =================================================================== --- head/dns/powerdns/distinfo (revision 378860) +++ head/dns/powerdns/distinfo (revision 378861) @@ -1,2 +1,2 @@ -SHA256 (pdns-3.4.1.tar.bz2) = 13e32a31759e7fd341b98c89fe551723a5c6a768350b3609c576f70602deb24a -SIZE (pdns-3.4.1.tar.bz2) = 1237002 +SHA256 (pdns-3.4.2.tar.bz2) = a6ab05459a0118cb921092deee06362722c45fa69ed0166ebc3696d526014b5b +SIZE (pdns-3.4.2.tar.bz2) = 1331062 Index: head/dns/powerdns/files/pdns.in =================================================================== --- head/dns/powerdns/files/pdns.in (revision 378860) +++ head/dns/powerdns/files/pdns.in (revision 378861) @@ -1,38 +1,39 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: pdns_server # REQUIRE: DAEMON SERVERS # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable powerdns: # # pdns_enable="YES" # pdns_flags="" # # See pdns_server(8) for flags. # . /etc/rc.subr name=pdns rcvar=pdns_enable command=%%PREFIX%%/sbin/pdns_server # set defaults pdns_enable=${pdns_enable:-"NO"} pdns_conf=${pdns_conf:-"%%PREFIX%%/etc/pdns/pdns.conf"} +pdns_flags=${pdns_flags:-"--daemon=yes --guardian=yes"} load_rc_config ${name} required_files=${pdns_conf} monitor_cmd="${command} --daemon=no --guardian=no --control-console --loglevel=9" extra_commands="monitor" run_rc_command "$1" Index: head/dns/powerdns/pkg-plist =================================================================== --- head/dns/powerdns/pkg-plist (revision 378860) +++ head/dns/powerdns/pkg-plist (revision 378861) @@ -1,57 +1,57 @@ bin/pdns_control bin/pdnssec bin/zone2json bin/zone2ldap bin/zone2sql sbin/pdns_server %%TOOLS%%bin/dnsbulktest %%TOOLS%%bin/dnsdist %%TOOLS%%bin/dnsreplay %%TOOLS%%bin/dnsscan %%TOOLS%%bin/dnsscope %%TOOLS%%bin/dnstcpbench %%TOOLS%%bin/dnswasher %%TOOLS%%bin/nproxy %%TOOLS%%bin/nsec3dig %%TOOLS%%bin/saxfr %%PGSQL%%lib/pdns/libgpgsqlbackend.so %%MYSQL%%lib/pdns/libgmysqlbackend.so %%SQLITE3%%lib/pdns/libgsqlite3backend.so %%OPENLDAP%%lib/pdns/libldapbackend.so %%OPENDBX%%lib/pdns/libopendbxbackend.so %%GEO%%lib/pdns/libgeobackend.so %%GEOIP%%lib/pdns/libgeoipbackend.so %%TINYDNS%%lib/pdns/libtinydnsbackend.so %%REMOTE%%lib/pdns/libremotebackend.so %%MYDNS%%lib/pdns/libmydnsbackend.so %%LUA%%lib/pdns/libluabackend.so %%LMDB%%lib/pdns/liblmdbbackend.so %%LMDB%%bin/zone2lmdb lib/pdns/libbindbackend.so lib/pdns/libpipebackend.so %%TOOLS%%man/man1/dnsdist.1.gz %%TOOLS%%man/man1/dnstcpbench.1.gz -%%TOOLS%%man/man8/dnsreplay.8.gz -%%TOOLS%%man/man8/dnsscope.8.gz -%%TOOLS%%man/man8/dnswasher.8.gz -man/man8/pdns_control.8.gz -man/man8/pdns_server.8.gz -man/man8/pdnssec.8.gz -man/man8/zone2ldap.8.gz -man/man8/zone2sql.8.gz +%%TOOLS%%man/man1/dnsreplay.1.gz +%%TOOLS%%man/man1/dnsscope.1.gz +%%TOOLS%%man/man1/dnswasher.1.gz +man/man1/pdns_control.1.gz +man/man1/pdns_server.1.gz +man/man1/pdnssec.1.gz +man/man1/zone2ldap.1.gz +man/man1/zone2sql.1.gz @unexec if cmp -s %D/etc/pdns/pdns.conf %D/etc/pdns/pdns.conf-dist; then rm -f %D/etc/pdns/pdns.conf; fi etc/pdns/pdns.conf-dist @exec [ -f %B/pdns.conf ] || cp %B/%f %B/pdns.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pdns.conf %%PORTEXAMPLES%%@dir %%EXAMPLESDIR%% %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/dnssec-3.x_to_3.4.0_schema.mysql.sql %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/dnssec-3.x_to_3.4.0_schema.pgsql.sql %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/dnssec-3.x_to_3.4.0_schema.sqlite3.sql %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/nodnssec-3.x_to_3.4.0_schema.mysql.sql %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/nodnssec-3.x_to_3.4.0_schema.pgsql.sql %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql %%MYDNS%%%%PORTDOCS%%%%DOCSDIR%%/schema.mydns.sql %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/schema.mysql.sql %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/schema.pgsql.sql %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/schema.sqlite3.sql @dir etc/pdns