Am Mon, May 18, 2026 at 02:26:48PM +0200 schrieb Martin Ziemer:
> This patch updates getmail from 6.19.10 to 6.19.12.
>
> Our last change went upstream so patch is removed.
>
> In the patch for getmails I removed the $ in the regexp, so we can use
> parameters to getmails. (e.g. -p for parallel fetching of multiple
> mailboxes)
>
> Tested on amd64.
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/getmail/Makefile,v
diff -u -p -r1.118 Makefile
--- Makefile 13 Mar 2026 10:32:45 -0000 1.118
+++ Makefile 20 Mar 2026 09:17:18 -0000
@@ -2,8 +2,8 @@ COMMENT= IMAP/POP3/SDPS mail retriever
GH_ACCOUNT= getmail6
GH_PROJECT= getmail6
-GH_TAGNAME= v6.19.10
-MODPY_DISTV= 6.19.10
+GH_TAGNAME= v6.19.12
+MODPY_DISTV= 6.19.12
PKGNAME= getmail-${MODPY_DISTV}
CATEGORIES= mail
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/getmail/distinfo,v
diff -u -p -r1.95 distinfo
--- distinfo 13 Mar 2026 10:32:45 -0000 1.95
+++ distinfo 20 Mar 2026 09:17:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (getmail6-6.19.10.tar.gz) = 4YxuVq+f9Rrg+duIuYUQIEaqfZHEj4IxNYdLt4MSvos=
-SIZE (getmail6-6.19.10.tar.gz) = 220437
+SHA256 (getmail6-6.19.12.tar.gz) = hbs5Zz1RYCAuerMqAqItlYGasB2Bw6yjSeRhe5j4+4M=
+SIZE (getmail6-6.19.12.tar.gz) = 221151
Index: patches/patch-getmail_fetch
===================================================================
RCS file: patches/patch-getmail_fetch
diff -N patches/patch-getmail_fetch
--- patches/patch-getmail_fetch 13 Mar 2026 10:32:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-restore "options." lost when dropping py2 compat in 572fd27953cf4
-
-Index: getmail_fetch
---- getmail_fetch.orig
-+++ getmail_fetch
-@@ -135,7 +135,7 @@ def main():
-
- def get(self, key, value=None):
- return getattr(self, key, value)
-- get = types.MethodType(get, options)
-+ options.get = types.MethodType(get, options)
-
- msg = None
- if options.message is not None:
Index: patches/patch-getmails
===================================================================
RCS file: /cvs/ports/mail/getmail/patches/patch-getmails,v
diff -u -p -r1.4 patch-getmails
--- patches/patch-getmails 7 Sep 2023 10:48:19 -0000 1.4
+++ patches/patch-getmails 20 Mar 2026 09:17:18 -0000
@@ -8,7 +8,7 @@ Index: getmails
}
UID_BY_ID=$(id -u)
-PID_GETMAILS=$(pgrep -U $UID_BY_ID '^getmails$')
-+PID_GETMAILS=$(pgrep -f -U $UID_BY_ID '^/bin/sh /usr/local/bin/getmails$')
++PID_GETMAILS=$(pgrep -f -U $UID_BY_ID '^/bin/sh /usr/local/bin/getmails')
if [ "x$PID_GETMAILS" != "x$$" ]; then
echo "The getmails script is already running as PID=\"$PID_GETMAILS\"
." >&2
exit 1
