New commits:
commit 1efd5f17eb3838b438c77e17a17bdd5cac177885
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
ntop: Allow enabling (default off) w3c HTML 4.01 output
commit 85cc7cc137917415168377677cf019c831db73b4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
ntop: Allow configuring interface merge
commit 8d10e88907c81b298222696a5c6e35cf9b29b06d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
ntop: Depends on geoip
If no geoip is found, ntop downloads and installs its own copy
Fake ntop into seeing the system geoip
Installs its own copy of GeoIPASNum.dat and GeoLiteCity.dat
commit 2b16e3ce322dab3ce621211965ef794bcff3dfb1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
diff --git a/net/ntop/init.d/ntop.conf b/net/ntop/init.d/ntop.conf
index cf994df..65202c5 100644
--- a/net/ntop/init.d/ntop.conf
+++ b/net/ntop/init.d/ntop.conf
@@ -8,3 +8,15 @@ HTTP_PORT=0
# Which https port (SSL encrytion enabled) should ntop listen to? When set
to 0
# then the https server is disabled (default: 3000)
HTTPS_PORT=3000
+
+# This option instructs ntop not to merge network interfaces together.
+# This means that ntop will collect statistics for each interface
+# and report them separately.
+INTERFACE_MERGE='--no-interface-merge'
+
+# By default, ntop generates displayable but not great html. There are a
+# number of tags we do not generate because they cause problems with older
+# browsers which are still commonly used or are important to look good on
+# real-world browsers. This flag tells ntop to generate 'BETTER' (but not
+# perfect) w3c compliant html 4.01 output.
+#W3C='--w3c'
diff --git a/net/ntop/systemgeoip.patch b/net/ntop/systemgeoip.patch
new file mode 100644
index 0000000..5b1273b
--- /dev/null
+++ b/net/ntop/systemgeoip.patch
@@ -0,0 +1,36 @@
+diff -Naur ntop-3.3.9.orig/Makefile.am ntop-3.3.9/Makefile.am
+--- ntop-3.3.9.orig/Makefile.am 2009-12-30 12:37:37.007745774 -0800
++++ ntop-3.3.9/Makefile.am 2009-12-30 12:38:40.538426478 -0800
+@@ -270,8 +270,6 @@
+
+ install: install-recursive
+
+- cd @GEO_DIR@; make install
+-
+ @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
+
+ @echo ""
+diff -Naur ntop-3.3.9.orig/configure.in ntop-3.3.9/configure.in
+--- ntop-3.3.9.orig/configure.in 2009-12-30 12:37:36.997426119 -0800
++++ ntop-3.3.9/configure.in 2009-12-30 12:39:44.841488896 -0800
+@@ -1916,10 +1916,8 @@
+ fi
+
+
+-GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
+-GEO_IP="$GEO_DIR/libGeoIP/"
+-CFLAGS="$CFLAGS -I$GEO_IP"
+-LDFLAGS="$LDFLAGS -L$GEO_IP.libs/ -lGeoIP"
++CFLAGS="$CFLAGS"
++LDFLAGS="$LDFLAGS -lGeoIP"
+
+ dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
+
+@@ -2084,7 +2082,6 @@
+ AC_SUBST(SO_VERSION_PATCH)
+ AC_SUBST(RRD_LIB)
+ AC_SUBST(RRD_INC)
+-AC_SUBST(GEO_DIR)
+
+ AC_CONFIG_FILES([Makefile])
+
[SM-Commit] GIT changes to master grimoire by Eric Sandall (1efd5f17eb3838b438c77e17a17bdd5cac177885),
Eric Sandall, 12/30/2009