Changes 4.1.0:

* Unknown

7 files changed, 35 insertions, 41 deletions

diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 99693e09961..723d1abdc6a 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2011/08/23 13:06:52 obache Exp $
+# $NetBSD: Makefile,v 1.69 2011/10/18 10:33:06 adam Exp $
 
-DISTNAME=	ntop-4.0.3
-PKGREVISION=	4
+DISTNAME=	ntop-4.1.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ntop/}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.ntop.org/ntop.html
diff --git a/net/ntop/PLIST b/net/ntop/PLIST
index 04ed04e1cd6..72fb755f290 100644
--- a/net/ntop/PLIST
+++ b/net/ntop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2011/02/11 11:12:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2011/10/18 10:33:06 adam Exp $
 bin/ntop
 lib/libcpacketPlugin-${PKGVERSION}.so
 lib/libcpacketPlugin.so
@@ -92,6 +92,7 @@ share/ntop/html/emulex.gif
 share/ntop/html/error.gif
 share/ntop/html/expanded.gif
 share/ntop/html/external.png
+share/ntop/html/facebook.gif
 share/ntop/html/faq.html
 share/ntop/html/favicon.ico
 share/ntop/html/fback.png
@@ -127,6 +128,7 @@ share/ntop/html/jscalendar/calendar.js
 share/ntop/html/jscalendar/lang/calendar-en.js
 share/ntop/html/json2.js
 share/ntop/html/line-bottom.png
+share/ntop/html/linkedin.gif
 share/ntop/html/lock.png
 share/ntop/html/mail.gif
 share/ntop/html/major.gif
@@ -152,6 +154,7 @@ share/ntop/html/router.gif
 share/ntop/html/rrdAlarmConfig.js
 share/ntop/html/seagate.gif
 share/ntop/html/skype.gif
+share/ntop/html/skype.png
 share/ntop/html/sorterScript.js
 share/ntop/html/sorterStyle.css
 share/ntop/html/spacer.gif
@@ -396,6 +399,7 @@ share/ntop/html/style.css
 share/ntop/html/switch.gif
 share/ntop/html/theme.css
 share/ntop/html/theme.js
+share/ntop/html/twitter.png
 share/ntop/html/upload.gif
 share/ntop/html/url.gif
 share/ntop/html/user.gif
@@ -405,6 +409,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/youtube.gif
 share/ntop/html/zoom.js
 share/ntop/ntop/GeoIPASNum.dat
 share/ntop/ntop/GeoLiteCity.dat
diff --git a/net/ntop/distinfo b/net/ntop/distinfo
index a41e4fbe914..ccd406be7b0 100644
--- a/net/ntop/distinfo
+++ b/net/ntop/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.18 2011/02/11 11:12:14 adam Exp $
+$NetBSD: distinfo,v 1.19 2011/10/18 10:33:06 adam Exp $
 
-SHA1 (ntop-4.0.3.tgz) = e7c31eabf31f61758e97d69398176520c1cb5613
-RMD160 (ntop-4.0.3.tgz) = a7b0f15409fee6b53b7c10d8b397fe0ade13120f
-Size (ntop-4.0.3.tgz) = 39191671 bytes
-SHA1 (patch-aa) = ccc5cb9532ba8591db5d131c06b516d4ae92cb4e
-SHA1 (patch-ab) = 7b8a00bc8e107f33b9bf0199ce4a7c9cb5fc1bc5
-SHA1 (patch-ac) = f947853ed8f4f77f55f75adedacf16b179513202
-SHA1 (patch-pbuf.c) = 92bb03cd3bb82b60cfbc958ab2854308b36a653d
+SHA1 (ntop-4.1.0.tar.gz) = 11cd397e5524fa72652d840ce1b92631f8bf39a2
+RMD160 (ntop-4.1.0.tar.gz) = 6f10e30e1b2870fc1ec327512e17cfbe0783faa4
+Size (ntop-4.1.0.tar.gz) = 39118983 bytes
+SHA1 (patch-aa) = 92fc5a3c22db1315397e84650361af25c932ca8b
+SHA1 (patch-ab) = 1c8d20ab57edac2f55d82cb5ac81e8fdfe9413b3
+SHA1 (patch-ac) = 122d498c4d8a5809cf4ca41bd32c8eb86001f01f
diff --git a/net/ntop/patches/patch-aa b/net/ntop/patches/patch-aa
index 853a537227d..d1e8c5b4ecb 100644
--- a/net/ntop/patches/patch-aa
+++ b/net/ntop/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2011/02/11 11:12:15 adam Exp $
+$NetBSD: patch-aa,v 1.15 2011/10/18 10:33:06 adam Exp $
 
---- Makefile.am.orig	2010-04-25 12:52:28.000000000 +0000
+--- Makefile.am.orig	2011-03-03 13:44:59.000000000 +0000
 +++ Makefile.am
