diff options
Diffstat (limited to 'net-analyzer/ntop/files/ntop-4.0.1-gentoo.patch')
| -rw-r--r-- | net-analyzer/ntop/files/ntop-4.0.1-gentoo.patch | 246 |
1 files changed, 246 insertions, 0 deletions
diff --git a/net-analyzer/ntop/files/ntop-4.0.1-gentoo.patch b/net-analyzer/ntop/files/ntop-4.0.1-gentoo.patch new file mode 100644 index 000000000000..a68c664d2994 --- /dev/null +++ b/net-analyzer/ntop/files/ntop-4.0.1-gentoo.patch @@ -0,0 +1,246 @@ +diff -Nru ntop-4.0.1.orig/configure.in ntop-4.0.1/configure.in +--- ntop-4.0.1.orig/configure.in 2010-08-07 00:44:41.000000000 +0200 ++++ ntop-4.0.1/configure.in 2010-09-24 01:42:46.000000000 +0200 +@@ -57,6 +57,7 @@ + dnl> + umask 002 + AM_CONFIG_HEADER(config.h) ++AM_MAINTAINER_MODE + + HAS_ERROR= + HAS_WARNING= +@@ -497,11 +498,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 +@@ -1809,39 +1805,17 @@ + + 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 +- echo "GeoIPASNum.dat already present" +-else +- if test -f "3rd_party/GeoIPASNum.dat.gz"; then +- cp 3rd_party/GeoIPASNum.dat.gz . +- else +- wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz +- fi +- +- gunzip GeoIPASNum.dat.gz +-fi + else + AC_MSG_RESULT(Please install GeoIP (http://www.maxmind.com/)) + exit 1 + fi + +-cp "3rd_party/oui.txt.gz" . +-cp "3rd_party/specialMAC.txt.gz" . ++gunzip 3rd_party/GeoIPASNum.dat.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 + +@@ -2002,7 +1976,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) + +diff -Nru ntop-4.0.1.orig/globals-core.c ntop-4.0.1/globals-core.c +--- ntop-4.0.1.orig/globals-core.c 2010-04-25 14:52:28.000000000 +0200 ++++ ntop-4.0.1/globals-core.c 2010-09-24 01:42:46.000000000 +0200 +@@ -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; + } + } + } +@@ -513,19 +512,18 @@ + + /* *************************** */ + +- 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; + } + } + } +diff -Nru ntop-4.0.1.orig/Makefile.am ntop-4.0.1/Makefile.am +--- ntop-4.0.1.orig/Makefile.am 2010-04-25 14:52:28.000000000 +0200 ++++ ntop-4.0.1/Makefile.am 2010-09-24 01:43:07.000000000 +0200 +@@ -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: +diff -Nru ntop-4.0.1.orig/report.c ntop-4.0.1/report.c +--- ntop-4.0.1.orig/report.c 2010-08-07 00:22:05.000000000 +0200 ++++ ntop-4.0.1/report.c 2010-09-24 01:42:46.000000000 +0200 +@@ -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 */ + } + |