Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2025-12-06 08:25:01 +01:00
Code Issues Projects Releases Wiki Activity

xplico: nevermind, just delete it

Browse source
This commit is contained in:
Anton Bolshakov 2022-07-28 13:15:35 +08:00
parent 54bc2b03a1
commit b0df2bb05a
No known key found for this signature in database
GPG key ID: 32BDCED870788F04
6 changed files with 0 additions and 270 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
net-analyzer/xplico/Manifest
View file

@ -1 +0,0 @@
DIST xplico-1.2.2.tar.gz 2469910 BLAKE2B d0bafa0b7a2263b7513f58466e7d3d467c6079c889f9434cfd6bbd567c54b042a3c49d5d0c72e19f6a6bb1fa30a4dd2a394837f485c3feb30fff2c5ff520476d SHA512 e189e39e1d76af691c4bc86ad7db3493f6341fec9aba951cf02558e06c4963b73806df06303b6ba9b6352e4a204aac5920690d61338d4d1f680257211d62a6d3

48
net-analyzer/xplico/files/init-detection.patch
View file

@ -1,48 +0,0 @@
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");

16
net-analyzer/xplico/files/istypes_h.patch
View file

@ -1,16 +0,0 @@
--- 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 <stdbool.h>
+
+# define TRUE (0==0)
+# define FALSE (!TRUE)
#endif /* __ISFTYPES_H__ */

70
net-analyzer/xplico/files/xplico-1.2.2-include.patch
View file

@ -1,70 +0,0 @@
diff -urN xplico-v.1.2.2.orig/dissectors/tcp_ca/tcp_analysis.c xplico-v.1.2.2/dissectors/tcp_ca/tcp_analysis.c
--- xplico-v.1.2.2.orig/dissectors/tcp_ca/tcp_analysis.c 2019-04-25 20:24:33.000000000 +0800
+++ xplico-v.1.2.2/dissectors/tcp_ca/tcp_analysis.c 2019-04-25 22:21:28.811087439 +0800
@@ -48,7 +48,7 @@
#include "png.h"
/* nDPI library */
-#include <libndpi/ndpi_main.h>
+#include <ndpi/ndpi_main.h>
#define CA_CHECK_LOST 0 /* check lost data */
diff -urN xplico-v.1.2.2.orig/dissectors/tcp_ca/tcp_analysis.h xplico-v.1.2.2/dissectors/tcp_ca/tcp_analysis.h
--- xplico-v.1.2.2.orig/dissectors/tcp_ca/tcp_analysis.h 2019-04-25 20:24:33.000000000 +0800
+++ xplico-v.1.2.2/dissectors/tcp_ca/tcp_analysis.h 2019-04-25 22:21:25.168087171 +0800
@@ -29,7 +29,7 @@
#define __TCP_ANALYSIS_H__
#include "pei.h"
-#include <libndpi/ndpi_api.h>
+#include <ndpi/ndpi_api.h>
/* path & buffer size */
#define TCP_CA_FILENAME_PATH_SIZE 512
diff -urN xplico-v.1.2.2.orig/dissectors/tcp_grbg/tcp_garbage.c xplico-v.1.2.2/dissectors/tcp_grbg/tcp_garbage.c
--- xplico-v.1.2.2.orig/dissectors/tcp_grbg/tcp_garbage.c 2019-04-25 20:24:33.000000000 +0800
+++ xplico-v.1.2.2/dissectors/tcp_grbg/tcp_garbage.c 2019-04-25 22:21:34.705087872 +0800
@@ -48,9 +48,9 @@
#include "pcap_gfile.h"
/* nDPI library */
-#include <libndpi/ndpi_main.h>
-#include <libndpi/ndpi_api.h>
-#include <libndpi/ndpi_typedefs.h>
+#include <ndpi/ndpi_main.h>
+#include <ndpi/ndpi_api.h>
+#include <ndpi/ndpi_typedefs.h>
#define GRB_FILE 0 /* to put (or not) data in to a pcap file */
diff -urN xplico-v.1.2.2.orig/dissectors/udp_ca/udp_analysis.c xplico-v.1.2.2/dissectors/udp_ca/udp_analysis.c
--- xplico-v.1.2.2.orig/dissectors/udp_ca/udp_analysis.c 2019-04-25 20:24:33.000000000 +0800
+++ xplico-v.1.2.2/dissectors/udp_ca/udp_analysis.c 2019-04-25 22:21:51.525089109 +0800
@@ -46,8 +46,8 @@
#include "geoiploc.h"
/* nDPI library */
-#include <libndpi/ndpi_main.h>
-#include <libndpi/ndpi_api.h>
+#include <ndpi/ndpi_main.h>
+#include <ndpi/ndpi_api.h>
#define UDP_CA_TMP_DIR "udp_ca"
#define NDPI_TICK_RES 1000 /* Hz */
diff -urN xplico-v.1.2.2.orig/dissectors/udp_grbg/udp_garbage.c xplico-v.1.2.2/dissectors/udp_grbg/udp_garbage.c
--- xplico-v.1.2.2.orig/dissectors/udp_grbg/udp_garbage.c 2019-04-25 20:24:33.000000000 +0800
+++ xplico-v.1.2.2/dissectors/udp_grbg/udp_garbage.c 2019-04-25 22:21:43.912088549 +0800
@@ -47,9 +47,9 @@
#include "pcap_gfile.h"
/* nDPI library */
-#include <libndpi/ndpi_main.h>
-#include <libndpi/ndpi_api.h>
-#include <libndpi/ndpi_typedefs.h>
+#include <ndpi/ndpi_main.h>
+#include <ndpi/ndpi_api.h>
+#include <ndpi/ndpi_typedefs.h>
#define GRB_FILE 0 /* to put (or not) data in to a file */
#define UDP_GRB_TMP_DIR "udp_grb"

