cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to BIND 9.10.3. add a bunch of patches because they now support

Browse Source 
OpenSSL 1.1 api (OPENSSL_VERSION_NUMBER < / >= 0x10100000L checks).
This commit is contained in:
sthen 2015-09-16 15:28:16 +00:00
parent ea2c90fadd
commit eef49f1bf6
8 changed files with 121 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/isc-bind/Makefile
View File

@ -1,18 +1,18 @@
# $OpenBSD: Makefile,v 1.46 2015/09/02 20:25:43 sthen Exp $
# $OpenBSD: Makefile,v 1.47 2015/09/16 15:28:16 sthen Exp $
COMMENT= Berkeley Internet Name Daemon: DNS server and tools
V= 9.10.2-P4
V= 9.10.3
DISTNAME= bind-$V
PKGNAME= isc-bind-${V:S/-P/pl/}
SHARED_LIBS += isc 2.1 # 148.2
SHARED_LIBS += isccc 0.0 # 140.1
SHARED_LIBS += dns 4.1 # 161.2
SHARED_LIBS += isccfg 0.3 # 142.4
SHARED_LIBS += bind9 0.1 # 140.9
SHARED_LIBS += lwres 0.1 # 141.2
SHARED_LIBS += irs 0.0 # 141.2
SHARED_LIBS += isc 3.0 # 160.0
SHARED_LIBS += isccc 0.0 # 140.3
SHARED_LIBS += dns 4.2 # 162.0
SHARED_LIBS += isccfg 0.4 # 143.0
SHARED_LIBS += bind9 0.1 # 140.10
SHARED_LIBS += lwres 0.1 # 141.3
SHARED_LIBS += irs 0.0 # 141.4
# not installed:
#SHARED_LIBS += isc-nosymtbl 148.2 # 148.2
@ -44,6 +44,7 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-filter-aaaa \
--enable-threads \
--with-libtool \
--without-readline \
--with-python=${MODPY_BIN}
# JSON stats support is built if json-c is found at build time; however this

4
net/isc-bind/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (bind-9.10.2-P4.tar.gz) = wAsh7B3vISlX8o7+nRCqxS1uxRXoT78sQhQ/XXFCnLg=
SIZE (bind-9.10.2-P4.tar.gz) = 8471531
SHA256 (bind-9.10.3.tar.gz) = msM72HVKtLbuRJsbKqiOCfUc2giEhvSrFYWs2SC5j/A=
SIZE (bind-9.10.3.tar.gz) = 8552545

8
net/isc-bind/patches/patch-configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.1 2015/05/16 10:15:53 kettenis Exp $
--- configure.in.orig Wed Feb 18 02:55:55 2015
+++ configure.in Fri May 15 23:11:43 2015
@@ -4302,10 +4302,15 @@ if test "$dlopen" = "yes"; then
$OpenBSD: patch-configure_in,v 1.2 2015/09/16 15:28:16 sthen Exp $
--- configure.in.orig Wed Sep 9 03:23:40 2015
+++ configure.in Wed Sep 16 13:50:21 2015
@@ -4433,10 +4433,15 @@ if test "$dlopen" = "yes"; then
SO_LD="ld"
fi
;;

12
net/isc-bind/patches/patch-lib_dns_dst_openssl_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_dns_dst_openssl_h,v 1.1 2015/09/16 15:28:16 sthen Exp $
--- lib/dns/dst_openssl.h.orig Wed Sep 16 14:00:47 2015
+++ lib/dns/dst_openssl.h Wed Sep 16 14:02:42 2015
@@ -36,7 +36,7 @@
#define USE_ENGINE 1
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
/*
* These are new in OpenSSL 1.1.0. BN_GENCB _cb needs to be declared in
* the function like this before the BN_GENCB_new call:

39
net/isc-bind/patches/patch-lib_dns_openssl_link_c Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-lib_dns_openssl_link_c,v 1.1 2015/09/16 15:28:16 sthen Exp $
--- lib/dns/openssl_link.c.orig Wed Sep 16 14:01:23 2015
+++ lib/dns/openssl_link.c Wed Sep 16 14:01:46 2015
@@ -88,7 +88,7 @@ entropy_getpseudo(unsigned char *buf, int num) {
return (result == ISC_R_SUCCESS ? 1 : -1);
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
static void
entropy_add(const void *buf, int num, double entropy) {
/*
@@ -121,7 +121,7 @@ lock_callback(int mode, int type, const char *file, in
UNLOCK(&locks[type]);
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
static unsigned long
id_callback(void) {
return ((unsigned long)isc_thread_self());
@@ -187,7 +187,7 @@ dst__openssl_init(const char *engine) {
if (result != ISC_R_SUCCESS)
goto cleanup_mutexalloc;
CRYPTO_set_locking_callback(lock_callback);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
CRYPTO_set_id_callback(id_callback);
#endif
@@ -287,7 +287,7 @@ dst__openssl_destroy(void) {
CRYPTO_cleanup_all_ex_data();
#endif
ERR_clear_error();
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
ERR_remove_state(0);
#endif
ERR_free_strings();

21
net/isc-bind/patches/patch-lib_dns_openssldh_link_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-lib_dns_openssldh_link_c,v 1.1 2015/09/16 15:28:16 sthen Exp $
--- lib/dns/openssldh_link.c.orig Wed Sep 16 14:01:23 2015
+++ lib/dns/openssldh_link.c Wed Sep 16 14:02:06 2015
@@ -173,7 +173,7 @@ openssldh_generate(dst_key_t *key, int generator, void
DH *dh = NULL;
#if OPENSSL_VERSION_NUMBER > 0x00908000L
BN_GENCB *cb;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
BN_GENCB _cb;
#endif
union {
@@ -210,7 +210,7 @@ openssldh_generate(dst_key_t *key, int generator, void
if (dh == NULL)
return (dst__openssl_toresult(ISC_R_NOMEMORY));
cb = BN_GENCB_new();
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
if (cb == NULL) {
DH_free(dh);
return (dst__openssl_toresult(ISC_R_NOMEMORY));

21
net/isc-bind/patches/patch-lib_dns_openssldsa_link_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-lib_dns_openssldsa_link_c,v 1.1 2015/09/16 15:28:16 sthen Exp $
--- lib/dns/openssldsa_link.c.orig Wed Sep 16 14:01:23 2015
+++ lib/dns/openssldsa_link.c Wed Sep 16 14:02:22 2015
@@ -359,7 +359,7 @@ openssldsa_generate(dst_key_t *key, int unused, void (
isc_result_t result;
#if OPENSSL_VERSION_NUMBER > 0x00908000L
BN_GENCB *cb;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
BN_GENCB _cb;
#endif
union {
@@ -383,7 +383,7 @@ openssldsa_generate(dst_key_t *key, int unused, void (
if (dsa == NULL)
return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
cb = BN_GENCB_new();
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
if (cb == NULL) {
DSA_free(dsa);
return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));

12
net/isc-bind/patches/patch-lib_dns_opensslrsa_link_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_dns_opensslrsa_link_c,v 1.1 2015/09/16 15:28:16 sthen Exp $
--- lib/dns/opensslrsa_link.c.orig Wed Sep 16 14:01:23 2015
+++ lib/dns/opensslrsa_link.c Wed Sep 16 14:02:31 2015
@@ -771,7 +771,7 @@ opensslrsa_generate(dst_key_t *key, int exp, void (*ca
} u;
RSA *rsa = RSA_new();
BIGNUM *e = BN_new();
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
BN_GENCB _cb;
#endif
BN_GENCB *cb = BN_GENCB_new();