jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bind: update patches for libressl-2.7.

Browse source
This commit is contained in:
Enno Boland 2018-04-30 17:11:33 +02:00
parent a909d16177
commit 7eed7a68e3
No known key found for this signature in database
GPG key ID: D09964719BDE9971
2 changed files with 63 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
srcpkgs/bind/patches/bind.so_bsdcompat.patch Normal file
View file

@ -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,

52
srcpkgs/bind/patches/libressl-2.7.patch Normal file
View file

@ -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) {