security update to getmail 6.18.11

from maintainer
This commit is contained in:
kn 2023-01-16 21:21:05 +00:00
parent 8352205b3e
commit 7685f15769
3 changed files with 18 additions and 10 deletions

View File

@ -1,6 +1,6 @@
COMMENT= IMAP/POP3/SDPS mail retriever
MODPY_EGG_VERSION= 6.18.10
MODPY_EGG_VERSION= 6.18.11
GH_ACCOUNT= getmail6
GH_PROJECT= getmail6
GH_TAGNAME= v${MODPY_EGG_VERSION}
@ -19,6 +19,8 @@ MODULES= lang/python
MODPY_PYBUILD= setuptools
NO_TEST= Yes
RUN_DEPENDS= shells/bash
EXDIR= ${PREFIX}/share/examples/getmail
post-install:

View File

@ -1,2 +1,2 @@
SHA256 (getmail6-6.18.10.tar.gz) = DlYXz6LMh8WyWWNPWfVyjfOyVoqSyqVkdn4lb3mGatY=
SIZE (getmail6-6.18.10.tar.gz) = 205481
SHA256 (getmail6-6.18.11.tar.gz) = SD5PJr0PYsie0tRHazhArKu32GjEDeC8mT7HuWQtlok=
SIZE (getmail6-6.18.11.tar.gz) = 207051

View File

@ -3,16 +3,22 @@
Index: getmails
--- getmails.orig
+++ getmails
@@ -28,7 +28,7 @@ BASE1=${1##*/}
[ "$BASE1" != "${BASE1#$2}" ] && return 0 || return 1
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# vim:se tw=78 sts=4:
# Copyright (C) 2011-2017 Osamu Aoki <osamu@debian.org>, GPL2+
@@ -32,7 +32,7 @@ shellquote() {
printf '%s\n' "'${1//\'/\'\\\'\'}'"
}
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 '^bash /usr/local/bin/getmails$')
if [ "x$PID_GETMAILS" != "x$$" ]; then
echo "The getmails script is already running as PID=\"$PID_GETMAILS\" ." >&2
exit 1
@@ -44,7 +44,7 @@ if [ -f $getmailrcdir/stop ]; then
@@ -48,7 +48,7 @@ if [ -f $getmailrcdir/stop ]; then
echo "Do not run getmail ... (if not, remove $getmailrcdir/stop)" >&2
exit 1
fi
@ -21,7 +27,7 @@ Index: getmails
# Address concerns raised by #863856
# emacs backup files: foo~ foo#
# vim backup files: foo~ foo.swp
@@ -57,7 +57,8 @@ if $para ; then
@@ -61,7 +61,8 @@ if $para ; then
! endwith "$file" '#' && \
! startswith "$file" 'oldmail-' && \
! endwith "$file" '.swp' && \
@ -31,13 +37,13 @@ Index: getmails
$rcfiles --rcfile "$file" "$@" &
pids="$pids $!"
fi
@@ -79,7 +80,8 @@ else
@@ -83,7 +84,8 @@ else
! endwith "$file" '#' && \
! startswith "$file" 'oldmail-' && \
! endwith "$file" '.swp' && \
- ! endwith "$file" '.bak' ; then
+ ! endwith "$file" '.bak' && \
+ [ -f "$file" ]; then
rcfiles="$rcfiles --rcfile \"$file\""
rcfiles="$rcfiles --rcfile $(shellquote "$file")"
fi
done