diff options
author | tcely <tcely@users.noreply.github.com> | 2018-09-10 19:38:03 -0400 |
---|---|---|
committer | Andy Postnikov <apostnikov@gmail.com> | 2018-09-13 01:12:59 +0300 |
commit | 009fc7167b17f8d97f9c89828d81b905d947b4aa (patch) | |
tree | a6b535d0d87145777139be10a6801bfa84257b7d /community/pdns-recursor/libressl-2.7.patch | |
parent | 399adaf7e68d025352ff2cb840d135f36f7a388e (diff) | |
download | aports-009fc7167b17f8d97f9c89828d81b905d947b4aa.tar.bz2 aports-009fc7167b17f8d97f9c89828d81b905d947b4aa.tar.xz |
community/pdns-recursor: upgrade to 4.1.4
Diffstat (limited to 'community/pdns-recursor/libressl-2.7.patch')
-rw-r--r-- | community/pdns-recursor/libressl-2.7.patch | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/community/pdns-recursor/libressl-2.7.patch b/community/pdns-recursor/libressl-2.7.patch index f21249e103..7456cdce62 100644 --- a/community/pdns-recursor/libressl-2.7.patch +++ b/community/pdns-recursor/libressl-2.7.patch @@ -1,13 +1,31 @@ +From 1648b8ff39c705fdee526cd73bf2652982b80087 Mon Sep 17 00:00:00 2001 +From: Remi Gacogne <remi.gacogne@powerdns.com> +Date: Sat, 8 Sep 2018 17:15:14 +0200 +Subject: [PATCH] Fix compilation with LibreSSL 2.7.0+ + +--- + pdns/opensslsigners.cc | 4 ++++ + 1 file changed, 4 insertions(+) + diff --git a/pdns/opensslsigners.cc b/pdns/opensslsigners.cc -index 8e3bb54..459939a 100644 +index 6a2e856940..d0a65e6489 100644 --- a/opensslsigners.cc +++ b/opensslsigners.cc -@@ -33,7 +33,7 @@ - #include "opensslsigners.hh" - #include "dnssecinfra.hh" +@@ -77,6 +77,8 @@ void openssl_thread_cleanup() + OPENSSL_free(openssllocks); + } --#if (OPENSSL_VERSION_NUMBER < 0x1010000fL || defined LIBRESSL_VERSION_NUMBER) -+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) - /* OpenSSL < 1.1.0 needs support for threading/locking in the calling application. */ - static pthread_mutex_t *openssllocks; ++#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL ++/* those symbols are defined in LibreSSL 2.7.0+ */ + /* compat helpers. These DO NOT do any of the checking that the libssl 1.1 functions do. */ + static inline void RSA_get0_key(const RSA* rsakey, const BIGNUM** n, const BIGNUM** e, const BIGNUM** d) { + *n = rsakey->n; +@@ -144,6 +146,8 @@ static inline int ECDSA_SIG_set0(ECDSA_SIG* signature, BIGNUM* pr, BIGNUM* ps) { + } + #endif /* HAVE_LIBCRYPTO_ECDSA */ ++#endif /* !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL */ ++ + #else + void openssl_thread_setup() {} + void openssl_thread_cleanup() {} |