Date: Thu, 23 Jan 2014 20:16:57 +0000 (UTC) From: Danilo Egea Gondolfo <danilo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340859 - in head/dns/powerdns-devel: . files Message-ID: <201401232016.s0NKGv2e009550@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danilo Date: Thu Jan 23 20:16:57 2014 New Revision: 340859 URL: http://svnweb.freebsd.org/changeset/ports/340859 QAT: https://qat.redports.org/buildarchive/r340859/ Log: - Update from 3.3 to 3.3.1 - Add some experimental backends while here - Convert USE_LUA to USES PR: ports/185824 Submitted by: Ralf van der Enden <tremere@cainites.net> (maintainer) Added: head/dns/powerdns-devel/files/pdns.in (contents, props changed) Deleted: head/dns/powerdns-devel/files/pdns-devel.in Modified: head/dns/powerdns-devel/Makefile head/dns/powerdns-devel/distinfo head/dns/powerdns-devel/pkg-plist Modified: head/dns/powerdns-devel/Makefile ============================================================================== --- head/dns/powerdns-devel/Makefile Thu Jan 23 20:13:09 2014 (r340858) +++ head/dns/powerdns-devel/Makefile Thu Jan 23 20:16:57 2014 (r340859) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= powerdns -PORTVERSION= 3.3 +PORTVERSION= 3.3.1 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= dns ipv6 @@ -20,17 +20,14 @@ LIB_DEPENDS= libboost_serialization.so:$ USE_GITHUB= YES GH_ACCOUNT= PowerDNS GH_PROJECT= pdns -GH_TAGNAME= auth-3.3 -GH_COMMIT= b8fe1df - -USE_LUA= 5.1 -LUA_COMPS= lua +GH_TAGNAME= auth-3.3.1 +GH_COMMIT= 8e1c18b CONFLICTS= powerdns-[2-3].[0-9]* NO_LATEST_LINK= YES -USES= bison gmake pkgconfig +USES= bison gmake lua:51 pkgconfig USE_SUBMAKE= YES USE_AUTOTOOLS= autoconf:env automake:env libtool:env USE_LDCONFIG= YES @@ -49,14 +46,14 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFI SUB_FILES= pkg-message -USE_RC_SUBR+= pdns-devel +USE_RC_SUBR+= pdns OPTIONS_DEFINE= GEO MYSQL MYSQL_LOCAL OPENDBX OPENLDAP OPENLDAP_LOCAL \ PGSQL PGSQL_LOCAL POLARSSL SQLITE3 TOOLS -OPTIONS_MULTI= DNSSEC -OPTIONS_MULTI_DNSSEC= BOTAN110 CRYPTOPP +OPTIONS_GROUP= DNSSEC EXPERIMENTAL +OPTIONS_GROUP_DNSSEC= BOTAN110 CRYPTOPP +OPTIONS_GROUP_EXPERIMENTAL= LUA MYDNS REMOTE REMOTE_HTTP TINYDNS -BACKENDS_DESC= Choose backend(s) PGSQL_DESC= PostgreSQL backend PGSQL_LOCAL_DESC= RUN_DEPEND on PostgreSQL server MYSQL_DESC= MySQL backend @@ -67,16 +64,25 @@ OPENLDAP_LOCAL_DESC= RUN_DEPEND on OpenL SQLITE3_DESC= SQLite 3 backend GEO_DESC= Geo backend DNSSEC_DESC= Enable extra DNSSEC options +EXPERIMENTAL_DESC= Experimental backends BOTAN110_DESC= Faster signing + ECDSA & GOST algorithms CRYPTOPP_DESC= ECDSA algorithms POLARSSL_DESC= Use embedded PolarSSL +LUA_DESC= Lua backend +MYDNS_DESC= MyDNS backend +REMOTE_DESC= Remote backend +REMOTE_HTTP_DESC= Enable HTTP for the Remote backend +TINYDNS_DESC= TinyDNS backend TOOLS_DESC= Build extra tools OPTIONS_DEFAULT= PGSQL DNSSEC BOTAN110 POLARSSL OPTIONS_SUB= yes -TOOLS_CONFIGURE_ENABLE= tools +# 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 @@ -88,29 +94,41 @@ MYSQL_CONFIGURE_OFF= --without-mysql MYSQL_USE= MYSQL=YES MYSQL_LOCAL_USE= MYSQL=server +MYDNS_CONFIGURE_ON= --with-mysql=${LOCALBASE} +MYDNS_USE= MYSQL=YES +MYDNS_LOCAL_USE= MYSQL=server + OPENLDAP_CXXFLAGS= -DLDAP_DEPRECATED=1 OPENLDAP_USE= OPENLDAP=YES OPENLDAP_LOCAL_RUN_DEPENDS= openldap-server>=0:${PORTSDIR}/net/openldap24-server +REMOTE_HTTP_CONFIGURE_ON= --enable-remotebackend-http +REMOTE_HTTP_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl + SQLITE3_USE= SQLITE=3 OPENDBX_LIB_DEPENDS= libopendbx.so:${PORTSDIR}/databases/opendbx -BOTAN110_CONFIGURE_ENABLE= botan1.10 +BOTAN110_CONFIGURE_ON= --enable-botan1.10 BOTAN110_LIB_DEPENDS= libbotan-1.10.so:${PORTSDIR}/security/botan110 -.include <bsd.port.pre.mk> +TINYDNS_LIB_DEPENDS= libcdb.so:${PORTSDIR}/databases/tinycdb +TINYDNS_CONFIGURE_ON= CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include" + +CRYPTOPP_CONFIGURE_ON= --enable-cryptopp + +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGEO} -MODULES+= "geo" +MODULES+= geo .endif .if ${PORT_OPTIONS:MPGSQL} -MODULES+= "gpgsql" +MODULES+= gpgsql .endif .if ${PORT_OPTIONS:MMYSQL} -MODULES+= "gmysql" +MODULES+= gmysql .endif .if ${PORT_OPTIONS:MPGSQL_LOCAL} @@ -126,7 +144,7 @@ SUB_LIST+= MYSQL_REQ= .endif .if ${PORT_OPTIONS:MOPENLDAP} -MODULES+= "ldap" +MODULES+= ldap .endif .if ${PORT_OPTIONS:MOPENLDAP_LOCAL} @@ -136,11 +154,27 @@ SUB_LIST+= SLAPD_REQ= .endif .if ${PORT_OPTIONS:MSQLITE3} -MODULES+= "gsqlite3" +MODULES+= gsqlite3 +.endif + +.if ${PORT_OPTIONS:MLUA} +MODULES+= lua +.endif + +.if ${PORT_OPTIONS:MMYDNS} +MODULES+= mydns +.endif + +.if ${PORT_OPTIONS:MREMOTE} +MODULES+= remote +.endif + +.if ${PORT_OPTIONS:MTINYDNS} +MODULES+= tinydns .endif .if ${PORT_OPTIONS:MOPENDBX} -MODULES+= "opendbx" +MODULES+= opendbx .endif .if ${PORT_OPTIONS:MPOLARSSL} @@ -155,13 +189,11 @@ LIB_DEPENDS+= libcryptopp.so:${PORTSDIR . else BUILD_DEPENDS+= ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp . endif -CONFIGURE_ARGS+= --enable-cryptopp .endif pre-patch: - ${ECHO_CMD} ${BARBA} @${REINPLACE_CMD} -e "s;/bin/bash;/usr/bin/env bash;" \ - -e "s;ssed -r;sed -E -e;g" \ + -e "s;sed -r;sed -E -e;g" \ -e "s;-i;-i \.bak;g" \ ${WRKSRC}/build-scripts/set-version-auth @${REINPLACE_CMD} -e 's;\$$(LIBCURL_LIBS) \$$(MYSQL_lib);;g' \ @@ -182,21 +214,25 @@ pre-patch: @${REINPLACE_CMD} -E -e 's;(PGSQL_inc_check="\$$withval/include/pgsql)";\1 \$$withval/include";' \ ${WRKSRC}/configure.ac .endif +.if ${PORT_OPTIONS:MREMOTE_HTTP} + @${REINPLACE_CMD} -E -e 's;-module -avoid-version;-module -avoid-version \$$(LIBCURL_LIBS);' \ + ${WRKSRC}/modules/remotebackend/Makefile.am +.endif pre-configure: - @(cd ${WRKSRC} && ${WRKSRC}/build-scripts/set-version-auth git-${GH_TAGNAME} 0.0.${GH_TAGNAME} 0.0.${GH_TAGNAME} && ${WRKSRC}/bootstrap) + (cd ${WRKSRC} && ${WRKSRC}/build-scripts/set-version-auth git-${GH_TAGNAME} 0.0.${GH_TAGNAME} 0.0.${GH_TAGNAME} && ${WRKSRC}/bootstrap) post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for i in pdns.conf ${INSTALL_DATA} ${FILESDIR}/$i ${STAGEDIR}${EXAMPLESDIR}/ .endfor -.for j in libgpgsqlbackend.so libgmysqlbackend.so libgsqlite3backend.so \ - libldapbackend.so libopendbxbackend.so libgeobackend.so \ - libpipebackend.so +.for j in libtinydnsbackend.so libremotebackend.so libmydnsbackend.so libgpgsqlbackend.so \ + libgmysqlbackend.so libgsqlite3backend.so libldapbackend.so libopendbxbackend.so \ + libgeobackend.so libpipebackend.so @if ([ -f ${STAGEDIR}${PREFIX}/lib/$j ] && [ ! -f ${STAGEDIR}${PREFIX}/lib/$j.0 ]); then \ ${LN} -sf ${PREFIX}/lib/$j ${STAGEDIR}${PREFIX}/lib/$j.0; \ fi .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/dns/powerdns-devel/distinfo ============================================================================== --- head/dns/powerdns-devel/distinfo Thu Jan 23 20:13:09 2014 (r340858) +++ head/dns/powerdns-devel/distinfo Thu Jan 23 20:16:57 2014 (r340859) @@ -1,2 +1,2 @@ -SHA256 (auth-3.3.tar.gz) = 0f6e85f6ee3041718dcc5d3aa97c8e48f7dc5ab33678c5c40b2bc4e585c6a4d6 -SIZE (auth-3.3.tar.gz) = 1794516 +SHA256 (auth-3.3.1.tar.gz) = 1ea90c58ffcb0c048bc952b3edf234a763f43fcb35adefe5b4448e185f0568c0 +SIZE (auth-3.3.1.tar.gz) = 1809736 Added: head/dns/powerdns-devel/files/pdns.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/powerdns-devel/files/pdns.in Thu Jan 23 20:16:57 2014 (r340859) @@ -0,0 +1,38 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: pdns_server +# REQUIRE: DAEMON %%MYSQL_REQ%% %%PGSQL_REQ%% %%SLAPD_REQ%% +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf to enable powerdns: +# +# pdns_enable="YES" +# pdns_flags="<set as needed>" +# +# 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"} + +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" Modified: head/dns/powerdns-devel/pkg-plist ============================================================================== --- head/dns/powerdns-devel/pkg-plist Thu Jan 23 20:13:09 2014 (r340858) +++ head/dns/powerdns-devel/pkg-plist Thu Jan 23 20:16:57 2014 (r340859) @@ -36,6 +36,18 @@ sbin/pdns_server %%GEO%%lib/libgeobackend.la %%GEO%%lib/libgeobackend.so %%GEO%%lib/libgeobackend.so.0 +%%TINYDNS%%lib/libtinydnsbackend.a +%%TINYDNS%%lib/libtinydnsbackend.la +%%TINYDNS%%lib/libtinydnsbackend.so +%%TINYDNS%%lib/libtinydnsbackend.so.0 +%%REMOTE%%lib/libremotebackend.a +%%REMOTE%%lib/libremotebackend.la +%%REMOTE%%lib/libremotebackend.so +%%REMOTE%%lib/libremotebackend.so.0 +%%MYDNS%%lib/libmydnsbackend.a +%%MYDNS%%lib/libmydnsbackend.la +%%MYDNS%%lib/libmydnsbackend.so +%%MYDNS%%lib/libmydnsbackend.so.0 lib/libpipebackend.a lib/libpipebackend.la lib/libpipebackend.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401232016.s0NKGv2e009550>