- system ieee-oui package

- use --redirdfs in initscript as the daemon doesn't do it by itself

Changed files:
    ieee-oui.patch -> 1.1
    ntop.init -> 1.10
    ntop.spec -> 1.88

diff --git a/ieee-oui.patch b/ieee-oui.patch
new file mode 100644 (file)
index 0000000..3b4e472
--- /dev/null
+++ b/ieee-oui.patch
@@ -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)
+ 

diff --git a/ntop.init b/ntop.init
index f7e83cd154058aaa9c9a406a0d59bbfd5afda0ef..073fcd040cf61335b8e6c8635919ad439b27825c 100644 (file)
--- a/ntop.init
+++ b/ntop.init
@@ -44,7 +44,7 @@ case "$1" in
        # 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

diff --git a/ntop.spec b/ntop.spec
index 31531f3c82681a45af38a341e100aec8b93252a1..d5dea2271a8b25eb442fa1f1df9083202650b2d8 100644 (file)
--- a/ntop.spec
+++ b/ntop.spec
@@ -1,6 +1,5 @@
 # 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:
@@ -24,6 +23,7 @@ Patch3:               %{name}-lua_wget.patch
 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
@@ -55,11 +55,12 @@ Requires(pre):      /bin/id
 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)
@@ -83,6 +84,9 @@ robi to popularna uniksowa komenda top.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+
+rm oui.txt.gz
 
 # taken from autogen.sh
 cp -f %{_aclocaldir}/libtool.m4 libtool.m4.in
@@ -112,6 +116,7 @@ install -d $RPM_BUILD_ROOT{%{_localstatedir}/ntop/rrd,/etc/{rc.d/init.d,sysconfi
 
 %{__make} install \
        GEOIP_FILES= \
+       OUI_FILES= \
        ETTER_PASSIVE= \
        DESTDIR=$RPM_BUILD_ROOT
 
@@ -124,6 +129,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}/oui.txt
+
 # no -devel
 rm -f $RPM_BUILD_ROOT%{_libdir}{,/ntop/plugins}/*.la
 
@@ -157,7 +164,7 @@ fi
 %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