head 1.16; access; symbols pkgsrc-2021Q4:1.15.0.82 pkgsrc-2021Q4-base:1.15 pkgsrc-2021Q3:1.15.0.80 pkgsrc-2021Q3-base:1.15 pkgsrc-2021Q2:1.15.0.78 pkgsrc-2021Q2-base:1.15 pkgsrc-2021Q1:1.15.0.76 pkgsrc-2021Q1-base:1.15 pkgsrc-2020Q4:1.15.0.74 pkgsrc-2020Q4-base:1.15 pkgsrc-2020Q3:1.15.0.72 pkgsrc-2020Q3-base:1.15 pkgsrc-2020Q2:1.15.0.68 pkgsrc-2020Q2-base:1.15 pkgsrc-2020Q1:1.15.0.48 pkgsrc-2020Q1-base:1.15 pkgsrc-2019Q4:1.15.0.70 pkgsrc-2019Q4-base:1.15 pkgsrc-2019Q3:1.15.0.66 pkgsrc-2019Q3-base:1.15 pkgsrc-2019Q2:1.15.0.64 pkgsrc-2019Q2-base:1.15 pkgsrc-2019Q1:1.15.0.62 pkgsrc-2019Q1-base:1.15 pkgsrc-2018Q4:1.15.0.60 pkgsrc-2018Q4-base:1.15 pkgsrc-2018Q3:1.15.0.58 pkgsrc-2018Q3-base:1.15 pkgsrc-2018Q2:1.15.0.56 pkgsrc-2018Q2-base:1.15 pkgsrc-2018Q1:1.15.0.54 pkgsrc-2018Q1-base:1.15 pkgsrc-2017Q4:1.15.0.52 pkgsrc-2017Q4-base:1.15 pkgsrc-2017Q3:1.15.0.50 pkgsrc-2017Q3-base:1.15 pkgsrc-2017Q2:1.15.0.46 pkgsrc-2017Q2-base:1.15 pkgsrc-2017Q1:1.15.0.44 pkgsrc-2017Q1-base:1.15 pkgsrc-2016Q4:1.15.0.42 pkgsrc-2016Q4-base:1.15 pkgsrc-2016Q3:1.15.0.40 pkgsrc-2016Q3-base:1.15 pkgsrc-2016Q2:1.15.0.38 pkgsrc-2016Q2-base:1.15 pkgsrc-2016Q1:1.15.0.36 pkgsrc-2016Q1-base:1.15 pkgsrc-2015Q4:1.15.0.34 pkgsrc-2015Q4-base:1.15 pkgsrc-2015Q3:1.15.0.32 pkgsrc-2015Q3-base:1.15 pkgsrc-2015Q2:1.15.0.30 pkgsrc-2015Q2-base:1.15 pkgsrc-2015Q1:1.15.0.28 pkgsrc-2015Q1-base:1.15 pkgsrc-2014Q4:1.15.0.26 pkgsrc-2014Q4-base:1.15 pkgsrc-2014Q3:1.15.0.24 pkgsrc-2014Q3-base:1.15 pkgsrc-2014Q2:1.15.0.22 pkgsrc-2014Q2-base:1.15 pkgsrc-2014Q1:1.15.0.20 pkgsrc-2014Q1-base:1.15 pkgsrc-2013Q4:1.15.0.18 pkgsrc-2013Q4-base:1.15 pkgsrc-2013Q3:1.15.0.16 pkgsrc-2013Q3-base:1.15 pkgsrc-2013Q2:1.15.0.14 pkgsrc-2013Q2-base:1.15 pkgsrc-2013Q1:1.15.0.12 pkgsrc-2013Q1-base:1.15 pkgsrc-2012Q4:1.15.0.10 pkgsrc-2012Q4-base:1.15 pkgsrc-2012Q3:1.15.0.8 pkgsrc-2012Q3-base:1.15 pkgsrc-2012Q2:1.15.0.6 pkgsrc-2012Q2-base:1.15 pkgsrc-2012Q1:1.15.0.4 pkgsrc-2012Q1-base:1.15 pkgsrc-2011Q4:1.15.0.2 pkgsrc-2011Q4-base:1.15 pkgsrc-2011Q3:1.14.0.6 pkgsrc-2011Q3-base:1.14 pkgsrc-2011Q2:1.14.0.4 pkgsrc-2011Q2-base:1.14 pkgsrc-2011Q1:1.14.0.2 pkgsrc-2011Q1-base:1.14 pkgsrc-2010Q4:1.13.0.4 pkgsrc-2010Q4-base:1.13 pkgsrc-2010Q3:1.13.0.2 pkgsrc-2010Q3-base:1.13 pkgsrc-2010Q2:1.12.0.10 pkgsrc-2010Q2-base:1.12 pkgsrc-2010Q1:1.12.0.8 pkgsrc-2010Q1-base:1.12 pkgsrc-2009Q4:1.12.0.6 pkgsrc-2009Q4-base:1.12 pkgsrc-2009Q3:1.12.0.4 pkgsrc-2009Q3-base:1.12 pkgsrc-2009Q2:1.12.0.2 pkgsrc-2009Q2-base:1.12 pkgsrc-2009Q1:1.11.0.4 pkgsrc-2009Q1-base:1.11 pkgsrc-2008Q4:1.11.0.2 pkgsrc-2008Q4-base:1.11 pkgsrc-2008Q3:1.10.0.12 pkgsrc-2008Q3-base:1.10 cube-native-xorg:1.10.0.10 cube-native-xorg-base:1.10 pkgsrc-2008Q2:1.10.0.8 pkgsrc-2008Q2-base:1.10 pkgsrc-2008Q1:1.10.0.6 pkgsrc-2008Q1-base:1.10 pkgsrc-2007Q4:1.10.0.4 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.10.0.2 pkgsrc-2007Q3-base:1.10 pkgsrc-2007Q2:1.9.0.14 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.12 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.10 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.8 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.6 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.9.0.4 pkgsrc-2006Q1-base:1.9 pkgsrc-2005Q4:1.9.0.2 pkgsrc-2005Q4-base:1.9 pkgsrc-2005Q3:1.7.0.6 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.4 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.2 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.6.0.18 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.16 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.14 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.12 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.10 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.6.0.6 netbsd-1-6-1-base:1.6 netbsd-1-6:1.6.0.8 netbsd-1-6-RELEASE-base:1.6 pkgviews:1.6.0.4 pkgviews-base:1.6 buildlink2:1.6.0.2 buildlink2-base:1.6 netbsd-1-5-PATCH003:1.6 netbsd-1-5-PATCH001:1.6 netbsd-1-3-PATCH003:1.1; locks; strict; comment @# @; 1.16 date 2022.03.25.11.27.33; author wiz; state dead; branches; next 1.15; commitid g3TieXsnzQ3eDAxD; 1.15 date 2011.10.18.10.33.06; author adam; state Exp; branches; next 1.14; 1.14 date 2011.02.11.11.12.15; author adam; state Exp; branches; next 1.13; 1.13 date 2010.07.22.21.10.52; author adam; state Exp; branches; next 1.12; 1.12 date 2009.04.24.10.18.03; author adam; state Exp; branches; next 1.11; 1.11 date 2008.10.16.12.24.09; author adam; state Exp; branches; next 1.10; 1.10 date 2007.09.15.07.35.38; author adam; state dead; branches; next 1.9; 1.9 date 2005.11.18.13.03.53; author rillig; state Exp; branches; next 1.8; 1.8 date 2005.10.26.15.43.08; author adam; state Exp; branches; next 1.7; 1.7 date 2005.01.06.11.52.35; author adam; state dead; branches; next 1.6; 1.6 date 2001.03.10.18.00.51; author wiz; state Exp; branches; next 1.5; 1.5 date 2000.10.20.11.03.38; author abs; state Exp; branches; next 1.4; 1.4 date 98.10.11.20.28.11; author kim; state dead; branches; next 1.3; 1.3 date 98.10.11.20.27.04; author kim; state Exp; branches; next 1.2; 1.2 date 98.10.11.10.25.24; author hubertf; state Exp; branches; next 1.1; 1.1 date 98.08.07.22.42.29; author kim; state Exp; branches; next ; desc @@ 1.16 log @ntop: remove Successor ntopng is already in pkgsrc. Ok adam@@ @ text @$NetBSD: patch-aa,v 1.15 2011/10/18 10:33:06 adam Exp $ --- Makefile.am.orig 2011-03-03 13:44:59.000000000 +0000 +++ Makefile.am @@@@ -328,7 +328,7 @@@@ install: install-recursive install-selinux-policy: chcon -t textrel_shlib_t $(DESTDIR)$(libdir)/*ntop*.so -install-data-local: ntop.txt ntop.html faq.html dnetter +install-data-local: ntop.txt ntop.html faq.html @@$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)/plugins; @@if ! test -d $(DESTDIR)/$(datadir)/ntop; then \ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/ntop; \ @ 1.15 log @Changes 4.1.0: * Unknown @ text @d1 1 a1 1 $NetBSD$ @ 1.14 log @* Install Geo information. * Depend on py-mako, so maps get be generated. * Don't discard badly checksummed packets. * Clean-up. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.13 2010/07/22 21:10:52 adam Exp $ d3 1 a3 1 --- Makefile.am.orig 2010-04-25 12:52:28.000000000 +0000 d5 1 a5 1 @@@@ -336,7 +332,7 @@@@ install: install-recursive @ 1.13 log @Changes 4.0: * Partially rewritten ntop processing engine to address reliability and performance * Several bugs and stability issues fixed * Added better support for IPFIX and NetFlow v9, as well as ntop PEN (Private Enterprise Number) * Added support for Cisco ASA firewalls * Added ntop engine scriptability via the python programming language * Added RRDalarm plugin for generating alerts based on thresholds * Improved google maps integration * Enhanced sFlow support @ text @d1 1 a1 1 $NetBSD$ a4 20 @@@@ -74,9 +74,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 \ @@@@ -157,8 +155,6 @@@@ man_MANS = ntop.8 .PHONY: snapshot -acinclude.m4: acinclude.m4.ntop libtool.m4.in - @@cat acinclude.m4.ntop libtool.m4.in >acinclude.m4 CLEANLIST = `ls -l $(DESTDIR)$(libdir)/*ntop*.so $(DESTDIR)$(libdir)/*Plugin*.so | \ grep -v $(VERSION) | \ @ 1.12 log @Changes 3.3.9: * Bug fixes * Uses GeoIP @ text @d3 1 a3 1 --- Makefile.am.orig 2008-12-03 23:00:22.000000000 +0100 d5 1 a5 1 @@@@ -76,9 +76,7 @@@@ ETTER_PASSIVE_DOWNLOAD_PARMS = "rev=HEAD d16 1 a16 1 @@@@ -159,8 +157,6 @@@@ man_MANS = ntop.8 d25 9 a33 8 @@@@ -270,7 +266,6 @@@@ libclean: install: install-recursive - cd @@GEO_DIR@@; make install @@mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR) @ 1.11 log @Changes 3.3.8: * Bug fixes and improvements. @ text @d3 1 a3 1 --- Makefile.am.orig 2008-10-16 08:40:25.000000000 +0200 d5 12 a16 1 @@@@ -160,8 +160,6 @@@@ man_MANS = ntop.8 d25 8 @ 1.10 log @Changes 3.3: * Improved stability * Ease of use * U3 support and graphical GUI (Win32) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.9 2005/11/18 13:03:53 rillig Exp $ d3 4 a6 35 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 a7 15 -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 d9 2 a10 5 @@@@ -41723,7 +41728,6 @@@@ _ACEOF echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -esac d12 2 a13 2 # Expansion of NTOPCONFIGDEBUG_SETTINGS() if test ".${NTOPCONFIGDEBUG}" = ".yes"; then @ 1.9 log @- Using "gcc -o /dev/null" has led to /dev/null being unlinked on Solaris. Enhanced patch-aa with a work-around. Fixes PR 32089. - Fixed invalid variable names (having dashes instead of underscores). - Added patch-ab, which is the same as patch-aa, except it is intended to be reported upstream. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2005/10/26 15:43:08 adam Exp $ @ 1.8 log @Changes 3.2: * VoIP support * NetFlow v9/IPFIX enhancements * performance boost * more statistics and stability @ text @d1 1 a1 1 $NetBSD$ d3 16 a18 2 --- configure.orig 2005-10-26 16:57:21.000000000 +0200 +++ configure d35 28 @ 1.7 log @ntop is a network traffic probe that shows the network usage, similar to what the popular top Unix command does. ntop is based on libpcap and it has been written in a portable way in order to virtually run on every Unix platform and on Win32 as well. ntop users can use a web browser (e.g. netscape) to navigate through ntop (that acts as a web server) traffic information and get a dump of the network status. In the latter case, ntop can be seen as a simple RMON-like agent with an embedded web interface. The use of: - a web interface - limited configuration and administration via the web interface - reduced CPU and memory usage (they vary according to network size and traffic) make ntop easy to use and suitable for monitoring various kind of networks. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2001/03/10 18:00:51 wiz Exp $ d3 5 a7 4 --- Makefile.in.orig Mon May 3 09:03:10 1999 +++ Makefile.in @@@@ -54,7 +54,7 @@@@ DEFS = @@DEFS@@ d9 12 a20 15 # Standard CFLAGS -CFLAGS = $(CCOPT) $(DEFS) @@G_THREAD_CFLAGS@@ @@LSOF_DEFS@@ @@OS_DEFS@@ $(INCLS) +CFLAGS = $(CCOPT) $(DEFS) @@G_THREAD_CFLAGS@@ @@LSOF_DEFS@@ @@OS_DEFS@@ $(INCLS) $(CPPFLAGS) # Standard LDFLAGS LDFLAGS = @@LDFLAGS@@ @@@@ -105,7 +105,7 @@@@ report.c: ntop.h install: - $(INSTALL) -m 6550 $(PROG) $(DESTDIR)$(BINDEST)/$(PROG) + $(INSTALL) -m 555 $(PROG) $(DESTDIR)$(BINDEST)/$(PROG) install-man: $(INSTALL) -m 444 $(PROG).8 $(DESTDIR)$(MANDEST)/man8/$(PROG).8 @ 1.6 log @Since ntop isn't set?id anymore, make it work even if you're not root, but have sufficient permissions on /dev/bpf. Shuffle lines around so that error output in case of insufficient permissions happens before curses are initialized. Install it mode 555 instead of 550. Closes pkg/6761. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2000/10/20 11:03:38 abs Exp $ @ 1.5 log @Update to 1.1nb1 - avoid possible format string crash with -i '...%s...'. No known security issues as not installed set{u,g}id @ text @d1 1 a1 1 $NetBSD$ d19 1 a19 1 + $(INSTALL) -m 550 $(PROG) $(DESTDIR)$(BINDEST)/$(PROG) @ 1.4 log @This patch no longer needed (fixed with LDFLAGS). @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 1998/10/11 20:27:04 kim Exp $ d3 10 a12 3 --- Makefile.in.orig Tue Oct 6 11:27:31 1998 +++ Makefile.in Sun Oct 11 15:00:45 1998 @@@@ -48,6 +48,7 @@@@ d14 2 d17 3 a19 3 # Standard LIBS +#LIBS = @@LIBS@@ -L${prefix}/lib -lncurses LIBS = @@LIBS@@ d21 2 a22 1 INSTALL = @@INSTALL@@ @ 1.3 log @Updated ntop to 1.0 @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Actually use ncurses so this links. @ text @d3 4 a6 4 --- Makefile.in.orig Mon Aug 3 12:43:38 1998 +++ Makefile.in Sat Oct 10 22:06:42 1998 @@@@ -48,7 +48,7 @@@@ LDFLAGS = @@LDFLAGS@@ -L/usr/5lib d9 2 a10 2 -LIBS = @@LIBS@@ +LIBS = @@LIBS@@ -L${PREFIX}/lib -lncurses a12 25 @@@@ -76,6 +76,8 @@@@ CLEANFILES = $(PROG) $(OBJ) $(GENSRC) +all: $(PROG) + $(PROG): $(OBJ) @@V_PCAPDEP@@ @@rm -f $@@ $(CC) $(CFLAGS) $(LDFLAGS) -o $@@ $(OBJ) $(LIBS) @@@@ -90,12 +92,8 @@@@ rm -f OS.NAME install: force - $(INSTALL) -m 6111 -o root -g sys $(PROG) $(DESTDIR)$(BINDEST)/$(PROG) - chmod gou+s $(DESTDIR)$(BINDEST)/$(PROG) - -install-man: force - $(INSTALL) -m 444 -o bin -g bin $(PROG).8 \ - $(DESTDIR)$(MANDEST)/man8/$(PROG).8 + $(INSTALL) -m 6550 $(PROG) $(DESTDIR)$(BINDEST)/$(PROG) + $(INSTALL) -m 444 $(PROG).8 $(DESTDIR)$(MANDEST)/man8/$(PROG).8 lint: $(GENSRC) force lint -hbxn $(SRC) | \ @ 1.1 log @Adding ntop, "network top", v0.4 @ text @d3 11 a13 2 --- Makefile.in.orig Mon Aug 3 06:43:38 1998 +++ Makefile.in Fri Aug 7 18:22:37 1998 @