From 188b3f2c3006e728e09939f9af7c3e249a177908 Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Thu, 2 Jan 2003 04:16:12 +0000
Subject: [PATCH] - fix start scripts Submitted by:
 mendelsd@spawar.navy.mil

---
 mail/raysfilter/files/patch-mf-reset | 20 +++++++++++++
 mail/raysfilter/files/patch-mf-start | 20 +++++++++++++
 mail/raysfilter/files/patch-mf-stop  | 44 ++++++++++++++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 mail/raysfilter/files/patch-mf-reset
 create mode 100644 mail/raysfilter/files/patch-mf-start
 create mode 100644 mail/raysfilter/files/patch-mf-stop

diff --git a/mail/raysfilter/files/patch-mf-reset b/mail/raysfilter/files/patch-mf-reset
new file mode 100644
index 000000000000..bfde7ac27697
--- /dev/null
+++ b/mail/raysfilter/files/patch-mf-reset
@@ -0,0 +1,20 @@
+--- mf-reset.orig	Thu Mar  8 13:46:07 2001
++++ mf-reset	Tue Dec 17 17:08:38 2002
+@@ -24,9 +24,9 @@
+ fi
+ LOGFILE="$WORK_DIR/mail-filter.log"
+ 
+-FILTER_PID=`ps -ef | grep $FILTER | grep -v $0 \
++FILTER_PID=`ps -af | grep $FILTER | grep -v $0 \
+            | grep -v 'mf-start' | grep -v 'grep' \
+-           | awk '{print $2}'`
++           | awk '{print $1}'`
+ if [ -n "$FILTER_PID" ]
+ then
+    kill -USR1 $FILTER_PID
+@@ -43,4 +43,5 @@
+    echo "$0: Could not determine PID for $BN_FILTER"
+    echo "$BN_FILTER may not be running." 
+ fi
++
+ 
diff --git a/mail/raysfilter/files/patch-mf-start b/mail/raysfilter/files/patch-mf-start
new file mode 100644
index 000000000000..03a514db2cf5
--- /dev/null
+++ b/mail/raysfilter/files/patch-mf-start
@@ -0,0 +1,20 @@
+--- mf-start.orig	Thu Mar  8 13:44:13 2001
++++ mf-start	Tue Dec 17 17:08:38 2002
+@@ -29,9 +29,9 @@
+ fi
+ LOGFILE="$WORK_DIR/mail-filter.log"
+ 
+-FILTER_PID=`ps -ef | grep $FILTER \
++FILTER_PID=`ps -af | grep $FILTER \
+            | grep -v $0 | grep -v 'grep' \
+-           | awk '{print $2}'`
++           | awk '{print $1}'`
+ if [ -n "$FILTER_PID" ]
+ then
+    DATE=`date +"%d-%b-%Y %T"`
+@@ -85,4 +85,5 @@
+    fi
+    sleep 10
+ done
++
+ 
diff --git a/mail/raysfilter/files/patch-mf-stop b/mail/raysfilter/files/patch-mf-stop
new file mode 100644
index 000000000000..76656a7b2566
--- /dev/null
+++ b/mail/raysfilter/files/patch-mf-stop
@@ -0,0 +1,44 @@
+--- mf-stop.orig	Thu Mar  8 13:45:31 2001
++++ mf-stop	Tue Dec 17 17:08:38 2002
+@@ -44,18 +44,18 @@
+ # First look for a 'mf-start' process with filter name in
+ # command-line.
+ 
+-FILTER_START_PID=`ps -ef | grep 'mf-start' | grep $FILTER \
++FILTER_START_PID=`ps -af | grep 'mf-start' | grep $FILTER \
+                  | grep -v 'grep' \
+-                 | awk '{print $2}'`
++                 | awk '{print $1}'`
+ 
+ # Failing that (e.g. on Linux, process is swapped out to disk so command-
+ # line parameters are not shown) look for any 'mf-start' process.
+ 
+ if [ -z "$FILTER_START_PID" ]
+ then
+-   FILTER_START_PID=`ps -ef | grep 'mf-start' \
++   FILTER_START_PID=`ps -af | grep 'mf-start' \
+                     | grep -v 'grep' \
+-                    | awk '{print $2}'`
++                    | awk '{print $1}'`
+ fi
+ 
+ # If found a 'mf-start' process, kill it.
+@@ -70,10 +70,10 @@
+ # Now stop the filter itself, when no messages are in progress or
+ # after MAX_WAIT seconds, whichever is quickest.
+ 
+-FILTER_PID=`ps -ef | grep $FILTER \
++FILTER_PID=`ps -af | grep $FILTER \
+            | grep -v 'mf-start' \
+            | grep -v $0 | grep -v 'grep' \
+-           | awk '{print $2}'`
++           | awk '{print $1}'`
+ if [ -n "$FILTER_PID" ]
+ then
+    while [ $WORKING -eq 1 ]
+@@ -109,4 +109,5 @@
+ fi
+ 
+ exit 
++
+