- up to 5.0.1

diff --git a/ntop-http_c.patch b/ntop-http_c.patch
index 3596067e0c55a399eae4b280f643f7f1276deb2d..13bfbba9090cb6948fe7ff6965a86ada8cef3a8c 100644 (file)
--- a/ntop-http_c.patch
+++ b/ntop-http_c.patch
@@ -1,21 +1,7 @@
-revision 1.3
-date: 2009/10/10 06:09:31;  author: rakesh;  state: Exp;  lines: +11 -9
-Patch7: ntop-http_c_user.patch for #518264 (CVE-2009-2732)
-----------------------------
-revision 1.2
-date: 2009/08/05 15:25:07;  author: rakesh;  state: dead;  lines: +0 -0
-
- - Updated to 3.3.10, updated geoip patch
- - lua_wget patch to prevent wget lua
- - removed ntop-http_c.patch
-----------------------------
-revision 1.1
-date: 2009/03/17 08:28:30;  author: rakesh;  state: Exp;
-Fixed world-writable access log (#490561)
-
---- ntop-3.3.10.org/http.c     2009-09-13 14:23:48.895204786 +0530
-+++ ntop-3.3.10/http.c 2009-09-13 14:45:35.603204376 +0530
-@@ -3439,6 +3439,9 @@
+diff -urN ntop-5.0.orig/httpd.c ntop-5.0/httpd.c
+--- ntop-5.0.orig/httpd.c      2012-07-18 01:14:33.000000000 +0200
++++ ntop-5.0/httpd.c   2012-07-20 12:15:57.306231889 +0200
+@@ -3321,6 +3321,9 @@
      strncpy(thePw, &outBuffer[i+1], thePwLen-1)[thePwLen-1] = '\0';
    }
  

diff --git a/ntop-no_wget_etter.patch b/ntop-no_wget_etter.patch
deleted file mode 100644 (file)
index 5d6b4e9..0000000
--- a/ntop-no_wget_etter.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ntop-4.0.3/Makefile.am~    2010-11-24 00:21:43.603982997 +0100
-+++ ntop-4.0.3/Makefile.am     2010-11-24 00:22:07.270982990 +0100
-@@ -339,7 +339,7 @@
- install-selinux-policy:
-       chcon -t textrel_shlib_t $(DESTDIR)$(libdir)/*ntop*.so
- 
--install-data-local: ntop.txt ntop.html faq.html dnetter
-+install-data-local: ntop.txt ntop.html faq.html
-       @$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)/plugins;
-       @if ! test -d $(DESTDIR)/$(datadir)/ntop; then \
-         $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/ntop; \

diff --git a/ntop-rrdtool-1.6.0.patch b/ntop-rrdtool-1.6.0.patch
new file mode 100644 (file)
index 0000000..5143939
--- /dev/null
+++ b/ntop-rrdtool-1.6.0.patch
@@ -0,0 +1,29 @@
+diff -up ntop-5.0.1/configure.in.rrdtool ntop-5.0.1/configure.in
+--- ntop-5.0.1/configure.in.rrdtool    2016-10-16 20:32:46.194496951 +0200
++++ ntop-5.0.1/configure.in    2016-10-16 20:32:57.392486940 +0200
+@@ -893,19 +893,19 @@ else
+    fi
+ fi
+ 
+-RRD_LIB="-L${RRD_HOME}/lib -lrrd_th"
++RRD_LIB="-L${RRD_HOME}/lib -lrrd"
+ 
+-if test -f "$RRD_HOME/lib/librrd_th.so"; then
++if test -f "$RRD_HOME/lib/librrd.so"; then
+    AC_MSG_RESULT(checking for rrdtool... yes)
+ else
+-  if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX
++  if test -f "$RRD_HOME/lib/librrd.dylib"; then # OSX
+      AC_MSG_RESULT(checking for rrdtool... yes)
+   else
+-     if test -f "$RRD_HOME/lib/librrd_th.a"; then
++     if test -f "$RRD_HOME/lib/librrd.a"; then
+        AC_MSG_RESULT(checking for rrdtool... yes)
+      else
+-       AC_CHECK_LIB([rrd_th], [main])
+-       if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then
++       AC_CHECK_LIB([rrd], [main])
++       if test ".${ac_cv_lib_rrd_main}" != ".yes"; then
+          AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR);
+        AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/);
+        else

diff --git a/ntop.spec b/ntop.spec
index 8b3d59f058087bd4d1fd562ded3afe052449ab7b..9148a33657519a0162d1beadbfe9a9f6c514a16d 100644 (file)
--- a/ntop.spec
+++ b/ntop.spec
@@ -14,12 +14,12 @@
 Summary:       Network monitoring tool
 Summary(pl.UTF-8):     Narzędzie do monitorowania sieci
 Name:          ntop
-Version:       4.1.0
-Release:       3
+Version:       5.0.1
+Release:       1
 License:       GPL v3+
 Group:         Networking
 Source0:       http://downloads.sourceforge.net/ntop/%{name}-%{version}.tar.gz
-# Source0-md5: 116df99cf548431393991ea15443c52f
+# Source0-md5: 01710b6925a8a5ffe1a41b8b512ebd69
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 # http://ettercap.cvs.sourceforge.net/ettercap/ettercap_ng/share/etter.finger.os?rev=HEAD
@@ -32,7 +32,7 @@ Patch4:               %{name}-http_c.patch
 Patch5:                %{name}-running-user.patch
 Patch6:                ieee-oui.patch
 Patch7:                %{name}-install.patch
-Patch8:                %{name}-no_wget_etter.patch
+Patch8:                %{name}-rrdtool-1.6.0.patch
 URL:           http://www.ntop.org/
 BuildRequires: GeoIP-devel
 BuildRequires: autoconf
@@ -119,6 +119,12 @@ cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+
+cd nDPI
+%configure
+%{__make}
+cd ..
+
 # "verified.awk -u" calls require gawk
 %configure \
        AWK=gawk \