From a101d7396f84a08d72a30419c1c2f072f8aa42c7 Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Wed, 14 Nov 2018 11:59:42 +0000 Subject: [PATCH] mail/imapfilter: Drop LibreSSL patch and unbreak build with OpenSSL 1.1.1 The patch added in ports r435498 broke OpenSSL 1.1.x compatibility. A different fix for LibreSSL was committed upstream so the patch is no longer needed since imapfilter 2.6.11 [1]. [1] https://github.com/lefcha/imapfilter/commit/c1865ba1ab2fd8da14e5e018ab55c79cbc432295 PR: 232132 Approved by: bofh (maintainer timeout, 1 month) --- mail/imapfilter/files/patch-src_auth.c | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 mail/imapfilter/files/patch-src_auth.c diff --git a/mail/imapfilter/files/patch-src_auth.c b/mail/imapfilter/files/patch-src_auth.c deleted file mode 100644 index 606ffb8a87c5..000000000000 --- a/mail/imapfilter/files/patch-src_auth.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/auth.c.orig 2017-11-19 09:38:24 UTC -+++ src/auth.c -@@ -20,7 +20,7 @@ auth_cram_md5(const char *user, const char *pass, unsi - unsigned char *resp, *buf, *out; - unsigned char md[EVP_MAX_MD_SIZE], mdhex[EVP_MAX_MD_SIZE * 2 + 1]; - unsigned int mdlen; --#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER) -+#ifdef HAVE_OPAQUE_STRUCTS && !defined(LIBRESSL_VERSION_NUMBER) - HMAC_CTX *ctx; - #else - HMAC_CTX ctx; -@@ -32,7 +32,7 @@ auth_cram_md5(const char *user, const char *pass, unsi - - EVP_DecodeBlock(resp, chal, strlen((char *)(chal))); - --#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER) -+#ifdef HAVE_OPAQUE_STRUCTS && !defined(LIBRESSL_VERSION_NUMBER) - ctx = HMAC_CTX_new(); - HMAC_Init_ex(ctx, (const unsigned char *)pass, strlen(pass), - EVP_md5(), NULL);