Changes 3.3:

* Improved stability
* Ease of use
* U3 support and graphical GUI (Win32)

5 files changed, 106 insertions, 135 deletions

diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 1cc1e475b73..3dfe9bd38a5 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2006/04/17 13:46:44 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2007/09/15 07:35:37 adam Exp $
 
-DISTNAME=	ntop-3.2
-PKGREVISION=	2
+DISTNAME=	ntop-3.3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ntop/}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.ntop.org/ntop.html
@@ -14,7 +12,7 @@ CONFLICTS=	ntop-[0-9]*
 
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gawk gmake
+USE_TOOLS+=		aclocal autoconf autoheader automake gawk gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share/ntop
@@ -28,6 +26,7 @@ CONFIGURE_ARGS+=	--with-pcap-root=${BUILDLINK_PREFIX.libpcap}
 CONFIGURE_ARGS+=	--with-zlib-root=${BUILDLINK_PREFIX.zlib}
 # ntop-3.x crashes with IPv6
 CONFIGURE_ARGS+=	--disable-ipv6
+CONFIGURE_ARGS+=	--disable-snmp
 
 BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.8.3
 
@@ -36,10 +35,15 @@ BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.8.3
 CONFIGURE_ARGS+=	--disable-mt
 .endif
 
+pre-configure:
+	set -e; cd ${WRKSRC}; \
+	aclocal; autoheader; automake -a --foreign -i; autoconf
+
 .include "../../databases/gdbm/buildlink3.mk"
+.include "../../databases/rrdtool/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/gdchart/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/gdome2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ntop/PLIST b/net/ntop/PLIST
index 00cdb0f33eb..dd00788f043 100644
--- a/net/ntop/PLIST
+++ b/net/ntop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/10/26 15:43:08 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/09/15 07:35:38 adam Exp $
 bin/ntop
 lib/libicmpPlugin-${PKGVERSION}.so
 lib/libicmpPlugin.a
@@ -6,7 +6,6 @@ lib/libicmpPlugin.so
 lib/liblastSeenPlugin-${PKGVERSION}.so
 lib/liblastSeenPlugin.a
 lib/liblastSeenPlugin.so
-lib/libmyrrd.la
 lib/libnetflowPlugin-${PKGVERSION}.so
 lib/libnetflowPlugin.a
 lib/libnetflowPlugin.so
@@ -15,28 +14,49 @@ lib/libntopreport.la
 lib/libpdaPlugin-${PKGVERSION}.so
 lib/libpdaPlugin.a
 lib/libpdaPlugin.so
+lib/libremotePlugin-3.3.so
+lib/libremotePlugin.a
+lib/libremotePlugin.so
 lib/librrdPlugin-${PKGVERSION}.so
 lib/librrdPlugin.a
 lib/librrdPlugin.so
 lib/libsflowPlugin-${PKGVERSION}.so
 lib/libsflowPlugin.a
 lib/libsflowPlugin.so
-lib/libsnmpPlugin-${PKGVERSION}.so
-lib/libsnmpPlugin.a
-lib/libsnmpPlugin.so
-lib/libxmldumpPlugin-${PKGVERSION}.so
-lib/libxmldumpPlugin.a
-lib/libxmldumpPlugin.so
 lib/ntop/plugins/icmpPlugin.so
 lib/ntop/plugins/lastSeenPlugin.so
 lib/ntop/plugins/netflowPlugin.so
 lib/ntop/plugins/pdaPlugin.so
+lib/ntop/plugins/remotePlugin.so
 lib/ntop/plugins/rrdPlugin.so
 lib/ntop/plugins/sflowPlugin.so
-lib/ntop/plugins/snmpPlugin.so
-lib/ntop/plugins/xmldumpPlugin.so
 man/man8/ntop.8
 share/ntop/html/JSCookMenu.js
+share/ntop/html/MochiKit/Async.js
+share/ntop/html/MochiKit/Base.js
+share/ntop/html/MochiKit/Color.js
+share/ntop/html/MochiKit/DOM.js
+share/ntop/html/MochiKit/DateTime.js
+share/ntop/html/MochiKit/Format.js
+share/ntop/html/MochiKit/Iter.js
+share/ntop/html/MochiKit/Logging.js
+share/ntop/html/MochiKit/LoggingPane.js
+share/ntop/html/MochiKit/MochiKit.js
+share/ntop/html/MochiKit/MockDOM.js
+share/ntop/html/MochiKit/Signal.js
+share/ntop/html/MochiKit/Test.js
+share/ntop/html/MochiKit/Visual.js
+share/ntop/html/MochiKit/__package__.js
+share/ntop/html/PlotKit/Base.js
+share/ntop/html/PlotKit/Canvas.js
+share/ntop/html/PlotKit/EasyPlot.js
+share/ntop/html/PlotKit/Layout.js
+share/ntop/html/PlotKit/PlotKit.js
+share/ntop/html/PlotKit/PlotKit_Packed.js
+share/ntop/html/PlotKit/SVG.js
+share/ntop/html/PlotKit/SweetCanvas.js
+share/ntop/html/PlotKit/SweetSVG.js
+share/ntop/html/PlotKit/excanvas.js
 share/ntop/html/Risk_high.gif
 share/ntop/html/Risk_low.gif
 share/ntop/html/Risk_medium.gif
