fetchmail: update to 6.3.26

* add licenses
* remove kerberos conditional pre-configure rule (fixed in upstream)

Changes:
fetchmail-6.3.26 (released 2013-04-23, 26180 LoC):

# NOTE THAT FETCHMAIL IS NO LONGER PUBLISHED THROUGH IBIBLIO.
* They have stopped accepting submissions and consider themselves an archive.

# CRITICAL BUG FIX for setups using "mimedecode":
* The mimedecode feature failed to ship the last line of the body if it was
encoded as quoted-printable and had a MIME soft line break in the very last
line. Reported by Lars Hecking in June 2011.

Bug introduced on 1998-03-20 when the mimedecode support was added by ESR
before release 4.4.1 through code contributed by Henrik Storner.
Workaround for older releases: do not use mimedecode feature.

Earlier versions of this NEWS file claimed this bug fixed in fetchmail-6.3.23,
but it was not.

Fixes Launchpad Bug#1171818.

fetchmail-6.3.25 (released 2013-03-18, 26149 LoC):

# NOTE THAT FETCHMAIL IS NO LONGER PUBLISHED THROUGH IBIBLIO.
* They have stopped accepting submissions and consider themselves an archive.

# BUG FIXES
* Fix a memory leak in out-of-memory error condition while handling plugins.
  Report and patch by John Beck (found with Parfait static code analyzer).
* Fix a NULL pointer dereference in out-of-memory error condition while handling
  plugins.
  Report and patch by John Beck (found with Parfait static code analyzer).

# CHANGES
* Improved reporting when SSL/TLS X.509 certificate validation has failed,
  working around a not-so-recent swapping of two OpenSSL error codes, and
  a practical impossibility to distinguish broken certification chains from
  missing trust anchors (root certificates).
* OpenSSL decoded errors are now reported through report(), rather than dumped
  to stderr, so that they should show up in logfiles and/or syslog.
* The fetchmail manual page no longer claims that MD5 were the default OpenSSL
  hash format (for use with --sslfingerprint). Reported by Jakob Wilk,
  PARTIAL fix for Debian Bug#700266.
* The fetchmail manual page now refers the user to --softbounce from the
  SMTP/ESMTP ERROR HANDLING section.  Reported by Anton Shterenlikht.

# WORKAROUNDS
* Older systems that provide the older RFC-2553 implementation of getaddrinfo,
  rather than the current RFC-3493, and systems that do not provide this
  getaddrinfo() interface at all and thus use the replacement functions from
  libesmtp/getaddrinfo.?, might return EAI_NODATA when a host is registered in
  DNS as MX or similar, but without A or AAAA records.  Handle this situation
  when checking for multidrop aliases and treat EAI_NODATA the same as
  EAI_NONAME, i. e. name cannot be resolved.

  The proper fix, however, is to upgrade the operating system.

# TRANSLATION UPDATES
[cs] Czech, by Petr Pisar
[da] Danish, by Joe Hansen
[de] German
[eo] Esperanto, by Sian Mountbatten and Felipe Castro
[fr] French, by Frédéric Marchal
[ja] Japanese, by Takeshi Hamasaki
[pl] Polish, by Jakub Bogusz
[sv] Swedish, by Göran Uddeborg
[vi] Vietnamese, by Trần Ngọc Quân

3 files changed, 22 insertions, 34 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 4f1957253bb..6f2f855e1a0 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.187 2018/02/20 13:19:39 wiz Exp $
+# $NetBSD: Makefile,v 1.188 2018/05/22 09:22:31 triaxx Exp $
 
 # Note to updaters: mail/fetchmailconf reaches over here, make sure it builds.
-DISTNAME=	fetchmail-6.3.22
-PKGREVISION=	4
+DISTNAME=	fetchmail-6.3.26
 CATEGORIES=	mail
-MASTER_SITES=	http://download.berlios.de/fetchmail/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fetchmail/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.fetchmail.info/
 COMMENT=	Batch mail retrieval/forwarding utility for pop2, pop3, apop, imap
+LICENSE=	gnu-gpl-v1 AND gnu-gpl-v2 AND modified-bsd AND public-domain AND \
+		lgpl-v2.1
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -28,33 +29,19 @@ TEST_TARGET=	check
 DOCDIR=		${PREFIX}/share/doc/fetchmail
 RCD_SCRIPTS=	fetchmail
 
