diff --git a/net-analyzer/xplico/files/init-detection.patch b/net-analyzer/xplico/files/init-detection.patch new file mode 100644 index 000000000..b0c1030f7 --- /dev/null +++ b/net-analyzer/xplico/files/init-detection.patch @@ -0,0 +1,48 @@ +diff -Naur a/dissectors/tcp_ca/tcp_analysis.c b/dissectors/tcp_ca/tcp_analysis.c +--- a/dissectors/tcp_ca/tcp_analysis.c 2021-02-07 12:27:44.022318127 +0100 ++++ b/dissectors/tcp_ca/tcp_analysis.c 2021-02-07 12:29:16.635347841 +0100 +@@ -1081,7 +1081,7 @@ + mkdir(tmp_dir, 0x01FF); + + /* ndpi */ +- ndpi = ndpi_init_detection_module(); ++ ndpi = ndpi_init_detection_module(ndpi_no_prefs); + if (ndpi == NULL) { + LogPrintf(LV_ERROR, "nDPi initializzation failed"); + +diff -Naur a/dissectors/tcp_grbg/tcp_garbage.c b/dissectors/tcp_grbg/tcp_garbage.c +--- a/dissectors/tcp_grbg/tcp_garbage.c 2021-02-07 12:27:44.022318127 +0100 ++++ b/dissectors/tcp_grbg/tcp_garbage.c 2021-02-07 12:29:02.512055779 +0100 +@@ -1250,7 +1250,7 @@ + + /* ndpi */ + pthread_mutex_init(&ndpi_mux, NULL); +- ndpi = ndpi_init_detection_module(); ++ ndpi = ndpi_init_detection_module(ndpi_no_prefs); + if (ndpi == NULL) { + LogPrintf(LV_ERROR, "nDPi initializzation failed"); + +diff -Naur a/dissectors/udp_ca/udp_analysis.c b/dissectors/udp_ca/udp_analysis.c +--- a/dissectors/udp_ca/udp_analysis.c 2021-02-07 12:27:44.022318127 +0100 ++++ b/dissectors/udp_ca/udp_analysis.c 2021-02-07 12:28:36.928801651 +0100 +@@ -631,7 +631,7 @@ + + /* ndpi */ + pthread_mutex_init(&ndpi_mux, NULL); +- ndpi = ndpi_init_detection_module(); ++ ndpi = ndpi_init_detection_module(ndpi_no_prefs); + if (ndpi == NULL) { + LogPrintf(LV_ERROR, "nDPi initializzation failed"); + +diff -Naur a/dissectors/udp_grbg/udp_garbage.c b/dissectors/udp_grbg/udp_garbage.c +--- a/dissectors/udp_grbg/udp_garbage.c 2021-02-07 12:27:44.022318127 +0100 ++++ b/dissectors/udp_grbg/udp_garbage.c 2021-02-07 12:29:42.058611090 +0100 +@@ -569,7 +569,7 @@ + + /* ndpi */ + pthread_mutex_init(&ndpi_mux, NULL); +- ndpi = ndpi_init_detection_module(); ++ ndpi = ndpi_init_detection_module(ndpi_no_prefs); + if (ndpi == NULL) { + LogPrintf(LV_ERROR, "nDPi initializzation failed"); + diff --git a/net-analyzer/xplico/files/istypes_h.patch b/net-analyzer/xplico/files/istypes_h.patch new file mode 100644 index 000000000..149723a23 --- /dev/null +++ b/net-analyzer/xplico/files/istypes_h.patch @@ -0,0 +1,16 @@ +--- a/common/include/istypes.h.orig 2019-04-25 20:24:33.000000000 +0800 ++++ b/common/include/istypes.h 2022-01-08 13:20:41.231765198 +0800 +@@ -27,9 +27,9 @@ + #ifndef __ISFTYPES_H__ + #define __ISFTYPES_H__ + +-/** boolean type */ +-typedef unsigned char bool; +-#define TRUE (0==0) +-#define FALSE (!TRUE) ++# include ++ ++# define TRUE (0==0) ++# define FALSE (!TRUE) + + #endif /* __ISFTYPES_H__ */ diff --git a/net-analyzer/xplico/xplico-1.2.2.ebuild b/net-analyzer/xplico/xplico-1.2.2.ebuild index e0b87ca05..de0cbaa45 100644 --- a/net-analyzer/xplico/xplico-1.2.2.ebuild +++ b/net-analyzer/xplico/xplico-1.2.2.ebuild @@ -37,6 +37,8 @@ S="${WORKDIR}/${PN}-v.${PV}" src_prepare() { epatch "${FILESDIR}"/"${P}"-include.patch + epatch "${FILESDIR}"/init-detection.patch + epatch "${FILESDIR}"/istypes_h.patch # fix CFLAGS sed -i "s|CFLAGS = -rdynamic|CFLAGS += -rdynamic|g" Makefile