@@ -45,8 +65,9 @@ share/ntop/html/antenna.gif
 share/ntop/html/arrow.gif
 share/ntop/html/arrow_down.gif
 share/ntop/html/arrow_up.gif
+share/ntop/html/autosuggest.css
+share/ntop/html/autosuggest.js
 share/ntop/html/back.gif
-share/ntop/html/bar.gif
 share/ntop/html/bg_line.gif
 share/ntop/html/black.gif
 share/ntop/html/blank.gif
@@ -55,22 +76,28 @@ share/ntop/html/bridge.gif
 share/ntop/html/brocade.gif
 share/ntop/html/bug.png
 share/ntop/html/bulb.gif
+share/ntop/html/calendar-setup.js
+share/ntop/html/calendar.gif
+share/ntop/html/calendar.js
 share/ntop/html/card.gif
 share/ntop/html/child.gif
 share/ntop/html/clear.gif
 share/ntop/html/clock.gif
 share/ntop/html/collapsed.gif
-share/ntop/html/copyright.png
 share/ntop/html/corner.gif
 share/ntop/html/deleteURL.gif
 share/ntop/html/deleteUser.gif
 share/ntop/html/disk.gif
 share/ntop/html/dns.gif
+share/ntop/html/domLib.js
+share/ntop/html/domTT.js
 share/ntop/html/download.gif
 share/ntop/html/dump.html
+share/ntop/html/edit.gif
 share/ntop/html/emulex.gif
 share/ntop/html/error.gif
 share/ntop/html/expanded.gif
+share/ntop/html/external.png
 share/ntop/html/faq.html
 share/ntop/html/favicon.ico
 share/ntop/html/fback.gif
@@ -81,21 +108,33 @@ share/ntop/html/gauge.jpg
 share/ntop/html/gaugeR.jpg
 share/ntop/html/gaugeS.jpg
 share/ntop/html/graph.gif
+share/ntop/html/graph_zoom.gif
 share/ntop/html/gray_bg.gif
 share/ntop/html/help.html
 share/ntop/html/help.png
 share/ntop/html/hostSortNote.html
+share/ntop/html/img_inquisitor/as_pointer.gif
+share/ntop/html/img_inquisitor/hl_corner_bl.gif
+share/ntop/html/img_inquisitor/hl_corner_br.gif
+share/ntop/html/img_inquisitor/hl_corner_tl.gif
+share/ntop/html/img_inquisitor/hl_corner_tr.gif
+share/ntop/html/img_inquisitor/ul_corner_bl.gif
+share/ntop/html/img_inquisitor/ul_corner_br.gif
+share/ntop/html/img_inquisitor/ul_corner_tl.gif
+share/ntop/html/img_inquisitor/ul_corner_tr.gif
 share/ntop/html/info.gif
 share/ntop/html/initiator.gif
+share/ntop/html/jscalendar/calendar-load.js
+share/ntop/html/jscalendar/calendar-setup.js
+share/ntop/html/jscalendar/calendar.js
+share/ntop/html/jscalendar/lang/calendar-en.js
 share/ntop/html/lock.png
 share/ntop/html/mail.gif
 share/ntop/html/major.gif
 share/ntop/html/marchio_unipi_pant541_144.gif
-share/ntop/html/menubar.png
-share/ntop/html/menubar_j.png
-share/ntop/html/menuline.png
+share/ntop/html/marker.gif
+share/ntop/html/marker.png
 share/ntop/html/minor.gif
-share/ntop/html/modifyUser.gif
 share/ntop/html/multihomed.gif
 share/ntop/html/multivlaned.gif
 share/ntop/html/nboxLogo.gif
@@ -106,12 +145,12 @@ share/ntop/html/ntopdump.dtd
 share/ntop/html/ntophelp.html
 share/ntop/html/p2p.gif
 share/ntop/html/phone.gif
