On 2018/02/01 16:55, Stuart Henderson wrote:
> On 2018/02/01 16:29, Otto Moerbeek wrote:
> > Hi,
> >
> > Florian stopped being maintainer and I am not able to do ports stuff.
> > Is there anybody who can take this up? It would be much appreciated.
>
> That diff looks reasonable to me, it may need hand merging due to
> subsequent commits but that shouldn't be too fiddly. But I have no
> powerdns setup to test with..
>
...merged diff (I skipped the quirks part for now), no other changes:
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/powerdns/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- Makefile 11 Jan 2018 19:27:07 -0000 1.59
+++ Makefile 1 Feb 2018 17:05:41 -0000
@@ -5,24 +5,18 @@ BROKEN-hppa = undefined reference to '_
COMMENT-main= modular authoritative nameserver (with database support)
COMMENT-mysql= MySQL database access module for PowerDNS
COMMENT-pgsql= PGSQL database access module for PowerDNS
-COMMENT-ldap= LDAP module for PowerDNS
-V= 4.0.4
+V= 4.1.0
DISTNAME= pdns-${V}
EXTRACT_SUFX = .tar.bz2
PKGNAME= powerdns-${V}
PKGNAME-main= powerdns-${V}
PKGNAME-mysql= powerdns-mysql-${V}
PKGNAME-pgsql= powerdns-pgsql-${V}
-PKGNAME-ldap= powerdns-ldap-${V}
CATEGORIES= net
HOMEPAGE= http://www.powerdns.com/
-REVISION-ldap= 1
-REVISION-main= 2
-REVISION-mysql= 1
-REVISION-pgsql= 1
-MULTI_PACKAGES= -main -mysql -pgsql -ldap
+MULTI_PACKAGES= -main -mysql -pgsql
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@@ -30,22 +24,19 @@ PERMIT_PACKAGE_CDROM= Yes
COMPILER = base-clang ports-gcc
WANTLIB += m pthread ${COMPILER_LIBCXX}
-#WANTLIB += ${MODGCC4_CPPWANTLIB}
WANTLIB-main += ${WANTLIB}
-WANTLIB-main += boost_program_options-mt boost_serialization-mt
-WANTLIB-main += bz2 c crypto gmp sqlite3 z
+WANTLIB-main += boost_program_options-mt c crypto sqlite3
-MASTER_SITES= http://downloads.powerdns.com/releases/
+MASTER_SITES= https://downloads.powerdns.com/releases/
NO_TEST= Yes
LIB_DEPENDS-main= ${LIB_DEPENDS} \
databases/sqlite3 \
- devel/boost \
- devel/gmp
+ devel/boost
-PSEUDO_FLAVORS+= no_mysql no_pgsql no_ldap
+PSEUDO_FLAVORS+= no_mysql no_pgsql
FLAVOR?=
BACKENDS= gsqlite3
@@ -59,7 +50,9 @@ CONFIGURE_ARGS+= --disable-shared \
--with-dynmodules="${BACKENDS}" \
--without-lua \
--disable-hardening \
- --without-protobuf
+ --without-protobuf \
+ --enable-tools
+CONFIGURE_ARGS+= --without-ldap
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -91,17 +84,6 @@ LIB_DEPENDS-pgsql= ${LIB_DEPENDS} \
databases/postgresql,-main
RUN_DEPENDS-pgsql= ${FULLPKGNAME-main}:net/powerdns
WANTLIB-pgsql= crypto pq>=2 ssl ${WANTLIB}
-
-# LDAP
-.if ${BUILD_PACKAGES:M-ldap}
-BACKENDS+= ldap
-.else
-CONFIGURE_ARGS+= --without-ldap
-.endif
-LIB_DEPENDS-ldap= ${LIB_DEPENDS} \
- databases/openldap
-RUN_DEPENDS-ldap= ${FULLPKGNAME-main}:net/powerdns
-WANTLIB-ldap+= ${WANTLIB} crypto lber-2.4 ldap_r-2.4 sasl2 ssl
EXAMPLE_DIR= ${PREFIX}/share/examples/pdns/
post-install:
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/powerdns/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo 10 Jul 2017 07:42:13 -0000 1.16
+++ distinfo 1 Feb 2018 17:05:41 -0000
@@ -1,2 +1,2 @@
-SHA256 (pdns-4.0.4.tar.bz2) = 2XSrid5pR3x/WBoyM7xzHqy7Q9R5KR5HKyxTHIO212M=
-SIZE (pdns-4.0.4.tar.bz2) = 1320327
+SHA256 (pdns-4.1.0.tar.bz2) = 25GTsPAlXCTfv8Mez/i9OeIf7AX/dSblrqljq8UX8PM=
+SIZE (pdns-4.1.0.tar.bz2) = 1116905
Index: patches/patch-ext_json11_json11_cpp
===================================================================
RCS file: /cvs/ports/net/powerdns/patches/patch-ext_json11_json11_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-ext_json11_json11_cpp
--- patches/patch-ext_json11_json11_cpp 27 May 2017 06:21:43 -0000 1.1
+++ patches/patch-ext_json11_json11_cpp 1 Feb 2018 17:05:41 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-ext_json11_json11_cpp,v 1.1 2017/05/27 06:21:43 espie Exp $
-nullptrs are non-comparable.
-patch from freebsd
-
-Index: ext/json11/json11.cpp
---- ext/json11/json11.cpp.orig
-+++ ext/json11/json11.cpp
-@@ -37,11 +37,21 @@ using std::make_shared;
- using std::initializer_list;
- using std::move;
-
-+/* Helper for representing null - just a do-nothing struct, plus comparison
-+ * operators so the helpers in JsonValue work. We can't use nullptr_t because
-+ * it may not be orderable.
-+*/
-+
-+struct NullStruct {
-+ bool operator==(NullStruct) const { return true; }
-+ bool operator<(NullStruct) const { return false; }
-+};
-+
- /* * * * * * * * * * * * * * * * * * * *
- * Serialization
- */
-
--static void dump(std::nullptr_t, string &out) {
-+static void dump(NullStruct, string &out) {
- out += "null";
- }
-
-@@ -204,9 +214,9 @@ class JsonObject final : public Value<Json::OBJECT, Js
- explicit JsonObject(Json::object &&value) : Value(move(value)) {}
- };
-
--class JsonNull final : public Value<Json::NUL, std::nullptr_t> {
-+class JsonNull final : public Value<Json::NUL, NullStruct> {
- public:
-- JsonNull() : Value(nullptr) {}
-+ JsonNull() : Value({}) {}
- };
-
- /* * * * * * * * * * * * * * * * * * * *
Index: patches/patch-pdns_mplexer_hh
===================================================================
RCS file: patches/patch-pdns_mplexer_hh
diff -N patches/patch-pdns_mplexer_hh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-pdns_mplexer_hh 1 Feb 2018 17:05:41 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+needed for timeval
+
+Index: pdns/mplexer.hh
+--- pdns/mplexer.hh.orig
++++ pdns/mplexer.hh
+@@ -21,6 +21,7 @@
+ */
+ #ifndef PDNS_MPLEXER_HH
+ #define PDNS_MPLEXER_HH
++#include <sys/time.h>
+ #include <boost/function.hpp>
+ #include <boost/any.hpp>
+ #include <boost/shared_array.hpp>
Index: patches/patch-pdns_nproxy_cc
===================================================================
RCS file: patches/patch-pdns_nproxy_cc
diff -N patches/patch-pdns_nproxy_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-pdns_nproxy_cc 1 Feb 2018 17:05:41 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+needed for chroot et al
+
+Index: pdns/nproxy.cc
+--- pdns/nproxy.cc.orig
++++ pdns/nproxy.cc
+@@ -38,6 +38,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <grp.h>
++#include <unistd.h>
+ #include "dnsrecords.hh"
+ #include "mplexer.hh"
+ #include "statbag.hh"
Index: pkg/PLIST-ldap
===================================================================
RCS file: /cvs/ports/net/powerdns/pkg/PLIST-ldap,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-ldap
--- pkg/PLIST-ldap 14 Apr 2015 18:10:27 -0000 1.2
+++ pkg/PLIST-ldap 1 Feb 2018 17:05:41 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PLIST-ldap,v 1.2 2015/04/14 18:10:27 florian Exp $
-lib/pdns/libldapbackend.so
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/powerdns/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-main
--- pkg/PLIST-main 13 Jan 2017 15:38:46 -0000 1.10
+++ pkg/PLIST-main 1 Feb 2018 17:05:41 -0000
@@ -5,10 +5,24 @@
@pkgpath net/powerdns,-sqlite3
@newgroup _powerdns:609
@newuser _powerdns:609:_powerdns:daemon:PowerDNS
Server:/nonexistent:/sbin/nologin
+@bin bin/dnsbulktest
+@bin bin/dnsgram
+@bin bin/dnsreplay
+@bin bin/dnsscan
+@bin bin/dnsscope
+@bin bin/dnstcpbench
+@bin bin/dnswasher
+@bin bin/dumresp
+@bin bin/ixplore
+@bin bin/nproxy
+@bin bin/nsec3dig
@bin bin/pdns_control
+@bin bin/pdns_notify
@bin bin/pdnsutil
+@bin bin/saxfr
+@bin bin/sdig
+@bin bin/stubquery
@bin bin/zone2json
-@bin bin/zone2ldap
@bin bin/zone2sql
lib/pdns/
lib/pdns/libbindbackend.so
@@ -36,6 +50,8 @@ lib/pdns/libgsqlite3backend.so
@man man/man1/zone2sql.1
@bin sbin/pdns_server
share/doc/pdns/
+share/doc/pdns/3.4.0_to_4.1.0_schema.mysql.sql
+share/doc/pdns/3.4.0_to_4.1.0_schema.pgsql.sql
share/doc/pdns/dnssec-3.x_to_3.4.0_schema.sqlite3.sql
share/doc/pdns/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql
share/doc/pdns/schema.sqlite3.sql
