rpms/ntop/devel ntop-disable-etter_fingerprint_download.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 import.log, 1.4, 1.5 ntop.spec, 1.14, 1.15 sources, 1.5, 1.6 ntop-enable-sslv3.patch, 1.1, NONE ntop-geoip.patch, 1.2, NONE ntop-lua_wget.patch, 1.1, NONE

Tue May 4 09:33:08 UTC 2010

Author: rakesh

Update of /cvs/pkgs/rpms/ntop/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22542/devel

Modified Files:
	.cvsignore import.log ntop.spec sources 
Added Files:
	ntop-disable-etter_fingerprint_download.patch 
Removed Files:
	ntop-enable-sslv3.patch ntop-geoip.patch ntop-lua_wget.patch 
Log Message:
Updated to latest 3.4-pre3


ntop-disable-etter_fingerprint_download.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ntop-disable-etter_fingerprint_download.patch ---
--- ntop-3.4-pre3.org/Makefile.am	2010-02-13 17:08:02.000000000 +0530
+++ ntop-3.4-pre3/Makefile.am	2010-05-04 13:23:12.291539308 +0530
@@ -336,7 +336,7 @@
 install-selinux-policy:
 	chcon -t textrel_shlib_t $(DESTDIR)$(libdir)/*ntop*.so
 
-install-data-local: ntop.txt ntop.html faq.html dnetter
+install-data-local: ntop.txt ntop.html faq.html
 	@$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)/plugins;
 	@if ! test -d $(DESTDIR)/$(datadir)/ntop; then \
 	  $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/ntop; \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	5 Aug 2009 15:25:07 -0000	1.5
+++ .cvsignore	4 May 2010 09:33:07 -0000	1.6
@@ -1,3 +1,4 @@
 GeoIPASNum.dat.gz
 GeoLiteCity.dat.gz
-ntop-3.3.10.tar.gz
+etter.finger.os.gz
+ntop-3.4-pre3.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	10 Oct 2009 06:09:31 -0000	1.4
+++ import.log	4 May 2010 09:33:08 -0000	1.5
@@ -2,3 +2,4 @@ ntop-3_3_6-5_fc9:HEAD:ntop-3.3.6-5.fc9.s
 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-3_3_10-3_fc12:HEAD:ntop-3.3.10-3.fc12.src.rpm:1255155644
+ntop-3_4-0_1_pre3_fc12:HEAD:ntop-3.4-0.1.pre3.fc12.src.rpm:1272964725


Index: ntop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/devel/ntop.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ntop.spec	7 Dec 2009 16:53:21 -0000	1.14
+++ ntop.spec	4 May 2010 09:33:08 -0000	1.15
@@ -1,29 +1,29 @@
 Name:           ntop
-Version:        3.3.10
-Release:        4%{?dist}
+Version:        3.4
+Release:        0.1.pre3%{?dist}
 Summary:        A network traffic probe similar to the UNIX top command
 Group:          Applications/Internet
 # Confirmed from fedora legal 488717
 License:        GPLv2 and BSD with advertising
 URL:            http://www.ntop.org
-Source0:        http://downloads.sourceforge.net/ntop/ntop-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/ntop/ntop-%{version}-pre3.tar.gz
 Source1:        ntop.init
 Source2:        ntop.conf
 Source3:        http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
 Source4:        http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
+# Source: wget -O etter.finger.os.gz http://ettercap.cvs.sourceforge.net/ettercap/ettercap_ng/share?rev=HEAD
+Source5:	etter.finger.os.gz
 Patch1:         ntop-am.patch
 Patch2:         ntop-running-user.patch
 Patch3:         ntop-dbfile-default-dir.patch
-Patch4:         ntop-enable-sslv3.patch
-Patch5:         ntop-geoip.patch
-Patch6:         ntop-lua_wget.patch
-Patch7:         ntop-http_c.patch
+Patch4: 	ntop-disable-etter_fingerprint_download.patch
+Patch5:         ntop-http_c.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, libevent-devel, lua-devel
+BuildRequires:  GeoIP-devel, libevent-devel, lua-devel, python-devel
 Requires:       initscripts, graphviz
 Requires(post): /sbin/chkconfig       
 Requires(post): openssl >= 0.9.7f-4, /bin/cat
@@ -53,7 +53,7 @@ password can be selected.
 
 
 %prep
-%setup -q -n ntop-%{version}
+%setup -q -n ntop-%{version}-pre3
 cp %SOURCE3 ./ && gunzip GeoLiteCity.dat.gz
 cp %SOURCE4 ./ && gunzip GeoIPASNum.dat.gz
 
@@ -67,10 +67,8 @@ find . \( -name \*\.gz -o -name \*\.c -o
 %patch1 -p1 -b .am
 %patch2 -p1 -b .user
 %patch3 -p1 -b .dbfile-default-dir
-%patch4 -p1 -b .sslv3
-%patch5 -p1 -b .geo
-%patch6 -p1 -b .lua_wget
-%patch7 -p1 -b .http_c
+%patch4 -p1 -b .ntop-disable-etter_fingerprint_download
+%patch5 -p1 -b .http_c
 
 %build
 #run ntop own autoconf wrapper
@@ -190,6 +188,9 @@ fi
 %{_localstatedir}/lib/ntop/rrd
 
 %changelog
+* Tue May  4 2010 Rakesh Pandit <rakesh at fedoraproject.org> - 3.4-0.1.pre3
+- Updated to 3.4-pre3
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 3.3.10-4
 - rebuild against perl 5.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ntop/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	5 Aug 2009 15:25:07 -0000	1.5
+++ sources	4 May 2010 09:33:08 -0000	1.6
@@ -1,3 +1,4 @@
 32997e6d3b1df64cbbb3ecc0adfb9ad8  GeoIPASNum.dat.gz
 1838a3a68f2c7a9eb310cee8f82b6a64  GeoLiteCity.dat.gz
-6e2ffa90d5f935c8f03d88a5dd19a866  ntop-3.3.10.tar.gz
+558706114f5389f499863b4377f4711f  etter.finger.os.gz
+4b4977b6d5f78110d32af09bff7e4bfa  ntop-3.4-pre3.tar.gz


--- ntop-enable-sslv3.patch DELETED ---


--- ntop-geoip.patch DELETED ---


--- ntop-lua_wget.patch DELETED ---

