View | Details | Raw Unified | Return to bug 138919
Collapse All | Expand All

(-)Makefile (-6 / +7 lines)
Lines 6-22 Link Here
6
#
6
#
7
7
8
PORTNAME=	ntop
8
PORTNAME=	ntop
9
PORTVERSION=	3.3.9
9
PORTVERSION=	3.3.10
10
PORTREVISION=	2
11
CATEGORIES=	net
10
CATEGORIES=	net
12
MASTER_SITES=	SF
11
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
13
12
14
MAINTAINER=	ports@FreeBSD.org
13
MAINTAINER=	scjamorim@bsd.com.br
15
COMMENT=	Network monitoring tool with command line and web interfaces
14
COMMENT=	Network monitoring tool with command line and web interfaces
16
15
17
BUILD_DEPENDS=	rrdtool>=1.2:${PORTSDIR}/databases/rrdtool \
16
BUILD_DEPENDS=	rrdtool>=1.2:${PORTSDIR}/databases/rrdtool \
18
		geoiplookup:${PORTSDIR}/net/GeoIP
17
		geoiplookup:${PORTSDIR}/net/GeoIP
19
LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
18
LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
19
		event-1.4:${PORTSDIR}/devel/libevent
20
RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
20
RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
21
		${LOCALBASE}/lib/X11/fonts/URW/a010013l.afm:${PORTSDIR}/x11-fonts/urwfonts
21
		${LOCALBASE}/lib/X11/fonts/URW/a010013l.afm:${PORTSDIR}/x11-fonts/urwfonts
