git: 16abb3874262 - 2025Q2 - mail/fetchmail: update to 6.5.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 20 Jun 2025 00:05:16 UTC
The branch 2025Q2 has been updated by mandree:
URL: https://cgit.FreeBSD.org/ports/commit/?id=16abb3874262649363d63e94f20d793f8c4c6c1d
commit 16abb3874262649363d63e94f20d793f8c4c6c1d
Author: Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2025-06-17 22:53:23 +0000
Commit: Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2025-06-20 00:05:08 +0000
mail/fetchmail: update to 6.5.4
BUGFIXES:
* socket: avoid crash when writing to a socket without SSL/TLS fails.
Reported by Andrea Venturoli via mailing list, fixes #71.
* wolfSSL support: avoid fetchmail.c compilation failure in certain
configurations of wolfSSL (for instance, on FreeBSD's wolfssl-5.8.0_1
package), OpenSSL_version enables a newer 1.1.x compat API that passes its
argument to a wolfSSL API, with OPENSSL_DIR and OPENSSL_ENGINES_DIR, causing
related compiler failures.
PR: 287616
PR: 287435 (patch integrated upstream)
Approved by: Corey Halpin (maintainer)
MFH: 2025Q2
(cherry picked from commit bb983333bbaba3fc8ce9d93cb2db8fff5bcbabae)
---
mail/fetchmail/Makefile | 2 +-
mail/fetchmail/distinfo | 6 +++---
mail/fetchmail/files/patch-fetchmail.c | 35 ----------------------------------
3 files changed, 4 insertions(+), 39 deletions(-)
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 36ea6a81d133..056c5f34a69c 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,5 +1,5 @@
PORTNAME?= fetchmail
-DISTVERSION= 6.5.3
+DISTVERSION= 6.5.4
PORTREVISION?= 0
CATEGORIES= mail
# The next line is inherited by the fetchmailconf dependent port,
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index 708675042e97..33d1fef8a5f6 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1749515671
-SHA256 (fetchmail-6.5.3.tar.xz) = d74e893b78ef29ebef375ab7e726d2977140f8f1208f5905569395cbdae4c23d
-SIZE (fetchmail-6.5.3.tar.xz) = 1114612
+TIMESTAMP = 1750200429
+SHA256 (fetchmail-6.5.4.tar.xz) = c859156e9bff841d4d984cb3fdcb8042b6b31789fc3387c2649baa95a88d698b
+SIZE (fetchmail-6.5.4.tar.xz) = 1114764
diff --git a/mail/fetchmail/files/patch-fetchmail.c b/mail/fetchmail/files/patch-fetchmail.c
deleted file mode 100644
index 9940217f8330..000000000000
--- a/mail/fetchmail/files/patch-fetchmail.c
+++ /dev/null
@@ -1,35 +0,0 @@
-commit c598c50ffda0dcac38b8bd01350dc6894a8efce4
-Author: Matthias Andree <matthias.andree@gmx.de>
-Date: Wed Jun 11 01:46:07 2025 +0200
-
- Fix wolfSSL compilation failure around OPENSSL_DIR.
-
- Depending on wolfSSL version and configuration, it exposes a
- newer OpenSSL 1.1.x API of OpenSSL_version(), which passes its
- argument -- but that OpenSSL_version() function is documented
- as having been added in OpenSSL 3.0. So let's not try using
- it with OPENSSL_DIR or OPENSSL_ENGINES_DIR arguments unless
- both OpenSSL >= 3.0 is found and both macros are defined,
- just in case...
-
- Reported by Corey Halpin,
- see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287435
-
-diff --git a/fetchmail.c b/fetchmail.c
-index 97419f64..3c8e571d 100644
---- ./fetchmail.c
-+++ b/fetchmail.c
-@@ -343,9 +343,13 @@ int main(int argc, char **argv)
- "Run-time uses SSL library %#lx \"%s\"\n"),
- OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT,
- OpenSSL_version_num(), OpenSSL_version(OPENSSL_VERSION));
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L // OpenSSL_version API in this form added in OpenSSL 3.0 according to manpage
-+# if defined(OPENSSL_DIR) && defined(OPENSSL_ENGINES_DIR) // in-depth fix in case some OpenSSL freerider claims 3.x compat without delivering it
- printf(GT_("OpenSSL: %s\nEngines: %s\n"),
- OpenSSL_version(OPENSSL_DIR),
- OpenSSL_version(OPENSSL_ENGINES_DIR));
-+# endif
-+#endif
- # if !HAVE_DECL_TLS1_3_VERSION || defined(OPENSSL_NO_TLS1_3)
- # error Your SSL/TLS library does not support TLS v1.3.
- # endif