diff options
| author | brnrd <brnrd@FreeBSD.org> | 2016-08-22 18:58:06 +0800 |
|---|---|---|
| committer | brnrd <brnrd@FreeBSD.org> | 2016-08-22 18:58:06 +0800 |
| commit | c80625589ddbf2fe75f61abad4fd20d03c87d465 (patch) | |
| tree | af113291b04669fd2408711657adf1fdcec99157 /dns | |
| parent | 23bd737c73b94ecdec99ad8175e13d4d805e1fdd (diff) | |
| download | freebsd-ports-gnome-c80625589ddbf2fe75f61abad4fd20d03c87d465.tar.gz freebsd-ports-gnome-c80625589ddbf2fe75f61abad4fd20d03c87d465.tar.zst freebsd-ports-gnome-c80625589ddbf2fe75f61abad4fd20d03c87d465.zip | |
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
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/powerdns-recursor/files/patch-libressl | 31 | ||||
| -rw-r--r-- | dns/powerdns/files/patch-libressl | 31 |
2 files changed, 62 insertions, 0 deletions
diff --git a/dns/powerdns-recursor/files/patch-libressl b/dns/powerdns-recursor/files/patch-libressl new file mode 100644 index 000000000000..37b1994ed150 --- /dev/null +++ b/dns/powerdns-recursor/files/patch-libressl @@ -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; + diff --git a/dns/powerdns/files/patch-libressl b/dns/powerdns/files/patch-libressl new file mode 100644 index 000000000000..59d46acf9527 --- /dev/null +++ b/dns/powerdns/files/patch-libressl @@ -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; + |