Skip to content

Commit

Permalink
mail/fetchmail, fetchmailconf: update to 6.4.3-rc2 (bug fixes)
Browse files Browse the repository at this point in the history
Add a patch to document --sslproto tls1.3+ and tls1.3 through the manpage,
which hasn't made 6.4.3-rc2 but works since 6.4.0 assuming that the SSL library
supports TLSv1.3.

Remove fetchmailconf patch that is now part of the upstream code.

Switch to .lz downloads, a tiny bit smaller.

Upstream changelog:
## BUGFIXES:
* Plug memory leaks when parts of the configuration (defaults, rcfile, command
  line) override one another.
* fetchmail terminated the placeholder command string too late and included
  garbage from the heap at the end of the string. Workaround: don't use place-
  holders %h or %p in the --plugin string. Bug added in 6.4.0 when merging
  Gitlab merge request !5 in order to fix an input buffer overrun.
  Faulty commit 418cda65f752e367fa663fd13884a45fcbc39ddd.
  Reported by Stefan Thurner, Gitlab issue #16.
* Fetchmail now checks for errors when trying to read the .idfile,
  Gitlab issue #3.

## CHANGES:
* Fetchmail documentation was updated to require OpenSSL 1.1.1.
  OpenSSL 1.0.2 reached End Of Life status at the end of the year 2019.
  Fetchmail will tolerate, but warn about, 1.0.2 for now on the assumption that
  distributors backport security fixes as the need arises.
  Fetchmail will also warn if another SSL library that is API-compatible
  with OpenSSL lacks TLS v1.3 support.
* If the trust anchor is missing, fetchmail refers the user to README.SSL.

PR:		245187
Submitted by:	mandree@
Approved by:	Corey Halpin (maintainer)
  • Loading branch information
mandree committed Mar 31, 2020
1 parent 26c2004 commit 0b97141
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 30 deletions.
4 changes: 2 additions & 2 deletions mail/fetchmail/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME?= fetchmail
PORTVERSION= 6.4.2
DISTVERSION= 6.4.3-rc2
CATEGORIES= mail
# The next line is inherited by the fetchmailconf slave port,
# do NOT replace fetchmail by ${PORTNAME}
Expand All @@ -17,7 +17,7 @@ LICENSE_COMB= dual
.if empty(MASTERDIR)
CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss

USES= cpe gmake tar:xz ssl
USES= cpe gmake tar:lz ssl

USERS= ${PORTNAME}
GROUPS= ${USERS}
Expand Down
6 changes: 3 additions & 3 deletions mail/fetchmail/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1581675882
SHA256 (fetchmail-6.4.2.tar.xz) = e21f6b3326f29fdb0c4786b5602aa4b9e668805424d0708eb42be6395c1ca630
SIZE (fetchmail-6.4.2.tar.xz) = 1261472
TIMESTAMP = 1585604829
SHA256 (fetchmail-6.4.3-rc2.tar.lz) = d67a19202656aa7a41c81c2cc1757c9b999ba16934855653520fb42e1fc56224
SIZE (fetchmail-6.4.3-rc2.tar.lz) = 1262662
30 changes: 30 additions & 0 deletions mail/fetchmail/files/patch-fetchmail.man
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
From 74c1a60970152d9b83e9c7eca9bda69336a0b458 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Mon, 30 Mar 2020 23:01:42 +0200
Subject: [PATCH] fetchmail.man: --sslproto: document tls1.3 and tls1.3+
values.

The code was added in 3d4a8713e = 6.4.0-beta3,
but the documentation was missing from the manual page.
---
fetchmail.man | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/fetchmail.man b/fetchmail.man
index 111ddb2f..da6ade56 100644
--- ./fetchmail.man
+++ b/fetchmail.man
@@ -520,6 +520,10 @@ Since v6.4.0. Require TLS. Auto-negotiate TLSv1.1 or newer.
Since v6.4.0. Require TLS v1.2 exactly.
.IP '\fBTLS1.2+\fP'
Since v6.4.0. Require TLS. Auto-negotiate TLSv1.2 or newer.
+.IP \&'\fBTLS1.3\fP'
+Since v6.4.0. Require TLS v1.3 exactly.
+.IP '\fBTLS1.3+\fP'
+Since v6.4.0. Require TLS. Auto-negotiate TLSv1.3 or newer.
.IP "Unrecognized parameters"
are treated the same as '\fBauto\fP'.
.RE
--
2.24.1

2 changes: 1 addition & 1 deletion mail/fetchmailconf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FL
fetchmail>=${PORTVERSION}:mail/fetchmail
RUN_DEPENDS+= ${BUILD_DEPENDS}

USES= python shebangfix tar:xz
USES= python shebangfix tar:lz
USE_PYTHON= py3kplist

FILESDIR= ${.CURDIR}/files
Expand Down
24 changes: 0 additions & 24 deletions mail/fetchmailconf/files/patch-fetchmailconf.py

This file was deleted.

0 comments on commit 0b97141

Please sign in to comment.