66
net-analyzer/xplico/files/xplico-1.2.2-ndpi2.patch
View file

@ -1,66 +0,0 @@
diff -urN xplico-1.2.0.orig/dissectors/tcp_ca/tcp_analysis.c xplico-1.2.0/dissectors/tcp_ca/tcp_analysis.c
--- xplico-1.2.0.orig/dissectors/tcp_ca/tcp_analysis.c 2017-01-15 19:11:07.000000000 +0800
+++ xplico-1.2.0/dissectors/tcp_ca/tcp_analysis.c 2017-10-10 00:50:47.065666338 +0800
@@ -524,7 +524,7 @@
else {
ifw->l7prot_id = nDPIPacket(pkt, ifw->l7flow, ifw->l7dst, ifw->l7src, ifw->priv.ipv6);
}
- if (ifw->l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
+ if (ifw->l7prot_id.app_protocol != NDPI_PROTOCOL_UNKNOWN) {
ifw->stage++;
ifw->l7prot_type = ndpi_protocol2name(ndpi, ifw->l7prot_id, ifw->buff, TCP_CA_LINE_MAX_SIZE);
}
@@ -618,7 +618,7 @@
else
ifw->l7prot_id = ndpi_guess_undetected_protocol(ndpi, IPPROTO_TCP, ifw->priv.ip_s.uint32, ifw->priv.ip_d.uint32, ifw->priv.port_s, ifw->priv.port_d);
- if (ifw->l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
+ if (ifw->l7prot_id.master_protocol != NDPI_PROTOCOL_UNKNOWN) {
ifw->l7prot_type = ndpi_protocol2name(ndpi, ifw->l7prot_id, ifw->buff, TCP_CA_LINE_MAX_SIZE);
}
else {
diff -urN xplico-1.2.0.orig/dissectors/tcp_grbg/tcp_garbage.c xplico-1.2.0/dissectors/tcp_grbg/tcp_garbage.c
--- xplico-1.2.0.orig/dissectors/tcp_grbg/tcp_garbage.c 2017-01-15 19:11:07.000000000 +0800
+++ xplico-1.2.0/dissectors/tcp_grbg/tcp_garbage.c 2017-10-10 00:48:34.837657461 +0800
@@ -675,7 +675,7 @@
else {
l7prot_id = nDPIPacket(pkt, l7flow, l7dst, l7src, ipv4);
}
- if (l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
+ if (l7prot_id.app_protocol != NDPI_PROTOCOL_UNKNOWN) {
stage++;
l7prot_type = ndpi_protocol2name(ndpi, l7prot_id, buff, TCP_CFG_LINE_MAX_SIZE);
}
diff -urN xplico-1.2.0.orig/dissectors/udp_ca/udp_analysis.c xplico-1.2.0/dissectors/udp_ca/udp_analysis.c
--- xplico-1.2.0.orig/dissectors/udp_ca/udp_analysis.c 2017-01-15 19:11:07.000000000 +0800
+++ xplico-1.2.0/dissectors/udp_ca/udp_analysis.c 2017-10-10 00:51:14.197668160 +0800
@@ -431,7 +431,7 @@
else {
l7prot_id = nDPIPacket(pkt, l7flow, l7dst, l7src, ipv4);
}
- if (l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
+ if (l7prot_id.master_protocol != NDPI_PROTOCOL_UNKNOWN) {
l7prot_type = ndpi_protocol2name(ndpi, l7prot_id, buff, UDP_CA_LINE_MAX_SIZE);
}
}
@@ -451,7 +451,7 @@
else
l7prot_id = ndpi_guess_undetected_protocol(ndpi, IPPROTO_UDP, priv.ip_s.uint32, priv.ip_d.uint32, priv.port_s, priv.port_d);
- if (l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
+ if (l7prot_id.master_protocol != NDPI_PROTOCOL_UNKNOWN) {
l7prot_type = ndpi_protocol2name(ndpi, l7prot_id, buff, UDP_CA_LINE_MAX_SIZE);
}
else {
diff -urN xplico-1.2.0.orig/dissectors/udp_grbg/udp_garbage.c xplico-1.2.0/dissectors/udp_grbg/udp_garbage.c
--- xplico-1.2.0.orig/dissectors/udp_grbg/udp_garbage.c 2017-01-15 19:11:07.000000000 +0800
+++ xplico-1.2.0/dissectors/udp_grbg/udp_garbage.c 2017-10-10 00:49:00.111659158 +0800
@@ -373,7 +373,7 @@
else {
l7prot_id = nDPIPacket(pkt, l7flow, l7dst, l7src, ipv4);
}
- if (l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
+ if (l7prot_id.master_protocol != NDPI_PROTOCOL_UNKNOWN) {
l7prot_type = ndpi_protocol2name(ndpi, l7prot_id, buff, UDP_CFG_LINE_MAX_SIZE);
}
}

69
net-analyzer/xplico/xplico-1.2.2.ebuild
View file

@ -1,69 +0,0 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit multilib eutils
# webapp
#WEBAPP_OPTIONAL=yes
#WEBAPP_MANUAL_SLOT="yes"
DESCRIPTION="Extract data from TCP/IP traffic"
HOMEPAGE="http://www.xplico.org"
SRC_URI="https://github.com/xplico/xplico/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
IUSE="+geoip mysql"
# webui"
SLOT="0"
DEPEND="net-libs/libpcap
>=net-libs/nDPI-2.8 <net-libs/nDPI-3.0"
RDEPEND="mysql? ( dev-db/mysql )
media-sound/sox
media-sound/lame
dev-db/sqlite:3
geoip? ( dev-libs/geoip )"
# webui? ( dev-lang/php
# virtual/httpd-cgi
# )
# cups? ( app-text/ghostscript-gpl ) "
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
# sed -i "s|CFLAGS = -rdynamic|CFLAGS += -rdynamic|g" system/dema/Makefile
sed -i '/json_object_private.h/d' manipulators/mwebymsg/analyse.c
# if use geoip; then
# sed -i -e "s|GEOIP_LIB =.*|GEOIP_LIB = /usr/$(get_libdir)/libGeoIP.a|g" Makefile
# sed -i "s|GeoLiteCity.dat|/usr/share/GeoIP/GeoIP.dat|" common/geoiploc.c
# sed -i "s|-lpthread|-lpthread -lGeoIP|g" manipulators/www/Makefile\
# manipulators/mfbc/Makefile manipulators/mwmail/Makefile\
# manipulators/mfile/Makefile
# fi
eapply_user
}
src_compile() {
DISABLE_GEOIP=1 emake -j1
}
src_install() {
# webapp_src_preinst
# mv xi "${D}"/${MY_HTDOCSDIR}/xplico
DESTDIR="${D}" emake -j1 install
# webapp_src_install
}