Attachment 219704 Details for Bug 250961 – dns/powerdns: Fix dependencies

[patch] dns/powerdns: Fix dependencies

dns_powerdns-4.3.1_1.diff (text/plain), 9.51 KB, created by Juraj Lutter on 2020-11-15 16:56:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Juraj Lutter

Created: 2020-11-15 16:56:03 UTC

Size: 9.51 KB

patch

obsolete

>diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
>index 0919ec5abed3..c24a0011dfe4 100644
>--- a/dns/powerdns/Makefile
>+++ b/dns/powerdns/Makefile
>@@ -1,139 +1,145 @@
> # $FreeBSD$
> 
> PORTNAME=	powerdns
> DISTVERSION=	4.3.1
>+PORTREVISION=	1
> CATEGORIES=	dns
> MASTER_SITES=	https://downloads.powerdns.com/releases/
> DISTNAME=	pdns-${DISTVERSION}
> 
> MAINTAINER=	tremere@cainites.net
> COMMENT=	Advanced DNS server with multiple backends including SQL
> 
> LICENSE=	GPLv2
> 
> BROKEN_sparc64=	Does not compile: error: to_string is not a member of std
> 
> LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
>-		libcurl.so:ftp/curl
>+		libcurl.so:ftp/curl \
>+		libprotobuf.so:devel/protobuf
> 
> USES=		compiler:c++11-lib cpe gmake libtool localbase:ldflags pathfix \
> 		pkgconfig ssl tar:bzip2
>+
> USE_LDCONFIG=	YES
> USE_RC_SUBR=	pdns
> USE_SUBMAKE=	YES
> 
> GNU_CONFIGURE=	YES
> CONFIGURE_ARGS=	--disable-static \
> 		--docdir="${PREFIX}/share/doc/powerdns" \
> 		--sysconfdir="${PREFIX}/etc/pdns" \
> 		--with-boost="${LOCALBASE}" \
> 		--with-dynmodules="pipe bind ${MODULES}" \
>-		--with-modules=""
>+		--with-modules="" \
>+		--with-protobuf
> 
> INSTALL_TARGET=	install-strip
> SCRIPTS_ENV=	CURDIR2="${.CURDIR}" DISTNAME="${DISTNAME}" MKDIR="${MKDIR}" \
> 		POWERDNS_OPTIONS="${POWERDNS_OPTIONS}" \
> 		WRKDIRPREFIX="${WRKDIRPREFIX}"
> SUB_FILES=	pkg-message
> 
>+USERS=		pdns
>+GROUPS=		pdns
>+
> OPTIONS_DEFINE=			DOCS EXAMPLES GEOIP IXFRDIST LMDB LUABACKEND \
>-				MYSQL OPENLDAP PGSQL PROTOBUF REMOTE SQLITE3 \
>-				TINYDNS TOOLS UNIXODBC
>+				MYSQL OPENLDAP PGSQL REMOTE SQLITE3 TINYDNS \
>+				TOOLS UNIXODBC
> OPTIONS_DEFAULT=		LMDB LUA MYSQL PGSQL SQLITE3
> OPTIONS_GROUP=			GEOIPOPT REMOTEOPT
> OPTIONS_GROUP_REMOTEOPT=	ZEROMQ
> OPTIONS_SINGLE=			EXTLUA
> OPTIONS_SINGLE_EXTLUA=		LUA LUAJIT LUAJITOR
> 
> OPTIONS_SUB=	yes
> 
> GEOIPOPT_DESC=		GeoIP DB options
> GEOIP_DESC=		GeoIP backend (GeoIP2 DB)
> IXFRDIST_DESC=		Build ixfrdist
> LMDB_DESC=		LMDB backend
> LUABACKEND_DESC=	Lua2 backend
> LUAJITOR_DESC=		Use lang/luajit-openresty
> LUAJIT_DESC=		Use lang/luajit
> LUA_DESC=		Use lang/lua
> MYSQL_DESC=		MySQL backend
> OPENLDAP_DESC=		OpenLDAP backend
> PGSQL_DESC=		PostgreSQL backend
>-PROTOBUF_DESC=		Protobuf support
> REMOTEOPT_DESC=		Remote backend connectors
> REMOTE_DESC=		Remote backend
> SQLITE3_DESC=		SQLite 3 backend
> TINYDNS_DESC=		TinyDNS backend
> TOOLS_DESC=		Build extra tools
> ZEROMQ_DESC=		Enable ZeroMQ connector (Implies REMOTE enabled)
> 
> GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb \
> 			libyaml-cpp.so:devel/yaml-cpp
> GEOIP_VARS=		MODULES+=geoip
> 
>+IXFRDIST_LIB_DEPENDS=		libyaml-cpp.so:devel/yaml-cpp
> IXFRDIST_CONFIGURE_ENABLE=	ixfrdist
> 
> LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
> LMDB_CONFIGURE_ON=	--with-lmdb=${LOCALBASE}
> LMDB_CONFIGURE_OFF=	--without-lmdb
> LMDB_VARS=		MODULES+=lmdb
> 
> LUABACKEND_VARS=	MODULES+=lua2
> 
> LUAJITOR_LIB_DEPENDS=	libluajit-5.1.so.2:lang/luajit-openresty
> LUAJITOR_CONFIGURE_ON=	--with-lua=luajit
> 
> LUAJIT_LIB_DEPENDS=	libluajit-5.1.so.2:lang/luajit
> LUAJIT_CONFIGURE_ON=	--with-lua=luajit
> 
> LUA_USES=	lua
> 
> MYSQL_USES=		mysql
> MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
> MYSQL_CONFIGURE_OFF=	--without-mysql
> MYSQL_VARS=		MODULES+=gmysql
> 
> OPENLDAP_USE=		OPENLDAP=YES
> OPENLDAP_CXXFLAGS=	-DLDAP_DEPRECATED=1
> OPENLDAP_VARS=		MODULES+=ldap
> 
> PGSQL_USES=		pgsql
> PGSQL_CONFIGURE_ON=	--with-pg-config=${LOCALBASE}/bin/pg_config
> PGSQL_VARS=		MODULES+=gpgsql
> 
>-PROTOBUF_LIB_DEPENDS=		libprotobuf.so:devel/protobuf
>-PROTOBUF_CONFIGURE_WITH=	protobuf
>-
> REMOTE_VARS=	MODULES+=remote
> 
> SQLITE3_USES=	sqlite:3
> SQLITE3_VARS=	MODULES+=gsqlite3
> 
> TINYDNS_LIB_DEPENDS=	libcdb.so:databases/tinycdb
> TINYDNS_CONFIGURE_ON=	CDB_CFLAGS="-I${LOCALBASE}/include" \
> 			CDB_LIBS="-L${LOCALBASE}/lib -lcdb"
> TINYDNS_VARS=		MODULES+=tinydns
> 
> TOOLS_CONFIGURE_ENABLE=	tools
> 
> UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
> UNIXODBC_VARS=		MODULES+=godbc
> 
> ZEROMQ_IMPLIES=		REMOTE
> ZEROMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
> ZEROMQ_CONFIGURE_ON=	--enable-remotebackend-zeromq
> 
> .include <bsd.port.pre.mk>
> 
> .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} != openssl
> CONFIGURE_ARGS+=	--with-libdecaf \
> 			--with-libsodium
> LIB_DEPENDS+=		libdecaf.so:security/libdecaf \
> 			libsodium.so:security/libsodium
>+.else
>+CONFIGURE_ARGS+=	--with-libsodium=no
> .endif
> 
> post-install::
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}/var/run/pdns
> 	@${STAGEDIR}${PREFIX}/sbin/pdns_server --module-dir=${STAGEDIR}${PREFIX}/lib/pdns --launch="pipe bind ${MODULES}" --config > ${STAGEDIR}${EXAMPLESDIR}/pdns.conf
> 	@${REINPLACE_CMD} -e 's;${STAGEDIR};;' -i '' ${STAGEDIR}${EXAMPLESDIR}/pdns.conf
> 
> .include <bsd.port.post.mk>
>diff --git a/dns/powerdns/files/pdns.in b/dns/powerdns/files/pdns.in
>index b3c0a61ec08c..8a8b3fa73456 100644
>--- a/dns/powerdns/files/pdns.in
>+++ b/dns/powerdns/files/pdns.in
>@@ -1,39 +1,39 @@
> #!/bin/sh
> #
> # $FreeBSD$
> #
> 
> # PROVIDE: pdns_server
> # REQUIRE: DAEMON SERVERS mysql postgresql slapd
> # 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
> 
> load_rc_config ${name}
> 
> pdns_enable=${pdns_enable:-"NO"}
> pdns_conf=${pdns_conf:-"%%PREFIX%%/etc/pdns/pdns.conf"}
> 
> required_files=${pdns_conf}
> 
> pidfile=/var/run/pdns/${name}.pid
> 
> command=%%PREFIX%%/sbin/pdns_server
>-command_args="--daemon --guardian"
>+command_args="${pdns_flags} --daemon --guardian"
> 
> monitor_cmd="${command} --daemon=no --guardian=no --control-console --loglevel=9"
> extra_commands="monitor"
> 
> run_rc_command "$1"
>diff --git a/dns/powerdns/pkg-plist b/dns/powerdns/pkg-plist
>index 03c1ed3fc114..1e1c3d3dd8b4 100644
>--- a/dns/powerdns/pkg-plist
>+++ b/dns/powerdns/pkg-plist
>@@ -1,93 +1,94 @@
> bin/pdns_control
> bin/pdnsutil
> bin/zone2json
> bin/zone2sql
> sbin/pdns_server
>-%%PROTOBUF%%bin/dnspcap2protobuf
>+bin/dnspcap2protobuf
> %%TOOLS%%bin/calidns
> %%TOOLS%%bin/dnsbulktest
> %%TOOLS%%bin/dnsgram
> %%TOOLS%%bin/dnspcap2calidns
> %%TOOLS%%bin/dnsreplay
> %%TOOLS%%bin/dnsscan
> %%TOOLS%%bin/dnsscope
> %%TOOLS%%bin/dnstcpbench
> %%TOOLS%%bin/dnswasher
> %%TOOLS%%bin/dumresp
> %%IXFRDIST%%bin/ixfrdist
> %%TOOLS%%bin/ixplore
> %%TOOLS%%bin/nproxy
> %%TOOLS%%bin/nsec3dig
> %%TOOLS%%bin/pdns_notify
> %%TOOLS%%bin/saxfr
> %%TOOLS%%bin/sdig
> %%TOOLS%%bin/stubquery
> lib/pdns/libbindbackend.so
> lib/pdns/libpipebackend.so
> %%GEOIP%%lib/pdns/libgeoipbackend.so
> %%LMDB%%lib/pdns/liblmdbbackend.so
> %%LUABACKEND%%lib/pdns/liblua2backend.so
> %%MYSQL%%lib/pdns/libgmysqlbackend.so
> %%OPENLDAP%%lib/pdns/libldapbackend.so
> %%OPENLDAP%%bin/zone2ldap
> %%PGSQL%%lib/pdns/libgpgsqlbackend.so
> %%REMOTE%%lib/pdns/libremotebackend.so
> %%SQLITE3%%lib/pdns/libgsqlite3backend.so
> %%TINYDNS%%lib/pdns/libtinydnsbackend.so
> %%UNIXODBC%%lib/pdns/libgodbcbackend.so
> %%TOOLS%%man/man1/calidns.1.gz
> %%TOOLS%%man/man1/dnsbulktest.1.gz
> %%TOOLS%%man/man1/dnsgram.1.gz
> %%TOOLS%%man/man1/dnspcap2calidns.1.gz
> %%TOOLS%%man/man1/dnsscan.1.gz
> %%TOOLS%%man/man1/dumresp.1.gz
> %%IXFRDIST%%man/man1/ixfrdist.1.gz
> %%TOOLS%%man/man1/ixplore.1.gz
> %%TOOLS%%man/man1/nproxy.1.gz
> %%TOOLS%%man/man1/nsec3dig.1.gz
> %%TOOLS%%man/man1/pdns_notify.1.gz
> man/man1/pdnsutil.1.gz
> %%TOOLS%%man/man1/saxfr.1.gz
> %%TOOLS%%man/man1/sdig.1.gz
> man/man1/pdns_control.1.gz
> man/man1/pdns_server.1.gz
> man/man1/zone2json.1.gz
> %%OPENLDAP%%man/man1/zone2ldap.1.gz
> man/man1/zone2sql.1.gz
>-%%PROTOBUF%%man/man1/dnspcap2protobuf.1.gz
>+man/man1/dnspcap2protobuf.1.gz
> %%TOOLS%%man/man1/dnstcpbench.1.gz
> %%TOOLS%%man/man1/dnsreplay.1.gz
> %%TOOLS%%man/man1/dnsscope.1.gz
> %%TOOLS%%man/man1/dnswasher.1.gz
> %%IXFRDIST%%man/man5/ixfrdist.yml.5.gz
> %%IXFRDIST%%etc/pdns/ixfrdist.example.yml
> @sample etc/pdns/pdns.conf-dist etc/pdns/pdns.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pdns.conf
> %%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%
> %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/3.4.0_to_4.1.0_schema.mysql.sql
> %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/3.4.0_to_4.1.0_schema.pgsql.sql
> %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/3.4.0_to_4.0.0_schema.sqlite3.sql
> %%UNIXODBC%%%%PORTDOCS%%%%DOCSDIR%%/4.0.0_to_4.2.0_schema.mssql.sql
> %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/4.0.0_to_4.2.0_schema.sqlite3.sql
> %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/4.1.0_to_4.2.0_schema.mysql.sql
> %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/4.1.0_to_4.2.0_schema.pgsql.sql
> %%UNIXODBC%%%%PORTDOCS%%%%DOCSDIR%%/4.2.0_to_4.3.0_schema.mssql.sql
> %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/4.2.0_to_4.3.0_schema.mysql.sql
> %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/4.2.0_to_4.3.0_schema.pgsql.sql
> %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/4.2.0_to_4.3.0_schema.sqlite3.sql
>+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/4.3.0_to_4.3.1_schema.sqlite3.sql
> %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/bind-dnssec.4.2.0_to_4.3.0_schema.sqlite3.sql
> %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/bind-dnssec.schema.sqlite3.sql
> %%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%%/enable-foreign-keys.mysql.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
> %%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/dnsdomain2.schema
> %%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/pdns-domaininfo.schema
> %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/schema.mysql.sql
> %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/schema.pgsql.sql
> %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/schema.sqlite3.sql
> %%UNIXODBC%%%%PORTDOCS%%%%DOCSDIR%%/schema.mssql.sql
> @dir(root,wheel,0755) /var/run/pdns

Actions: View | Diff

Attachments on bug 250961: 219468 | 219541 | 219542 | 219704 | 219732