View | Details | Raw Unified | Return to bug 250961 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-8 / +13 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	powerdns
3
PORTNAME=	powerdns
4
DISTVERSION=	4.3.1
4
DISTVERSION=	4.3.1
5
PORTREVISION=	1
5
CATEGORIES=	dns
6
CATEGORIES=	dns
6
MASTER_SITES=	https://downloads.powerdns.com/releases/
7
MASTER_SITES=	https://downloads.powerdns.com/releases/
7
DISTNAME=	pdns-${DISTVERSION}
8
DISTNAME=	pdns-${DISTVERSION}
Lines 14-20 Link Here
14
BROKEN_sparc64=	Does not compile: error: to_string is not a member of std
15
BROKEN_sparc64=	Does not compile: error: to_string is not a member of std
15
16
16
LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
17
LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
17
		libcurl.so:ftp/curl
18
		libcurl.so:ftp/curl \
19
		libprotobuf.so:devel/protobuf
18
20
19
USES=		compiler:c++11-lib cpe gmake libtool localbase:ldflags pathfix \
21
USES=		compiler:c++11-lib cpe gmake libtool localbase:ldflags pathfix \
20
		pkgconfig ssl tar:bzip2
22
		pkgconfig ssl tar:bzip2
Lines 28-34 Link Here
28
		--sysconfdir="${PREFIX}/etc/pdns" \
30
		--sysconfdir="${PREFIX}/etc/pdns" \
29
		--with-boost="${LOCALBASE}" \
31
		--with-boost="${LOCALBASE}" \
30
		--with-dynmodules="pipe bind ${MODULES}" \
32
		--with-dynmodules="pipe bind ${MODULES}" \
31
		--with-modules=""
33
		--with-modules="" \
34
		--with-protobuf
32
35
33
INSTALL_TARGET=	install-strip
36
INSTALL_TARGET=	install-strip
34
SCRIPTS_ENV=	CURDIR2="${.CURDIR}" DISTNAME="${DISTNAME}" MKDIR="${MKDIR}" \
37
SCRIPTS_ENV=	CURDIR2="${.CURDIR}" DISTNAME="${DISTNAME}" MKDIR="${MKDIR}" \
Lines 36-44 Link Here
36
		WRKDIRPREFIX="${WRKDIRPREFIX}"
39
		WRKDIRPREFIX="${WRKDIRPREFIX}"
37
SUB_FILES=	pkg-message
40
SUB_FILES=	pkg-message
38
41
42
USERS=		pdns
43
GROUPS=		pdns
44
39
OPTIONS_DEFINE=			DOCS EXAMPLES GEOIP IXFRDIST LMDB LUABACKEND \
45
OPTIONS_DEFINE=			DOCS EXAMPLES GEOIP IXFRDIST LMDB LUABACKEND \
40
				MYSQL OPENLDAP PGSQL PROTOBUF REMOTE SQLITE3 \
46
				MYSQL OPENLDAP PGSQL REMOTE SQLITE3 TINYDNS \
41
				TINYDNS TOOLS UNIXODBC
47
				TOOLS UNIXODBC
42
OPTIONS_DEFAULT=		LMDB LUA MYSQL PGSQL SQLITE3
48
OPTIONS_DEFAULT=		LMDB LUA MYSQL PGSQL SQLITE3
43
OPTIONS_GROUP=			GEOIPOPT REMOTEOPT
49
OPTIONS_GROUP=			GEOIPOPT REMOTEOPT
44
OPTIONS_GROUP_REMOTEOPT=	ZEROMQ
50
OPTIONS_GROUP_REMOTEOPT=	ZEROMQ
Lines 58-64 Link Here
58
MYSQL_DESC=		MySQL backend
64
MYSQL_DESC=		MySQL backend
59
OPENLDAP_DESC=		OpenLDAP backend
65
OPENLDAP_DESC=		OpenLDAP backend
60
PGSQL_DESC=		PostgreSQL backend
66
PGSQL_DESC=		PostgreSQL backend
61
PROTOBUF_DESC=		Protobuf support
62
REMOTEOPT_DESC=		Remote backend connectors
67
REMOTEOPT_DESC=		Remote backend connectors
63
REMOTE_DESC=		Remote backend
68
REMOTE_DESC=		Remote backend
64
SQLITE3_DESC=		SQLite 3 backend
69
SQLITE3_DESC=		SQLite 3 backend
Lines 70-75 Link Here
70
			libyaml-cpp.so:devel/yaml-cpp
75
			libyaml-cpp.so:devel/yaml-cpp
