Date: Mon, 22 Aug 2016 10:58:06 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420599 - in head/dns: powerdns-recursor/files powerdns/files Message-ID: <201608221058.u7MAw6Hp084841@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Mon Aug 22 10:58:06 2016 New Revision: 420599 URL: https://svnweb.freebsd.org/changeset/ports/420599 Log: dns/powerdns: Fix build with LibreSSL - Add upstream patch 115f658ee2000a4cdcc13e999da50b3634c6a907 - Patch dns/powerdns-recursor as well PR: 212016 Submitted by: Ralf van der Enden <tremere@cainites.net> (maintainer) Reported by: Ralf van der Enden <tremere@cainites.net> (maintainer) MFH: 2016Q3 Added: head/dns/powerdns-recursor/files/patch-libressl (contents, props changed) head/dns/powerdns/files/patch-libressl (contents, props changed) Added: head/dns/powerdns-recursor/files/patch-libressl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/powerdns-recursor/files/patch-libressl Mon Aug 22 10:58:06 2016 (r420599) @@ -0,0 +1,31 @@ +--- dns_random.cc.orig 2016-07-29 14:32:32 UTC ++++ 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); +--- opensslsigners.cc.orig 2016-07-29 14:32:32 UTC ++++ 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; + Added: head/dns/powerdns/files/patch-libressl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/powerdns/files/patch-libressl Mon Aug 22 10:58:06 2016 (r420599) @@ -0,0 +1,31 @@ +--- 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; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608221058.u7MAw6Hp084841>