diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 66474be62251..b4c4dcceb64f 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,106 +1,114 @@ # Created by: Ville Eerola PORTNAME?= fetchmail -DISTVERSION= 6.4.24 +DISTVERSION= 6.4.25 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 ssl tar:xz +USES= cpe gmake tar:xz IGNORE_SSL= libressl libressl-devel -IGNORE_SSL_REASON=incompatible license/no GPLv2 clause 2b exception for LibreSSL +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 \ - --with-ssl=${OPENSSLBASE} \ --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 -OPTIONS_SINGLE= GSSAPI +OPTIONS_DEFAULT= CA_BUNDLE GSSAPI_BASE OPENSSL +OPTIONS_SINGLE= GSSAPI TLS OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE -OPTIONS_SUB= yes +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 -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 +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: .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 c2d2a1175c8c..ecbfe5e751fb 100644 --- a/mail/fetchmail/distinfo +++ b/mail/fetchmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1637401885 -SHA256 (fetchmail-6.4.24.tar.xz) = 9c961df25cd922f539218b0b56a77e7a47778e49ed907edaa5b4941ad3b253cf -SIZE (fetchmail-6.4.24.tar.xz) = 1331764 +TIMESTAMP = 1639176375 +SHA256 (fetchmail-6.4.25.tar.xz) = 7ebefbe89172fd59f0fd8317d8743a8436f375ccdcab3900e4c3ec06a8fbf27f +SIZE (fetchmail-6.4.25.tar.xz) = 1343360 diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile index 63599abe7b3f..442a37e5eefe 100644 --- a/mail/fetchmailconf/Makefile +++ b/mail/fetchmailconf/Makefile @@ -1,45 +1,46 @@ PORTNAME= fetchmailconf PORTREVISION= 0 DISTNAME= fetchmail-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} # NOTE: MASTER_SITES in ../fetchmail must NOT use the $PORTNAME variable, # else _this_ port (fetchmailconf) becomes unfetchable MAINTAINER= chalpin@cs.wisc.edu COMMENT= Python-based GUI to configure fetchmail LICENSE= GPLv2+ # minimum required version 6.4.2 - not codified, on the assumption # that fetchmail port updated at the same time RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ fetchmail>=${PORTVERSION}:mail/fetchmail BUILD_DEPENDS+= ${RUN_DEPENDS} USES= python shebangfix tar:xz USE_PYTHON= py3kplist GNU_CONFIGURE= yes +CONFIGURE_ARGS= PKG_CONFIG=: ALL_TARGET= fetchmailconf INSTALL_TARGET= install-data-am install-nodist_binSCRIPTS install-man FILESDIR= ${.CURDIR}/files PATCHDIR= ${FILESDIR} NO_ARCH= yes SUB_FILES= fetchmailconf SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} PLIST= ${.CURDIR}/pkg-plist post-install: # first, run smoke tests - the version check makes sure we have all # modules listed in the *_DEPENDS variables: ${PYTHON_CMD} ${WRKSRC}/fetchmailconf.py -V # then install: ${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin ${RM} ${STAGEDIR}${PREFIX}/man/man1/fetchmail.1* MASTERDIR= ${.CURDIR}/../fetchmail .include "${MASTERDIR}/Makefile"