mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
net-analyzer/ntop: Old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
This commit is contained in:
Jeroen Roovers
@@ -1,3 +1 @@
|
||||
DIST ntop-4.0.3.tgz 39191671 SHA256 5b34b64fa4aebaeb365b2f255b2bbeb0a487686f49e85680789070d1c2404dc0 SHA512 48734b8c2fcb5c8efb9917836702b6407cca568cfd715c1cab98b8f4eaba2aa43491414132a94019d4619400b7e02a2232abd0a60cb2dbc413c6fbe6472f7f2f WHIRLPOOL c7bc59a010fd6792110eead7a6fe6cbeb401d7d38fd47a440d66091f3c317a7d80d2685bcb5e129db3267ef691908e4363c2ed3dfbff9c58578e272c420541a7
|
||||
DIST ntop-4.1.0.tar.gz 39118983 SHA256 c71e5563879ec1866296825e1705f30b5a67eb87c9abfbd7dc1c5baeed0384a4 SHA512 6759ef6396768b33db96db20ceb907f9d8a5e3421c920d277e043bec85eb1fb38e41b7c88e189e7dd316a02c627aa4c4ea9295beee8cd890ac09b5d8b161a579 WHIRLPOOL ae5616bf29a002d02273fcb436fd3b869ec6fcb7c3d10a61097f72aabe68240232f8aff9b533300baa76fc2096900902dfd900f95142c334c61f5cd425e543a7
|
||||
DIST ntop-5.0.1.tar.gz 40133867 SHA256 7e8e84cb14d2173beaca4d4cb991a14d84a4bef84ec37b2276bc363f45c52ef8 SHA512 f52c40e6c00c8d2f46b68078c5f9aef8ed78670f92a0a81f66f2f44c71d41bc4c001b4550f19b71c546f7c07cbbed15e0aa1ee13873ac63a11678bf2b8483f2a WHIRLPOOL aa20b6529f343f6f57fc1d880c8cf07cd11720c6fe8c968359ff1e16b77fe3f4c6df1ed83a184e580d6ef7f5eff6d245b2971c17a7dd674c12325f21029f64ee
|
||||
|
||||
@@ -1,232 +0,0 @@
|
||||
--- 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 */
|
||||
}
|
||||
|
||||
@@ -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
|
||||
@@ -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 */
|
||||
}
|
||||
|
||||
@@ -1,126 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit autotools eutils user
|
||||
|
||||
DESCRIPTION="Network traffic analyzer with web interface"
|
||||
HOMEPAGE="http://www.ntop.org/products/ntop/"
|
||||
SRC_URI="mirror://sourceforge/ntop/${P}.tgz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
|
||||
IUSE="ipv6 ssl"
|
||||
#snmp support is disabled
|
||||
|
||||
#snmp? ( net-analyzer/net-snmp )
|
||||
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-1.4.5
|
||||
>=dev-lang/lua-5.1.4"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=sys-devel/libtool-1.4"
|
||||
|
||||
# Needed by xmldumpPlugin - couldn't get it to work
|
||||
# dev-libs/gdome2
|
||||
# >=dev-libs/glib-2"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
media-fonts/corefonts
|
||||
media-gfx/graphviz
|
||||
net-misc/wget
|
||||
app-arch/gzip"
|
||||
|
||||
pkg_setup() {
|
||||
# snmp doesn't compile in this release, disabled for now
|
||||
#if use snmp ; then
|
||||
# ewarn "snmp plugin is under development and upstream does not recommend"
|
||||
# ewarn "it for usage in production environment."
|
||||
# if ! use ipv6 ; then
|
||||
# echo
|
||||
# eerror "snmp plugin has compilation problems without ipv6 support."
|
||||
# eerror "For additional information see bug #121497."
|
||||
# die "snmp without ipv6 is broken"
|
||||
# else
|
||||
# if ! built_with_use net-analyzer/net-snmp ipv6 ; then
|
||||
# echo
|
||||
# eerror "You have both ipv6 and snmp enabled."
|
||||
# eerror "This require ipv6 support in net-analyzer/net-snmp."
|
||||
# eerror "However, net-analyzer/net-snmp was compiled with ipv6 flag disabled."
|
||||
# eerror "Please, re-emerge net-analyzer/net-snmp with USE=\"ipv6\"."
|
||||
# die "net-analyzer/net-snmp was build without ipv6."
|
||||
# fi
|
||||
# fi
|
||||
#fi
|
||||
|
||||
enewgroup ntop
|
||||
enewuser ntop -1 -1 /var/lib/ntop ntop
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-gentoo.patch
|
||||
cat acinclude.m4.in acinclude.m4.ntop > acinclude.m4
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# force disable xmldumpPlugin
|
||||
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
|
||||
|
||||
econf \
|
||||
$(use_enable ipv6) \
|
||||
$(use_with ssl) \
|
||||
--with-rrd-home=/usr/lib \
|
||||
--disable-snmp \
|
||||
|| die "configure problem"
|
||||
# $(use_enable snmp)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
|
||||
emake DESTDIR="${D}" install || die "install problem"
|
||||
|
||||
keepdir /var/lib/ntop &&
|
||||
fowners ntop:ntop /var/lib/ntop &&
|
||||
fperms 750 /var/lib/ntop ||
|
||||
die "failed to prepare /var/lib/ntop dir"
|
||||
insinto /var/lib/ntop
|
||||
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}" ||
|
||||
die "failed to install ${f}"
|
||||
done
|
||||
|
||||
dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
|
||||
dodoc PORTING README SUPPORT_NTOP.txt THANKS $(find docs -type f)
|
||||
|
||||
newinitd "${FILESDIR}"/ntop-initd 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"
|
||||
}
|
||||
@@ -1,102 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit autotools eutils user
|
||||
|
||||
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"
|
||||
|
||||
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"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
media-fonts/corefonts
|
||||
media-gfx/graphviz
|
||||
net-misc/wget
|
||||
app-arch/gzip
|
||||
dev-libs/glib:2
|
||||
dev-python/mako"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup ntop
|
||||
enewuser ntop -1 -1 /var/lib/ntop ntop
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-gentoo.patch
|
||||
cp /usr/share/aclocal/libtool.m4 libtool.m4.in
|
||||
cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
econf \
|
||||
$(use_enable snmp) \
|
||||
$(use_with ssl) \
|
||||
--with-rrd-home=/usr/lib \
|
||||
|| die "configure problem"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
|
||||
emake DESTDIR="${D}" install || die "install problem"
|
||||
|
||||
keepdir /var/lib/ntop &&
|
||||
fowners ntop:ntop /var/lib/ntop &&
|
||||
fperms 750 /var/lib/ntop ||
|
||||
die "failed to prepare /var/lib/ntop dir"
|
||||
insinto /var/lib/ntop
|
||||
gunzip 3rd_party/GeoIPASNum.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}" ||
|
||||
die "failed to install ${f}"
|
||||
done
|
||||
|
||||
dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
|
||||
dodoc PORTING README SUPPORT_NTOP.txt THANKS $(find docs -type f)
|
||||
|
||||
newinitd "${FILESDIR}"/ntop-initd 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"
|
||||
}
|
||||
Reference in New Issue
Block a user