Am Wed, Jan 25, 2023 at 01:10:17PM +0100 schrieb Martin Ziemer:
> This patch updates getmail from 6.18.11 to 6.18.12.
>
> Fixes bug with errors in child processes.
> Shellquote was reverted, so bash is not needed in this release.
>
> Tested on amd64.
>
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/getmail/Makefile,v
retrieving revision 1.104
diff -u -p -r1.104 Makefile
--- Makefile 16 Jan 2023 21:21:05 -0000 1.104
+++ Makefile 25 Jan 2023 11:02:24 -0000
@@ -1,6 +1,6 @@
COMMENT= IMAP/POP3/SDPS mail retriever
-MODPY_EGG_VERSION= 6.18.11
+MODPY_EGG_VERSION= 6.18.12
GH_ACCOUNT= getmail6
GH_PROJECT= getmail6
GH_TAGNAME= v${MODPY_EGG_VERSION}
@@ -18,8 +18,6 @@ PERMIT_PACKAGE= Yes
MODULES= lang/python
MODPY_PYBUILD= setuptools
NO_TEST= Yes
-
-RUN_DEPENDS= shells/bash
EXDIR= ${PREFIX}/share/examples/getmail
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/getmail/distinfo,v
retrieving revision 1.83
diff -u -p -r1.83 distinfo
--- distinfo 16 Jan 2023 21:21:05 -0000 1.83
+++ distinfo 25 Jan 2023 11:02:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (getmail6-6.18.11.tar.gz) = SD5PJr0PYsie0tRHazhArKu32GjEDeC8mT7HuWQtlok=
-SIZE (getmail6-6.18.11.tar.gz) = 207051
+SHA256 (getmail6-6.18.12.tar.gz) = QZ3BEYSxR+9NqsLsnxNrGzfmRQ4vRAmWKaa3ZQ3rBEo=
+SIZE (getmail6-6.18.12.tar.gz) = 207087
Index: patches/patch-getmails
===================================================================
RCS file: /cvs/ports/mail/getmail/patches/patch-getmails,v
retrieving revision 1.2
diff -u -p -r1.2 patch-getmails
--- patches/patch-getmails 16 Jan 2023 21:21:05 -0000 1.2
+++ patches/patch-getmails 25 Jan 2023 11:02:24 -0000
@@ -3,31 +3,16 @@
Index: getmails
--- getmails.orig
+++ getmails
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/env bash
- # vim:se tw=78 sts=4:
- # Copyright (C) 2011-2017 Osamu Aoki <os...@debian.org>, GPL2+
-
-@@ -32,7 +32,7 @@ shellquote() {
- printf '%s\n' "'${1//\'/\'\\\'\'}'"
+@@ -28,7 +28,7 @@ BASE1=${1##*/}
+ [ "$BASE1" != "${BASE1#$2}" ] && return 0 || return 1
}
UID_BY_ID=$(id -u)
-PID_GETMAILS=$(pgrep -U $UID_BY_ID '^getmails$')
-+PID_GETMAILS=$(pgrep -f -U $UID_BY_ID '^bash /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
-@@ -48,7 +48,7 @@ if [ -f $getmailrcdir/stop ]; then
- echo "Do not run getmail ... (if not, remove $getmailrcdir/stop)" >&2
- exit 1
- fi
--rcfiles="/usr/bin/getmail"
-+rcfiles="/usr/local/bin/getmail"
- # Address concerns raised by #863856
- # emacs backup files: foo~ foo#
- # vim backup files: foo~ foo.swp
-@@ -61,7 +61,8 @@ if $para ; then
+@@ -57,7 +57,8 @@ if $para ; then
! endwith "$file" '#' && \
! startswith "$file" 'oldmail-' && \
! endwith "$file" '.swp' && \
@@ -37,13 +22,13 @@ Index: getmails
$rcfiles --rcfile "$file" "$@" &
pids="$pids $!"
fi
-@@ -83,7 +84,8 @@ else
+@@ -79,7 +80,8 @@ else
! endwith "$file" '#' && \
! startswith "$file" 'oldmail-' && \
! endwith "$file" '.swp' && \
- ! endwith "$file" '.bak' ; then
+ ! endwith "$file" '.bak' && \
+ [ -f "$file" ]; then
- rcfiles="$rcfiles --rcfile $(shellquote "$file")"
+ rcfiles="$rcfiles --rcfile \"$file\""
fi
done
