[packages/ntopng] - rel 1, updated x32 patch
baggins
baggins at pld-linux.org
Sun Oct 19 15:46:46 CEST 2025
commit d8ff0ad85ea77779d9bc436163ad134c123566db
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Oct 19 17:46:31 2025 +0200
- rel 1, updated x32 patch
ntopng.spec | 4 ++--
x32.patch | 15 +++++++++++++--
2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/ntopng.spec b/ntopng.spec
index e93a260..2ca315b 100644
--- a/ntopng.spec
+++ b/ntopng.spec
@@ -3,7 +3,7 @@ Summary: Network monitoring tool
Summary(pl.UTF-8): Narzędzie do monitorowania sieci
Name: ntopng
Version: 6.4
-Release: 0.1
+Release: 1
License: GPL v3+
Group: Networking
#Source0Download: https://github.com/ntop/ntopng/releases
@@ -72,7 +72,7 @@ zmodernizowana z myślą o wydajności, używalności i możliwościach.
%patch -P0 -p1
%{__mv} nDPI-%{ndpi_ver} nDPI
-#patch -P1 -p1
+%patch -P1 -p1
%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+bash(\s|$),#!/bin/bash\1,' \
httpdocs/misc/ntopng-utils-manage-config.in \
diff --git a/x32.patch b/x32.patch
index 24c7b77..4d33aa8 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,5 +1,5 @@
---- 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
+--- ntopng-6.0/nDPI/src/lib/third_party/src/roaring_v2.c.orig 2024-06-24 22:19:51.942871669 +0200
++++ ntopng-6.0/nDPI/src/lib/third_party/src/roaring_v2.c 2024-06-24 22:33:52.091653525 +0200
@@ -138,7 +138,7 @@ extern "C" { // portability definitions
@@ -9,3 +9,14 @@
// we have an x64 processor
#define CROARING_IS_X64 1
+--- ntopng-6.4/nDPI/src/lib/third_party/include/roaring.h~ 2025-04-28 08:58:26.000000000 +0200
++++ ntopng-6.4/nDPI/src/lib/third_party/include/roaring.h 2025-10-19 17:43:47.863327950 +0200
+@@ -273,7 +273,7 @@
+ #endif // __restrict__
+ #endif // CROARING_REGULAR_VISUAL_STUDIO
+
+-#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 1
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ntopng.git/commitdiff/d8ff0ad85ea77779d9bc436163ad134c123566db
More information about the pld-cvs-commit
mailing list