nDPI: massive migration to v2.0

This commit is contained in:
blshkv 2017-10-10 01:05:40 +08:00
parent 96b747a967
commit 7764ff7af7
No known key found for this signature in database
GPG key ID: 273E3E90D1A6294F
26 changed files with 106 additions and 1109 deletions

View file

@ -1,442 +0,0 @@
# ChangeLog for net-analyzer/ntop
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.112 2012/06/12 02:58:12 zmedico Exp $
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.

View file

@ -1 +0,0 @@
DIST ntop-5.0.1.tar.gz 40133867 SHA256 7e8e84cb14d2173beaca4d4cb991a14d84a4bef84ec37b2276bc363f45c52ef8 SHA512 f52c40e6c00c8d2f46b68078c5f9aef8ed78670f92a0a81f66f2f44c71d41bc4c001b4550f19b71c546f7c07cbbed15e0aa1ee13873ac63a11678bf2b8483f2a WHIRLPOOL aa20b6529f343f6f57fc1d880c8cf07cd11720c6fe8c968359ff1e16b77fe3f4c6df1ed83a184e580d6ef7f5eff6d245b2971c17a7dd674c12325f21029f64ee

View file

@ -1,27 +0,0 @@
--- 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]) } \
} \

View file

@ -1,240 +0,0 @@
--- 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 */
}

View file

@ -1,20 +0,0 @@
--- 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

View file

@ -1,31 +0,0 @@
--- a/configure.in
+++ b/configure.in
@@ -887,28 +887,6 @@
fi
fi
-RRD_LIB="-L${RRD_HOME}/lib -lrrd_th"
-
-if test -f "$RRD_HOME/lib/librrd_th.so"; then
- AC_MSG_RESULT(checking for rrdtool... yes)
-else
- if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX
- AC_MSG_RESULT(checking for rrdtool... yes)
- else
- if test -f "$RRD_HOME/lib/librrd_th.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_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
- RRD_LIB=
- fi
- fi
- fi
-fi
-
RRD_INC=
if test -d "${RRD_HOME}/include"; then
RRD_INC="-I${RRD_HOME}/include"

View file

@ -1,42 +0,0 @@
--- configure.in.orig 2012-08-13 15:35:26.000000000 +0800
+++ configure.in 2012-11-08 07:55:51.000000000 +0800
@@ -688,8 +688,8 @@
fi
dnl> nDPI based on OpenDPI (https://code.google.com/p/opendpi/)
-NDPI_LIB=./nDPI/src/lib/.libs/libndpi.a
-NDPI_INC=./nDPI/src/include/
+NDPI_LIB=-lndpi
+NDPI_INC=/usr/include/libndpi
dnl> Define the arguments we accept...
--- autogen.sh.orig 2012-02-20 18:35:43.000000000 +0800
+++ autogen.sh 2012-11-08 07:54:32.000000000 +0800
@@ -434,26 +434,6 @@
rm -f autoha*
rm -f confdefs.h
-# Get nDPI
-
-echo "9. Downloading nDPI..."
-
-NDPI_URL=https://svn.ntop.org/svn/ntop/trunk/nDPI/
-if test -d nDPI; then
- echo "nDPI already available"
-else
- svn co $NDPI_URL
-fi
-
-dnl> nDPI compilation
-if test -f NDPI_LIB; then
- echo "nDPI already compiled"
-else
- echo "10. Compiling nDPI..."
- cd nDPI; ./configure --with-pic; make; cd ..
-fi
-
-
echo
echo "Now we're ready to compile ntop"

View file

@ -1,9 +0,0 @@
# 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"

View file

@ -1,30 +0,0 @@
#!/sbin/openrc-run
# 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 $?
}

View file

@ -1,24 +0,0 @@
#!/sbin/openrc-run
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
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)
}

View file

@ -1,21 +0,0 @@
#!/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"

View file

@ -1,13 +0,0 @@
<?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>
</pkgmetadata>

View file

