* [gentoo-commits] repo/gentoo:master commit in: net-libs/nDPI/, net-libs/nDPI/files/
@ 2019-08-20 5:41 Slawek Lis
0 siblings, 0 replies; 6+ messages in thread
From: Slawek Lis @ 2019-08-20 5:41 UTC (permalink / raw
To: gentoo-commits
commit: eadd42e7a118ce41c2a3fab5b57e1418ee5e7e55
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 20 05:38:25 2019 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 05:38:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eadd42e7
net-libs/nDPI: version bump to 2.8
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Slawek Lis <slis <AT> gentoo.org>
net-libs/nDPI/Manifest | 1 +
.../nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch | 11 +++++++
net-libs/nDPI/files/nDPI-2.8-relative-sym.patch | 12 +++++++
net-libs/nDPI/nDPI-2.8.ebuild | 37 ++++++++++++++++++++++
4 files changed, 61 insertions(+)
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 4664a599cc3..bcb2f018990 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,2 +1,3 @@
DIST nDPI-2.0.tar.gz 19280901 BLAKE2B d08bd807b556394b708713061ef23025be296b3c847c90680170b2d39f23f05fac35a1ced091925383f57c0d0be6e5f0c7ad239168c76caa7b9a46847413e860 SHA512 c8dac1990ff49fc04ee321068d8fc722528c6be0543af2d0bda77936eff12713c36d5abd3fd2472121f2e322e99ba8e57facca813f7b012240c61e16c1a6cd44
DIST nDPI-2.2.tar.gz 19937173 BLAKE2B a00287d5901487f7e56d7aeab7dcb357c0eb6348be5621952d9f357058419b6378d41b42d0d6e9ea6e20680cfda96fa501f2ebaae5c83dd4e62f756d1089a160 SHA512 ee1e0a1cc87a3971408877bd5d3154f6bd5d4ddcd2437c8e03e5d8a5093da2b1cbfefad1e28e77145af4286eecbd341ef90f94aa5c7f36a98e3625e9948e96d6
+DIST nDPI-2.8.tar.gz 19754226 BLAKE2B c112ae2d9fff872f116a23bbffe7bca39a5c876346b4e41ef503934301f39413517fce169a37a766ffae16b0cb1ee81d96573ffa1ee2519d295dfb32cc1f115e SHA512 aae757047810bbc32700ecf7ac2e5df4b93528021a50da4a0b83865a5248dfca8b1643c75aa7eeb6eac4f155638d45666db487318b2be9adb2f3412cb8ec8497
diff --git a/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch b/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch
new file mode 100644
index 00000000000..2604b8c34d8
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch
@@ -0,0 +1,11 @@
+--- Makefile.am.orig 2018-10-08 19:04:23.241000607 -0600
++++ Makefile.am 2018-10-08 19:04:46.710000661 -0600
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = src/lib example tests
+
+-pkgconfigdir = $(prefix)/libdata/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libndpi.pc
+
+ EXTRA_DIST = autogen.sh
diff --git a/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch b/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch
new file mode 100644
index 00000000000..b889d0546ba
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch
@@ -0,0 +1,12 @@
+--- src/lib/Makefile.in.orig 2019-08-20 07:34:29.667187396 +0200
++++ src/lib/Makefile.in 2019-08-20 07:34:40.202187657 +0200
+@@ -61,7 +61,7 @@
+ install: $(NDPI_LIBS)
+ mkdir -p $(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 -Ffs $(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE)
++ ln -Ffs $(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
+ mkdir -p $(DESTDIR)$(includedir)
+ cp ../include/*.h $(DESTDIR)$(includedir)
diff --git a/net-libs/nDPI/nDPI-2.8.ebuild b/net-libs/nDPI/nDPI-2.8.ebuild
new file mode 100644
index 00000000000..1412a46256d
--- /dev/null
+++ b/net-libs/nDPI/nDPI-2.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils multilib versionator
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="http://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="dev-libs/json-c:=
+ net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -e "s/@NDPI_MAJOR@/$(get_version_component_range 1)/g;s/@NDPI_MINOR@/$(get_version_component_range 2)/g;s/@NDPI_PATCH@/$(get_version_component_range 3)/g;s/@NDPI_VERSION_SHORT@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die
+
+ sed -i "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" src/lib/Makefile.in || die
+
+ epatch "${FILESDIR}/${P}-fix-pkgconfigdir.patch"
+ epatch "${FILESDIR}/${P}-relative-sym.patch"
+
+ default
+ eautoreconf
+}
+
+src_install() {
+ default
+ if ! use static-libs; then
+ rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/nDPI/, net-libs/nDPI/files/
@ 2020-05-16 11:49 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2020-05-16 11:49 UTC (permalink / raw
To: gentoo-commits
commit: 86334337401778e20e86773179e40c4a323fb34d
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 11:44:44 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat May 16 11:49:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86334337
net-libs/nDPI: Apply 3.2-stable patches
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
...L-strings-in-ndpi_serialize_string_string.patch | 23 +++
...3.2-0001-Added-fix-for-serialization-loop.patch | 28 +++
...02-Refresh-of-ndpi_netbios_name_interpret.patch | 74 ++++++++
.../nDPI-3.2-0003-Fixed-invalid-allocation.patch | 22 +++
...ings-where-the-first-element-is-a-zero-le.patch | 208 +++++++++++++++++++++
net-libs/nDPI/nDPI-3.2-r1.ebuild | 64 +++++++
6 files changed, 419 insertions(+)
diff --git a/net-libs/nDPI/files/nDPI-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch b/net-libs/nDPI/files/nDPI-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch
new file mode 100644
index 00000000000..db26330d699
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch
@@ -0,0 +1,23 @@
+From 15bb7ae4339cc2a4a626a52fcf49abfb1d237d65 Mon Sep 17 00:00:00 2001
+From: Alfredo Cardigliano <alfredo.cardigliano@gmail.com>
+Date: Wed, 26 Feb 2020 09:55:24 +0100
+Subject: [PATCH] Check NULL strings in ndpi_serialize_string_string
+
+---
+ src/lib/ndpi_serializer.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
+index 05b346bb..9a3cd0bd 100644
+--- a/src/lib/ndpi_serializer.c
++++ b/src/lib/ndpi_serializer.c
+@@ -1270,7 +1270,8 @@ int ndpi_serialize_string_binary(ndpi_serializer *_serializer,
+ /* Key is a string, value is a string (strlen is used to compute the len) */
+ int ndpi_serialize_string_string(ndpi_serializer *_serializer,
+ const char *key, const char *_value) {
+- return(ndpi_serialize_binary_binary(_serializer, key, strlen(key), _value, strlen(_value)));
++ const char *value = _value ? _value : "";
++ return(ndpi_serialize_binary_binary(_serializer, key, strlen(key), value, strlen(value)));
+ }
+
+ /* ********************************** */
diff --git a/net-libs/nDPI/files/nDPI-3.2-0001-Added-fix-for-serialization-loop.patch b/net-libs/nDPI/files/nDPI-3.2-0001-Added-fix-for-serialization-loop.patch
new file mode 100644
index 00000000000..c2fbf28383f
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-3.2-0001-Added-fix-for-serialization-loop.patch
@@ -0,0 +1,28 @@
+From 7b2f89ef25eafdd76e8b540f1d8ba1fdec185ef9 Mon Sep 17 00:00:00 2001
+From: Luca Deri <deri@ntop.org>
+Date: Fri, 20 Mar 2020 18:05:52 +0100
+Subject: [PATCH] Added fix for serialization loop
+
+---
+ src/lib/ndpi_serializer.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
+index 9a3cd0bd..80221005 100644
+--- a/src/lib/ndpi_serializer.c
++++ b/src/lib/ndpi_serializer.c
+@@ -1054,8 +1054,12 @@ int ndpi_serialize_string_uint32_format(ndpi_serializer *_serializer,
+ */
+
+ return(ndpi_serialize_string_uint32(_serializer, key, value));
+- } else
+- return(ndpi_serialize_string_uint32_format(_serializer, key, value, format));
++ } else {
++ char buf[16];
++
++ snprintf(buf, sizeof(buf), format, value);
++ return(ndpi_serialize_string_string(_serializer, key, buf));
++ }
+ }
+
+ /* ********************************** */
diff --git a/net-libs/nDPI/files/nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch b/net-libs/nDPI/files/nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch
new file mode 100644
index 00000000000..69aa892d2d1
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch
@@ -0,0 +1,74 @@
+From e4512dbcb9e1db0500290b712257e501d1440d71 Mon Sep 17 00:00:00 2001
+From: Luca Deri <deri@ntop.org>
+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);
diff --git a/net-libs/nDPI/files/nDPI-3.2-0003-Fixed-invalid-allocation.patch b/net-libs/nDPI/files/nDPI-3.2-0003-Fixed-invalid-allocation.patch
new file mode 100644
index 00000000000..ba8353eef98
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-3.2-0003-Fixed-invalid-allocation.patch
@@ -0,0 +1,22 @@
+From cd4f8051ddfd1bae53393174462c823cf5e15ec0 Mon Sep 17 00:00:00 2001
+From: Luca Deri <deri@ntop.org>
+Date: Tue, 24 Mar 2020 13:39:12 +0100
+Subject: [PATCH] Fixed invalid allocation
+
+---
+ src/lib/protocols/ssh.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/protocols/ssh.c b/src/lib/protocols/ssh.c
+index f3b50b60..6813b2a9 100644
+--- a/src/lib/protocols/ssh.c
++++ b/src/lib/protocols/ssh.c
+@@ -294,7 +294,7 @@ static void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct
+ ndpi_MD5_CTX ctx;
+
+ if(msgcode == 20 /* key exchange init */) {
+- char *hassh_buf = calloc(packet->payload_packet_len, sizeof(char));
++ char *hassh_buf = ndpi_calloc(packet->payload_packet_len, sizeof(char));
+ u_int i, len;
+
+ #ifdef SSH_DEBUG
diff --git a/net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch b/net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
new file mode 100644
index 00000000000..04f264d52dd
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
@@ -0,0 +1,208 @@
+From 60e3ac6b39cb25c974785b8ccc49edaae458a891 Mon Sep 17 00:00:00 2001
+From: Luca Deri <deri@ntop.org>
+Date: Fri, 3 Apr 2020 15:31:23 +0200
+Subject: [PATCH] Fix for serialization of strings where the first element is a
+ zero len string
+
+---
+ src/include/ndpi_typedefs.h | 10 ++++++----
+ src/lib/ndpi_serializer.c | 36 +++++++++++++++++++++++++++++++-----
+ 2 files changed, 37 insertions(+), 9 deletions(-)
+
+diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
+index 98b8ccf8..2c513e26 100644
+--- a/src/include/ndpi_typedefs.h
++++ b/src/include/ndpi_typedefs.h
+@@ -1446,10 +1446,12 @@ typedef enum {
+ #define NDPI_SERIALIZER_DEFAULT_BUFFER_SIZE 8192
+ #define NDPI_SERIALIZER_DEFAULT_BUFFER_INCR 1024
+
+-#define NDPI_SERIALIZER_STATUS_COMMA (1 << 0)
+-#define NDPI_SERIALIZER_STATUS_ARRAY (1 << 1)
+-#define NDPI_SERIALIZER_STATUS_EOR (1 << 2)
+-#define NDPI_SERIALIZER_STATUS_SOB (1 << 3)
++#define NDPI_SERIALIZER_STATUS_COMMA (1 << 0)
++#define NDPI_SERIALIZER_STATUS_ARRAY (1 << 1)
++#define NDPI_SERIALIZER_STATUS_EOR (1 << 2)
++#define NDPI_SERIALIZER_STATUS_SOB (1 << 3)
++#define NDPI_SERIALIZER_STATUS_NOT_EMPTY (1 << 4)
++
+
+ typedef struct {
+ u_int32_t flags;
+diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
+index 80221005..57c61604 100644
+--- a/src/lib/ndpi_serializer.c
++++ b/src/lib/ndpi_serializer.c
+@@ -43,6 +43,14 @@
+
+ /* ********************************** */
+
++static u_int8_t ndpi_serialize_is_not_empty(ndpi_serializer *_serializer) {
++ ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
++
++ return(((serializer->status.flags & NDPI_SERIALIZER_STATUS_NOT_EMPTY) == NDPI_SERIALIZER_STATUS_NOT_EMPTY) ? 1 : 0);
++}
++
++/* ********************************** */
++
+ static u_int64_t ndpi_htonll(u_int64_t v) {
+ union { u_int32_t lv[2]; u_int64_t llv; } u;
+
+@@ -442,14 +450,17 @@ int ndpi_serialize_end_of_record(ndpi_serializer *_serializer) {
+ if(!(serializer->status.flags & NDPI_SERIALIZER_STATUS_ARRAY)) {
+ serializer->buffer[0] = '[';
+ serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used],
+- buff_diff, "]");
++ buff_diff, "]");
+ }
++
+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_ARRAY | NDPI_SERIALIZER_STATUS_EOR;
+ serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_COMMA;
+ } else {
+ serializer->buffer[serializer->status.size_used++] = ndpi_serialization_end_of_record;
+ }
+
++ serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_NOT_EMPTY;
++
+ return(0);
+ }
+
+@@ -556,6 +567,7 @@ int ndpi_serialize_uint32_uint32(ndpi_serializer *_serializer,
+ serializer->buffer[type_offset] = type;
+ }
+
++ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+ return(0);
+ }
+
+@@ -607,6 +619,7 @@ int ndpi_serialize_uint32_uint64(ndpi_serializer *_serializer,
+ }
+ }
+
++ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+ return(0);
+ }
+
+@@ -660,6 +673,7 @@ int ndpi_serialize_uint32_int32(ndpi_serializer *_serializer,
+ serializer->buffer[type_offset] = type;
+ }
+
++ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+ return(0);
+ }
+
+@@ -713,6 +727,7 @@ int ndpi_serialize_uint32_int64(ndpi_serializer *_serializer,
+ }
+ }
+
++ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+ return(0);
+ }
+
+@@ -761,6 +776,7 @@ int ndpi_serialize_uint32_float(ndpi_serializer *_serializer,
+ serializer->buffer[type_offset] = type;
+ }
+
++ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+ return(0);
+ }
+
+@@ -811,6 +827,7 @@ static int ndpi_serialize_uint32_binary(ndpi_serializer *_serializer,
+ serializer->buffer[type_offset] = type;
+ }
+
++ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+ return(0);
+ }
+
+@@ -851,6 +868,7 @@ int ndpi_serialize_uint32_boolean(ndpi_serializer *_serializer,
+ value ? "true" : "false");
+ }
+
++ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+ return(0);
+ }
+
+@@ -908,6 +926,8 @@ static int ndpi_serialize_binary_int32(ndpi_serializer *_serializer,
+ }
+ }
+
++ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
++
+ return(0);
+ }
+
+@@ -967,6 +987,7 @@ int ndpi_serialize_binary_int64(ndpi_serializer *_serializer,
+ }
+ }
+
++ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+ return(0);
+ }
+
+@@ -1030,6 +1051,7 @@ static int ndpi_serialize_binary_uint32(ndpi_serializer *_serializer,
+ }
+ }
+
++ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+ return(0);
+ }
+
+@@ -1056,7 +1078,7 @@ int ndpi_serialize_string_uint32_format(ndpi_serializer *_serializer,
+ return(ndpi_serialize_string_uint32(_serializer, key, value));
+ } else {
+ char buf[16];
+-
++
+ snprintf(buf, sizeof(buf), format, value);
+ return(ndpi_serialize_string_string(_serializer, key, buf));
+ }
+@@ -1111,6 +1133,7 @@ static int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer,
+ }
+ }
+
++ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+ return(0);
+ }
+
+@@ -1174,6 +1197,7 @@ static int ndpi_serialize_binary_float(ndpi_serializer *_serializer,
+ ndpi_serialize_single_float(serializer, value);
+ }
+
++ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+ return(0);
+ }
+
+@@ -1232,8 +1256,8 @@ static int ndpi_serialize_binary_raw(ndpi_serializer *_serializer,
+ ndpi_serialize_json_post(_serializer);
+ } else if(serializer->fmt == ndpi_serialization_format_csv) {
+ serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
+- "%s%s", (serializer->status.size_used > 0) ? serializer->csv_separator : "",
+- value);
++ "%s%s", ndpi_serialize_is_not_empty(_serializer) ? serializer->csv_separator : "",
++ value);
+ } else {
+ serializer->buffer[serializer->status.size_used++] = (ndpi_serialization_string << 4) | ndpi_serialization_string;
+
+@@ -1241,6 +1265,7 @@ static int ndpi_serialize_binary_raw(ndpi_serializer *_serializer,
+ ndpi_serialize_single_string(serializer, value, vlen);
+ }
+
++ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+ return(0);
+ }
+
+@@ -1320,10 +1345,11 @@ int ndpi_serialize_string_boolean(ndpi_serializer *_serializer,
+ ndpi_serialize_json_post(_serializer);
+ } else if(serializer->fmt == ndpi_serialization_format_csv) {
+ serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
+- "%s%s", (serializer->status.size_used > 0) ? serializer->csv_separator : "",
++ "%s%s", ndpi_serialize_is_not_empty(_serializer) ? serializer->csv_separator : "",
+ value ? "true" : "false");
+ }
+
++ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
+ return(0);
+ }
+
diff --git a/net-libs/nDPI/nDPI-3.2-r1.ebuild b/net-libs/nDPI/nDPI-3.2-r1.ebuild
new file mode 100644
index 00000000000..a83b9c1dce9
--- /dev/null
+++ b/net-libs/nDPI/nDPI-3.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="https://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="
+ dev-libs/json-c:=
+ net-libs/libpcap
+"
+RDEPEND="
+ ${DEPEND}
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch
+ "${FILESDIR}"/${PN}-3.2-0001-Added-fix-for-serialization-loop.patch
+ "${FILESDIR}"/${PN}-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch
+ "${FILESDIR}"/${PN}-3.2-0003-Fixed-invalid-allocation.patch
+ "${FILESDIR}"/${PN}-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
+)
+
+src_prepare() {
+ eval $(grep '^NDPI_MAJOR=' autogen.sh)
+ eval $(grep '^NDPI_MINOR=' autogen.sh)
+ eval $(grep '^NDPI_PATCH=' autogen.sh)
+ NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}"
+
+ sed \
+ -e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \
+ -e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \
+ -e "s/@NDPI_PATCH@/${NDPI_PATCH}/g" \
+ -e "s/@NDPI_VERSION_SHORT@/${NDPI_VERSION_SHORT}/g" \
+ < "${S}/configure.seed" \
+ > "${S}/configure.ac" || die
+
+ sed -i \
+ -e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \
+ src/lib/Makefile.in || die
+
+ default
+ eautoreconf
+
+ # Taken from autogen.sh (bug #704074):
+ sed -i \
+ -e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
+ -e "s/#define VERSION/#define NDPI_VERSION/g" \
+ configure || die
+}
+
+src_install() {
+ default
+ if ! use static-libs; then
+ rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/nDPI/, net-libs/nDPI/files/
@ 2020-11-05 14:08 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2020-11-05 14:08 UTC (permalink / raw
To: gentoo-commits
commit: 75f0ee948825fc1dd8060a4480a0dd5872424313
Author: John Helmert III <jchelmert3 <AT> posteo <DOT> net>
AuthorDate: Wed Nov 4 07:09:03 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 5 14:08:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75f0ee94
net-libs/nDPI: bump to 3.4
Bug: https://bugs.gentoo.org/719084
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/nDPI/Manifest | 1 +
.../nDPI-3.4-fix-oob-in-kerberos-dissector.patch | 16 ++++++
net-libs/nDPI/nDPI-3.4.ebuild | 63 ++++++++++++++++++++++
3 files changed, 80 insertions(+)
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index ff887adc5eb..11430d2ded9 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -3,3 +3,4 @@ DIST nDPI-2.2.tar.gz 19937173 BLAKE2B a00287d5901487f7e56d7aeab7dcb357c0eb6348be
DIST nDPI-2.8.tar.gz 19754226 BLAKE2B c112ae2d9fff872f116a23bbffe7bca39a5c876346b4e41ef503934301f39413517fce169a37a766ffae16b0cb1ee81d96573ffa1ee2519d295dfb32cc1f115e SHA512 aae757047810bbc32700ecf7ac2e5df4b93528021a50da4a0b83865a5248dfca8b1643c75aa7eeb6eac4f155638d45666db487318b2be9adb2f3412cb8ec8497
DIST nDPI-3.0.tar.gz 26902734 BLAKE2B 79380ce5138b8ba99169ce3a2afeaa2a2bcded9bc7834d32af6911e9cee60395613a390d2d5d0530b9ff9263ad707e78f49d35098428c66a9c95a98aee2d8df8 SHA512 74c4a41201e809b476f4c23b99c2391b7bcbc76507a11261d216caf2350db8fd4ae3dac69d1d2179b12217901da1e04676aeca05d3a8e63d1a162469b33ab4c0
DIST nDPI-3.2.tar.gz 29586049 BLAKE2B 4ea7f1cf39b5363b724c2db84c006de2f0e05ea275586241c3e1b9a53681f1da83dc752e69d379d6b8c8bcf8b15b146e8a2de127931d3b2061112aef297f7d79 SHA512 bf3a6e66479110b8e1a51a3b66cc0a85aef98af455f2895a75fe2a8b06a9fb72a4dca3d4bbfa6f44959c5043c038927a1a8acb312e881d4e2bb544dc84b6eea8
+DIST nDPI-3.4.tar.gz 37976087 BLAKE2B 49e25586671a91278d90775c3dbc881ce4ca9ae4afd3108b1caff3b0d38251808bcd52ead253f451474195994fbf94658f70241acedb23c35a475df3b15c4a20 SHA512 ed5a22b6ddc14ad707a18a0bd96746c1df489969faaa42016fa9aad8d414fc4ee303b96cac15c3ba86f484a80a0aaa2dd1be5f92be672912e0e0d30da4bdad4c
diff --git a/net-libs/nDPI/files/nDPI-3.4-fix-oob-in-kerberos-dissector.patch b/net-libs/nDPI/files/nDPI-3.4-fix-oob-in-kerberos-dissector.patch
new file mode 100644
index 00000000000..7e8f381cdea
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-3.4-fix-oob-in-kerberos-dissector.patch
@@ -0,0 +1,16 @@
+Sourced from https://github.com/gentoo/gentoo/commit/c02681fcb7839ac1829ec09394334ddbca1b0aea
+
+diff --git a/src/lib/protocols/kerberos.c b/src/lib/protocols/kerberos.c
+index fa0ab6cb..32319668 100644
+--- a/src/lib/protocols/kerberos.c
++++ b/src/lib/protocols/kerberos.c
+@@ -189,7 +189,8 @@ void ndpi_search_kerberos(struct ndpi_detection_module_struct *ndpi_struct,
+
+ body_offset = koffsetp + 1 + pad_len;
+
+- for(i=0; i<10; i++) if(body_offset<packet->payload_packet_len && packet->payload[body_offset] != 0x05) body_offset++; /* ASN.1 */
++ for(i=0; i<10 && body_offset < packet->payload_packet_len; i++)
++ if(packet->payload[body_offset] != 0x05) body_offset++; /* ASN.1 */
+ #ifdef KERBEROS_DEBUG
+ printf("body_offset=%u [%02X %02X] [byte 0 must be 0x05]\n", body_offset, packet->payload[body_offset], packet->payload[body_offset+1]);
+ #endif
diff --git a/net-libs/nDPI/nDPI-3.4.ebuild b/net-libs/nDPI/nDPI-3.4.ebuild
new file mode 100644
index 00000000000..39a1a4c8a57
--- /dev/null
+++ b/net-libs/nDPI/nDPI-3.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="https://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/json-c:=
+ net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.4-fix-oob-in-kerberos-dissector.patch"
+)
+
+src_prepare() {
+ eval $(grep '^NDPI_MAJOR=' autogen.sh)
+ eval $(grep '^NDPI_MINOR=' autogen.sh)
+ eval $(grep '^NDPI_PATCH=' autogen.sh)
+ NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}"
+
+ sed \
+ -e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \
+ -e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \
+ -e "s/@NDPI_PATCH@/${NDPI_PATCH}/g" \
+ -e "s/@NDPI_VERSION_SHORT@/${NDPI_VERSION_SHORT}/g" \
+ -e "s/@FUZZY@//g" \
+ < "${S}/configure.seed" \
+ > "${S}/configure.ac" || die
+
+ sed -i \
+ -e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \
+ src/lib/Makefile.in || die
+
+ default
+ eautoreconf
+
+ # Taken from autogen.sh (bug #704074):
+ sed -i \
+ -e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
+ -e "s/#define VERSION/#define NDPI_VERSION/g" \
+ configure || die
+}
+
+src_install() {
+ default
+ rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
+}
+
+src_test() {
+ pushd tests || die
+ ./do.sh || die "Failed tests"
+ ./do-unit.sh || die "Failed tests"
+ popd || die
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/nDPI/, net-libs/nDPI/files/
@ 2020-11-05 14:08 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2020-11-05 14:08 UTC (permalink / raw
To: gentoo-commits
commit: db4512216402efbf873d16032baff9141b2dd53d
Author: John Helmert III <jchelmert3 <AT> posteo <DOT> net>
AuthorDate: Wed Nov 4 07:10:40 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 5 14:08:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db451221
net-libs/nDPI: drop 2.x (QA fixes)
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/18128
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/nDPI/Manifest | 3 --
.../nDPI/files/nDPI-2.2-libcache-include.patch | 32 -------------------
.../nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch | 11 -------
net-libs/nDPI/files/nDPI-2.8-relative-sym.patch | 12 -------
net-libs/nDPI/nDPI-2.0.ebuild | 31 ------------------
net-libs/nDPI/nDPI-2.2.ebuild | 36 ---------------------
net-libs/nDPI/nDPI-2.8.ebuild | 37 ----------------------
7 files changed, 162 deletions(-)
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 11430d2ded9..957317cfcc5 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,6 +1,3 @@
-DIST nDPI-2.0.tar.gz 19280901 BLAKE2B d08bd807b556394b708713061ef23025be296b3c847c90680170b2d39f23f05fac35a1ced091925383f57c0d0be6e5f0c7ad239168c76caa7b9a46847413e860 SHA512 c8dac1990ff49fc04ee321068d8fc722528c6be0543af2d0bda77936eff12713c36d5abd3fd2472121f2e322e99ba8e57facca813f7b012240c61e16c1a6cd44
-DIST nDPI-2.2.tar.gz 19937173 BLAKE2B a00287d5901487f7e56d7aeab7dcb357c0eb6348be5621952d9f357058419b6378d41b42d0d6e9ea6e20680cfda96fa501f2ebaae5c83dd4e62f756d1089a160 SHA512 ee1e0a1cc87a3971408877bd5d3154f6bd5d4ddcd2437c8e03e5d8a5093da2b1cbfefad1e28e77145af4286eecbd341ef90f94aa5c7f36a98e3625e9948e96d6
-DIST nDPI-2.8.tar.gz 19754226 BLAKE2B c112ae2d9fff872f116a23bbffe7bca39a5c876346b4e41ef503934301f39413517fce169a37a766ffae16b0cb1ee81d96573ffa1ee2519d295dfb32cc1f115e SHA512 aae757047810bbc32700ecf7ac2e5df4b93528021a50da4a0b83865a5248dfca8b1643c75aa7eeb6eac4f155638d45666db487318b2be9adb2f3412cb8ec8497
DIST nDPI-3.0.tar.gz 26902734 BLAKE2B 79380ce5138b8ba99169ce3a2afeaa2a2bcded9bc7834d32af6911e9cee60395613a390d2d5d0530b9ff9263ad707e78f49d35098428c66a9c95a98aee2d8df8 SHA512 74c4a41201e809b476f4c23b99c2391b7bcbc76507a11261d216caf2350db8fd4ae3dac69d1d2179b12217901da1e04676aeca05d3a8e63d1a162469b33ab4c0
DIST nDPI-3.2.tar.gz 29586049 BLAKE2B 4ea7f1cf39b5363b724c2db84c006de2f0e05ea275586241c3e1b9a53681f1da83dc752e69d379d6b8c8bcf8b15b146e8a2de127931d3b2061112aef297f7d79 SHA512 bf3a6e66479110b8e1a51a3b66cc0a85aef98af455f2895a75fe2a8b06a9fb72a4dca3d4bbfa6f44959c5043c038927a1a8acb312e881d4e2bb544dc84b6eea8
DIST nDPI-3.4.tar.gz 37976087 BLAKE2B 49e25586671a91278d90775c3dbc881ce4ca9ae4afd3108b1caff3b0d38251808bcd52ead253f451474195994fbf94658f70241acedb23c35a475df3b15c4a20 SHA512 ed5a22b6ddc14ad707a18a0bd96746c1df489969faaa42016fa9aad8d414fc4ee303b96cac15c3ba86f484a80a0aaa2dd1be5f92be672912e0e0d30da4bdad4c
diff --git a/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch b/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch
deleted file mode 100644
index 44d78e99f32..00000000000
--- a/net-libs/nDPI/files/nDPI-2.2-libcache-include.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/src/include/Makefile.am
-+++ b/src/include/Makefile.am
-@@ -7,4 +7,5 @@
- ndpi_protocol_ids.h \
- ndpi_protocols.h \
- ndpi_win32.h \
-- ndpi_includes.h
-+ ndpi_includes.h \
-+ libcache.h
---- a/src/include/ndpi_typedefs.h
-+++ b/src/include/ndpi_typedefs.h
-@@ -25,7 +25,7 @@
- #define __NDPI_TYPEDEFS_H__
-
- #include "ndpi_define.h"
--#include "../lib/third_party/include/libcache.h"
-+#include "libcache.h"
-
- #define BT_ANNOUNCE
- #define SNAP_EXT
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -12,7 +12,8 @@
- ../include/ndpi_includes.h \
- ../include/ndpi_protocol_ids.h \
- ../include/ndpi_protocols.h \
-- ../include/ndpi_typedefs.h
-+ ../include/ndpi_typedefs.h \
-+ ../include/libcache.h
-
- libndpi_la_SOURCES = ndpi_content_match.c.inc \
- ndpi_main.c \
diff --git a/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch b/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch
deleted file mode 100644
index f6f805bbeeb..00000000000
--- a/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = src/lib example tests
-
--pkgconfigdir = $(prefix)/libdata/pkgconfig
-+pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libndpi.pc
-
- EXTRA_DIST = autogen.sh
diff --git a/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch b/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch
deleted file mode 100644
index 6a0230d6559..00000000000
--- a/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/lib/Makefile.in
-+++ b/src/lib/Makefile.in
-@@ -61,7 +61,7 @@
- install: $(NDPI_LIBS)
- mkdir -p $(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 -Ffs $(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE)
-+ ln -Ffs $(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
- mkdir -p $(DESTDIR)$(includedir)
- cp ../include/*.h $(DESTDIR)$(includedir)
diff --git a/net-libs/nDPI/nDPI-2.0.ebuild b/net-libs/nDPI/nDPI-2.0.ebuild
deleted file mode 100644
index 4ab5cd458c2..00000000000
--- a/net-libs/nDPI/nDPI-2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune multilib
-
-DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="dev-libs/json-c:=
- net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_install() {
- default
- if ! use static-libs; then
- rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
- fi
- prune_libtool_files
-}
diff --git a/net-libs/nDPI/nDPI-2.2.ebuild b/net-libs/nDPI/nDPI-2.2.ebuild
deleted file mode 100644
index d1934b2381d..00000000000
--- a/net-libs/nDPI/nDPI-2.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune multilib versionator
-
-DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="dev-libs/json-c:=
- net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -e "s/@NDPI_MAJOR@/$(get_version_component_range 1)/g;s/@NDPI_MINOR@/$(get_version_component_range 2)/g;s/@NDPI_PATCH@/$(get_version_component_range 3)/g;s/@NDPI_VERSION_SHORT@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die
-
- mv "${S}/src/lib/third_party/include/libcache.h" "${S}/src/include"
- epatch "${FILESDIR}/${P}-libcache-include.patch"
-
- default
- eautoreconf
-}
-
-src_install() {
- default
- if ! use static-libs; then
- rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
- fi
- prune_libtool_files
-}
diff --git a/net-libs/nDPI/nDPI-2.8.ebuild b/net-libs/nDPI/nDPI-2.8.ebuild
deleted file mode 100644
index 1412a46256d..00000000000
--- a/net-libs/nDPI/nDPI-2.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils multilib versionator
-
-DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="http://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="dev-libs/json-c:=
- net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -e "s/@NDPI_MAJOR@/$(get_version_component_range 1)/g;s/@NDPI_MINOR@/$(get_version_component_range 2)/g;s/@NDPI_PATCH@/$(get_version_component_range 3)/g;s/@NDPI_VERSION_SHORT@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die
-
- sed -i "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" src/lib/Makefile.in || die
-
- epatch "${FILESDIR}/${P}-fix-pkgconfigdir.patch"
- epatch "${FILESDIR}/${P}-relative-sym.patch"
-
- default
- eautoreconf
-}
-
-src_install() {
- default
- if ! use static-libs; then
- rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/nDPI/, net-libs/nDPI/files/
@ 2020-11-05 14:08 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2020-11-05 14:08 UTC (permalink / raw
To: gentoo-commits
commit: 4b863caa2a14604924729dbb227a1949e32dbdfe
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 5 13:45:03 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 5 14:08:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b863caa
net-libs/nDPI: fail when libpcap can't be found
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../nDPI/files/nDPI-3.4-configure-fail-libcap.patch | 19 +++++++++++++++++++
net-libs/nDPI/nDPI-3.4.ebuild | 4 +++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/net-libs/nDPI/files/nDPI-3.4-configure-fail-libcap.patch b/net-libs/nDPI/files/nDPI-3.4-configure-fail-libcap.patch
new file mode 100644
index 00000000000..7ae5a04d4e8
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-3.4-configure-fail-libcap.patch
@@ -0,0 +1,19 @@
+Ensure that we fail if libpcap can't be detected, rather than exiting with a success return code.
+--- a/configure.seed
++++ b/configure.seed
+@@ -126,12 +126,9 @@ case "$host" in
+ AC_CHECK_LIB([dl], [dlopen, dlsym], [DL_LIB="-ldl"],[AC_CHECK_LIB([c], [dlopen, dlsym], [DL_LIB="-lc"],[AC_MSG_ERROR([unable to find the dlopen(), dlsym() functions]) ]) ])
+ else
+ AC_CHECK_LIB([pcap], [pcap_open_live], [PCAP_LIB="-lpcap"])
+- if test $ac_cv_lib_pcap_pcap_open_live = "no"; then :
+- echo ""
+- echo "ERROR: Missing libpcap(-dev) library required to compile the example application"
+- echo "ERROR: Please install it and try again"
+- exit
+- fi
++ if test $ac_cv_lib_pcap_pcap_open_live = "no"; then :
++ AC_MSG_ERROR([Cannot find libpcap which is required to compile the example application])
++ fi
+ fi
+ ;;
+ esac
diff --git a/net-libs/nDPI/nDPI-3.4.ebuild b/net-libs/nDPI/nDPI-3.4.ebuild
index 39a1a4c8a57..cb053734cf3 100644
--- a/net-libs/nDPI/nDPI-3.4.ebuild
+++ b/net-libs/nDPI/nDPI-3.4.ebuild
@@ -19,6 +19,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-3.4-fix-oob-in-kerberos-dissector.patch"
+ "${FILESDIR}/${PN}-3.4-configure-fail-libcap.patch"
)
src_prepare() {
@@ -27,6 +28,8 @@ src_prepare() {
eval $(grep '^NDPI_PATCH=' autogen.sh)
NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}"
+ default
+
sed \
-e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \
-e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \
@@ -40,7 +43,6 @@ src_prepare() {
-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \
src/lib/Makefile.in || die
- default
eautoreconf
# Taken from autogen.sh (bug #704074):
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/nDPI/, net-libs/nDPI/files/
@ 2021-04-13 13:14 John Helmert III
0 siblings, 0 replies; 6+ messages in thread
From: John Helmert III @ 2021-04-13 13:14 UTC (permalink / raw
To: gentoo-commits
commit: 9903b049920436006ca14c2b37ddde88e9ff55ca
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 13 12:51:43 2021 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 12:51:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9903b049
net-libs/nDPI: security cleanup (drop <3.4)
Bug: https://bugs.gentoo.org/719084
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
net-libs/nDPI/Manifest | 2 -
...L-strings-in-ndpi_serialize_string_string.patch | 23 ---
...3.2-0001-Added-fix-for-serialization-loop.patch | 28 ---
...02-Refresh-of-ndpi_netbios_name_interpret.patch | 74 --------
.../nDPI-3.2-0003-Fixed-invalid-allocation.patch | 22 ---
...ings-where-the-first-element-is-a-zero-le.patch | 208 ---------------------
...PI-3.2-0005-Fix-oob-in-kerberos-dissector.patch | 23 ---
net-libs/nDPI/nDPI-3.0-r1.ebuild | 46 -----
net-libs/nDPI/nDPI-3.0-r2.ebuild | 53 ------
net-libs/nDPI/nDPI-3.2-r1.ebuild | 64 -------
net-libs/nDPI/nDPI-3.2-r2.ebuild | 65 -------
11 files changed, 608 deletions(-)
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 957317cfcc5..505e78a99b9 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,3 +1 @@
-DIST nDPI-3.0.tar.gz 26902734 BLAKE2B 79380ce5138b8ba99169ce3a2afeaa2a2bcded9bc7834d32af6911e9cee60395613a390d2d5d0530b9ff9263ad707e78f49d35098428c66a9c95a98aee2d8df8 SHA512 74c4a41201e809b476f4c23b99c2391b7bcbc76507a11261d216caf2350db8fd4ae3dac69d1d2179b12217901da1e04676aeca05d3a8e63d1a162469b33ab4c0
-DIST nDPI-3.2.tar.gz 29586049 BLAKE2B 4ea7f1cf39b5363b724c2db84c006de2f0e05ea275586241c3e1b9a53681f1da83dc752e69d379d6b8c8bcf8b15b146e8a2de127931d3b2061112aef297f7d79 SHA512 bf3a6e66479110b8e1a51a3b66cc0a85aef98af455f2895a75fe2a8b06a9fb72a4dca3d4bbfa6f44959c5043c038927a1a8acb312e881d4e2bb544dc84b6eea8
DIST nDPI-3.4.tar.gz 37976087 BLAKE2B 49e25586671a91278d90775c3dbc881ce4ca9ae4afd3108b1caff3b0d38251808bcd52ead253f451474195994fbf94658f70241acedb23c35a475df3b15c4a20 SHA512 ed5a22b6ddc14ad707a18a0bd96746c1df489969faaa42016fa9aad8d414fc4ee303b96cac15c3ba86f484a80a0aaa2dd1be5f92be672912e0e0d30da4bdad4c
diff --git a/net-libs/nDPI/files/nDPI-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch b/net-libs/nDPI/files/nDPI-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch
deleted file mode 100644
index db26330d699..00000000000
--- a/net-libs/nDPI/files/nDPI-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 15bb7ae4339cc2a4a626a52fcf49abfb1d237d65 Mon Sep 17 00:00:00 2001
-From: Alfredo Cardigliano <alfredo.cardigliano@gmail.com>
-Date: Wed, 26 Feb 2020 09:55:24 +0100
-Subject: [PATCH] Check NULL strings in ndpi_serialize_string_string
-
----
- src/lib/ndpi_serializer.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
-index 05b346bb..9a3cd0bd 100644
---- a/src/lib/ndpi_serializer.c
-+++ b/src/lib/ndpi_serializer.c
-@@ -1270,7 +1270,8 @@ int ndpi_serialize_string_binary(ndpi_serializer *_serializer,
- /* Key is a string, value is a string (strlen is used to compute the len) */
- int ndpi_serialize_string_string(ndpi_serializer *_serializer,
- const char *key, const char *_value) {
-- return(ndpi_serialize_binary_binary(_serializer, key, strlen(key), _value, strlen(_value)));
-+ const char *value = _value ? _value : "";
-+ return(ndpi_serialize_binary_binary(_serializer, key, strlen(key), value, strlen(value)));
- }
-
- /* ********************************** */
diff --git a/net-libs/nDPI/files/nDPI-3.2-0001-Added-fix-for-serialization-loop.patch b/net-libs/nDPI/files/nDPI-3.2-0001-Added-fix-for-serialization-loop.patch
deleted file mode 100644
index c2fbf28383f..00000000000
--- a/net-libs/nDPI/files/nDPI-3.2-0001-Added-fix-for-serialization-loop.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7b2f89ef25eafdd76e8b540f1d8ba1fdec185ef9 Mon Sep 17 00:00:00 2001
-From: Luca Deri <deri@ntop.org>
-Date: Fri, 20 Mar 2020 18:05:52 +0100
-Subject: [PATCH] Added fix for serialization loop
-
----
- src/lib/ndpi_serializer.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
-index 9a3cd0bd..80221005 100644
---- a/src/lib/ndpi_serializer.c
-+++ b/src/lib/ndpi_serializer.c
-@@ -1054,8 +1054,12 @@ int ndpi_serialize_string_uint32_format(ndpi_serializer *_serializer,
- */
-
- return(ndpi_serialize_string_uint32(_serializer, key, value));
-- } else
-- return(ndpi_serialize_string_uint32_format(_serializer, key, value, format));
-+ } else {
-+ char buf[16];
-+
-+ snprintf(buf, sizeof(buf), format, value);
-+ return(ndpi_serialize_string_string(_serializer, key, buf));
-+ }
- }
-
- /* ********************************** */
diff --git a/net-libs/nDPI/files/nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch b/net-libs/nDPI/files/nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch
deleted file mode 100644
index 69aa892d2d1..00000000000
--- a/net-libs/nDPI/files/nDPI-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From e4512dbcb9e1db0500290b712257e501d1440d71 Mon Sep 17 00:00:00 2001
-From: Luca Deri <deri@ntop.org>
-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);
diff --git a/net-libs/nDPI/files/nDPI-3.2-0003-Fixed-invalid-allocation.patch b/net-libs/nDPI/files/nDPI-3.2-0003-Fixed-invalid-allocation.patch
deleted file mode 100644
index ba8353eef98..00000000000
--- a/net-libs/nDPI/files/nDPI-3.2-0003-Fixed-invalid-allocation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From cd4f8051ddfd1bae53393174462c823cf5e15ec0 Mon Sep 17 00:00:00 2001
-From: Luca Deri <deri@ntop.org>
-Date: Tue, 24 Mar 2020 13:39:12 +0100
-Subject: [PATCH] Fixed invalid allocation
-
----
- src/lib/protocols/ssh.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/protocols/ssh.c b/src/lib/protocols/ssh.c
-index f3b50b60..6813b2a9 100644
---- a/src/lib/protocols/ssh.c
-+++ b/src/lib/protocols/ssh.c
-@@ -294,7 +294,7 @@ static void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct
- ndpi_MD5_CTX ctx;
-
- if(msgcode == 20 /* key exchange init */) {
-- char *hassh_buf = calloc(packet->payload_packet_len, sizeof(char));
-+ char *hassh_buf = ndpi_calloc(packet->payload_packet_len, sizeof(char));
- u_int i, len;
-
- #ifdef SSH_DEBUG
diff --git a/net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch b/net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
deleted file mode 100644
index 04f264d52dd..00000000000
--- a/net-libs/nDPI/files/nDPI-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From 60e3ac6b39cb25c974785b8ccc49edaae458a891 Mon Sep 17 00:00:00 2001
-From: Luca Deri <deri@ntop.org>
-Date: Fri, 3 Apr 2020 15:31:23 +0200
-Subject: [PATCH] Fix for serialization of strings where the first element is a
- zero len string
-
----
- src/include/ndpi_typedefs.h | 10 ++++++----
- src/lib/ndpi_serializer.c | 36 +++++++++++++++++++++++++++++++-----
- 2 files changed, 37 insertions(+), 9 deletions(-)
-
-diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
-index 98b8ccf8..2c513e26 100644
---- a/src/include/ndpi_typedefs.h
-+++ b/src/include/ndpi_typedefs.h
-@@ -1446,10 +1446,12 @@ typedef enum {
- #define NDPI_SERIALIZER_DEFAULT_BUFFER_SIZE 8192
- #define NDPI_SERIALIZER_DEFAULT_BUFFER_INCR 1024
-
--#define NDPI_SERIALIZER_STATUS_COMMA (1 << 0)
--#define NDPI_SERIALIZER_STATUS_ARRAY (1 << 1)
--#define NDPI_SERIALIZER_STATUS_EOR (1 << 2)
--#define NDPI_SERIALIZER_STATUS_SOB (1 << 3)
-+#define NDPI_SERIALIZER_STATUS_COMMA (1 << 0)
-+#define NDPI_SERIALIZER_STATUS_ARRAY (1 << 1)
-+#define NDPI_SERIALIZER_STATUS_EOR (1 << 2)
-+#define NDPI_SERIALIZER_STATUS_SOB (1 << 3)
-+#define NDPI_SERIALIZER_STATUS_NOT_EMPTY (1 << 4)
-+
-
- typedef struct {
- u_int32_t flags;
-diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
-index 80221005..57c61604 100644
---- a/src/lib/ndpi_serializer.c
-+++ b/src/lib/ndpi_serializer.c
-@@ -43,6 +43,14 @@
-
- /* ********************************** */
-
-+static u_int8_t ndpi_serialize_is_not_empty(ndpi_serializer *_serializer) {
-+ ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
-+
-+ return(((serializer->status.flags & NDPI_SERIALIZER_STATUS_NOT_EMPTY) == NDPI_SERIALIZER_STATUS_NOT_EMPTY) ? 1 : 0);
-+}
-+
-+/* ********************************** */
-+
- static u_int64_t ndpi_htonll(u_int64_t v) {
- union { u_int32_t lv[2]; u_int64_t llv; } u;
-
-@@ -442,14 +450,17 @@ int ndpi_serialize_end_of_record(ndpi_serializer *_serializer) {
- if(!(serializer->status.flags & NDPI_SERIALIZER_STATUS_ARRAY)) {
- serializer->buffer[0] = '[';
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used],
-- buff_diff, "]");
-+ buff_diff, "]");
- }
-+
- serializer->status.flags |= NDPI_SERIALIZER_STATUS_ARRAY | NDPI_SERIALIZER_STATUS_EOR;
- serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_COMMA;
- } else {
- serializer->buffer[serializer->status.size_used++] = ndpi_serialization_end_of_record;
- }
-
-+ serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-+
- return(0);
- }
-
-@@ -556,6 +567,7 @@ int ndpi_serialize_uint32_uint32(ndpi_serializer *_serializer,
- serializer->buffer[type_offset] = type;
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -607,6 +619,7 @@ int ndpi_serialize_uint32_uint64(ndpi_serializer *_serializer,
- }
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -660,6 +673,7 @@ int ndpi_serialize_uint32_int32(ndpi_serializer *_serializer,
- serializer->buffer[type_offset] = type;
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -713,6 +727,7 @@ int ndpi_serialize_uint32_int64(ndpi_serializer *_serializer,
- }
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -761,6 +776,7 @@ int ndpi_serialize_uint32_float(ndpi_serializer *_serializer,
- serializer->buffer[type_offset] = type;
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -811,6 +827,7 @@ static int ndpi_serialize_uint32_binary(ndpi_serializer *_serializer,
- serializer->buffer[type_offset] = type;
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -851,6 +868,7 @@ int ndpi_serialize_uint32_boolean(ndpi_serializer *_serializer,
- value ? "true" : "false");
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -908,6 +926,8 @@ static int ndpi_serialize_binary_int32(ndpi_serializer *_serializer,
- }
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
-+
- return(0);
- }
-
-@@ -967,6 +987,7 @@ int ndpi_serialize_binary_int64(ndpi_serializer *_serializer,
- }
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -1030,6 +1051,7 @@ static int ndpi_serialize_binary_uint32(ndpi_serializer *_serializer,
- }
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -1056,7 +1078,7 @@ int ndpi_serialize_string_uint32_format(ndpi_serializer *_serializer,
- return(ndpi_serialize_string_uint32(_serializer, key, value));
- } else {
- char buf[16];
--
-+
- snprintf(buf, sizeof(buf), format, value);
- return(ndpi_serialize_string_string(_serializer, key, buf));
- }
-@@ -1111,6 +1133,7 @@ static int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer,
- }
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -1174,6 +1197,7 @@ static int ndpi_serialize_binary_float(ndpi_serializer *_serializer,
- ndpi_serialize_single_float(serializer, value);
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -1232,8 +1256,8 @@ static int ndpi_serialize_binary_raw(ndpi_serializer *_serializer,
- ndpi_serialize_json_post(_serializer);
- } else if(serializer->fmt == ndpi_serialization_format_csv) {
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
-- "%s%s", (serializer->status.size_used > 0) ? serializer->csv_separator : "",
-- value);
-+ "%s%s", ndpi_serialize_is_not_empty(_serializer) ? serializer->csv_separator : "",
-+ value);
- } else {
- serializer->buffer[serializer->status.size_used++] = (ndpi_serialization_string << 4) | ndpi_serialization_string;
-
-@@ -1241,6 +1265,7 @@ static int ndpi_serialize_binary_raw(ndpi_serializer *_serializer,
- ndpi_serialize_single_string(serializer, value, vlen);
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
-@@ -1320,10 +1345,11 @@ int ndpi_serialize_string_boolean(ndpi_serializer *_serializer,
- ndpi_serialize_json_post(_serializer);
- } else if(serializer->fmt == ndpi_serialization_format_csv) {
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
-- "%s%s", (serializer->status.size_used > 0) ? serializer->csv_separator : "",
-+ "%s%s", ndpi_serialize_is_not_empty(_serializer) ? serializer->csv_separator : "",
- value ? "true" : "false");
- }
-
-+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
- return(0);
- }
-
diff --git a/net-libs/nDPI/files/nDPI-3.2-0005-Fix-oob-in-kerberos-dissector.patch b/net-libs/nDPI/files/nDPI-3.2-0005-Fix-oob-in-kerberos-dissector.patch
deleted file mode 100644
index cd34875890c..00000000000
--- a/net-libs/nDPI/files/nDPI-3.2-0005-Fix-oob-in-kerberos-dissector.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 6735bb35c65c60a777557c3277546d5801729995 Mon Sep 17 00:00:00 2001
-From: Alfredo Cardigliano <alfredo.cardigliano@gmail.com>
-Date: Tue, 21 Jul 2020 00:46:37 +0200
-Subject: [PATCH] Fix oob in kerberos dissector
-
----
- src/lib/protocols/kerberos.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/protocols/kerberos.c b/src/lib/protocols/kerberos.c
-index 2bacbf51..2ed824fa 100644
---- a/src/lib/protocols/kerberos.c
-+++ b/src/lib/protocols/kerberos.c
-@@ -185,7 +185,8 @@ void ndpi_search_kerberos(struct ndpi_detection_module_struct *ndpi_struct,
-
- body_offset = koffsetp + 1 + pad_len;
-
-- for(i=0; i<10; i++) if(packet->payload[body_offset] != 0x05) body_offset++; /* ASN.1 */
-+ for(i=0; i<10 && body_offset < packet->payload_packet_len; i++)
-+ if(packet->payload[body_offset] != 0x05) body_offset++; /* ASN.1 */
- #ifdef KERBEROS_DEBUG
- printf("body_offset=%u [%02X %02X] [byte 0 must be 0x05]\n", body_offset, packet->payload[body_offset], packet->payload[body_offset+1]);
- #endif
diff --git a/net-libs/nDPI/nDPI-3.0-r1.ebuild b/net-libs/nDPI/nDPI-3.0-r1.ebuild
deleted file mode 100644
index 42766ed5abf..00000000000
--- a/net-libs/nDPI/nDPI-3.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib
-
-DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="
- dev-libs/json-c:=
- net-libs/libpcap
-"
-RDEPEND="
- ${DEPEND}
-"
-
-src_prepare() {
- sed \
- -e "s/@NDPI_MAJOR@/$(ver_cut 1)/g" \
- -e "s/@NDPI_MINOR@/$(ver_cut 2)/g" \
- -e "s/@NDPI_PATCH@/$(ver_cut 3)/g" \
- -e "s/@NDPI_VERSION_SHORT@/${PV}/g" \
- < "${S}/configure.seed" \
- > "${S}/configure.ac" || die
-
- sed -i \
- -e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \
- src/lib/Makefile.in || die
-
- default
- eautoreconf
-}
-
-src_install() {
- default
- if ! use static-libs; then
- rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
- fi
-}
diff --git a/net-libs/nDPI/nDPI-3.0-r2.ebuild b/net-libs/nDPI/nDPI-3.0-r2.ebuild
deleted file mode 100644
index 50396b2d9db..00000000000
--- a/net-libs/nDPI/nDPI-3.0-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib
-
-DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="
- dev-libs/json-c:=
- net-libs/libpcap
-"
-RDEPEND="
- ${DEPEND}
-"
-
-src_prepare() {
- # Taken from autogen.sh (bug #704074):
- sed \
- -e "s/@NDPI_MAJOR@/$(ver_cut 1)/g" \
- -e "s/@NDPI_MINOR@/$(ver_cut 2)/g" \
- -e "s/@NDPI_PATCH@/$(ver_cut 3)/g" \
- -e "s/@NDPI_VERSION_SHORT@/${PV}/g" \
- < "${S}/configure.seed" \
- > "${S}/configure.ac" || die
-
- sed -i \
- -e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \
- src/lib/Makefile.in || die
-
- default
- eautoreconf
-
- # Taken from autogen.sh (bug #704074):
- sed -i \
- -e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
- -e "s/#define VERSION/#define NDPI_VERSION/g" \
- configure || die
-}
-
-src_install() {
- default
- if ! use static-libs; then
- rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
- fi
-}
diff --git a/net-libs/nDPI/nDPI-3.2-r1.ebuild b/net-libs/nDPI/nDPI-3.2-r1.ebuild
deleted file mode 100644
index a83b9c1dce9..00000000000
--- a/net-libs/nDPI/nDPI-3.2-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib
-
-DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="
- dev-libs/json-c:=
- net-libs/libpcap
-"
-RDEPEND="
- ${DEPEND}
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch
- "${FILESDIR}"/${PN}-3.2-0001-Added-fix-for-serialization-loop.patch
- "${FILESDIR}"/${PN}-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch
- "${FILESDIR}"/${PN}-3.2-0003-Fixed-invalid-allocation.patch
- "${FILESDIR}"/${PN}-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
-)
-
-src_prepare() {
- eval $(grep '^NDPI_MAJOR=' autogen.sh)
- eval $(grep '^NDPI_MINOR=' autogen.sh)
- eval $(grep '^NDPI_PATCH=' autogen.sh)
- NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}"
-
- sed \
- -e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \
- -e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \
- -e "s/@NDPI_PATCH@/${NDPI_PATCH}/g" \
- -e "s/@NDPI_VERSION_SHORT@/${NDPI_VERSION_SHORT}/g" \
- < "${S}/configure.seed" \
- > "${S}/configure.ac" || die
-
- sed -i \
- -e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \
- src/lib/Makefile.in || die
-
- default
- eautoreconf
-
- # Taken from autogen.sh (bug #704074):
- sed -i \
- -e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
- -e "s/#define VERSION/#define NDPI_VERSION/g" \
- configure || die
-}
-
-src_install() {
- default
- if ! use static-libs; then
- rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
- fi
-}
diff --git a/net-libs/nDPI/nDPI-3.2-r2.ebuild b/net-libs/nDPI/nDPI-3.2-r2.ebuild
deleted file mode 100644
index 12a23bb316a..00000000000
--- a/net-libs/nDPI/nDPI-3.2-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib
-
-DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="
- dev-libs/json-c:=
- net-libs/libpcap
-"
-RDEPEND="
- ${DEPEND}
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-3.2-0000-Check-NULL-strings-in-ndpi_serialize_string_string.patch
- "${FILESDIR}"/${PN}-3.2-0001-Added-fix-for-serialization-loop.patch
- "${FILESDIR}"/${PN}-3.2-0002-Refresh-of-ndpi_netbios_name_interpret.patch
- "${FILESDIR}"/${PN}-3.2-0003-Fixed-invalid-allocation.patch
- "${FILESDIR}"/${PN}-3.2-0004-Fix-for-serialization-of-strings-where-the-first-element-is-a-zero-le.patch
- "${FILESDIR}"/${PN}-3.2-0005-Fix-oob-in-kerberos-dissector.patch
-)
-
-src_prepare() {
- eval $(grep '^NDPI_MAJOR=' autogen.sh)
- eval $(grep '^NDPI_MINOR=' autogen.sh)
- eval $(grep '^NDPI_PATCH=' autogen.sh)
- NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}"
-
- sed \
- -e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \
- -e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \
- -e "s/@NDPI_PATCH@/${NDPI_PATCH}/g" \
- -e "s/@NDPI_VERSION_SHORT@/${NDPI_VERSION_SHORT}/g" \
- < "${S}/configure.seed" \
- > "${S}/configure.ac" || die
-
- sed -i \
- -e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \
- src/lib/Makefile.in || die
-
- default
- eautoreconf
-
- # Taken from autogen.sh (bug #704074):
- sed -i \
- -e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
- -e "s/#define VERSION/#define NDPI_VERSION/g" \
- configure || die
-}
-
-src_install() {
- default
- if ! use static-libs; then
- rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-04-13 13:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-20 5:41 [gentoo-commits] repo/gentoo:master commit in: net-libs/nDPI/, net-libs/nDPI/files/ Slawek Lis
-- strict thread matches above, loose matches on Subject: below --
2020-05-16 11:49 Jeroen Roovers
2020-11-05 14:08 Sam James
2020-11-05 14:08 Sam James
2020-11-05 14:08 Sam James
2021-04-13 13:14 John Helmert III
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox