diff options
| author | wiz <wiz@pkgsrc.org> | 2001-07-16 13:30:37 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2001-07-16 13:30:37 +0000 |
| commit | f57fff981491052ffeb93dd3739fb501203cc9d0 (patch) | |
| tree | b1e679e50584b05b82053f45d0d4343b1f61af48 | |
| parent | 4d7b454206d845e5a4f54b916b08bdb3021b6692 (diff) | |
| download | pkgsrc-f57fff981491052ffeb93dd3739fb501203cc9d0.tar.gz | |
Fix faxsetup's pid check, as requested by pkg/13346.
| -rw-r--r-- | comms/hylafax/distinfo | 4 | ||||
| -rw-r--r-- | comms/hylafax/patches/patch-ai | 26 |
2 files changed, 22 insertions, 8 deletions
diff --git a/comms/hylafax/distinfo b/comms/hylafax/distinfo index 8bcb50373a6..fad42a31df4 100644 --- a/comms/hylafax/distinfo +++ b/comms/hylafax/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2001/07/08 13:32:14 bad Exp $ +$NetBSD: distinfo,v 1.6 2001/07/16 13:30:37 wiz Exp $ SHA1 (hylafax/hylafax-4.1.tar.gz) = 1b505492788c791a9db6b30e64e02e43117ce832 Size (hylafax/hylafax-4.1.tar.gz) = 1243832 bytes @@ -10,7 +10,7 @@ SHA1 (patch-ae) = b0ec8e91250f0bda788dee79503a2f8f1d6ee351 SHA1 (patch-af) = e1e09b2914e4071807ca83f134134bd5cf42519d SHA1 (patch-ag) = 75c7c633587a952d7f62e7f450a816b8e6ad298b SHA1 (patch-ah) = fbd4d348186e866099d2abb0fd001ec1e9b5a1e0 -SHA1 (patch-ai) = 5c21f46f9e861784b7e060d7cf8938bf34ff4f39 +SHA1 (patch-ai) = fe653990da25219f22bb6a4cb89b2f1cc47152c3 SHA1 (patch-aj) = 86520589dc1be4517e0c0f0b349b04a04bed41d9 SHA1 (patch-ak) = f72d797419ce1c9d50d03f2c5e5db16a0b30e5cb SHA1 (patch-al) = e8a7576143b51781fc2aa985e761a19c0e756d13 diff --git a/comms/hylafax/patches/patch-ai b/comms/hylafax/patches/patch-ai index 92b9772a6db..3f012084b7f 100644 --- a/comms/hylafax/patches/patch-ai +++ b/comms/hylafax/patches/patch-ai @@ -1,7 +1,7 @@ -$NetBSD: patch-ai,v 1.6 2001/07/08 13:32:15 bad Exp $ +$NetBSD: patch-ai,v 1.7 2001/07/16 13:30:38 wiz Exp $ --- etc/faxsetup.sh.in.orig Thu Jun 14 07:36:16 2001 -+++ etc/faxsetup.sh.in Sun Jul 8 01:25:48 2001 ++++ etc/faxsetup.sh.in @@ -41,7 +41,9 @@ # This script interactively prepares and verifies # a HylaFAX client and/or server machine for use. @@ -37,11 +37,10 @@ $NetBSD: patch-ai,v 1.6 2001/07/08 13:32:15 bad Exp $ MKFIFO MV PATH -@@ -747,6 +751,61 @@ - bitch "Sorry, but you must run this script as the super-user!" +@@ -748,6 +752,61 @@ boom fi -+ + +createspool() +{ + old_spool="`dirname ${DIR_SPOOL}`/fax" @@ -96,6 +95,21 @@ $NetBSD: patch-ai,v 1.6 2001/07/08 13:32:15 bad Exp $ +Note "Creating spool directory structure" + +createspool - ++ onClient && Note "Checking system for proper client configuration." onServer && Note "Checking system for proper server configuration." + +@@ -2083,12 +2142,7 @@ + + findproc() + { +- # NB: ps ax should give an error on System V, so we try it first! +- pid="`ps ax 2>/dev/null | $AWK \"\ +- /[\/ (]$1[ )]/ {print \\$1;} +- /[\/ ]$1\$/ {print \\$1;}\"`" +- test "$pid" || +- pid="`ps -e 2>/dev/null | $AWK \"/ $1[ ]*\$/ {print \\$1;}\"`" ++ pid="`ps -ax | grep -e "[/ (]$1[ )]" -e "[/ ]$1\$" | grep -v grep | head -1 | cut -c1-5`" + echo "$pid" + } + |