git: 702b257be6fb - main - mail/fetchmail: update to 6.5.1, minor polishing.

From: Matthias Andree <mandree_at_FreeBSD.org>
Date: Fri, 15 Nov 2024 17:01:54 UTC
The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=702b257be6fb833e5e0365ea64c4ae28996d0517

commit 702b257be6fb833e5e0365ea64c4ae28996d0517
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2024-11-13 23:22:48 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2024-11-15 16:59:19 +0000

    mail/fetchmail: update to 6.5.1, minor polishing.
    
    Translation updates for files we missed to have translated.
    
    Some improvements to the build experience were made;
    most of the local patches have been integrated upstream.
    
    (Also fixes missing TIMESTAMP and SIZE fields in distinfo,
    vs. Corey's review. -- Thanks!)
    
    Approved by:    Corey Halpin (maintainer)
    PR:             282743
---
 mail/fetchmail/Makefile              |  4 ++--
 mail/fetchmail/distinfo              |  6 +++---
 mail/fetchmail/files/patch-socket.c  |  9 ---------
 mail/fetchmail/files/patch-tls-aux.h | 18 ------------------
 4 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 3eae97f3aa3c..deb708518b9c 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,6 +1,6 @@
 PORTNAME?=	fetchmail
-DISTVERSION=	6.5.0
-PORTREVISION?=	1
+DISTVERSION=	6.5.1
+PORTREVISION?=	0
 CATEGORIES=	mail
 # The next line is inherited by the fetchmailconf dependent port,
 # do NOT replace fetchmail by ${PORTNAME}
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index df6589e2c6cd..fb850a2d7a0f 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1730243037
-SHA256 (fetchmail-6.5.0.tar.xz) = 42611aea4861a5311e5116843f01c203dceadf440bf2eb1b4a43a445f2977668
-SIZE (fetchmail-6.5.0.tar.xz) = 1108148
+TIMESTAMP = 1731628928
+SHA256 (fetchmail-6.5.1.tar.xz) = ca3fdb95141c277aca109be77f4d45b47e03ee010043058dd90bc182db518d4a
+SIZE (fetchmail-6.5.1.tar.xz) = 1110924
diff --git a/mail/fetchmail/files/patch-socket.c b/mail/fetchmail/files/patch-socket.c
index d8faa1a79534..23185afe0f94 100644
--- a/mail/fetchmail/files/patch-socket.c
+++ b/mail/fetchmail/files/patch-socket.c
@@ -13,12 +13,3 @@ for FreeBSD 13.3 and 13.4:
  /* do not warn about OpenSSL 3.2.0, the 3.2.1 fix is of low priority */
  # if OPENSSL_VERSION_NUMBER >= 0x30100000L && OPENSSL_VERSION_NUMBER < 0x30200000L
  #  if OPENSSL_VERSION_NUMBER < 0x30100040L
-@@ -402,7 +402,7 @@ enum { SSL_min_security_level = 2 };
- #endif /* USING_WOLFSSL */
- 
- /* workaround for EVP_MD_fetch API - missing on wolfSSL and LibreSSL */
--#if defined(USING_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
- # define EVP_MD_fetch(x, digest, y) (EVP_get_digestbyname(digest))
- # define EVP_MD_free(x) /* NOOP */
- # define fm_EVP_MD_const const // compatibility const EVP_MD* from EVP_get_digestbyname()
diff --git a/mail/fetchmail/files/patch-tls-aux.h b/mail/fetchmail/files/patch-tls-aux.h
deleted file mode 100644
index 54f9ba55daa6..000000000000
--- a/mail/fetchmail/files/patch-tls-aux.h
+++ /dev/null
@@ -1,18 +0,0 @@
-Cherry-pick from upstream 8f00c607, see 
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282413#c4
-
---- tls-aux.h.orig	2024-08-18 17:42:19 UTC
-+++ tls-aux.h
-@@ -18,12 +18,6 @@
- # ifdef LIBWOLFSSL_VERSION_HEX
- #  define USING_WOLFSSL 1
- #  define OSSL110_API 1
--#  ifndef OPENSSL_COMPATIBLE_DEFAULTS
--#   error "wolfSSL was compiled without -DOPENSSL_COMPATIBLE_DEFAULTS. Recompile and reinstall wolfSSL!"
--#  endif
--#  ifndef HAVE_EX_DATA
--#   error "wolfSSL was configured without --enable-context-extra-user-data. Recompile and reinstall wolfSSL!"
--#  endif
- # else
- #  if OPENSSL_VERSION_NUMBER < 0x1010000fL
- #   undef OSSL110_API