Changes 3.3.10:

This release adds MPLS support, a per-interface BPF filter, the ability to
export the HTTP GET parameters in QUERY_STRING_UNESCAPED in the Perl plugin,
support for extended sFlow samples, a fix for a visualization issue when using
VLANs, and an improved Perl plugin.

5 files changed, 55 insertions, 67 deletions

diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 7061feb0601..bf9b1e1f17a 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2009/05/03 15:31:08 tnn Exp $
+# $NetBSD: Makefile,v 1.53 2009/05/25 09:03:14 adam Exp $
 
-DISTNAME=	ntop-3.3.9
-PKGREVISION=	1
+DISTNAME=	ntop-3.3.10
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ntop/}
 
@@ -17,11 +16,7 @@ USE_TOOLS+=		aclocal autoconf autoheader automake gawk gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share/ntop
-CONFIGURE_ARGS+=	--with-gd-root=${BUILDLINK_PREFIX.gd}
 CONFIGURE_ARGS+=	--with-gdbm-root=${BUILDLINK_PREFIX.gdbm}
-CONFIGURE_ARGS+=	--with-gdchart-root=${BUILDLINK_PREFIX.gdchart}
-CONFIGURE_ARGS+=	--with-localedir=${PREFIX}/${PKGLOCALEDIR}
-CONFIGURE_ARGS+=	--with-libpng-root=${BUILDLINK_PREFIX.png}
 CONFIGURE_ARGS+=	--with-ossl-root=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=	--with-pcap-root=${BUILDLINK_PREFIX.libpcap}
 CONFIGURE_ARGS+=	--with-zlib-root=${BUILDLINK_PREFIX.zlib}
@@ -50,8 +45,7 @@ pre-configure:
 .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 "../../lang/lua/buildlink3.mk"
 .include "../../net/GeoIP/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/ntop/PLIST b/net/ntop/PLIST
index 08093faacd8..94c3891c9eb 100644
--- a/net/ntop/PLIST
+++ b/net/ntop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/04/24 10:18:03 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/05/25 09:03:14 adam Exp $
 bin/ntop
 lib/libcpacketPlugin-${PKGVERSION}.so
 lib/libcpacketPlugin.a
@@ -14,12 +14,6 @@ lib/libnetflowPlugin.a
 lib/libnetflowPlugin.so
 lib/libntop.la
 lib/libntopreport.la
-lib/libpdaPlugin-${PKGVERSION}.so
-lib/libpdaPlugin.a
-lib/libpdaPlugin.so
-lib/libremotePlugin-${PKGVERSION}.so
-lib/libremotePlugin.a
-lib/libremotePlugin.so
 lib/librrdPlugin-${PKGVERSION}.so
 lib/librrdPlugin.a
 lib/librrdPlugin.so
@@ -30,8 +24,6 @@ lib/ntop/plugins/cpacketPlugin.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
 man/man8/ntop.8
@@ -67,12 +59,14 @@ share/ntop/html/Risk_medium.gif
 share/ntop/html/Risk_unknown.gif
 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/arrow_down.png
+share/ntop/html/arrow_up.png
 share/ntop/html/autosuggest.css
 share/ntop/html/autosuggest.js
-share/ntop/html/back.gif
+share/ntop/html/back.png
 share/ntop/html/bg_line.gif
+share/ntop/html/bit_off.png
+share/ntop/html/bit_on.png
 share/ntop/html/black.gif
 share/ntop/html/blank.gif
 share/ntop/html/bottom_corner.gif
@@ -104,9 +98,9 @@ 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
-share/ntop/html/fforward.gif
-share/ntop/html/forward.gif
+share/ntop/html/fback.png
+share/ntop/html/fforward.png
+share/ntop/html/forward.png
 share/ntop/html/functions.js
 share/ntop/html/gauge.jpg
 share/ntop/html/gaugeR.jpg
@@ -408,7 +402,6 @@ 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
 share/ntop/ntop/specialMAC.txt.gz
diff --git a/net/ntop/distinfo b/net/ntop/distinfo
index 1bc34d82c6c..54e25753d32 100644
--- a/net/ntop/distinfo
+++ b/net/ntop/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.12 2009/05/03 15:31:08 tnn Exp $
+$NetBSD: distinfo,v 1.13 2009/05/25 09:03:14 adam Exp $
 
-SHA1 (ntop-3.3.9.tar.gz) = 77c1976d096709c6e45dcfe4befc2045cf83774b
-RMD160 (ntop-3.3.9.tar.gz) = 3d7b14bff99a6652ae83fb86a2cda3206cc3392c
-Size (ntop-3.3.9.tar.gz) = 4955257 bytes
+SHA1 (ntop-3.3.10.tar.gz) = 8c6b5024a99e73241abd1c831f5ea241b67d0dbf
+RMD160 (ntop-3.3.10.tar.gz) = 85e73de0d7db041d12ae8d77a832b6ed199b6f4b
+Size (ntop-3.3.10.tar.gz) = 3235500 bytes
 SHA1 (patch-aa) = 64b2d4cda050cd9b8981b29b0e10d900469d4b7d
