diff options
| author | abs <abs@pkgsrc.org> | 2000-07-13 15:34:10 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2000-07-13 15:34:10 +0000 |
| commit | 9aa9298845679f7da1a1efffd1b954e43ee8cd67 (patch) | |
| tree | 67aec4186d5dadc42eefbb67c1dc87fefe7e60cd /net/nocol/patches | |
| parent | dd8cfb5b4e38a3538afb7b958bf5d8dbb9e8147a (diff) | |
| download | pkgsrc-9aa9298845679f7da1a1efffd1b954e43ee8cd67.tar.gz | |
Update to 4.3.1nb1
- Modify webnocol.cgi to find traceroute in /usr/sbin
- Install the images and audio files in $PREFIX/share/nocol for later use
Diffstat (limited to 'net/nocol/patches')
| -rw-r--r-- | net/nocol/patches/patch-ad | 36 | ||||
| -rw-r--r-- | net/nocol/patches/patch-ae | 13 |
2 files changed, 38 insertions, 11 deletions
diff --git a/net/nocol/patches/patch-ad b/net/nocol/patches/patch-ad index 136dbe122ee..3029ac4f8e4 100644 --- a/net/nocol/patches/patch-ad +++ b/net/nocol/patches/patch-ad @@ -1,13 +1,27 @@ -$NetBSD: patch-ad,v 1.1 2000/07/13 11:09:18 abs Exp $ +$NetBSD: patch-ad,v 1.2 2000/07/13 15:34:13 abs Exp $ ---- Makefile.head.orig Wed Jan 19 04:08:32 2000 -+++ Makefile.head Thu Jul 13 11:07:09 2000 -@@ -45,7 +45,7 @@ - DATADIR= $(ROOTDIR)/data - MSGSDIR= $(ROOTDIR)/msgs - HELPDIR= $(ROOTDIR)/help --EXAMPLESDIR= $(ETCDIR)/samples -+EXAMPLESDIR= ${ROOTDIR}/share/examples/nocol +--- webnocol/webnocol.cgi.orig Thu Jul 13 15:46:34 2000 ++++ webnocol/webnocol.cgi Thu Jul 13 15:45:49 2000 +@@ -646,11 +646,21 @@ + # e.g. on Sun's use '/usr/sbin/ping -s DEVICE 500 3' if you are not using + # multiping + sub doTroubleShoot { +- local ($traceroute) = "/usr/local/bin/traceroute -m 15 DEVICE"; ++ local (@traceroutepaths) = ('/usr/sbin', '/usr/local/bin'); ++ local ($traceroute) = "traceroute -m 15 DEVICE"; + local ($ping) = "$nocolroot/bin/multiping -c 3 -i 2 DEVICE"; # check_this + local ($nslookup) = "nslookup -query=any DEVICE"; + local ($nslookup) = ($siteaddr =~ /^[\d\.]+$/) ? + "nslookup DEVICE" : "nslookup -query=any DEVICE"; ++ ++ foreach (@traceroutepaths) ++ { ++ if ( -x "$_/traceroute") ++ { ++ $traceroute = "$_/traceroute"; ++ last; ++ } ++ } - ## - # NOCOL specific definitions: + local ($subcmd); + local (%cmdlist) = ("ping", $ping, "traceroute", $traceroute, diff --git a/net/nocol/patches/patch-ae b/net/nocol/patches/patch-ae new file mode 100644 index 00000000000..db4192d71dd --- /dev/null +++ b/net/nocol/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2000/07/13 15:34:13 abs Exp $ + +--- Makefile.head.orig Wed Jan 19 04:08:32 2000 ++++ Makefile.head Thu Jul 13 15:46:48 2000 +@@ -45,7 +45,7 @@ + DATADIR= $(ROOTDIR)/data + MSGSDIR= $(ROOTDIR)/msgs + HELPDIR= $(ROOTDIR)/help +-EXAMPLESDIR= $(ETCDIR)/samples ++EXAMPLESDIR= ${ROOTDIR}/share/examples/nocol + + ## + # NOCOL specific definitions: |