head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.50
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.48
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.46
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.44
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.42
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.40
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.38
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.36
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.34
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.32
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.30
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.28
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.26
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.24
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.22
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.20
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.18
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.16
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.14
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.12
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.10
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.8
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.6
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.4
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.2
	pkgsrc-2020Q1-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2020.01.23.16.45.48;	author schmonz;	state Exp;
branches;
next	;
commitid	f0ZHJzyVkOiOQPTB;


desc
@@


1.1
log
@Modernize patch filename.
@
text
@$NetBSD$

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
@