www/p5-Dancer: Update to 1.3520
Hi, ports@: Here is a patch for www/p5-Dancer: i) update to 1.3520 ii) Add a missing TEST_DEPENDS it build well and pass all tests. The ports depend on p5-Dancer: i) databases/ports-readmes-dancer ii) www/p5-Dancer-Plugin-Thumbnail Both build well and run well with this patch. Cheers ! wen Index: www/p5-Dancer/Makefile === RCS file: /cvs/ports/www/p5-Dancer/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- www/p5-Dancer/Makefile 11 Mar 2022 20:10:21 - 1.17 +++ www/p5-Dancer/Makefile 2 Jan 2023 23:27:02 - @@ -2,7 +2,7 @@ COMMENT = simple perl web app framework MODULES = cpan PKG_ARCH = * -DISTNAME = Dancer-1.3513 +DISTNAME = Dancer-1.3520 CATEGORIES = www # perl @@ -23,6 +23,7 @@ TEST_DEPENDS =converters/p5-JSON>=2.90 devel/p5-Data-Dump \ devel/p5-Devel-Hide \ devel/p5-Test-CPAN-Meta \ + devel/p5-Test-LongString \ devel/p5-Test-NoWarnings \ devel/p5-Test-Output \ devel/p5-YAML \ Index: www/p5-Dancer/distinfo === RCS file: /cvs/ports/www/p5-Dancer/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- www/p5-Dancer/distinfo 24 Jul 2020 23:38:30 - 1.9 +++ www/p5-Dancer/distinfo 2 Jan 2023 23:27:02 - @@ -1,2 +1,2 @@ -SHA256 (Dancer-1.3513.tar.gz) = s6Zm2ZmXkfgJoLIquT47kKCEomjndBLWrQVJaUsVEy4= -SIZE (Dancer-1.3513.tar.gz) = 391492 +SHA256 (Dancer-1.3520.tar.gz) = kq4REAW6n3gPuQHL5LbtIZJK25uTZPy8u1zMf8Yh/bI= +SIZE (Dancer-1.3520.tar.gz) = 401620
Re: [NEW] audio/alsa-lib-1.2.8
Hi, previous ports cannot support alsa-plugin due to libdl detection, here is new ports with patch. (the patch is sent same as pull-request at https://github.com/alsa-project/alsa-lib/pull/290 ) -- SASANO Takayoshi (JG1UAA) alsa-lib.tgz Description: Binary data
kdenlive-22.12.0 SIGSEGV in QArrayData::data (in ThumbnailCache::storeThumbnail)
I played with kdenlive on amd64 a bit and it crashes pretty frequently with a core indicating memory corruption. I submitted the details to the bug tracker. If anybody has a reliable way to cause or even avoid this, please document your findings in https://bugs.kde.org/show_bug.cgi?id=463764 Thanks Greg
Re: security/keepassxc: set password hint for clipboard managers
Yes that is ton cope with upstream weirdness. In your case we are in control so REVISION it is. — Antoine > On 2 Jan 2023, at 19:35, Klemens Nanni wrote: > > 02.01.2023 22:21, Antoine Jacoutot пишет: >> Please use REVISION. > > Alright. > >> pl means nothing. > > packages-specs(7) explicitly documents it: > > The last part may contain an extra suffix matching rc[N], alpha[N], > beta[N], pre[N], or pl[N], with N an optional number. These > correspond to traditional notations for ‘release candidate’, ‘alpha > version’, ‘beta version’, ‘pre-release’, ‘patch-level’, and are > ordered accordingly, e.g., alpha is oldest, then beta, rc and pre are > next (and non-comparable to one another), then normal version, and > finally pl.
Re: security/keepassxc: set password hint for clipboard managers
02.01.2023 22:21, Antoine Jacoutot пишет: > Please use REVISION. Alright. > pl means nothing. packages-specs(7) explicitly documents it: The last part may contain an extra suffix matching rc[N], alpha[N], beta[N], pre[N], or pl[N], with N an optional number. These correspond to traditional notations for ‘release candidate’, ‘alpha version’, ‘beta version’, ‘pre-release’, ‘patch-level’, and are ordered accordingly, e.g., alpha is oldest, then beta, rc and pre are next (and non-comparable to one another), then normal version, and finally pl.
Re: security/keepassxc: set password hint for clipboard managers
On Mon, Jan 02, 2023 at 06:01:19PM +, Klemens Nanni wrote: > 02.01.2023 21:46, Omar Polo пишет: > > why pl1 instead of just bumping the revision? (could also bundle the > > patch instead of fetching it, it's small and touches just one file.) > > I've been thinking about pl vs. REVISION and the former just seems more > appropiate for those kind of diffs: they add a patch/change behaviour. > > REVISION is used for everything from HOMEPAGE/MAINTAINER changes to > feature changes and what not. Please use REVISION. pl means nothing. -- Antoine
Re: security/keepassxc: set password hint for clipboard managers
02.01.2023 21:46, Omar Polo пишет: > why pl1 instead of just bumping the revision? (could also bundle the > patch instead of fetching it, it's small and touches just one file.) I've been thinking about pl vs. REVISION and the former just seems more appropiate for those kind of diffs: they add a patch/change behaviour. REVISION is used for everything from HOMEPAGE/MAINTAINER changes to feature changes and what not. As for fetch vs. local patch: I find fetching ready-to-use bits easier than juggling local copies. If others object I'll switch, no problem. > > anyway, i ended up looking into it and agree with your diff. For > example x11/copyq can be instructed to ignore password copied from > keepassxc this way[0]. Yup. Looking into password managers and clipboard managers in general, CopyQ's documentation is how I found out about this hint. I successfully tested this diff with CopyQ, but am otherwise not using it. My initial plan was/is to teach xfce4-clipman a new trick so it wouldn't save passwords... now I know how. > > ok for me. Thanks.
Re: security/keepassxc: set password hint for clipboard managers
On 2023/01/02 17:32:46 +, Klemens Nanni wrote: > Like on Linux, set a specific MIME type when copying so programs can > ignore the value; this makes certain clipboard managers not safe > passwords in history. > > See PR for details. > OK? why pl1 instead of just bumping the revision? (could also bundle the patch instead of fetching it, it's small and touches just one file.) anyway, i ended up looking into it and agree with your diff. For example x11/copyq can be instructed to ignore password copied from keepassxc this way[0]. ok for me. [0]: https://copyq.readthedocs.io/en/latest/faq.html#how-to-omit-storing-text-copied-from-specific-windows-like-a-password-manager > Index: Makefile > === > RCS file: /cvs/ports/security/keepassxc/Makefile,v > retrieving revision 1.47 > diff -u -p -r1.47 Makefile > --- Makefile 24 Dec 2022 20:45:54 - 1.47 > +++ Makefile 2 Jan 2023 17:24:38 - > @@ -2,7 +2,7 @@ COMMENT = management tool for password a > > V = 2.7.4 > DISTNAME = keepassxc-${V} > -REVISION = 1 > +PKGNAME =${DISTNAME}pl1 > > CATEGORIES = security > > @@ -20,6 +20,12 @@ WANTLIB += argon2 botan-2 c m minizip qr > MASTER_SITES = \ > https://github.com/keepassxreboot/keepassxc/releases/download/${V}/ > EXTRACT_SUFX = -src.tar.xz > + > +MASTER_SITES0 = https://github.com/keepassxreboot/keepassxc/ > +# pending "Enable password hints on BSD as is already done on Linux" > +# https://github.com/keepassxreboot/keepassxc/pull/8949 > +PATCHFILES = keepassxc-set-password-hint-{commit/}27e92da.patch:0 > +PATCH_DIST_STRIP = -p1 > > MODULES =x11/qt5 \ > devel/cmake > Index: distinfo > === > RCS file: /cvs/ports/security/keepassxc/distinfo,v > retrieving revision 1.28 > diff -u -p -r1.28 distinfo > --- distinfo 30 Oct 2022 06:41:31 - 1.28 > +++ distinfo 2 Jan 2023 17:24:41 - > @@ -1,2 +1,4 @@ > SHA256 (keepassxc-2.7.4-src.tar.xz) = > VgBSlh2gOJMn51kXH2YCMN+k4PTh+rYTlgD7hcbl3s4= > +SHA256 (keepassxc-set-password-hint-27e92da.patch) = > kz8OTY8h786C/EXlYXwe72zU23owI4gm9JlFqhWcGXQ= > SIZE (keepassxc-2.7.4-src.tar.xz) = 8957372 > +SIZE (keepassxc-set-password-hint-27e92da.patch) = 1102
security/keepassxc: set password hint for clipboard managers
Like on Linux, set a specific MIME type when copying so programs can ignore the value; this makes certain clipboard managers not safe passwords in history. See PR for details. OK? Index: Makefile === RCS file: /cvs/ports/security/keepassxc/Makefile,v retrieving revision 1.47 diff -u -p -r1.47 Makefile --- Makefile24 Dec 2022 20:45:54 - 1.47 +++ Makefile2 Jan 2023 17:24:38 - @@ -2,7 +2,7 @@ COMMENT = management tool for password a V =2.7.4 DISTNAME = keepassxc-${V} -REVISION = 1 +PKGNAME = ${DISTNAME}pl1 CATEGORIES = security @@ -20,6 +20,12 @@ WANTLIB += argon2 botan-2 c m minizip qr MASTER_SITES = \ https://github.com/keepassxreboot/keepassxc/releases/download/${V}/ EXTRACT_SUFX = -src.tar.xz + +MASTER_SITES0 =https://github.com/keepassxreboot/keepassxc/ +# pending "Enable password hints on BSD as is already done on Linux" +# https://github.com/keepassxreboot/keepassxc/pull/8949 +PATCHFILES = keepassxc-set-password-hint-{commit/}27e92da.patch:0 +PATCH_DIST_STRIP = -p1 MODULES = x11/qt5 \ devel/cmake Index: distinfo === RCS file: /cvs/ports/security/keepassxc/distinfo,v retrieving revision 1.28 diff -u -p -r1.28 distinfo --- distinfo30 Oct 2022 06:41:31 - 1.28 +++ distinfo2 Jan 2023 17:24:41 - @@ -1,2 +1,4 @@ SHA256 (keepassxc-2.7.4-src.tar.xz) = VgBSlh2gOJMn51kXH2YCMN+k4PTh+rYTlgD7hcbl3s4= +SHA256 (keepassxc-set-password-hint-27e92da.patch) = kz8OTY8h786C/EXlYXwe72zU23owI4gm9JlFqhWcGXQ= SIZE (keepassxc-2.7.4-src.tar.xz) = 8957372 +SIZE (keepassxc-set-password-hint-27e92da.patch) = 1102
[update] Patch for sysutils/duf 0.8.1
Hi, my proposal with a little patch for sysutils/duf v0.8.1 : - add internal version during build via MODGO_FLAGS $ duf -version duf 0.8.1 - add REVISION = 0 - remove unnecessary PKGNAME (duplicate with DISTNAME) Build and tests OK on amd64 LaurentIndex: Makefile === RCS file: /cvs/ports/sysutils/duf/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile 16 Aug 2022 15:55:18 - 1.7 +++ Makefile 2 Jan 2023 15:53:06 - @@ -4,7 +4,7 @@ MODGO_MODNAME = github.com/muesli/duf MODGO_VERSION = v0.8.1 DISTNAME = duf-${MODGO_VERSION} -PKGNAME = duf-0.8.1 +REVISION = 0 CATEGORIES = sysutils @@ -14,6 +14,8 @@ MAINTAINER = Gonzalo L. R.
Re: UPDATE: mail/p5-Mail-SpamAssassin
ping... Cheers Giovanni On 12/20/22 08:29, Giovanni Bechis wrote: Hi, major update to 4.0.0. Lot of improvements and new features, more info at https://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_4_0_0/UPGRADE. Comments ? Ok ? Cheers Giovanni Index: Makefile === RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v retrieving revision 1.119 diff -u -p -r1.119 Makefile --- Makefile8 Nov 2022 11:14:50 - 1.119 +++ Makefile20 Dec 2022 07:23:44 - @@ -1,11 +1,10 @@ COMMENT= mailfilter to identify and mark spam -VER= 3.4.6 +VER= 4.0.0 DISTNAME= Mail-SpamAssassin-${VER} PKGNAME= p5-${DISTNAME} -RULESNAME= Mail-SpamAssassin-rules-${VER}.r1888502.tgz +RULESNAME= Mail-SpamAssassin-rules-${VER}.r1905950.tgz CATEGORIES= mail perl5 -REVISION= 0 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RULESNAME} EXTRACT_SUFX= .tar.bz2 @@ -24,6 +23,8 @@ MASTER_SITES= ${MASTER_SITE_APACHE:=spa COMMON_DEPENDS= www/p5-HTML-Parser>=3.31 \ mail/p5-Mail-DKIM>=0.31 \ + mail/p5-Email-Address-XS \ + mail/p5-Mail-DMARC \ net/p5-Net-DNS>=0.34 \ net/p5-NetAddr-IP \ security/p5-IO-Socket-SSL @@ -36,7 +37,7 @@ RUN_DEPENDS= ${COMMON_DEPENDS} \ devel/p5-IO-String \ p5-Mail-SPF-*|p5-Mail-SPF-Query-*:mail/p5-Mail-SPF \ p5-GeoIP2-*|p5-IP-Country-DB_File-*|p5-IP-Country-*:net/p5-GeoIP2 \ - net/p5-Net-LibIDN \ + net/p5-Net-LibIDN2 \ net/p5-Net-Patricia \ security/gnupg \ textproc/p5-Encode-Detect \ Index: distinfo === RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/distinfo,v retrieving revision 1.43 diff -u -p -r1.43 distinfo --- distinfo30 Apr 2021 14:43:48 - 1.43 +++ distinfo20 Dec 2022 07:23:44 - @@ -1,4 +1,4 @@ -SHA256 (Mail-SpamAssassin-3.4.6.tar.bz2) = vEh18+S7WXnwwQKDITpRLEyWRiIK4BMqeMjjr5R4lhA= -SHA256 (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = se/NxX5rEAc1hV4k7oORsIVzJ9cOHh0sJ1fV9m6KHOY= -SIZE (Mail-SpamAssassin-3.4.6.tar.bz2) = 6166807 -SIZE (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = 369768 +SHA256 (Mail-SpamAssassin-4.0.0.tar.bz2) = 5aoXBQowvHK6qGr9xgSMrepNHsLsxh14dxegWbgxnog= +SHA256 (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) = rk/7uRfrx/76ckD8W7UVHdpmP45AWRYa18m0Lu0brG0= +SIZE (Mail-SpamAssassin-4.0.0.tar.bz2) = 6371055 +SIZE (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) = 355737 Index: patches/patch-Makefile_PL === RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL,v retrieving revision 1.16 diff -u -p -r1.16 patch-Makefile_PL --- patches/patch-Makefile_PL 11 Mar 2022 19:34:50 - 1.16 +++ patches/patch-Makefile_PL 20 Dec 2022 07:23:44 - @@ -1,7 +1,7 @@ Index: Makefile.PL --- Makefile.PL.orig +++ Makefile.PL -@@ -857,7 +857,7 @@ sub MY::install { +@@ -886,7 +886,7 @@ sub MY::install { foreach (@code) { # Add our install targets as a dependency to all top-level install targets Index: patches/patch-t_sa_compile_t === RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/patches/patch-t_sa_compile_t,v retrieving revision 1.5 diff -u -p -r1.5 patch-t_sa_compile_t --- patches/patch-t_sa_compile_t11 Mar 2022 19:34:50 - 1.5 +++ patches/patch-t_sa_compile_t20 Dec 2022 07:23:44 - @@ -1,9 +1,9 @@ Index: t/sa_compile.t --- t/sa_compile.t.orig +++ t/sa_compile.t -@@ -12,8 +12,7 @@ use Config; - use File::Basename; - use File::Path qw/mkpath/; +@@ -10,8 +10,7 @@ use SATest; sa_t_init("sa_compile"); + + use Config; -my $temp_binpath = $Config{sitebinexp}; -$temp_binpath =~ s|^\Q$Config{siteprefixexp}\E/||; Index: pkg/PLIST === RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/pkg/PLIST,v retrieving revision 1.41 diff -u -p -r1.41 PLIST --- pkg/PLIST 8 Nov 2022 11:14:51 - 1.41 +++ pkg/PLIST 20 Dec 2022 07:23:44 - @@ -21,7 +21,7 @@ ${P5SITE}/Mail/SpamAssassin.pm ${P5SITE}/Mail/SpamAssassin/AICache.pm ${P5SITE}/Mail/SpamAssassin/ArchiveIterator.pm ${P5SITE}/Mail/SpamAssassin/AsyncLoop.pm -${P5SITE}/Mail/SpamAssassin/AutoWhitelist.pm +${P5SITE}/Mail/SpamAssassin/AutoWelcomelist.pm ${P5SITE}/Mail/SpamAssassin/Bayes/ ${P5SITE}/Mail/SpamAssassin/Bayes.pm ${P5SITE}/Mail/SpamAssassin/Bayes/CombineChi.pm @@ -45,6 +45,7 @@ ${P5SITE}/Mail/SpamAssassin/Constants
Re: net/kdeconnect-kde: no rundep on python
On Mon, Jan 02, 2023 at 02:57:25PM +, Klemens Nanni wrote: > 02.01.2023 18:48, Antoine Jacoutot пишет: > > Considering we don't have https://gitlab.gnome.org/GNOME/nautilus-python/, > > the > > extension is useless anyway. > > Ah, didn't know that. > > But I guess shipping it doesn't hurt and allows future ports work around > nautilus-python to pick up stuff like this immediately/automatically. > > So removing it now would only make sense to me if nautilus-python is > known to remain unported (no idea what deal is). I am not saying to remove the extension, I am saying it is useless. So yes, no need for the python dependency. -- Antoine
Re: net/kdeconnect-kde: no rundep on python
02.01.2023 18:48, Antoine Jacoutot пишет: > Considering we don't have https://gitlab.gnome.org/GNOME/nautilus-python/, the > extension is useless anyway. Ah, didn't know that. But I guess shipping it doesn't hurt and allows future ports work around nautilus-python to pick up stuff like this immediately/automatically. So removing it now would only make sense to me if nautilus-python is known to remain unported (no idea what deal is).
Re: net/kdeconnect-kde: no rundep on python
On Mon, Jan 02, 2023 at 02:24:58PM +, Klemens Nanni wrote: > It ships an optional x11/gome/nautilus plugin but otherwise does not > need Python. > > Python is most likely installed anyway already, but still be accurate. > > OK? Considering we don't have https://gitlab.gnome.org/GNOME/nautilus-python/, the extension is useless anyway. > > Index: Makefile > === > RCS file: /cvs/ports/net/kdeconnect-kde/Makefile,v > retrieving revision 1.15 > diff -u -p -r1.15 Makefile > --- Makefile 18 Dec 2022 09:10:51 - 1.15 > +++ Makefile 2 Jan 2023 14:23:00 - > @@ -1,6 +1,7 @@ > COMMENT =KDE app that allows your devices to communicate > > DISTNAME = kdeconnect-kde-${MODKDE_VERSION} > +REVISION = 0 > > SHARED_LIBS += kdeconnectcore 3.0 # 1.4 > SHARED_LIBS += kdeconnectinterfaces3.1 # 1.4 > @@ -32,6 +33,8 @@ MASTER_SITES = ${MASTER_SITE_KDE:=stable > MODULES =x11/kde-applications \ > devel/kf5 \ > lang/python > + > +MODPY_RUNDEP = No > > BUILD_DEPENDS = devel/gettext,-tools \ > devel/kf5/qqc2-desktop-style \ > -- Antoine
net/kdeconnect-kde: no rundep on python
It ships an optional x11/gome/nautilus plugin but otherwise does not need Python. Python is most likely installed anyway already, but still be accurate. OK? Index: Makefile === RCS file: /cvs/ports/net/kdeconnect-kde/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile18 Dec 2022 09:10:51 - 1.15 +++ Makefile2 Jan 2023 14:23:00 - @@ -1,6 +1,7 @@ COMMENT = KDE app that allows your devices to communicate DISTNAME = kdeconnect-kde-${MODKDE_VERSION} +REVISION = 0 SHARED_LIBS += kdeconnectcore 3.0 # 1.4 SHARED_LIBS += kdeconnectinterfaces3.1 # 1.4 @@ -32,6 +33,8 @@ MASTER_SITES =${MASTER_SITE_KDE:=stable MODULES = x11/kde-applications \ devel/kf5 \ lang/python + +MODPY_RUNDEP = No BUILD_DEPENDS =devel/gettext,-tools \ devel/kf5/qqc2-desktop-style \
Re: [new] mail/rssgoemail: send RSS/Atom/Gemini feeds to email
friendly ping On 2022/12/16 21:29:37 +0100, Omar Polo wrote: > Hi, > > I've been using this for quite some time, it's really handy. It's > meant to be run from cron and is similar otherwise to rss2email, but > supports Gemini feeds and Rss/Atom served via the Gemini protocol too. > > > % pkg_info rssgoemail > Information for inst:rssgoemail-1.0.2 > > Comment: > send RSS/Atom/Gemini feeds to email > > Description: > Rssgoemail is a command line tool that let you read your favourite feeds > from your mailbox. It is designed to work in cooperation with the > system mailer, as it will send all the items of every given feed using > sendmail(8). > > Maintainer: Omar Polo > > WWW: https://lab.abiscuola.org/rssgoemail/ > > > ok? rssgoemail.tar.gz Description: GNU Zip compressed data
[maintainer update] getmail 6.18.10 -> 6.18.11
This patch updates getmail from 6.18.10 to 6.18.11. For the new shell quotes, which fixes a security hole, i changed the getmails-script from using /bin/sh to use bash. Tested on to amd64 systems. Index: Makefile === RCS file: /cvs/ports/mail/getmail/Makefile,v retrieving revision 1.103 diff -u -p -u -p -r1.103 Makefile --- Makefile9 Dec 2022 14:29:52 - 1.103 +++ Makefile2 Jan 2023 08:44:16 - @@ -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} @@ -18,6 +18,8 @@ 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.82 diff -u -p -u -p -r1.82 distinfo --- distinfo9 Dec 2022 14:29:52 - 1.82 +++ distinfo2 Jan 2023 08:44:16 - @@ -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 Index: patches/patch-getmails === RCS file: /cvs/ports/mail/getmail/patches/patch-getmails,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-getmails --- patches/patch-getmails 9 Dec 2022 14:29:52 - 1.1 +++ patches/patch-getmails 2 Jan 2023 08:44:16 - @@ -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 , 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