mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

dovecot: Fix deprecated API patch 

Refreshed patches.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2019-04-09 19:35:03 -07:00
parent 2546dff23c
commit 5ec9545ddc
No known key found for this signature in database
GPG Key ID: 36D31CFA845F0E3B
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/dovecot/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dovecot
PKG_VERSION:=2.3.5.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.dovecot.org/releases/2.3

27
mail/dovecot/patches/100-openssl-deprecated.patch
View File

@ -10,7 +10,19 @@
--- a/src/lib-ssl-iostream/dovecot-openssl-common.c
+++ b/src/lib-ssl-iostream/dovecot-openssl-common.c
@@ -79,6 +79,7 @@ bool dovecot_openssl_common_global_unref(void)
@@ -63,9 +63,11 @@ void dovecot_openssl_common_global_ref(void)
/*i_warning("CRYPTO_set_mem_functions() was called too late");*/
}
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_library_init();
SSL_load_error_strings();
OpenSSL_add_all_algorithms();
+#endif
}
bool dovecot_openssl_common_global_unref(void)
@@ -79,6 +81,7 @@ bool dovecot_openssl_common_global_unref(void)
ENGINE_finish(dovecot_openssl_engine);
dovecot_openssl_engine = NULL;
}
@ -18,7 +30,7 @@
/* OBJ_cleanup() is called automatically by EVP_cleanup() in
newer versions. Doesn't hurt to call it anyway. */
OBJ_cleanup();
@@ -100,6 +101,7 @@ bool dovecot_openssl_common_global_unref(void)
@@ -100,6 +103,7 @@ bool dovecot_openssl_common_global_unref(void)
ERR_free_strings();
#ifdef HAVE_OPENSSL_CLEANUP
OPENSSL_cleanup();
@ -38,3 +50,14 @@
#include <openssl/x509.h>
#include <openssl/pem.h>
#include <openssl/ssl.h>
@@ -510,8 +513,10 @@ ssl_proxy_ctx_set_crypto_params(SSL_CTX *ssl_ctx,
int nid;
const char *curve_name;
#endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
if (SSL_CTX_need_tmp_RSA(ssl_ctx) != 0)
SSL_CTX_set_tmp_rsa_callback(ssl_ctx, ssl_gen_rsa_key);
+#endif
if (set->dh == NULL || *set->dh == '\0')
SSL_CTX_set_tmp_dh_callback(ssl_ctx, ssl_tmp_dh_callback);
#ifdef HAVE_ECDH

8
mail/dovecot/patches/110-openssl-engine.patch
View File

@ -47,7 +47,7 @@
#ifdef HAVE_SSL_NEW_MEM_FUNCS
static void *dovecot_openssl_malloc(size_t size, const char *u0 ATTR_UNUSED, int u1 ATTR_UNUSED)
@@ -75,10 +78,12 @@ bool dovecot_openssl_common_global_unref(void)
@@ -77,10 +80,12 @@ bool dovecot_openssl_common_global_unref(void)
if (--openssl_init_refcount > 0)
return TRUE;
@ -60,7 +60,7 @@
#if OPENSSL_VERSION_NUMBER < 0x10100000L
/* OBJ_cleanup() is called automatically by EVP_cleanup() in
newer versions. Doesn't hurt to call it anyway. */
@@ -86,7 +91,9 @@ bool dovecot_openssl_common_global_unref(void)
@@ -88,7 +93,9 @@ bool dovecot_openssl_common_global_unref(void)
#ifdef HAVE_SSL_COMP_FREE_COMPRESSION_METHODS
SSL_COMP_free_compression_methods();
#endif
@ -70,7 +70,7 @@
EVP_cleanup();
CRYPTO_cleanup_all_ex_data();
#ifdef HAVE_OPENSSL_AUTO_THREAD_DEINIT
@@ -109,6 +116,7 @@ bool dovecot_openssl_common_global_unref(void)
@@ -111,6 +118,7 @@ bool dovecot_openssl_common_global_unref(void)
int dovecot_openssl_common_global_set_engine(const char *engine,
const char **error_r)
{
@ -78,7 +78,7 @@
if (dovecot_openssl_engine != NULL)
return 1;
@@ -130,5 +138,6 @@ int dovecot_openssl_common_global_set_engine(const char *engine,
@@ -132,5 +140,6 @@ int dovecot_openssl_common_global_set_engine(const char *engine,
dovecot_openssl_engine = NULL;
return -1;
}