MFH: r546739 r547549

mail/fetchmail: update to 6.4.12 (from 6.4.8)

(Note this isn't the usual MFH changelog as that doesn't make sense in this
particular case; head/ had some churn around a regression in 6.4.10 that
this MFH-of-two-changeset nicely skips over.)

Add: Romanian-language translation by Florentina Musat

Add: manual page now mentions that --sslfingerprint hash is of MD5 type.

Fix: README contained NEWS fragments (broken since c. 1 year/c. 6.4.2,
fixed in 6.4.12) instead of the actual contents.

Update: the > 2^31 "long long" local patch so it patches the right place of the
NEWS file.

PR:		248954
Approved by:	Corey Halpin (maintainer)

PR:		249009
Approved by:	Corey Halpin (maintainer)

Approved by:	ports-secteam@ (fluffy@)

5 files changed, 15 insertions, 13 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 650ed3ad0423..3b2991ccf856 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	fetchmail
-DISTVERSION=	6.4.8
+DISTVERSION=	6.4.12
 CATEGORIES=	mail
 # The next line is inherited by the fetchmailconf slave port,
 # do NOT replace fetchmail by ${PORTNAME}
@@ -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:lz ssl
+USES=		cpe gmake tar:xz ssl
 
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index 586b7330f080..c70c615c1f74 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592159098
-SHA256 (fetchmail-6.4.8.tar.lz) = d8e03112a4067e0bf930cba7da20de82d970ad657efa1aeb7fe4e35229cb0ce1
-SIZE (fetchmail-6.4.8.tar.lz) = 1280078
+TIMESTAMP = 1599207773
+SHA256 (fetchmail-6.4.12.tar.xz) = 2b84e0971dbf683ec7edd313f9218adbc7dc51c1de9825b3b549bf619c1a4887
+SIZE (fetchmail-6.4.12.tar.xz) = 1303532
diff --git a/mail/fetchmail/files/patch-ZZZ-87626c2707cc0d82e49e160ab3c85430ff33534f b/mail/fetchmail/files/patch-ZZZ-87626c2707cc0d82e49e160ab3c85430ff33534f
index e6d1a227e22a..3c6d085a19c9 100644
--- a/mail/fetchmail/files/patch-ZZZ-87626c2707cc0d82e49e160ab3c85430ff33534f
+++ b/mail/fetchmail/files/patch-ZZZ-87626c2707cc0d82e49e160ab3c85430ff33534f
@@ -16,23 +16,24 @@ This requires C99's new long long type.
  pop3.c      | 4 ++--
  8 files changed, 18 insertions(+), 10 deletions(-)
 
-diff --git a/NEWS b/NEWS
-index c01f9df9..9485edca 100644
+diff -up work/fetchmail-6.4.10/NEWS.orig work/fetchmail-6.4.10/NEWS
 --- a/NEWS
 +++ b/NEWS
-@@ -63,5 +63,12 @@
- 
- --------------------------------------------------------------------------------
+@@ -63,7 +63,13 @@ removed from a 6.5.0 or newer release.)
+ * Fetchmail does not guarantee compatibility with EOL OpenSSL versions. Support
+   for end-of-life OpenSSL versions may be removed even from patchlevel releases.
  
+----------------------------------------------------------------------------------
++--------------------------------------------------------------------------------
 +## BUG FIXES
 +* fetchmail can now report mailbox sizes of 2^31 octets and beyond.
 +  This requires C99 support (for the long long type).
 +  Fixes Debian Bug#873668, reported by Andreas Schmidt.
 +
 +--------------------------------------------------------------------------------
-+
- fetchmail-6.4.1 (released 2019-09-28, 27473 LoC):
+ fetchmail-6.4.10 (released 2020-08-27, 27596 LoC):
  
+ # REGRESSION FIX:
 diff --git a/driver.c b/driver.c
 index d21a32ab..a5033729 100644
 --- a/driver.c
diff --git a/mail/fetchmail/pkg-plist b/mail/fetchmail/pkg-plist
index af28bca023ab..4f6d9111a97b 100644
--- a/mail/fetchmail/pkg-plist
+++ b/mail/fetchmail/pkg-plist
@@ -17,6 +17,7 @@ man/man1/fetchmail.1.gz
 %%NLS%%share/locale/nl/LC_MESSAGES/fetchmail.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/fetchmail.mo
 @comment %%NLS%%share/locale/pt_BR/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/fetchmail.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/fetchmail.mo
 @comment %%NLS%%share/locale/sk/LC_MESSAGES/fetchmail.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/fetchmail.mo
diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile
index 4480965346c0..7e26b6e8be22 100644
--- a/mail/fetchmailconf/Makefile
+++ b/mail/fetchmailconf/Makefile
@@ -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:lz
+USES=		python shebangfix tar:xz
 USE_PYTHON=	py3kplist
 
 FILESDIR=	${.CURDIR}/files