-share/ntop/html/pie-error.png
 share/ntop/html/printer.gif
 share/ntop/html/privacyNotice.html
 share/ntop/html/question.gif
 share/ntop/html/router.gif
 share/ntop/html/seagate.gif
+share/ntop/html/skype.gif
 share/ntop/html/spacer.gif
 share/ntop/html/statsicons/flags/ad.gif
 share/ntop/html/statsicons/flags/ae.gif
@@ -363,6 +402,7 @@ share/ntop/html/warning.gif
 share/ntop/html/web.gif
 share/ntop/html/wheel.gif
 share/ntop/html/white_bg.gif
+share/ntop/html/zoom.js
 share/ntop/ntop/etter.finger.os.gz
 share/ntop/ntop/ntop-cert.pem
 share/ntop/ntop/oui.txt.gz
@@ -372,6 +412,11 @@ share/ntop/ntop/specialMAC.txt.gz
 @dirrm share/ntop/html/statsicons/os
 @dirrm share/ntop/html/statsicons/flags
 @dirrm share/ntop/html/statsicons
+@dirrm share/ntop/html/jscalendar/lang
+@dirrm share/ntop/html/jscalendar
+@dirrm share/ntop/html/img_inquisitor
+@dirrm share/ntop/html/PlotKit
+@dirrm share/ntop/html/MochiKit
 @dirrm share/ntop/html
 @dirrm share/ntop
 @dirrm lib/plugins
diff --git a/net/ntop/distinfo b/net/ntop/distinfo
index 8494bcab51e..b3fe0f7a83d 100644
--- a/net/ntop/distinfo
+++ b/net/ntop/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2005/11/18 13:03:53 rillig Exp $
+$NetBSD: distinfo,v 1.8 2007/09/15 07:35:38 adam Exp $
 
-SHA1 (ntop-3.2.tgz) = ab17e871890bc490746fe03f171523073b54e1e8
-RMD160 (ntop-3.2.tgz) = 18ea4b535826e6d7bdf56c071c271869653cba8d
-Size (ntop-3.2.tgz) = 3910593 bytes
-SHA1 (patch-aa) = bb7aa0c3e935373ec128bb9453b8991edc54fdb6
-SHA1 (patch-ab) = 47cfa325fbf5570e238d290004c9c4a772f10aed
+SHA1 (ntop-3.3.tar.gz) = 4b56f15eb502ea853308433589820161ce82c8d8
+RMD160 (ntop-3.3.tar.gz) = 453842866189e7e8f63c68e70ea57800e41684b9
+Size (ntop-3.3.tar.gz) = 3709605 bytes
+SHA1 (patch-ab) = fe3b5c04a64698e35ff0b6d8f29208ec6f16bec1
diff --git a/net/ntop/patches/patch-aa b/net/ntop/patches/patch-aa
deleted file mode 100644
index aa0ec65eaa1..00000000000
--- a/net/ntop/patches/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2005/11/18 13:03:53 rillig Exp $
-
-The "gcc -o /dev/null" led to /dev/null be unlinked on Solaris.
-
---- configure.orig	Thu Oct 20 22:07:43 2005
-+++ configure	Fri Nov 18 13:59:35 2005
-@@ -21625,9 +21625,9 @@ fi;
- # Check whether --enable-jumbo-frames or --disable-jumbo-frames was given.
- if test "${enable_jumbo_frames+set}" = set; then
-   enableval="$enable_jumbo_frames"
--  ac_enable_jumbo-frames="yes"
-+  ac_enable_jumbo_frames="yes"
- else
--  ac_enable_jumbo-frames="no"
-+  ac_enable_jumbo_frames="no"
- fi;
- 
- # Check whether --enable-ipv6 or --disable-ipv6 was given.
-@@ -22985,6 +22985,15 @@ case "${target}:${CC}" in
-         echo "* This appears to be ${DEFINEOS} (release not checked)"
-       ;;
- 
-+    *-*-netbsd*:* )
-+	DEFINEOS="NETBSD"
-+        echo "* This appears to be ${DEFINEOS}"
-+      ;;
-+    *-*-openbsd*:* )
-+	DEFINEOS="OPENBSD"
-+        echo "* This appears to be ${DEFINEOS}"
-+      ;;
-+
-     * )
-         echo "* ${target} is an unknown/unsupported OS"
-         echo "*"
-@@ -41690,8 +41699,6 @@ fi
- done
- 
- 
--case "${CC}" in
--  *gcc* )
-         echo "$as_me:$LINENO: checking for mallinfo in malloc.h" >&5
- echo $ECHO_N "checking for mallinfo in malloc.h... $ECHO_C" >&6
-     cat >conftest.$ac_ext <<_ACEOF
-@@ -41709,9 +41716,7 @@ struct mallinfo memStats = mallinfo();
-   return 0;
- }
- _ACEOF
--    gcc conftest.c -o /dev/null > /dev/null 2> /dev/null
--    rc=$?
--    if test ".${rc}" = ".0"; then
-+    if eval "$ac_link"; then
-         echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-@@ -41723,7 +41728,6 @@ _ACEOF
-         echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-     fi
--esac
- 
- # Expansion of NTOPCONFIGDEBUG_SETTINGS()
- if test ".${NTOPCONFIGDEBUG}" = ".yes"; then
diff --git a/net/ntop/patches/patch-ab b/net/ntop/patches/patch-ab
index 07add5a68ce..698be703969 100644
--- a/net/ntop/patches/patch-ab
+++ b/net/ntop/patches/patch-ab
@@ -1,46 +1,31 @@
-$NetBSD: patch-ab,v 1.11 2005/11/18 13:03:53 rillig Exp $
+$NetBSD: patch-ab,v 1.12 2007/09/15 07:35:38 adam Exp $
 
