[gentoo-commits] repo/proj/libressl:master commit in: mail-filter/imapfilter/, mail-filter/imapfilter/files/

["Quentin Retornaz" <gentoo@retornaz.com>]

commit:     2bd21e7bccc480c25c47046a619368208d4be36d
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu Jul  7 22:21:24 2022 +0000
Commit:     Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
CommitDate: Sun Jul 10 22:50:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=2bd21e7b

mail-filter/imapfilter: Update libressl patch

Also merges changes from ::gentoo.

Signed-off-by: orbea <orbea <AT> riseup.net>
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>

 .../files/imapfilter-2.7.5-libressl.patch          | 45 +++++++++++-----------
 mail-filter/imapfilter/imapfilter-2.7.5.ebuild     |  2 +-
 mail-filter/imapfilter/metadata.xml                |  2 +-
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch b/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch
index fb665f8..e5b1882 100644
--- a/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch
+++ b/mail-filter/imapfilter/files/imapfilter-2.7.5-libressl.patch
@@ -1,26 +1,25 @@
-From 9a1132d8c8616b67156d49bea89d567ed31d42d6 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 30 Dec 2020 06:48:40 +0300
-Subject: [PATCH] Fix build with LibreSSL
+From OpenBSD.
 
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/socket.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+Fix build with opaque HMAC_CTX in LibreSSL 3.5.
 
-diff --git a/src/socket.c b/src/socket.c
-index aa2ef4f..fa75de4 100644
---- a/src/socket.c
-+++ b/src/socket.c
-@@ -143,7 +143,7 @@ open_secure_connection(session *ssn)
- 		goto fail;
+Index: src/auth.c
+--- a/src/auth.c.orig
++++ b/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)
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
+ 	HMAC_CTX *ctx;
+ #else
+ 	HMAC_CTX ctx;
+@@ -32,7 +32,7 @@ auth_cram_md5(const char *user, const char *pass, unsi
  
- 	if (get_option_boolean("hostnames")) {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 		SSL_set_hostflags(ssn->sslconn,
- 		    X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
- 		if (!SSL_set1_host(ssn->sslconn, ssn->server)) {
--- 
-2.30.0
-
+ 	EVP_DecodeBlock(resp, chal, strlen((char *)(chal)));
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
+ 	ctx = HMAC_CTX_new();
+ 	HMAC_Init_ex(ctx, (const unsigned char *)pass, strlen(pass),
+ 	    EVP_md5(), NULL);

diff --git a/mail-filter/imapfilter/imapfilter-2.7.5.ebuild b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
index 89738e8..911e6fe 100644
--- a/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 

diff --git a/mail-filter/imapfilter/metadata.xml b/mail-filter/imapfilter/metadata.xml
index 905d603..e32dccc 100644
--- a/mail-filter/imapfilter/metadata.xml
+++ b/mail-filter/imapfilter/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>