22
22
Lines 25-30 Link Here
25
MAKE_JOBS_SAFE=	yes
25
MAKE_JOBS_SAFE=	yes
26
USE_AUTOTOOLS=	libtool:22 automake:19 autoconf:262
26
USE_AUTOTOOLS=	libtool:22 automake:19 autoconf:262
27
USE_GNOME=	libxml2
27
USE_GNOME=	libxml2
28
USE_LUA=	5.1
28
USE_GMAKE=	yes
29
USE_GMAKE=	yes
29
USE_OPENSSL=	yes
30
USE_OPENSSL=	yes
30
GNU_CONFIGURE=	yes
31
GNU_CONFIGURE=	yes
Lines 44-50 Link Here
44
PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
45
PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
45
SUB_FILES=	pkg-deinstall
46
SUB_FILES=	pkg-deinstall
46
SUB_LIST=	DBDIR=${DBDIR}
47
SUB_LIST=	DBDIR=${DBDIR}
47
USE_RC_SUBR=	ntop.sh
48
USE_RC_SUBR=	ntop
48
49
49
##
50
##
50
## Available knobs:
51
## Available knobs:
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (ntop-3.3.9.tar.gz) = 0c22038e0f2aa003110437b5a5d5a6a5
1
MD5 (ntop-3.3.10.tar.gz) = 6e2ffa90d5f935c8f03d88a5dd19a866
2
SHA256 (ntop-3.3.9.tar.gz) = 606c027d02cdaab7de87475bef8be168e9f18329c2215ac21a518766aa8a331f
2
SHA256 (ntop-3.3.10.tar.gz) = aa18ba3acb564d707521deaa2655f61f5b617d98d4fb5a014553f3fa123f123a
3
SIZE (ntop-3.3.9.tar.gz) = 4955257
3
SIZE (ntop-3.3.10.tar.gz) = 3235500
(-)pkg-plist (-13 / +8 lines)
Lines 1-5 Link Here
1
bin/ntop
1
bin/ntop
2
etc/ntop/etter.finger.os.gz
3
etc/ntop/ntop-cert.pem
2
etc/ntop/ntop-cert.pem
4
etc/ntop/oui.txt.gz
3
etc/ntop/oui.txt.gz
5
etc/ntop/specialMAC.txt.gz
4
etc/ntop/specialMAC.txt.gz
Lines 19-28 Link Here
19
lib/libntopreport.so
18
lib/libntopreport.so
20
lib/libntopreport.a
19
lib/libntopreport.a
21
lib/libntopreport.la
20
lib/libntopreport.la
22
lib/libpdaPlugin-%%PORTVERSION%%.so
23
lib/libpdaPlugin.so
24
lib/libremotePlugin-%%PORTVERSION%%.so
25
lib/libremotePlugin.so
26
lib/librrdPlugin-%%PORTVERSION%%.so
21
lib/librrdPlugin-%%PORTVERSION%%.so
27
lib/librrdPlugin.so
22
lib/librrdPlugin.so
28
lib/libsflowPlugin-%%PORTVERSION%%.so
23
lib/libsflowPlugin-%%PORTVERSION%%.so
Lines 31-38 Link Here
31
lib/ntop/plugins/icmpPlugin.so
26
lib/ntop/plugins/icmpPlugin.so
32
lib/ntop/plugins/lastSeenPlugin.so
27
lib/ntop/plugins/lastSeenPlugin.so
33
lib/ntop/plugins/netflowPlugin.so
28
lib/ntop/plugins/netflowPlugin.so
34
lib/ntop/plugins/pdaPlugin.so
35
lib/ntop/plugins/remotePlugin.so
36
lib/ntop/plugins/rrdPlugin.so
29
lib/ntop/plugins/rrdPlugin.so
37
lib/ntop/plugins/sflowPlugin.so
30
lib/ntop/plugins/sflowPlugin.so
38
%%DATADIR%%/perl/report/basic.xml
31
%%DATADIR%%/perl/report/basic.xml
Lines 67-75 Link Here
67
%%DATADIR%%/html/Risk_medium.gif
60
%%DATADIR%%/html/Risk_medium.gif
68
%%DATADIR%%/html/Risk_unknown.gif
61
%%DATADIR%%/html/Risk_unknown.gif
69
%%DATADIR%%/html/antenna.gif
62
%%DATADIR%%/html/antenna.gif
70
%%DATADIR%%/html/arrow_down.gif
71
%%DATADIR%%/html/arrow_up.gif
72
%%DATADIR%%/html/back.gif
73
%%DATADIR%%/html/bg_line.gif
63
%%DATADIR%%/html/bg_line.gif
74
%%DATADIR%%/html/black.gif
64
%%DATADIR%%/html/black.gif
75
%%DATADIR%%/html/bottom_corner.gif
65
%%DATADIR%%/html/bottom_corner.gif
Lines 94-102 Link Here
94
%%DATADIR%%/html/expanded.gif
84
%%DATADIR%%/html/expanded.gif
95
%%DATADIR%%/html/faq.html
85
%%DATADIR%%/html/faq.html
96
%%DATADIR%%/html/favicon.ico
86
%%DATADIR%%/html/favicon.ico
97
%%DATADIR%%/html/fback.gif
98
%%DATADIR%%/html/fforward.gif
99
%%DATADIR%%/html/forward.gif
100
%%DATADIR%%/html/functions.js
87
%%DATADIR%%/html/functions.js
101
%%DATADIR%%/html/gauge.jpg
88
%%DATADIR%%/html/gauge.jpg
102
%%DATADIR%%/html/gaugeR.jpg
89
%%DATADIR%%/html/gaugeR.jpg
Lines 362-367 Link Here
362
%%DATADIR%%/html/statsicons/os/os2.gif
349
%%DATADIR%%/html/statsicons/os/os2.gif
363
%%DATADIR%%/html/statsicons/os/sun.gif
350
%%DATADIR%%/html/statsicons/os/sun.gif
364
%%DATADIR%%/html/statsicons/os/windows.gif
351
%%DATADIR%%/html/statsicons/os/windows.gif
352
%%DATADIR%%/html/arrow_down.png
353
%%DATADIR%%/html/arrow_up.png
354
%%DATADIR%%/html/back.png
355
%%DATADIR%%/html/bit_off.png
356
%%DATADIR%%/html/bit_on.png
357
%%DATADIR%%/html/fback.png
358
%%DATADIR%%/html/fforward.png
359
%%DATADIR%%/html/forward.png
365
%%DATADIR%%/html/style.css
360
%%DATADIR%%/html/style.css
366
%%DATADIR%%/html/switch.gif
361
%%DATADIR%%/html/switch.gif
367
%%DATADIR%%/html/upload.gif
362
%%DATADIR%%/html/upload.gif
(-)files/ntop.in (+37 lines)
Added Link Here
1
#!/bin/sh
2
#
3
# $FreeBSD: ports/net/ntop/files/ntop.sh.in,v 1.3 2009/08/02 19:35:02 mezz Exp $
4
#
5
# PROVIDE: ntop
6
# REQUIRE: DAEMON
7
# KEYWORD: shutdown
8
#
9
# Add the following lines to /etc/rc.conf to enable ntop:
10
#
11
# ntop_enable (bool):		Set it to "YES" to enable ntop
12
#				Default is "NO".
13
# ntop_flags (flags):		Set extra flags to ntop
14
#				Default is "-d --use-syslog=daemon". see ntop(8).
15
#
16
17
. %%RC_SUBR%%
18
19
name=ntop
20
rcvar=${name}_enable
21
22
load_rc_config $name
23
24
: ${ntop_enable="NO"}
25
: ${ntop_flags="-d --use-syslog=daemon"}
26
27
command=%%PREFIX%%/bin/ntop
28
start_precmd="${name}_checkpw"
29
30
ntop_checkpw()
31
{
32
	if [ ! -f %%DBDIR%%/ntop/ntop_pw.db ]; then
33
		err 1 "Please set admin password for ntop. Run '%%PREFIX%%/bin/ntop -u nobody -A'"
34
	fi
35
}
36
37
run_rc_command "$1"
(-)files/ntop.sh.in (-37 lines)
Removed Link Here
1
#!/bin/sh
2
#
3
# $FreeBSD: ports/net/ntop/files/ntop.sh.in,v 1.3 2009/08/02 19:35:02 mezz Exp $
4
#
5
# PROVIDE: ntop
6
# REQUIRE: DAEMON
7
# KEYWORD: shutdown
8
#
9
# Add the following lines to /etc/rc.conf to enable ntop:
10
#
11
# ntop_enable (bool):		Set it to "YES" to enable ntop
12
#				Default is "NO".
13
# ntop_flags (flags):		Set extra flags to ntop
14
#				Default is "-d --use-syslog=daemon". see ntop(8).
15
#
16
17
. %%RC_SUBR%%
18
19
name=ntop
20
rcvar=${name}_enable
21
22
load_rc_config $name
23
24
: ${ntop_enable="NO"}
25
: ${ntop_flags="-d --use-syslog=daemon"}
26
27
command=%%PREFIX%%/bin/ntop
28
start_precmd="${name}_checkpw"
29
30
ntop_checkpw()
31
{
32
	if [ ! -f %%DBDIR%%/ntop/ntop_pw.db ]; then
33
		err 1 "Please set admin password for ntop. Run '%%PREFIX%%/bin/ntop -u nobody -A'"
34
	fi
35
}
36
37
run_rc_command "$1"
(-)files/patch-Makefile.am (-4 / +4 lines)
Lines 1-5 Link Here
1
--- Makefile.am.orig	2008-12-03 17:00:22.000000000 -0500
1
--- Makefile.am.orig	2009-04-17 17:27:57.000000000 -0300
2
+++ Makefile.am	2009-06-02 14:27:56.863148713 -0400
2
+++ Makefile.am	2009-09-15 13:07:19.000000000 -0300
3
@@ -76,9 +76,7 @@
3
@@ -76,9 +76,7 @@
4
 NTOPDATA = ntop-cert.pem \
