X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ntop.spec;h=7aef63de0e563f0cb0cbe4dd1eacda6fc42649e7;hb=master;hp=deb5ed66ee322bf0cdc2c966a0943f8fafe8b6e4;hpb=19d05b6c6ac68e4a9ef00c265588dda71823bdf5;p=packages%2Fntop.git

diff --git a/ntop.spec b/ntop.spec
index deb5ed6..7aef63d 100644
--- a/ntop.spec
+++ b/ntop.spec
@@ -1,51 +1,51 @@
 # 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
-#
-# Conditional build:
-%bcond_with	mysql	# with mysql support
+# - unpackaged
+#        /etc/ntop/GeoIPASNum.dat
+#        /etc/ntop/GeoLiteCity.dat
+#        /usr/lib64/libntop.a
+#        /usr/lib64/libntopreport.a
+# NOTE: can read oui.txt.xz if MAKE_WITH_ZLIB enabled
 
 Summary:	Network monitoring tool
 Summary(pl.UTF-8):	Narzędzie do monitorowania sieci
 Name:		ntop
-Version:	3.3.10
-Release:	3
-License:	GPL
+Version:	5.0.1
+Release:	9
+License:	GPL v3+
 Group:		Networking
 Source0:	http://downloads.sourceforge.net/ntop/%{name}-%{version}.tar.gz
-# Source0-md5:	6e2ffa90d5f935c8f03d88a5dd19a866
+# Source0-md5:	01710b6925a8a5ffe1a41b8b512ebd69
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
+# http://ettercap.cvs.sourceforge.net/ettercap/ettercap_ng/share/etter.finger.os?rev=HEAD
+Source3:	etter.finger.os
 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
+Patch8:		%{name}-rrdtool-1.6.0.patch
+Patch9:		ac-am.patch
 URL:		http://www.ntop.org/
 BuildRequires:	GeoIP-devel
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake >= 1.6
 BuildRequires:	gawk
-BuildRequires:	gd-devel >= 2.0.1
 BuildRequires:	gdbm-devel >= 1.8.3
-BuildRequires:	gdome2-devel
-BuildRequires:	glib2-devel
-BuildRequires:	libevent-devel >= 1.4.0
 BuildRequires:	libpcap-devel
-BuildRequires:	libpng-devel
-BuildRequires:	libtiff-devel
 BuildRequires:	libtool
-BuildRequires:	libwrap-devel
-BuildRequires:	lua51-devel
-BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	net-snmp-devel
 BuildRequires:	openssl-devel >= 0.9.7d
-BuildRequires:	readline-devel >= 4.2
+BuildRequires:	perl-devel
+BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	rrdtool-devel >= 1.1.0
+BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
 Requires(post,postun):	/sbin/ldconfig
 Requires(post,preun):	/sbin/chkconfig
@@ -55,12 +55,12 @@ Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
+Requires:	hwdata >= 0.243-2
 Requires:	rc-scripts >= 0.4.2.8
 # maybe is optional, needs checking
 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)
@@ -85,28 +85,36 @@ robi to popularna uniksowa komenda top.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
-rm oui.txt.gz
+gzip -9c %{SOURCE3} >etter.finger.os.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
 
+%{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' python/sankey.py
+
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+
+cd nDPI
+%configure
+%{__make}
+cd ..
+
 # "verified.awk -u" calls require gawk
 %configure \
 	AWK=gawk \
 	--disable-static \
 	--with-gnu-ld \
 	--with-ossl-root=%{_prefix} \
-	--with-tcpwrap \
-	--enable-snmp \
-	%{?with_mysql:--enable-mysql}
+	--enable-snmp
 
 %{__make}
 
@@ -129,7 +137,8 @@ for p in icmpPlugin lastSeenPlugin netflowPlugin cpacketPlugin rrdPlugin sflowPl
 	ln -snf ../../lib$p-%{version}.so $RPM_BUILD_ROOT%{_libdir}/ntop/plugins/$p.so
 done
 
-ln -s %{_datadir}/oui.txt $RPM_BUILD_ROOT%{_sysconfdir}/ntop/oui.txt
+# read by checkForInputFile() scanning various dirs and extensions
+ln -s /lib/hwdata/oui.txt $RPM_BUILD_ROOT%{_sysconfdir}/ntop/oui.txt
 
 # no -devel
 rm -f $RPM_BUILD_ROOT%{_libdir}{,/ntop/plugins}/*.la