- Update to 3.3.10

- Pass maintainership to submitter

PR:		138919
Submitted by:	Sylvio Cesar <scjamorim@bsd.com.br>
Feature safe:	yes

4 files changed, 48 insertions, 31 deletions

diff --git a/net/ntop/files/patch-Makefile.am b/net/ntop/files/patch-Makefile.am
index 93942eff21e9..e5ec90c30bcb 100644
--- a/net/ntop/files/patch-Makefile.am
+++ b/net/ntop/files/patch-Makefile.am
@@ -1,5 +1,5 @@
---- Makefile.am.orig	2008-12-03 17:00:22.000000000 -0500
-+++ Makefile.am	2009-06-02 14:27:56.863148713 -0400
+--- Makefile.am.orig	2009-04-17 17:27:57.000000000 -0300
++++ Makefile.am	2009-09-15 13:07:19.000000000 -0300
 @@ -76,9 +76,7 @@
  NTOPDATA = ntop-cert.pem \
             $(ETTER_PASSIVE) \
@@ -20,8 +20,8 @@
  	@mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
  
  	@echo ""
-@@ -336,7 +332,6 @@
- 
+@@ -341,7 +337,6 @@
+ 	chcon -t textrel_shlib_t $(DESTDIR)$(libdir)/*ntop*.so
  
  install-data-local: ntop.txt ntop.html faq.html
 -	@$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)/plugins;
diff --git a/net/ntop/files/patch-autogen.sh b/net/ntop/files/patch-autogen.sh
index c7e68b56319e..5fd3a5c43e81 100644
--- a/net/ntop/files/patch-autogen.sh
+++ b/net/ntop/files/patch-autogen.sh
@@ -1,5 +1,5 @@
---- autogen.sh.orig	2009-06-02 10:26:46.731977294 -0400
-+++ autogen.sh	2009-06-02 10:27:02.866983000 -0400
+--- autogen.sh.orig	2009-09-15 11:33:11.000000000 -0300
++++ autogen.sh	2009-09-15 11:34:06.000000000 -0300
 @@ -244,16 +244,6 @@
    GNU_OR_DIE=0
  }
diff --git a/net/ntop/files/patch-configure.in b/net/ntop/files/patch-configure.in
index 1d11d9fea18a..32b7fd41b6d2 100644
--- a/net/ntop/files/patch-configure.in
+++ b/net/ntop/files/patch-configure.in
@@ -1,7 +1,7 @@
---- configure.in.orig	2008-12-03 17:00:22.000000000 -0500
-+++ configure.in	2009-06-02 13:28:01.067367126 -0400
-@@ -573,8 +573,8 @@
- dnl>
+--- configure.in.orig	2009-09-15 11:37:06.000000000 -0300
++++ configure.in	2009-09-15 11:45:13.000000000 -0300
+@@ -621,8 +621,8 @@
+ else
  if test ".${PCAP_ROOT}" != .; then
    if test -d $PCAP_ROOT &&
 -     test -r $PCAP_ROOT/libpcap.a &&
@@ -11,7 +11,35 @@
         PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
         CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap"
         INCS="${INCS} -I$PCAP_ROOT"
-@@ -1886,40 +1886,7 @@
+@@ -1650,27 +1650,6 @@
+ fi
+ 
+ dnl>
+-dnl> Lua - http://www.lua.org
+-dnl>
+-LUA_VERSION=lua-5.1.4
+-if test -f "$LUA_VERSION.tar.gz"; then
+-   echo "Lua already present on this machine"
+-else
+-   wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz
+-fi
+-
+-tar xvfz $LUA_VERSION.tar.gz
+-cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp
+-cat /tmp/lua.temp >  $LUA_VERSION/src/Makefile
+-#rm -f /tmp/lua.temp
+-cd $LUA_VERSION; make posix; cd ..
+-
+-LUA_LIB_DIR=$PWD/$LUA_VERSION"/src"
+-LIBS="-L${LUA_LIB_DIR} -llua ${LIBS} "
+-INCS="${INCS} -I${LUA_LIB_DIR}"
+-AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported])
+-
+-dnl>
+ dnl> SCTP - RFC 3286
+ dnl>
+ AC_MSG_CHECKING([sctp])
+@@ -1962,40 +1941,7 @@
      }'`
  fi
  
@@ -20,14 +48,14 @@
 -   echo "GeoIP already present on this machine"
 -else
 -   wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
--   tar xvfz GeoIP.tar.gz
--   GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
--   cd $GEO_DIR; ./configure; make; cd ..
--   # OSX Fix
--   GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
--   if test -f $GEO_DYLIB; then
--      ln -s $GEO_DYLIB .
--   fi
+-fi
+-tar xvfz GeoIP.tar.gz
+-GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
+-cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd ..
+-# OSX Fix
+-GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
+-if test -f $GEO_DYLIB; then
+-   ln -s $GEO_DYLIB .
 -fi
 -
 -if test -f "GeoLiteCity.dat"; then
@@ -48,7 +76,7 @@
 -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"
+-LDFLAGS="-L$GEO_IP.libs/ -lGeoIP $LDFLAGS"
 +LDFLAGS="$LDFLAGS -lGeoIP"
  
  dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
diff --git a/net/ntop/files/patch-plugins_netflowPlugin.c b/net/ntop/files/patch-plugins_netflowPlugin.c
deleted file mode 100644
index be5be50da805..000000000000
--- a/net/ntop/files/patch-plugins_netflowPlugin.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/netflowPlugin.c.orig	2009-06-22 14:00:56.000000000 -0400
-+++ plugins/netflowPlugin.c	2009-06-22 14:01:10.000000000 -0400
-@@ -28,7 +28,7 @@
- static void* netflowUtilsLoop(void* _deviceId);
- #endif
- 
--#define DEBUG_FLOWS
-+//#define DEBUG_FLOWS
- 
- #define CONST_NETFLOW_STATISTICS_HTML       "statistics.html"
-