@ -1,156 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit autotools eutils multilib user python-single-r1
DESCRIPTION="Network traffic analyzer with web interface"
HOMEPAGE="http://www.ntop.org/products/ntop/"
SRC_URI="mirror://sourceforge/ntop/ntop/Stable/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="snmp ssl system-ndpi"
COMMON_DEPEND="
dev-lang/lua:=
dev-lang/perl
dev-libs/geoip
dev-libs/libevent
media-libs/gd
media-libs/libpng:0=
net-analyzer/rrdtool[graph]
net-libs/libpcap
snmp? ( net-analyzer/net-snmp[ipv6] )
ssl? ( dev-libs/openssl:0= )
sys-libs/gdbm
sys-libs/zlib
virtual/awk
system-ndpi? ( net-libs/libndpi )
"
DEPEND="
${COMMON_DEPEND}
${PYTHON_DEPS}
>=sys-devel/libtool-1.5.26
"
RDEPEND="
${COMMON_DEPEND}
app-arch/gzip
dev-libs/glib:2
dev-python/mako
media-fonts/corefonts
media-gfx/graphviz
net-misc/wget
"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
pkg_setup() {
enewgroup ntop
enewuser ntop -1 -1 /var/lib/ntop ntop
python-single-r1_pkg_setup
#this flag is broken currently
if use system-ndpi; then
die "sorry system-ndpi is broken at the moment. See https://github.com/ntop/nDPI/issues/353"
fi
}
src_prepare() {
epatch \
"${FILESDIR}"/${P}-gentoo.patch \
"${FILESDIR}"/${P}-includes.patch \
"${FILESDIR}"/${P}-librrd.patch
#Waiting for the fix, see https://www.ntop.org/bugzilla3/show_bug.cgi?id=273
if use system-ndpi; then
epatch "${FILESDIR}"/${P}-system-ndpi.patch
rm -r ./nDPI
fi
cp /usr/share/aclocal/libtool.m4 libtool.m4.in
cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
eautoreconf
# The build system is a complete mess, so apply a configure patch here
# instead of patching configure.in above
epatch "${FILESDIR}"/${P}-INCS.patch
# Stop make from doing autotools stuff
sed -i -e '/missing --run echo/s|=.*|= true|g' Makefile.in || die
default
}
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
if use !system-ndpi; then
pushd nDPI >/dev/null || die
econf
popd &>/dev/null || die
fi
if has_version '<net-analyzer/rrdtool-1.6'; then
export RRD_LIB=-lrrd_th
else
export RRD_LIB=-lrrd
fi
econf \
$(use_enable snmp) \
$(use_with ssl) \
--with-rrd-home=/usr/$(get_libdir)
}
src_compile() {
if use !system-ndpi; then
pushd nDPI >/dev/null || die
emake
popd &>/dev/null || die
fi
emake
}
src_install() {
LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
emake DESTDIR="${D}" install
keepdir /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() {
fowners ntop:ntop /var/lib/ntop
fperms 750 /var/lib/ntop
}

View file

@ -1,2 +1,2 @@
DIST xplico-1.1.0.tgz 3692520 SHA256 3e0854ca7338efe0a0688525ac09c015a0cf8cc16db0840fa5c65351038594ac SHA512 d3a064dfd2ff632d7074ca9e770d89d4fded296f9235b16c6581484ccc0e1bf038780bcfc65f73559a142c0c40115ff574a5a59be10ec060691da1b06da0be5e WHIRLPOOL eb276308ac05bbc04a2cfd5adb719ae12f84802e859f1adbe672154ebb119d21500005d5146004d8d42b0c37a42e6927c8e8b8857034283c6aa783dad31847d4
DIST xplico-1.1.2.tgz 3133277 SHA256 08cc8bbae705e5ea3643d876e93b0dd14dd593595de0ae6ecf6a1089a056af25 SHA512 aaa205dfd3b601bd3ab510c5e0060521c85075d46754ce6d00d04e5536d957589ce7d41a27a30001273f50e653af6b8a15f0db3954cddd0ffb698c2d73934d44 WHIRLPOOL 558d2773afed001306bddf94542be372492bb808c6eeeeb8f2f36bbbc3997f215dd148c7148c97f662993bd54de259e736cb451d260a66e165bec346adb5794f
DIST xplico-1.2.0.tar.gz 2453963 SHA256 6a8fb251536b057e5deffb8bfc1d3317dd200084bdaea6eecb1978db7434b887 SHA512 c37430dbe3efd7ff3589a7531ed5a1e1fde5baa0e60083275eb9a4e2ea249446cb3b8d50aa452736e90cdde04ba4630efca5fb6981b4dad66a02b4ecd97dd6dd WHIRLPOOL b908a8fb3f1546d3cf2c7aa8d73a2ea27dcb10c5147bda0aacc7c3b26bbbb09f580d99d0dd8ea524a3ad2604d82509bc812556b07d9871ba4ea302ed0994d4cf

View file

@ -0,0 +1,11 @@
diff -urN xplico-1.2.0.orig/system/trigcap/Makefile xplico-1.2.0/system/trigcap/Makefile
--- xplico-1.2.0.orig/system/trigcap/Makefile 2017-01-15 19:11:07.000000000 +0800
+++ xplico-1.2.0/system/trigcap/Makefile 2017-10-09 18:43:41.813187695 +0800
@@ -90,7 +90,6 @@
mkdir -p $(INSTALL_DIR)
mkdir -p $(INSTALL_DIR)/bin
cp -a trigcap $(INSTALL_DIR)/bin
- strip -s $(INSTALL_DIR)/bin/trigcap
.PHONY: reset
reset:

View file

@ -0,0 +1,66 @@
diff -urN xplico-1.2.0.orig/dissectors/tcp_ca/tcp_analysis.c xplico-1.2.0/dissectors/tcp_ca/tcp_analysis.c
--- xplico-1.2.0.orig/dissectors/tcp_ca/tcp_analysis.c 2017-01-15 19:11:07.000000000 +0800
+++ xplico-1.2.0/dissectors/tcp_ca/tcp_analysis.c 2017-10-10 00:50:47.065666338 +0800
@@ -524,7 +524,7 @@
else {
ifw->l7prot_id = nDPIPacket(pkt, ifw->l7flow, ifw->l7dst, ifw->l7src, ifw->priv.ipv6);
}
- if (ifw->l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
+ if (ifw->l7prot_id.app_protocol != NDPI_PROTOCOL_UNKNOWN) {
ifw->stage++;
ifw->l7prot_type = ndpi_protocol2name(ndpi, ifw->l7prot_id, ifw->buff, TCP_CA_LINE_MAX_SIZE);
}
@@ -618,7 +618,7 @@
else
ifw->l7prot_id = ndpi_guess_undetected_protocol(ndpi, IPPROTO_TCP, ifw->priv.ip_s.uint32, ifw->priv.ip_d.uint32, ifw->priv.port_s, ifw->priv.port_d);
- if (ifw->l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
+ if (ifw->l7prot_id.master_protocol != NDPI_PROTOCOL_UNKNOWN) {
ifw->l7prot_type = ndpi_protocol2name(ndpi, ifw->l7prot_id, ifw->buff, TCP_CA_LINE_MAX_SIZE);
}
else {
diff -urN xplico-1.2.0.orig/dissectors/tcp_grbg/tcp_garbage.c xplico-1.2.0/dissectors/tcp_grbg/tcp_garbage.c
--- xplico-1.2.0.orig/dissectors/tcp_grbg/tcp_garbage.c 2017-01-15 19:11:07.000000000 +0800
+++ xplico-1.2.0/dissectors/tcp_grbg/tcp_garbage.c 2017-10-10 00:48:34.837657461 +0800
@@ -675,7 +675,7 @@
else {
l7prot_id = nDPIPacket(pkt, l7flow, l7dst, l7src, ipv4);
}
- if (l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
+ if (l7prot_id.app_protocol != NDPI_PROTOCOL_UNKNOWN) {
stage++;
l7prot_type = ndpi_protocol2name(ndpi, l7prot_id, buff, TCP_CFG_LINE_MAX_SIZE);
}
diff -urN xplico-1.2.0.orig/dissectors/udp_ca/udp_analysis.c xplico-1.2.0/dissectors/udp_ca/udp_analysis.c
--- xplico-1.2.0.orig/dissectors/udp_ca/udp_analysis.c 2017-01-15 19:11:07.000000000 +0800
+++ xplico-1.2.0/dissectors/udp_ca/udp_analysis.c 2017-10-10 00:51:14.197668160 +0800
@@ -431,7 +431,7 @@
else {
l7prot_id = nDPIPacket(pkt, l7flow, l7dst, l7src, ipv4);
}
- if (l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
+ if (l7prot_id.master_protocol != NDPI_PROTOCOL_UNKNOWN) {
l7prot_type = ndpi_protocol2name(ndpi, l7prot_id, buff, UDP_CA_LINE_MAX_SIZE);
}
}
@@ -451,7 +451,7 @@
else
l7prot_id = ndpi_guess_undetected_protocol(ndpi, IPPROTO_UDP, priv.ip_s.uint32, priv.ip_d.uint32, priv.port_s, priv.port_d);
- if (l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
+ if (l7prot_id.master_protocol != NDPI_PROTOCOL_UNKNOWN) {
l7prot_type = ndpi_protocol2name(ndpi, l7prot_id, buff, UDP_CA_LINE_MAX_SIZE);
}
else {
diff -urN xplico-1.2.0.orig/dissectors/udp_grbg/udp_garbage.c xplico-1.2.0/dissectors/udp_grbg/udp_garbage.c
--- xplico-1.2.0.orig/dissectors/udp_grbg/udp_garbage.c 2017-01-15 19:11:07.000000000 +0800
+++ xplico-1.2.0/dissectors/udp_grbg/udp_garbage.c 2017-10-10 00:49:00.111659158 +0800
@@ -373,7 +373,7 @@
else {
l7prot_id = nDPIPacket(pkt, l7flow, l7dst, l7src, ipv4);
}
- if (l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
+ if (l7prot_id.master_protocol != NDPI_PROTOCOL_UNKNOWN) {
l7prot_type = ndpi_protocol2name(ndpi, l7prot_id, buff, UDP_CFG_LINE_MAX_SIZE);
}
}

View file

@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
inherit multilib webapp eutils
@ -17,14 +16,13 @@ IUSE="+geoip mysql"
SLOT="0"
DEPEND="net-libs/libpcap
>=net-libs/libndpi-1.5.0"
>=net-libs/nDPI-1.5.0"
RDEPEND="mysql? ( dev-db/mysql )
media-sound/sox
media-sound/lame
dev-lang/php
virtual/httpd-cgi
dev-db/sqlite:3
>=net-libs/libndpi-1.5.0
geoip? ( dev-libs/geoip ) "
# cups? ( app-text/ghostscript-gpl ) "
#videosnarf

View file

@ -1,15 +1,17 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
inherit multilib webapp eutils
EAPI=6
inherit multilib eutils webapp
WEBAPP_MANUAL_SLOT="yes"
DESCRIPTION="Extract data from TCP/IP traffic"
HOMEPAGE="http://www.xplico.org"
SRC_URI="mirror://sourceforge/$PN/$P.tgz"
#SRC_URI="mirror://sourceforge/$PN/$P.tgz"
SRC_URI="https://sourceforge.net/projects/xplico/files/Xplico%20versions/${PV}/${P}.tar.gz/download -> ${P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
@ -17,22 +19,21 @@ IUSE="+geoip mysql"
SLOT="0"
DEPEND="net-libs/libpcap
>=net-libs/libndpi-1.5.0"
>=net-libs/nDPI-2.0"
RDEPEND="mysql? ( dev-db/mysql )
media-sound/sox
media-sound/lame
dev-lang/php
virtual/httpd-cgi
dev-db/sqlite:3
>=net-libs/libndpi-1.5.0
geoip? ( dev-libs/geoip ) "
# cups? ( app-text/ghostscript-gpl ) "
#videosnarf
# >=net-libs/libndpi-1.5.0
src_prepare() {
epatch "${FILESDIR}"/"${P}"-dont-strip.patch
#unbundle libndpi
epatch "${FILESDIR}"/"${P}"-libndpi15.patch
epatch "${FILESDIR}"/"${P}"-ndpi2.patch
# TODO:
# unbundle json-c and geoip
@ -40,17 +41,20 @@ src_prepare() {
# fix CFLAGS
sed -i "s|CFLAGS = -rdynamic|CFLAGS += -rdynamic|g" Makefile
# sed -i "s|CFLAGS = -rdynamic|CFLAGS += -rdynamic|g" system/dema/Makefile
if use geoip; then
sed -i -e "s|GEOIP_LIB =.*|GEOIP_LIB = /usr/$(get_libdir)/libGeoIP.a|g" Makefile
sed -i "s|GeoLiteCity.dat|/usr/share/GeoIP/GeoIP.dat|" common/geoiploc.c
sed -i "s|-lpthread|-lpthread -lGeoIP|g" manipulators/www/Makefile\
manipulators/mfbc/Makefile manipulators/mwmail/Makefile\
manipulators/mfile/Makefile
fi
# if use geoip; then
# sed -i -e "s|GEOIP_LIB =.*|GEOIP_LIB = /usr/$(get_libdir)/libGeoIP.a|g" Makefile
# sed -i "s|GeoLiteCity.dat|/usr/share/GeoIP/GeoIP.dat|" common/geoiploc.c
# sed -i "s|-lpthread|-lpthread -lGeoIP|g" manipulators/www/Makefile\
# manipulators/mfbc/Makefile manipulators/mwmail/Makefile\
# manipulators/mfile/Makefile
# fi
eapply_user
}
src_compile() {
emake -j1
DISABLE_GEOIP=1 emake -j1
}
src_install() {

View file

@ -1,2 +0,0 @@
DIST libndpi-1.6.tar.gz 1837027 SHA256 0863c7096f70c785e1b27a34f7b40939ac1a0e3a734ea3dcaa5cf161360a2561 SHA512 aa74b06fcf9ecdb9c094fd59fd8d9ce3d6ca3a6512bb9de55e07b86e16f935ab1465727885651788fa30417a62ce800ac06d03e87f4a64a0644a3688e04f77f8 WHIRLPOOL 65e0aa8f2d4dbf699b2569f0554f3de644f654a097187772cf60cb05e64222a6e4d738f645aaf97c68a88ee744424f20572d7723eca0bfce47234ecebb6b3540
DIST libndpi-1.8.tar.gz 7238087 SHA256 cea26a7f280301cc3a0e714b560d48b57ae2cf6453b71eb647ceb3fccecb5ba2 SHA512 6a9a995e86c0d940fd27046b1ddf0556a02f88d4d4b188db99da25d6a5acb7eb26889b2e9d197c86d5deec6c2d3fc0707e10bc645339e3f36519664dc9c15bd1 WHIRLPOOL 4ecc867fd4ca059363e7f99083330e93442e2afda1a2f6e8d4f8ada20924c0e405963d822d528aa576b1baa9b7420d22c3fcff23a41348899965fc6681148994

View file

@ -1,26 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools eutils
DESCRIPTION="ntop-maintained superset of the popular OpenDPI library"
HOMEPAGE="http://www.ntop.org/products/ndpi/"
SRC_URI="https://github.com/ntop/nDPI/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND=""
RDEPEND=""
S="${WORKDIR}/nDPI-${PV}"
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.5.0-system.patch
eautoreconf
default
}

1
net-libs/nDPI/Manifest Normal file
View file

@ -0,0 +1 @@
DIST nDPI-1.8.tar.gz 7238087 SHA256 cea26a7f280301cc3a0e714b560d48b57ae2cf6453b71eb647ceb3fccecb5ba2 SHA512 6a9a995e86c0d940fd27046b1ddf0556a02f88d4d4b188db99da25d6a5acb7eb26889b2e9d197c86d5deec6c2d3fc0707e10bc645339e3f36519664dc9c15bd1 WHIRLPOOL 4ecc867fd4ca059363e7f99083330e93442e2afda1a2f6e8d4f8ada20924c0e405963d822d528aa576b1baa9b7420d22c3fcff23a41348899965fc6681148994

View file

@ -68,7 +68,7 @@ net-analyzer/nessus-plugins
~net-analyzer/netwox-5.39.0
=net-analyzer/nikto-2.1.6_p*
~net-analyzer/nmap-7.60
~net-analyzer/ntopng-2.4
=net-analyzer/ntopng-3.0*
~net-analyzer/ntp-fingerprint-0.1
~net-analyzer/onesixtyone-0.3.2
=net-analyzer/p0f-3*
@ -100,6 +100,6 @@ net-analyzer/snort
=net-analyzer/wapiti-3.0.0*
=net-analyzer/wfuzz-2.2*
~net-analyzer/wolpertinger-0.6
~net-analyzer/xplico-1.1.0
=net-analyzer/xplico-1.2*
~net-analyzer/xprobe-0.3
net-analyzer/zmap

View file

@ -15,7 +15,7 @@ net-libs/libhackrf
net-libs/cppzmq
#xplico, ntop
~net-libs/libndpi-1.6
=net-libs/nDPI-2*
#requried by zarp
~net-libs/nfqueue-bindings-0.5

1
profiles/updates/4Q-2017 Normal file
View file

@ -0,0 +1 @@
move libndpi/libndpi libndpi/nDPI