Document that -w is disabled, and remove most other documentation

about it. Addresses PR 27078.
Bump PKGREVISION.

3 files changed, 84 insertions, 3 deletions

diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index cd5cd5611c4..eee5b60fb18 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2004/10/03 00:17:56 tv Exp $
+# $NetBSD: Makefile,v 1.30 2004/10/03 20:51:23 wiz Exp $
 
 DISTNAME=		ntop-1.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.unipi.it/pub/local/ntop/source/
 EXTRACT_SUFX=		-src.tar.gz
diff --git a/net/ntop/distinfo b/net/ntop/distinfo
index ec629f81ffc..f92bf3fb6ab 100644
--- a/net/ntop/distinfo
+++ b/net/ntop/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:26 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/10/03 20:51:23 wiz Exp $
 
 SHA1 (ntop-1.1-src.tar.gz) = b244f025709cfcdae14d59e78778e2daf2e7bc55
 Size (ntop-1.1-src.tar.gz) = 220950 bytes
 SHA1 (patch-aa) = 1d9002e962061ddc174cb0f904f868ca91070465
 SHA1 (patch-ab) = f0d6be0bde866803f25da5ace473e244514e3d14
 SHA1 (patch-ac) = 1f32b536470e77bf6e029d0933bb375c1b08aee0
+SHA1 (patch-ad) = b2ef6583696880a55888a549ad5d4a7d3c8d49c0
diff --git a/net/ntop/patches/patch-ad b/net/ntop/patches/patch-ad
new file mode 100644
index 00000000000..9a713b56a69
--- /dev/null
+++ b/net/ntop/patches/patch-ad
@@ -0,0 +1,80 @@
+$NetBSD: patch-ad,v 1.5 2004/10/03 20:51:23 wiz Exp $
+
+--- ntop.8.orig	1999-04-13 10:20:11.000000000 +0200
++++ ntop.8
+@@ -19,8 +19,6 @@ ntop \- display top network users
+ .IR "IP protocols to monitor" ]
+ .RB [ -i 
+ .IR interface ]
+-.RB [ -w 
+-.IR port ]
+ .RB [ -d ]
+ .RB [ -m 
+ .IR "local subnet" ]
+@@ -34,12 +32,7 @@ ntop \- display top network users
+ shows the current network usage. It displays a list of hosts that are
+ currently using the network and reports information concerning the (IP and non-IP) 
+ traffic generated by each host. 
+-.B ntop
+-can be started either in a terminal window (interactive mode) or in
+-web mode. In the latter case, a web browser is needed to use the
+-program. The traffic is sorted according to the host and the protocol. Whenever
+-.B ntop
+-is started in web mode (-w flag), multiple remote users can access the traffic information. See below for more information.
++The traffic is sorted according to the host and the protocol.
+ .PP
+ .SH "COMMAND\-LINE OPTIONS"
+ .It -r
+@@ -77,28 +70,10 @@ Specifies the network interface used by
+ .
+ 
+ .It -w 
+-Starts
+-.B ntop
+-in web mode. Users can attach their web browsers to the specified port and browse 
+-traffic information remotely. Supposing to start
+-.B ntop
+-at the port 3000 (ntop -w 3000), the URL to access is
+-http://hostname:3000/. The file ~/.ntop specifies the HTTP
+-user/password of those people who are allowed to access ntop. If the
+-~/.ntop file is missing no security will be used hence everyone can
+-access traffic information. A simple .ntop file is the following:
+-.
+-#
+-# .ntop File format
+-#
+-# user<tab>/<space>pw
+-#
+-#
+-luca		linux
+-.
+-Please note that an HTTP server is NOT
+-needed in order to use the program in interactive mode.
+-.
++Is disabled in this version of ntop for security reasons.
++See
++.B http://www.securityfocus.com/advisories/2520
++for details.
+ 
+ .It -d
+ This flag (it has to be used with -w) causes ntop to become a daemon, i.e. it is started in background and detached from the terminal.
+@@ -185,12 +160,6 @@ three 
+ columns are toggled. Please note that these columns represent either
+ the traffic sent or received, according to the the way the list is sorted (see previous
+ command).
+-
+-.SH "WEB VIEWS (Web mode)"
+-While
+-.B ntop
+-is running in web mode (-w flag), multiple users can access the traffic information using conventional web browsers. The main HTML page, is divided is two frames. The left frame allows users to select the traffic view that will be displayed in the right frame. Available sections are: sort traffic by data sent, sort traffic by data received, traffic statistics, active hosts list, remote to local (i.e. inside the subnet defined for the network board from which the program is currently sniffing) IP traffic, local to remote IP traffic, local to local IP traffic, list of active TCP sessions, IP protocol distribution statistics, IP protocol usage, IP traffic matrix.
+-
+ .
+ .SH "FIELD DESCRIPTIONS (Interactive mode)"
+ .B ntop
+@@ -247,4 +216,4 @@ at ftp://ftp.ee.lbl.gov/libpcap.tar.Z.
+ .
+ .
+ .SH AUTHOR
+-Please send bug reports to the ntop mailing list <ntop@unipi.it>. ntop's author is Luca Deri <deri@unipi.it>.
+\ No newline at end of file
++Please send bug reports to the ntop mailing list <ntop@unipi.it>. ntop's author is Luca Deri <deri@unipi.it>.