[UPDATE] mail/imapfilter
Hi,
this is a simple update dropping an obsolete patch and warning users of
a configuration change. OK?
Christopher
Index: Makefile
===
RCS file: /cvs/ports/mail/imapfilter/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile17 Jul 2022 19:23:39 - 1.27
+++ Makefile23 Dec 2023 12:58:30 -
@@ -1,6 +1,6 @@
COMMENT= remote IMAP filtering utility
-V= 2.7.5
+V= 2.8.1
DISTNAME= imapfilter-${V}
GH_TAGNAME= v${V}
Index: distinfo
===
RCS file: /cvs/ports/mail/imapfilter/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo17 Jul 2022 19:23:39 - 1.15
+++ distinfo23 Dec 2023 12:58:30 -
@@ -1,2 +1,2 @@
-SHA256 (imapfilter-2.7.5.tar.gz) = qxn4QHEuaVHlHCnkTEOzsvpC6TaT+Y+Jacx2Ok+tVr8=
-SIZE (imapfilter-2.7.5.tar.gz) = 59441
+SHA256 (imapfilter-2.8.1.tar.gz) = dYoPeK/zCTWRZCbIeNLMgDvc0xx0mC+/zSNy5nRCYsw=
+SIZE (imapfilter-2.8.1.tar.gz) = 58382
Index: patches/patch-src_auth_c
===
RCS file: patches/patch-src_auth_c
diff -N patches/patch-src_auth_c
--- patches/patch-src_auth_c11 Mar 2022 19:34:38 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,23 +0,0 @@
-Fix build with opaque HMAC_CTX in LibreSSL 3.5.
-
-Index: src/auth.c
src/auth.c.orig
-+++ 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 >= 0x101fL && !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x101fL
- 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 >= 0x101fL && !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x101fL
- ctx = HMAC_CTX_new();
- HMAC_Init_ex(ctx, (const unsigned char *)pass, strlen(pass),
- EVP_md5(), NULL);
Index: pkg/MESSAGE
===
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/MESSAGE 23 Dec 2023 12:58:30 -
@@ -0,0 +1,4 @@
+Since imapfilter 2.8 the implicit error recovery mechanism has been
+dropped in favour of a more robust mechanism requiring explicit
+configuration by using the new recover(commands, retries) function.
+Please update your configuration as necessary.
Re: UPDATE: mail/imapfilter
> Update imapfilter to 2.7.5. OK? builds fine on arm64 and amd64 The next imapfilter's update may get rid of patches/patch-src_auth_c since upstream has deprecated CRAM-MD5 authentication mechanism as per commit [1] OK gsoares, thanks! [1] https://github.com/lefcha/imapfilter/commit/20865804d12bfdbd3dc18d569a416d9b42708792
UPDATE: mail/imapfilter
Update imapfilter to 2.7.5. OK?
Index: Makefile
===
RCS file: /cvs/ports/mail/imapfilter/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile11 Mar 2022 19:34:38 - 1.26
+++ Makefile14 Jul 2022 06:28:13 -
@@ -1,8 +1,7 @@
COMMENT= remote IMAP filtering utility
-V= 2.6.11
+V= 2.7.5
DISTNAME= imapfilter-${V}
-REVISION= 0
GH_TAGNAME=v${V}
GH_ACCOUNT=lefcha
@@ -15,12 +14,12 @@ MAINTAINER= Gleydson Soares
UPDATE: mail/imapfilter to 2.7.5
Find attached a diff that updates imapfilter to latest release 2.7.5.
Builds now with pcre2 and needs a patch for linking against libressl.
Nathanael, could you check it works for you?
feedback and OKs are welcome,
Thanks,
- gsoares
Index: Makefile
===
RCS file: /cvs/ports/mail/imapfilter/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile12 Jul 2019 20:47:28 - 1.24
+++ Makefile23 Jan 2021 11:17:52 -
@@ -2,7 +2,7 @@
COMMENT= remote IMAP filtering utility
-V= 2.6.11
+V= 2.7.5
DISTNAME= imapfilter-${V}
GH_TAGNAME=v${V}
@@ -16,12 +16,12 @@ MAINTAINER= Gleydson Soares = 0x1010L
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
+ SSL_set_hostflags(ssn->sslconn,
+ X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
+ if (!SSL_set1_host(ssn->sslconn, ssn->server)) {
update mail/imapfilter
One of our SSLv3 patches got upstreamed. I'll submit the other one soon.
ok?
Index: Makefile
===
RCS file: /cvs/ports/mail/imapfilter/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile7 Jan 2016 17:33:38 - 1.20
+++ Makefile21 Jan 2016 20:34:44 -
@@ -2,7 +2,7 @@
COMMENT= remote IMAP filtering utility
-V= 2.6.4
+V= 2.6.5
DISTNAME= imapfilter-${V}
GH_TAGNAME=v${V}
Index: distinfo
===
RCS file: /cvs/ports/mail/imapfilter/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo7 Jan 2016 17:33:38 - 1.11
+++ distinfo21 Jan 2016 20:34:44 -
@@ -1,2 +1,2 @@
-SHA256 (imapfilter-2.6.4.tar.gz) = qyn6qxWluaxha/ymURTFBno6JrezLipwwy6xKsHxbB4=
-SIZE (imapfilter-2.6.4.tar.gz) = 56920
+SHA256 (imapfilter-2.6.5.tar.gz) = D0tJ4b516/1eOjvb/wHWiqr9t6zdw1/EDc9DcClwgFU=
+SIZE (imapfilter-2.6.5.tar.gz) = 56993
Index: patches/patch-src_imapfilter_c
===
RCS file: patches/patch-src_imapfilter_c
diff -N patches/patch-src_imapfilter_c
--- patches/patch-src_imapfilter_c 4 Nov 2015 17:51:18 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,48 +0,0 @@
-$OpenBSD: patch-src_imapfilter_c,v 1.3 2015/11/04 17:51:18 jca Exp $
-
-Cope with SSLv3 removal.
-
src/imapfilter.c.orig Wed Sep 30 22:55:26 2015
-+++ src/imapfilter.c Mon Nov 2 22:37:03 2015
-@@ -21,7 +21,10 @@
-
- extern buffer ibuf, obuf, nbuf, cbuf;
- extern regexp responses[];
--extern SSL_CTX *ssl3ctx, *ssl23ctx, *tls1ctx;
-+extern SSL_CTX *ssl23ctx, *tls1ctx;
-+#ifndef OPENSSL_NO_SSL3_METHOD
-+extern SSL_CTX *ssl3ctx;
-+#endif
- #if OPENSSL_VERSION_NUMBER >= 0x01000100fL
- extern SSL_CTX *tls11ctx, *tls12ctx;
- #endif
-@@ -114,7 +117,9 @@ main(int argc, char *argv[])
-
- SSL_library_init();
- SSL_load_error_strings();
-+#ifndef OPENSSL_NO_SSL3_METHOD
- ssl3ctx = SSL_CTX_new(SSLv3_client_method());
-+#endif
- ssl23ctx = SSL_CTX_new(SSLv23_client_method());
- tls1ctx = SSL_CTX_new(TLSv1_client_method());
- #if OPENSSL_VERSION_NUMBER >= 0x01000100fL
-@@ -125,7 +130,9 @@ main(int argc, char *argv[])
- capath = opts.truststore;
- else if (exists_file(opts.truststore))
- cafile = opts.truststore;
-+#ifndef OPENSSL_NO_SSL3_METHOD
- SSL_CTX_load_verify_locations(ssl3ctx, cafile, capath);
-+#endif
- SSL_CTX_load_verify_locations(ssl23ctx, cafile, capath);
- SSL_CTX_load_verify_locations(tls1ctx, cafile, capath);
- #if OPENSSL_VERSION_NUMBER >= 0x01000100fL
-@@ -150,7 +157,9 @@ main(int argc, char *argv[])
- #endif
- stop_lua();
-
-+#ifndef OPENSSL_NO_SSL3_METHOD
- SSL_CTX_free(ssl3ctx);
-+#endif
- SSL_CTX_free(ssl23ctx);
- SSL_CTX_free(tls1ctx);
- #if OPENSSL_VERSION_NUMBER >= 0x01000100fL
