Date: Thu, 16 Jan 2014 11:45:26 +0100 From: Ralf van der Enden <tremere@cainites.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/185819: [MAINTAINER] dns/powerdns-devel: update to 3.3.1,1 Message-ID: <E1W3kRy-000Nre-La@cainites.net> Resent-Message-ID: <201401161050.s0GAo0Tl083304@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185819 >Category: ports >Synopsis: [MAINTAINER] dns/powerdns-devel: update to 3.3.1,1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jan 16 10:50:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Ralf van der Enden >Release: FreeBSD 9.2-RELEASE amd64 >Organization: >Environment: System: FreeBSD lan.cainites.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255981: Wed Oct 2 10:15:07 >Description: - Update to 3.3.1,1 - Add some experimental backends (author's request) - Change startup script from pdns-devel to pdns (since dns/powerdns conflicts anyway) ChangeLog: http://doc.powerdns.com/html/changelog.html#changelog-auth-3-3-1 Generated with FreeBSD Port Tools 0.99_11 (mode: update, diff: SVN) >How-To-Repeat: >Fix: --- powerdns-devel-3.3.1,1.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 339905) +++ Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= powerdns -PORTVERSION= 3.3 +PORTVERSION= 3.3.1 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= dns ipv6 @@ -20,8 +20,9 @@ USE_GITHUB= YES GH_ACCOUNT= PowerDNS GH_PROJECT= pdns -GH_TAGNAME= auth-3.3 -GH_COMMIT= b8fe1df +GH_TAGNAME= auth-3.3.1 +#GH_TAGNAME= ${GH_COMMIT} +GH_COMMIT= 8e1c18b USE_LUA= 5.1 LUA_COMPS= lua @@ -49,14 +50,14 @@ 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,9 +68,15 @@ 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 @@ -88,10 +95,17 @@ 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 @@ -99,18 +113,21 @@ BOTAN110_CONFIGURE_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" + .include <bsd.port.pre.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 +143,7 @@ .endif .if ${PORT_OPTIONS:MOPENLDAP} -MODULES+= "ldap" +MODULES+= ldap .endif .if ${PORT_OPTIONS:MOPENLDAP_LOCAL} @@ -136,11 +153,27 @@ .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} @@ -159,9 +192,8 @@ .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,9 +214,13 @@ @${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} @@ -191,9 +227,9 @@ .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 Index: distinfo =================================================================== --- distinfo (revision 339905) +++ distinfo (working copy) @@ -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 Index: files/pdns-devel.in =================================================================== --- files/pdns-devel.in (revision 339905) +++ files/pdns-devel.in (working copy) @@ -1,38 +0,0 @@ -#!/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" Index: files/pdns.in =================================================================== --- files/pdns.in (revision 0) +++ files/pdns.in (working copy) @@ -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" Index: pkg-plist =================================================================== --- pkg-plist (revision 339905) +++ pkg-plist (working copy) @@ -36,6 +36,18 @@ %%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 --- powerdns-devel-3.3.1,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1W3kRy-000Nre-La>