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

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

[Stefan Strogin]

commit:     67bd6910efa009b8a48f7853f22bdb8d07974ff9
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 28 05:06:40 2020 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 05:08:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67bd6910

mail-filter/imapfilter: add patch for LibreSSL

Closes: https://bugs.gentoo.org/714882
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 .../files/imapfilter-2.6.16-libressl.patch         | 29 ++++++++++++++++++++++
 mail-filter/imapfilter/imapfilter-2.6.16.ebuild    |  2 ++
 2 files changed, 31 insertions(+)

diff --git a/mail-filter/imapfilter/files/imapfilter-2.6.16-libressl.patch b/mail-filter/imapfilter/files/imapfilter-2.6.16-libressl.patch
new file mode 100644
index 00000000000..2454fc3ffb9
--- /dev/null
+++ b/mail-filter/imapfilter/files/imapfilter-2.6.16-libressl.patch
@@ -0,0 +1,29 @@
+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.ebuild b/mail-filter/imapfilter/imapfilter-2.6.16.ebuild
index 0afa3d7ef35..2717687e7e4 100644
--- a/mail-filter/imapfilter/imapfilter-2.6.16.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.6.16.ebuild
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS NEWS README samples/*"
 
+PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+
 src_prepare() {
 	default
 	sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \

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

[Sam James]

commit:     bebe48a569c277bfa5b4835cababf62c3b7c9769
Author:     Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Sat Sep 17 11:51:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 21:13:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bebe48a5

mail-filter/imapfilter: fix build with -Werror=strict-prototypes

Closes: https://bugs.gentoo.org/870682
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/27304
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../imapfilter/files/2.7.6-prototypes.patch        | 30 ++++++++++++++++++++++
 mail-filter/imapfilter/imapfilter-2.7.6.ebuild     |  4 +++
 2 files changed, 34 insertions(+)

diff --git a/mail-filter/imapfilter/files/2.7.6-prototypes.patch b/mail-filter/imapfilter/files/2.7.6-prototypes.patch
new file mode 100644
index 000000000000..33448834fa2f
--- /dev/null
+++ b/mail-filter/imapfilter/files/2.7.6-prototypes.patch
@@ -0,0 +1,30 @@
+
+Patch from: https://github.com/lefcha/imapfilter/pull/257
+Bug: https://bugs.gentoo.org/870682
+
+From 9580bfca0d8a1cf92a79a24b9f1b83fd3b778375 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
+Date: Sat, 17 Sep 2022 13:42:30 +0200
+Subject: [PATCH] Fix compilation failure with -Werror=strict-prototypes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+---
+ src/lua.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lua.c b/src/lua.c
+index 868ddb7..02514bb 100644
+--- a/src/lua.c
++++ b/src/lua.c
+@@ -26,7 +26,7 @@ void interactive_mode(void);
+  * Lua interface functions, load and execute imapfilter's configuration file.
+  */
+ void
+-start_lua()
++start_lua(void)
+ {
+ 
+ 	lua = luaL_newstate();

diff --git a/mail-filter/imapfilter/imapfilter-2.7.6.ebuild b/mail-filter/imapfilter/imapfilter-2.7.6.ebuild
index 8c65a881ad44..d129899e7bff 100644
--- a/mail-filter/imapfilter/imapfilter-2.7.6.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.7.6.ebuild
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS NEWS README samples/*"
 
+PATCHES=(
+	"${FILESDIR}/${PV}-prototypes.patch"
+)
+
 src_prepare() {
 	default
 	sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \