rpms/ntop/devel ntop-lua_wget.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 import.log, 1.2, 1.3 ntop-geoip.patch, 1.1, 1.2 ntop.spec, 1.10, 1.11 sources, 1.4, 1.5 ntop-http_c.patch, 1.1, NONE

Wed Aug 5 15:25:07 UTC 2009

Author: rakesh

Update of /cvs/pkgs/rpms/ntop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20459/devel

Modified Files:
	.cvsignore import.log ntop-geoip.patch ntop.spec sources 
Added Files:
	ntop-lua_wget.patch 
Removed Files:
	ntop-http_c.patch 
Log Message:

 - Updated to 3.3.10, updated geoip patch
 - lua_wget patch to prevent wget lua
 - removed ntop-http_c.patch



ntop-lua_wget.patch:
 configure.in |   20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

--- NEW FILE ntop-lua_wget.patch ---
--- ntop-3.3.10.org/configure.in	2009-08-05 20:23:00.296160799 +0530
+++ ntop-3.3.10/configure.in	2009-08-05 20:34:16.656165445 +0530
@@ -1644,25 +1644,7 @@
   fi
 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}"
+LIBS="-llua ${LIBS} "
 AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported])
 
 dnl>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	2 Mar 2009 18:09:12 -0000	1.4
+++ .cvsignore	5 Aug 2009 15:25:07 -0000	1.5
@@ -1,4 +1,3 @@
-GeoIP.tar.gz
 GeoIPASNum.dat.gz
 GeoLiteCity.dat.gz
-ntop-3.3.9.tar.gz
+ntop-3.3.10.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	22 Oct 2008 13:36:48 -0000	1.2
+++ import.log	5 Aug 2009 15:25:07 -0000	1.3
@@ -1,2 +1,3 @@
 ntop-3_3_6-5_fc9:HEAD:ntop-3.3.6-5.fc9.src.rpm:1218561708
 ntop-3_3_8-1_fc10:HEAD:ntop-3.3.8-1.fc10.src.rpm:1224702132
+ntop-3_3_10-1_fc11:HEAD:ntop-3.3.10-1.fc11.src.rpm:1249486132

ntop-geoip.patch:
 Makefile.am  |    2 --
 configure.in |   49 ++++++++++++++++---------------------------------
 2 files changed, 16 insertions(+), 35 deletions(-)

Index: ntop-geoip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/devel/ntop-geoip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ntop-geoip.patch	5 Mar 2009 11:59:43 -0000	1.1
+++ ntop-geoip.patch	5 Aug 2009 15:25:07 -0000	1.2
@@ -1,7 +1,6 @@
-diff -up ntop-3.3.9/configure.in.geo ntop-3.3.9/configure.in
---- ntop-3.3.9/configure.in.geo	2009-03-05 11:30:53.000000000 +0100
-+++ ntop-3.3.9/configure.in	2009-03-05 11:30:53.000000000 +0100
-@@ -1890,40 +1890,23 @@ else
+--- ntop-3.3.10.org/configure.in	2009-08-05 19:30:31.141160363 +0530
++++ ntop-3.3.10/configure.in	2009-08-05 19:34:11.076160092 +0530
+@@ -1962,40 +1962,23 @@
      }'`
  fi
  
@@ -10,14 +9,14 @@ diff -up ntop-3.3.9/configure.in.geo nto
 -   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
@@ -54,14 +53,13 @@ diff -up ntop-3.3.9/configure.in.geo nto
 -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"
  
  dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
  
-diff -up ntop-3.3.9/Makefile.am.geo ntop-3.3.9/Makefile.am
---- ntop-3.3.9/Makefile.am.geo	2009-03-05 11:39:26.000000000 +0100
-+++ ntop-3.3.9/Makefile.am	2009-03-05 12:20:11.000000000 +0100
-@@ -262,8 +262,6 @@ libclean:
+--- ntop-3.3.10.org/Makefile.am	2009-08-05 19:30:31.115222483 +0530
++++ ntop-3.3.10/Makefile.am	2009-08-05 19:34:51.918165468 +0530
+@@ -270,8 +270,6 @@
  
  install: install-recursive
  


Index: ntop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/devel/ntop.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ntop.spec	25 Jul 2009 19:39:24 -0000	1.10
+++ ntop.spec	5 Aug 2009 15:25:07 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           ntop
-Version:        3.3.9
-Release:        6%{?dist}
+Version:        3.3.10
+Release:        1%{?dist}
 Summary:        A network traffic probe similar to the UNIX top command
 Group:          Applications/Internet
 # Confirmed from fedora legal 488717
@@ -16,13 +16,13 @@ Patch2:         ntop-running-user.patch
 Patch3:         ntop-dbfile-default-dir.patch
 Patch4:         ntop-enable-sslv3.patch
 Patch5:         ntop-geoip.patch
-Patch6:         ntop-http_c.patch
+Patch6:         ntop-lua_wget.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  autoconf, automake, pkgconfig, libtool, groff, libpcap-devel wget
 BuildRequires:  gdbm-devel, gd-devel, rrdtool-devel, openssl-devel
 BuildRequires:  net-snmp-devel, lm_sensors-devel, pcre-devel, mysql-devel
 BuildRequires:  tcp_wrappers-devel, perl(ExtUtils::Embed)
-BuildRequires:  GeoIP-devel
+BuildRequires:  GeoIP-devel, libevent-devel, lua-devel
 Requires:       initscripts, graphviz
 Requires(post): /sbin/chkconfig       
 Requires(post): openssl >= 0.9.7f-4, /bin/cat
@@ -68,7 +68,8 @@ find . \( -name \*\.gz -o -name \*\.c -o
 %patch3 -p1 -b .dbfile-default-dir
 %patch4 -p1 -b .sslv3
 %patch5 -p1 -b .geo
-%patch6 -p1 -b .http_c
+%patch6 -p1 -b .lua_wget
+#%patch6 -p1 -b .http_c
 
 %build
 #run ntop own autoconf wrapper
@@ -188,6 +189,11 @@ fi
 %{_localstatedir}/lib/ntop/rrd
 
 %changelog
+* Wed Aug 05 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 3.3.10-1
+- Updated to 3.3.10, updated geoip patch
+- lua_wget patch to prevent wget lua
+- removed ntop-http_c.patch
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	2 Mar 2009 18:09:12 -0000	1.4
+++ sources	5 Aug 2009 15:25:07 -0000	1.5
@@ -1,4 +1,3 @@
-cb14b1beeb40631a12676b11ca0c309a  GeoIP.tar.gz
 32997e6d3b1df64cbbb3ecc0adfb9ad8  GeoIPASNum.dat.gz
 1838a3a68f2c7a9eb310cee8f82b6a64  GeoLiteCity.dat.gz
-0c22038e0f2aa003110437b5a5d5a6a5  ntop-3.3.9.tar.gz
+6e2ffa90d5f935c8f03d88a5dd19a866  ntop-3.3.10.tar.gz


--- ntop-http_c.patch DELETED ---


