[UPDATE] PowerDNS to 4.0.1

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[UPDATE] PowerDNS to 4.0.1

Florian Obser-2
If been running 4.x since some time. Thanks to sthen@ this update is
now presentable :)

OK?

diff --git Makefile Makefile
index 638abb3..92c83d1 100644
--- Makefile
+++ Makefile
@@ -8,8 +8,7 @@ COMMENT-mysql= MySQL database access module for PowerDNS
 COMMENT-pgsql= PGSQL database access module for PowerDNS
 COMMENT-ldap= LDAP module for PowerDNS
 
-V= 3.4.9
-REVISION-main= 0
+V= 4.0.1
 DISTNAME= pdns-${V}
 EXTRACT_SUFX = .tar.bz2
 PKGNAME= powerdns-${V}
@@ -26,19 +25,24 @@ MULTI_PACKAGES= -main -mysql -pgsql -ldap
 # GPLv2
 PERMIT_PACKAGE_CDROM= Yes
 
-WANTLIB += m pthread stdc++
+MODULES += gcc4
+MODGCC4_ARCHS = *
+MODGCC4_LANGS = c++
+
+WANTLIB += m pthread
+#WANTLIB += ${MODGCC4_CPPWANTLIB}
 
 WANTLIB-main += ${WANTLIB}
-WANTLIB-main += boost_program_options-mt boost_serialization-mt botan-1.10
+WANTLIB-main += boost_program_options-mt boost_serialization-mt
 WANTLIB-main += bz2 c crypto gmp sqlite3 z
 
 MASTER_SITES= http://downloads.powerdns.com/releases/
 
 NO_TEST= Yes
 
-LIB_DEPENDS-main= devel/boost \
- devel/gmp \
- security/botan
+LIB_DEPENDS-main= ${LIB_DEPENDS} \
+ devel/boost \
+ devel/gmp
 
 PSEUDO_FLAVORS+= no_mysql no_pgsql no_ldap
 FLAVOR?=
@@ -49,12 +53,13 @@ SYSCONFDIR= ${BASESYSCONFDIR}/pdns
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= --disable-shared \
- --with-modules="geo bind" \
+ --with-modules="bind" \
  --with-sqlite3 \
  --with-dynmodules="${BACKENDS}" \
  --without-lua \
- --enable-botan1.10 \
- --disable-hardening
+ --disable-hardening \
+ --without-protobuf
+
 CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
  LDFLAGS="-L${LOCALBASE}/lib"
 LIBTOOL_FLAGS= --tag=disable-static
@@ -68,7 +73,8 @@ BACKENDS+= gmysql
 .else
 CONFIGURE_ARGS+= --without-mysql
 .endif
-LIB_DEPENDS-mysql= databases/mariadb
+LIB_DEPENDS-mysql= ${LIB_DEPENDS} \
+ databases/mariadb
 RUN_DEPENDS-mysql= ${FULLPKGNAME-main}:net/powerdns
 WANTLIB-mysql+= crypto lib/mysql/mysqlclient ssl z ${WANTLIB}
 
@@ -80,7 +86,8 @@ BACKENDS+= gpgsql
 .else
 CONFIGURE_ARGS+= --without-pgsql
 .endif
-LIB_DEPENDS-pgsql= databases/postgresql,-main
+LIB_DEPENDS-pgsql= ${LIB_DEPENDS} \
+ databases/postgresql,-main
 RUN_DEPENDS-pgsql= ${FULLPKGNAME-main}:net/powerdns
 WANTLIB-pgsql= crypto pq>=2 ssl ${WANTLIB}
 
@@ -90,11 +97,11 @@ BACKENDS+= ldap
 .else
 CONFIGURE_ARGS+= --without-ldap
 .endif
