manuel
/
void-packages
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bind: update to 9.10.3. 

Featuring LibreSSL patches from OpenBSD ports.
This commit is contained in:
Christian Neukirchen 2015-10-03 23:45:07 +02:00
parent c4160b9737
commit d4a0cce613
3 changed files with 112 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/shlibs
View File

@ -985,7 +985,7 @@ liblwres.so.141 bind-libs-9.10.2P3_2
libdns.so.161 bind-libs-9.10.2P3_2
libbind9.so.140 bind-libs-9.10.2P3_2
libisccfg.so.140 bind-libs-9.10.2P3_2
libisc.so.148 bind-libs-9.10.2P3_2
libisc.so.160 bind-libs-9.10.3_1
libisccc.so.140 bind-libs-9.10.2P3_2
libirs.so.141 bind-libs-9.10.2P3_2
libplist.so.3 libplist-1.12_1

105
srcpkgs/bind/patches/libressl.patch Normal file
View File

@ -0,0 +1,105 @@
$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:
$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();
$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));
$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));
$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();

12
srcpkgs/bind/template
View File

@ -1,16 +1,16 @@
# Template file for 'bind'
pkgname=bind
_distver=9.10.2
_patchver=P4
_distver=9.10.3
_patchver=
version="${_distver}${_patchver}"
revision=1
wrksrc="${pkgname}-${_distver}-${_patchver}"
wrksrc="${pkgname}-${_distver}${_patchver:+-${_patchver}}"
short_desc="Berkeley Internet Name Domain server"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="ISC"
homepage="http://www.isc.org/software/bind/"
distfiles="http://ftp.isc.org/isc/bind9/${_distver}-${_patchver}/bind-${_distver}-${_patchver}.tar.gz"
checksum=c00b21ec1def212957f28efe9d10aac52d6ec515e84fbf2c42143f5d71429cb8
distfiles="http://ftp.isc.org/isc/bind9/${_distver}${_patchver:+-${_patchver}}/bind-${_distver}${_patchver:+-${_patchver}}.tar.gz"
checksum=9ac33bd8754ab4b6ee449b1b2aa88e09f51cda088486f4ab1585acd920b98ff0
build_style=gnu-configure
configure_args="--disable-static --enable-threads --enable-largefile
@ -21,7 +21,7 @@ hostmakedepends="automake libtool perl"
makedepends="libressl-devel libxml2-devel libcap-devel readline-devel"
conf_files="/etc/named/named.conf"
system_accounts="named"
named_desc="BIND DNS server"
named_descr="BIND DNS server"
named_homedir="/var/named"
make_dirs="/var/named 0770 root named"