head 1.25; access; symbols pkgsrc-2021Q4:1.24.0.46 pkgsrc-2021Q4-base:1.24 pkgsrc-2021Q3:1.24.0.44 pkgsrc-2021Q3-base:1.24 pkgsrc-2021Q2:1.24.0.42 pkgsrc-2021Q2-base:1.24 pkgsrc-2021Q1:1.24.0.40 pkgsrc-2021Q1-base:1.24 pkgsrc-2020Q4:1.24.0.38 pkgsrc-2020Q4-base:1.24 pkgsrc-2020Q3:1.24.0.36 pkgsrc-2020Q3-base:1.24 pkgsrc-2020Q2:1.24.0.32 pkgsrc-2020Q2-base:1.24 pkgsrc-2020Q1:1.24.0.12 pkgsrc-2020Q1-base:1.24 pkgsrc-2019Q4:1.24.0.34 pkgsrc-2019Q4-base:1.24 pkgsrc-2019Q3:1.24.0.30 pkgsrc-2019Q3-base:1.24 pkgsrc-2019Q2:1.24.0.28 pkgsrc-2019Q2-base:1.24 pkgsrc-2019Q1:1.24.0.26 pkgsrc-2019Q1-base:1.24 pkgsrc-2018Q4:1.24.0.24 pkgsrc-2018Q4-base:1.24 pkgsrc-2018Q3:1.24.0.22 pkgsrc-2018Q3-base:1.24 pkgsrc-2018Q2:1.24.0.20 pkgsrc-2018Q2-base:1.24 pkgsrc-2018Q1:1.24.0.18 pkgsrc-2018Q1-base:1.24 pkgsrc-2017Q4:1.24.0.16 pkgsrc-2017Q4-base:1.24 pkgsrc-2017Q3:1.24.0.14 pkgsrc-2017Q3-base:1.24 pkgsrc-2017Q2:1.24.0.10 pkgsrc-2017Q2-base:1.24 pkgsrc-2017Q1:1.24.0.8 pkgsrc-2017Q1-base:1.24 pkgsrc-2016Q4:1.24.0.6 pkgsrc-2016Q4-base:1.24 pkgsrc-2016Q3:1.24.0.4 pkgsrc-2016Q3-base:1.24 pkgsrc-2016Q2:1.24.0.2 pkgsrc-2016Q2-base:1.24 pkgsrc-2016Q1:1.23.0.26 pkgsrc-2016Q1-base:1.23 pkgsrc-2015Q4:1.23.0.24 pkgsrc-2015Q4-base:1.23 pkgsrc-2015Q3:1.23.0.22 pkgsrc-2015Q3-base:1.23 pkgsrc-2015Q2:1.23.0.20 pkgsrc-2015Q2-base:1.23 pkgsrc-2015Q1:1.23.0.18 pkgsrc-2015Q1-base:1.23 pkgsrc-2014Q4:1.23.0.16 pkgsrc-2014Q4-base:1.23 pkgsrc-2014Q3:1.23.0.14 pkgsrc-2014Q3-base:1.23 pkgsrc-2014Q2:1.23.0.12 pkgsrc-2014Q2-base:1.23 pkgsrc-2014Q1:1.23.0.10 pkgsrc-2014Q1-base:1.23 pkgsrc-2013Q4:1.23.0.8 pkgsrc-2013Q4-base:1.23 pkgsrc-2013Q3:1.23.0.6 pkgsrc-2013Q3-base:1.23 pkgsrc-2013Q2:1.23.0.4 pkgsrc-2013Q2-base:1.23 pkgsrc-2013Q1:1.23.0.2 pkgsrc-2013Q1-base:1.23 pkgsrc-2012Q4:1.21.0.10 pkgsrc-2012Q4-base:1.21 pkgsrc-2012Q3:1.21.0.8 pkgsrc-2012Q3-base:1.21 pkgsrc-2012Q2:1.21.0.6 pkgsrc-2012Q2-base:1.21 pkgsrc-2012Q1:1.21.0.4 pkgsrc-2012Q1-base:1.21 pkgsrc-2011Q4:1.21.0.2 pkgsrc-2011Q4-base:1.21 pkgsrc-2011Q3:1.20.0.6 pkgsrc-2011Q3-base:1.20 pkgsrc-2011Q2:1.20.0.4 pkgsrc-2011Q2-base:1.20 pkgsrc-2011Q1:1.20.0.2 pkgsrc-2011Q1-base:1.20 pkgsrc-2010Q4:1.18.0.4 pkgsrc-2010Q4-base:1.18 pkgsrc-2010Q3:1.18.0.2 pkgsrc-2010Q3-base:1.18 pkgsrc-2010Q2:1.17.0.8 pkgsrc-2010Q2-base:1.17 pkgsrc-2010Q1:1.17.0.6 pkgsrc-2010Q1-base:1.17 pkgsrc-2009Q4:1.17.0.4 pkgsrc-2009Q4-base:1.17 pkgsrc-2009Q3:1.17.0.2 pkgsrc-2009Q3-base:1.17 pkgsrc-2009Q2:1.16.0.2 pkgsrc-2009Q2-base:1.16 pkgsrc-2009Q1:1.14.0.2 pkgsrc-2009Q1-base:1.14 pkgsrc-2008Q4:1.13.0.2 pkgsrc-2008Q4-base:1.13 pkgsrc-2008Q3:1.12.0.14 pkgsrc-2008Q3-base:1.12 cube-native-xorg:1.12.0.12 cube-native-xorg-base:1.12 pkgsrc-2008Q2:1.12.0.10 pkgsrc-2008Q2-base:1.12 cwrapper:1.12.0.8 pkgsrc-2008Q1:1.12.0.6 pkgsrc-2008Q1-base:1.12 pkgsrc-2007Q4:1.12.0.4 pkgsrc-2007Q4-base:1.12 pkgsrc-2007Q3:1.12.0.2 pkgsrc-2007Q3-base:1.12 pkgsrc-2007Q2:1.11.0.14 pkgsrc-2007Q2-base:1.11 pkgsrc-2007Q1:1.11.0.12 pkgsrc-2007Q1-base:1.11 pkgsrc-2006Q4:1.11.0.10 pkgsrc-2006Q4-base:1.11 pkgsrc-2006Q3:1.11.0.8 pkgsrc-2006Q3-base:1.11 pkgsrc-2006Q2:1.11.0.6 pkgsrc-2006Q2-base:1.11 pkgsrc-2006Q1:1.11.0.4 pkgsrc-2006Q1-base:1.11 pkgsrc-2005Q4:1.11.0.2 pkgsrc-2005Q4-base:1.11 pkgsrc-2005Q3:1.10.0.6 pkgsrc-2005Q3-base:1.10 pkgsrc-2005Q2:1.10.0.4 pkgsrc-2005Q2-base:1.10 pkgsrc-2005Q1:1.10.0.2 pkgsrc-2005Q1-base:1.10 pkgsrc-2004Q4:1.9.0.18 pkgsrc-2004Q4-base:1.9 pkgsrc-2004Q3:1.9.0.16 pkgsrc-2004Q3-base:1.9 pkgsrc-2004Q2:1.9.0.14 pkgsrc-2004Q2-base:1.9 pkgsrc-2004Q1:1.9.0.12 pkgsrc-2004Q1-base:1.9 pkgsrc-2003Q4:1.9.0.10 pkgsrc-2003Q4-base:1.9 netbsd-1-6-1:1.9.0.6 netbsd-1-6-1-base:1.9 netbsd-1-6:1.9.0.8 netbsd-1-6-RELEASE-base:1.9 pkgviews:1.9.0.4 pkgviews-base:1.9 buildlink2:1.9.0.2 buildlink2-base:1.9 netbsd-1-5-PATCH003:1.9 netbsd-1-5-PATCH001:1.9 netbsd-1-4-PATCH002:1.6 comdex-fall-1999:1.6 netbsd-1-4-PATCH001:1.6 netbsd-1-4-RELEASE:1.6 netbsd-1-3-PATCH003:1.2; locks; strict; comment @# @; 1.25 date 2022.03.25.11.27.33; author wiz; state dead; branches; next 1.24; commitid g3TieXsnzQ3eDAxD; 1.24 date 2016.06.19.05.55.57; author markd; state Exp; branches; next 1.23; commitid rBECFYval9Pvs2bz; 1.23 date 2013.02.18.08.41.34; author markd; state Exp; branches; next 1.22; 1.22 date 2013.01.25.11.59.13; author jperkin; state Exp; branches; next 1.21; 1.21 date 2011.10.18.10.33.06; author adam; state Exp; branches; next 1.20; 1.20 date 2011.02.11.11.12.15; author adam; state Exp; branches; next 1.19; 1.19 date 2011.02.09.08.37.10; author adam; state Exp; branches; next 1.18; 1.18 date 2010.07.22.21.10.52; author adam; state Exp; branches; next 1.17; 1.17 date 2009.07.21.19.17.53; author hasso; state Exp; branches; next 1.16; 1.16 date 2009.05.25.09.03.15; author adam; state Exp; branches; next 1.15; 1.15 date 2009.04.24.10.18.04; author adam; state Exp; branches; next 1.14; 1.14 date 2009.01.09.08.53.26; author dbj; state Exp; branches; next 1.13; 1.13 date 2008.10.16.12.24.09; author adam; state Exp; branches; next 1.12; 1.12 date 2007.09.15.07.35.38; author adam; state Exp; branches; next 1.11; 1.11 date 2005.11.18.13.03.53; author rillig; state Exp; branches; next 1.10; 1.10 date 2005.01.06.11.52.35; author adam; state dead; branches; next 1.9; 1.9 date 2001.03.10.18.00.51; author wiz; state Exp; branches; next 1.8; 1.8 date 2000.10.20.11.03.38; author abs; state Exp; branches; next 1.7; 1.7 date 2000.09.19.20.00.04; author agc; state dead; branches; next 1.6; 1.6 date 98.12.28.22.49.21; author marc; state Exp; branches; next 1.5; 1.5 date 98.12.01.13.50.44; author hwr; state Exp; branches; next 1.4; 1.4 date 98.10.13.03.46.07; author kim; state Exp; 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.08.08.21.28.32; author kim; state Exp; branches; next 1.1; 1.1 date 98.08.07.22.42.29; author kim; state Exp; branches; next ; desc @@ 1.25 log @ntop: remove Successor ntopng is already in pkgsrc. Ok adam@@ @ text @$NetBSD: patch-ab,v 1.24 2016/06/19 05:55:57 markd Exp $ * First two chunks: automake-1.13 compatability. Latest rrdtool doesnt have separate librrd_th --- configure.in.orig 2011-08-15 08:34:28.000000000 +0000 +++ configure.in @@@@ -56,7 +56,7 @@@@ dnl> dnl> generate the config header dnl> umask 002 -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) HAS_ERROR= HAS_WARNING= @@@@ -324,7 +324,7 @@@@ dnl> echo echo "Checking C compiler program and features..." echo -AM_PROG_CC_STDC +AC_PROG_CC if test ".${ac_cv_prog_cc_stdc}" = ".no"; then echo echo "*******************************************************************" @@@@ -395,6 +395,19 @@@@ 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}" + ;; + *-*-dragonfly*:* ) + DEFINEOS="DRAGONFLY" + echo "* This appears to be ${DEFINEOS}" + ;; + * ) echo "* ${target} is an unknown/unsupported OS" echo "*" @@@@ -554,8 +567,8 @@@@ if test ".${PCAPRING_DIR}" != .; then else if test ".${PCAP_ROOT}" != .; then if test -d $PCAP_ROOT && - test -r $PCAP_ROOT/libpcap.a && - test -r $PCAP_ROOT/pcap.h; then + test -r $PCAP_ROOT/lib/libpcap.a -o -r $PCAP_ROOT/lib/libpcap.dylib && + test -r $PCAP_ROOT/include/pcap.h; then PCAP_ROOT=`cd ${PCAP_ROOT} && pwd` CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap" INCS="${INCS} -I$PCAP_ROOT" @@@@ -876,19 +889,19 @@@@ else fi fi -RRD_LIB="-L${RRD_HOME}/lib -lrrd_th" +RRD_LIB="-L${RRD_HOME}/lib -lrrd" -if test -f "$RRD_HOME/lib/librrd_th.so"; then +if test -f "$RRD_HOME/lib/librrd.so"; then AC_MSG_RESULT(checking for rrdtool... yes) else - if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX + if test -f "$RRD_HOME/lib/librrd.dylib"; then # OSX AC_MSG_RESULT(checking for rrdtool... yes) else - if test -f "$RRD_HOME/lib/librrd_th.a"; then + if test -f "$RRD_HOME/lib/librrd.a"; then AC_MSG_RESULT(checking for rrdtool... yes) else - AC_CHECK_LIB([rrd_th], [main]) - if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then + AC_CHECK_LIB([rrd], [main]) + if test ".${ac_cv_lib_rrd_main}" != ".yes"; then AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR); AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/); else @@@@ -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 . - else - wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz fi gunzip GeoLiteCity.dat.gz @@@@ -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 . - else - wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz fi gunzip GeoIPASNum.dat.gz @ 1.24 log @Build with latest rrdtool. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.23 2013/02/18 08:41:34 markd Exp $ @ 1.23 log @fix path in patchfile. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.22 2013/01/25 11:59:13 jperkin Exp $ d5 2 d58 26 @ 1.22 log @automake-1.13 compatability. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.21 2011/10/18 10:33:06 adam Exp $ d5 2 a6 2 --- /home/pbulk/build/upstream-trunk32/net/ntop/work/ntop-4.1.0/configure.in.orig 2011-08-15 08:34:28.000000000 +0000 +++ /home/pbulk/build/upstream-trunk32/net/ntop/work/ntop-4.1.0/configure.in @ 1.21 log @Changes 4.1.0: * Unknown @ text @d1 1 a1 1 $NetBSD$ d3 22 a24 2 --- configure.in.orig 2011-08-15 08:34:28.000000000 +0000 +++ configure.in @ 1.20 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-ab,v 1.19 2011/02/09 08:37:10 adam Exp $ d3 1 a3 1 --- configure.in.orig 2010-10-24 10:01:01.000000000 +0000 d5 1 a5 1 @@@@ -437,6 +437,19 @@@@ case "${target}:${CC}" in d25 1 a25 1 @@@@ -596,8 +609,8 @@@@ if test ".${PCAPRING_DIR}" != .; then d36 1 a36 1 @@@@ -1829,8 +1842,6 @@@@ if test -f "GeoLiteCity.dat"; then d45 1 a45 1 @@@@ -1843,8 +1852,6 @@@@ if test -f "GeoIPASNum.dat"; then @ 1.19 log @Changes 4.0.3: This is a bug fix release. @ text @d1 1 a1 1 $NetBSD$ d36 1 a36 1 @@@@ -1829,11 +1842,7 @@@@ if test -f "GeoLiteCity.dat"; then a42 3 - - gunzip GeoLiteCity.dat.gz fi d44 2 a45 2 dnl> -------- @@@@ -1843,11 +1852,8 @@@@ if test -f "GeoIPASNum.dat"; then d53 1 a53 4 - gunzip GeoIPASNum.dat.gz fi else AC_MSG_RESULT(Please install GeoIP (http://www.maxmind.com/)) @ 1.18 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 @d3 1 a3 1 --- configure.in.orig 2010-07-19 16:50:08.000000000 +0000 d5 1 a5 1 @@@@ -423,6 +423,19 @@@@ case "${target}:${CC}" in d25 1 a25 1 @@@@ -582,8 +595,8 @@@@ if test ".${PCAPRING_DIR}" != .; then d36 2 a37 1 @@@@ -1816,10 +1829,7 @@@@ else d40 1 a40 1 else d48 2 a49 1 @@@@ -1830,10 +1840,8 @@@@ else d52 1 a52 1 else @ 1.17 log @Make it build on DragonFly. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.16 2009/05/25 09:03:15 adam Exp $ d3 3 a5 3 --- configure.in.orig 2009-05-06 17:55:22 +0300 +++ configure.in 2009-07-21 21:19:57 +0300 @@@@ -431,6 +431,19 @@@@ case "${target}:${CC}" in d25 1 a25 1 @@@@ -621,8 +634,8 @@@@ if test ".${PCAPRING_DIR}" != .; then d36 6 a41 12 @@@@ -1656,18 +1669,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 -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 .. d43 1 a43 21 -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 +1971,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 -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 . d46 7 a52 6 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 a53 4 if test -f "GeoIPASNum.dat"; then echo "GeoIPASNum.dat already present" else - wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz d56 2 a57 10 -GEO_DIR=`find $PWD -type d -name "GeoIP-*"` -GEO_IP="$GEO_DIR/libGeoIP/" -CFLAGS="$CFLAGS -I$GEO_IP" -LDFLAGS="-L$GEO_IP.libs/ -lGeoIP $LDFLAGS" +LDFLAGS="-lGeoIP $LDFLAGS" dnl> NTOPCONFIGDEBUG_SETTINGS([precet]) @ 1.16 log @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. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- configure.in.orig 2009-05-06 16:55:22.000000000 +0200 +++ configure.in @@@@ -431,6 +431,15 @@@@ case "${target}:${CC}" in d17 4 d25 1 a25 1 @@@@ -621,8 +630,8 @@@@ if test ".${PCAPRING_DIR}" != .; then d36 1 a36 1 @@@@ -1656,18 +1665,10 @@@@ LUA_VERSION=lua-5.1.4 d57 1 a57 1 @@@@ -1966,36 +1967,20 @@@@ dnl> GeoIP (http://www.maxmind.com/) @ 1.15 log @Changes 3.3.9: * Bug fixes * Uses GeoIP @ text @d3 1 a3 1 --- configure.in.orig 2008-12-03 23:00:22.000000000 +0100 d5 1 a5 1 @@@@ -428,6 +428,15 @@@@ case "${target}:${CC}" in d21 2 a22 2 @@@@ -573,8 +582,8 @@@@ dnl> user defined directory passed as op dnl> d32 5 a36 1 @@@@ -1887,39 +1896,19 @@@@ else d39 18 a56 4 dnl> GeoIP (http://www.maxmind.com/) -if test -f "GeoIP.tar.gz"; then - echo "GeoIP already present on this machine" -else a57 8 - 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 d59 8 d86 2 a87 2 -LDFLAGS="$LDFLAGS -L$GEO_IP.libs/ -lGeoIP" +LDFLAGS="$LDFLAGS -lGeoIP" @ 1.14 log @fixes to compile and run on darwin. . modify configure.in to look for libpcap.dylib . set INSTALL_UNSTRIPPED=yes @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.13 2008/10/16 12:24:09 adam Exp $ d3 1 a3 1 --- configure.in.orig 2008-10-02 12:54:15.000000000 +0200 d32 41 @ 1.13 log @Changes 3.3.8: * Bug fixes and improvements. @ text @d1 1 a1 1 $NetBSD$ d27 1 a27 1 + test -r $PCAP_ROOT/lib/libpcap.a && @ 1.12 log @Changes 3.3: * Improved stability * Ease of use * U3 support and graphical GUI (Win32) @ text @d3 1 a3 1 --- configure.in.orig 2007-06-09 23:30:00.000000000 +0200 d5 1 a5 1 @@@@ -432,6 +432,15 @@@@ case "${target}:${CC}" in d21 1 a21 1 @@@@ -577,8 +586,8 @@@@ dnl> user defined directory passed as op @ 1.11 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 @d3 5 a7 43 The "gcc -o /dev/null" led to /dev/null be unlinked on Solaris. This patch does not affect the build and is only intended to be reported upstream. --- configure.in.orig Thu Oct 20 22:07:37 2005 +++ configure.in Fri Nov 18 13:56:53 2005 @@@@ -715,8 +715,8 @@@@ AC_ARG_ENABLE(i18n, AC_ARG_ENABLE(jumbo-frames, [ --enable-jumbo-frames Enable Jumbo (9K) Ethernet frames [[default=disabled]]], - ac_enable_jumbo-frames="yes", - ac_enable_jumbo-frames="no") + ac_enable_jumbo_frames="yes", + ac_enable_jumbo_frames="no") AC_ARG_ENABLE(ipv6, [ --disable-ipv6 use IPv6 [[default=enabled]]], @@@@ -1988,16 +1988,12 @@@@ AC_CHECK_FUNCS([uname]) dnl> Test for strtok_r (we have our own defn if it's not available)C_CHECK_FUNCS([strtok_r]) AC_CHECK_FUNCS([strtok_r]) -case "${CC}" in - *gcc* ) dnl> Check if malloc.h has mallinfo... AC_MSG_CHECKING([for mallinfo in malloc.h]) AC_LANG_CONFTEST( [AC_LANG_PROGRAM([[#include ]], [[struct mallinfo memStats = mallinfo();]])]) - gcc conftest.c -o /dev/null > /dev/null 2> /dev/null - rc=$? - if test ".${rc}" = ".0"; then + if (eval "$ac_link"); then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_MALLINFO_MALLOC_H, 1, @@@@ -2005,7 +2001,6 @@@@ case "${CC}" in else AC_MSG_RESULT(no) fi -esac NTOPCONFIGDEBUG_SETTINGS([After all tests]) d9 23 @ 1.10 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-ab,v 1.9 2001/03/10 18:00:51 wiz Exp $ d3 41 a43 49 --- ntop.c.orig Wed Apr 28 19:49:00 1999 +++ ntop.c @@@@ -254,7 +254,7 @@@@ initIPServices(); #ifndef WIN32 - while ((op = getopt(argc, argv, "df:F:hr:i:p:l:nw:m:")) != EOF) + while ((op = getopt(argc, argv, "df:F:hr:i:p:l:nm:")) != EOF) switch (op) { #ifndef WIN32 @@@@ -324,6 +324,7 @@@@ numericFlag++; break; +#if 0 case 'w': if(!isdigit(optarg[0])) { printf("FATAL ERROR: flag -w expects a numeric argument.\n"); @@@@ -332,6 +333,7 @@@@ webMode++; webPort = atoi(optarg); break; +#endif default: usage(0); @@@@ -348,11 +350,6 @@@@ #endif #ifndef WIN32 - if((rFileName == NULL) && (getuid () && geteuid ()) || setuid (0)) { - printf("Sorry, you must be superuser in order to run ntop.\n"); - return(-1); - } - if(daemonMode && (!webMode)) { printf("WARNING: -d is incompatible with interactive mode.\n"); } else if(daemonMode) @@@@ -392,13 +389,30 @@@@ #ifndef WIN32 /* Determine the device name if not specified */ if (device == NULL && (device = pcap_lookupdev(ebuf)) == NULL) { - printf(ebuf); + printf("%s\n", ebuf); return(-1); } getLocalHostAddress(&localHostAddress, device); d45 1 a45 53 if(rFileName == NULL) { + /* Fire up libpcap */ + pcapPtr = pcap_open_live(device, DEFAULT_SNAPLEN, !pflag, 1000, ebuf); + } else { + pcapPtr = pcap_open_offline(rFileName, ebuf); + } + + if (pcapPtr == NULL) { + printf("%s\n", ebuf); + return(-1); + } + + if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) { + printf("%s\n", ebuf); + return(-1); + } + + if(rFileName == NULL) { if(webMode) { (void)fprintf(stderr, "ntop v.%s %s [%s]" #ifndef WIN32 @@@@ -418,21 +432,6 @@@@ init_curses(); } #endif - - /* Fire up libpcap */ - pcapPtr = pcap_open_live(device, DEFAULT_SNAPLEN, !pflag, 1000, ebuf); - } else { - pcapPtr = pcap_open_offline(rFileName, ebuf); - } - - if (pcapPtr == NULL) { - printf(ebuf); - return(-1); - } - - if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) { - printf(ebuf); - return(-1); } #else /* WIN32 */ printf("ntop v.%s %s [%s]" @@@@ -458,12 +457,6 @@@@ free(localAddresses); localAddresses = NULL; } - -#ifndef WIN32 - /* Now that the socket is open, throw away potential setuid/setgid */ - (void)setgid(getgid()); - (void)setuid(getuid()); -#endif a46 2 #ifndef WIN32 /* get datalink type */ @ 1.9 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$ @ 1.8 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 @d3 1 a3 1 --- ntop.c.orig Wed Apr 28 18:49:00 1999 d30 13 a42 1 @@@@ -392,7 +394,7 @@@@ d47 1 a47 1 + printf("%s", ebuf); d51 1 a51 2 @@@@ -426,12 +428,12 @@@@ } d53 33 a85 1 if (pcapPtr == NULL) { d87 4 a90 5 + printf("%s", ebuf); return(-1); } if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) { d92 1 a92 2 + printf("%s", ebuf); return(-1); d95 14 @ 1.7 log @Install the binary for this package as mode 550, and disable the -w option, to avoid any compromises due to reported buffer overflow exploits, reported in ntop<=1.0 remote-root-shell http://www.securityfocus.com/advisories/2520 Also, upgrade to 1.1 on the distribution site, as the old distfile is no longer there, and 1.1 incorporates all the old patches in the pkgsrc version bar one minor one (passing CPPFLAGS into Makefile.in for the build environment). @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 1998/12/28 22:49:21 marc Exp $ d3 23 a25 8 --- ntop.h.orig Mon Oct 5 12:18:41 1998 +++ ntop.h Mon Oct 12 22:44:29 1998 @@@@ -87,8 +87,20 @@@@ #include #include #include +#ifdef HAVE_ETHERTYPE_H #include a26 11 #include + +#ifndef ETHERTYPE_DN +#define ETHERTYPE_DN 0x6003 +#endif +#ifndef ETHERTYPE_ATALK +#define ETHERTYPE_ATALK 0x809b +#endif +#ifndef ETHERTYPE_AARP +#define ETHERTYPE_AARP 0x80f3 +#endif d28 26 a53 2 #include "interface.h" #include "setsignal.h" @ 1.6 log @fix an error in 1.5: the patch was malformed. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.5 1998/12/01 13:50:44 hwr Exp $ @ 1.5 log @Fixes PR6513 by . XXX this should be changed to include in post 1.3.2 worlds. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 1998/10/13 03:46:07 kim Exp $ d5 1 a5 1 @@@@ -87,8 +87,17 @@@@ @ 1.4 log @Our includes , so I shouldn't include it separately. Avoid using a configure check. @ text @d1 1 a1 1 $NetBSD$ d20 3 @ 1.3 log @Updated ntop to 1.0 @ text @d4 2 a5 2 +++ ntop.h Sun Oct 11 15:56:17 1998 @@@@ -87,8 +87,19 @@@@ d9 1 a9 3 +#ifdef __NetBSD__ +#include +#else /* __NetBSD__ */ d11 1 a11 1 +#endif /* __NetBSD__ */ @ 1.2 log @The logic for determining the local domain was wrong. Using gethostname(3) instead (could use gethostbyname(3) on top of that, I guess...). @ text @d3 3 a5 21 --- ntop.h.orig Fri Jul 31 12:31:45 1998 +++ ntop.h Sat Aug 8 17:19:25 1998 @@@@ -16,9 +16,16 @@@@ #endif #include -#include "sn_curses.h" +#ifdef HAVE_NCURSES_H +#include +#else +#ifdef HAVE_CURSES_H +#invlude +#endif +#endif #include #include +#include #include #include #include @@@@ -38,7 +45,6 @@@@ d9 5 a13 1 -#include d15 7 a21 1 #include d23 2 @ 1.1 log @Adding ntop, "network top", v0.4 @ text @d4 2 a5 2 +++ ntop.h Fri Aug 7 18:07:14 1998 @@@@ -16,7 +16,13 @@@@ d19 1 d21 3 a23 1 @@@@ -38,7 +44,6 @@@@ @