-@@ -336,7 +332,7 @@ install: install-recursive
+@@ -328,7 +328,7 @@ install: install-recursive
  install-selinux-policy:
  	chcon -t textrel_shlib_t $(DESTDIR)$(libdir)/*ntop*.so
  
diff --git a/net/ntop/patches/patch-ab b/net/ntop/patches/patch-ab
index bfd42fa4ab5..8771e06cc3d 100644
--- a/net/ntop/patches/patch-ab
+++ b/net/ntop/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.20 2011/02/11 11:12:15 adam Exp $
+$NetBSD: patch-ab,v 1.21 2011/10/18 10:33:06 adam Exp $
 
---- configure.in.orig	2010-10-24 10:01:01.000000000 +0000
+--- configure.in.orig	2011-08-15 08:34:28.000000000 +0000
 +++ configure.in
-@@ -437,6 +437,19 @@ case "${target}:${CC}" in
+@@ -395,6 +395,19 @@ case "${target}:${CC}" in
          echo "* This appears to be ${DEFINEOS} (release not checked)"
        ;;
  
@@ -22,7 +22,7 @@ $NetBSD: patch-ab,v 1.20 2011/02/11 11:12:15 adam Exp $
      * )
          echo "* ${target} is an unknown/unsupported OS"
          echo "*"
-@@ -596,8 +609,8 @@ if test ".${PCAPRING_DIR}" != .; then
+@@ -554,8 +567,8 @@ if test ".${PCAPRING_DIR}" != .; then
  else
  if test ".${PCAP_ROOT}" != .; then
    if test -d $PCAP_ROOT &&
@@ -33,7 +33,7 @@ $NetBSD: patch-ab,v 1.20 2011/02/11 11:12:15 adam Exp $
         PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
         CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap"
         INCS="${INCS} -I$PCAP_ROOT"
-@@ -1829,8 +1842,6 @@ if test -f "GeoLiteCity.dat"; then
+@@ -1721,8 +1734,6 @@ if test -f "GeoLiteCity.dat"; then
  else
     if test -f "3rd_party/GeoLiteCity.dat.gz"; then
       cp 3rd_party/GeoLiteCity.dat.gz .
@@ -42,7 +42,7 @@ $NetBSD: patch-ab,v 1.20 2011/02/11 11:12:15 adam Exp $
     fi
  
     gunzip GeoLiteCity.dat.gz
-@@ -1843,8 +1852,6 @@ if test -f "GeoIPASNum.dat"; then
+@@ -1735,8 +1746,6 @@ if test -f "GeoIPASNum.dat"; then
  else
     if test -f "3rd_party/GeoIPASNum.dat.gz"; then
       cp 3rd_party/GeoIPASNum.dat.gz .
diff --git a/net/ntop/patches/patch-ac b/net/ntop/patches/patch-ac
index 3a8e33258bb..b98b58a455b 100644
--- a/net/ntop/patches/patch-ac
+++ b/net/ntop/patches/patch-ac
@@ -1,13 +1,20 @@
-$NetBSD: patch-ac,v 1.8 2010/07/22 21:10:52 adam Exp $
+$NetBSD: patch-ac,v 1.9 2011/10/18 10:33:06 adam Exp $
 
---- initialize.c.orig	2010-07-20 20:46:07.000000000 +0000
+--- initialize.c.orig	2011-03-03 21:00:04.000000000 +0000
 +++ initialize.c
-@@ -365,7 +365,7 @@ void initCounters(void) {
+@@ -343,6 +343,7 @@ void initCounters(void) {
  
    setDomainName();
  
--#ifdef INET6
 +#if 0
    _in6addr_linklocal_allnodes.s6_addr[0] = 0xff;
    _in6addr_linklocal_allnodes.s6_addr[1] = 0x02;
    _in6addr_linklocal_allnodes.s6_addr[2] = 0x00;
+@@ -359,6 +360,7 @@ void initCounters(void) {
+   _in6addr_linklocal_allnodes.s6_addr[13] = 0x00;
+   _in6addr_linklocal_allnodes.s6_addr[14] = 0x00;
+   _in6addr_linklocal_allnodes.s6_addr[15] = 0x01;
++#endif
+ 
+   memset(myGlobals.transTimeHash, 0, sizeof(myGlobals.transTimeHash));
+   memset(myGlobals.dummyEthAddress, 0, LEN_ETHERNET_ADDRESS);
diff --git a/net/ntop/patches/patch-pbuf.c b/net/ntop/patches/patch-pbuf.c
deleted file mode 100644
index 72b14d25dd0..00000000000
--- a/net/ntop/patches/patch-pbuf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-pbuf.c,v 1.1 2011/02/11 11:12:15 adam Exp $
-
-Do not discard packets with bad checksum.
-Bad checksum may occur when local interface has hardware-assisted checksumming.
-
---- pbuf.c.orig	2011-02-11 10:00:09.000000000 +0000
-+++ pbuf.c
-@@ -1175,7 +1175,6 @@ static void processIpPkt(const u_char *b
-        && (in_cksum((const u_short *)bp, hlen, 0) != 0)
-        ) {
-       incrementTrafficCounter(&myGlobals.device[actualDeviceId].rcvdPktStats.badChecksum, 1);
--      return;
-     }
- 
-   /*