From 7eed7a68e3ce4ef71ac3a158a139310aeac3c762 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Mon, 30 Apr 2018 17:11:33 +0200
Subject: [PATCH] bind: update patches for libressl-2.7.

---
 srcpkgs/bind/patches/bind.so_bsdcompat.patch | 11 +++++
 srcpkgs/bind/patches/libressl-2.7.patch      | 52 ++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 srcpkgs/bind/patches/bind.so_bsdcompat.patch
 create mode 100644 srcpkgs/bind/patches/libressl-2.7.patch

diff --git a/srcpkgs/bind/patches/bind.so_bsdcompat.patch b/srcpkgs/bind/patches/bind.so_bsdcompat.patch
new file mode 100644
index 00000000000..5d78031b7b0
--- /dev/null
+++ b/srcpkgs/bind/patches/bind.so_bsdcompat.patch
@@ -0,0 +1,11 @@
+--- ./lib/isc/unix/socket.c.orig	2005-11-03 17:08:42.000000000 -0600
++++ ./lib/isc/unix/socket.c	2006-02-18 13:09:15.000000000 -0600
+@@ -245,6 +245,8 @@
+ 
+ #define SOCK_DEAD(s)			((s)->references == 0)
+ 
++#undef SO_BSDCOMPAT
++
+ static void
+ manager_log(isc_socketmgr_t *sockmgr,
+ 	    isc_logcategory_t *category, isc_logmodule_t *module, int level,
diff --git a/srcpkgs/bind/patches/libressl-2.7.patch b/srcpkgs/bind/patches/libressl-2.7.patch
new file mode 100644
index 00000000000..42b0a2a8ab4
--- /dev/null
+++ b/srcpkgs/bind/patches/libressl-2.7.patch
@@ -0,0 +1,52 @@
+diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c
+index ab2f68a..727d5dd 100644
+--- ./lib/dns/openssldh_link.c
++++ ./lib/dns/openssldh_link.c
+@@ -69,7 +69,7 @@ static isc_result_t openssldh_todns(const dst_key_t *key, isc_buffer_t *data);
+ 
+ static BIGNUM *bn2, *bn768, *bn1024, *bn1536;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ /*
+  * DH_get0_key, DH_set0_key, DH_get0_pqg and DH_set0_pqg
+  * are from OpenSSL 1.1.0.
+diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c
+index 4c2d3e4..5e8096f 100644
+--- ./lib/dns/openssldsa_link.c
++++ ./lib/dns/openssldsa_link.c
+@@ -49,7 +49,7 @@
+ 
+ static isc_result_t openssldsa_todns(const dst_key_t *key, isc_buffer_t *data);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ static void
+ DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q,
+ 	     const BIGNUM **g)
+diff --git a/lib/dns/opensslecdsa_link.c b/lib/dns/opensslecdsa_link.c
+index 9168ec2..a39dadf 100644
+--- ./lib/dns/opensslecdsa_link.c
++++ ./lib/dns/opensslecdsa_link.c
+@@ -42,7 +42,7 @@
+ 
+ #define DST_RET(a) {ret = a; goto err;}
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ /* From OpenSSL 1.1 */
+ static void
+ ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) {
+diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
+index 5dddc2e..74e167b 100644
+--- ./lib/dns/opensslrsa_link.c
++++ ./lib/dns/opensslrsa_link.c
+@@ -121,7 +121,7 @@
+ #endif
+ #define DST_RET(a) {ret = a; goto err;}
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ /* From OpenSSL 1.1.0 */
+ static int
+ RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {