* [gentoo-commits] repo/proj/libressl:master commit in: mail-filter/imapfilter/, mail-filter/imapfilter/files/
@ 2022-07-10 22:52 Quentin Retornaz
0 siblings, 0 replies; 2+ messages in thread
From: Quentin Retornaz @ 2022-07-10 22:52 UTC (permalink / raw
To: gentoo-commits
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>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/libressl:master commit in: mail-filter/imapfilter/, mail-filter/imapfilter/files/
@ 2022-07-10 22:52 Quentin Retornaz
0 siblings, 0 replies; 2+ messages in thread
From: Quentin Retornaz @ 2022-07-10 22:52 UTC (permalink / raw
To: gentoo-commits
commit: b0c0d82e8fd48110da40fefb600399d2c6d0e014
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu Jul 7 22:26:39 2022 +0000
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
CommitDate: Sun Jul 10 22:50:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=b0c0d82e
mail-filter/imapfilter: Remove old versions
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/libressl/pull/444
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
mail-filter/imapfilter/Manifest | 1 -
.../files/imapfilter-2.6.16-libressl.patch | 29 ------------
.../imapfilter/imapfilter-2.6.16-r100.ebuild | 52 ----------------------
mail-filter/imapfilter/imapfilter-2.6.16.ebuild | 42 -----------------
4 files changed, 124 deletions(-)
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index b6f3391..d5b5a10 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,2 +1 @@
-DIST imapfilter-2.6.16.tar.gz 59636 BLAKE2B 9de58800ab88aa6e22ead001fd4e635b1991d23a2345d729a59438d3774148b1478b561c36848af155da7d15e84afdf900b73054ef268243f333843b71417d1e SHA512 0500931143e593eb69357ef6a6a40be971abadd22d7e807685b88927da8db9a928470f5cad460252b95ccd42efcfd39b5c4001a8796fa79cbd35018405a7be19
DIST imapfilter-2.7.5.tar.gz 59441 BLAKE2B 0326a698f3be18da47c99cbe20e5e51cde8abcaebf365b3f00e5b1dba6bfaed5139b65766bd447dc596736da504063d5c87c21d1c5c11d6bc7ebd947d9d44835 SHA512 a64747d745ecd5a2f61d486cd8fec1bceeb97ce459ec57454311a960dbfce526c15e8bddeb16860b8efd9710de93845adec61ec892355a0bef7bddc4517e1442
diff --git a/mail-filter/imapfilter/files/imapfilter-2.6.16-libressl.patch b/mail-filter/imapfilter/files/imapfilter-2.6.16-libressl.patch
deleted file mode 100644
index 2454fc3..0000000
--- a/mail-filter/imapfilter/files/imapfilter-2.6.16-libressl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From bf69bdbf674269e84b22461c50ce1016182b56d3 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Sat, 28 Mar 2020 06:56:07 +0200
-Subject: [PATCH] Fix build with LibreSSL
-
-Bug: https://bugs.gentoo.org/714882
-Upstream-Status: Submitted
-[https://github.com/lefcha/imapfilter/pull/204]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/socket.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/socket.c b/src/socket.c
-index 0a1874f..03e0d21 100644
---- a/src/socket.c
-+++ b/src/socket.c
-@@ -143,7 +143,7 @@ open_secure_connection(session *ssn)
- goto fail;
-
- if (get_option_boolean("certificates")) {
--#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.26.0
-
diff --git a/mail-filter/imapfilter/imapfilter-2.6.16-r100.ebuild b/mail-filter/imapfilter/imapfilter-2.6.16-r100.ebuild
deleted file mode 100644
index c1d6ea9..0000000
--- a/mail-filter/imapfilter/imapfilter-2.6.16-r100.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit lua-single toolchain-funcs
-
-DESCRIPTION="An IMAP mail filtering utility"
-HOMEPAGE="https://github.com/lefcha/imapfilter"
-SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
- dev-libs/openssl:0=
- dev-libs/libpcre
- ${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README samples/*"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.16-libressl.patch
-)
-
-src_prepare() {
- default
- sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
- -e "/^MANDIR/s:man:share/man:" \
- -e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
- -e "/^CFLAGS/s/-O//" \
- src/Makefile || die
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- LDFLAGS="${LDFLAGS}" \
- INCDIRS=$(lua_get_CFLAGS) \
- LIBLUA=$(lua_get_LIBS)
-}
-
-src_install() {
- default
- doman doc/imapfilter.1 doc/imapfilter_config.5
-}
diff --git a/mail-filter/imapfilter/imapfilter-2.6.16.ebuild b/mail-filter/imapfilter/imapfilter-2.6.16.ebuild
deleted file mode 100644
index 9a2348b..0000000
--- a/mail-filter/imapfilter/imapfilter-2.6.16.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="An IMAP mail filtering utility"
-HOMEPAGE="https://github.com/lefcha/imapfilter"
-SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
- dev-libs/openssl:0=
- dev-libs/libpcre
- dev-lang/lua:0="
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README samples/*"
-
-PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
-
-src_prepare() {
- default
- sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
- -e "/^MANDIR/s:man:share/man:" \
- -e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
- -e "/^CFLAGS/s/-O//" \
- src/Makefile || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- default
- doman doc/imapfilter.1 doc/imapfilter_config.5
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-10 22:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-10 22:52 [gentoo-commits] repo/proj/libressl:master commit in: mail-filter/imapfilter/, mail-filter/imapfilter/files/ Quentin Retornaz
-- strict thread matches above, loose matches on Subject: below --
2022-07-10 22:52 Quentin Retornaz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox