summaryrefslogtreecommitdiff
path: root/mail/fetchmail/files
diff options
context:
space:
mode:
authorMatthias Andree <mandree@FreeBSD.org>2024-11-14 00:22:48 +0100
committerMatthias Andree <mandree@FreeBSD.org>2024-11-15 17:59:19 +0100
commit702b257be6fb833e5e0365ea64c4ae28996d0517 (patch)
tree056e4ef170fea27c8586f2fd157dbd33e250d67a /mail/fetchmail/files
parentsysutils/limine: Update to 8.4.0 (diff)
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
Diffstat (limited to 'mail/fetchmail/files')
-rw-r--r--mail/fetchmail/files/patch-socket.c9
-rw-r--r--mail/fetchmail/files/patch-tls-aux.h18
2 files changed, 0 insertions, 27 deletions
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