diff --git a/net/unbound/Makefile b/net/unbound/Makefile index e89afc7e1..e492c1372 100644 --- a/net/unbound/Makefile +++ b/net/unbound/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=unbound PKG_VERSION:=1.8.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/net/unbound/patches/200-openssl-deprecated.patch b/net/unbound/patches/200-openssl-deprecated.patch new file mode 100644 index 000000000..118a82ccc --- /dev/null +++ b/net/unbound/patches/200-openssl-deprecated.patch @@ -0,0 +1,49 @@ +diff --git a/daemon/daemon.c b/daemon/daemon.c +index 4c3d5f1..50f5060 100644 +--- a/daemon/daemon.c ++++ b/daemon/daemon.c +@@ -769,7 +769,7 @@ daemon_delete(struct daemon* daemon) + # endif + # ifdef HAVE_OPENSSL_CONFIG + EVP_cleanup(); +-# if OPENSSL_VERSION_NUMBER < 0x10100000 ++# if (OPENSSL_VERSION_NUMBER < 0x10100000) || !defined(OPENSSL_NO_ENGINE) + ENGINE_cleanup(); + # endif + CONF_modules_free(); +diff --git a/util/net_help.c b/util/net_help.c +index 91368c8..a932010 100644 +--- a/util/net_help.c ++++ b/util/net_help.c +@@ -1006,10 +1006,10 @@ void* outgoing_ssl_fd(void* sslctx, int fd) + static lock_basic_type *ub_openssl_locks = NULL; + + /** callback that gets thread id for openssl */ +-static unsigned long +-ub_crypto_id_cb(void) ++static void ++ub_crypto_id_cb(CRYPTO_THREADID *id) + { +- return (unsigned long)log_thread_get(); ++ CRYPTO_THREADID_set_numeric(id, (unsigned long)log_thread_get()); + } + + static void +@@ -1035,7 +1035,7 @@ int ub_openssl_lock_init(void) + for(i=0; i