From owner-svn-ports-all@freebsd.org Sun Jan 6 07:21:25 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8146F143BA92; Sun, 6 Jan 2019 07:21:25 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1E7158D9A0; Sun, 6 Jan 2019 07:21:25 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 11C8424F1C; Sun, 6 Jan 2019 07:21:25 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x067LOC1040190; Sun, 6 Jan 2019 07:21:24 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x067LO5S040186; Sun, 6 Jan 2019 07:21:24 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201901060721.x067LO5S040186@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Sun, 6 Jan 2019 07:21:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489439 - in head/mail/fetchmail: . files X-SVN-Group: ports-head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: in head/mail/fetchmail: . files X-SVN-Commit-Revision: 489439 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1E7158D9A0 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2019 07:21:25 -0000 Author: cem (src committer) Date: Sun Jan 6 07:21:24 2019 New Revision: 489439 URL: https://svnweb.freebsd.org/changeset/ports/489439 Log: mail/fetchmail: backport less-old TLS support from Fedora Allows options like 'sslproto "TLS1.2+"', for example. PR: 233247 Submitted by: Corey Halpin (maintainer) Approved by: koobs Modified: head/mail/fetchmail/Makefile head/mail/fetchmail/distinfo head/mail/fetchmail/files/patch-fetchmail.c head/mail/fetchmail/files/patch-socket.c Modified: head/mail/fetchmail/Makefile ============================================================================== --- head/mail/fetchmail/Makefile Sun Jan 6 04:34:29 2019 (r489438) +++ head/mail/fetchmail/Makefile Sun Jan 6 07:21:24 2019 (r489439) @@ -3,13 +3,16 @@ 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 Modified: head/mail/fetchmail/distinfo ============================================================================== --- head/mail/fetchmail/distinfo Sun Jan 6 04:34:29 2019 (r489438) +++ head/mail/fetchmail/distinfo Sun Jan 6 07:21:24 2019 (r489439) @@ -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 Modified: head/mail/fetchmail/files/patch-fetchmail.c ============================================================================== --- head/mail/fetchmail/files/patch-fetchmail.c Sun Jan 6 04:34:29 2019 (r489438) +++ head/mail/fetchmail/files/patch-fetchmail.c Sun Jan 6 07:21:24 2019 (r489439) @@ -1,5 +1,5 @@ ---- 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 @@ -11,16 +11,16 @@ #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 */ Modified: head/mail/fetchmail/files/patch-socket.c ============================================================================== --- head/mail/fetchmail/files/patch-socket.c Sun Jan 6 04:34:29 2019 (r489438) +++ head/mail/fetchmail/files/patch-socket.c Sun Jan 6 07:21:24 2019 (r489439) @@ -1,6 +1,6 @@ ---- 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)) { @@ -8,17 +8,13 @@ +#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"));