fetchmail: Update to 6.4.33

upstream changes:
-----------------
fetchmail-6.4.33 (released 2022-08-27, 31696 LoC):

# TRANSLATIONS: language translations were updated by this fine person:
* fr:    Frédéric Marchal [French]

# CONTRIBUTED SCRIPT CHANGES:
* contrib/fetchsetup improvements by Matěj Cepl
* contrib/runfetchmail improvements by Matěj Cepl

--------------------------------------------------------------------------------
fetchmail-6.4.32 (released 2022-07-30, 31696 LoC):

# FIXES:
* Use configure to find rst2html, some systems install it only with .py suffix,
  others only without, and some install both.
* Update README.maintainer

# TRANSLATIONS: language translations were updated by these fine people:
(in alphabetical order of language codes so as not to prefer people):
* cs:    Petr Pisar [Czech]
* es:    Cristian Othón Martínez Vera [Spanish]
* ja:    Takeshi Hamasaki [Japanese]
* pl:    Jakub Bogusz [Polish]
* ro:    Remus-Gabriel Chelu [Romanian]
* sq:    Besnik Bleta [Albanian]
* sv:    Göran Uddeborg [Swedish]

--------------------------------------------------------------------------------
fetchmail-6.4.31 (released 2022-07-16, 31694 LoC):

# BUG FIXES:
* Try to fix ./configure --with-ssl=... for systems that have multiple OpenSSL
  versions installed.  Issues reported by Dennis Putnam.
* The netrc parser now reports its errors to syslog or logfile when appropriate,
  previously it would always log to stderr.
* Add error checking to .netrc parser.

# CHANGES:
* manpage: use .UR/.UE macros instead of .URL for URIs.
* manpage: fix contractions. Found with FreeBSD's igor tool.
* manpage: HTML now built with pandoc -> python-docutils
  (manServer.pl was dropped)

5 files changed, 25 insertions, 25 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index c2a0d4331db..0c100712411 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.204 2022/05/26 06:18:23 triaxx Exp $
+# $NetBSD: Makefile,v 1.205 2022/09/29 19:26:55 triaxx Exp $
 
 # Note to updaters: mail/fetchmailconf reaches over here, make sure it builds.
-DISTNAME=	fetchmail-6.4.30
+DISTNAME=	fetchmail-6.4.33
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fetchmail/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index 90442d91d3c..f77c3ba5dbc 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.65 2022/05/26 06:18:23 triaxx Exp $
+$NetBSD: distinfo,v 1.66 2022/09/29 19:26:55 triaxx Exp $
 
-BLAKE2s (fetchmail-6.4.30.tar.xz) = 148763089ad7e19584e50aec9d232b7bfb705221f353ddebc331f7da4b7dfb3b
-SHA512 (fetchmail-6.4.30.tar.xz) = 0ec540c4102267e6e72fefa5e76aa76f45d25a0e68ec40f1fd834719f2a4b5f3f78c587b050fc33d97dd8fc6f674950949e5c23f960ebcd3046d5cc2e06db1d0
-Size (fetchmail-6.4.30.tar.xz) = 1333524 bytes
-SHA1 (patch-Makefile.in) = 599e4eaada7466165ad8dbe41671b4ee46c0469d
-SHA1 (patch-configure) = 00384d048361bdb9e8244148e729242251540bb3
-SHA1 (patch-configure.ac) = 7cf2e63e2df2836417eca0ad34fa846f9af003fb
+BLAKE2s (fetchmail-6.4.33.tar.xz) = bdf79c2dc68ecd5f943143eab202a6a6940c3a233c248734e1a2f6ebafe94005
+SHA512 (fetchmail-6.4.33.tar.xz) = b95b89eaecdc98a92e1542f1bbdc6e1e51d38d392b564462413b602b3d5ebb004e4f4354694e369e6aceb6724753db55957e31a290e231fded74f1f523af41ac
+Size (fetchmail-6.4.33.tar.xz) = 1330708 bytes
+SHA1 (patch-Makefile.in) = b2300fc13e0d748ce90b37503a0e1a4e450b7d02
+SHA1 (patch-configure) = cb5174b911bfe93a0a33e7088c6aa2a92ee81471
+SHA1 (patch-configure.ac) = 1b6304098ffd0b697069e38727e99ddaa3bf6354
diff --git a/mail/fetchmail/patches/patch-Makefile.in b/mail/fetchmail/patches/patch-Makefile.in
index d2617ca7589..b8a911f3d48 100644
--- a/mail/fetchmail/patches/patch-Makefile.in
+++ b/mail/fetchmail/patches/patch-Makefile.in
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile.in,v 1.5 2022/05/26 06:18:23 triaxx Exp $
+$NetBSD: patch-Makefile.in,v 1.6 2022/09/29 19:26:56 triaxx Exp $
 
 Even with disabled python, wrapper around fetchmailconf.py and its
 manpage is installed.
 
