packages: ntop/ntop-lua_wget.patch, ntop/ntop.spec - updated to 4.0 - ntop-...

[lisu]

Author: lisu                         Date: Tue Jul 20 09:07:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 4.0
- ntop-geoip.patch is not longer needed
- apply ntop-install.patch whchi fixes installation
- TODO: fix init script which returns error when trying to start daemon

---- Files affected:
packages/ntop:
   ntop-lua_wget.patch (1.1 -> 1.2) , ntop.spec (1.92 -> 1.93) 

---- Diffs:

================================================================
Index: packages/ntop/ntop-lua_wget.patch
diff -u packages/ntop/ntop-lua_wget.patch:1.1 packages/ntop/ntop-lua_wget.patch:1.2
--- packages/ntop/ntop-lua_wget.patch:1.1	Tue Apr  6 23:20:02 2010
+++ packages/ntop/ntop-lua_wget.patch	Tue Jul 20 11:07:47 2010
@@ -1,9 +1,6 @@
---- 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,8 @@
-   fi
- fi
- 
+--- ntop-4.0/misc/configure.in.lua~	2009-08-11 10:24:46.000000000 +0200
++++ ntop-4.0/misc/configure.in.lua	2010-07-20 09:04:41.581951627 +0200
+@@ -1,21 +1,4 @@
 -dnl>
 -dnl> Lua - http://www.lua.org
 -dnl>
@@ -27,4 +24,3 @@
 +INCS="${INCS} -I/usr/include/lua51"
  AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported])
  
- dnl>

================================================================
Index: packages/ntop/ntop.spec
diff -u packages/ntop/ntop.spec:1.92 packages/ntop/ntop.spec:1.93
--- packages/ntop/ntop.spec:1.92	Sun Jun  6 10:53:18 2010
+++ packages/ntop/ntop.spec	Tue Jul 20 11:07:47 2010
@@ -2,6 +2,7 @@
 # TODO
 # - see if it uses system files for ettercap and geoip, ieee-oui files we did not package
 # - see where plugins are needed in plugin dir or in system dir
+# - fix init script (--redirdfs is bogus?)
 #
 # Conditional build:
 %bcond_with	mysql	# with mysql support
@@ -9,22 +10,22 @@
 Summary:	Network monitoring tool
 Summary(pl.UTF-8):	Narzędzie do monitorowania sieci
 Name:		ntop
-Version:	3.3.10
-Release:	5
-License:	GPL
+Version:	4.0
+Release:	0.1
+License:	GPL v3+
 Group:		Networking
 Source0:	http://downloads.sourceforge.net/ntop/%{name}-%{version}.tar.gz
-# Source0-md5:	6e2ffa90d5f935c8f03d88a5dd19a866
+# Source0-md5:	c5fc7863d8ba08654ef7b4d88ff860f4
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-conf.patch
 Patch1:		%{name}-config.patch
 Patch2:		%{name}-am.patch
 Patch3:		%{name}-lua_wget.patch
-Patch4:		%{name}-geoip.patch
-Patch5:		%{name}-http_c.patch
-Patch6:		%{name}-running-user.patch
-Patch7:		ieee-oui.patch
+Patch4:		%{name}-http_c.patch
+Patch5:		%{name}-running-user.patch
+Patch6:		ieee-oui.patch
+Patch7:		%{name}-install.patch
 URL:		http://www.ntop.org/
 BuildRequires:	GeoIP-devel
 BuildRequires:	autoconf
@@ -34,6 +35,7 @@
 BuildRequires:	gdbm-devel >= 1.8.3
 BuildRequires:	gdome2-devel
 BuildRequires:	glib2-devel
+BuildRequires:	libdbi-devel
 BuildRequires:	libevent-devel >= 1.4.0
 BuildRequires:	libpcap-devel
 BuildRequires:	libpng-devel
@@ -59,10 +61,10 @@
 Requires(pre):	/usr/sbin/useradd
 Requires:	rc-scripts >= 0.4.2.8
 # maybe is optional, needs checking
+Requires:	ieee-oui
 Suggests:	GeoIP-db-City
 Suggests:	GeoIP-db-IPASNum
 Suggests:	ettercap
-Requires:	ieee-oui
 Provides:	group(ntop)
 Provides:	user(ntop)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -88,8 +90,6 @@
 %patch6 -p1
 %patch7 -p1
 
-rm oui.txt.gz
-
 # taken from autogen.sh
 cp -f %{_aclocaldir}/libtool.m4 libtool.m4.in
 cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
@@ -187,6 +187,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.93  2010/07/20 09:07:47  lisu
+- updated to 4.0
+- ntop-geoip.patch is not longer needed
+- apply ntop-install.patch whchi fixes installation
+- TODO: fix init script which returns error when trying to start daemon
+
 Revision 1.92  2010/06/06 08:53:18  arekm
 - release 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntop/ntop-lua_wget.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntop/ntop.spec?r1=1.92&r2=1.93&f=u