Attachment #178991 for bug #216136




# $FreeBSD$

PORTNAME=	powerdns
PORTVERSION=	4.0.3
PORTREVISION=	3
CATEGORIES=	dns ipv6
MASTER_SITES=	http://downloads.powerdns.com/releases/
DISTNAME=	pdns-${PORTVERSION}

BROKEN_powerpc64=	Does not build
BROKEN_sparc64=		Does not compile: error: to_string is not a member of std

USES=		compiler:c++11-lib cpe gmake libtool localbase:ldflags pathfix pkgconfig ssl \
		tar:bzip2
USE_LDCONFIG=	YES
USE_SUBMAKE=	YES
GNU_CONFIGURE=	YES
INSTALL_TARGET=	install-strip
CXXFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib
CONFIGURE_ARGS=	--disable-static \
		--with-modules="" \
		--with-dynmodules="pipe bind ${MODULES}" \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1470038374	1	TIMESTAMP = 1484653707
2	SHA256 (pdns-4.0.1.tar.bz2) = d191eed4a6664430e85969f49835c59e810ecbb7b3eb506e64c6b2734091edd7	2	SHA256 (pdns-4.0.3.tar.bz2) = 60fa21550b278b41f58701af31c9f2b121badf271fb9d7642f6d35bfbea8e282
3	SIZE (pdns-4.0.1.tar.bz2) = 1304788	3	SIZE (pdns-4.0.3.tar.bz2) = 1312299




--- pdns/dns_random.cc.orig	2016-07-29 14:32:32 UTC
+++ pdns/dns_random.cc
@@ -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);
--- pdns/opensslsigners.cc.orig	2016-07-29 14:32:32 UTC
+++ pdns/opensslsigners.cc
@@ -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;
 

Return to bug 216136

Lines 1-8 Link Here

(-)Makefile (-5 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= powerdns	3	PORTNAME= powerdns
4	PORTVERSION= 4.0.1	4	PORTVERSION= 4.0.3
5	PORTREVISION= 3
6	CATEGORIES= dns ipv6	5	CATEGORIES= dns ipv6
7	MASTER_SITES= http://downloads.powerdns.com/releases/	6	MASTER_SITES= http://downloads.powerdns.com/releases/
8	DISTNAME= pdns-${PORTVERSION}	7	DISTNAME= pdns-${PORTVERSION}
Lines 17-30 Link Here
17	BROKEN_powerpc64= Does not build	16	BROKEN_powerpc64= Does not build
18	BROKEN_sparc64= Does not compile: error: to_string is not a member of std	17	BROKEN_sparc64= Does not compile: error: to_string is not a member of std
19		18
20	USES= compiler:c++11-lib cpe gmake libtool pathfix pkgconfig ssl \	19	USES= compiler:c++11-lib cpe gmake libtool localbase:ldflags pathfix pkgconfig ssl \
21	tar:bzip2	20	tar:bzip2
22	USE_LDCONFIG= YES	21	USE_LDCONFIG= YES
23	USE_SUBMAKE= YES	22	USE_SUBMAKE= YES
24	GNU_CONFIGURE= YES	23	GNU_CONFIGURE= YES
25	INSTALL_TARGET= install-strip	24	INSTALL_TARGET= install-strip
26	CXXFLAGS+= -I${LOCALBASE}/include
27	LDFLAGS+= -L${LOCALBASE}/lib
28	CONFIGURE_ARGS= --disable-static \	25	CONFIGURE_ARGS= --disable-static \
29	--with-modules="" \	26	--with-modules="" \
30	--with-dynmodules="pipe bind ${MODULES}" \	27	--with-dynmodules="pipe bind ${MODULES}" \

Lines 1-31 Link Here

(-)files/patch-libressl (-31 lines)
1	--- pdns/dns_random.cc.orig 2016-07-29 14:32:32 UTC
2	+++ pdns/dns_random.cc
3	@@ -2,7 +2,7 @@
4	#include "config.h"
5	#endif
6	#include <openssl/aes.h>
7	-#if OPENSSL_VERSION_NUMBER > 0x1000100fL
8	+#if OPENSSL_VERSION_NUMBER > 0x1000100fL && !defined LIBRESSL_VERSION_NUMBER
9	// Older OpenSSL does not have CRYPTO_ctr128_encrypt. Before 1.1.0 the header
10	// file did not have the necessary extern "C" wrapper. In 1.1.0, AES_ctr128_encrypt
11	// was removed.
12	@@ -53,7 +53,7 @@ unsigned int dns_random(unsigned int n)
13	if(!g_initialized)
14	abort();
15	uint32_t out;
16	-#if OPENSSL_VERSION_NUMBER > 0x1000100fL
17	+#if OPENSSL_VERSION_NUMBER > 0x1000100fL && !defined LIBRESSL_VERSION_NUMBER
18	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);
19	#else
20	AES_ctr128_encrypt((const unsigned char)&g_in, (unsigned char) &out, sizeof(g_in), &aes_key, g_counter, g_stream, &g_offset);
21	--- pdns/opensslsigners.cc.orig 2016-07-29 14:32:32 UTC
22	+++ pdns/opensslsigners.cc
23	@@ -12,7 +12,7 @@
24	#include "opensslsigners.hh"
25	#include "dnssecinfra.hh"
26
27	-#if OPENSSL_VERSION_NUMBER < 0x1010000fL
28	+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL \|\| defined LIBRESSL_VERSION_NUMBER)
29	/* OpenSSL < 1.1.0 needs support for threading/locking in the calling application. */
30	static pthread_mutex_t *openssllocks;
31