commit ndpi for openSUSE:Factory
Hello community,
here is the log from the commit of package ndpi for openSUSE:Factory checked in
at 2020-04-27 23:38:49
Comparing /work/SRC/openSUSE:Factory/ndpi (Old)
and /work/SRC/openSUSE:Factory/.ndpi.new.2738 (New)
Package is "ndpi"
Mon Apr 27 23:38:49 2020 rev:8 rq:798122 version:3.2
Changes:
--- /work/SRC/openSUSE:Factory/ndpi/ndpi.changes2020-02-22
19:08:04.890543023 +0100
+++ /work/SRC/openSUSE:Factory/.ndpi.new.2738/ndpi.changes 2020-04-27
23:38:58.115592396 +0200
@@ -1,0 +2,6 @@
+Fri Apr 24 17:25:05 UTC 2020 - Petr Cervinka
+
+- Add upstream patch to fix ntopng build failure (ntopng#3675)
+ 001-Refresh-of-ndpi_netbios_name_interpret.patch
+
+---
New:
001-Refresh-of-ndpi_netbios_name_interpret.patch
Other differences:
--
++ ndpi.spec ++
--- /var/tmp/diff_new_pack.HWk8Kl/_old 2020-04-27 23:38:59.527595153 +0200
+++ /var/tmp/diff_new_pack.HWk8Kl/_new 2020-04-27 23:38:59.531595160 +0200
@@ -31,6 +31,7 @@
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
+Patch0: 001-Refresh-of-ndpi_netbios_name_interpret.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@@ -88,6 +89,7 @@
%prep
%setup -q -n nDPI-%{version}
+%patch0 -p1
%build
sh autogen.sh
++ 001-Refresh-of-ndpi_netbios_name_interpret.patch ++
>From e4512dbcb9e1db0500290b712257e501d1440d71 Mon Sep 17 00:00:00 2001
From: Luca Deri
Date: Tue, 24 Mar 2020 12:18:15 +0100
Subject: [PATCH] Refresh of ndpi_netbios_name_interpret
---
src/include/ndpi_main.h | 2 +-
src/lib/protocols/netbios.c | 15 +++
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/include/ndpi_main.h b/src/include/ndpi_main.h
index c909adc7..9335f215 100644
--- a/src/include/ndpi_main.h
+++ b/src/include/ndpi_main.h
@@ -132,7 +132,7 @@ extern "C" {
u_int16_t** tcp_master_proto,
u_int16_t** udp_master_proto);
#/* NDPI_PROTOCOL_NETBIOS */
- int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len);
+ int ndpi_netbios_name_interpret(char *in, size_t inlen, char *out, u_int
out_len);
#ifdef NDPI_ENABLE_DEBUG_MESSAGES
void ndpi_debug_get_last_log_function_line(struct
ndpi_detection_module_struct *ndpi_struct,
diff --git a/src/lib/protocols/netbios.c b/src/lib/protocols/netbios.c
index 19cffeb8..1c65b185 100644
--- a/src/lib/protocols/netbios.c
+++ b/src/lib/protocols/netbios.c
@@ -35,17 +35,17 @@ struct netbios_header {
};
/* The function below has been inherited by tcpdump */
-int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) {
+int ndpi_netbios_name_interpret(char *in, size_t inlen, char *out, u_int
out_len) {
int ret = 0, len;
char *b;
-
+
len = (*in++)/2;
b = out;
*out = 0;
- if(len > (out_len-1) || len < 1)
-return(-1);
-
+ if(len > (out_len-1) || len < 1 || 2*len > inlen)
+return(-1);
+
while (len--) {
if(in[0] < 'A' || in[0] > 'P' || in[1] < 'A' || in[1] > 'P') {
*out = 0;
@@ -53,7 +53,7 @@ int ndpi_netbios_name_interpret(char *in, char *out, u_int
out_len) {
}
*out = ((in[0]-'A')<<4) + (in[1]-'A');
-
+
in += 2;
if(isprint(*out))
@@ -69,13 +69,12 @@ int ndpi_netbios_name_interpret(char *in, char *out, u_int
out_len) {
return(ret);
}
-
static void ndpi_int_netbios_add_connection(struct ndpi_detection_module_struct
*ndpi_struct, struct
ndpi_flow_struct *flow) {
char name[64];
u_int off = flow->packet.payload[12] == 0x20 ? 12 : 14;
- if(ndpi_netbios_name_interpret((char*)&flow->packet.payload[off], name,
sizeof(name)) > 0)
+ if(ndpi_netbios_name_interpret((char*)&flow->packet.payload[off],
flow->packet.payload_packet_len - off, name, sizeof(name)) > 0)
snprintf((char*)flow->host_server_name, sizeof(flow->host_server_name)-1,
"%s", name);
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_NETBIOS,
NDPI_PROTOCOL_UNKNOWN);
--
2.26.1
commit ndpi for openSUSE:Factory
Hello community, here is the log from the commit of package ndpi for openSUSE:Factory checked in at 2020-02-22 19:07:48 Comparing /work/SRC/openSUSE:Factory/ndpi (Old) and /work/SRC/openSUSE:Factory/.ndpi.new.26092 (New) Package is "ndpi" Sat Feb 22 19:07:48 2020 rev:7 rq:778081 version:3.2 Changes: --- /work/SRC/openSUSE:Factory/ndpi/ndpi.changes2020-01-07 23:54:06.228054680 +0100 +++ /work/SRC/openSUSE:Factory/.ndpi.new.26092/ndpi.changes 2020-02-22 19:08:04.890543023 +0100 @@ -1,0 +2,91 @@ +Thu Feb 20 21:03:45 UTC 2020 - Martin Hauke + +- Update to version 3.2 + New Features + * New API calls + * Protocol detection: ndpi_is_protocol_detected + * Categories: ndpi_load_categories_file / ndpi_load_category + * JSON/TLV serialization: ndpi_serialize_string_boolean / +ndpi_serialize_uint32_boolean + * Patricia tree: ndpi_load_ipv4_ptree + * Module initialization: ndpi_init_detection_module / +ndpi_finalize_initalization + * Base64 encoding: ndpi_base64_encode + * JSON export: ndpi_flow2json + * Print protocol: ndpi_get_l4_proto_name / ndpi_get_l4_proto_info + * Libfuzz integration + * Implemented Community ID hash (API call ndpi_flowv6_flow_hash +and ndpi_flowv4_flow_hash) + * Detection of RCE in HTTP GET requests via PCRE + * Integration of the libinjection library to detect SQL +injections and XSS type attacks in HTTP requests + New Supported Protocols and Services + * TLS: new decode + * Added ALPN support + * Added export of supported version in TLS header + * Added Telnet dissector with metadata extraction + * Added Zabbix dissector + * Added POP3/IMAP metadata extraction + * Added FTP user/password extraction + * Added NetBIOS metadata extraction + * Added Kerberos metadata extraction + * Implemented SQL Injection and XSS attack detection + * Host-based detection improvements and changes + * Added Microsoft range + * Added twitch.tv website + * Added brasilbandalarga.com.br and .eaqbr.com.br as EAQ + * Added 20.180.0.0/14, 20.184.0.0/13 range as Skype + * Added 52.84.0.0/14 range as Amazon + * Added pastebin.com + * Changed 13.64.0.0/11 range from Skype to Microsoft + * Refreshed Whatsapp server list, added whatsapp-.fbcdn.net IPs + * Added public DNSoverHTTPS servers + Improvements + * Reworked and improved the TLS dissector + * Reworked Kerberos dissector + * Improved DNS response decoding + * Support for DNS continuous flow dissection + * Improved Python bindings + * Improved Ethereum support + * Improved categories detection with streaming and HTTP + * Support for IP-based detection to compute the application +protocol + * Renamed protocol 104 to IEC60870 (more meaningful) + * Added failed authentication support with FTP + * Renamed DNSoverHTTPS to handle bot DoH and DoT + * Implemented stacked DPI decoding + * Improvements for CapWAP and Bloomberg + * Improved SMB dissection + * Improved SSH dissection + * Added capwap support + * Modified API signatures for ndpi_ssl_version2str / +ndpi_detection_giveup + * Removed ndpi_pref_http_dont_dissect_response / +ndpi_pref_dns_dont_dissect_response (replaced by +ndpi_extra_dissection_possible) + Fixes + * Fixed memory invalid access in SMTP and leaks in TLS + * Fixed a few memory leaks + * Fixed invalid memory access in a few protocol dissectors (HTTP, +memcached, Citrix, STUN, DNS, Amazon Video, TLS, Viber) + * Fixed IPv6 address format across the various platforms + * Fixed infinite loop in ndpi_workflow_process_packet + * Fixed SHA1 certificate detection + * Fixed custom protocol detection + * Fixed SMTP dissection (including email) + * Fixed Telnet dissection and invalid password report + * Fixed invalid category matching in HTTP + * Fixed Skype and STUN false positives + * Fixed SQL Injection detection + * Fixed invalid SMBv1 detection + * Fixed SSH dissection + * Fixed ndpi_ssl_version2str + * Fixed ndpi_extra_dissection_possible + * Fixed out of bounds read in ndpi_match_custom_category + ndpiReader + * CSV output enhancements + * Added tunnelling decapsulation + * Improved HTTP reporting + * Added scan and HTTP attacks (XSS, SQL Injection) detection + +--- Old: ndpi-3.0.tar.gz New: ndpi-3.2.tar.gz Other differences: -- ++ ndpi.spec ++ --- /var/tmp/diff_new_pack.MOoFcr/_old 2020-02-22 19:08:05.934545102 +0100 +++ /var/tmp/diff_new_pack.MOoFcr/_new 2020-02-22 19:08:05.934545102 +0100 @@ -1,7 +1,7 @@ # # spec file for package ndpi # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2017, Martin Hauke # # All modifications a
commit ndpi for openSUSE:Factory
Hello community,
here is the log from the commit of package ndpi for openSUSE:Factory checked in
at 2020-01-07 23:53:32
Comparing /work/SRC/openSUSE:Factory/ndpi (Old)
and /work/SRC/openSUSE:Factory/.ndpi.new.6675 (New)
Package is "ndpi"
Tue Jan 7 23:53:32 2020 rev:6 rq:761346 version:3.0
Changes:
--- /work/SRC/openSUSE:Factory/ndpi/ndpi.changes2019-12-30
12:35:14.271817620 +0100
+++ /work/SRC/openSUSE:Factory/.ndpi.new.6675/ndpi.changes 2020-01-07
23:54:06.228054680 +0100
@@ -1,0 +2,5 @@
+Thu Jan 2 11:50:52 UTC 2020 - Martin Hauke
+
+- Add hyperscan-devel as dependency to libndpi-devel
+
+---
Other differences:
--
++ ndpi.spec ++
--- /var/tmp/diff_new_pack.lls7bp/_old 2020-01-07 23:54:07.540055361 +0100
+++ /var/tmp/diff_new_pack.lls7bp/_new 2020-01-07 23:54:07.540055361 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ndpi
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017, Martin Hauke
#
# All modifications and additions to the file contributed by third parties
@@ -65,6 +65,9 @@
Summary:Development headers for nNDPI
Group: Development/Libraries/C and C++
Requires: libndpi%{sover} = %{version}
+%if 0%{with hyperscan}
+Requires: pkgconfig(libhs)
+%endif
%description -n libndpi-devel
nDPI is a ntop-maintained superset of the OpenDPI library. It extends
commit ndpi for openSUSE:Factory
Hello community, here is the log from the commit of package ndpi for openSUSE:Factory checked in at 2019-12-30 12:35:08 Comparing /work/SRC/openSUSE:Factory/ndpi (Old) and /work/SRC/openSUSE:Factory/.ndpi.new.6675 (New) Package is "ndpi" Mon Dec 30 12:35:08 2019 rev:5 rq:759921 version:3.0 Changes: --- /work/SRC/openSUSE:Factory/ndpi/ndpi.changes2019-06-06 18:18:14.864669769 +0200 +++ /work/SRC/openSUSE:Factory/.ndpi.new.6675/ndpi.changes 2019-12-30 12:35:14.271817620 +0100 @@ -1,0 +2,95 @@ +Wed Dec 25 10:13:32 UTC 2019 - Martin Hauke + +- Drop not longer needed patches (fixed upstream) + * ndpi-fix-build.patch + * reproducible.patch +- Update to version 3.0 + New Features + * nDPI now reports the protocol ASAP even when specific fields +have not yet been dissected because such packets have not yet +been observed. This is important for inline applications that +can immediately act on traffic. Applications that need full +dissection need to call the new API function +ndpi_extra_dissection_possible() to check if metadata dissection +has been completely performed or if there is more to read before +declaring it completed. + * TLS (formerly identified as SSL in nDPI v2.x) is now dissected +more deeply, certificate validity is extracted as well +certificate SHA-1. + * nDPIreader can now export data in CSV format with option -C + * Implemented Sequence of Packet Length and Time (SPLT) and Byte +Distribution (BD) as specified by Cisco Joy +(https://github.com/cisco/joy). This allows malware activities +on encrypted TLS streams. + * Available as library and in ndpiReader with option -J + * Promoted usage of protocol categories rather than protocol +identifiers in order to classify protocols. This allows +application protocols to be clustered in families and thus better +managed by users/developers rather than using hundred of +protocols unknown to most of the people. + * Added Inter-Arrival Time (IAT) calculation used to detect +protocol misbehaviour (e.g. slow-DoS detection) + * Added data analysis features for computign metrics such as +entropy, average, stddev, variance on a single and consistent +place that will prevent when possible. This should ease traffic +analysis on monitoring/security applications. New API calls have +been implemented such as ndpi_data_XXX() to handle these +calculations. + * Initial release of Python bindings available under nDPI/python. + * Implemented search of human readable strings for promoting data +exfiltration detection + * Available as library and in ndpiReader with option -e + * Fingerprints +JA3 (https://github.com/salesforce/ja3) +HASSH (https://github.com/salesforce/hassh) +DHCP + * Implemented a library to serialize/deserialize data in both +Type-Length-Value (TLV) and JSON format + New Supported Protocols and Services + * DTLS (i.e. TLS over UDP) + * Hulu + * TikTok/Musical.ly + * WhatsApp Video + * DNSoverHTTPS + * Datasaver + * Line protocol + * Google Duo and Hangout merged + * WireGuard VPN + * IMO + * Zoom.us + Improvements + * TLS ++ Organizations ++ Ciphers ++ Certificate analysis + * Added PUBLISH/SUBSCRIBE methods to SIP + * Implemented STUN cache to enhance matching of STUN-based protocols + * Dissection improvements ++ Viber ++ WhatsApp ++ AmazonVideo ++ SnapChat ++ FTP ++ QUIC ++ OpenVPN support for UDP-based VPNs ++ Facebook Messenger mobile ++ Various improvements for STUN, Hangout and Duo + * Added new categories: ++ CUSTOM_CATEGORY_ANTIMALWARE, ++ NDPI_PROTOCOL_CATEGORY_MUSIC, ++ NDPI_PROTOCOL_CATEGORY_VIDEO, ++ NDPI_PROTOCOL_CATEGORY_SHOPPING, ++ NDPI_PROTOCOL_CATEGORY_PRODUCTIVITY ++ NDPI_PROTOCOL_CATEGORY_FILE_SHARING + * Added NDPI_PROTOCOL_DANGEROUS classification + Fixes + * Fixed the dissection of certain invalid DNS responses + * Fixed Spotify dissection + * Fixed false positives with FTP and FTP_DATA + * Fix to discard STUN over TCP flows + * Fixed MySQL dissector + * Fix category detection due to missing initialization + * Fix DNS rsp_addr missing in some tiny responses + * Various hardening fixes + +--- Old: ndpi-2.8.tar.gz ndpi-fix-build.patch reproducible.patch New: ndpi-3.0.tar.gz Other differences: -- ++ ndpi.spec ++ --- /var/tmp/diff_new_pack.RrTwKh/_old 2019-12-30 12:35:14.923817970 +0100 +++ /var/tmp/diff_new_pack.RrTwKh/_new 2019-12-30 12:35:14.923817970 +0100 @@ -21,9 +21,9 @@ %bcond_without hyperscan %endif -%define sover 2 +%define sover 3 Name:
commit ndpi for openSUSE:Factory
Hello community,
here is the log from the commit of package ndpi for openSUSE:Factory checked in
at 2019-06-06 18:18:13
Comparing /work/SRC/openSUSE:Factory/ndpi (Old)
and /work/SRC/openSUSE:Factory/.ndpi.new.4811 (New)
Package is "ndpi"
Thu Jun 6 18:18:13 2019 rev:4 rq:707881 version:2.8
Changes:
--- /work/SRC/openSUSE:Factory/ndpi/ndpi.changes2019-04-08
10:40:20.375295480 +0200
+++ /work/SRC/openSUSE:Factory/.ndpi.new.4811/ndpi.changes 2019-06-06
18:18:14.864669769 +0200
@@ -1,0 +2,5 @@
+Wed Jun 5 04:03:31 UTC 2019 - Bernhard Wiedemann
+
+- Add reproducible.patch to override build date (boo#1047218)
+
+---
New:
reproducible.patch
Other differences:
--
++ ndpi.spec ++
--- /var/tmp/diff_new_pack.6Gf9yj/_old 2019-06-06 18:18:16.008669433 +0200
+++ /var/tmp/diff_new_pack.6Gf9yj/_new 2019-06-06 18:18:16.012669433 +0200
@@ -33,6 +33,8 @@
Source:
https://github.com/ntop/nDPI/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# FIXME: Upstream makefile is broken
Patch0: ndpi-fix-build.patch
+# PATCH-FIX-UPSTREAM https://github.com/ntop/nDPI/pull/662
+Patch1: reproducible.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@@ -89,6 +91,7 @@
%prep
%setup -q -n nDPI-%{version}
%patch0 -p1
+%patch1 -p1
%build
sh autogen.sh
++ reproducible.patch ++
https://github.com/ntop/nDPI/pull/662
>From e91123e17a6ebe2cb1f718aa3e44edb10b707779 Mon Sep 17 00:00:00 2001
From: "Bernhard M. Wiedemann"
Date: Thu, 24 Jan 2019 14:21:06 +0100
Subject: [PATCH] Use ChangeLog date instead of build date
in order to make builds reproducible.
See https://reproducible-builds.org/ for why this is good.
This date call works with GNU date and BSD date.
Also use UTC/gmtime to be independent of timezone.
---
configure.seed | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.seed b/configure.seed
index 1aa68f17..006e6d97 100644
--- a/configure.seed
+++ b/configure.seed
@@ -30,7 +30,7 @@ if test -d ".git"; then :
GIT_RELEASE="${PACKAGE_VERSION}-${GIT_NUM}-${GIT_TAG}"
else
GIT_RELEASE="${PACKAGE_VERSION}"
- GIT_DATE=`date`
+ GIT_DATE=`date -u -r CHANGELOG.md`
fi
AC_DEFINE_UNQUOTED(NDPI_GIT_RELEASE, "${GIT_RELEASE}", [GIT Release])
commit ndpi for openSUSE:Factory
Hello community,
here is the log from the commit of package ndpi for openSUSE:Factory checked in
at 2019-04-08 10:38:40
Comparing /work/SRC/openSUSE:Factory/ndpi (Old)
and /work/SRC/openSUSE:Factory/.ndpi.new.3908 (New)
Package is "ndpi"
Mon Apr 8 10:38:40 2019 rev:3 rq:691915 version:2.8
Changes:
--- /work/SRC/openSUSE:Factory/ndpi/ndpi.changes2019-02-25
17:56:45.270319352 +0100
+++ /work/SRC/openSUSE:Factory/.ndpi.new.3908/ndpi.changes 2019-04-08
10:40:20.375295480 +0200
@@ -1,0 +2,24 @@
+Sat Mar 30 09:53:01 UTC 2019 - Martin Hauke
+
+- Update to version 2.8
+ New Supported Protocols and Services
+ * Added Modbus over TCP dissector
+ Improvements
+ * Wireshark Lua plugin compatibility with Wireshark 3
+ * Improved MDNS dissection
+ * Improved HTTP response code handling
+ * Full dissection of HTTP responses
+ Fixes
+ * Fixed false positive mining detection
+ * Fixed invalid TCP DNS dissection
+ * Releasing buffers upon realloc failures
+ * ndpiReader: Prevents references after free
+ * Endianness fixes
+ * Fixed IPv6 HTTP traffic dissection
+ * Fixed H.323 detection
+ Other
+ * Disabled ookla statistics which need to be improved
+ * Support for custom protocol files of arbitrary length
+ * Update radius.c to RFC2865
+
+---
Old:
ndpi-2.6.tar.gz
New:
ndpi-2.8.tar.gz
Other differences:
--
++ ndpi.spec ++
--- /var/tmp/diff_new_pack.O1z3Nx/_old 2019-04-08 10:40:21.379295725 +0200
+++ /var/tmp/diff_new_pack.O1z3Nx/_new 2019-04-08 10:40:21.383295726 +0200
@@ -23,12 +23,12 @@
%define sover 2
Name: ndpi
-Version:2.6
+Version:2.8
Release:0
Summary:Extensible deep packet inspection library
+# wireshark/ndpi.lua is GPL-3.0-or-later
License:LGPL-3.0-only
Group: Development/Libraries/C and C++
-# wireshark/ndpi.lua is GPL-3.0-or-later
URL:https://github.com/ntop/nDPI
Source:
https://github.com/ntop/nDPI/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# FIXME: Upstream makefile is broken
++ ndpi-2.6.tar.gz -> ndpi-2.8.tar.gz ++
/work/SRC/openSUSE:Factory/ndpi/ndpi-2.6.tar.gz
/work/SRC/openSUSE:Factory/.ndpi.new.3908/ndpi-2.8.tar.gz differ: char 13, line
1
commit ndpi for openSUSE:Factory
Hello community,
here is the log from the commit of package ndpi for openSUSE:Factory checked in
at 2019-02-25 17:56:22
Comparing /work/SRC/openSUSE:Factory/ndpi (Old)
and /work/SRC/openSUSE:Factory/.ndpi.new.28833 (New)
Package is "ndpi"
Mon Feb 25 17:56:22 2019 rev:2 rq:678573 version:2.6
Changes:
--- /work/SRC/openSUSE:Factory/ndpi/ndpi.changes2019-01-21
10:48:21.184165894 +0100
+++ /work/SRC/openSUSE:Factory/.ndpi.new.28833/ndpi.changes 2019-02-25
17:56:45.270319352 +0100
@@ -1,0 +2,6 @@
+Sun Feb 24 15:00:58 UTC 2019 - sch...@suse.de
+
+- override prefix and libdir during install
+- ndpi-fix-build.patch: don't install multiple copies of the library
+
+---
Other differences:
--
++ ndpi.spec ++
--- /var/tmp/diff_new_pack.x3RgmZ/_old 2019-02-25 17:56:46.018318789 +0100
+++ /var/tmp/diff_new_pack.x3RgmZ/_new 2019-02-25 17:56:46.022318786 +0100
@@ -1,6 +1,7 @@
#
-# spec file for package nDPI
+# spec file for package ndpi
#
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017, Martin Hauke
#
# All modifications and additions to the file contributed by third parties
@@ -12,9 +13,10 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
%ifarch %{ix86} x86_64
%bcond_without hyperscan
%endif
@@ -24,9 +26,9 @@
Version:2.6
Release:0
Summary:Extensible deep packet inspection library
-# wireshark/ndpi.lua is GPL-3.0-or-later
License:LGPL-3.0-only
Group: Development/Libraries/C and C++
+# wireshark/ndpi.lua is GPL-3.0-or-later
URL:https://github.com/ntop/nDPI
Source:
https://github.com/ntop/nDPI/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# FIXME: Upstream makefile is broken
@@ -35,11 +37,11 @@
BuildRequires: automake
BuildRequires: gcc-c++
BuildRequires: libnuma-devel
+BuildRequires: libnuma-devel
BuildRequires: libpcap-devel
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: pkgconfig(json-c)
-BuildRequires: libnuma-devel
%if 0%{with hyperscan}
BuildRequires: pkgconfig(libhs)
%endif
@@ -87,13 +89,9 @@
%prep
%setup -q -n nDPI-%{version}
%patch0 -p1
-sh autogen.sh
-# FIXME: Upstream makefile is broken
-%ifarch %{ix86}
-sed -i 's/lib64/lib/g' src/lib/Makefile.in
-%endif
%build
+sh autogen.sh
%configure \
%if 0%{with hyperscan}
--with-hyperscan \
@@ -102,7 +100,7 @@
make %{?_smp_mflags}
%install
-%make_install PREFIX=%{_prefix}
+%make_install PREFIX=%{_prefix} prefix=%{_prefix} libdir=%{_libdir}
rm -f %{buildroot}/%{_libdir}/libndpi.a
%post -n libndpi%{sover} -p /sbin/ldconfig
++ ndpi-fix-build.patch ++
--- /var/tmp/diff_new_pack.x3RgmZ/_old 2019-02-25 17:56:46.042318771 +0100
+++ /var/tmp/diff_new_pack.x3RgmZ/_new 2019-02-25 17:56:46.042318771 +0100
@@ -1,7 +1,7 @@
-diff --git a/Makefile.am b/Makefile.am
-index 37f0849..4090817 100644
a/Makefile.am
-+++ b/Makefile.am
+Index: nDPI-2.6/Makefile.am
+===
+--- nDPI-2.6.orig/Makefile.am
nDPI-2.6/Makefile.am
@@ -1,7 +1,7 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src/lib example tests
@@ -11,30 +11,17 @@
pkgconfig_DATA = libndpi.pc
EXTRA_DIST = autogen.sh
-diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
-index 0ffeb9d..2c0296a 100644
a/src/lib/Makefile.in
-+++ b/src/lib/Makefile.in
-@@ -10,8 +10,8 @@
- #
- # Installation directories
- #
--prefix = /usr/local
--libdir = ${prefix}/lib
-+prefix = /usr
-+libdir = ${prefix}/lib64
- includedir = ${prefix}/include/ndpi
- CC = @CC@
- CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include
-DNDPI_LIB_COMPILATION -O2 -g
-@@ -60,8 +60,8 @@ distclean: clean
-
+Index: nDPI-2.6/src/lib/Makefile.in
+===
+--- nDPI-2.6.orig/src/lib/Makefile.in
nDPI-2.6/src/lib/Makefile.in
+@@ -61,7 +61,7 @@ distclean: clean
install: $(NDPI_LIBS)
mkdir -p $(DESTDIR)$(libdir)
-- cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/
+ cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/
- ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED)
$(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE)
- ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED)
$(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
-+ ln -sf $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE)
-+ ln -sf $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
-+ cp -v libndpi.so*
