Date: Sun, 15 Nov 2020 19:01:30 +0000 (UTC) From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555419 - in head: . dns/powerdns dns/powerdns/files Message-ID: <202011151901.0AFJ1Uh1065388@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mikael Date: Sun Nov 15 19:01:29 2020 New Revision: 555419 URL: https://svnweb.freebsd.org/changeset/ports/555419 Log: dns/powerdns: Adjust dependencies for tools - Adjust dependencies (IXFRTOOL needs yaml-cpp) - Explicitly disable decaf and sodium in case they are not enabled. Otherwise they default to "auto" and if detected in the system, stage-qa reports unresolved dependency. - Drop user privilges for worker processes to pdns/pdns (UID is new; GUID already exists) - Always depend on protobuf. I do the same for dnsdist and powerdns-recursor - Actually do something with the pdns_flags variable in the rc-script instead of just mentioning it in the comment block - Bump PORTREVISION PR: 250961 Submitted by: Juraj Lutter, Ralf van der Enden Approved by: Ralf van der Enden (maintainer) Modified: head/UIDs head/dns/powerdns/Makefile head/dns/powerdns/files/pdns.in head/dns/powerdns/pkg-plist Modified: head/UIDs ============================================================================== --- head/UIDs Sun Nov 15 18:50:17 2020 (r555418) +++ head/UIDs Sun Nov 15 19:01:29 2020 (r555419) @@ -126,7 +126,7 @@ mlvpn:*:176:176::0:0:mlVPN pseudo-user:/var/run/mlvpn: _mdnsd:*:177:177::0:0:Multicast DNS Daemon:/var/empty:/usr/sbin/nologin otpw:*:178:178::0:0:OTPW pseudo-user:/var/lib/otpw:/usr/sbin/nologin gdnsd:*:179:179::0:0:gDNSd pseudo-user:/nonexistent:/usr/sbin/nologin -# free: 180, GID used +pdns:*:180:120::0:0:pdns pseudo-user:/nonexistent:/usr/sbin/nologin nagios:*:181:181::0:0:Nagios pseudo-user:/var/spool/nagios:/usr/sbin/nologin noc:*:182:182::0:0:NOC pseudo-user:/usr/local/noc:/bin/sh icinga:*:183:183::0:0:Icinga pseudo-user:/var/spool/icinga:/usr/sbin/nologin Modified: head/dns/powerdns/Makefile ============================================================================== --- head/dns/powerdns/Makefile Sun Nov 15 18:50:17 2020 (r555418) +++ head/dns/powerdns/Makefile Sun Nov 15 19:01:29 2020 (r555419) @@ -2,6 +2,7 @@ PORTNAME= powerdns DISTVERSION= 4.3.1 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= https://downloads.powerdns.com/releases/ DISTNAME= pdns-${DISTVERSION} @@ -14,10 +15,12 @@ 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 @@ -28,7 +31,8 @@ CONFIGURE_ARGS= --disable-static \ --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}" \ @@ -36,9 +40,12 @@ SCRIPTS_ENV= CURDIR2="${.CURDIR}" DISTNAME="${DISTNAME 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 @@ -58,7 +65,6 @@ 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 @@ -70,6 +76,7 @@ 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 @@ -100,9 +107,6 @@ 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 @@ -129,6 +133,8 @@ 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:: Modified: head/dns/powerdns/files/pdns.in ============================================================================== --- head/dns/powerdns/files/pdns.in Sun Nov 15 18:50:17 2020 (r555418) +++ head/dns/powerdns/files/pdns.in Sun Nov 15 19:01:29 2020 (r555419) @@ -31,7 +31,7 @@ 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" Modified: head/dns/powerdns/pkg-plist ============================================================================== --- head/dns/powerdns/pkg-plist Sun Nov 15 18:50:17 2020 (r555418) +++ head/dns/powerdns/pkg-plist Sun Nov 15 19:01:29 2020 (r555419) @@ -3,7 +3,7 @@ bin/pdnsutil bin/zone2json bin/zone2sql sbin/pdns_server -%%PROTOBUF%%bin/dnspcap2protobuf +bin/dnspcap2protobuf %%TOOLS%%bin/calidns %%TOOLS%%bin/dnsbulktest %%TOOLS%%bin/dnsgram @@ -54,7 +54,7 @@ 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 @@ -75,6 +75,7 @@ man/man1/zone2sql.1.gz %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011151901.0AFJ1Uh1065388>