[ntop] update to latest upstream release (rhbz #652868) rebuild to not include debug info (rhbz #713613) fi
Sven Lankes
slankes at fedoraproject.org
Thu Nov 24 11:51:47 UTC 2011
commit 22865942b90ab1eee84871679be830b4fdd4a8b5
Author: Sven Lankes <sven at lank.es>
Date: Thu Nov 24 12:51:43 2011 +0100
update to latest upstream release (rhbz #652868)
rebuild to not include debug info (rhbz #713613)
fix file permissions for graphviz output to work (rhbz #696607)
use correct path to graphviz dot tool
update ntop.conf to allow the service to start (rhbz #652868)
.gitignore | 1 +
ntop-dot-default-path.patch | 11 +++++++++++
ntop.conf | 5 -----
ntop.spec | 23 +++++++++++++++++------
sources | 2 +-
5 files changed, 30 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f502ad7..8071b2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ GeoIPASNum.dat.gz
GeoLiteCity.dat.gz
etter.finger.os.gz
ntop-3.4-pre3.tar.gz
+/ntop-4.1.0.tar.gz
diff --git a/ntop-dot-default-path.patch b/ntop-dot-default-path.patch
new file mode 100644
index 0000000..d1c6455
--- /dev/null
+++ b/ntop-dot-default-path.patch
@@ -0,0 +1,11 @@
+--- report.c.orig 2011-11-24 12:08:40.453365662 +0100
++++ report.c 2011-11-24 12:08:50.461395335 +0100
+@@ -2091,7 +2091,7 @@
+ if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
+ snprintf(dotPath, sizeof(dotPath), "%s", buf);
+ } else {
+- snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot");
++ snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot");
+ storePrefsValue("dot.path", dotPath); /* Set the default */
+ }
+
diff --git a/ntop.conf b/ntop.conf
index d1f2910..3df7aa0 100644
--- a/ntop.conf
+++ b/ntop.conf
@@ -13,11 +13,6 @@
# limit ntop to listening on a specific interface and port
--http-server 127.0.0.1:3000 --https-server 127.0.0.1:3001
-# Under certain circumstances, the sched_yield() function causes the ntop web
-# server to lock up. It shouldn't happen, but it does. This option causes
-# ntop to skip those calls, at a tiny performance penalty.
---disable-schedyield
-
# disables "phone home" behavior
--skip-version-check=yes
diff --git a/ntop.spec b/ntop.spec
index 901bf43..c26ac06 100644
--- a/ntop.spec
+++ b/ntop.spec
@@ -1,23 +1,24 @@
Name: ntop
-Version: 3.4
-Release: 0.9.pre3%{?dist}
+Version: 4.1.0
+Release: 1%{?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}-pre3.tar.gz
+Source0: http://downloads.sourceforge.net/ntop/ntop-%{version}.tar.gz
Source1: ntop.service
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
+Source5: etter.finger.os.gz
Patch1: ntop-am.patch
Patch2: ntop-running-user.patch
Patch3: ntop-dbfile-default-dir.patch
-Patch4: ntop-disable-etter_fingerprint_download.patch
+Patch4: ntop-disable-etter_fingerprint_download.patch
Patch5: ntop-http_c.patch
+Patch6: ntop-dot-default-path.patch
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
@@ -54,7 +55,7 @@ password can be selected.
%prep
-%setup -q -n ntop-%{version}-pre3
+%setup -q -n ntop-%{version}
cp %SOURCE3 ./ && gunzip GeoLiteCity.dat.gz
cp %SOURCE4 ./ && gunzip GeoIPASNum.dat.gz
@@ -70,6 +71,7 @@ find . \( -name \*\.gz -o -name \*\.c -o -name \*\.h -o -name \*\.pdf \
%patch3 -p1 -b .dbfile-default-dir
%patch4 -p1 -b .ntop-disable-etter_fingerprint_download
%patch5 -p1 -b .http_c
+%patch6 -p0 -b .dot-default-path
%build
#run ntop own autoconf wrapper
@@ -99,6 +101,7 @@ install -p -m 0644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/ntop.conf
find $RPM_BUILD_ROOT -name \*\.la -print | xargs rm -f
# these are not dlopened modules, but -devel cruft
rm -f $RPM_BUILD_ROOT/%{_libdir}/lib{myrrd,ntop,ntopreport,*Plugin*}.so
+rm -f $RPM_BUILD_ROOT/%{_libdir}/lib{myrrd,ntop,ntopreport,*Plugin*}.a
# remove empty file
rm -f $RPM_BUILD_ROOT/%{_datadir}/ntop/html/ntop.html
# fix permissions
@@ -182,6 +185,7 @@ fi
%{_libdir}/ntop
%{_mandir}/man8/*
%{_datadir}/ntop
+%defattr(0755,ntop,ntop,-)
%dir %{_localstatedir}/lib/ntop
%defattr(0644,root,root,-)
%ghost %{_localstatedir}/lib/ntop/addressQueue.db
@@ -198,6 +202,13 @@ fi
%{_localstatedir}/lib/ntop/rrd
%changelog
+* Thu Nov 23 2011 Sven Lankes <sven at lank.es> - 4.1.0-1
+- update to latest upstream release (rhbz #652868)
+- rebuild to not include debug info (rhbz #713613)
+- fix file permissions for graphviz output to work (rhbz #696607)
+- use correct path to graphviz dot tool
+- update ntop.conf to allow the service to start (rhbz #652868)
+
* Fri Sep 9 2011 Tom Callaway <spot at fedoraproject.org> - 3.4-0.9.pre3
- add missing systemd scriptlets
diff --git a/sources b/sources
index 375acaa..d484175 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
32997e6d3b1df64cbbb3ecc0adfb9ad8 GeoIPASNum.dat.gz
1838a3a68f2c7a9eb310cee8f82b6a64 GeoLiteCity.dat.gz
558706114f5389f499863b4377f4711f etter.finger.os.gz
-4b4977b6d5f78110d32af09bff7e4bfa ntop-3.4-pre3.tar.gz
+116df99cf548431393991ea15443c52f ntop-4.1.0.tar.gz
More information about the scm-commits
mailing list