Changes 3.3.9:

* Bug fixes
* Uses GeoIP

5 files changed, 76 insertions, 18 deletions

diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index a9c5a7a24fb..8905af77067 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2009/01/09 08:53:26 dbj Exp $
+# $NetBSD: Makefile,v 1.51 2009/04/24 10:18:03 adam Exp $
 
-DISTNAME=	ntop-3.3.8
+DISTNAME=	ntop-3.3.9
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ntop/}
 
@@ -38,11 +38,9 @@ CONFIGURE_ARGS+=	--disable-mt
 .if ${OPSYS} == "Darwin"
 # This package uses "-flat_namespace -undefined suppress" and exports
 # symbols from the executable that get stripped unless we set this:
-
 INSTALL_UNSTRIPPED=	YES
 .endif
 
-
 pre-configure:
 	set -e; cd ${WRKSRC}; \
 	cp ${PREFIX}/share/libtool/ltmain.sh .; \
@@ -53,6 +51,7 @@ pre-configure:
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/gdchart/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../net/GeoIP/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ntop/PLIST b/net/ntop/PLIST
index c7b8a6b2bd5..08093faacd8 100644
--- a/net/ntop/PLIST
+++ b/net/ntop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2008/11/22 14:35:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/04/24 10:18:03 adam Exp $
 bin/ntop
 lib/libcpacketPlugin-${PKGVERSION}.so
 lib/libcpacketPlugin.a
@@ -140,7 +140,7 @@ share/ntop/html/marchio_unipi_pant541_144.gif
 share/ntop/html/marker.gif
 share/ntop/html/marker.png
 share/ntop/html/minor.gif
-share/ntop/html/multihomed.gif
+share/ntop/html/multihomed.png
 share/ntop/html/multivlaned.gif
 share/ntop/html/nboxLogo.gif
 share/ntop/html/ntop.gif
@@ -411,7 +411,6 @@ 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/p2c.opt.table.gz
 share/ntop/ntop/specialMAC.txt.gz
 share/ntop/perl/report.pl
 share/ntop/perl/report/basic.xml
diff --git a/net/ntop/distinfo b/net/ntop/distinfo
index 0d56f9754d8..48ebb1d16b9 100644
--- a/net/ntop/distinfo
+++ b/net/ntop/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2009/01/09 08:53:26 dbj Exp $
+$NetBSD: distinfo,v 1.11 2009/04/24 10:18:03 adam Exp $
 
-SHA1 (ntop-3.3.8.tar.gz) = 6ef20a1c43ce560b81e6439dc7ad0f7b29edc2c0
-RMD160 (ntop-3.3.8.tar.gz) = cd1b3e08f74d9231d56fc8b619ce5e85d3fabbd0
-Size (ntop-3.3.8.tar.gz) = 5626313 bytes
-SHA1 (patch-aa) = 3a3c9ce9bad98d6b73c487ca31ff67720e1ea96c
-SHA1 (patch-ab) = afee878962b6d3313faa618fd1c9230f8ac5016c
+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 (patch-aa) = 64b2d4cda050cd9b8981b29b0e10d900469d4b7d
+SHA1 (patch-ab) = 6c700cf0c8ed7651d40420b6cb6eb41d4f78ef81
diff --git a/net/ntop/patches/patch-aa b/net/ntop/patches/patch-aa
index 373a5688f51..fdd6092922f 100644
--- a/net/ntop/patches/patch-aa
+++ b/net/ntop/patches/patch-aa
@@ -1,8 +1,19 @@
-$NetBSD: patch-aa,v 1.11 2008/10/16 12:24:09 adam Exp $
+$NetBSD: patch-aa,v 1.12 2009/04/24 10:18:03 adam Exp $
 
---- Makefile.am.orig	2008-10-16 08:40:25.000000000 +0200
+--- Makefile.am.orig	2008-12-03 23:00:22.000000000 +0100
 +++ Makefile.am
-@@ -160,8 +160,6 @@ man_MANS = ntop.8
+@@ -76,9 +76,7 @@ ETTER_PASSIVE_DOWNLOAD_PARMS = "rev=HEAD
+ NTOPDATA = ntop-cert.pem \
+            $(ETTER_PASSIVE) \
+            oui.txt.gz \
+-           specialMAC.txt.gz \
+-	   GeoIPASNum.dat \
+-	   GeoLiteCity.dat
++           specialMAC.txt.gz
+ 
+ NTOPHTML = html html/*.js html/*.html  html/*.gif html/*.jpg html/*.ico html/*.png \
+            html/*.css html/*.dtd \
+@@ -159,8 +157,6 @@ man_MANS = ntop.8
  .PHONY: snapshot
  
  
@@ -11,3 +22,11 @@ $NetBSD: patch-aa,v 1.11 2008/10/16 12:24:09 adam Exp $
  
  CLEANLIST = `ls -l $(DESTDIR)$(libdir)/*ntop*.so $(DESTDIR)$(libdir)/*Plugin*.so | \
            grep -v $(VERSION) | \
+@@ -270,7 +266,6 @@ libclean:
+ 
+ install: install-recursive
+ 
+-	cd @GEO_DIR@; make install
+ 
+ 	@mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
+ 
diff --git a/net/ntop/patches/patch-ab b/net/ntop/patches/patch-ab
index 3ddb8dbf5c3..56090cc7fb4 100644
--- a/net/ntop/patches/patch-ab
+++ b/net/ntop/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.14 2009/01/09 08:53:26 dbj Exp $
+$NetBSD: patch-ab,v 1.15 2009/04/24 10:18:04 adam Exp $
 
---- configure.in.orig	2008-10-02 12:54:15.000000000 +0200
+--- configure.in.orig	2008-12-03 23:00:22.000000000 +0100
 +++ configure.in
 @@ -428,6 +428,15 @@ case "${target}:${CC}" in
          echo "* This appears to be ${DEFINEOS} (release not checked)"
@@ -29,3 +29,44 @@ $NetBSD: patch-ab,v 1.14 2009/01/09 08:53:26 dbj Exp $
         PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
         CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap"
         INCS="${INCS} -I$PCAP_ROOT"
+@@ -1887,39 +1896,19 @@ else
+ fi
+ 
+ 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
+ 
+ if test -f "GeoLiteCity.dat"; then
+    echo "GeoLiteCity.dat already present"
+ else
+-   wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+-   gunzip GeoLiteCity.dat.gz
+ fi
+ 
+ if test -f "GeoIPASNum.dat"; then
+    echo "GeoIPASNum.dat already present"
+ else
+-   wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
+-   gunzip GeoIPASNum.dat.gz
+ fi
+ 
+ 
+-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"
+ 
+ dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
+