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
This commit is contained in:
Matthias Andree
2025-06-18 00:53:23 +02:00
parent ad14822694
commit bb983333bb
3 changed files with 4 additions and 39 deletions
+1 -1
View File
@@ -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,
+3 -3
View File
@@ -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
-35
View File
@@ -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