Attachment 214238 Details for Bug 246262 – update to 4.3.0 rename patch-pdns_dns__random.cc to patch-dns_random.cc

[patch] update to 4.3.0 rename patch-pdns_dns__random.cc to patch-dns_random.cc

powerdns.diff (text/plain), 13.60 KB, created by yds on 2020-05-07 16:22:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: yds

Created: 2020-05-07 16:22:42 UTC

Size: 13.60 KB

patch

obsolete

>diff -ruN powerdns~4.2.1/Makefile powerdns/Makefile
>--- powerdns~4.2.1/Makefile	2020-01-22 00:53:20.000000000 -0500
>+++ powerdns/Makefile	2020-05-07 03:20:34.601039000 -0400
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	powerdns
>-DISTVERSION=	4.2.1
>-PORTREVISION=	1
>+DISTVERSION=	4.3.0
> CATEGORIES=	dns
> MASTER_SITES=	https://downloads.powerdns.com/releases/
> DISTNAME=	pdns-${DISTVERSION}
>@@ -37,10 +36,10 @@
> 		WRKDIRPREFIX="${WRKDIRPREFIX}"
> SUB_FILES=	pkg-message
> 
>-OPTIONS_DEFINE=			DOCS EXAMPLES GEOIP LUABACKEND LUAJIT MYDNS \
>-				MYSQL OPENDBX OPENLDAP PGSQL PROTOBUF REMOTE \
>+OPTIONS_DEFINE=			DOCS EXAMPLES GEOIP LMDB LUABACKEND LUAJIT \
>+				MYSQL OPENLDAP PGSQL PROTOBUF REMOTE \
> 				SQLITE3 TINYDNS TOOLS UNIXODBC
>-OPTIONS_DEFAULT=		MYSQL PGSQL SQLITE3
>+OPTIONS_DEFAULT=		LMDB MYSQL PGSQL SQLITE3
> OPTIONS_GROUP=			GEOIPOPT REMOTEOPT
> OPTIONS_GROUP_REMOTEOPT=	ZEROMQ
> 
>@@ -48,11 +47,10 @@
> 
> GEOIPOPT_DESC=		GeoIP DB options
> GEOIP_DESC=		GeoIP backend (GeoIP2 DB)
>+LMDB_DESC=		LMDB backend
> LUABACKEND_DESC=	Lua2 backend
> LUAJIT_DESC=		Use LuaJIT instead of Lua
>-MYDNS_DESC=		MyDNS backend
> MYSQL_DESC=		MySQL backend
>-OPENDBX_DESC=		OpenDBX backend
> OPENLDAP_DESC=		OpenLDAP backend
> PGSQL_DESC=		PostgreSQL backend
> PROTOBUF_DESC=		Protobuf support
>@@ -67,24 +65,22 @@
> 			libyaml-cpp.so:devel/yaml-cpp
> GEOIP_VARS=		MODULES+=geoip
> 
>+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
>+LMDB_CONFIGURE_OFF=	--without-lmdb
>+LMDB_CONFIGURE_ON=	--with-lmdb=${LOCALBASE}
>+LMDB_VARS=		MODULES+=lmdb
>+
> LUABACKEND_VARS=	MODULES+=lua2
> 
> LUAJIT_LIB_DEPENDS=	libluajit-5.1.so.2:lang/luajit-openresty
> LUAJIT_USES_OFF=	lua
> LUAJIT_CONFIGURE_ON=	--with-lua=luajit
> 
>-MYDNS_USES=		mysql
>-MYDNS_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
>-MYDNS_VARS=		MODULES+=mydns
>-
> MYSQL_USES=		mysql
> MYSQL_CONFIGURE_OFF=	--without-mysql
> MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
> MYSQL_VARS=		MODULES+=gmysql
> 
>-OPENDBX_LIB_DEPENDS=	libopendbx.so:databases/opendbx
>-OPENDBX_VARS=		MODULES+=opendbx
>-
> OPENLDAP_USE=		OPENLDAP=YES
> OPENLDAP_CXXFLAGS=	-DLDAP_DEPRECATED=1
> OPENLDAP_VARS=		MODULES+=ldap
>@@ -125,7 +121,7 @@
> .endif
> 
> post-install::
>-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	@${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
> 
>diff -ruN powerdns~4.2.1/distinfo powerdns/distinfo
>--- powerdns~4.2.1/distinfo	2020-01-17 13:01:31.000000000 -0500
>+++ powerdns/distinfo	2020-05-07 03:20:34.601405000 -0400
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1575879679
>-SHA256 (pdns-4.2.1.tar.bz2) = f65019986b8fcbb1c6fffebcded04b2b397b84395830f4c63e8d119bcfa1aa28
>-SIZE (pdns-4.2.1.tar.bz2) = 1252829
>+TIMESTAMP = 1588788036
>+SHA256 (pdns-4.3.0.tar.bz2) = 6be2e70f100df6f32cb431d5f57ca0aabde1fba6c11d947eccc86d44bdf95d08
>+SIZE (pdns-4.3.0.tar.bz2) = 1211536
>diff -ruN powerdns~4.2.1/files/patch-configure powerdns/files/patch-configure
>--- powerdns~4.2.1/files/patch-configure	2020-01-17 13:01:31.000000000 -0500
>+++ powerdns/files/patch-configure	2020-05-07 03:20:34.601923000 -0400
>@@ -1,6 +1,6 @@
>---- configure.orig	2019-11-29 19:23:06 UTC
>-+++ configure
>-@@ -19757,8 +19757,10 @@ fi
>+--- configure.orig	2020-02-18 21:26:30.000000000 -0500
>++++ configure	2020-02-18 21:26:30.000000000 -0500
>+@@ -19774,8 +19774,10 @@
>              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl/crypto.h in $ssldir" >&5
>  $as_echo_n "checking for openssl/crypto.h in $ssldir... " >&6; }
>              if test -f "$ssldir/include/openssl/crypto.h"; then
>diff -ruN powerdns~4.2.1/files/patch-dns_random.cc powerdns/files/patch-dns_random.cc
>--- powerdns~4.2.1/files/patch-dns_random.cc	1969-12-31 19:00:00.000000000 -0500
>+++ powerdns/files/patch-dns_random.cc	2020-05-07 03:20:34.602031000 -0400
>@@ -0,0 +1,12 @@
>+--- pdns/dns_random.cc.orig	2018-11-29 12:53:42 UTC
>++++ pdns/dns_random.cc
>+@@ -40,7 +40,9 @@
>+ #include <openssl/rand.h>
>+ #endif
>+ #if defined(HAVE_GETRANDOM)
>++extern "C" {
>+ #include <sys/random.h>
>++}
>+ #endif
>+ 
>+ static enum DNS_RNG {
>diff -ruN powerdns~4.2.1/files/patch-fix_memleak_bindbackend powerdns/files/patch-fix_memleak_bindbackend
>--- powerdns~4.2.1/files/patch-fix_memleak_bindbackend	2020-01-17 13:01:31.000000000 -0500
>+++ powerdns/files/patch-fix_memleak_bindbackend	1969-12-31 19:00:00.000000000 -0500
>@@ -1,80 +0,0 @@
>-------------------------------------------------------------------------------------------
>-bind backend: pthread_mutex_t should be inited and destroyed and not be copied #8350
>-
>-To make our live easier, use a native C++ mutex.
>-Fixes #8161
>-
>-https://github.com/PowerDNS/pdns/pull/8350
>-------------------------------------------------------------------------------------------
>---- modules/bindbackend/bindbackend2.cc.orig	2019-11-29 15:11:44 UTC
>-+++ modules/bindbackend/bindbackend2.cc
>-@@ -80,6 +80,9 @@ pthread_mutex_t Bind2Backend::s_supermaster_config_loc
>- pthread_mutex_t Bind2Backend::s_startup_lock=PTHREAD_MUTEX_INITIALIZER;
>- string Bind2Backend::s_binddirectory;  
>- 
>-+template <typename T>
>-+std::mutex LookButDontTouch<T>::s_lock;
>-+
>- BB2DomainInfo::BB2DomainInfo()
>- {
>-   d_loaded=false;
>---- modules/bindbackend/bindbackend2.hh.orig	2019-11-29 15:11:44 UTC
>-+++ modules/bindbackend/bindbackend2.hh
>-@@ -29,6 +29,7 @@
>- #include <pthread.h>
>- #include <time.h>
>- #include <fstream>
>-+#include <mutex>
>- #include <boost/utility.hpp>
>- 
>- #include <boost/tuple/tuple.hpp>
>-@@ -103,22 +104,18 @@ template <typename T>
>- class LookButDontTouch //  : public boost::noncopyable
>- {
>- public:
>--  LookButDontTouch() 
>-+  LookButDontTouch()
>-   {
>--    pthread_mutex_init(&d_lock, 0);
>--    pthread_mutex_init(&d_swaplock, 0);
>-   }
>-   LookButDontTouch(shared_ptr<T> records) : d_records(records)
>-   {
>--    pthread_mutex_init(&d_lock, 0);
>--    pthread_mutex_init(&d_swaplock, 0);
>-   }
>- 
>-   shared_ptr<const T> get()
>-   {
>-     shared_ptr<const T> ret;
>-     {
>--      Lock l(&d_lock);
>-+      std::lock_guard<std::mutex> lock(s_lock);
>-       ret = d_records;
>-     }
>-     return ret;
>-@@ -128,22 +125,14 @@ class LookButDontTouch //  : public boost::noncopyable
>-   {
>-     shared_ptr<T> ret;
>-     {
>--      Lock l(&d_lock);
>-+      std::lock_guard<std::mutex> lock(s_lock);
>-       ret = d_records;
>-     }
>-     return ret;
>-   }
>- 
>--
>--  void swap(shared_ptr<T> records)
>--  {
>--    Lock l(&d_lock);
>--    Lock l2(&d_swaplock);
>--    d_records.swap(records);
>--  }
>--  pthread_mutex_t d_lock;
>--  pthread_mutex_t d_swaplock;
>- private:
>-+  static std::mutex s_lock;
>-   shared_ptr<T> d_records;
>- };
>- 
>diff -ruN powerdns~4.2.1/files/patch-pdns_dns__random.cc powerdns/files/patch-pdns_dns__random.cc
>--- powerdns~4.2.1/files/patch-pdns_dns__random.cc	2019-09-05 12:51:04.000000000 -0400
>+++ powerdns/files/patch-pdns_dns__random.cc	1969-12-31 19:00:00.000000000 -0500
>@@ -1,12 +0,0 @@
>---- pdns/dns_random.cc.orig	2018-11-29 12:53:42 UTC
>-+++ pdns/dns_random.cc
>-@@ -40,7 +40,9 @@
>- #include <openssl/rand.h>
>- #endif
>- #if defined(HAVE_GETRANDOM)
>-+extern "C" {
>- #include <sys/random.h>
>-+}
>- #endif
>- 
>- static enum DNS_RNG {
>diff -ruN powerdns~4.2.1/files/pdns.in powerdns/files/pdns.in
>--- powerdns~4.2.1/files/pdns.in	2019-09-05 12:51:04.000000000 -0400
>+++ powerdns/files/pdns.in	2020-05-07 03:20:34.602306000 -0400
>@@ -21,17 +21,17 @@
> name=pdns
> rcvar=pdns_enable
> 
>-command=%%PREFIX%%/sbin/pdns_server
>+load_rc_config ${name}
> 
>-# set defaults
>-
> pdns_enable=${pdns_enable:-"NO"}
> pdns_conf=${pdns_conf:-"%%PREFIX%%/etc/pdns/pdns.conf"}
>-pdns_flags=${pdns_flags:-"--daemon=yes --guardian=yes"}
> 
>-load_rc_config ${name}
>-
> required_files=${pdns_conf}
>+
>+pidfile=/var/run/pdns/pdns_server.pid
>+
>+command=%%PREFIX%%/sbin/pdns_server
>+command_args="--daemon --guardian"
> 
> monitor_cmd="${command} --daemon=no --guardian=no --control-console --loglevel=9"
> extra_commands="monitor"
>diff -ruN powerdns~4.2.1/files/pkg-message.in powerdns/files/pkg-message.in
>--- powerdns~4.2.1/files/pkg-message.in	2019-09-05 12:51:04.000000000 -0400
>+++ powerdns/files/pkg-message.in	2020-05-07 03:20:34.602612000 -0400
>@@ -1,7 +1,8 @@
> [
> { type: install
>   message: <<EOM
>- Enable powerdns in /etc/rc.conf with the following line:
>+ Enable PowerDNS in /etc/rc.conf(.local) or in
>+ /etc/rc.conf.d/pdns with the following line:
> 
>     pdns_enable="YES"
> 
>@@ -20,7 +21,12 @@
>  -----------------------------------------------
>  This version needs a mandatory schema change for the gmsyql,
>  gpgsql and gsqlite3 backends. SQL statements are available in
>- %%DOCSDIR%% or http://doc.powerdns.com
>+ %%DOCSDIR%% or http://Doc.PowerDNS.com
>+ -----------------------------------------------
>+ IMPORTANT: PowerDNS Authoritative Server 4.3.0+:
>+ -----------------------------------------------
>+ MyDNS and OpenDBX backends removed 
>+ https://Blog.PowerDNS.com/2019/10/17/backend-removals-in-the-upcoming-authoritative-server-release/
> EOM
> }
> ]
>diff -ruN powerdns~4.2.1/pkg-descr powerdns/pkg-descr
>--- powerdns~4.2.1/pkg-descr	2013-08-01 02:23:50.000000000 -0400
>+++ powerdns/pkg-descr	2020-05-07 03:20:34.602899000 -0400
>@@ -1,4 +1,34 @@
>-PowerDNS is an advanced DNS server, which allows for several different
>-backends. Current backends include MySQL, PostgreSQL, bind, etc.
>+The PowerDNS Authoritative Server is the only solution that enables
>+authoritative DNS service from all major databases, including but
>+not limited to MySQL, PostgreSQL, SQLite3, LDAP and plain text files.
> 
>-WWW: http://www.powerdns.com/
>+DNS answers can also be fully scripted using a variety of (scripting)
>+languages such as Lua, Java, Perl, Python, Ruby, C and C++. Such
>+scripting can be used for dynamic redirection, (spam) filtering or
>+real time intervention.
>+
>+In addition, the PowerDNS Authoritative Server is the leading DNSSEC
>+implementation, hosting the majority of all DNSSEC domains worldwide.
>+The Authoritative Server hosts at least 30% of all domain names in
>+Europe, and around 90% of all DNSSEC domains in Europe.
>+
>+ * IPv4, UDP/TCP
>+ * IPv6, UDP/TCP, 100% compliant
>+ * Remotely pollable statistics for real time graphing
>+ * MySQL, PostgreSQL, Oracle, Sybase, Microsoft SQL Server, LDAP, SQLite3
>+   - Including replication
>+ * Near instant start up time
>+ * Plain BIND zone files
>+   - Brief start up time
>+ * Migration tools from legacy DNS platforms (zone2sql)
>+ * Internal Lua-based scripted answer generation
>+ * External high-performance Script-based answer generation
>+ * Geographical load balancing
>+ * Full DNSSEC support including all standardized algorithms
>+ * TSIG for transaction signatures, AXFR authorization/requests
>+ * Master/Slave support
>+ * Built-in web server for statistics and limited direct control
>+ * API for direct control (pdns_control, pdnssec)
>+   - Local and remote access
>+
>+WWW: https://www.PowerDNS.com/auth.html
>diff -ruN powerdns~4.2.1/pkg-plist powerdns/pkg-plist
>--- powerdns~4.2.1/pkg-plist	2019-09-05 12:51:04.000000000 -0400
>+++ powerdns/pkg-plist	2020-05-07 12:12:48.119356000 -0400
>@@ -24,10 +24,9 @@
> lib/pdns/libbindbackend.so
> lib/pdns/libpipebackend.so
> %%GEOIP%%lib/pdns/libgeoipbackend.so
>+%%LMDB%%lib/pdns/liblmdbbackend.so
> %%LUABACKEND%%lib/pdns/liblua2backend.so
>-%%MYDNS%%lib/pdns/libmydnsbackend.so
> %%MYSQL%%lib/pdns/libgmysqlbackend.so
>-%%OPENDBX%%lib/pdns/libopendbxbackend.so
> %%OPENLDAP%%lib/pdns/libldapbackend.so
> %%OPENLDAP%%bin/zone2ldap
> %%PGSQL%%lib/pdns/libgpgsqlbackend.so
>@@ -62,21 +61,27 @@
> %%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
>-%%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
>+%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/4.2.0_to_4.3.0_schema.mysql.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
>+%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/schema.mysql.sql
> %%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/dnsdomain2.schema
> %%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/pdns-domaininfo.schema
>-%%MYDNS%%%%PORTDOCS%%%%DOCSDIR%%/schema.mydns.sql
>-%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/schema.mysql.sql
>+%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/3.4.0_to_4.1.0_schema.pgsql.sql
>+%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/4.1.0_to_4.2.0_schema.pgsql.sql
>+%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/4.2.0_to_4.3.0_schema.pgsql.sql
>+%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/dnssec-3.x_to_3.4.0_schema.pgsql.sql
>+%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/nodnssec-3.x_to_3.4.0_schema.pgsql.sql
> %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/schema.pgsql.sql
>+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/3.4.0_to_4.0.0_schema.sqlite3.sql
>+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/4.0.0_to_4.2.0_schema.sqlite3.sql
>+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/4.2.0_to_4.3.0_schema.sqlite3.sql
>+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/dnssec-3.x_to_3.4.0_schema.sqlite3.sql
>+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql
> %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/schema.sqlite3.sql
>+%%UNIXODBC%%%%PORTDOCS%%%%DOCSDIR%%/4.0.0_to_4.2.0_schema.mssql.sql
>+%%UNIXODBC%%%%PORTDOCS%%%%DOCSDIR%%/4.2.0_to_4.3.0_schema.mssql.sql
> %%UNIXODBC%%%%PORTDOCS%%%%DOCSDIR%%/schema.mssql.sql
>+@dir(root,wheel,0755) /var/run/pdns

Flags:

yds: maintainer-approval?

Actions: View | Diff

Attachments on bug 246262: 214202 | 214210 | 214238