diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index d753b00e7fbc..36ea6a81d133 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,117 +1,117 @@ PORTNAME?= fetchmail -DISTVERSION= 6.5.2 +DISTVERSION= 6.5.3 PORTREVISION?= 0 CATEGORIES= mail # The next line is inherited by the fetchmailconf dependent port, # do NOT replace fetchmail by ${PORTNAME} MASTER_SITES= SF/fetchmail/branch_6.5/ MAINTAINER= chalpin@cs.wisc.edu COMMENT?= Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR WWW= https://www.fetchmail.info/ LICENSE= GPLv2+ .if empty(MASTERDIR) USES= cpe gmake pkgconfig tar:xz IGNORE_SSL= libressl libressl-devel IGNORE_SSL_REASON= incompatible license/no GPLv2 clause 2b exception for LibreSSL # The Free Software Foundation asserts that a GPL v2 clause 2b exception is # required even for dynamically linked binaries. See # https://www.gnu.org/licenses/gpl-faq.en.html#GPLStaticVsDynamic USE_RC_SUBR= fetchmail GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share # the added PYTHON=: suppresses python builds, # see ../../mail/fetchmailconf/ for the configuration tool CONFIGURE_ARGS= --enable-SDPS \ --without-hesiod \ PYTHON=: # -Wl,--as-needed suppresses unneeded library references, # for instance, libcom_err.so on GSSAPI_NONE builds: LDFLAGS+= -L${LOCALBASE}/lib -Wl,--as-needed SUB_FILES= pkg-message USERS= ${PORTNAME} GROUPS= ${USERS} PORTDOCS= FAQ FEATURES NEWS NOTES OLDNEWS README README.SSL \ README.SSL-SERVER design-notes.html esrs-design-notes.html \ fetchmail-FAQ.html fetchmail-features.html todo.html OPTIONS_DEFINE= OPIE RPA DOCS NLS OPTIONS_DEFAULT= GSSAPI_BASE OPENSSL RPA OPTIONS_SINGLE= GSSAPI TLS OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SINGLE_TLS= OPENSSL WOLFSSL OPTIONS_SUB= yes OPIE_DESC= Build with OPIE support (deprecated - weak/broken cryptography) RPA_DESC= Build with RPA support (deprecated - weak/broken cryptography) GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ --with-gssapi=${GSSAPIBASEDIR} GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ --with-gssapi=${GSSAPIBASEDIR} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ --with-kerberos5=${GSSAPIBASEDIR} GSSAPI_NONE_CONFIGURE_ON= --without-gssapi NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} OPIE_CONFIGURE_ON= --enable-opie RPA_CONFIGURE_ON= --enable-RPA WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl WOLFSSL_USES_OFF= ssl WOLFSSL_CONFIGURE_ON= WOLFSSL_TRUST_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt WOLFSSL_CONFIGURE_WITH= wolfssl=${LOCALBASE} post-patch: @${REINPLACE_CMD} -e 's,krb5_des_string_to_key,krb5int_des_init_state,g' ${WRKSRC}/configure .if !exists(/usr/lib/libcom_err.so) @${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure .endif .endif .if empty(MASTERDIR) post-build: ${MAKE_CMD} -C ${WRKSRC} check ; { r=$$? ; ( set -x ; ${CAT} "${WRKSRC}/test-suite.log" ) ; exit $$r ; } post-install: ${INSTALL} -d ${STAGEDIR}/var/run/fetchmail ${INSTALL_DATA} ${FILESDIR}/fetchmailrc.sample \ ${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample ${RM} ${STAGEDIR}${PREFIX}/bin/fetchmailconf ${RM} ${STAGEDIR}${PREFIX}/share/man/man1/fetchmailconf.1* post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .include .if ${PORT_OPTIONS:MOPIE} && ${MASTERDIR} == ${.CURDIR} && ${OPSYS} == FreeBSD . if ${OSVERSION} >= 1400072 LIB_DEPENDS+= libopie.so:security/opie # moved to port (from base in 13.X) CPPFLAGS+= -I${LOCALBASE}/include . endif .endif .include diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo index fdb02fb9ba75..708675042e97 100644 --- a/mail/fetchmail/distinfo +++ b/mail/fetchmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1735559390 -SHA256 (fetchmail-6.5.2.tar.xz) = 8fd0477408620ae382c1d0ef83d8946a95e5be0c2e582dd4ebe55cba513a45fe -SIZE (fetchmail-6.5.2.tar.xz) = 1110968 +TIMESTAMP = 1749515671 +SHA256 (fetchmail-6.5.3.tar.xz) = d74e893b78ef29ebef375ab7e726d2977140f8f1208f5905569395cbdae4c23d +SIZE (fetchmail-6.5.3.tar.xz) = 1114612 diff --git a/mail/fetchmail/files/patch-fetchmail.c b/mail/fetchmail/files/patch-fetchmail.c new file mode 100644 index 000000000000..9940217f8330 --- /dev/null +++ b/mail/fetchmail/files/patch-fetchmail.c @@ -0,0 +1,35 @@ +commit c598c50ffda0dcac38b8bd01350dc6894a8efce4 +Author: Matthias Andree +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