fetchmail: Update to 6.5.4

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: fetchmail: Update to 6.5.4
From: Frédéric Fauberteau (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Thu, 26 Jun 2025 07:41:13 +0000
Module Name:	pkgsrc-wip
Committed By:	Frédéric Fauberteau <frederic%fauberteau.org@localhost>
Pushed By:	frederic
Date:		Thu Jun 26 09:41:03 2025 +0200
Changeset:	4e64b3ae9f52613dfe7a38e80f2809baeefc405f

Modified Files:
	fetchmail/Makefile
	fetchmail/PLIST
	fetchmail/distinfo
Added Files:
	fetchmail/COMMIT_MSG
	fetchmail/options.mk
	fetchmail/patches/patch-Makefile.in
	fetchmail/patches/patch-configure
	fetchmail/patches/patch-configure.ac

Log Message:
fetchmail: Update to 6.5.4

Packaged in wip by Frédéric Fauberteau

upstream changes:
-----------------

fetchmail-6.5.4 (released 2025-06-17, 31208 LoC):

## BUGFIXES:
* socket: avoid crash when writing to a socket without SSL/TLS fails.
  Reported by Andrea Venturoli via mailing list, fixes #71.
* wolfSSL support: avoid fetchmail.c compilation failure in certain
  configurations of wolfSSL (for instance, on FreeBSD's wolfssl-5.8.0_1
  package), OpenSSL_version enables a newer 1.1.x compat API that passes its
  argument to a wolfSSL API, with OPENSSL_DIR and OPENSSL_ENGINES_DIR, causing
  related compiler failures.
  See <https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287435>.

-------------------------------------------------------------------------------
fetchmail-6.5.3 (released 2025-06-10, 31204 LoC):

## BUGFIXES:
* IMAP: Reinstate workaround for missing IDLE support if --idle is requested.
  This had been a long-standing feature but got broken in fetchmail 6.4.22
  (commit 616e8c70).  Thanks to Lukáš Tesař for the detailed report including
  a Git bisect that identified this faulty commit.  Fixes Gitlab issue #69.
* IMAP: Only print 'will idle after poll' if --idle is enabled
  and either offered by the server, or forced through --forceidle.
  This fixes a regression introduced in fetchmail 6.4.22 (commit 616e8c70).

## TRANSLATIONS: fetchmail's translation was updated, courtesy of:
* es:    Cristian Othón Martínez Vera [Spanish]

-------------------------------------------------------------------------------
fetchmail-6.5.2 (released 2024-12-30, 31200 LoC):

## TRANSLATIONS: fetchmail's translations were updated, courtesy of:
* cs:    Petr Pisar [Czech]
* sr:    Мирослав Николић (Miroslav Nikolić) [Serbian]

## CHANGES:
* Minor documentation consistency fixes (versions, dates).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4e64b3ae9f52613dfe7a38e80f2809baeefc405f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 fetchmail/COMMIT_MSG                 | 43 ++++++++++++++++++++
 fetchmail/Makefile                   | 39 ++++++------------
 fetchmail/PLIST                      | 24 ++----------
 fetchmail/distinfo                   | 11 ++++--
 fetchmail/options.mk                 | 76 ++++++++++++++++++++++++++++++++++++
 fetchmail/patches/patch-Makefile.in  | 20 ++++++++++
 fetchmail/patches/patch-configure    | 24 ++++++++++++
 fetchmail/patches/patch-configure.ac | 24 ++++++++++++
 8 files changed, 210 insertions(+), 51 deletions(-)

diffs:
diff --git a/fetchmail/COMMIT_MSG b/fetchmail/COMMIT_MSG
new file mode 100644
index 0000000000..87d69ab7df
--- /dev/null
+++ b/fetchmail/COMMIT_MSG
@@ -0,0 +1,43 @@
+fetchmail: Update to 6.5.4
+
+Packaged in wip by Frédéric Fauberteau
+
+upstream changes:
+-----------------
+
+fetchmail-6.5.4 (released 2025-06-17, 31208 LoC):
+
+## BUGFIXES:
+* socket: avoid crash when writing to a socket without SSL/TLS fails.
+  Reported by Andrea Venturoli via mailing list, fixes #71.
+* wolfSSL support: avoid fetchmail.c compilation failure in certain
+  configurations of wolfSSL (for instance, on FreeBSD's wolfssl-5.8.0_1
+  package), OpenSSL_version enables a newer 1.1.x compat API that passes its
+  argument to a wolfSSL API, with OPENSSL_DIR and OPENSSL_ENGINES_DIR, causing
+  related compiler failures.
+  See <https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287435>.
+
+-------------------------------------------------------------------------------
+fetchmail-6.5.3 (released 2025-06-10, 31204 LoC):
+
+## BUGFIXES:
+* IMAP: Reinstate workaround for missing IDLE support if --idle is requested.
+  This had been a long-standing feature but got broken in fetchmail 6.4.22
+  (commit 616e8c70).  Thanks to Lukáš Tesař for the detailed report including
+  a Git bisect that identified this faulty commit.  Fixes Gitlab issue #69.
+* IMAP: Only print 'will idle after poll' if --idle is enabled
+  and either offered by the server, or forced through --forceidle.
+  This fixes a regression introduced in fetchmail 6.4.22 (commit 616e8c70).
+
+## TRANSLATIONS: fetchmail's translation was updated, courtesy of:
+* es:    Cristian Othón Martínez Vera [Spanish]
+
+-------------------------------------------------------------------------------
+fetchmail-6.5.2 (released 2024-12-30, 31200 LoC):
+
+## TRANSLATIONS: fetchmail's translations were updated, courtesy of:
+* cs:    Petr Pisar [Czech]
+* sr:    Мирослав Николић (Miroslav Nikolić) [Serbian]
+
+## CHANGES:
+* Minor documentation consistency fixes (versions, dates).
diff --git a/fetchmail/Makefile b/fetchmail/Makefile
index f29b7bcf08..5bf884a7a8 100644
--- a/fetchmail/Makefile
+++ b/fetchmail/Makefile
@@ -1,19 +1,13 @@
-# $NetBSD$
+# $NetBSD: Makefile,v 1.211 2025/04/19 07:58:01 wiz Exp $
 
-DISTNAME=	fetchmail-7.0alpha11
+# Note to updaters: mail/fetchmailconf reaches over here, make sure it builds.
+DISTNAME=	fetchmail-6.5.4
 CATEGORIES=	mail
-MASTER_SITES=	https://gitlab.com/fetchmail/fetchmail/-/archive/98215a5e/
-SHORT_TAG=	98215a5e
-LONG_TAG=	98215a5ee7847caf67f85972bdac63b84cbe50c9
-# Remnants of failed attempt at using gitlab.mk; it doesn't
-# end up trying to fetch the right file / url.
-#MASTER_SITES=	${MASTER_SITE_GITLAB:=fetchmail/}
-#GITLAB_TAG=	98215a5e
-#GITLAB_TYPE=	tag
-EXTRACT_SUFX=	.tar.gz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fetchmail/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://gitlab.com/fetchmail/fetchmail
+HOMEPAGE=	https://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 gnu-lgpl-v2.1
 
@@ -22,13 +16,13 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-hesiod
 CONFIGURE_ENV+=		PYTHON=:
 LDFLAGS+=		${CFLAGS}
-USE_TOOLS+=		msgfmt tbl
-USE_TOOLS+=		autoconf automake
-AUTOCONF_REQD=  	2.69
+USE_TOOLS+=		autoconf msgfmt pkg-config tbl
 
 LDFLAGS.Darwin+=	-lresolv
 CFLAGS.Darwin+=		-DBIND_8_COMPAT -DHAVE_RESOLV_H
 
+.include "options.mk"
+
 TEST_TARGET=	check
 
 DOCDIR=		${PREFIX}/share/doc/fetchmail
@@ -36,26 +30,17 @@ RCD_SCRIPTS=	fetchmail
 
 INSTALLATION_DIRS+=	${DOCDIR}
 
-post-extract:
-	${MV} ${WRKDIR}/${PKGBASE}-${SHORT_TAG}-${LONG_TAG} ${WRKSRC}
-
-pre-configure:
-	set -e -x; cd ${WRKSRC}; \
-	sh autogen.sh
-
 .include "../../devel/gettext-lib/buildlink3.mk"
+
 post-build:
 	${MV} ${WRKSRC}/fetchmail.man ${WRKSRC}/fetchmail.man.tbl &&	\
 	${TBL} ${WRKSRC}/fetchmail.man.tbl > ${WRKSRC}/fetchmail.man
 
 post-install:
-.for f in NEWS OLDNEWS \
-		README README.OAUTH2 README.NTLM README.PWMD 		\
-		README.SSL README.SSL-SERVER COPYING fetchmail-FAQ.html	\
-		fetchmail-features.html design-notes.html
+.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 "../../wip/mk/gitlab.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fetchmail/PLIST b/fetchmail/PLIST
index bcec1cacda..040ae3461c 100644
--- a/fetchmail/PLIST
+++ b/fetchmail/PLIST
@@ -1,37 +1,21 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.20 2024/12/28 22:09:58 triaxx Exp $
 bin/fetchmail
-bin/fetchmailconf
 man/man1/fetchmail.1
-man/man1/fetchmailconf.1
 share/doc/fetchmail/COPYING
-share/doc/fetchmail/NEWS
-share/doc/fetchmail/OLDNEWS
+share/doc/fetchmail/FAQ
+share/doc/fetchmail/FEATURES
+share/doc/fetchmail/NOTES
 share/doc/fetchmail/README
-share/doc/fetchmail/README.NTLM
-share/doc/fetchmail/README.OAUTH2
-share/doc/fetchmail/README.PWMD
-share/doc/fetchmail/README.SSL
-share/doc/fetchmail/README.SSL-SERVER
 share/doc/fetchmail/design-notes.html
 share/doc/fetchmail/fetchmail-FAQ.html
 share/doc/fetchmail/fetchmail-features.html
-share/locale/ca/LC_MESSAGES/fetchmail.mo
 share/locale/cs/LC_MESSAGES/fetchmail.mo
-share/locale/da/LC_MESSAGES/fetchmail.mo
 share/locale/de/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/fr/LC_MESSAGES/fetchmail.mo
-share/locale/id/LC_MESSAGES/fetchmail.mo
-share/locale/it/LC_MESSAGES/fetchmail.mo
 share/locale/ja/LC_MESSAGES/fetchmail.mo
-share/locale/nl/LC_MESSAGES/fetchmail.mo
 share/locale/pl/LC_MESSAGES/fetchmail.mo
 share/locale/ro/LC_MESSAGES/fetchmail.mo
-share/locale/ru/LC_MESSAGES/fetchmail.mo
 share/locale/sq/LC_MESSAGES/fetchmail.mo
-share/locale/sr/LC_MESSAGES/fetchmail.mo
 share/locale/sv/LC_MESSAGES/fetchmail.mo
-share/locale/vi/LC_MESSAGES/fetchmail.mo
-share/locale/zh_CN/LC_MESSAGES/fetchmail.mo
diff --git a/fetchmail/distinfo b/fetchmail/distinfo
index 5bae865c5d..379cd7404b 100644
--- a/fetchmail/distinfo
+++ b/fetchmail/distinfo
@@ -1,5 +1,8 @@
-$NetBSD$
+$NetBSD: distinfo,v 1.69 2024/12/28 22:09:58 triaxx Exp $
 
-BLAKE2s (fetchmail-7.0alpha11.tar.gz) = 7fd997f50784031e603052e181b4f151cf2467e6a69933d0abb837a506d98f5f
-SHA512 (fetchmail-7.0alpha11.tar.gz) = 8765d249b4d43eb1e1ec8ba644d5bbd0696d0cbf8d02f86c29645c0f106e24c003bf5e486a99eb92b17f6f22e7d54247d5a246ba59de10f1f78371f9b491b6ee
-Size (fetchmail-7.0alpha11.tar.gz) = 1425304 bytes
+BLAKE2s (fetchmail-6.5.4.tar.xz) = f5f23f7b6593e17ca9c86f25e9980c625a4c4ac7a54b687d27a92b39d2dbbd26
+SHA512 (fetchmail-6.5.4.tar.xz) = 6d8764119636f8f5b60d1f1878c151bbdca1fbda60b24e8695c8a54656003c4bb83950fec40f349d2e0a4ab45511b89fc45a0e898d362363d5f609ca1926a57c
+Size (fetchmail-6.5.4.tar.xz) = 1114764 bytes
+SHA1 (patch-Makefile.in) = d2c1394924e222fc6bb79d095668ea863661cb14
+SHA1 (patch-configure) = 06cf283b7d2a34d443c22536d25957520c4a5bac
+SHA1 (patch-configure.ac) = ea2475c262f92869bf5cc8b3dd6a50eb40849b83
diff --git a/fetchmail/options.mk b/fetchmail/options.mk
new file mode 100644
index 0000000000..b0aa5132af
--- /dev/null
+++ b/fetchmail/options.mk
@@ -0,0 +1,76 @@
+# $NetBSD: options.mk,v 1.22 2025/02/12 12:48:46 wiz Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.fetchmail
+PKG_SUPPORTED_OPTIONS=		kerberos4 kerberos gssapi ssl
+PKG_OPTIONS_OPTIONAL_GROUPS=	socks
+PKG_OPTIONS_GROUP.socks=	socks4 dante
+
+PKG_SUGGESTED_OPTIONS=	ssl
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Authentication via GSSAPI (currently only over Kerberos V) support.
+###
+.if !empty(PKG_OPTIONS:Mgssapi)
+.  if ${OPSYS} == "Darwin"
+# Darwin doesn't have include files in ${KRB5BASE}/include
+# so let configure use krb5-config to find kerberos
+CONFIGURE_ARGS+=	--with-gssapi=yes
+.  else
+CONFIGURE_ARGS+=	--with-gssapi=${KRB5BASE:Q}
+.  endif
+.else
+CONFIGURE_ARGS+=	--with-gssapi=no
+.endif
+
+###
+### KPOP (POP3 + Kerberos IV) support.
+###
+.if !empty(PKG_OPTIONS:Mkerberos4)
+PKG_USE_KERBEROS=	yes
+CONFIGURE_ARGS+=	--with-kerberos=yes
+.else
+CONFIGURE_ARGS+=	--with-kerberos=no
+.endif
+
+###
+### Kerberos V support.
+###
+.if !empty(PKG_OPTIONS:Mkerberos) || !empty(PKG_OPTIONS:Mgssapi)
+.  include "../../mk/krb5.buildlink3.mk"
+PKG_USE_KERBEROS=	yes
+.  if ${OPSYS} == "Darwin"
+# Darwin doesn't have include files in ${KRB5BASE}/include
+# so let configure use krb5-config to find kerberos
+CONFIGURE_ARGS+=        --with-kerberos5=yes
+.  else
+CONFIGURE_ARGS+=        --with-kerberos5=${KRB5BASE:Q}
+.  endif
+.else
+CONFIGURE_ARGS+=        --with-kerberos5=no
+.endif
+
+###
+### Support POP3 and IMAP over SSL.
+###
+.if !empty(PKG_OPTIONS:Mssl)
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=3.0.9
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q}
+.else
+CONFIGURE_ARGS+=	--without-ssl
+.endif
+
+###
+### Include SOCKS firewall support
+###
+.if !empty(PKG_OPTIONS:Msocks4)
+.include "../../net/socks4/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-socks=${BUILDLINK_PREFIX.socks4}
+.endif
+.if !empty(PKG_OPTIONS:Mdante)
+.include "../../net/dante/buildlink3.mk"
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.dante}/include/dante
+CONFIGURE_ARGS+=	--with-socks=${BUILDLINK_PREFIX.dante}
+.endif
diff --git a/fetchmail/patches/patch-Makefile.in b/fetchmail/patches/patch-Makefile.in
new file mode 100644
index 0000000000..150046e7ea
--- /dev/null
+++ b/fetchmail/patches/patch-Makefile.in
@@ -0,0 +1,20 @@
+$NetBSD: patch-Makefile.in,v 1.7 2024/12/28 22:09:58 triaxx Exp $
+
+Even with disabled python, wrapper around fetchmailconf.py and its
+manpage is installed.
+
+--- Makefile.in.orig	2024-11-12 23:44:51.000000000 +0000
++++ Makefile.in
+@@ -794,10 +794,10 @@ ACLOCAL_AMFLAGS = -I m4 -I m4-local
+ AM_YFLAGS = -t -d -Wno-yacc
+ BUILT_SOURCES = rcfile_y.h rcfile_l.h
+ dist_noinst_SCRIPTS = specgen.sh
+-dist_man1_MANS = fetchmail.man $(pym)
++dist_man1_MANS = fetchmail.man
+ pys = fetchmailconf.py
+ pym = fetchmailconf.man
+-nodist_bin_SCRIPTS = fetchmailconf
++nodist_bin_SCRIPTS =
+ python_PYTHON = $(pys)
+ CLEANFILES = $(nodist_bin_SCRIPTS) \
+ 			fetchmail-man.html \
diff --git a/fetchmail/patches/patch-configure b/fetchmail/patches/patch-configure
new file mode 100644
index 0000000000..dfb103f33f
--- /dev/null
+++ b/fetchmail/patches/patch-configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.6 2024/12/28 22:09:58 triaxx Exp $
+
+krb5-config errors out unless you give it a library to look for
+
+--- configure.orig	2022-08-27 07:08:20.000000000 +0000
++++ configure
+@@ -11432,7 +11432,7 @@ printf "%s\n" "#define KERBEROS_V5 1" >>
+ 
+   CFLAGS="$CFLAGS -I/usr/include/kerberosV"
+   LIBS="$LIBS -lasn1 -lkrb5 -lcom_err -lkafs"
+-elif krb5-config 2> /dev/null >/dev/null ; then
++elif krb5-config krb5 2> /dev/null >/dev/null ; then
+   krb5_prefix=`krb5-config --prefix krb5`
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: krb5-config points to kerberosV under $krb5_prefix" >&5
+ printf "%s\n" "krb5-config points to kerberosV under $krb5_prefix" >&6; }
+@@ -11830,7 +11830,7 @@ printf "%s\n" "krb4-config points to ker
+   CFLAGS="$CFLAGS `krb4-config --cflags`"
+   LIBS="$LIBS `krb4-config --libs`"
+   KERBEROS_V4=1
+-elif krb5-config 2> /dev/null >/dev/null ; then
++elif krb5-config krb4 2> /dev/null >/dev/null ; then
+   krb4_prefix=`krb5-config --prefix krb4`
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: krb5-config points to kerberosIV under $krb4_prefix" >&5
+ printf "%s\n" "krb5-config points to kerberosIV under $krb4_prefix" >&6; }
diff --git a/fetchmail/patches/patch-configure.ac b/fetchmail/patches/patch-configure.ac
new file mode 100644
index 0000000000..f63639e961
--- /dev/null
+++ b/fetchmail/patches/patch-configure.ac
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure.ac,v 1.5 2024/12/28 22:09:58 triaxx Exp $
+
+krb5-config errors out unless you give it a library to look for
+
+--- configure.ac.orig	2020-09-04 08:03:28.000000000 +0000
++++ configure.ac
+@@ -359,7 +359,7 @@ then
+   AC_DEFINE(KERBEROS_V5,1,Define if you have Kerberos V5)
+   CFLAGS="$CFLAGS -I/usr/include/kerberosV"
+   LIBS="$LIBS -lasn1 -lkrb5 -lcom_err -lkafs"
+-elif krb5-config 2> /dev/null >/dev/null ; then
++elif krb5-config krb5 2> /dev/null >/dev/null ; then
+   krb5_prefix=`krb5-config --prefix krb5`
+   AC_MSG_RESULT([krb5-config points to kerberosV under $krb5_prefix])
+   if test -f ${krb5_prefix}/include/et/com_err.h && \
+@@ -457,7 +457,7 @@ elif krb4-config 2> /dev/null >/dev/null
+   CFLAGS="$CFLAGS `krb4-config --cflags`"
+   LIBS="$LIBS `krb4-config --libs`"
+   KERBEROS_V4=1
+-elif krb5-config 2> /dev/null >/dev/null ; then
++elif krb5-config krb4 2> /dev/null >/dev/null ; then
+   krb4_prefix=`krb5-config --prefix krb4`
+   AC_MSG_RESULT([krb5-config points to kerberosIV under $krb4_prefix])
+   if test -f ${krb4_prefix}/include/kerberosIV/krb.h ; then
Prev by Date: automake: Update to 1.18
Next by Date: fetchmailconf: Update to 6.5.4
Previous by Thread: automake: Update to 1.18
Next by Thread: fetchmailconf: Update to 6.5.4
Indexes:
Home | Main Index | Thread Index | Old Index