Index: head/mail/fetchmail/Makefile =================================================================== --- head/mail/fetchmail/Makefile (revision 489438) +++ head/mail/fetchmail/Makefile (revision 489439) @@ -1,96 +1,99 @@ # Created by: Ville Eerola # $FreeBSD$ PORTNAME= fetchmail PORTVERSION= 6.3.26 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= mail ipv6 MASTER_SITES= SF/${PORTNAME}/branch_6.3/ \ http://mandree.home.pages.de/${PORTNAME}/ -PATCH_SITES= https://gitlab.com/fetchmail/fetchmail/commit/ -PATCHFILES= 9b8b634.patch:-p1 +PATCH_SITES= https://gitlab.com/fetchmail/fetchmail/commit/:gitlab +PATCH_SITES+= https://src.fedoraproject.org/rpms/fetchmail/raw/master/f/:fedora +PATCHFILES= 9b8b634.patch:-p1:gitlab # SNI fix +PATCHFILES+= fetchmail-6.3.26-ssl-backport.patch:-p1:fedora + MAINTAINER= chalpin@cs.wisc.edu COMMENT= Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR LICENSE= GPLv2 LGPL21 LICENSE_COMB= dual RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USERS= ${PORTNAME} GROUPS= ${USERS} USES= cpe gmake python shebangfix tar:xz ssl SHEBANG_FILES= fetchmailconf.py USE_RC_SUBR= fetchmail SUB_FILES= pkg-message GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-opie --enable-RPA --enable-SDPS \ --without-hesiod --enable-fallback=no \ --with-ssl=${OPENSSLBASE} CONFIGURE_ENV= ac_cv_have_decl_SSLv2_client_method=no LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= X11 NLS NTLM POP2 DOCS OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= GSSAPI_BASE OPTIONS_SUB= yes GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --with-kerberos5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_NONE_CONFIGURE_ON= --without-gssapi X11_DESC= Python/Tkinter dependencies for ``fetchmailconf'' POP2_DESC= POP2 Protocol support[obsolete] NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NTLM_CONFIGURE_ENABLE= NTLM NTLM_PORTDOCS= README.NTLM # POP2 is obsolete POP2_CONFIGURE_ENABLE= POP2 X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} X11_CONFIGURE_OFF= PYTHON=: X11_SUB_FILES_OFF= fetchmailconf PORTDOCS= FAQ FEATURES NEWS NOTES README README.SSL \ design-notes.html fetchmail-FAQ.html fetchmail-features.html \ esrs-design-notes.html #.include post-patch: .if !exists(/usr/lib/libcom_err.so) @${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure .endif post-build: @${MAKE_CMD} -C ${WRKSRC} check post-install: ${INSTALL} -d ${STAGEDIR}/var/run/fetchmail ${INSTALL_DATA} ${FILESDIR}/fetchmailrc.sample \ ${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install-X11-off: ${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${STAGEDIR}${PREFIX}/libexec .include Index: head/mail/fetchmail/distinfo =================================================================== --- head/mail/fetchmail/distinfo (revision 489438) +++ head/mail/fetchmail/distinfo (revision 489439) @@ -1,5 +1,7 @@ -TIMESTAMP = 1542709974 +TIMESTAMP = 1546191531 SHA256 (fetchmail-6.3.26.tar.xz) = 79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850 SIZE (fetchmail-6.3.26.tar.xz) = 1283816 SHA256 (9b8b634.patch) = b0a9f7e28e7e6a5a16669832ad7a7a7dca47b435ce446ef10bd0421deea4a848 SIZE (9b8b634.patch) = 1023 +SHA256 (fetchmail-6.3.26-ssl-backport.patch) = a34b1a6becf731e2ef029a1c5ee3a82a7bbb1e2487b6f3be15bbb4e7dc8b500d +SIZE (fetchmail-6.3.26-ssl-backport.patch) = 31596 Index: head/mail/fetchmail/files/patch-fetchmail.c =================================================================== --- head/mail/fetchmail/files/patch-fetchmail.c (revision 489438) +++ head/mail/fetchmail/files/patch-fetchmail.c (revision 489439) @@ -1,26 +1,26 @@ ---- fetchmail.c.orig 2013-04-23 20:00:45 UTC -+++ fetchmail.c +--- fetchmail.c.orig 2018-12-30 11:43:19.032822000 -0600 ++++ fetchmail.c 2018-12-30 12:51:55.552234000 -0600 @@ -50,6 +50,10 @@ #include #include +#ifdef SSL_ENABLE +#include +#endif + #ifndef ENETUNREACH #define ENETUNREACH 128 /* Interactive doesn't know this */ #endif /* ENETUNREACH */ -@@ -263,6 +267,12 @@ int main(int argc, char **argv) +@@ -263,10 +267,10 @@ #ifdef SSL_ENABLE "+SSL" #endif -+#ifdef OPENSSL_NO_SSL2 -+ "-SSLv2" -+#endif -+#ifdef OPENSSL_NO_SSL3_METHOD -+ "-SSLv3" -+#endif +-#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 == 0 ++#if (HAVE_DECL_SSLV2_CLIENT_METHOD + 0 == 0) && !defined(OPENSSL_NO_SSL2) + "-SSLv2" + #endif +-#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0 ++#if (HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0) && !defined(OPENSSL_NO_SSL3_METHOD) + "-SSLv3" + #endif #ifdef OPIE_ENABLE - "+OPIE" - #endif /* OPIE_ENABLE */ Index: head/mail/fetchmail/files/patch-socket.c =================================================================== --- head/mail/fetchmail/files/patch-socket.c (revision 489438) +++ head/mail/fetchmail/files/patch-socket.c (revision 489439) @@ -1,24 +1,20 @@ ---- socket.c.orig 2013-04-23 20:00:45 UTC -+++ socket.c -@@ -907,14 +907,19 @@ int SSLOpen(int sock, char *mycert, char +--- socket.c.orig 2018-12-30 11:43:19.042365000 -0600 ++++ socket.c 2018-12-30 12:46:39.062201000 -0600 +@@ -910,7 +910,7 @@ _ssl_context[sock] = NULL; if(myproto) { if(!strcasecmp("ssl2",myproto)) { -#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0 +#if (HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0) && !defined(OPENSSL_NO_SSL2) _ctx[sock] = SSL_CTX_new(SSLv2_client_method()); #else -- report(stderr, GT_("Your operating system does not support SSLv2.\n")); -+ report(stderr, GT_("Your OpenSSL version does not support SSLv2.\n")); - return -1; + report(stderr, GT_("Your OpenSSL version does not support SSLv2.\n")); +@@ -918,7 +918,7 @@ #endif + avoid_ssl_versions &= ~SSL_OP_NO_SSLv2; } else if(!strcasecmp("ssl3",myproto)) { -+#ifndef OPENSSL_NO_SSL3_METHOD +-#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 0 ++#if (HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 0) && !defined(OPENSSL_NO_SSL3_METHOD) _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); -+#else -+ report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n")); -+ return -1; -+#endif - } else if(!strcasecmp("tls1",myproto)) { - _ctx[sock] = SSL_CTX_new(TLSv1_client_method()); - } else if (!strcasecmp("ssl23",myproto)) { + #else + report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n"));