Attachment #212874 for bug #245187

Lines 2-8 Link Here

(-)fetchmail/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= fetchmail	4	PORTNAME?= fetchmail
5	PORTVERSION= 6.4.2	5	DISTVERSION= 6.4.3-rc2
6	CATEGORIES= mail	6	CATEGORIES= mail
7	# The next line is inherited by the fetchmailconf slave port,	7	# The next line is inherited by the fetchmailconf slave port,
8	# do NOT replace fetchmail by ${PORTNAME}	8	# do NOT replace fetchmail by ${PORTNAME}
Lines 17-23 Link Here
17	.if empty(MASTERDIR)	17	.if empty(MASTERDIR)
18	CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss	18	CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
19		19
20	USES= cpe gmake tar:xz ssl	20	USES= cpe gmake tar:lz ssl
21		21
22	USERS= ${PORTNAME}	22	USERS= ${PORTNAME}
23	GROUPS= ${USERS}	23	GROUPS= ${USERS}

Lines 1-3 Link Here

(-)fetchmail/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1581675882	1	TIMESTAMP = 1585604829
2	SHA256 (fetchmail-6.4.2.tar.xz) = e21f6b3326f29fdb0c4786b5602aa4b9e668805424d0708eb42be6395c1ca630	2	SHA256 (fetchmail-6.4.3-rc2.tar.lz) = d67a19202656aa7a41c81c2cc1757c9b999ba16934855653520fb42e1fc56224
3	SIZE (fetchmail-6.4.2.tar.xz) = 1261472	3	SIZE (fetchmail-6.4.3-rc2.tar.lz) = 1262662




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


Lines 18-24 Link Here

(-)fetchmailconf/Makefile (-1 / +1 lines)
18	fetchmail>=${PORTVERSION}:mail/fetchmail	18	fetchmail>=${PORTVERSION}:mail/fetchmail
19	RUN_DEPENDS+= ${BUILD_DEPENDS}	19	RUN_DEPENDS+= ${BUILD_DEPENDS}
20		20
21	USES= python shebangfix tar:xz	21	USES= python shebangfix tar:lz
22	USE_PYTHON= py3kplist	22	USE_PYTHON= py3kplist
23		23
24	FILESDIR= ${.CURDIR}/files	24	FILESDIR= ${.CURDIR}/files




--- fetchmailconf.py.orig	2020-01-31 20:22:54 UTC
+++ fetchmailconf.py
@@ -2132,10 +2132,6 @@ def copy_instance(toclass, fromdict):
 
 if __name__ == '__main__':
 
-    if "DISPLAY" not in os.environ:
-        print("fetchmailconf must be run under X")
-        sys.exit(1)
-
     fetchmail_icon = """
 R0lGODdhPAAoAPcAAP///wgICBAQEISEhIyMjJSUlKWlpa2trbW1tcbGxs7Ozufn5+/v7//39yEY
 GNa9tUoxKZyEe1o5KTEQAN7OxpyMhIRjUvfn3pxSKYQ5EO/Wxv/WvWtSQrVzSmtCKWspAMatnP/e
@@ -2202,6 +2198,10 @@ fetchmailconf comes with ABSOLUTELY NO WARRANTY.  This
 welcome to redistribute it under certain conditions.  Please see the file
 COPYING in the source or documentation directory for details.""")
             sys.exit(0)
+
+    if "DISPLAY" not in os.environ:
+        print("fetchmailconf must be run under X")
+        sys.exit(1)
 
     # Get client host's FQDN
     hostname = socket.gethostname()

Return to bug 245187

Line 0 Link Here

(-)fetchmail/files/patch-fetchmail.man (+30 lines)
	1	From 74c1a60970152d9b83e9c7eca9bda69336a0b458 Mon Sep 17 00:00:00 2001
	2	From: Matthias Andree <matthias.andree@gmx.de>
	3	Date: Mon, 30 Mar 2020 23:01:42 +0200
	4	Subject: [PATCH] fetchmail.man: --sslproto: document tls1.3 and tls1.3+
	5	values.
	6
	7	The code was added in 3d4a8713e = 6.4.0-beta3,
	8	but the documentation was missing from the manual page.
	9	---
	10	fetchmail.man \| 4 ++++
	11	1 file changed, 4 insertions(+)
	12
	13	diff --git a/fetchmail.man b/fetchmail.man
	14	index 111ddb2f..da6ade56 100644
	15	--- ./fetchmail.man
	16	+++ b/fetchmail.man
	17	@@ -520,6 +520,10 @@ Since v6.4.0. Require TLS. Auto-negotiate TLSv1.1 or newer.
	18	Since v6.4.0. Require TLS v1.2 exactly.
	19	.IP '\fBTLS1.2+\fP'
	20	Since v6.4.0. Require TLS. Auto-negotiate TLSv1.2 or newer.
	21	+.IP \&'\fBTLS1.3\fP'
	22	+Since v6.4.0. Require TLS v1.3 exactly.
	23	+.IP '\fBTLS1.3+\fP'
	24	+Since v6.4.0. Require TLS. Auto-negotiate TLSv1.3 or newer.
	25	.IP "Unrecognized parameters"
	26	are treated the same as '\fBauto\fP'.
	27	.RE
	28	--
	29	2.24.1
	30

Lines 1-24 Link Here

(-)fetchmailconf/files/patch-fetchmailconf.py (-24 lines)
1	--- fetchmailconf.py.orig 2020-01-31 20:22:54 UTC
2	+++ fetchmailconf.py
3	@@ -2132,10 +2132,6 @@ def copy_instance(toclass, fromdict):
4
5	if __name__ == '__main__':
6
7	- if "DISPLAY" not in os.environ:
8	- print("fetchmailconf must be run under X")
9	- sys.exit(1)
10	-
11	fetchmail_icon = """
12	R0lGODdhPAAoAPcAAP///wgICBAQEISEhIyMjJSUlKWlpa2trbW1tcbGxs7Ozufn5+/v7//39yEY
13	GNa9tUoxKZyEe1o5KTEQAN7OxpyMhIRjUvfn3pxSKYQ5EO/Wxv/WvWtSQrVzSmtCKWspAMatnP/e
14	@@ -2202,6 +2198,10 @@ fetchmailconf comes with ABSOLUTELY NO WARRANTY. This
15	welcome to redistribute it under certain conditions. Please see the file
16	COPYING in the source or documentation directory for details.""")
17	sys.exit(0)
18	+
19	+ if "DISPLAY" not in os.environ:
20	+ print("fetchmailconf must be run under X")
21	+ sys.exit(1)
22
23	# Get client host's FQDN
24	hostname = socket.gethostname()