On Tue, Feb 13, 2007 at 03:10:07PM +0100, Simon Dassow wrote:
> On Tue, Feb 13, 2007 at 02:48:14PM +0100, Giovanni Bechis wrote:
> > I have added a patch to fix an error in faxsetup:
> > syntax error near unexpected token ')'
> > and a type in pkg/MESSAGE (there was cua0 instead of tty00).
> > distinfo has changed because of sha256 check.
> > Ok ? Comments ?
>
> In faxsetup, why dont you utilize pgrep instead of ps | grep | awk?
>
I did not remembered of the pgrep command, here is the modified patch.
Thanks
Giovanni
diff -ruNx CVS hylafax.orig/Makefile hylafax/Makefile
--- hylafax.orig/Makefile Tue Feb 13 14:24:42 2007
+++ hylafax/Makefile Tue Feb 13 14:25:14 2007
@@ -2,7 +2,7 @@
COMMENT= "send/receive faxes and share modems"
DISTNAME= hylafax-4.1.5
-PKGNAME= ${DISTNAME}p7
+PKGNAME= ${DISTNAME}p8
CATEGORIES= comms
FLAVORS= a4
diff -ruNx CVS hylafax.orig/distinfo hylafax/distinfo
--- hylafax.orig/distinfo Tue Feb 13 14:24:42 2007
+++ hylafax/distinfo Tue Feb 13 14:27:20 2007
@@ -1,4 +1,5 @@
MD5 (hylafax-4.1.5.tar.gz) = 67135ae721f7a927e0f9a96644694617
RMD160 (hylafax-4.1.5.tar.gz) = caae931300e2025b7672ee2a516c4101d870f930
SHA1 (hylafax-4.1.5.tar.gz) = fa60a8a51921d42aa36732b5c9ee62d5b0f18dab
+SHA256 (hylafax-4.1.5.tar.gz) =
8ee98d63a03b6bcf6ecc6a4a56dba6b12c15eb7d0daa99740375ee5004c3c215
SIZE (hylafax-4.1.5.tar.gz) = 1276511
diff -ruNx CVS hylafax.orig/patches/patch-etc_faxsetup_sh_in
hylafax/patches/patch-etc_faxsetup_sh_in
--- hylafax.orig/patches/patch-etc_faxsetup_sh_in Thu Jan 1 01:00:00 1970
+++ hylafax/patches/patch-etc_faxsetup_sh_in Tue Feb 13 14:25:14 2007
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- etc/faxsetup.sh.in.orig Fri Feb 2 08:36:41 2007
++++ etc/faxsetup.sh.in Fri Feb 2 08:39:12 2007
+@@ -2136,12 +2136,7 @@ if onServer; then
+
+ 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="'pgrep $1'"
+ echo "$pid"
+ }
+
diff -ruNx CVS hylafax.orig/patches/patch-etc_faxsetup_sh_in.orig
hylafax/patches/patch-etc_faxsetup_sh_in.orig
diff -ruNx CVS hylafax.orig/pkg/MESSAGE hylafax/pkg/MESSAGE
--- hylafax.orig/pkg/MESSAGE Tue Feb 13 14:24:42 2007
+++ hylafax/pkg/MESSAGE Tue Feb 13 14:25:14 2007
@@ -14,7 +14,7 @@
For accepting incoming FAX/data calls, modify /etc/ttys(5) to
contain something like this:
- cua00 "${PREFIX}/sbin/faxgetty" dialup on
+ tty00 "${PREFIX}/sbin/faxgetty" dialup on
and send a SIGHUP to init(8).