-SHA1 (patch-ab) = 6c700cf0c8ed7651d40420b6cb6eb41d4f78ef81
-SHA1 (patch-ac) = 101dd95636a09339cf3f2032e9d697ccc37f27c6
+SHA1 (patch-ab) = 2592d685f011eaf3268ec7a73b70c572e7f4354f
diff --git a/net/ntop/patches/patch-ab b/net/ntop/patches/patch-ab
index 56090cc7fb4..7b4e21f3d1c 100644
--- a/net/ntop/patches/patch-ab
+++ b/net/ntop/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.15 2009/04/24 10:18:04 adam Exp $
+$NetBSD: patch-ab,v 1.16 2009/05/25 09:03:15 adam Exp $
 
---- configure.in.orig	2008-12-03 23:00:22.000000000 +0100
+--- configure.in.orig	2009-05-06 16:55:22.000000000 +0200
 +++ configure.in
-@@ -428,6 +428,15 @@ case "${target}:${CC}" in
+@@ -431,6 +431,15 @@ case "${target}:${CC}" in
          echo "* This appears to be ${DEFINEOS} (release not checked)"
        ;;
  
@@ -18,8 +18,8 @@ $NetBSD: patch-ab,v 1.15 2009/04/24 10:18:04 adam Exp $
      * )
          echo "* ${target} is an unknown/unsupported OS"
          echo "*"
-@@ -573,8 +582,8 @@ dnl> user defined directory passed as op
- dnl>
+@@ -621,8 +630,8 @@ if test ".${PCAPRING_DIR}" != .; then
+ else
  if test ".${PCAP_ROOT}" != .; then
    if test -d $PCAP_ROOT &&
 -     test -r $PCAP_ROOT/libpcap.a &&
@@ -29,23 +29,41 @@ $NetBSD: patch-ab,v 1.15 2009/04/24 10:18:04 adam Exp $
         PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
         CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap"
         INCS="${INCS} -I$PCAP_ROOT"
-@@ -1887,39 +1896,19 @@ else
+@@ -1656,18 +1665,10 @@ LUA_VERSION=lua-5.1.4
+ if test -f "$LUA_VERSION.tar.gz"; then
+    echo "Lua already present on this machine"
+ else
+-   wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz
  fi
  
- dnl> GeoIP (http://www.maxmind.com/)
--if test -f "GeoIP.tar.gz"; then
--   echo "GeoIP already present on this machine"
--else
+-tar xvfz $LUA_VERSION.tar.gz
+-cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp
+-cat /tmp/lua.temp >  $LUA_VERSION/src/Makefile
+-#rm -f /tmp/lua.temp
+-cd $LUA_VERSION; make posix; cd ..
+-
+-LUA_LIB_DIR=$PWD/$LUA_VERSION"/src"
+-LIBS="-L${LUA_LIB_DIR} -llua ${LIBS} "
+-INCS="${INCS} -I${LUA_LIB_DIR}"
++
++LIBS="-llua ${LIBS} "
+ AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported])
+ 
+ dnl>
+@@ -1966,36 +1967,20 @@ dnl> GeoIP (http://www.maxmind.com/)
+ if test -f "GeoIP.tar.gz"; then
+    echo "GeoIP already present on this machine"
+ else
 -   wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
--   tar xvfz GeoIP.tar.gz
--   GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
--   cd $GEO_DIR; ./configure; make; cd ..
--   # OSX Fix
--   GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
--   if test -f $GEO_DYLIB; then
--      ln -s $GEO_DYLIB .
--   fi
 -fi
+-tar xvfz GeoIP.tar.gz
+-GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
+-cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd ..
+-# OSX Fix
+-GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
+-if test -f $GEO_DYLIB; then
+-   ln -s $GEO_DYLIB .
+ fi
  
  if test -f "GeoLiteCity.dat"; then
     echo "GeoLiteCity.dat already present"
@@ -65,8 +83,8 @@ $NetBSD: patch-ab,v 1.15 2009/04/24 10:18:04 adam Exp $
 -GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
 -GEO_IP="$GEO_DIR/libGeoIP/"
 -CFLAGS="$CFLAGS -I$GEO_IP"
--LDFLAGS="$LDFLAGS -L$GEO_IP.libs/ -lGeoIP"
-+LDFLAGS="$LDFLAGS -lGeoIP"
+-LDFLAGS="-L$GEO_IP.libs/ -lGeoIP $LDFLAGS"
++LDFLAGS="-lGeoIP $LDFLAGS"
  
  dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
  
diff --git a/net/ntop/patches/patch-ac b/net/ntop/patches/patch-ac
deleted file mode 100644
index decadaa5e0b..00000000000
--- a/net/ntop/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2009/05/03 15:31:08 tnn Exp $
-
-http://www.ntop.org/trac/ticket/75
-
-Index: http.c
-===================================================================
---- http.c	(revision 3747)
-+++ http.c	(revision 3748)
-@@ -1341,6 +1341,7 @@
- void initAccessLog(void) {
- 
-   if(myGlobals.runningPref.accessLogFile) {
-+    umask(0137);
-     myGlobals.accessLogFd = fopen(myGlobals.runningPref.accessLogFile, "a");
-     if(myGlobals.accessLogFd == NULL) {
-       traceEvent(CONST_TRACE_ERROR, "Unable to create file %s. Access log is disabled.",