71
GEOIP_VARS=		MODULES+=geoip
76
GEOIP_VARS=		MODULES+=geoip
72
77
78
IXFRDIST_LIB_DEPENDS=	libyaml-cpp.so:devel/yaml-cpp
73
IXFRDIST_CONFIGURE_ENABLE=	ixfrdist
79
IXFRDIST_CONFIGURE_ENABLE=	ixfrdist
74
80
75
LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
81
LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
Lines 100-108 Link Here
100
PGSQL_CONFIGURE_ON=	--with-pg-config=${LOCALBASE}/bin/pg_config
106
PGSQL_CONFIGURE_ON=	--with-pg-config=${LOCALBASE}/bin/pg_config
101
PGSQL_VARS=		MODULES+=gpgsql
107
PGSQL_VARS=		MODULES+=gpgsql
102
108
103
PROTOBUF_LIB_DEPENDS=		libprotobuf.so:devel/protobuf
104
PROTOBUF_CONFIGURE_WITH=	protobuf
105
106
REMOTE_VARS=	MODULES+=remote
109
REMOTE_VARS=	MODULES+=remote
107
110
108
SQLITE3_USES=	sqlite:3
111
SQLITE3_USES=	sqlite:3
Lines 129-134 Link Here
129
			--with-libsodium
132
			--with-libsodium
130
LIB_DEPENDS+=		libdecaf.so:security/libdecaf \
133
LIB_DEPENDS+=		libdecaf.so:security/libdecaf \
131
			libsodium.so:security/libsodium
134
			libsodium.so:security/libsodium
135
.else
136
CONFIGURE_ARGS+=	--with-libsodium=no
132
.endif
137
.endif
133
138
134
post-install::
139
post-install::
(-)files/patch-pdns_common__startup.cc (+13 lines)
Line 0 Link Here
1
--- pdns/common_startup.cc.orig	2020-02-24 14:34:14 UTC
2
+++ pdns/common_startup.cc
3
@@ -191,8 +191,8 @@ void declareArguments()
4
 
5
   ::arg().setSwitch("no-shuffle","Set this to prevent random shuffling of answers - for regression testing")="off";
6
 
7
-  ::arg().set("setuid","If set, change user id to this uid for more security")="";
8
-  ::arg().set("setgid","If set, change group id to this gid for more security")="";
9
+  ::arg().set("setuid","If set, change user id to this uid for more security")="pdns";
10
+  ::arg().set("setgid","If set, change group id to this gid for more security")="pdns";
11
 
12
   ::arg().set("max-cache-entries", "Maximum number of entries in the query cache")="1000000";
13
   ::arg().set("max-packet-cache-entries", "Maximum number of entries in the packet cache")="1000000";
(-)files/pdns.in (-1 / +1 lines)
Lines 31-37 Link Here
31
pidfile=/var/run/pdns/${name}.pid
31
pidfile=/var/run/pdns/${name}.pid
32
32
33
command=%%PREFIX%%/sbin/pdns_server
33
command=%%PREFIX%%/sbin/pdns_server
34
command_args="--daemon --guardian"
34
command_args="${pdns_flags} --daemon --guardian"
35
35
36
monitor_cmd="${command} --daemon=no --guardian=no --control-console --loglevel=9"
36
monitor_cmd="${command} --daemon=no --guardian=no --control-console --loglevel=9"
37
extra_commands="monitor"
37
extra_commands="monitor"
(-)pkg-plist (-2 / +2 lines)
Lines 3-9 Link Here
3
bin/zone2json
3
bin/zone2json
4
bin/zone2sql
4
bin/zone2sql
5
sbin/pdns_server
5
sbin/pdns_server
6
%%PROTOBUF%%bin/dnspcap2protobuf
6
bin/dnspcap2protobuf
7
%%TOOLS%%bin/calidns
7
%%TOOLS%%bin/calidns
8
%%TOOLS%%bin/dnsbulktest
8
%%TOOLS%%bin/dnsbulktest
9
%%TOOLS%%bin/dnsgram
9
%%TOOLS%%bin/dnsgram
Lines 54-60 Link Here
54
man/man1/zone2json.1.gz
54
man/man1/zone2json.1.gz
55
%%OPENLDAP%%man/man1/zone2ldap.1.gz
55
%%OPENLDAP%%man/man1/zone2ldap.1.gz
56
man/man1/zone2sql.1.gz
56
man/man1/zone2sql.1.gz
57
%%PROTOBUF%%man/man1/dnspcap2protobuf.1.gz
57
man/man1/dnspcap2protobuf.1.gz
58
%%TOOLS%%man/man1/dnstcpbench.1.gz
58
%%TOOLS%%man/man1/dnstcpbench.1.gz
59
%%TOOLS%%man/man1/dnsreplay.1.gz
59
%%TOOLS%%man/man1/dnsreplay.1.gz
60
%%TOOLS%%man/man1/dnsscope.1.gz
60
%%TOOLS%%man/man1/dnsscope.1.gz

Return to bug 250961