-.include "../../devel/gettext-lib/buildlink3.mk"
+INSTALLATION_DIRS+=	${DOCDIR}
 
-.if defined(REPLACE_KERBEROS_LIBS)
-pre-configure:
-	cd ${WRKSRC} && \
-	for F in configure.in configure; do \
-		${SED} -e "s/-lkrb -ldes/-lkrb -ldes -lcom_err -lroken/" \
-			$$F > $$F.mod; \
-		${MV} -f $$F.mod $$F; \
-	done
-	${CHMOD} a+x ${WRKSRC}/configure
-.endif
+.include "../../devel/gettext-lib/buildlink3.mk"
 
 post-build:
-	for file in ${WRKSRC}/fetchmail.man; do				\
-		${MV} -f $$file $$file.tbl;				\
-		${TBL} $$file.tbl > $$file;				\
-	done
+	${MV} ${WRKSRC}/fetchmail.man ${WRKSRC}/fetchmail.man.tbl &&	\
+	${TBL} ${WRKSRC}/fetchmail.man.tbl > ${WRKSRC}/fetchmail.man
 
 post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
-	cd ${WRKSRC}; for file in					\
-		FAQ NOTES FEATURES README COPYING			\
-		fetchmail-FAQ.html fetchmail-features.html		\
-		design-notes.html;					\
-	do								\
-		${INSTALL_DATA} $$file ${DESTDIR}${DOCDIR};		\
-	done
+.for f in FAQ NOTES FEATURES README COPYING fetchmail-FAQ.html		\
+                 fetchmail-features.html design-notes.html
+	cd ${WRKSRC} &&							\
+	${INSTALL_DATA} ${f} ${DESTDIR}${DOCDIR}
+.endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/fetchmail/PLIST b/mail/fetchmail/PLIST
index dfd1170514c..2250bb7be86 100644
--- a/mail/fetchmail/PLIST
+++ b/mail/fetchmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2014/03/11 14:05:03 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.16 2018/05/22 09:22:31 triaxx Exp $
 bin/fetchmail
 man/man1/fetchmail.1
 share/doc/fetchmail/COPYING
@@ -15,6 +15,7 @@ share/locale/da/LC_MESSAGES/fetchmail.mo
 share/locale/de/LC_MESSAGES/fetchmail.mo
 share/locale/el/LC_MESSAGES/fetchmail.mo
 share/locale/en_GB/LC_MESSAGES/fetchmail.mo
+share/locale/eo/LC_MESSAGES/fetchmail.mo
 share/locale/es/LC_MESSAGES/fetchmail.mo
 share/locale/fi/LC_MESSAGES/fetchmail.mo
 share/locale/fr/LC_MESSAGES/fetchmail.mo
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index d6a55037db5..5c36a6be63c 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.50 2018/02/20 13:19:39 wiz Exp $
+$NetBSD: distinfo,v 1.51 2018/05/22 09:22:31 triaxx Exp $
 
-SHA1 (fetchmail-6.3.22.tar.bz2) = f9411a16d4055669e5cfd89bf38acba6a5cce041
-RMD160 (fetchmail-6.3.22.tar.bz2) = b1b4ae20e7fc6d307cf97c697d5e27daddc6bc72
-SHA512 (fetchmail-6.3.22.tar.bz2) = 965761c873ea5c2d80ecabf40f0a161148f2cded5cb0ef0d71a44798ba7da1b80022a4dcea4060dddb0c87764d905b5a6f5076eb925732eee4ba4e6884330b06
-Size (fetchmail-6.3.22.tar.bz2) = 1724108 bytes
+SHA1 (fetchmail-6.3.26.tar.xz) = de8dbe62a8edfa232ee4278257a1fe67aa1c797a
+RMD160 (fetchmail-6.3.26.tar.xz) = ce9a54b6d11da4c5e042c760284f8b3c6ac5a4ff
+SHA512 (fetchmail-6.3.26.tar.xz) = 8e0a2484e60eaf6c0231e2599e10fec6d207fa1c0fa02ec99b3ef9aea00b6d87275434e79470a25f06e358cdd4a293f9c46a82dd128fe733a99c85144e6caa63
+Size (fetchmail-6.3.26.tar.xz) = 1283816 bytes
 SHA1 (patch-Makefile.in) = c08ef115550f004496481e610140d7d2391016b2
 SHA1 (patch-socket.c) = 3d51ef4ffa6d721889d08ee04fc78b1b77715989