---- Makefile.in.orig	2019-09-28 10:37:51.000000000 +0000
+--- Makefile.in.orig	2022-08-27 07:08:21.000000000 +0000
 +++ Makefile.in
-@@ -823,10 +823,10 @@ AM_YFLAGS = -d
+@@ -828,10 +828,10 @@ AM_YFLAGS = -t -d
  # without building a few dozen other files first.
  BUILT_SOURCES = rcfile_y.h socket.$(OBJEXT)
  dist_noinst_SCRIPTS = specgen.sh
@@ -16,5 +16,5 @@ manpage is installed.
 -nodist_bin_SCRIPTS = fetchmailconf
 +nodist_bin_SCRIPTS =
  python_PYTHON = $(pys)
- CLEANFILES = $(nodist_bin_SCRIPTS)
- noinst_LIBRARIES = libfm.a $(am__append_2)
+ CLEANFILES = $(nodist_bin_SCRIPTS) \
+ 			fetchmail-man.html \
diff --git a/mail/fetchmail/patches/patch-configure b/mail/fetchmail/patches/patch-configure
index 5dbfaa5c321..911a5d761cb 100644
--- a/mail/fetchmail/patches/patch-configure
+++ b/mail/fetchmail/patches/patch-configure
@@ -1,24 +1,24 @@
-$NetBSD: patch-configure,v 1.3 2022/05/26 06:18:23 triaxx Exp $
+$NetBSD: patch-configure,v 1.4 2022/09/29 19:26:56 triaxx Exp $
 
 krb5-config errors out unless you give it a library to look for
 
---- configure.orig	2020-09-04 08:19:51.000000000 +0000
+--- configure.orig	2022-08-27 07:08:20.000000000 +0000
 +++ configure
-@@ -10976,7 +10976,7 @@ $as_echo "#define KERBEROS_V5 1" >>confd
+@@ -12278,7 +12278,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`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: krb5-config points to kerberosV under $krb5_prefix" >&5
- $as_echo "krb5-config points to kerberosV under $krb5_prefix" >&6; }
-@@ -11324,7 +11324,7 @@ $as_echo "krb4-config points to kerberos
+   { 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; }
+@@ -12623,7 +12623,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`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: krb5-config points to kerberosIV under $krb4_prefix" >&5
- $as_echo "krb5-config points to kerberosIV under $krb4_prefix" >&6; }
+   { 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/mail/fetchmail/patches/patch-configure.ac b/mail/fetchmail/patches/patch-configure.ac
index c33879542af..f048aa3ebf0 100644
--- a/mail/fetchmail/patches/patch-configure.ac
+++ b/mail/fetchmail/patches/patch-configure.ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure.ac,v 1.2 2022/01/31 14:12:59 triaxx Exp $
+$NetBSD: patch-configure.ac,v 1.3 2022/09/29 19:26:56 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
-@@ -557,7 +557,7 @@ then
+@@ -560,7 +560,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"
@@ -13,7 +13,7 @@ krb5-config errors out unless you give it a library to look for
    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 && \
-@@ -655,7 +655,7 @@ elif krb4-config 2> /dev/null >/dev/null
+@@ -658,7 +658,7 @@ elif krb4-config 2> /dev/null >/dev/null
    CFLAGS="$CFLAGS `krb4-config --cflags`"
    LIBS="$LIBS `krb4-config --libs`"
    KERBEROS_V4=1