Accepting request 1233260 from server:monitoring

OBS-URL: https://build.opensuse.org/request/show/1233260
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ndpi?expand=0&rev=12

0002-Report-whether-a-protocol-is-encrypted.patch

@@ -1,26 +0,0 @@
-From 5f286a17c1ecb88b06ee069650fa73f7565165dc Mon Sep 17 00:00:00 2001
-From: Luca Deri <deri@ntop.org>
-Date: Sat, 7 Aug 2021 17:35:34 +0200
-Subject: [PATCH 2/3] Report whether a protocol is encrypted
-
----
- example/ndpiReader.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/example/ndpiReader.c b/example/ndpiReader.c
-index b4434650..053dc2ec 100644
---- a/example/ndpiReader.c
-+++ b/example/ndpiReader.c
-@@ -1368,6 +1368,9 @@ static void printFlow(u_int32_t id, struct ndpi_flow_info *flow, u_int16_t threa
- 	  ndpi_protocol2name(ndpi_thread_info[thread_id].workflow->ndpi_struct,
- 			     flow->detected_protocol, buf1, sizeof(buf1)));
- 
-+  fprintf(out, "[%s]",
-+	  ndpi_is_encrypted_proto(ndpi_thread_info[thread_id].workflow->ndpi_struct, flow->detected_protocol) ? "Encrypted" : "ClearText");
-+  
-   if(flow->detected_protocol.category != 0)
-     fprintf(out, "[cat: %s/%u]",
- 	    ndpi_category_get_name(ndpi_thread_info[thread_id].workflow->ndpi_struct,
--- 
-2.32.0
-

0003-Firs-crash-on-ARM-during-steam-protocol-dissection.patch

@@ -1,43 +0,0 @@
-From 817c00b65ab4d0bf78927e494227ac5308417f91 Mon Sep 17 00:00:00 2001
-From: Luca Deri <deri@ntop.org>
-Date: Wed, 18 Aug 2021 11:33:33 +0200
-Subject: [PATCH 3/3] Firs crash on ARM during steam protocol dissection
-
----
- src/lib/protocols/steam.c | 19 ++++++++++++-------
- 1 file changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/src/lib/protocols/steam.c b/src/lib/protocols/steam.c
-index 8cd3ec41..53bbfc6a 100644
---- a/src/lib/protocols/steam.c
-+++ b/src/lib/protocols/steam.c
-@@ -114,14 +114,19 @@ static void ndpi_check_steam_udp1(struct ndpi_detection_module_struct *ndpi_stru
-   }
- 
-   /* Check for Steam Datagram Relay (SDR) packets. */
--  if (payload_len > 8 &&
--      ndpi_ntohll(get_u_int64_t(packet->payload, 0)) == 0x0101736470696e67 /* "\x01\x01sdping" */)
--  {
--    NDPI_LOG_INFO(ndpi_struct, "found STEAM (Steam Datagram Relay)\n");
--    ndpi_int_steam_add_connection(ndpi_struct, flow);
--    return;
--  }
-+  if (payload_len > 8) {
-+    u_int64_t n;
- 
-+    /* Necessary as simple cast crashes on ARM */
-+    memcpy(&n, packet->payload, sizeof(u_int64_t));
-+    
-+    if(ndpi_ntohll(n) == 0x0101736470696e67 /* "\x01\x01sdping" */) {
-+      NDPI_LOG_INFO(ndpi_struct, "found STEAM (Steam Datagram Relay)\n");
-+      ndpi_int_steam_add_connection(ndpi_struct, flow);
-+      return;
-+    }  
-+  }
-+  
-   /* Check if we so far detected the protocol in the request or not. */
-   if (flow->steam_stage1 == 0) {
-     NDPI_LOG_DBG2(ndpi_struct, "STEAM stage 0: \n");
--- 
-2.32.0
-

fix-makefile.patch

@@ -0,0 +1,29 @@
+diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
+index b446ba2..e5d0ea4 100644
+--- a/src/lib/Makefile.in
++++ b/src/lib/Makefile.in
+@@ -11,7 +11,6 @@ RANLIB = @RANLIB@
+ #
+ # Installation directories
+ #
+-PREFIX     = @prefix@
+ libdir     = @libdir@
+ includedir = @includedir@/ndpi
+ ifneq ($(OS),Windows_NT)
+@@ -96,10 +95,10 @@ cppcheck:
+ 	cppcheck --template='{file}:{line}:{severity}:{message}' --quiet --enable=all --force -I ../include *.c protocols/*.c
+ 
+ install: $(NDPI_LIBS)
+-	mkdir -p $(DESTDIR)$(PREFIX)$(libdir)
+-	cp $(NDPI_LIBS) $(DESTDIR)$(PREFIX)$(libdir)/
+-	cp -P $(NDPI_LIB_SHARED_BASE) $(DESTDIR)$(PREFIX)$(libdir)/
+-	cp -P $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) $(DESTDIR)$(PREFIX)$(libdir)/
+-	mkdir -p $(DESTDIR)$(PREFIX)$(includedir)
++	mkdir -p $(DESTDIR)$(libdir)
++	cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/
++	cp -P $(NDPI_LIB_SHARED_BASE) $(DESTDIR)$(libdir)/
++	cp -P $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) $(DESTDIR)$(libdir)/
++	mkdir -p $(DESTDIR)$(includedir)
+ 	#Avoid installing private header
+-	find ../include/*.h ! -name ndpi_private.h -exec cp "{}" $(DESTDIR)$(PREFIX)$(includedir)/ \;
++	find ../include/*.h ! -name ndpi_private.h -exec cp "{}" $(DESTDIR)$(includedir)/ \;

ndpi-4.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:99e0aba6396fd633c3840f30e4942f6591a08066d037f560b65ba64e7310f4d6
-size 120053617

ndpi-4.12.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28b0029877bbc970a8acc924664541c71e76e7a45e3761d5d0ddf3e695b6878c
+size 47562110

ndpi.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Dec 20 16:18:54 UTC 2024 - Martin Hauke <mardnh@gmx.de>
+
+- Update to version 4.12
+  * https://github.com/ntop/nDPI/releases/tag/4.12
+  * https://github.com/ntop/nDPI/releases/tag/4.10
+  * https://github.com/ntop/nDPI/releases/tag/4.8
+  * https://github.com/ntop/nDPI/releases/tag/4.6
+  * https://github.com/ntop/nDPI/releases/tag/4.4
+  * https://github.com/ntop/nDPI/releases/tag/4.2
+- Drop not longer needed patches
+  * 0001-Added-ability-to-report-whether-a-protocol-is-encryp.patch
+  * 0002-Report-whether-a-protocol-is-encrypted.patch
+  * 0003-Firs-crash-on-ARM-during-steam-protocol-dissection.patch
+- Add patch:
+  * fix-makefile.patch
+
 -------------------------------------------------------------------
 Thu Feb 22 13:56:41 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

ndpi.spec

@@ -1,8 +1,8 @@
 #
 # spec file for package ndpi
 #
-# Copyright (c) 2021 SUSE LLC
-# Copyright (c) 2017-2021, Martin Hauke <mardnh@gmx.de>
+# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2017-2024, Martin Hauke <mardnh@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,12 @@
 #
 
 
+%define sover 4
 %ifarch %{ix86} x86_64
 %bcond_without hyperscan
 %endif
-
-%define sover 4
 Name:           ndpi
-Version:        4.0
+Version:        4.12
 Release:        0
 Summary:        Extensible deep packet inspection library
 # wireshark/ndpi.lua is GPL-3.0-or-later
@@ -31,12 +30,7 @@ License:        LGPL-3.0-only
 Group:          Development/Libraries/C and C++
 URL:            https://github.com/ntop/nDPI
 Source:         https://github.com/ntop/nDPI/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM 0001-Added-ability-to-report-whether-a-protocol-is-encryp.patch # ntopng 5.0 needs this from the ndpi 4.0-stable branch
-Patch0:         0001-Added-ability-to-report-whether-a-protocol-is-encryp.patch
-# PATCH-FIX-UPSTREAM 0002-Report-whether-a-protocol-is-encrypted.patch # ntopng 5.0 needs this from the ndpi 4.0-stable branch
-Patch1:         0002-Report-whether-a-protocol-is-encrypted.patch
-# PATCH-FIX-UPSTREAM 0003-Firs-crash-on-ARM-during-steam-protocol-dissection.patch
-Patch2:         0003-Firs-crash-on-ARM-during-steam-protocol-dissection.patch
+Patch0:         fix-makefile.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
@@ -110,18 +104,17 @@ This package contains common files used by nDPI.
 %autosetup -p1 -n nDPI-%{version}
 
 %build
-sh autogen.sh
+autoreconf -fiv
 %configure \
 %if 0%{with hyperscan}
     --with-hyperscan \
 %endif
-    --prefix="%{_prefix}"
-make %{?_smp_mflags}
+    %{nil}
+%make_build
 
 %install
-%make_install PREFIX=%{_prefix} prefix=%{_prefix} libdir=%{_libdir}
-rm -f %{buildroot}/%{_libdir}/libndpi.a
-rm -f %{buildroot}/%{_sbindir}/ndpi
+%make_install
+rm %{buildroot}/%{_libdir}/libndpi.a
 
 %post   -n libndpi%{sover} -p /sbin/ldconfig
 %postun -n libndpi%{sover} -p /sbin/ldconfig
@@ -140,8 +133,8 @@ rm -f %{buildroot}/%{_sbindir}/ndpi
 
 %files -n ndpi-common
 %license COPYING
-%doc CHANGELOG.md README.md README.nDPI README.protocols
-%doc doc/nDPI_QuickStartGuide.pdf
+%doc CHANGELOG.md README.md
+%doc doc/guide/nDPI_QuickStartGuide.pdf
 %{_datadir}/%{name}
 
 %changelog