Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 net/ntop/BUILD                  |    3 +--
 net/ntop/CONFIGURE              |    2 --
 net/ntop/DEPENDS                |    1 +
 net/ntop/DETAILS                |    6 ++++++
 net/ntop/GeoIPASNum.dat.gz.sig  |binary
 net/ntop/GeoLiteCity.dat.gz.sig |binary
 net/ntop/HISTORY                |   11 +++++++++++
 net/ntop/PRE_BUILD              |   25 +++++++++++++++++++++++--
 net/ntop/init.d/ntop            |    4 ++--
 net/ntop/init.d/ntop.conf       |   12 ++++++++++++
 net/ntop/systemgeoip.patch      |   36 ++++++++++++++++++++++++++++++++++++
 11 files changed, 92 insertions(+), 8 deletions(-)

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>

    ntop: SSLv3 is no longer configurable

diff --git a/net/ntop/BUILD b/net/ntop/BUILD
index c611889..bf828c0 100755
--- a/net/ntop/BUILD
+++ b/net/ntop/BUILD
@@ -1,5 +1,4 @@
-OPTS="$NTOP_SSLV3                                \
-      --localstatedir=${INSTALL_ROOT}/var/cache  \
+OPTS="--localstatedir=${INSTALL_ROOT}/var/cache  \
       $OPTS"                                     &&
 make_single                                      &&
 default_build
diff --git a/net/ntop/CONFIGURE b/net/ntop/CONFIGURE
deleted file mode 100755
index ea5783c..0000000
--- a/net/ntop/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query_option  NTOP_SSLV3  'Enable SSLv3 support?' y  \
-                     '--enable-sslv3'  '--disable-sslv3'
diff --git a/net/ntop/DEPENDS b/net/ntop/DEPENDS
index b3ba28a..5c7b206 100755
--- a/net/ntop/DEPENDS
+++ b/net/ntop/DEPENDS
@@ -1,6 +1,7 @@
 depends  autoconf  &&
 depends  automake  &&
 depends  gawk      &&
+depends  geoip     &&
 depends  gd        &&
 depends  gdbm      &&
 depends  libtool   &&
diff --git a/net/ntop/DETAILS b/net/ntop/DETAILS
index a0c9f74..c1bf1a7 100755
--- a/net/ntop/DETAILS
+++ b/net/ntop/DETAILS
@@ -1,10 +1,16 @@
            SPELL=ntop
          VERSION=3.3.9
           SOURCE=$SPELL-$VERSION.tar.gz
+         SOURCE2=GeoLiteCity.dat.gz
+         SOURCE3=GeoIPASNum.dat.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+  SOURCE2_URL[0]=http://www.maxmind.com/download/geoip/database/$SOURCE2
+  
SOURCE3_URL[0]=http://www.maxmind.com/download/geoip/database/asnum/$SOURCE3
 #     
SOURCE_HASH=sha512:6aeb2b7194376a7f04a64800ec272785d7ce57429c3931506506c28a809f3febff8df3ba50f432f198efb0e83553dc99c0824fe63af6574b63054ce8eec34d2e
       SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+     SOURCE2_GPG="gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME"
+     SOURCE3_GPG="gurus.gpg:$SOURCE3.sig:WORKS_FOR_ME"
       LICENSE[0]=GPL
         WEB_SITE=http://www.ntop.org/
         KEYWORDS="net"
diff --git a/net/ntop/GeoIPASNum.dat.gz.sig b/net/ntop/GeoIPASNum.dat.gz.sig
new file mode 100644
index 0000000..ec5484a
Binary files /dev/null and b/net/ntop/GeoIPASNum.dat.gz.sig differ
diff --git a/net/ntop/GeoLiteCity.dat.gz.sig b/net/ntop/GeoLiteCity.dat.gz.sig
new file mode 100644
index 0000000..f4635af
Binary files /dev/null and b/net/ntop/GeoLiteCity.dat.gz.sig differ
diff --git a/net/ntop/HISTORY b/net/ntop/HISTORY
index 5d11adb..8fbc353 100644
--- a/net/ntop/HISTORY
+++ b/net/ntop/HISTORY
@@ -1,3 +1,14 @@
+2009-12-30 Eric Sandall <sandalle AT sourcemage.org>
+       * DETAILS: Add GeoLiteCity.dat.gz and GeoIPASNum.dat.gz SOURCEs
+       * DEPENDS: Depends on geoip
+       * CONFIGURE: SSLv3 is no longer configurable
+       * PRE_BUILD: Verify SOURCE2 and SOURCE3 before unpacking
+         Apply systemgeoip.patch
+       * BUILD: Remove passing NTOP_SSLV3
+       * systemgeoip.patch: Remove ntop internal geoip download/install
+       * init.d/ntop{,.conf}: Allow configuring interface merge
+         Allow enabling (default off) w3c HTML 4.01 output
+
 2009-09-09 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Depends on perl
 
diff --git a/net/ntop/PRE_BUILD b/net/ntop/PRE_BUILD
index f660002..624f34e 100755
--- a/net/ntop/PRE_BUILD
+++ b/net/ntop/PRE_BUILD
@@ -1,3 +1,24 @@
-default_pre_build        &&
-cd  $SOURCE_DIRECTORY    &&
+default_pre_build         &&
+verify_source "$SOURCE2"  &&
+verify_source "$SOURCE3"  &&
+cd $SOURCE_DIRECTORY      &&
+
+#
+# Remove building of internal GeoIP
+#
+patch -p1 < $SPELL_DIRECTORY/systemgeoip.patch &&
+
+#
+# Unpack already downloaded GeoIP data
+#
+cp $SOURCE_CACHE/$SOURCE2 .  &&
+cp $SOURCE_CACHE/$SOURCE3 .  &&
+gunzip $SOURCE2              &&
+gunzip $SOURCE3              &&
+
+#
+# Fake GeoIP source as it's already installed
+#
+touch GeoIP.tar.gz  &&
+
 ./autogen.sh --noconfig
diff --git a/net/ntop/init.d/ntop b/net/ntop/init.d/ntop
index 4624a68..aaaba9f 100644
--- a/net/ntop/init.d/ntop
+++ b/net/ntop/init.d/ntop
@@ -12,8 +12,8 @@ fi
 
 PROGRAM=/usr/bin/ntop
 NAME="ntop (using following interfaces: ${IFACES}"
-ARGS="-d -u ntop -w $HTTP_PORT -W $HTTPS_PORT \
-          --use-syslog=daemon -i ${IFACES} -M"
+ARGS="-d -u ntop -w $HTTP_PORT -W $HTTPS_PORT ${W3C} \
+          --use-syslog=daemon -i ${IFACES} ${INTERFACE_MERGE}"
 RUNLEVEL=3
 NEEDS="+network +remote_fs"
 
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])
+