-LIB_DEPENDS-ldap= databases/openldap
+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:
  rm -f ${PREFIX}/lib/pdns/*.la
diff --git distinfo distinfo
index 8db5796..906c55e 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (pdns-3.4.9.tar.bz2) = KxEk2y2TftZmZSW5/GCl3VXLgvTK5YEWy5ht5T+qXf8=
-SIZE (pdns-3.4.9.tar.bz2) = 1351434
+SHA256 (pdns-4.0.1.tar.bz2) = 0ZHu1KZmRDDoWWn0mDXFnoEOy7ez61BuZMayc0CR7dc=
+SIZE (pdns-4.0.1.tar.bz2) = 1304788
diff --git patches/patch-pdns_dns_random_cc patches/patch-pdns_dns_random_cc
new file mode 100644
index 0000000..6a79c33
--- /dev/null
+++ patches/patch-pdns_dns_random_cc
@@ -0,0 +1,23 @@
+$OpenBSD$
+Fix build with LibreSSL, for which OPENSSL_VERSION_NUMBER is irrelevant
+commit 115f658ee2000a4cdcc13e999da50b3634c6a907
+--- pdns/dns_random.cc.orig Fri Jul 29 16:32:32 2016
++++ pdns/dns_random.cc Tue Aug 16 14:11:23 2016
+@@ -2,7 +2,7 @@
+ #include "config.h"
+ #endif
+ #include <openssl/aes.h>
+-#if OPENSSL_VERSION_NUMBER > 0x1000100fL
++#if OPENSSL_VERSION_NUMBER > 0x1000100fL && !defined LIBRESSL_VERSION_NUMBER
+ // Older OpenSSL does not have CRYPTO_ctr128_encrypt. Before 1.1.0 the header
+ // file did not have the necessary extern "C" wrapper. In 1.1.0, AES_ctr128_encrypt
+ // was removed.
+@@ -53,7 +53,7 @@ unsigned int dns_random(unsigned int n)
+   if(!g_initialized)
+     abort();
+   uint32_t out;
+-#if OPENSSL_VERSION_NUMBER > 0x1000100fL
++#if OPENSSL_VERSION_NUMBER > 0x1000100fL && !defined LIBRESSL_VERSION_NUMBER
+   CRYPTO_ctr128_encrypt((const unsigned char*)&g_in, (unsigned char*) &out, sizeof(g_in), &aes_key, g_counter, g_stream, &g_offset, (block128_f) AES_encrypt);
+ #else
+   AES_ctr128_encrypt((const unsigned char*)&g_in, (unsigned char*) &out, sizeof(g_in), &aes_key, g_counter, g_stream, &g_offset);
diff --git patches/patch-pdns_opensslsigners_cc patches/patch-pdns_opensslsigners_cc
new file mode 100644
index 0000000..a09409c
--- /dev/null
+++ patches/patch-pdns_opensslsigners_cc
@@ -0,0 +1,14 @@
+$OpenBSD$
+Fix build with LibreSSL, for which OPENSSL_VERSION_NUMBER is irrelevant
+commit 115f658ee2000a4cdcc13e999da50b3634c6a907
+--- pdns/opensslsigners.cc.orig Fri Jul 29 16:32:32 2016
++++ pdns/opensslsigners.cc Tue Aug 16 14:11:23 2016
+@@ -12,7 +12,7 @@
+ #include "opensslsigners.hh"
+ #include "dnssecinfra.hh"
+
+-#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if (OPENSSL_VERSION_NUMBER < 0x1010000fL || defined LIBRESSL_VERSION_NUMBER)
+ /* OpenSSL < 1.1.0 needs support for threading/locking in the calling application. */
+ static pthread_mutex_t *openssllocks;
+
diff --git pkg/PLIST-main pkg/PLIST-main
index d0f1149..9bf191d 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -7,17 +7,32 @@
 @newuser _powerdns:609:_powerdns:daemon:PowerDNS Server:/nonexistent:/sbin/nologin
 @extraunexec rm -rf /var/pdnsd/*
 @bin bin/pdns_control
-@bin bin/pdnssec
+@bin bin/pdnsutil
 @bin bin/zone2json
 @bin bin/zone2ldap
 @bin bin/zone2sql
 lib/pdns/
 lib/pdns/libbindbackend.so
-lib/pdns/libgeobackend.so
 lib/pdns/libgsqlite3backend.so
+@man man/man1/calidns.1
+@man man/man1/dnsbulktest.1
+@man man/man1/dnsgram.1
+@man man/man1/dnsreplay.1
+@man man/man1/dnsscan.1
+@man man/man1/dnsscope.1
+@man man/man1/dnstcpbench.1
+@man man/man1/dnswasher.1
+@man man/man1/dumresp.1
+@man man/man1/ixplore.1
+@man man/man1/nproxy.1
+@man man/man1/nsec3dig.1
 @man man/man1/pdns_control.1
+@man man/man1/pdns_notify.1
 @man man/man1/pdns_server.1
-@man man/man1/pdnssec.1
+@man man/man1/pdnsutil.1
+@man man/man1/saxfr.1
+@man man/man1/sdig.1
+@man man/man1/zone2json.1
 @man man/man1/zone2ldap.1
 @man man/man1/zone2sql.1
 @bin sbin/pdns_server

--
I'm not entirely sure you are real.