-The "gcc -o /dev/null" led to /dev/null be unlinked on Solaris.
-
-This patch does not affect the build and is only intended to be reported
-upstream.
-
---- configure.in.orig	Thu Oct 20 22:07:37 2005
-+++ configure.in	Fri Nov 18 13:56:53 2005
-@@ -715,8 +715,8 @@ AC_ARG_ENABLE(i18n,
- 
- AC_ARG_ENABLE(jumbo-frames,
-               [  --enable-jumbo-frames       Enable Jumbo (9K) Ethernet frames [[default=disabled]]],
--              ac_enable_jumbo-frames="yes",
--              ac_enable_jumbo-frames="no")
-+              ac_enable_jumbo_frames="yes",
-+              ac_enable_jumbo_frames="no")
- 
- AC_ARG_ENABLE(ipv6,
-               [  --disable-ipv6              use IPv6 [[default=enabled]]],
-@@ -1988,16 +1988,12 @@ AC_CHECK_FUNCS([uname])
- dnl> Test for strtok_r (we have our own defn if it's not available)C_CHECK_FUNCS([strtok_r])
- AC_CHECK_FUNCS([strtok_r])
- 
--case "${CC}" in
--  *gcc* )
-     dnl> Check if malloc.h has mallinfo...
-     AC_MSG_CHECKING([for mallinfo in malloc.h])
-     AC_LANG_CONFTEST(
-     [AC_LANG_PROGRAM([[#include <malloc.h>]],
-                      [[struct mallinfo memStats = mallinfo();]])])
--    gcc conftest.c -o /dev/null > /dev/null 2> /dev/null
--    rc=$?
--    if test ".${rc}" = ".0"; then
-+    if (eval "$ac_link"); then
-         AC_MSG_RESULT(yes)
-         AC_DEFINE_UNQUOTED(HAVE_MALLINFO_MALLOC_H,
-                                1,
-@@ -2005,7 +2001,6 @@ case "${CC}" in
-     else
-         AC_MSG_RESULT(no)
-     fi
--esac
- 
- NTOPCONFIGDEBUG_SETTINGS([After all tests])
+--- configure.in.orig	2007-06-09 23:30:00.000000000 +0200
++++ configure.in
+@@ -432,6 +432,15 @@ case "${target}:${CC}" in
+         echo "* This appears to be ${DEFINEOS} (release not checked)"
+       ;;
  
++    *-*-netbsd*:* )
++	DEFINEOS="NETBSD"
++        echo "* This appears to be ${DEFINEOS}"
++      ;;
++    *-*-openbsd*:* )
++	DEFINEOS="OPENBSD"
++        echo "* This appears to be ${DEFINEOS}"
++      ;;
++
+     * )
+         echo "* ${target} is an unknown/unsupported OS"
+         echo "*"
+@@ -577,8 +586,8 @@ dnl> user defined directory passed as op
+ dnl>
+ if test ".${PCAP_ROOT}" != .; then
+   if test -d $PCAP_ROOT &&
+-     test -r $PCAP_ROOT/libpcap.a &&
+-     test -r $PCAP_ROOT/pcap.h; then
++     test -r $PCAP_ROOT/lib/libpcap.a &&
++     test -r $PCAP_ROOT/include/pcap.h; then
+        PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
+        CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap"
+        INCS="${INCS} -I$PCAP_ROOT"