CVS commit: pkgsrc/mail/qmqtool

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Jan 23 16:45:48 UTC 2020

Modified Files:
        pkgsrc/mail/qmqtool: distinfo
Added Files:
        pkgsrc/mail/qmqtool/patches: patch-src_qmqtool
Removed Files:
        pkgsrc/mail/qmqtool/patches: patch-aa

Log Message:
Modernize patch filename.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/qmqtool/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/mail/qmqtool/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/qmqtool/patches/patch-src_qmqtool

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/qmqtool/distinfo
diff -u pkgsrc/mail/qmqtool/distinfo:1.6 pkgsrc/mail/qmqtool/distinfo:1.7
--- pkgsrc/mail/qmqtool/distinfo:1.6    Thu Jan 23 15:55:04 2020
+++ pkgsrc/mail/qmqtool/distinfo        Thu Jan 23 16:45:48 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2020/01/23 15:55:04 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2020/01/23 16:45:48 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) = 36017a3751797fc2afbf89c2e4176da9defc7746
 SHA1 (patch-configure) = 90a0a3ade3591957c8b76546ed7e414d6a57c019
+SHA1 (patch-src_qmqtool) = 36017a3751797fc2afbf89c2e4176da9defc7746

Added files:

Index: pkgsrc/mail/qmqtool/patches/patch-src_qmqtool
diff -u /dev/null pkgsrc/mail/qmqtool/patches/patch-src_qmqtool:1.1
--- /dev/null   Thu Jan 23 16:45:49 2020
+++ pkgsrc/mail/qmqtool/patches/patch-src_qmqtool       Thu Jan 23 16:45:48 2020
@@ -0,0 +1,97 @@
+$NetBSD: patch-src_qmqtool,v 1.1 2020/01/23 16:45:48 schmonz Exp $
+
+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
+@@ -10,7 +10,7 @@ use Getopt::Std;
+ 
+ my $qmail = '__QMAILDIR__';
+ # keep ps/bigtodo dynamic - one nfs homed script can work on any arch
+-my $ps = ($^O eq 'solaris') ? '/usr/ucb/ps auxww' : 'ps auxww';
++my $ps = '@PS@ auxww';
+ my $bigtodo = ( -d "${qmail}/queue/todo/0" ) ? 1 : 0; # more implemented, little demand.
+ 
+ 
+@@ -105,10 +105,10 @@ if($opt{l}){
+         }
+     }elsif($opt{B} eq 'r'){
+         my(%owner,%uid,%gid);
+-        $owner{info} = $owner{local} = $owner{remote} = $owner{bounce} = 'qmails';
+-        $owner{mess} = $owner{todo} = $owner{intd} = 'qmailq';
++        $owner{info} = $owner{local} = $owner{remote} = $owner{bounce} = '@QMAIL_SEND_USER@';
++        $owner{mess} = $owner{todo} = $owner{intd} = '@QMAIL_QUEUE_USER@';
+ 
+-        for my $user (qw/qmailq qmails/){
++        for my $user (qw/@QMAIL_QUEUE_USER@ @QMAIL_SEND_USER@/){
+             ($uid{$user},$gid{$user}) = (getpwnam($user))[2,3];
+         }
+ 
+@@ -162,6 +162,7 @@ if($opt{l}){
+         }
+         unless($opt{Q}){
+             print "you must now start qmail-send: for a LWQ installation, run: svc -u /service/qmail-send\n";
++            print "for a pkgsrc installation, run: @RCD_SCRIPTS_DIR@/qmailsend start\n";
+         }
+     }else{
+         syntax();
+@@ -422,6 +423,7 @@ sub check_daemons {
+                 next if(/multilog\s+/); # some log to /var/log/qmail/qmail-send/
+                 die "you must stop qmail-send and qmail-smtpd before this program can continue (PID [$1] running).\n",
+                     "for a LWQ installation, run: svc -d /service/qmail-send /service/qmail-smtpd\n",
++                    "for a pkgsrc installation, run: @RCD_SCRIPTS_DIR@/qmailsend stop; @RCD_SCRIPTS_DIR@/qmailsmtpd stop\n",
+                     "others may be able to run: kill -9 `$ps | awk '/qmail-send|qmail-smtpd/ { print \$1 }'`\n";
+             }
+         }
+@@ -652,6 +654,7 @@ sub checkqueue {
+     if($opt{r}){
+         unless($opt{Q}){
+             print "you must now start qmail-send: for a LWQ installation, run: svc -u /service/qmail-send\n";
++            print "for a pkgsrc installation, run: @RCD_SCRIPTS_DIR@/qmailsend start\n";
+         }
+     }
+ }
+@@ -692,6 +695,7 @@ sub rm_files {
+     }
+     if($restart){
+         print "you must now restart qmail-send: for a LWQ installation, run: svc -du /service/qmail-send\n";
++        print "for a pkgsrc installation, run: @RCD_SCRIPTS_DIR@/qmailsend restart\n";
+     }
+ }
+ 
+@@ -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
+     my $last=0;
+-    open(GREP, "find ${qmail}/queue/mess/ -type f | xargs grep $opts \"$regex\" /dev/null 2>/dev/null |") || die "could not fork find | xargs grep: $!\n";
++    open(GREP, "find ${qmail}/queue/mess/ -type f | xargs @GREP@ $opts \"$regex\" /dev/null 2>/dev/null |") || die "could not fork find | xargs @GREP@ $!\n";
+     # 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