diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 260972a115af..fa86583d8300 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,114 +1,115 @@ # Created by: Ville Eerola PORTNAME?= fetchmail -DISTVERSION= 6.4.30 +DISTVERSION= 6.4.31 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.4/ MAINTAINER= chalpin@cs.wisc.edu COMMENT?= Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR LICENSE= GPLv2+ .if empty(MASTERDIR) USES= cpe gmake 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 # the added PYTHON=: suppresses python builds, # see ../../mail/fetchmailconf/ for the configuration tool CONFIGURE_ARGS= --enable-fallback=no \ --enable-opie \ --enable-RPA \ --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 PATCH_STRIP= -p1 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= CA_BUNDLE DOCS NLS OPTIONS_DEFAULT= CA_BUNDLE GSSAPI_BASE OPENSSL OPTIONS_SINGLE= GSSAPI TLS OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SINGLE_TLS= OPENSSL WOLFSSL OPTIONS_SUB= yes CA_BUNDLE_DESC= Install CA bundle for OpenSSL CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss 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} 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}/man/man1/fetchmailconf.1* post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .include .if ${ARCH:Mpowerpc*} && ${OSREL:R} < 13 # as of 2019-10-02, powerpc's base compiler does not yield a working fetchmail. # https://svnweb.freebsd.org/ports?view=revision&revision=513614 -- pkubaj@ USE_GCC= yes .endif .include diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo index 814456f6366f..e3bf6a53f6e2 100644 --- a/mail/fetchmail/distinfo +++ b/mail/fetchmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651096631 -SHA256 (fetchmail-6.4.30.tar.xz) = 35824c20aa1d8d97e3f1611fef49b9f7f68396f7cbc4d3a807fed27ae9ea445a -SIZE (fetchmail-6.4.30.tar.xz) = 1333524 +TIMESTAMP = 1657974724 +SHA256 (fetchmail-6.4.31.tar.xz) = 904bf9247054df8e91b47b1a9fe15a31dda8478c25b5291da0424653744a28f7 +SIZE (fetchmail-6.4.31.tar.xz) = 1332264 diff --git a/mail/fetchmail/files/patch-ZZZ-841f6af0d1a820c5bb4379e72799d95b5a3ef77d.diff b/mail/fetchmail/files/patch-ZZZ-841f6af0d1a820c5bb4379e72799d95b5a3ef77d.diff new file mode 100644 index 000000000000..81159081ec70 --- /dev/null +++ b/mail/fetchmail/files/patch-ZZZ-841f6af0d1a820c5bb4379e72799d95b5a3ef77d.diff @@ -0,0 +1,13 @@ +diff --git a/fetchmail.man b/fetchmail.man +index 37792b81084549c1579de5b6844b10e55377468d..aebfdfdbeaf33a4435a5a074960059bbd337242b 100644 +--- a/fetchmail.man ++++ b/fetchmail.man +@@ -10,7 +10,7 @@ + .\" Load www macros to process .URL requests, this requires groff: + .mso www.tmac + .\" +-.TH fetchmail 1 2022-02-18 "fetchmail 6.4.30" "fetchmail reference manual" ++.TH fetchmail 1 2022-07-16 "fetchmail 6.4.31" "fetchmail reference manual" + + .SH NAME + fetchmail \- fetch mail from a POP, IMAP, ETRN, or ODMR-capable server diff --git a/mail/fetchmail/files/patch-configure b/mail/fetchmail/files/patch-configure deleted file mode 100644 index 196de8ea3975..000000000000 --- a/mail/fetchmail/files/patch-configure +++ /dev/null @@ -1,30 +0,0 @@ ---- a/configure.orig 2013-04-23 21:36:55 UTC -+++ b/configure -@@ -9552,11 +9552,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - #ifdef __cplusplus - extern "C" - #endif --char krb5_des_string_to_key (); -+char krb5int_des_init_state (); - int - main () - { --return krb5_des_string_to_key (); -+return krb5int_des_init_state (); - ; - return 0; - } -@@ -9591,11 +9591,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - #ifdef __cplusplus - extern "C" - #endif --char krb5_des_string_to_key (); -+char krb5int_des_init_state (); - int - main () - { --return krb5_des_string_to_key (); -+return krb5int_des_init_state (); - ; - return 0; - }