Attachment 219541 Details for Bug 250961 – Fix dependencies, drop user privileges, always depend on protobuf and fix rc script

[patch] Fix dependencies, drop user privileges, always depend on protobuf and fix rc script

powerdns-4.3.1_1.diff (text/plain), 4.70 KB, created by Ralf van der Enden on 2020-11-11 07:52:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf van der Enden

Created: 2020-11-11 07:52:24 UTC

Size: 4.70 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 554861)
>+++ Makefile	(working copy)
>@@ -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,7 +15,8 @@
> 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
>@@ -28,7 +30,8 @@
> 		--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 +39,12 @@
> 		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 +64,6 @@
> 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 +75,7 @@
> 			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 +106,6 @@
> 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 +132,8 @@
> 			--with-libsodium
> LIB_DEPENDS+=		libdecaf.so:security/libdecaf \
> 			libsodium.so:security/libsodium
>+.else
>+CONFIGURE_ARGS+=	--with-libsodium=no
> .endif
> 
> post-install::
>Index: files/patch-pdns_common__startup.cc
>===================================================================
>--- files/patch-pdns_common__startup.cc	(nonexistent)
>+++ files/patch-pdns_common__startup.cc	(working copy)
>@@ -0,0 +1,13 @@
>+--- pdns/common_startup.cc.orig	2020-02-24 14:34:14 UTC
>++++ pdns/common_startup.cc
>+@@ -191,8 +191,8 @@ void declareArguments()
>+ 
>+   ::arg().setSwitch("no-shuffle","Set this to prevent random shuffling of answers - for regression testing")="off";
>+ 
>+-  ::arg().set("setuid","If set, change user id to this uid for more security")="";
>+-  ::arg().set("setgid","If set, change group id to this gid for more security")="";
>++  ::arg().set("setuid","If set, change user id to this uid for more security")="pdns";
>++  ::arg().set("setgid","If set, change group id to this gid for more security")="pdns";
>+ 
>+   ::arg().set("max-cache-entries", "Maximum number of entries in the query cache")="1000000";
>+   ::arg().set("max-packet-cache-entries", "Maximum number of entries in the packet cache")="1000000";
>
>Property changes on: files/patch-pdns_common__startup.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/pdns.in
>===================================================================
>--- files/pdns.in	(revision 554861)
>+++ files/pdns.in	(working copy)
>@@ -31,7 +31,7 @@
> 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"
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 554861)
>+++ pkg-plist	(working copy)
>@@ -3,7 +3,7 @@
> 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/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

Flags:

tremere: maintainer-approval+

Actions: View | Diff

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