diff options
| author | rillig <rillig> | 2006-01-14 02:52:42 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2006-01-14 02:52:42 +0000 |
| commit | 21813b121d85ba4b31669158bdbe73d8a469060e (patch) | |
| tree | 86ec6352bd59e01a2ef00508d40a0e9c232fe73c /net/hobbitmon | |
| parent | 127ecac4dcfa60b15e7ad6c6ff18e09b0a46dc9f (diff) | |
| download | pkgsrc-21813b121d85ba4b31669158bdbe73d8a469060e.tar.gz | |
Avoid an endless loop when fping does not work _and_ no user input is
available.
Diffstat (limited to 'net/hobbitmon')
| -rw-r--r-- | net/hobbitmon/distinfo | 4 | ||||
| -rw-r--r-- | net/hobbitmon/patches/patch-ab | 23 |
2 files changed, 19 insertions, 8 deletions
diff --git a/net/hobbitmon/distinfo b/net/hobbitmon/distinfo index 7d2cf6eef09..ce0d4f4af6e 100644 --- a/net/hobbitmon/distinfo +++ b/net/hobbitmon/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.5 2005/09/17 21:31:26 minskim Exp $ +$NetBSD: distinfo,v 1.6 2006/01/14 02:52:42 rillig Exp $ SHA1 (hobbit-4.0-beta6.tar.gz) = 82e6a76e55682c205adac47e54830064bba44f2d RMD160 (hobbit-4.0-beta6.tar.gz) = 6542f6a1cd58236c85eefc74872436ee75f36b4b Size (hobbit-4.0-beta6.tar.gz) = 1130547 bytes SHA1 (patch-aa) = a1d5ceaaa7cc99be2a55543234cdd3b20dd0e1a9 -SHA1 (patch-ab) = a5d0145f0dd6886a631aa22a093da1d6a28299e3 +SHA1 (patch-ab) = 810b67dfa9c149defb3d05886d70e62798eaf96f SHA1 (patch-ac) = 26ea6fd07f9529fe2af3067d1e704a64157756d0 SHA1 (patch-ae) = 1355886e3aeafe26bb9ec5322235a464ab475993 SHA1 (patch-aj) = 4758ccbabb6a109c3f3da40c3fd5129be1f7bbfd diff --git a/net/hobbitmon/patches/patch-ab b/net/hobbitmon/patches/patch-ab index 2f7bcecd462..00cbd46edb2 100644 --- a/net/hobbitmon/patches/patch-ab +++ b/net/hobbitmon/patches/patch-ab @@ -1,8 +1,11 @@ -$NetBSD: patch-ab,v 1.2 2005/01/24 18:16:20 manu Exp $ ---- build/fping.sh.orig 2005-01-24 17:28:28.000000000 +0100 -+++ build/fping.sh 2005-01-24 17:28:01.000000000 +0100 -@@ -1,9 +1,9 @@ - #!/bin/sh +$NetBSD: patch-ab,v 1.3 2006/01/14 02:52:42 rillig Exp $ + +The second hunk avoids an endless loop when there is no +way to read from stdin. + +--- build/fping.sh.orig 2005-01-23 09:19:02.000000000 +0100 ++++ build/fping.sh 2006-01-14 03:47:22.000000000 +0100 +@@ -2,7 +2,7 @@ echo "Checking for fping ..." @@ -11,4 +14,12 @@ $NetBSD: patch-ab,v 1.2 2005/01/24 18:16:20 manu Exp $ for DIR in /bin /usr/bin /sbin /usr/sbin /usr/local/bin /usr/local/sbin /opt/bin /usr/pkg/bin do - if test -x $DIR/fping +@@ -41,7 +41,7 @@ + echo "like 'sudo' to run fping." + echo "" + echo "Hobbit needs the fping utility. What command should it use to run fping ?" +- read FPING ++ read FPING || exit 1 + fi + done + |