packages: ntop/ntop.init, ntop/ntop.spec, ntop/ieee-oui.patch (NEW) - syste...

[glen]

Author: glen                         Date: Wed Apr  7 07:08:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- system ieee-oui package
- use --redirdfs in initscript as the daemon doesn't do it by itself

---- Files affected:
packages/ntop:
   ntop.init (1.9 -> 1.10) , ntop.spec (1.87 -> 1.88) , ieee-oui.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ntop/ntop.init
diff -u packages/ntop/ntop.init:1.9 packages/ntop/ntop.init:1.10
--- packages/ntop/ntop.init:1.9	Tue Jan  6 23:50:14 2009
+++ packages/ntop/ntop.init	Wed Apr  7 09:08:07 2010
@@ -44,7 +44,7 @@
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/ntop ]; then
 		msg_starting ntop
-		daemon ntop @/etc/ntop.conf -d -P $NTOP_DIR
+		daemon --redirdfs /usr/sbin/ntop @/etc/ntop.conf -d -P $NTOP_DIR
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ntop
 	else

================================================================
Index: packages/ntop/ntop.spec
diff -u packages/ntop/ntop.spec:1.87 packages/ntop/ntop.spec:1.88
--- packages/ntop/ntop.spec:1.87	Wed Apr  7 00:08:10 2010
+++ packages/ntop/ntop.spec	Wed Apr  7 09:08:07 2010
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 # TODO
-# - see if it uses system files for ettercap and geoip files we did not package
-# - see if /etc/ntop/oui.txt.gz can be externalized (whatever it is)
+# - 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:
@@ -25,6 +24,7 @@
 Patch4:		%{name}-geoip.patch
 Patch5:		%{name}-http_c.patch
 Patch6:		%{name}-running-user.patch
+Patch7:		ieee-oui.patch
 URL:		http://www.ntop.org/
 BuildRequires:	GeoIP-devel
 BuildRequires:	autoconf
@@ -56,11 +56,12 @@
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires:	rc-scripts
+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)
@@ -84,6 +85,9 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+
+rm oui.txt.gz
 
 # taken from autogen.sh
 cp -f %{_aclocaldir}/libtool.m4 libtool.m4.in
@@ -113,6 +117,7 @@
 
 %{__make} install \
 	GEOIP_FILES= \
+	OUI_FILES= \
 	ETTER_PASSIVE= \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -125,6 +130,8 @@
 	ln -snf ../../lib$p-%{version}.so $RPM_BUILD_ROOT%{_libdir}/ntop/plugins/$p.so
 done
 
+ln -s %{_datadir}/oui.txt $RPM_BUILD_ROOT%{_sysconfdir}/oui.txt
+
 # no -devel
 rm -f $RPM_BUILD_ROOT%{_libdir}{,/ntop/plugins}/*.la
 
@@ -158,7 +165,7 @@
 %doc AUTHORS ChangeLog NEWS README THANKS docs/{1STRUN.txt,FAQ}
 %attr(750,root,ntop) %dir %{_sysconfdir}/ntop
 %attr(640,root,ntop) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntop/ntop-cert.pem
-%attr(640,root,ntop) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntop/oui.txt.gz
+%attr(640,root,ntop) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntop/oui.txt
 %attr(640,root,ntop) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntop/specialMAC.txt.gz
 %attr(660,root,ntop) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntop.conf
 %attr(754,root,root) /etc/rc.d/init.d/ntop
@@ -179,6 +186,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.88  2010/04/07 07:08:07  glen
+- system ieee-oui package
+- use --redirdfs in initscript as the daemon doesn't do it by itself
+
 Revision 1.87  2010/04/06 22:08:10  glen
 - symlink duplicate files, verbose files, enable snmp
 

================================================================
Index: packages/ntop/ieee-oui.patch
diff -u /dev/null packages/ntop/ieee-oui.patch:1.1
--- /dev/null	Wed Apr  7 09:08:13 2010
+++ packages/ntop/ieee-oui.patch	Wed Apr  7 09:08:07 2010
@@ -0,0 +1,16 @@
+--- ntop-3.3.10/Makefile.am~	2010-04-07 01:05:52.000000000 +0300
++++ ntop-3.3.10/Makefile.am	2010-04-07 09:18:06.085523903 +0300
+@@ -77,9 +77,12 @@
+ 	GeoIPASNum.dat \
+ 	GeoLiteCity.dat
+ 
++OUI_FILES = \
++	oui.txt.gz
++
+ NTOPDATA = ntop-cert.pem \
+            $(ETTER_PASSIVE) \
+-           oui.txt.gz \
++           %(OUI_FILES) \
+            specialMAC.txt.gz \
+ 		   $(GEOIP_FILES)
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntop/ntop.init?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntop/ntop.spec?r1=1.87&r2=1.88&f=u