4
 NTOPDATA = ntop-cert.pem \
5
            $(ETTER_PASSIVE) \
5
            $(ETTER_PASSIVE) \
Lines 20-27 Link Here
20
 	@mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
20
 	@mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
21
 
21
 
22
 	@echo ""
22
 	@echo ""
23
@@ -336,7 +332,6 @@
23
@@ -341,7 +337,6 @@
24
 
24
 	chcon -t textrel_shlib_t $(DESTDIR)$(libdir)/*ntop*.so
25
 
25
 
26
 install-data-local: ntop.txt ntop.html faq.html
26
 install-data-local: ntop.txt ntop.html faq.html
27
-	@$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)/plugins;
27
-	@$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)/plugins;
(-)files/patch-autogen.sh (-2 / +2 lines)
Lines 1-5 Link Here
1
--- autogen.sh.orig	2009-06-02 10:26:46.731977294 -0400
1
--- autogen.sh.orig	2009-09-15 11:33:11.000000000 -0300
2
+++ autogen.sh	2009-06-02 10:27:02.866983000 -0400
2
+++ autogen.sh	2009-09-15 11:34:06.000000000 -0300
3
@@ -244,16 +244,6 @@
3
@@ -244,16 +244,6 @@
4
   GNU_OR_DIE=0
4
   GNU_OR_DIE=0
5
 }
5
 }
(-)files/patch-configure.in (-14 / +42 lines)
Lines 1-7 Link Here
1
--- configure.in.orig	2008-12-03 17:00:22.000000000 -0500
1
--- configure.in.orig	2009-09-15 11:37:06.000000000 -0300
2
+++ configure.in	2009-06-02 13:28:01.067367126 -0400
2
+++ configure.in	2009-09-15 11:45:13.000000000 -0300
3
@@ -573,8 +573,8 @@
3
@@ -621,8 +621,8 @@
4
 dnl>
4
 else
5
 if test ".${PCAP_ROOT}" != .; then
5
 if test ".${PCAP_ROOT}" != .; then
6
   if test -d $PCAP_ROOT &&
6
   if test -d $PCAP_ROOT &&
7
-     test -r $PCAP_ROOT/libpcap.a &&
7
-     test -r $PCAP_ROOT/libpcap.a &&
Lines 11-17 Link Here
11
        PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
11
        PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
12
        CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap"
12
        CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap"
13
        INCS="${INCS} -I$PCAP_ROOT"
13
        INCS="${INCS} -I$PCAP_ROOT"
14
@@ -1886,40 +1886,7 @@
14
@@ -1650,27 +1650,6 @@
15
 fi
16
 
17
 dnl>
18
-dnl> Lua - http://www.lua.org
19
-dnl>
20
-LUA_VERSION=lua-5.1.4
21
-if test -f "$LUA_VERSION.tar.gz"; then
22
-   echo "Lua already present on this machine"
23
-else
24
-   wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz
25
-fi
26
-
27
-tar xvfz $LUA_VERSION.tar.gz
28
-cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp
29
-cat /tmp/lua.temp >  $LUA_VERSION/src/Makefile
30
-#rm -f /tmp/lua.temp
31
-cd $LUA_VERSION; make posix; cd ..
32
-
33
-LUA_LIB_DIR=$PWD/$LUA_VERSION"/src"
34
-LIBS="-L${LUA_LIB_DIR} -llua ${LIBS} "
35
-INCS="${INCS} -I${LUA_LIB_DIR}"
36
-AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported])
37
-
38
-dnl>
39
 dnl> SCTP - RFC 3286
40
 dnl>
41
 AC_MSG_CHECKING([sctp])
42
@@ -1962,40 +1941,7 @@
15
     }'`
43
     }'`
16
 fi
44
 fi
17
 
45
 
Lines 20-33 Link Here
20
-   echo "GeoIP already present on this machine"
48
-   echo "GeoIP already present on this machine"
21
-else
49
-else
22
-   wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
50
-   wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
23
-   tar xvfz GeoIP.tar.gz
51
-fi
24
-   GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
52
-tar xvfz GeoIP.tar.gz
25
-   cd $GEO_DIR; ./configure; make; cd ..
53
-GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
26
-   # OSX Fix
54
-cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd ..
27
-   GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
55
-# OSX Fix
28
-   if test -f $GEO_DYLIB; then
56
-GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
29
-      ln -s $GEO_DYLIB .
57
-if test -f $GEO_DYLIB; then
30
-   fi
58
-   ln -s $GEO_DYLIB .
31
-fi
59
-fi
32
-
60
-
33
-if test -f "GeoLiteCity.dat"; then
61
-if test -f "GeoLiteCity.dat"; then
Lines 48-54 Link Here
48
-GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
76
-GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
49
-GEO_IP="$GEO_DIR/libGeoIP/"
77
-GEO_IP="$GEO_DIR/libGeoIP/"
50
-CFLAGS="$CFLAGS -I$GEO_IP"
78
-CFLAGS="$CFLAGS -I$GEO_IP"
51
-LDFLAGS="$LDFLAGS -L$GEO_IP.libs/ -lGeoIP"
79
-LDFLAGS="-L$GEO_IP.libs/ -lGeoIP $LDFLAGS"
52
+LDFLAGS="$LDFLAGS -lGeoIP"
80
+LDFLAGS="$LDFLAGS -lGeoIP"
53
 
81
 
54
 dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
82
 dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
(-)files/patch-plugins_netflowPlugin.c (-11 lines)
Removed Link Here
1
--- plugins/netflowPlugin.c.orig	2009-06-22 14:00:56.000000000 -0400
2
+++ plugins/netflowPlugin.c	2009-06-22 14:01:10.000000000 -0400
3
@@ -28,7 +28,7 @@
4
 static void* netflowUtilsLoop(void* _deviceId);
5
 #endif
6
 
7
-#define DEBUG_FLOWS
8
+//#define DEBUG_FLOWS
9
 
10
 #define CONST_NETFLOW_STATISTICS_HTML       "statistics.html"
11
 

Return to bug 138919