[packages/ntopng] - updated to 6.0, ndpi 4.8

[qboosh]

commit 8a7a5b11aa7d57d67aba55bee533ef6541c2b600
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jun 25 05:51:07 2024 +0200

    - updated to 6.0, ndpi 4.8

 ntopng.spec | 42 +++++++++++++++++++++++++++++-------------
 x32.patch   |  8 ++++----
 2 files changed, 33 insertions(+), 17 deletions(-)
---
diff --git a/ntopng.spec b/ntopng.spec
index 7f38ac4..7fb3662 100644
--- a/ntopng.spec
+++ b/ntopng.spec
@@ -1,32 +1,41 @@
-%define		ndpi_ver	4.6
+%define		ndpi_ver	4.8
 Summary:	Network monitoring tool
 Summary(pl.UTF-8):	Narzędzie do monitorowania sieci
 Name:		ntopng
-Version:	5.6
+Version:	6.0
 Release:	1
 License:	GPL v3+
 Group:		Networking
+#Source0Download: https://github.com/ntop/ntopng/releases
 Source0:	https://github.com/ntop/ntopng/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	2235c42d3a6f135ab0b9ffb200a2070b
+# Source0-md5:	a6f2a09a3114841ea020b23de6db9081
+#Source1Download: https://github.com/ntop/nDPI/releases
 Source1:	https://github.com/ntop/nDPI/archive/%{ndpi_ver}/nDPI-%{ndpi_ver}.tar.gz
-# Source1-md5:	1803f5f3999e1dc3a2454d437b11e9ba
+# Source1-md5:	41a5437fa7d274f59f852b17b776558f
 Patch0:		mandir.patch
 Patch1:		x32.patch
-URL:		http://www.ntop.org/
-BuildRequires:	GeoIP-devel
+URL:		https://www.ntop.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake >= 1.6
-BuildRequires:	gawk
-BuildRequires:	gdbm-devel >= 1.8.3
+BuildRequires:	json-c-devel
+BuildRequires:	hiredis-devel
+BuildRequires:	libatomic-devel
+BuildRequires:	libmaxminddb-devel
 BuildRequires:	libpcap-devel
-BuildRequires:	libtool
+BuildRequires:	libstdc++-devel
+BuildRequires:	libtool >= 2:2
+BuildRequires:	mysql-devel
 BuildRequires:	net-snmp-devel
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	perl-devel
+BuildRequires:	pkgconfig
+BuildRequires:	radcli-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	rrdtool-devel >= 1.1.0
 BuildRequires:	sed >= 4.0
+BuildRequires:	sqlite3-devel >= 3
+BuildRequires:	zeromq-devel >= 3
 BuildRequires:	zlib-devel
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
@@ -48,8 +57,15 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 ntopng is a web-based network traffic monitoring application.
-It is the new incarnation of the original ntop written in
-1998, and now revamped in terms of performance, usability, and features.
+
+It is the new incarnation of the original ntop written in 1998, and
+now revamped in terms of performance, usability, and features.
+
+%description -l pl.UTF-8
+ntopng to oparta na WWW aplikacja do monitorowania ruchu sieciowego.
+
+Jest to nowa inkarnacja oryginalnego ntopa, napisanego w 1998, teraz
+zmodernizowana z myślą o wydajności, używalności i możliwościach.
 
 %prep
 %setup -q -a1
@@ -59,8 +75,8 @@ It is the new incarnation of the original ntop written in
 %patch1 -p1
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+bash(\s|$),#!/bin/bash\1,' \
-      httpdocs/misc/ntopng-utils-manage-config.in \
-      httpdocs/misc/ntopng-utils-manage-updates.in
+	httpdocs/misc/ntopng-utils-manage-config.in \
+	httpdocs/misc/ntopng-utils-manage-updates.in
 
 %build
 cd nDPI
diff --git a/x32.patch b/x32.patch
index f8f2e0f..24c7b77 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,11 +1,11 @@
---- ntopng-5.6/nDPI/src/lib/third_party/src/roaring.cc.orig	2023-02-01 18:29:59.000000000 +0100
-+++ ntopng-5.6/nDPI/src/lib/third_party/src/roaring.cc	2023-10-02 05:27:14.540262993 +0200
-@@ -315,7 +315,7 @@
+--- ntopng-6.0/nDPI/src/lib/third_party/src/roaring.c.orig	2024-06-24 22:19:51.942871669 +0200
++++ ntopng-6.0/nDPI/src/lib/third_party/src/roaring.c	2024-06-24 22:33:52.091653525 +0200
+@@ -138,7 +138,7 @@ extern "C" {  // portability definitions
  
  
  
 -#if defined(__x86_64__) || defined(_M_X64)
 +#if (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64)
  // we have an x64 processor
- #define CROARING_IS_X64
+ #define CROARING_IS_X64 1
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ntopng.git/commitdiff/8a7a5b11aa7d57d67aba55bee533ef6541c2b600