Unitas Network GmbH version of ntop (5.0.2) (experimental)
This commit is contained in:
Matthias Drobny
parent
bff3066113
commit
44563632e1
|
|
@ -0,0 +1,492 @@
|
|||
# ChangeLog for net-analyzer/ntop
|
||||
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.122 2015/04/08 18:01:21 mgorny Exp $
|
||||
|
||||
22 Sep 2015; Matthias Drobny <mdrobny@unitas-network.de> ntop-5.0.2-r1.ebuild,
|
||||
Non-maintainer commit: +files/fix-doubleValuesInTrafficData-report.patch
|
||||
|
||||
30 Jul 2015; Jörg Deckert <jdeckert@unitas-network.de> ntop-5.0.2.ebuild,
|
||||
Non-maintainer commit: +files/load_protos_file.patch
|
||||
|
||||
08 Apr 2015; Michał Górny <mgorny@gentoo.org> ntop-5.0.1-r1.ebuild:
|
||||
Drop old Python implementations
|
||||
|
||||
02 Feb 2015; Jeroen Roovers <jer@gentoo.org> ntop-4.0.3.ebuild,
|
||||
ntop-4.1.0.ebuild, ntop-5.0.1-r1.ebuild:
|
||||
Fix LICENSE.
|
||||
|
||||
16 Jul 2014; Jeroen Roovers <jer@gentoo.org> ntop-5.0.1-r1.ebuild,
|
||||
+files/ntop-5.0.1-INCS.patch, +files/ntop-5.0.1-includes.patch:
|
||||
Fix missing includes for standard functions. Stop running autotools in
|
||||
src_install(). Use python-config --includes, not --cflags. Do not "clean up"
|
||||
INCS (INCLUDES).
|
||||
|
||||
15 Jul 2014; Jeroen Roovers <jer@gentoo.org> files/ntop-4.0.3-gentoo.patch,
|
||||
files/ntop-4.1.0-gentoo.patch, files/ntop-5.0.1-gentoo.patch:
|
||||
Clean up patches.
|
||||
|
||||
15 Jul 2014; Jeroen Roovers <jer@gentoo.org> ntop-4.0.3.ebuild,
|
||||
ntop-4.1.0.ebuild, ntop-5.0.1-r1.ebuild:
|
||||
Set USE=graph dependency on net-analyzer/rrdtool (bug #509682).
|
||||
|
||||
*ntop-5.0.1-r1 (06 Aug 2013)
|
||||
|
||||
06 Aug 2013; Lars Wendler <polynomial-c@gentoo.org> -ntop-5.0.1.ebuild,
|
||||
+ntop-5.0.1-r1.ebuild, +files/ntop-initd-r1:
|
||||
Non-maintainer commit: Revbump to make use of rewritten init script.
|
||||
|
||||
*ntop-5.0.1 (04 Jul 2013)
|
||||
|
||||
04 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> -ntop-4.0.1.ebuild,
|
||||
+ntop-5.0.1.ebuild, -files/ntop-4.0.1-gentoo.patch,
|
||||
+files/ntop-5.0.1-gentoo.patch:
|
||||
Non-maintainer commit: Version bump (fixes bug #430428). Removed old.
|
||||
|
||||
10 Mar 2013; Christoph Junghans <ottxor@gentoo.org> ntop-4.0.1.ebuild,
|
||||
ntop-4.0.3.ebuild, ntop-4.1.0.ebuild:
|
||||
switch to virtual/awk (bug #455664)
|
||||
|
||||
10 Feb 2013; Pacho Ramos <pacho@gentoo.org> ntop-4.1.0.ebuild:
|
||||
Drop gdome2 dep, #415743
|
||||
|
||||
13 Dec 2012; Sergey Popov <pinkbyte@gentoo.org> ntop-4.1.0.ebuild:
|
||||
Add dev-python/mako to runtime deps, wrt bug #410255
|
||||
|
||||
12 Jun 2012; Zac Medico <zmedico@gentoo.org> ntop-4.0.1.ebuild,
|
||||
ntop-4.0.3.ebuild, ntop-4.1.0.ebuild:
|
||||
inherit user for enewgroup and enewuser
|
||||
|
||||
06 Apr 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
|
||||
Drop maintainer due retirement, bug #63588
|
||||
|
||||
06 Jan 2012; Mark Loeser <halcy0n@gentoo.org> ntop-4.0.3.ebuild:
|
||||
Stable for ppc/ppc64; bug #382091
|
||||
|
||||
*ntop-4.1.0 (08 Nov 2011)
|
||||
|
||||
08 Nov 2011; Alin Năstac <mrness@gentoo.org> +ntop-4.1.0.ebuild,
|
||||
+files/ntop-4.1.0-gentoo.patch:
|
||||
Version bump with added snmp support (#378333). Drop ipv6 USE flag (no longer
|
||||
possible to disable IPv6 support). Remove static libraries (#382093).
|
||||
|
||||
11 Oct 2011; Jeroen Roovers <jer@gentoo.org> ntop-4.0.3.ebuild:
|
||||
Stable for HPPA (bug #382091).
|
||||
|
||||
09 Oct 2011; Raúl Porcel <armin76@gentoo.org> ntop-4.0.3.ebuild:
|
||||
ia64/s390/sh/sparc stable wrt #382091
|
||||
|
||||
18 Sep 2011; Markus Meier <maekke@gentoo.org> ntop-4.0.3.ebuild:
|
||||
arm stable, bug #382091
|
||||
|
||||
11 Sep 2011; Christian Ruppert <idl0r@gentoo.org> ntop-4.0.3.ebuild:
|
||||
Fix HOMEPAGE.
|
||||
|
||||
11 Sep 2011; Markus Meier <maekke@gentoo.org> ntop-4.0.3.ebuild:
|
||||
x86 stable, bug #382091
|
||||
|
||||
07 Sep 2011; Tony Vroon <chainsaw@gentoo.org> ntop-4.0.3.ebuild:
|
||||
Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El
|
||||
Lazkani & Tomáš "Mepho" Pružina in bug #382091 filed by Markos "hwoarang"
|
||||
Chandras.
|
||||
|
||||
10 Aug 2011; Lars Wendler <polynomial-c@gentoo.org>
|
||||
files/ntop-4.0.3-gentoo.patch:
|
||||
non-maintainer commit: Added missing gunzip line for GeoIPASNum.dat file (bug
|
||||
#376453). Fixed patch committed with kind permission from hwoarang.
|
||||
|
||||
07 Aug 2011; Jeroen Roovers <jer@gentoo.org> -ntop-3.3.10-r2.ebuild,
|
||||
-files/ntop-3.3.10-CVE-2009-2732.patch, -files/ntop-3.3.10-gentoo.patch:
|
||||
^
|
||||
|
||||
07 Aug 2011; Raúl Porcel <armin76@gentoo.org> ntop-4.0.1.ebuild:
|
||||
ia64/s390/sh/sparc stable wrt #376057
|
||||
|
||||
07 Aug 2011; Markus Meier <maekke@gentoo.org> ntop-4.0.1.ebuild:
|
||||
arm stable, bug #376057
|
||||
|
||||
26 Jul 2011; Markus Meier <maekke@gentoo.org> ntop-4.0.1.ebuild:
|
||||
amd64/x86 stable, bug #376057
|
||||
|
||||
26 Jul 2011; Jeroen Roovers <jer@gentoo.org> ntop-4.0.1.ebuild:
|
||||
Stable for HPPA (bug #376057).
|
||||
|
||||
26 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> ntop-4.0.1.ebuild:
|
||||
ppc/ppc64 stable wrt #376057
|
||||
|
||||
*ntop-4.0.3 (26 May 2011)
|
||||
|
||||
26 May 2011; Markos Chandras <hwoarang@gentoo.org> +ntop-4.0.3.ebuild,
|
||||
+files/ntop-4.0.3-gentoo.patch:
|
||||
Version bump. Bug #347393
|
||||
|
||||
*ntop-4.0.1 (24 Sep 2010)
|
||||
|
||||
24 Sep 2010; Alin Năstac <mrness@gentoo.org> +ntop-4.0.1.ebuild,
|
||||
+files/ntop-4.0.1-gentoo.patch:
|
||||
Version bump (#329577).
|
||||
|
||||
31 Jan 2010; Richard Freeman <rich0@gentoo.org> ntop-3.3.10-r2.ebuild:
|
||||
amd64 stable - 281956
|
||||
|
||||
22 Jan 2010; Raúl Porcel <armin76@gentoo.org> ntop-3.3.10-r2.ebuild:
|
||||
arm/ia64/s390/sh/sparc stable wrt #281956
|
||||
|
||||
19 Jan 2010; Jeroen Roovers <jer@gentoo.org> ntop-3.3.10-r2.ebuild:
|
||||
Stable for HPPA (bug #281956).
|
||||
|
||||
19 Jan 2010; Brent Baude <ranger@gentoo.org> ntop-3.3.10-r2.ebuild:
|
||||
Marking ntop-3.3.10-r2 ppc64 and ppc for bug 281956
|
||||
|
||||
19 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
|
||||
ntop-3.3.10-r2.ebuild:
|
||||
stable x86, security bug 281956
|
||||
|
||||
*ntop-3.3.10-r2 (18 Jan 2010)
|
||||
|
||||
18 Jan 2010; Jeroen Roovers <jer@gentoo.org> +ntop-3.3.10-r2.ebuild,
|
||||
+files/ntop-3.3.10-CVE-2009-2732.patch:
|
||||
Bump to apply security fix (bug #281956).
|
||||
|
||||
27 Sep 2009; Brent Baude <ranger@gentoo.org> ntop-3.3.10-r1.ebuild:
|
||||
Marking ntop-3.3.10-r1 ppc64 for bug 282063
|
||||
|
||||
13 Sep 2009; Raúl Porcel <armin76@gentoo.org> ntop-3.3.10-r1.ebuild:
|
||||
arm/ia64/s390/sh/sparc stable wrt #282063
|
||||
|
||||
06 Sep 2009; Markus Meier <maekke@gentoo.org> ntop-3.3.10-r1.ebuild:
|
||||
amd64/x86 stable, bug #282063
|
||||
|
||||
30 Aug 2009; nixnut <nixnut@gentoo.org> ntop-3.3.10-r1.ebuild:
|
||||
ppc stable #282063
|
||||
|
||||
27 Aug 2009; Jeroen Roovers <jer@gentoo.org> ntop-3.3.10-r1.ebuild:
|
||||
Stable for HPPA (bug #282063).
|
||||
|
||||
12 Aug 2009; Mike Frysinger <vapier@gentoo.org>
|
||||
files/ntop-update-geoip-db:
|
||||
Run wget with -nv so it doesnt spam logs so much.
|
||||
|
||||
*ntop-3.3.10-r1 (18 Jun 2009)
|
||||
|
||||
18 Jun 2009; Alin Năstac <mrness@gentoo.org>
|
||||
-files/ntop-3.3.10-external-geoip.patch, files/ntop-3.3.10-gentoo.patch,
|
||||
-ntop-3.3.10.ebuild, +ntop-3.3.10-r1.ebuild:
|
||||
Add missing lua dependency (#274447).
|
||||
|
||||
*ntop-3.3.10 (14 Jun 2009)
|
||||
|
||||
14 Jun 2009; Alin Năstac <mrness@gentoo.org>
|
||||
+files/ntop-3.3.10-external-geoip.patch, +files/ntop-3.3.10-gentoo.patch,
|
||||
+ntop-3.3.10.ebuild:
|
||||
Version bump (#271453).
|
||||
|
||||
09 May 2009; Alin Năstac <mrness@gentoo.org> metadata.xml,
|
||||
ntop-3.3.9-r2.ebuild:
|
||||
Change package description (#268400).
|
||||
|
||||
02 May 2009; Alin Năstac <mrness@gentoo.org> -files/ntop-3.2-build.patch,
|
||||
-files/ntop-3.2-snmp.patch, -files/ntop-3.3.6-gentoo.patch,
|
||||
-files/ntop-3.3.8-gentoo.patch, -files/globals-core.c.diff,
|
||||
-ntop-3.2-r3.ebuild, -ntop-3.3.6.ebuild, -ntop-3.3.8.ebuild,
|
||||
ntop-3.3.9-r2.ebuild:
|
||||
Remove nls USE flag and correct tcpd configure argument (#267660).
|
||||
|
||||
27 Apr 2009; Jeroen Roovers <jer@gentoo.org> ntop-3.3.9-r2:
|
||||
Stable for HPPA (bug #265704).
|
||||
|
||||
26 Apr 2009; Raúl Porcel <armin76@gentoo.org> ntop-3.3.9-r2.ebuild:
|
||||
arm/ia64/s390/sh/sparc stable wrt #265704
|
||||
|
||||
*ntop-3.3.9-r2 (25 Apr 2009)
|
||||
|
||||
25 Apr 2009; Alin Năstac <mrness@gentoo.org>
|
||||
+files/ntop-3.3.9-accesslog-umask.patch, -ntop-3.3.9-r1.ebuild,
|
||||
+ntop-3.3.9-r2.ebuild:
|
||||
Fix insecure log file creation (#266947).
|
||||
|
||||
22 Apr 2009; Markus Meier <maekke@gentoo.org> ntop-3.3.9-r1:
|
||||
x86 stable, bug #265704
|
||||
|
||||
16 Apr 2009; Richard Freeman <rich0@gentoo.org> ntop-3.3.9-r1.ebuild:
|
||||
amd64 stable - 265704
|
||||
|
||||
12 Apr 2009; Brent Baude <ranger@gentoo.org> ntop-3.3.9-r1.ebuild:
|
||||
stable ppc64, bug 265704
|
||||
|
||||
11 Apr 2009; nixnut <nixnut@gentoo.org> ntop-3.3.9-r1.ebuild:
|
||||
ppc stable #265704
|
||||
|
||||
10 Apr 2009; Alin Năstac <mrness@gentoo.org> ntop-3.3.9-r1.ebuild:
|
||||
Fix geoip dependency atom (#264524). Migrate to EAPI 2.
|
||||
|
||||
08 Mar 2009; Dawid Węgliński <cla@gentoo.org> ntop-3.2-r3.ebuild:
|
||||
Migrate to EAPI 2
|
||||
|
||||
*ntop-3.3.9-r1 (18 Feb 2009)
|
||||
|
||||
18 Feb 2009; Alin Năstac <mrness@gentoo.org>
|
||||
files/ntop-3.3.9-external-geoip.patch, +files/ntop-update-geoip-db,
|
||||
-ntop-3.3.9.ebuild, +ntop-3.3.9-r1.ebuild:
|
||||
Update GeoIP databases through a cron job (#259394).
|
||||
|
||||
*ntop-3.3.9 (16 Feb 2009)
|
||||
|
||||
16 Feb 2009; Alin Năstac <mrness@gentoo.org>
|
||||
+files/ntop-3.3.9-external-geoip.patch, +files/ntop-3.3.9-gentoo.patch,
|
||||
+ntop-3.3.9.ebuild:
|
||||
Version bump. Install /var/lib/ntop with the right owner (#254868).
|
||||
|
||||
*ntop-3.3.8 (05 Oct 2008)
|
||||
|
||||
05 Oct 2008; Alin Năstac <mrness@gentoo.org>
|
||||
+files/ntop-3.3.8-gentoo.patch, -files/ntop-3.3-build.patch,
|
||||
files/ntop-initd, -ntop-3.3.ebuild, +ntop-3.3.8.ebuild:
|
||||
Version bump. Fix QA warnings (#237812). Add corefonts run-time dependency
|
||||
(#231705).
|
||||
|
||||
05 Jul 2008; Peter Alfredsen <loki_val@gentoo.org> ntop-3.3.6.ebuild:
|
||||
Fix for libtool-2.2, bug #230853.
|
||||
|
||||
*ntop-3.3.6 (04 Jul 2008)
|
||||
|
||||
04 Jul 2008; Alin Năstac <mrness@gentoo.org>
|
||||
+files/ntop-3.3.6-gentoo.patch, files/ntop-initd, metadata.xml,
|
||||
ntop-3.2-r3.ebuild, ntop-3.3.ebuild, +ntop-3.3.6.ebuild:
|
||||
Version bump. Fix init script (#191576). Fix broken ebuild when locales use
|
||||
other chars than ASCII (#205382). Fix libtool dependency (#221623).
|
||||
|
||||
09 Jun 2008; Mike Frysinger <vapier@gentoo.org> ntop-3.3.ebuild:
|
||||
Remove stale libtool macros from local m4 files #220819 by Paul Hartman.
|
||||
|
||||
13 Nov 2007; Michael Sterrett <mr_bones_@gentoo.org> ntop-3.3.ebuild:
|
||||
take snmp out of deps since it's disabled for now
|
||||
|
||||
06 Sep 2007; Mike Frysinger <vapier@gentoo.org> ntop-3.3.ebuild:
|
||||
Force --disable-snmp so it isnt detected automatically.
|
||||
|
||||
06 Sep 2007; Markus Ullmann <jokey@gentoo.org> ntop-3.3.ebuild:
|
||||
Disabling snmp as it doesn't compile, see bug #190448
|
||||
|
||||
*ntop-3.3 (26 Aug 2007)
|
||||
|
||||
26 Aug 2007; Cédric Krier <cedk@gentoo.org> +files/ntop-3.3-build.patch,
|
||||
+ntop-3.3.ebuild:
|
||||
Version bump
|
||||
|
||||
24 Jul 2007; Markus Ullmann <jokey@gentoo.org> -files/ntop-confd-2,
|
||||
-files/ntop-init-2, files/ntop-confd, -files/ntop-init, +files/ntop-initd,
|
||||
-ntop-3.0.ebuild, -ntop-3.1.ebuild, -ntop-3.2-r1.ebuild,
|
||||
-ntop-3.2-r2.ebuild, ntop-3.2-r3.ebuild:
|
||||
Clean out old versions
|
||||
|
||||
14 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org> ntop-3.2-r3.ebuild:
|
||||
ppc stable, bug #180561
|
||||
|
||||
14 Jun 2007; Christoph Mende <angelos@gentoo.org> ntop-3.2-r3.ebuild:
|
||||
Stable on amd64 wrt bug 180561
|
||||
|
||||
13 Jun 2007; Markus Ullmann <jokey@gentoo.org> ntop-3.2-r3.ebuild:
|
||||
Stable on x86
|
||||
|
||||
13 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org> ntop-3.2-r3.ebuild:
|
||||
Stable on sparc wrt #180561
|
||||
|
||||
13 Jun 2007; Jeroen Roovers <jer@gentoo.org> ntop-3.2-r3.ebuild:
|
||||
Stable for HPPA (bug #180561).
|
||||
|
||||
01 May 2007; Marius Mauch <genone@gentoo.org> ntop-3.0.ebuild,
|
||||
ntop-3.2-r2.ebuild, ntop-3.2-r3.ebuild:
|
||||
Replacing einfo with elog
|
||||
|
||||
22 Apr 2007; <pva@gentoo.org> ntop-3.0.ebuild, ntop-3.1.ebuild:
|
||||
Use do{conf,init}d, bug #174266.
|
||||
|
||||
*ntop-3.2-r3 (27 Mar 2007)
|
||||
|
||||
27 Mar 2007; Markus Ullmann <jokey@gentoo.org> +files/ntop-confd-2,
|
||||
+files/ntop-init-2, +ntop-3.2-r3.ebuild:
|
||||
Add fixes from bug #136983, look at the confd file in case you experience
|
||||
lockups
|
||||
|
||||
05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> ntop-3.0.ebuild,
|
||||
ntop-3.1.ebuild:
|
||||
Remove gnuconfig_update usage, leave it to econf.
|
||||
|
||||
20 Nov 2006; Cedric Krier <cedk@gentoo.org> ntop-3.2-r2.ebuild:
|
||||
fix sslwatchdog and add einfo about pwd
|
||||
|
||||
*ntop-3.2-r2 (17 Nov 2006)
|
||||
|
||||
17 Nov 2006; Cedric Krier <cedk@gentoo.org> +ntop-3.2-r2.ebuild:
|
||||
Add RDEPEND for media-gfx/graphviz for bug #150739
|
||||
|
||||
15 Feb 2006; Markus Ullmann <jokey@gentoo.org> ntop-3.0.ebuild,
|
||||
ntop-3.1.ebuild, ntop-3.2-r1.ebuild:
|
||||
Removing virtual/libpcap wrt bug #117898
|
||||
|
||||
07 Feb 2006; Peter Volkov <pva@gentoo.org> ntop-3.2-r1.ebuild:
|
||||
Fix for bug 121497.
|
||||
|
||||
*ntop-3.2-r1 (01 Feb 2006)
|
||||
|
||||
01 Feb 2006; Markus Ullmann <jokey@gentoo.org> +files/ntop-3.2-snmp.patch,
|
||||
-ntop-3.2.ebuild, +ntop-3.2-r1.ebuild:
|
||||
Added fix for snmp compile issue, thanks to Jan Boysen
|
||||
(trekkie@media-mission.de) bug #120954
|
||||
|
||||
27 Jan 2006; Mike Frysinger <vapier@gentoo.org>
|
||||
files/ntop-3.2-build.patch:
|
||||
Make sure the inverted options are handled properly #111557.
|
||||
|
||||
12 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> ntop-3.0.ebuild:
|
||||
Stable on amd64.
|
||||
|
||||
*ntop-3.2 (30 Dec 2005)
|
||||
|
||||
30 Dec 2005; Mike Frysinger <vapier@gentoo.org>
|
||||
+files/ntop-3.2-build.patch, files/ntop-confd, +ntop-3.2.ebuild:
|
||||
Version bump #111389 by Eric Brown. Also fix up dependencies #111557 by
|
||||
Carsten Lohrke, broken configure option passing #113819 by Henrik Sankala,
|
||||
and uclibc support #117082 by Natanael Copa.
|
||||
|
||||
15 Sep 2005; Carlos Silva <r3pek@gentoo.org> ntop-3.0.ebuild:
|
||||
Marking ntop-3.0 ~x86 since it have some memory leak problems
|
||||
|
||||
24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> ntop-3.1.ebuild:
|
||||
FreeBSD fix: root:root -> root:0.
|
||||
|
||||
23 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> ntop-3.1.ebuild:
|
||||
Use -1 instead of /bin/false, bug #103421.
|
||||
|
||||
29 Jul 2005; Daniel Black <dragonheart@gentoo.org> ntop-3.1.ebuild:
|
||||
removed die from epatch || die.
|
||||
|
||||
09 May 2005; Eldad Zack <eldad@gentoo.org> ntop-3.1.ebuild:
|
||||
Fixed ACCESS VIOLATION that occurs if there is no /var/lib/ntop.
|
||||
|
||||
19 Feb 2005; Daniel Black <dragonheart@gentoo.org> ntop-3.1.ebuild:
|
||||
Quoted NTOP_OPTS in /etc/conf.d/ntop to fix bug #80663. Thanks to\ Alan McNeil
|
||||
<alanmcneil@mac.com>
|
||||
|
||||
10 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> ntop-3.1.ebuild:
|
||||
Install internal html files to the correct place for bug 81449.
|
||||
|
||||
31 Jan 2005; Daniel Black <dragonheart@gentoo.org> ntop-3.0.ebuild,
|
||||
ntop-3.1.ebuild:
|
||||
virtual/libpcap transition
|
||||
|
||||
*ntop-3.1 (16 Jan 2005)
|
||||
|
||||
16 Jan 2005; Daniel Black <dragonheart@gentoo.org>
|
||||
-files/gd-1.8.3-fpic.patch, -files/gdchart0.94c-fpic.patch,
|
||||
+files/globals-core.c.diff, -files/libpng-1.2.4-fpic.patch,
|
||||
-files/tcpwrap.patch, -files/zlib-1.1.4-build-fPIC.patch,
|
||||
-files/zlib-1.1.4-build-static-with-fpic.patch,
|
||||
-files/zlib-1.1.4-glibc.patch, -files/zlib-1.1.4-gzprintf.patch,
|
||||
-files/zlib-1.1.4-mapfile.patch, -ntop-2.2c.ebuild, +ntop-3.1.ebuild:
|
||||
Cleanout and Version bump as per bug #75812
|
||||
|
||||
27 Oct 2004; Eldad Zack <eldad@gentoo.org> ntop-3.0.ebuild:
|
||||
Removed dep on ncurses since intop was removed at 3.0.
|
||||
|
||||
25 Sep 2004; Tom Gall <tgall@gentoo.org> ntop-3.0.ebuild:
|
||||
added ~ppc64, bug #64101
|
||||
|
||||
14 Sep 2004; Guy Martin <gmsoft@gentoo.org> ntop-3.0.ebuild:
|
||||
Stable on hppa.
|
||||
|
||||
19 Aug 2004; Jason Wever <weeve@gentoo.org> ntop-3.0.ebuild:
|
||||
Stable on sparc.
|
||||
|
||||
17 Aug 2004; Eldad Zack <eldad@gentoo.org> ntop-3.0.ebuild:
|
||||
x86 stable
|
||||
|
||||
25 Jul 2004; Eldad Zack <eldad@gentoo.org> ntop-3.0.ebuild:
|
||||
Fixed sandbox violation. Thanks to Dennis Freise <cat@final-frontier.ath.cx>.
|
||||
Closes #58271.
|
||||
|
||||
24 Jul 2004; Eldad Zack <eldad@gentoo.org> ntop-3.0.ebuild:
|
||||
chown /var/lib/ntop to ntop's running user (nobody). Closes #46969.
|
||||
|
||||
09 Jun 2004; Aron Griffis <agriffis@gentoo.org> ntop-2.0.99_rc2-r2.ebuild,
|
||||
ntop-2.2.ebuild, ntop-2.2c.ebuild, ntop-3.0.ebuild:
|
||||
Fix use invocation
|
||||
|
||||
27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ntop-2.2c.ebuild:
|
||||
Add inherit eutils
|
||||
|
||||
*ntop-3.0 (31 Mar 2004)
|
||||
|
||||
14 Apr 2004; Jon Hood <squinky86@gentoo.org> ntop-3.0.ebuild:
|
||||
added libgd and libpng to dependencies, closes bug 46469.
|
||||
|
||||
31 Mar 2004; Michael Boman <mboman@gentoo.org> metadata.xml,
|
||||
ntop-3.0.ebuild:
|
||||
New upstream version. Closes bug 45372.
|
||||
|
||||
10 Mar 2004; Jason Wever <weeve@gentoo.org> ntop-2.2c.ebuild:
|
||||
Stable on sparc.
|
||||
|
||||
05 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> ntop-2.2c.ebuild:
|
||||
Added fpic patches to make it compile on amd64. Also compile everything with our preferred cflags.
|
||||
|
||||
11 Jan 2004; Seemant Kulleen <seemant@gentoo.org> ntop-2.0.99_rc2-r2.ebuild:
|
||||
sed -i
|
||||
|
||||
11 Jan 2004; Seemant Kulleen <seemant@gentoo.org> ntop-2.2.ebuild,
|
||||
ntop-2.2c.ebuild:
|
||||
Changed dodir to keepdir, otherwise a subsequent install removes
|
||||
/var/lib/ntop. Closes bug #37914 by Carlo <current@myrealbox.com>
|
||||
|
||||
26 Sep 2003; Martin Holzer <mholzer@gentoo.org> ntop-2.2.ebuild,
|
||||
ntop-2.2c.ebuild:
|
||||
Added more docs and marked x86 stable.
|
||||
|
||||
02 Aug 2003; Todd Sunderlin <todd@gentoo.org> ntop-2.2.ebuild:
|
||||
Marked stable on sparc
|
||||
|
||||
*ntop-2.2c (12 Jul 2003)
|
||||
|
||||
09 Jan 2004; Guy Martin <gmsoft@gentoo.org> ntop-2.2c.ebuild :
|
||||
Added -fPIC for zlib and libpng on hppa. Marked stable on hppa.
|
||||
|
||||
12 Jul 2003; Martin Holzer <mholzer@gentoo.org> ntop-2.2c.ebuild:
|
||||
Version bumped.
|
||||
|
||||
29 Jun 2003; Martin Holzer <mholzer@gentoo.org> ntop-2.2.ebuild:
|
||||
Marked stable on x86.
|
||||
|
||||
*ntop-2.2 (04 May 2003)
|
||||
|
||||
04 May 2003; Daniel Ahlberg <aliz@gentoo.org> ntop-2.2.ebuild :
|
||||
Version bump. Contributions by Rigo Ketelings <rigo@home.nl> and
|
||||
Ross Dougherty <theklone@optusnet.com.au> in #19354.
|
||||
|
||||
06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
|
||||
|
||||
*ntop-2.0.99_rc2-r2 (11 Jul 2002)
|
||||
|
||||
11 Jul 2002; Maik Schreiber <blizzy@gentoo.org> :
|
||||
|
||||
Applied tcp-wrappers patch from Markus Krainer
|
||||
<markus-krainer@chello.at>, closes bugs #4774, #4772
|
||||
and #4832.
|
||||
|
||||
*ntop-2.0.99_rc2-r1 (09 Jul 2002)
|
||||
|
||||
09 Jul 2002; Maik Schreiber <blizzy@gentoo.org> :
|
||||
|
||||
Quick fix for bug #4678.
|
||||
|
||||
*ntop-2.0.99_rc2 (14 Jun 2002)
|
||||
|
||||
14 Jun 2002; Ryan Phillips <rphillips@gentoo.org> :
|
||||
|
||||
updated revision
|
||||
|
||||
*ntop-2.0-r1 (25 Apr 2002)
|
||||
|
||||
25 Apr 2002; Pete Michaleas <tutor@gentoo.org> ntop-2.0-r1.ebuild :
|
||||
|
||||
Included patch to fix vulnerability with syslog() call, found in
|
||||
util.c.
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
AUX fix-doubleValuesInTrafficData-report.patch 1593 SHA256 dd06acce6da9f5f0c1fd735f869d736c6c180c0043b53fd0ddfe2f1966a9217c SHA512 88f1a4743e88ea4115c4f3de0ed02a5a2ab61fca4a4f4ec3f9b6ce9fc4530569f2c613a09cc7ab7b80edded7be240786103e99d7b0a74205beb84d857f81fb91 WHIRLPOOL c44b9d7b710d1aaf9c70ed33849c3f4422a203b41d3ea2ba14e653506947baaddd3217daf664691ca90815053cf713967bde9568b3dc2a19becdaa9a26217238
|
||||
AUX load_protos_file.patch 658 SHA256 f0a4185fa9c19c3d92a0b5d045b6adde4df440a138dccb3373d0731beeaca408 SHA512 1794b3c79fe628e5e08e38662891ed758dab16efdef2853dadd377643e3ff47ababbdabef9093d5e8006d58522b0806da809c87baba0c171637174421b6ef48e WHIRLPOOL 21fa5681838af21b0e30aab0b23a93d9076cfa530641a207446e2a53863cbf21df4d88bf020ef032a3e534e43e104720128fa56b58c86a1bfcb1c5ebf5142143
|
||||
AUX ntop-4.0.3-gentoo.patch 6136 SHA256 86ad86f206cbfaf2a92951ad882d9b8705f4e028e6651e4102ac402321f8df37 SHA512 732e76ad7fe4ee4d3a2d01c15971f985070613d5188c302695fbe1b93910f85f2b46f2bc65e967c85b66807becab20b5459c8d6446ece52ec8883451a5fca155 WHIRLPOOL ab60c9e924899ac22ab33e248f78ac6d63a3cb181c77b1ae130c6d9b7929f893b87a1a10d1cf29e3e586f9b461bf6f4f8a6333ec7af703886392549310510f21
|
||||
AUX ntop-4.1.0-gentoo.patch 6735 SHA256 2c28b7c65cce840c6a22c1762f4e296d8c2f00fb91947a90d5ac4b1a757be18f SHA512 33804549d93b116037bab82445a547e541385169df380d95ce9da80e9b272d9b190932ff0a197b281cdf890c77e7d675e892ff458fc4f59a3dd0993551583f46 WHIRLPOOL c1c133dd5a7f8c9dadc7ba6c69dff615ee6e209198f2000c85e1e15aff875a17bf33f9a54f71536171d6bee5a2000c840f4a7166a62957bd01c356134b4ec3ad
|
||||
AUX ntop-5.0.1-INCS.patch 951 SHA256 cd719a29f6e98ee4ba24ebd21b12ee6164e564deaa0e1a2aac93046d23ffa3f7 SHA512 396b1d8b9c99faa390615795f470221a6b2a5d9a9e4bf73ae6758e8cf4615e44571ac7c112e61f6be914a299b289f7caceffab08bbc083a5fcba069a5e1713c7 WHIRLPOOL 84825950cf4be6cc10072232776676dce2fd6a8c424637d6b4e7204b592944d9623b922e992878c4d305e42d7c94872d606d93606fdcb3b894e9e495ce7af977
|
||||
AUX ntop-5.0.1-gentoo.patch 6752 SHA256 cece982d8670c471e38e8b65c85a131a8a6ede31236e02743add5bec233d2418 SHA512 dd8309cd5c24eda0a9bb4a35b5598ff5f9a22b2af36ae9692f13b6254b2d9e624b646dda38610f6552b2694eb18d5946f0623fff76261c1d4e2ef94518fd5c69 WHIRLPOOL d7e88a7d2bb9cc92e81d2f5b019011212a8f88f551fe2fe06cf65b83e394b76ab474f3147f73a0d603e869344e7d0766f5784ad41215ce510a56498fd2cf4a2c
|
||||
AUX ntop-5.0.1-includes.patch 388 SHA256 60429cc4920da2ec387baa08e2bde1c32e999d330c6e3f921544198efb84040a SHA512 6afe8aee2dfee0c9b778a11896aa8b3341618171a74497832d2d67d76dea4374c14060c308ba9a69369b4bfd19c83ff9d5891410758b252bcc714e6031a44a30 WHIRLPOOL 31b2a2ed5fb7e2a70a887e37bc0c6e130830cd256c91f2ead57feeab242d8ad46403dfc6d2062294bb01ac390b05f96064662f05cf67560ce64a93ad4bfcd84b
|
||||
AUX ntop-confd 341 SHA256 b582253490df4cde55dda97585d45d16b2968296da7e9bc996dde932cf42584d SHA512 8693050cab03eeb29b59e0a7b173c7791625e8cd6bc33eaa5d74a50ab3ecf435577d7918626cfe3963a0d23d4522a737737b2b9fd8335df29784858a6191813d WHIRLPOOL b467f3baf1065ca7a2434fce23561b270adf1507d36269f1adec04ac41d08866885b043673d2908c44dc6fecb4db1768bc1a01ce590d65e4a629bf5b75b21d67
|
||||
AUX ntop-initd 747 SHA256 f583d6625690ee60744d407d149845db178f618f1239d962bfac14f39076dc7d SHA512 294cf1c0c274f1fbb29804965306be1aee97d98e83a2fd25925ac92398ce9d1f8f617968888842fa6d6d19b0b28f2f29bb9f8fd861067a18cc53ea89c91b0c67 WHIRLPOOL 3f57ec8e287e99d9d4854974d0d3d2566995ebb3b2889a8baed66457c45ac2d645af1dfa3d2e991a740d64465d70a91a5f93ca953ed2971f33d008c61dd45b36
|
||||
AUX ntop-initd-r1 787 SHA256 ebb85fa4ecc3686bf3d207eaaa959b6d1942512ccf6e8333a96f95bba3a435d0 SHA512 158071d262cc35213b8ef1e6ff4f3ebff20b180fd427fb103cd80557204c22be52d2d197371ee627ad660645e0674f701346802cb68c97fa9d212a532e8e953e WHIRLPOOL 53cadc62b45339e2b6d0010957e69237893149fc2e9ed504779c63106c491c531a7bfe047e4c8cadbcdd39d3a930a3dab922ecc41af862c3c6478a5141250fd1
|
||||
AUX ntop-update-geoip-db 492 SHA256 3604d0a728b203211fab05eca829a7e93bc05c04f252937ffbf630813420eef6 SHA512 7b5ae8dbd7d5d084c7278af1deb64a903b106663c3195df70acead3e8d7e14fbd996e69d5132c0ddac9147b3e70892c91695d834ab7b22fec2569efcd52df5f6 WHIRLPOOL d96c2fa39287ed6e0ac8b76a5c09ff4485305328bfd61fd738ff82a09cde0a8f0be76474d0c5bc95f0a55aa212b092f2e7b7a3bf3d8e6ee2ec1e88f246653e78
|
||||
AUX ntop.changes 19583 SHA256 d646f57b68119da55b494b67ff4678052471d72d5daebed2fc20769ac119bfa4 SHA512 1ca506d4159ecf792d84aa703cc212f864795c1fb06b676e943fc420cc10f143402a9f01eab4bab55d1f3fe967a05e59ea7aa73ae0237bd0bf057cf4c0342a3d WHIRLPOOL f1c76e124d9f4818edd6518b91a9167c9473e9f4fa9dfe2548274191cc4ba4364f5dec2ffb99253e8203fc1e4d626640539a475830d0122e1f7912acbb877996
|
||||
DIST ntop-5.0.2-2.3.1.src.rpm 40344422 SHA256 5a0a9d0797a66f12b596574420692861b323b075e45a4d08dd5c09e9a9e96589 SHA512 dce36afca5086bc9ca91a7848c4a1ff7d26f75e4c28586ae2e7e430e355c0fcf692e819336e8c0d1d2f0c58b1294ca649f27a20aa92ff440bfc27a008c3840b8 WHIRLPOOL 9eba2af852348f268c8d560af5f3afba264f18c30d8683fdd32d55310b7fdddb64fada44c1a6efb32a3cf491d06758cb1185130b567762cbffbd70aac6edcb74
|
||||
EBUILD ntop-5.0.2-r1.ebuild 3980 SHA256 09b56a462d473715556591b1822ddb0f88dc912bff2ee9320f7d02489c56523b SHA512 7fd7b877c37fe4134005dd8bea2345e6f69abe9115501484f666faeb3f6132a8e229c152a2951ade90e2f3267f754ed9e7d9309bd97ca68fbc7ef0fedc24f3ad WHIRLPOOL 713ef52482e45bff5a60ea22a0c3264faaf8caf06a3918bd2573e0499d841f8a319e2c106358815d1f6e141ce5a89cb84af8f965422aeb9671433441c8aa0b3e
|
||||
MISC ChangeLog 17541 SHA256 f4fba8bb8f931a55d8dbde4134af9e70640dab57cdc6e82047b0aa7059988226 SHA512 bdb6769f9f252486166da9b89b7f1f0e63df0e30acbd0545bd33604eb884d662883e967d7e283e850b4f141f4ef877d1d0362be70271c67ced5354f719fdc82b WHIRLPOOL fb9c50a2a3a8058533ac9cba83647b9c162f355685024554884af0f561529f917cf2ff27b4fe4eda1eb004c55e330290f79bb63fa408f151f4c28f94b7b0268b
|
||||
MISC metadata.xml 800 SHA256 1c30b31b70a070ce063954127847eb2df0d576fadcc813a9d26b5e91b7d44fc7 SHA512 7ef23a8c6e4149e747ca8b91eaa68eb3cd32c7f5af417661fc6487a4411c1430fd06b450e27969824282e010e15506e2f9ee48eb754f8b01ee118fc3dc4a2c60 WHIRLPOOL 39dcf4099a137e2957fb72fe78cb63665da6c415e7b7647b86e2bee0947d7e223d3e9fa8e585f72381f0bf84d23337183429f3c736953e7bb4ba1ef3069d52ec
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
--- ntop-5.0.1/report.c.orig 2015-09-17 12:25:09.947886000 +0200
|
||||
+++ ntop-5.0.1/report.c 2015-09-17 12:26:31.339886000 +0200
|
||||
@@ -1784,7 +1784,7 @@
|
||||
for(i=0; i<myGlobals.l7.numSupportedProtocols; i++) {
|
||||
if(myGlobals.device[myGlobals.actualReportDeviceId].l7.protoTraffic[i]) {
|
||||
safe_snprintf(__FILE__, __LINE__, buf, sizeof(buf), "<TD "TD_BG" ALIGN=RIGHT>%s</TD>",
|
||||
- formatBytes(el->l7.traffic[i].bytesRcvd, 1, formatBuf, sizeof(formatBuf)));
|
||||
+ formatBytes(el->l7.traffic[i].bytesRcvd/2, 1, formatBuf, sizeof(formatBuf)));
|
||||
sendString(buf);
|
||||
}
|
||||
}
|
||||
@@ -1807,7 +1807,7 @@
|
||||
for(i=0; i<myGlobals.l7.numSupportedProtocols; i++) {
|
||||
if(myGlobals.device[myGlobals.actualReportDeviceId].l7.protoTraffic[i] > 0) {
|
||||
safe_snprintf(__FILE__, __LINE__, buf, sizeof(buf), "<TD "TD_BG" ALIGN=RIGHT>%s</TD>",
|
||||
- formatBytes(el->l7.traffic[i].bytesSent, 1, formatBuf, sizeof(formatBuf)));
|
||||
+ formatBytes(el->l7.traffic[i].bytesSent/2, 1, formatBuf, sizeof(formatBuf)));
|
||||
sendString(buf);
|
||||
}
|
||||
}
|
||||
@@ -1830,7 +1830,7 @@
|
||||
for(i=0; i<myGlobals.l7.numSupportedProtocols; i++) {
|
||||
if(myGlobals.device[myGlobals.actualReportDeviceId].l7.protoTraffic[i] > 0) {
|
||||
safe_snprintf(__FILE__, __LINE__, buf, sizeof(buf), "<TD "TD_BG" ALIGN=RIGHT>%s</TD>",
|
||||
- formatBytes(el->l7.traffic[i].bytesSent + el->l7.traffic[i].bytesRcvd, 1, formatBuf, sizeof(formatBuf)));
|
||||
+ formatBytes((el->l7.traffic[i].bytesSent + el->l7.traffic[i].bytesRcvd)/2, 1, formatBuf, sizeof(formatBuf)));
|
||||
sendString(buf);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
diff -Naur ntop-5.0.2-orig/globals-core.c ntop-5.0.2/globals-core.c
|
||||
--- ntop-5.0.2-orig/globals-core.c 2014-05-20 09:43:55.000000000 +0200
|
||||
+++ ntop-5.0.2/globals-core.c 2015-07-30 15:18:24.852651184 +0200
|
||||
@@ -549,13 +549,11 @@
|
||||
ndpi_set_protocol_detection_bitmask2(myGlobals.device[deviceId].l7.l7handler, &all);
|
||||
|
||||
if(myGlobals.runningPref.protoSpecs != NULL) {
|
||||
- if(deviceId == 0) {
|
||||
traceEvent(CONST_TRACE_INFO, "Loading nDPI protocol/port mapping from %s",
|
||||
myGlobals.runningPref.protoSpecs);
|
||||
|
||||
ndpi_load_protocols_file(myGlobals.device[deviceId].l7.l7handler,
|
||||
myGlobals.runningPref.protoSpecs);
|
||||
- }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,232 @@
|
|||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -57,6 +57,7 @@
|
||||
dnl>
|
||||
umask 002
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
+AM_MAINTAINER_MODE
|
||||
|
||||
HAS_ERROR=
|
||||
HAS_WARNING=
|
||||
@@ -511,11 +512,6 @@
|
||||
LOCALEDIR="/usr/lib/locale"
|
||||
fi
|
||||
|
||||
-dnl> Add /usr/local/ /opt/local
|
||||
-CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include"
|
||||
-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include"
|
||||
-LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib"
|
||||
-
|
||||
PWD=`pwd`
|
||||
|
||||
echo
|
||||
@@ -1824,18 +1820,6 @@
|
||||
if test ".${ac_cv_lib_GeoIP_GeoIP_record_by_ipnum}" = ".yes"; then
|
||||
LIBS="$LIBS -lGeoIP"
|
||||
|
||||
-if test -f "GeoLiteCity.dat"; then
|
||||
- echo "GeoLiteCity.dat already present"
|
||||
-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
|
||||
-fi
|
||||
-
|
||||
dnl> --------
|
||||
|
||||
if test -f "GeoIPASNum.dat"; then
|
||||
@@ -1854,8 +1838,13 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-cp "3rd_party/oui.txt.gz" .
|
||||
-cp "3rd_party/specialMAC.txt.gz" .
|
||||
+
|
||||
+gunzip 3rd_party/GeoLiteCity.dat.gz &&
|
||||
+gunzip 3rd_party/GeoIPASNum.dat.gz &&
|
||||
+mv "3rd_party/etter.finger.os.gz" . &&
|
||||
+mv "3rd_party/oui.txt.gz" . &&
|
||||
+mv "3rd_party/specialMAC.txt.gz" . ||
|
||||
+ exit 1
|
||||
|
||||
if test -d ./configureextra; then
|
||||
|
||||
@@ -2016,7 +2005,6 @@
|
||||
AC_SUBST(SO_VERSION_PATCH)
|
||||
AC_SUBST(RRD_LIB)
|
||||
AC_SUBST(RRD_INC)
|
||||
-AC_SUBST(GEO_DIR)
|
||||
AC_SUBST(GETOPT_H)
|
||||
AC_SUBST(GETOPT_C)
|
||||
|
||||
--- a/globals-core.c
|
||||
+++ b/globals-core.c
|
||||
@@ -372,7 +372,7 @@
|
||||
_mtuSize[DLT_ATM_RFC1483] = 9180 /* LLC/SNAP encapsulated atm */;
|
||||
_headerSize[DLT_ATM_RFC1483] = 0;
|
||||
|
||||
- /* _mtuSize[DLT_RAW] = ? raw IP */
|
||||
+ _mtuSize[DLT_RAW] = 1500; /* raw IP */
|
||||
_headerSize[DLT_RAW] = 0;
|
||||
|
||||
/* Others defined in bpf.h at tcpdump.org as of the resync - it would be NICE
|
||||
@@ -491,19 +491,18 @@
|
||||
struct stat statbuf;
|
||||
|
||||
/* Initialize GeoIP databases */
|
||||
- for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
|
||||
+ {
|
||||
char path[256];
|
||||
|
||||
safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
|
||||
"%s%c%s",
|
||||
- myGlobals.configFileDirs[i],
|
||||
+ myGlobals.dbPath,
|
||||
CONST_PATH_SEP, GEO_IP_FILE);
|
||||
revertSlashIfWIN32(path, 0);
|
||||
|
||||
if(stat(path, &statbuf) == 0) {
|
||||
if((myGlobals.geo_ip_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
|
||||
traceEvent(CONST_TRACE_INFO, "GeoIP: loaded config file %s", path);
|
||||
- break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -512,20 +511,18 @@
|
||||
traceEvent(CONST_TRACE_ERROR, "GeoIP: unable to load file %s", GEO_IP_FILE);
|
||||
|
||||
/* *************************** */
|
||||
-
|
||||
- for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
|
||||
+ {
|
||||
char path[256];
|
||||
|
||||
safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
|
||||
"%s%c%s",
|
||||
- myGlobals.configFileDirs[i],
|
||||
+ myGlobals.dbPath,
|
||||
CONST_PATH_SEP, GEO_IP_ASN_FILE);
|
||||
revertSlashIfWIN32(path, 0);
|
||||
|
||||
if(stat(path, &statbuf) == 0) {
|
||||
if((myGlobals.geo_ip_asn_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
|
||||
traceEvent(CONST_TRACE_INFO, "GeoIP: loaded ASN config file %s", path);
|
||||
- break;
|
||||
}
|
||||
}
|
||||
}
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -43,7 +43,6 @@
|
||||
|
||||
#AM_CFLAGS =
|
||||
#AM_LDFLAGS=
|
||||
-ACLOCAL_AMFLAGS=-I m4
|
||||
|
||||
DISTCLEANFILES = trivialcompilemessage *.db #* *~ *.log
|
||||
CLEANFILES = $(DISTCLEANFILES) stamp-h1
|
||||
@@ -74,9 +73,7 @@
|
||||
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 \
|
||||
@@ -370,30 +367,7 @@
|
||||
|
||||
# download the vendor information table
|
||||
dnvt:
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @echo -n "Preparing "
|
||||
- @if test -f oui.txt; then \
|
||||
- rm -rf oui.txt; \
|
||||
- fi
|
||||
- @if test -f oui.txt.gz.old; then \
|
||||
- rm -rf oui.txt.gz.old; \
|
||||
- fi;
|
||||
- @mv oui.txt.gz oui.txt.gz.old
|
||||
- @echo "(old oui.txt.gz file is now oui.txt.gz.old)"
|
||||
- @echo ""
|
||||
- @wget -c http://standards.ieee.org/regauth/oui/oui.txt
|
||||
- @gzip oui.txt
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @echo -n "Old file lines were: "
|
||||
- @gunzip -c oui.txt.gz.old | wc -l
|
||||
- @echo -n "New file lines are: "
|
||||
- @gunzip -c oui.txt.gz | wc -l
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @echo "New file is:"
|
||||
- @ls -l oui.txt.gz
|
||||
+ @echo "Use included oui.txt.gz"
|
||||
|
||||
# download the Novell SAP Protocol information table
|
||||
#dnsapt:
|
||||
@@ -401,45 +375,7 @@
|
||||
|
||||
# download the passive ethernet fingerprint database
|
||||
dnetter:
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @echo "Preparing "
|
||||
- @echo ""
|
||||
-
|
||||
- @if test -f $(ETTER_PASSIVE).old; then \
|
||||
- echo "...Deleting prior file, $(ETTER_PASSIVE).old..."; \
|
||||
- rm -rf $(ETTER_PASSIVE).old; \
|
||||
- fi;
|
||||
- @if test -f $(ETTER_PASSIVE); then \
|
||||
- echo "...Moving current $(ETTER_PASSIVE) to $(ETTER_PASSIVE).old"; \
|
||||
- mv $(ETTER_PASSIVE) $(ETTER_PASSIVE).old; \
|
||||
- fi;
|
||||
- @for file in $(ETTER_PASSIVE) $(ETTER_PASSIVE).gz \
|
||||
- $(ETTER_PASSIVE_FILE) $(ETTER_PASSIVE_FILE).gz; do \
|
||||
- if test -f $$file; then \
|
||||
- echo "...Deleting prior file, $$file..."; \
|
||||
- rm -rf $$file; \
|
||||
- fi; \
|
||||
- done
|
||||
- @echo ""
|
||||
- @echo "...Downloading new file..."
|
||||
- @wget -O $(ETTER_PASSIVE_FILE) \
|
||||
- $(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)?$(ETTER_PASSIVE_DOWNLOAD_PARMS)
|
||||
- @echo ""
|
||||
- @echo "gziping downloaded file..."
|
||||
- @gzip $(ETTER_PASSIVE_FILE)
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @if test -f $(ETTER_PASSIVE).old; then \
|
||||
- echo -n "Old file lines were: "; \
|
||||
- gunzip -c $(ETTER_PASSIVE).old | wc -l; \
|
||||
- fi;
|
||||
- @echo -n "New file lines are: "
|
||||
- @gunzip -c $(ETTER_PASSIVE) | wc -l
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @echo "New file is:"
|
||||
- @ls -l $(ETTER_PASSIVE)
|
||||
+ @echo "Use included $(ETTER_PASSIVE)"
|
||||
|
||||
# ntop census
|
||||
census-fail:
|
||||
--- a/report.c
|
||||
+++ b/report.c
|
||||
@@ -2353,7 +2353,7 @@
|
||||
if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
|
||||
snprintf(dotPath, sizeof(dotPath), "%s", buf);
|
||||
} else {
|
||||
- snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot");
|
||||
+ snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot");
|
||||
storePrefsValue("dot.path", dotPath); /* Set the default */
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,240 @@
|
|||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -469,11 +469,6 @@
|
||||
LOCALEDIR="/usr/lib/locale"
|
||||
fi
|
||||
|
||||
-dnl> Add /usr/local/ /opt/local
|
||||
-CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include"
|
||||
-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include"
|
||||
-LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib"
|
||||
-
|
||||
PWD=`pwd`
|
||||
|
||||
echo
|
||||
@@ -1716,18 +1711,6 @@
|
||||
if test ".${ac_cv_lib_GeoIP_GeoIP_record_by_ipnum}" = ".yes"; then
|
||||
LIBS="$LIBS -lGeoIP"
|
||||
|
||||
-if test -f "GeoLiteCity.dat"; then
|
||||
- echo "GeoLiteCity.dat already present"
|
||||
-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
|
||||
-fi
|
||||
-
|
||||
dnl> --------
|
||||
|
||||
if test -f "GeoIPASNum.dat"; then
|
||||
@@ -1746,8 +1729,11 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-cp "3rd_party/oui.txt.gz" .
|
||||
-cp "3rd_party/specialMAC.txt.gz" .
|
||||
+gunzip 3rd_party/GeoLiteCity.dat.gz &&
|
||||
+mv "3rd_party/etter.finger.os.gz" . &&
|
||||
+mv "3rd_party/oui.txt.gz" . &&
|
||||
+mv "3rd_party/specialMAC.txt.gz" . ||
|
||||
+ exit 1
|
||||
|
||||
if test -d ./configureextra; then
|
||||
|
||||
@@ -1908,7 +1894,6 @@
|
||||
AC_SUBST(SO_VERSION_PATCH)
|
||||
AC_SUBST(RRD_LIB)
|
||||
AC_SUBST(RRD_INC)
|
||||
-AC_SUBST(GEO_DIR)
|
||||
AC_SUBST(GETOPT_H)
|
||||
AC_SUBST(GETOPT_C)
|
||||
|
||||
--- a/globals-core.c
|
||||
+++ b/globals-core.c
|
||||
@@ -367,7 +367,7 @@
|
||||
_mtuSize[DLT_ATM_RFC1483] = 9180 /* LLC/SNAP encapsulated atm */;
|
||||
_headerSize[DLT_ATM_RFC1483] = 0;
|
||||
|
||||
- /* _mtuSize[DLT_RAW] = ? raw IP */
|
||||
+ _mtuSize[DLT_RAW] = 1500; /* raw IP */
|
||||
_headerSize[DLT_RAW] = 0;
|
||||
|
||||
/* Others defined in bpf.h at tcpdump.org as of the resync - it would be NICE
|
||||
@@ -461,19 +461,18 @@
|
||||
struct stat statbuf;
|
||||
|
||||
/* Initialize GeoIP databases */
|
||||
- for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
|
||||
+ {
|
||||
char path[256];
|
||||
|
||||
safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
|
||||
"%s%c%s",
|
||||
- myGlobals.configFileDirs[i],
|
||||
+ myGlobals.dbPath,
|
||||
CONST_PATH_SEP, GEO_IP_FILE);
|
||||
revertSlashIfWIN32(path, 0);
|
||||
|
||||
if(stat(path, &statbuf) == 0) {
|
||||
if((myGlobals.geo_ip_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
|
||||
traceEvent(CONST_TRACE_INFO, "GeoIP: loaded config file %s", path);
|
||||
- break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -482,20 +481,18 @@
|
||||
traceEvent(CONST_TRACE_ERROR, "GeoIP: unable to load file %s", GEO_IP_FILE);
|
||||
|
||||
/* *************************** */
|
||||
-
|
||||
- for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
|
||||
+ {
|
||||
char path[256];
|
||||
|
||||
safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
|
||||
"%s%c%s",
|
||||
- myGlobals.configFileDirs[i],
|
||||
+ myGlobals.dbPath,
|
||||
CONST_PATH_SEP, GEO_IP_ASN_FILE);
|
||||
revertSlashIfWIN32(path, 0);
|
||||
|
||||
if(stat(path, &statbuf) == 0) {
|
||||
if((myGlobals.geo_ip_asn_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
|
||||
traceEvent(CONST_TRACE_INFO, "GeoIP: loaded ASN config file %s", path);
|
||||
- break;
|
||||
}
|
||||
}
|
||||
}
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -36,7 +36,6 @@
|
||||
|
||||
#AM_CFLAGS =
|
||||
#AM_LDFLAGS=
|
||||
-ACLOCAL_AMFLAGS=-I m4
|
||||
|
||||
DISTCLEANFILES = trivialcompilemessage *.db #* *~ *.log
|
||||
CLEANFILES = $(DISTCLEANFILES) stamp-h1
|
||||
@@ -67,9 +66,7 @@
|
||||
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 \
|
||||
@@ -130,7 +127,7 @@
|
||||
|
||||
libntop_la_DEPENDENCIES = config.h
|
||||
libntop_la_LIBADD = $(BASE_LIBS)
|
||||
-libntop_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic @DYN_FLAGS@
|
||||
+libntop_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic -shared @DYN_FLAGS@
|
||||
|
||||
# Archive for http representation, or the 'viewer'
|
||||
libntopreport_la_SOURCES = emitter.c globals-report.c graph.c \
|
||||
@@ -142,7 +139,7 @@
|
||||
|
||||
libntopreport_la_DEPENDENCIES = libntop.la
|
||||
libntopreport_la_LIBADD = libntop.la $(BASE_LIBS)
|
||||
-libntopreport_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic @DYN_FLAGS@
|
||||
+libntopreport_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic -shared @DYN_FLAGS@
|
||||
|
||||
man_MANS = ntop.8
|
||||
|
||||
@@ -362,30 +359,7 @@
|
||||
|
||||
# download the vendor information table
|
||||
dnvt:
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @echo -n "Preparing "
|
||||
- @if test -f oui.txt; then \
|
||||
- rm -rf oui.txt; \
|
||||
- fi
|
||||
- @if test -f oui.txt.gz.old; then \
|
||||
- rm -rf oui.txt.gz.old; \
|
||||
- fi;
|
||||
- @mv oui.txt.gz oui.txt.gz.old
|
||||
- @echo "(old oui.txt.gz file is now oui.txt.gz.old)"
|
||||
- @echo ""
|
||||
- @wget -c http://standards.ieee.org/regauth/oui/oui.txt
|
||||
- @gzip oui.txt
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @echo -n "Old file lines were: "
|
||||
- @gunzip -c oui.txt.gz.old | wc -l
|
||||
- @echo -n "New file lines are: "
|
||||
- @gunzip -c oui.txt.gz | wc -l
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @echo "New file is:"
|
||||
- @ls -l oui.txt.gz
|
||||
+ @echo "Use included oui.txt.gz"
|
||||
|
||||
# download the Novell SAP Protocol information table
|
||||
#dnsapt:
|
||||
@@ -393,45 +367,7 @@
|
||||
|
||||
# download the passive ethernet fingerprint database
|
||||
dnetter:
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @echo "Preparing "
|
||||
- @echo ""
|
||||
-
|
||||
- @if test -f $(ETTER_PASSIVE).old; then \
|
||||
- echo "...Deleting prior file, $(ETTER_PASSIVE).old..."; \
|
||||
- rm -rf $(ETTER_PASSIVE).old; \
|
||||
- fi;
|
||||
- @if test -f $(ETTER_PASSIVE); then \
|
||||
- echo "...Moving current $(ETTER_PASSIVE) to $(ETTER_PASSIVE).old"; \
|
||||
- mv $(ETTER_PASSIVE) $(ETTER_PASSIVE).old; \
|
||||
- fi;
|
||||
- @for file in $(ETTER_PASSIVE) $(ETTER_PASSIVE).gz \
|
||||
- $(ETTER_PASSIVE_FILE) $(ETTER_PASSIVE_FILE).gz; do \
|
||||
- if test -f $$file; then \
|
||||
- echo "...Deleting prior file, $$file..."; \
|
||||
- rm -rf $$file; \
|
||||
- fi; \
|
||||
- done
|
||||
- @echo ""
|
||||
- @echo "...Downloading new file..."
|
||||
- @wget -O $(ETTER_PASSIVE_FILE) \
|
||||
- $(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)?$(ETTER_PASSIVE_DOWNLOAD_PARMS)
|
||||
- @echo ""
|
||||
- @echo "gziping downloaded file..."
|
||||
- @gzip $(ETTER_PASSIVE_FILE)
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @if test -f $(ETTER_PASSIVE).old; then \
|
||||
- echo -n "Old file lines were: "; \
|
||||
- gunzip -c $(ETTER_PASSIVE).old | wc -l; \
|
||||
- fi;
|
||||
- @echo -n "New file lines are: "
|
||||
- @gunzip -c $(ETTER_PASSIVE) | wc -l
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @echo "New file is:"
|
||||
- @ls -l $(ETTER_PASSIVE)
|
||||
+ @echo "Use included $(ETTER_PASSIVE)"
|
||||
|
||||
# ntop census
|
||||
census-fail:
|
||||
--- a/report.c
|
||||
+++ b/report.c
|
||||
@@ -2091,7 +2091,7 @@
|
||||
if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
|
||||
snprintf(dotPath, sizeof(dotPath), "%s", buf);
|
||||
} else {
|
||||
- snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot");
|
||||
+ snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot");
|
||||
storePrefsValue("dot.path", dotPath); /* Set the default */
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -18983,7 +18983,7 @@
|
||||
else
|
||||
LIBS="${LIBS} ${PYTHON_LIBS}"
|
||||
|
||||
- PYTHON_INCS=`$PYTHON_CONFIG --cflags | sed -e "s/-arch i386//" | sed -e "s/-arch ppc//" | sed -e "s/-arch x86_64//"`
|
||||
+ PYTHON_INCS=`$PYTHON_CONFIG --includes | sed -e "s/-arch i386//" | sed -e "s/-arch ppc//" | sed -e "s/-arch x86_64//"`
|
||||
|
||||
INCS="${INCS} ${PYTHON_INCS}"
|
||||
|
||||
@@ -19335,15 +19335,6 @@
|
||||
for(i=NF; i>0; i--) { \
|
||||
if ($i in fields) { } else { fields[$i]="."; out[i]=$i } \
|
||||
} \
|
||||
- for(i=1; i<=NF; i++) { \
|
||||
- if (i in out) { printf("%s ", out[i]) } \
|
||||
- } \
|
||||
- print "" \
|
||||
- }'`
|
||||
- INCS=`echo ${INCS} | ${ac_cv_prog_AWK} '{ \
|
||||
- for(i=NF; i>0; i--) { \
|
||||
- if ($i in fields) { } else { fields[$i]="."; out[i]=$i } \
|
||||
- } \
|
||||
for(i=1; i<=NF; i++) { \
|
||||
if (i in out) { printf("%s ", out[i]) } \
|
||||
} \
|
||||
|
|
@ -0,0 +1,240 @@
|
|||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -469,11 +469,6 @@
|
||||
LOCALEDIR="/usr/lib/locale"
|
||||
fi
|
||||
|
||||
-dnl> Add /usr/local/ /opt/local
|
||||
-CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include"
|
||||
-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include"
|
||||
-LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib"
|
||||
-
|
||||
PWD=`pwd`
|
||||
|
||||
echo
|
||||
@@ -1739,18 +1734,6 @@
|
||||
if test ".${ac_cv_lib_GeoIP_GeoIP_record_by_ipnum}" = ".yes"; then
|
||||
LIBS="$LIBS -lGeoIP"
|
||||
|
||||
-if test -f "GeoLiteCity.dat"; then
|
||||
- echo "GeoLiteCity.dat already present"
|
||||
-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
|
||||
-fi
|
||||
-
|
||||
dnl> --------
|
||||
|
||||
if test -f "GeoIPASNum.dat"; then
|
||||
@@ -1769,8 +1752,11 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-cp "3rd_party/oui.txt.gz" .
|
||||
-cp "3rd_party/specialMAC.txt.gz" .
|
||||
+gunzip 3rd_party/GeoLiteCity.dat.gz &&
|
||||
+mv "3rd_party/etter.finger.os.gz" . &&
|
||||
+mv "3rd_party/oui.txt.gz" . &&
|
||||
+mv "3rd_party/specialMAC.txt.gz" . ||
|
||||
+ exit 1
|
||||
|
||||
if test -d ./configureextra; then
|
||||
|
||||
@@ -1931,7 +1917,6 @@
|
||||
AC_SUBST(SO_VERSION_PATCH)
|
||||
AC_SUBST(RRD_LIB)
|
||||
AC_SUBST(RRD_INC)
|
||||
-AC_SUBST(GEO_DIR)
|
||||
AC_SUBST(GETOPT_H)
|
||||
AC_SUBST(GETOPT_C)
|
||||
AC_SUBST(NDPI_LIB)
|
||||
--- a/globals-core.c
|
||||
+++ b/globals-core.c
|
||||
@@ -369,7 +369,7 @@
|
||||
_mtuSize[DLT_ATM_RFC1483] = 9180 /* LLC/SNAP encapsulated atm */;
|
||||
_headerSize[DLT_ATM_RFC1483] = 0;
|
||||
|
||||
- /* _mtuSize[DLT_RAW] = ? raw IP */
|
||||
+ _mtuSize[DLT_RAW] = 1500; /* raw IP */
|
||||
_headerSize[DLT_RAW] = 0;
|
||||
|
||||
/* Others defined in bpf.h at tcpdump.org as of the resync - it would be NICE
|
||||
@@ -470,19 +470,18 @@
|
||||
struct stat statbuf;
|
||||
|
||||
/* Initialize GeoIP databases */
|
||||
- for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
|
||||
+ {
|
||||
char path[256];
|
||||
|
||||
safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
|
||||
"%s%c%s",
|
||||
- myGlobals.configFileDirs[i],
|
||||
+ myGlobals.dbPath,
|
||||
CONST_PATH_SEP, GEO_IP_FILE);
|
||||
revertSlashIfWIN32(path, 0);
|
||||
|
||||
if(stat(path, &statbuf) == 0) {
|
||||
if((myGlobals.geo_ip_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
|
||||
traceEvent(CONST_TRACE_INFO, "GeoIP: loaded config file %s", path);
|
||||
- break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -491,20 +490,18 @@
|
||||
traceEvent(CONST_TRACE_ERROR, "GeoIP: unable to load file %s", GEO_IP_FILE);
|
||||
|
||||
/* *************************** */
|
||||
-
|
||||
- for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
|
||||
+ {
|
||||
char path[256];
|
||||
|
||||
safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
|
||||
"%s%c%s",
|
||||
- myGlobals.configFileDirs[i],
|
||||
+ myGlobals.dbPath,
|
||||
CONST_PATH_SEP, GEO_IP_ASN_FILE);
|
||||
revertSlashIfWIN32(path, 0);
|
||||
|
||||
if(stat(path, &statbuf) == 0) {
|
||||
if((myGlobals.geo_ip_asn_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
|
||||
traceEvent(CONST_TRACE_INFO, "GeoIP: loaded ASN config file %s", path);
|
||||
- break;
|
||||
}
|
||||
}
|
||||
}
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -36,7 +36,6 @@
|
||||
|
||||
#AM_CFLAGS =
|
||||
#AM_LDFLAGS=
|
||||
-ACLOCAL_AMFLAGS=-I m4
|
||||
|
||||
DISTCLEANFILES = trivialcompilemessage *.db #* *~ *.log
|
||||
CLEANFILES = $(DISTCLEANFILES) stamp-h1
|
||||
@@ -67,9 +66,7 @@
|
||||
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 \
|
||||
@@ -133,7 +130,7 @@
|
||||
|
||||
libntop_la_DEPENDENCIES = config.h
|
||||
libntop_la_LIBADD = $(BASE_LIBS)
|
||||
-libntop_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic @DYN_FLAGS@
|
||||
+libntop_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic -shared @DYN_FLAGS@
|
||||
|
||||
# Archive for http representation, or the 'viewer'
|
||||
libntopreport_la_SOURCES = emitter.c globals-report.c graph.c \
|
||||
@@ -145,7 +142,7 @@
|
||||
|
||||
libntopreport_la_DEPENDENCIES = libntop.la
|
||||
libntopreport_la_LIBADD = libntop.la $(BASE_LIBS)
|
||||
-libntopreport_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic @DYN_FLAGS@
|
||||
+libntopreport_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) -export-dynamic -shared @DYN_FLAGS@
|
||||
|
||||
man_MANS = ntop.8
|
||||
|
||||
@@ -367,30 +364,7 @@
|
||||
|
||||
# download the vendor information table
|
||||
dnvt:
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @echo -n "Preparing "
|
||||
- @if test -f oui.txt; then \
|
||||
- rm -rf oui.txt; \
|
||||
- fi
|
||||
- @if test -f oui.txt.gz.old; then \
|
||||
- rm -rf oui.txt.gz.old; \
|
||||
- fi;
|
||||
- @mv oui.txt.gz oui.txt.gz.old
|
||||
- @echo "(old oui.txt.gz file is now oui.txt.gz.old)"
|
||||
- @echo ""
|
||||
- @wget -c http://standards.ieee.org/regauth/oui/oui.txt
|
||||
- @gzip oui.txt
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @echo -n "Old file lines were: "
|
||||
- @gunzip -c oui.txt.gz.old | wc -l
|
||||
- @echo -n "New file lines are: "
|
||||
- @gunzip -c oui.txt.gz | wc -l
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @echo "New file is:"
|
||||
- @ls -l oui.txt.gz
|
||||
+ @echo "Use included oui.txt.gz"
|
||||
|
||||
# download the Novell SAP Protocol information table
|
||||
#dnsapt:
|
||||
@@ -398,45 +372,7 @@
|
||||
|
||||
# download the passive ethernet fingerprint database
|
||||
dnetter:
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @echo "Preparing "
|
||||
- @echo ""
|
||||
-
|
||||
- @if test -f $(ETTER_PASSIVE).old; then \
|
||||
- echo "...Deleting prior file, $(ETTER_PASSIVE).old..."; \
|
||||
- rm -rf $(ETTER_PASSIVE).old; \
|
||||
- fi;
|
||||
- @if test -f $(ETTER_PASSIVE); then \
|
||||
- echo "...Moving current $(ETTER_PASSIVE) to $(ETTER_PASSIVE).old"; \
|
||||
- mv $(ETTER_PASSIVE) $(ETTER_PASSIVE).old; \
|
||||
- fi;
|
||||
- @for file in $(ETTER_PASSIVE) $(ETTER_PASSIVE).gz \
|
||||
- $(ETTER_PASSIVE_FILE) $(ETTER_PASSIVE_FILE).gz; do \
|
||||
- if test -f $$file; then \
|
||||
- echo "...Deleting prior file, $$file..."; \
|
||||
- rm -rf $$file; \
|
||||
- fi; \
|
||||
- done
|
||||
- @echo ""
|
||||
- @echo "...Downloading new file..."
|
||||
- @wget -O $(ETTER_PASSIVE_FILE) \
|
||||
- $(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)?$(ETTER_PASSIVE_DOWNLOAD_PARMS)
|
||||
- @echo ""
|
||||
- @echo "gziping downloaded file..."
|
||||
- @gzip $(ETTER_PASSIVE_FILE)
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @if test -f $(ETTER_PASSIVE).old; then \
|
||||
- echo -n "Old file lines were: "; \
|
||||
- gunzip -c $(ETTER_PASSIVE).old | wc -l; \
|
||||
- fi;
|
||||
- @echo -n "New file lines are: "
|
||||
- @gunzip -c $(ETTER_PASSIVE) | wc -l
|
||||
- @echo ""
|
||||
- @echo ""
|
||||
- @echo "New file is:"
|
||||
- @ls -l $(ETTER_PASSIVE)
|
||||
+ @echo "Use included $(ETTER_PASSIVE)"
|
||||
|
||||
# ntop census
|
||||
census-fail:
|
||||
--- a/report.c
|
||||
+++ b/report.c
|
||||
@@ -2299,7 +2299,7 @@
|
||||
if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
|
||||
snprintf(dotPath, sizeof(dotPath), "%s", buf);
|
||||
} else {
|
||||
- snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot");
|
||||
+ snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot");
|
||||
storePrefsValue("dot.path", dotPath); /* Set the default */
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
--- a/nDPI/src/lib/protocols/netflow.c
|
||||
+++ b/nDPI/src/lib/protocols/netflow.c
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
|
||||
#include "ipq_utils.h"
|
||||
+#include <time.h> /* time() */
|
||||
|
||||
#ifdef NTOP_PROTOCOL_NETFLOW
|
||||
|
||||
--- a/nDPI/src/lib/protocols/ssl.c
|
||||
+++ b/nDPI/src/lib/protocols/ssl.c
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
|
||||
#include "ipq_utils.h"
|
||||
+#include <ctype.h> /* isalpha() isdigit() ... */
|
||||
|
||||
#ifdef IPOQUE_PROTOCOL_SSL
|
||||
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
# Config file for /etc/init.d/ntop
|
||||
|
||||
# Set preferred options here
|
||||
#NTOP_OPTS="--http-server 3000 --https-server 0 --interface eth0"
|
||||
|
||||
# suggestions from bug #136983 (use it in case you experience ntop hangs)
|
||||
#NTOP_OPTS="u ntop -P /var/lib/ntop --disable-schedyield --http-server 3000 --https-server 3001"
|
||||
|
||||
NTOP_OPTS="-u ntop -P /var/lib/ntop"
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
#!/sbin/runscript
|
||||
# Copyright 1999-2007 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
depend() {
|
||||
need net
|
||||
}
|
||||
|
||||
checkconfig() {
|
||||
if [ ! -e /var/lib/ntop/ntop_pw.db ]; then
|
||||
eerror "You need to set a password first by running"
|
||||
eerror "ntop --set-admin-password"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
start() {
|
||||
checkconfig || return 1
|
||||
ebegin "Starting ntop"
|
||||
export LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
|
||||
export GDFONTPATH=/usr/share/fonts/corefonts # apparently the only font that works (#231705)
|
||||
start-stop-daemon --start --exec /usr/bin/ntop -- -d -L ${NTOP_OPTS}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ntop"
|
||||
start-stop-daemon --stop --retry 30 --pidfile /var/run/ntop.pid
|
||||
eend $?
|
||||
}
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
#!/sbin/runscript
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/files/ntop-initd-r1,v 1.1 2013/08/06 06:28:07 polynomial-c Exp $
|
||||
|
||||
description="ntop - a network traffic analyzer"
|
||||
pidfile="/run/ntop.pid"
|
||||
command="/usr/bin/ntop"
|
||||
command_args="-L ${NTOP_OPTS}"
|
||||
start_stop_daemon_args="-p ${pidfile} -m -b"
|
||||
|
||||
depend() {
|
||||
need net
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
if [ ! -e /var/lib/ntop/ntop_pw.db ] ; then
|
||||
eerror "You need to set a password first by running"
|
||||
eerror "ntop --set-admin-password"
|
||||
return 1
|
||||
fi
|
||||
|
||||
export LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
|
||||
export GDFONTPATH=/usr/share/fonts/corefonts # apparently the only font that works (#231705)
|
||||
}
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
#!/bin/sh
|
||||
|
||||
BASE_URL=http://geolite.maxmind.com/download/geoip/database
|
||||
|
||||
echo "Updating NTOP GeoIP databases..."
|
||||
|
||||
cd /var/lib/ntop || exit
|
||||
|
||||
for u in asnum/GeoIPASNum.dat.gz GeoLiteCity.dat.gz ; do
|
||||
FILE_GZ=${u#*/}
|
||||
FILE=${FILE_GZ%.gz}
|
||||
wget -nv -O ${FILE_GZ} ${BASE_URL}/${u} &&
|
||||
gunzip < ${FILE_GZ} > .${FILE} &&
|
||||
mv -f .${FILE} ${FILE} &&
|
||||
rm -f ${FILE_GZ} ||
|
||||
exit
|
||||
done
|
||||
|
||||
/etc/init.d/ntop --quiet status && /etc/init.d/ntop restart
|
||||
|
||||
echo "NTOP GeoIP databases were successfully updated"
|
||||
|
|
@ -0,0 +1,594 @@
|
|||
-------------------------------------------------------------------
|
||||
Sun Nov 09 19:37:00 UTC 2014 - Led <ledest@gmail.com>
|
||||
|
||||
- fix bashisms in pre script
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 3 23:14:47 UTC 2014 - crrodriguez@opensuse.org
|
||||
|
||||
- Remove all unused buildRequires.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 23 14:29:38 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
- Remove unused patch:
|
||||
* ntop-remove_ntop_safefree.patch
|
||||
* ntop-compile-fix.patch
|
||||
- Remove unused tarball:
|
||||
* etter.finger.os.gz
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 17 10:18:00 UTC 2014 - bg@suse.com
|
||||
|
||||
- rename README.SuSE to README.SUSE
|
||||
- remove bogus util.c
|
||||
- remove old sources ntop-5.01.tar.bz2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 20 09:24:21 UTC 2014 - bg@suse.com
|
||||
|
||||
- Update to 5.0.2, probably last available version. Development
|
||||
changed to ntopng
|
||||
- Readded nDPI from svn to project
|
||||
- added fix POS36-C.patch
|
||||
https://www.securecoding.cert.org/confluence/spaces/flyingpdf/pdfpageexport.action?pageId=16450166
|
||||
- readded packagedir bnc#865243
|
||||
- Updated first startup information in README.SuSE and rcntop bnc#848276
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 28 13:05:01 UTC 2013 - lars@linux-schulserver.de
|
||||
|
||||
- really remove the following patches as requested by review team:
|
||||
+ ntop-compile-fix.patch
|
||||
+ ntop-remove_ntop_safefree.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 13 05:43:38 UTC 2013 - alexandre@exatati.com.br
|
||||
|
||||
- Removed extra configure run and unrecognized options (--enable-sslv3
|
||||
and --enable-i18n).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 17 04:57:40 UTC 2012 - alexandre@exatati.com.br
|
||||
|
||||
- Update to 5.0.1:
|
||||
- Sorry, no changelog atm.
|
||||
- Refresh patches 0 to 5, 8, 10 and 11 and remove patches 6, 7 and
|
||||
9.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 8 08:38:22 UTC 2012 - lars@linux-schulserver.de
|
||||
|
||||
- create logrotate script dynamically during build to have the
|
||||
correct pkg_user and pkg_group assigned - and also the 'su'
|
||||
option for younger logrotate packages
|
||||
- added restart_on_update snipplet in postun
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 17 10:20:27 UTC 2012 - idonmez@suse.com
|
||||
|
||||
- Remove ntop-4.1.0.dif and ntop-fix-segfault-on-exit.patch, they
|
||||
are not applied.
|
||||
- Don't package INSTALL file.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 21 10:31:42 UTC 2011 - coolo@suse.com
|
||||
|
||||
- remove call to suse_update_config (very old work around)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 24 12:25:55 UTC 2011 - bg@suse.com
|
||||
|
||||
- add development patch to fix compile warning (r4978 from svn)
|
||||
- remove ntop-rrdPlugin.patch which applied to already removed FC protocol
|
||||
- change template netflowUtilsLoop; endless loop never returns
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 24 10:19:54 UTC 2011 - coolo@suse.com
|
||||
|
||||
- add libtool as buildrequire to avoid implicit dependency
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 13 15:30:09 UTC 2011 - lars@linux-schulserver.de
|
||||
|
||||
- fix init script (include $CONFIG was missing) - thanks to
|
||||
Frank Steiner
|
||||
- create and own /var/lib/ntop/* directories, so ntop can store
|
||||
the configuration
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 8 20:08:40 UTC 2011 - lars@linux-schulserver.de
|
||||
|
||||
- update to 4.1.0:
|
||||
+ Removed some legacy code that caused trouble in the past. As
|
||||
result, this version lacks some of the 4.0.3 features but it
|
||||
can benefit in terms of stability and efficiency.
|
||||
+ The next release will re-incorporate some of the features
|
||||
we cut on 4.1 as we’re currently redesigning them.
|
||||
+ In 4.1 for instance we have removed legacy protocols in favor
|
||||
or new (let’s call them protocols) ones such as Facebook
|
||||
and Twitter.
|
||||
- specfile cleanup
|
||||
- added 'probe' option to init file
|
||||
- added Should-Start/Should-Stop to init file
|
||||
- patchfile cleanup (TODO: check last chuncks of ntop-4.1.0.diff)
|
||||
- added/changed patches:
|
||||
+ ntop-disable_ethernet_fingerprint_database_download.patch:
|
||||
do not download during build time split out from ntop-4.1.0.diff
|
||||
+ ntop-disable_darwin.patch: split out from ntop-4.1.0.diff
|
||||
+ ntop-python_fix.patch: fix python detection and therefor enable
|
||||
python support
|
||||
+ ntop-default_user.patch: start as ntop instead of nobody, if
|
||||
a user tries to start ntop on his own
|
||||
+ ntop-fix-manpage-errors.patch: taken from Debian
|
||||
+ ntop-fix-netflow-plugin-links.patch: taken from Debian
|
||||
+ ntop-fix-timestamp.patch: do not include the build time into
|
||||
the binaries (let build-compare do it's work)
|
||||
- added logrotate script (and dependency)
|
||||
- added ntop-rpmlintrc to ignore some warnings
|
||||
- parse arguments to autogen.sh to predefine the right places
|
||||
- unzip the files ntop uses to name MACs and other values
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 16 14:12:19 UTC 2011 - alexandre@exatati.com.br
|
||||
|
||||
- Update etter.finger.os.gz file.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 16 13:36:08 UTC 2011 - alexandre@exatati.com.br
|
||||
|
||||
- Update to 4.0.3:
|
||||
* Sorry no news or changelogs about recent fixes or improvements
|
||||
on ntop's source or website.
|
||||
- Refreshed ntop-%{version} patch;
|
||||
- Minor spec file improvement.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 10 15:13:21 UTC 2010 - coolo@novell.com
|
||||
|
||||
- own parent directories
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 8 13:43:21 UTC 2010 - coolo@novell.com
|
||||
|
||||
- remove support for pre-9.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 25 19:40:07 UTC 2010 - alexandre@exatati.com.br
|
||||
|
||||
- Update to 4.0;
|
||||
- Rewrote main diff;
|
||||
- Spec file cleaned with spec-cleaner.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 7 06:46:19 UTC 2010 - puzel@novell.com
|
||||
|
||||
- add ntop-fix-segfault-on-exit.patch (bnc#578404)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 3 19:09:34 UTC 2009 - coolo@novell.com
|
||||
|
||||
- updated patches to apply with fuzz=0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 13 15:03:17 CEST 2009 - bg@suse.de
|
||||
|
||||
- use %configure
|
||||
- fix two warnings about array subscript is above array bounds
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 7 10:03:14 CEST 2009 - bg@suse.de
|
||||
|
||||
- change BuildRequires for 11.0 and 10.3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 6 15:30:58 CEST 2009 - bg@suse.de
|
||||
|
||||
- Update to version 3.3.10
|
||||
- Fixes for bugs #333436 (does not show up in new version), #375967,
|
||||
#422006, #432617 (does not show up in new version), #477996,
|
||||
#477997 and 528585
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 9 16:07:43 CEST 2008 - schwab@suse.de
|
||||
|
||||
- Remove local libtool macros.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 29 15:00:53 CET 2008 - lmichnovic@suse.cz
|
||||
|
||||
- fixed obsoleted run_ldconfig macro
|
||||
- spec file adjustment for seamless build for older distributions
|
||||
in BuildService
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 7 09:39:59 CEST 2007 - bg@suse.de
|
||||
|
||||
- remove first (wrong) definition of free
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 1 12:19:04 CEST 2007 - bg@suse.de
|
||||
|
||||
- update to version 3.3 (mainly bugfixes and automake changes)
|
||||
- fix some rpmlint warnings
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 26 16:56:15 CEST 2007 - prusnak@suse.cz
|
||||
|
||||
- changed libpcap to libpcap-devel in BuildRequires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 21 23:43:38 CEST 2007 - dmueller@suse.de
|
||||
|
||||
- update BuildRequires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 8 17:47:01 CEST 2007 - schwab@suse.de
|
||||
|
||||
- Fix default location of dot.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 26 14:50:53 CEST 2007 - rguenther@suse.de
|
||||
|
||||
- add gdbm-devel BuildRequires.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 7 13:40:20 CET 2006 - ro@suse.de
|
||||
|
||||
- fix docu permissions
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 11 15:38:49 CEST 2006 - schwab@suse.de
|
||||
|
||||
- Workaround lack of datarootdir support.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 4 17:32:09 CEST 2006 - bg@suse.de
|
||||
|
||||
- removing files ntop_darwin.[ch] (Bug #161809)
|
||||
- fixing user/group (Bug #140309)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 20 15:40:26 CET 2006 - bg@suse.de
|
||||
|
||||
- fix initialization of formatBuf (Bug #159477)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 26 14:05:52 CET 2006 - bg@suse.de
|
||||
|
||||
- fix bug #145502 (coding problems uncovered by new compiler)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 25 21:38:51 CET 2006 - mls@suse.de
|
||||
|
||||
- converted neededforbuild to BuildRequires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 15 17:47:56 CET 2006 - schwab@suse.de
|
||||
|
||||
- Don't strip binaries.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 12 15:31:07 CET 2005 - bg@suse.de
|
||||
|
||||
- upgrade to version 3.2
|
||||
- fix several compiler complaints
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 6 01:18:20 CEST 2005 - ro@suse.de
|
||||
|
||||
- matched number of arguments to printf formats
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 9 10:06:56 CEST 2005 - bg@suse.de
|
||||
|
||||
- removing execute permissions on gz files (Bug #114849)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 29 16:45:01 CEST 2005 - bg@suse.de
|
||||
|
||||
- update to 3.1.50, recent version did not come up anymore.
|
||||
(Bug #113816)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 25 13:43:48 CEST 2005 - mmj@suse.de
|
||||
|
||||
- Correct memset call
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 1 10:55:05 CEST 2005 - mmj@suse.de
|
||||
|
||||
- Don't return random data
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 21 18:05:04 CET 2005 - schwab@suse.de
|
||||
|
||||
- Convert configuration name to interface name in start script.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 4 13:47:48 CET 2005 - bg@suse.de
|
||||
|
||||
- passcheck has to be called as root with the new version
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 8 14:33:29 CET 2005 - bg@suse.de
|
||||
|
||||
- update to version 3.1
|
||||
- adopt fixes from older version
|
||||
- fix make install
|
||||
- make passcheck not segfault on failure of open password database
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 7 09:11:21 CEST 2004 - bg@suse.de
|
||||
|
||||
- fix and remove -fno-strict-aliasing
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 24 08:15:22 CEST 2004 - bg@suse.de
|
||||
|
||||
- fix traffic data collection (Bug #43815)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 6 17:10:16 CEST 2004 - bg@suse.de
|
||||
|
||||
- update to version 3.0.53
|
||||
- rename ntop to rcntop to avoid conflict with directory name
|
||||
- fix bug #41690
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 1 12:07:34 CEST 2004 - mmj@suse.de
|
||||
|
||||
- Move the mail to root into a README.SuSE where it belongs [#44349]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 1 23:58:39 CEST 2004 - ro@suse.de
|
||||
|
||||
- fix build for ppc64
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 31 08:36:07 CEST 2004 - bg@suse.de
|
||||
|
||||
- update to version 3.0
|
||||
- remove --ignore-sigpipe (not available anymore)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 30 22:54:48 CEST 2004 - mmj@suse.de
|
||||
|
||||
- Add --ignore-sigpipe to default arguments [#37576]
|
||||
- Clean up initscript and add missing sections (thanks lmuelle)
|
||||
- Compile with -fno-strict-aliasing
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 20 13:27:47 CET 2004 - bg@suse.de
|
||||
|
||||
- fixed comment in rc.config.ntop (Bug 33701)
|
||||
- fixed build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 10 15:04:09 CET 2004 - adrian@suse.de
|
||||
|
||||
- build as user
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 20 10:53:52 CEST 2003 - bg@suse.de
|
||||
|
||||
- add activation metatdata (Bug #28909)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 30 13:06:10 CEST 2003 - meissner@suse.de
|
||||
|
||||
- remove libtool.m4 from acinclude.m4, autoreconf.
|
||||
- fixed dependencies of rrdPlugin, so that it loads and
|
||||
you can see nice pie charts etc.
|
||||
- reenabled thomas security patch, which was disabled upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 28 11:41:30 CEST 2003 - meissner@suse.de
|
||||
|
||||
- Upgraded to 2.2c, removed intop again. Added rrdtool to nfb.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 19 14:43:21 CEST 2003 - meissner@suse.de
|
||||
|
||||
- Upgraded to 2.2, build and add intop, added missing files.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 24 14:40:07 CET 2003 - meissner@suse.de
|
||||
|
||||
- Fixed ppc64 build by sed hack (autoreconf does not work)
|
||||
- buildrooted.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 10 11:45:44 CET 2003 - bg@suse.de
|
||||
|
||||
- update to version 2.1.56
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 18 13:42:22 CEST 2002 - bg@suse.de
|
||||
|
||||
- added check program for admin user
|
||||
- rename of config file when updateing (Bug #19814)
|
||||
- removed (very old) README.Suse (Bug #16852)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 6 14:53:12 CEST 2002 - ro@suse.de
|
||||
|
||||
- added missing prereqs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 6 14:31:36 CEST 2002 - bg@suse.de
|
||||
|
||||
- upgrade to version 2.1.2
|
||||
- fixed init script for new version
|
||||
- change default port binding
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jul 27 15:23:49 CEST 2002 - adrian@suse.de
|
||||
|
||||
- fix neededforbuild
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 12 10:04:22 CEST 2002 - bg@suse.de
|
||||
|
||||
- upgrade to version 2.1.0
|
||||
- split up diff
|
||||
- fixed configure.in of new version
|
||||
- enabled mysql
|
||||
- renamed ntopd to ntop according to useful LSB names
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 17 08:46:17 CEST 2002 - bg@suse.de
|
||||
|
||||
- fix build for s390x
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 15 16:14:33 CET 2002 - ro@suse.de
|
||||
|
||||
- update to 2.0.1 for security fix
|
||||
- fixed configure.in in gdchart to use system libraries
|
||||
- run as user wwwrun (parameter -u wwwrun in startscript)
|
||||
- fix segfault in nfsPlugin.c
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 1 11:54:08 CET 2002 - pthomas@suse.de
|
||||
|
||||
- Correct notification mail.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 1 00:26:10 CET 2002 - ro@suse.de
|
||||
|
||||
- changed neededforbuild <libpng> to <libpng-devel-packages>
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 21 09:22:30 CET 2002 - ro@suse.de
|
||||
|
||||
- moved variables to sysconfig/ntopd
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 10 11:55:44 CET 2002 - egmont@suselinux.hu
|
||||
|
||||
- changed /sbin/init.d to /etc/init.d in init script comment
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 8 10:43:08 CET 2002 - bg@suse.de
|
||||
|
||||
- update to version 2.0
|
||||
- using system libraries instead of delivered (libz, libpng, libgd)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 14 09:09:09 CET 2001 - ro@suse.de
|
||||
|
||||
- hack for automake 1.5
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 18 19:06:30 CEST 2001 - uli@suse.de
|
||||
|
||||
- fixed OS ident via nmap
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 5 10:10:38 CEST 2001 - bg@suse.de
|
||||
|
||||
- fix Bug #9056
|
||||
- add ucdsnmp and ssl
|
||||
- activate gdchart
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 11 13:05:52 CEST 2001 - bg@suse.de
|
||||
|
||||
- moved AC_INIT to the beginning of configure.in
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 9 23:52:31 CEST 2001 - mfabian@suse.de
|
||||
|
||||
- bzip2 sources
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 23 00:10:25 CET 2001 - ro@suse.de
|
||||
|
||||
- added readline/readline-devel to neededforbuild (split from bash)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 1 02:23:27 CET 2000 - ro@suse.de
|
||||
|
||||
- moved startscript to etc
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 24 14:47:39 CET 2000 - bg@suse.de
|
||||
|
||||
- cleaned up specfile with ro
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 23 09:50:32 CET 2000 - bg@suse.de
|
||||
|
||||
- removed runlevel links in ntop.spec
|
||||
- fixed init script for 7.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 10 11:14:46 CET 2000 - bg@suse.de
|
||||
|
||||
- new verion 1.3.2
|
||||
this fixes Bug #4121
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 13 11:33:04 CEST 2000 - kukuk@suse.de
|
||||
|
||||
- fix compiling with glibc 2.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 28 15:19:59 CEST 2000 - ro@suse.de
|
||||
|
||||
- cvs-update of 2000/08/28 (all patches included)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 15 17:34:07 CEST 2000 - ro@suse.de
|
||||
|
||||
- update to cvs version of 2000/08/15
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 15 01:37:11 CEST 2000 - ro@suse.de
|
||||
|
||||
- removed deprecated referring to .ntop
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 5 15:21:56 CEST 2000 - ro@suse.de
|
||||
|
||||
- fixed another segfault
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 30 15:42:17 CEST 2000 - ro@suse.de
|
||||
|
||||
- added fix for segfault from cvs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 27 12:11:49 CEST 2000 - ro@suse.de
|
||||
|
||||
- update to 1.3.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 4 12:04:30 MET 2000 - uli@suse.de
|
||||
|
||||
- moved man page to %{_mandir}
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 13 14:15:48 MET 2000 - freitag@suse.de
|
||||
|
||||
- dropped own libpcap and use one in needforbuild
|
||||
- update to version 1.1
|
||||
- using configure instead of own Makefile
|
||||
- new tags in specfile like version
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de
|
||||
|
||||
- ran old prepare_spec on spec file to switch to new prepare_spec.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jun 12 16:10:42 MEST 1999 - ray@suse.de
|
||||
|
||||
- fix in init-script
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 1 19:47:38 MET 1998 - ray@suse.de
|
||||
|
||||
- new package
|
||||
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>netmon</herd>
|
||||
<longdescription>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 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.</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">ntop</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
|
@ -0,0 +1,145 @@
|
|||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-5.0.1-r1.ebuild,v 1.5 2015/04/08 18:01:21 mgorny Exp $
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
RPMREL="2.3.1"
|
||||
|
||||
inherit autotools eutils user python-single-r1 rpm
|
||||
|
||||
DESCRIPTION="Network traffic analyzer with web interface"
|
||||
HOMEPAGE="http://www.ntop.org/products/ntop/"
|
||||
SRC_URI="http://download.opensuse.org/update/13.2/src/${P}-${RPMREL}.src.rpm"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="snmp ssl"
|
||||
|
||||
COMMON_DEPEND="
|
||||
virtual/awk
|
||||
dev-lang/perl
|
||||
sys-libs/gdbm
|
||||
dev-libs/libevent
|
||||
net-libs/libpcap
|
||||
media-libs/gd
|
||||
media-libs/libpng
|
||||
net-analyzer/rrdtool[graph]
|
||||
ssl? ( dev-libs/openssl )
|
||||
sys-libs/zlib
|
||||
dev-libs/geoip
|
||||
dev-lang/lua
|
||||
snmp? ( net-analyzer/net-snmp[ipv6] )"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=sys-devel/libtool-1.5.26
|
||||
${PYTHON_DEPS}"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
media-fonts/corefonts
|
||||
media-gfx/graphviz
|
||||
net-misc/wget
|
||||
app-arch/gzip
|
||||
dev-libs/glib:2
|
||||
dev-python/mako"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup ntop
|
||||
enewuser ntop -1 -1 /var/lib/ntop ntop
|
||||
python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
ln -s ../nDPI nDPI
|
||||
epatch ${WORKDIR}/ntop-disable_ethernet_fingerprint_database_download.patch
|
||||
epatch ${WORKDIR}/ntop-disable_darwin.patch
|
||||
epatch ${WORKDIR}/ntop-fix-manpage-errors.patch
|
||||
epatch ${WORKDIR}/ntop-dot-path.patch
|
||||
epatch ${WORKDIR}/ntop-fix-netflow-plugin-links.patch
|
||||
epatch ${WORKDIR}/ntop-default_user.patch
|
||||
epatch ${WORKDIR}/ntop-fix-timestamp.patch
|
||||
epatch ${WORKDIR}/ntop-disable_svn_check.patch
|
||||
epatch ${WORKDIR}/ntop-no-return-in-nonvoid-function.patch
|
||||
epatch ${WORKDIR}/POS36-C.patch
|
||||
epatch ${WORKDIR}/CVE-2014-4165.patch
|
||||
epatch ${FILESDIR}/load_protos_file.patch
|
||||
epatch ${FILESDIR}/fix-doubleValuesInTrafficData-report.patch
|
||||
|
||||
sed -i "s|
||g" python/templates/rrdAlarmStart.tmpl
|
||||
chmod -x python/templates/rrdAlarmStart.tmpl docs/ntop-autotools.vsd
|
||||
|
||||
# Remove build time references so build-compare can do its work
|
||||
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "${FILESDIR}/${PN}.changes")"
|
||||
DATE="\"$(date -d "${modified}" "+%b %e %Y")\""
|
||||
TIME="\"$(date -d "${modified}" "+%H:%M:%S")\""
|
||||
sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" configure.in
|
||||
|
||||
cp /usr/share/aclocal/libtool.m4 libtool.m4.in
|
||||
cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
|
||||
eautoreconf
|
||||
|
||||
# Stop make from doing autotools stuff
|
||||
sed -i -e '/missing --run echo/s|=.*|= true|g' Makefile.in || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
export \
|
||||
ac_cv_header_glib_h=no \
|
||||
ac_cv_header_glibconfig_h=no \
|
||||
ac_cv_header_gdome_h=no \
|
||||
ac_cv_lib_glib_g_date_julian=no \
|
||||
ac_cv_lib_xml2_xmlCheckVersion=no \
|
||||
ac_cv_lib_gdome_gdome_di_saveDocToFile=no
|
||||
|
||||
pushd nDPI >/dev/null || die
|
||||
econf
|
||||
popd &>/dev/null || die
|
||||
|
||||
econf \
|
||||
$(use_enable snmp) \
|
||||
$(use_with ssl)
|
||||
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
pushd nDPI >/dev/null || die
|
||||
emake
|
||||
popd &>/dev/null || die
|
||||
|
||||
emake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
|
||||
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
keepdir /var/lib/ntop &&
|
||||
fowners ntop:ntop /var/lib/ntop &&
|
||||
fperms 750 /var/lib/ntop
|
||||
insinto /var/lib/ntop
|
||||
gunzip 3rd_party/GeoIPASNum.dat.gz
|
||||
gunzip 3rd_party/GeoLiteCity.dat.gz
|
||||
local f
|
||||
for f in GeoIPASNum.dat GeoLiteCity.dat; do
|
||||
# Don't install included GeoIP files if newer versions are available
|
||||
[ -f "${ROOT}/var/lib/ntop/${f}" ] ||
|
||||
doins "3rd_party/${f}"
|
||||
done
|
||||
|
||||
dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
|
||||
dodoc PORTING README SUPPORT_NTOP.txt THANKS $(find docs -type f)
|
||||
|
||||
newinitd "${FILESDIR}"/ntop-initd-r1 ntop
|
||||
newconfd "${FILESDIR}"/ntop-confd ntop
|
||||
|
||||
exeinto /etc/cron.monthly
|
||||
doexe "${FILESDIR}"/ntop-update-geoip-db
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "If this is the first time you install ntop, you need to run"
|
||||
elog "following command before starting ntop service:"
|
||||
elog " ntop --set-admin-password"
|
||||
}
|
||||
Loading…
Reference in New Issue