diff options
| author | schmonz <schmonz@pkgsrc.org> | 2020-01-23 15:55:04 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2020-01-23 15:55:04 +0000 |
| commit | 3d008f6f90e9d727c1cfdf1362009c8193231366 (patch) | |
| tree | 0308a4f1423d93ae590f7e2cb96a97ce46c5916e /mail/qmqtool | |
| parent | 1333eef4d4e4f34caaf36e90d65dd1d8ba83872b (diff) | |
| download | pkgsrc-3d008f6f90e9d727c1cfdf1362009c8193231366.tar.gz | |
Fix "Cannot open %s as a filehandle: it is already open as a dirhandle",
deprecated in Perl 5.10 and fatal since 5.28. Bump PKGREVISION.
Diffstat (limited to 'mail/qmqtool')
| -rw-r--r-- | mail/qmqtool/Makefile | 4 | ||||
| -rw-r--r-- | mail/qmqtool/distinfo | 4 | ||||
| -rw-r--r-- | mail/qmqtool/patches/patch-aa | 31 |
3 files changed, 33 insertions, 6 deletions
diff --git a/mail/qmqtool/Makefile b/mail/qmqtool/Makefile index 6ab97c5a62e..4ff8a2acafe 100644 --- a/mail/qmqtool/Makefile +++ b/mail/qmqtool/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:21:41 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2020/01/23 15:55:04 schmonz Exp $ # DISTNAME= qmqtool-1.15 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= mail MASTER_SITES= ${HOMEPAGE}/files/ EXTRACT_SUFX= .tgz diff --git a/mail/qmqtool/distinfo b/mail/qmqtool/distinfo index 9d9b66e3c92..8482bec31fc 100644 --- a/mail/qmqtool/distinfo +++ b/mail/qmqtool/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2017/04/04 08:27:56 schmonz Exp $ +$NetBSD: distinfo,v 1.6 2020/01/23 15:55:04 schmonz Exp $ SHA1 (qmqtool-1.15.tgz) = 06e665852c3f2c98d351b3162bf34a48d03df1b2 RMD160 (qmqtool-1.15.tgz) = 089f5584352c573308b09a29a92d5b1e42aa6640 SHA512 (qmqtool-1.15.tgz) = 613499629c9a651636fb5146c6a0faf41b183dbd0aacdb48227811ebb84401a9916fb66a3157f2521c36bc8b4326f3524b2db32e7b2f23250acac6adc251d29f Size (qmqtool-1.15.tgz) = 25884 bytes -SHA1 (patch-aa) = a214cea1fa1dccdb3f4f35bb7d41d79e0d20dc05 +SHA1 (patch-aa) = 36017a3751797fc2afbf89c2e4176da9defc7746 SHA1 (patch-configure) = 90a0a3ade3591957c8b76546ed7e414d6a57c019 diff --git a/mail/qmqtool/patches/patch-aa b/mail/qmqtool/patches/patch-aa index 21bb2387b9f..5636ff773ce 100644 --- a/mail/qmqtool/patches/patch-aa +++ b/mail/qmqtool/patches/patch-aa @@ -1,6 +1,9 @@ -$NetBSD: patch-aa,v 1.3 2017/04/04 08:27:56 schmonz Exp $ +$NetBSD: patch-aa,v 1.4 2020/01/23 15:55:05 schmonz Exp $ -Use pkgsrc-preferred tools. +Use pkgsrc-preferred tools, users, and paths. +Avoid 5.28-fatal "Cannot open %s as a filehandle: it is already open as +a dirhandle". +Fix spelling. --- src/qmqtool.orig 2016-06-11 16:26:52.000000000 +0000 +++ src/qmqtool @@ -59,6 +62,19 @@ Use pkgsrc-preferred tools. } } +@@ -866,9 +870,9 @@ sub msgprop { + warn "cannot open ${qmail}/queue/intd/${file}: $!\n"; + } + }else{ +- if(open(S, "${qmail}/queue/info/${subdir}/${file}")){ +- chop($es=<S>); +- close S; ++ if(open(QQISF, "${qmail}/queue/info/${subdir}/${file}")){ ++ chop($es=<QQISF>); ++ close QQISF; + substr($es,0,1) = ''; + } + @@ -985,7 +989,7 @@ sub find_msgs_bystring { # using find|xargs grep is must faster than regex matching in perl (dunno why) # grep -r isnt portable, dunno if it's safe for huge file lists @@ -68,3 +84,14 @@ Use pkgsrc-preferred tools. # do not count on grep's exit code, because: # if a message is removed while grepping, exit code is 2 while(<GREP>){ +@@ -1013,8 +1017,8 @@ sub syntax { + -B + b Backup queue into ${qmail}/queue.backup/ + r Restore backup from ${qmail}/queue.backup/ +- -c check queue consitancy +- -r repair queue (by deleting fragments) found by checking queue consistancy ++ -c check queue consistency ++ -r repair queue (by deleting fragments) found by checking queue consistency + -i show how many messages are queued per ip address + -nN pay attention to the Nth last smtp-hop + -S show how many bytes are queued per ip address |