xplico: use the stable library

2026-04-15 19:31:11 +02:00 · 2014-09-01 21:15:04 +00:00 · 2014-09-01 21:15:04 +00:00 · 8be5f63f90
commit 8be5f63f90
parent 0fa95990c9
4 changed files with 143 additions and 1 deletions
--- a/net-analyzer/xplico/Manifest
+++ b/net-analyzer/xplico/Manifest
@ -3,9 +3,11 @@ AUX xplico-1.0.1-libndpi.patch 2472 SHA256 b93ae8d108c37994bde4a69688dabc4b60247
 AUX xplico-1.0.1-sock.patch 424 SHA256 f207d51860284668ee327fe85a5e585d651f964271d4ea6adeec1e1552606b9f SHA512 b0cc8a7b140a1cc5af152d1291fb1d1623803eb9397fc350353a3f9c0a0b9b694f00397b85094e4b91fc76897da2856f3d2881694612885f3ecba392c4b384b8 WHIRLPOOL 947db394f3ed50d840ae58bbd684ca568ef4e013cdd96da87effffed7c35adf341f2217fd68f617b2046e83efd9352afdeda3f9c19e75394ffb60379a9e7e85f
 AUX xplico-1.1.0-dont-strip.patch 305 SHA256 2eb07e32ae5c1013396aa2eb255c1acc1fdd0a5bc899dcb5f04c98906b9fd4cd SHA512 75219bdb3dd8e1840cd3852335804ca4adc3fcebb61ca307315f42aa1f7daf760dba8a429cf12791d70118de6ebd423e0bbe9651176eedf835a242896b25d563 WHIRLPOOL 6a1e8952ef3a78fad2458d49974733746b74f00ed4dc243458b96f140cdfc30104c95708c043abe721b4b6d0cd028317e9487f177243c8dc7de59bcfe9d0707d
 AUX xplico-1.1.0-libndpi.patch 2770 SHA256 d39e191fca12b2a086601f3c51c6abf72eda55081de7e07bf7f12d2cd6467a71 SHA512 0b30ea61b068fd8f916b702ebdd5c9cc87a81af99d2d521f81457a687935e5c0c1493bc65fcb8283a4fe9e070b9d5ac3b5f23a764d41b8ba708b73f160ac2428 WHIRLPOOL 308f0d21303a7951b4665227d39d3f14fc592aedae61c331b7e012dfdfa5457c4c789268f1d52b0507b5144886c76d7c21076d3b9c7d330b9f66df80c58de090
+AUX xplico-1.1.0-libndpi15.patch 2772 SHA256 6fec7361b125d414a933048a385e22817a1fe5dc0ae3710706569b5f51419efd SHA512 2a3f8d1504afbc17e3967155aa5cbaececc968fde10873f3e84604ae1a07b0997cc39d3646688f8d06147ce7ca84b47ce053de726961b23cb98e8267e0ae157b WHIRLPOOL 8ce5923b422d3e986c4032912699acbd350ff8d8135121e4263a1e78e3579a8d3c8f0c6b90baeb955e3828d301ea59834adef7d24d4bdcfdf7dfc4e5f62104a6
 DIST xplico-1.0.0.tgz 1937763 SHA256 bc0717f18c29b9f8e8febb1dbf6a00dce32ebb72df71e7e595ac845c70c289cc SHA512 7f97be17e806206b8b6145e763fee231b4da23a91038eef01df5d7629a2e9b0b2e838066dc88b8b3a558af34128d8de432ae4056ceadf3a9fb6a1fd275f55a6b WHIRLPOOL 10da37488798f37c34d6e578dffbd7a3d61faf82475a9dc0f3bea39f4e408a40a0849649b62ffb09c6f2abfd07106308f002fa35c37aa5cb026edc98af4990d8
 DIST xplico-1.0.1.tgz 2052297 SHA256 f5025f8f3cf38601f02fc821e95e9ff7774909fa90c2605ec0dfe5c8b46ff0a5 SHA512 679eaacc96383d884d32c3c5267ad8e3af530bcec643e70583a83c960ddc3a955c6bb0fa9d8e5a8391f0d94b174dace458ba9fc68fe414d2ed27fb6be5e3e5a5 WHIRLPOOL 87e9865de45ca5dc38382bccfbabc919de0a0bf47a2f8507a013a1e8c25a939a76f720f8de09145ba27f00b96a622ecbd60086bef6336637a17e9ddf5a39d401
 DIST xplico-1.1.0.tgz 3692520 SHA256 3e0854ca7338efe0a0688525ac09c015a0cf8cc16db0840fa5c65351038594ac SHA512 d3a064dfd2ff632d7074ca9e770d89d4fded296f9235b16c6581484ccc0e1bf038780bcfc65f73559a142c0c40115ff574a5a59be10ec060691da1b06da0be5e WHIRLPOOL eb276308ac05bbc04a2cfd5adb719ae12f84802e859f1adbe672154ebb119d21500005d5146004d8d42b0c37a42e6927c8e8b8857034283c6aa783dad31847d4
 EBUILD xplico-1.0.0.ebuild 1222 SHA256 ae0295ed7d281371c12df648e1610e77100883d1553dab00f1828dd2b0e79749 SHA512 d10b45315d0fb58e9d8300887ad544c22204b5fa9fb1808333dce60f532e7e839a963064222eb37628dbb3e6e014bda8eb878fc05d96eb5a2cf36137a52fa3f5 WHIRLPOOL f957f9696715f78db0e4d03a7603290a95b58a95ba6c342104e73879309cdff2a600125a91ac55cd793efcd9074df818fb7287fd5cfe76e92429cbbba8d5b289
 EBUILD xplico-1.0.1.ebuild 1378 SHA256 c67043c8e87a4022942d24ec747dbfef45d9fad5b1a53cd8843b80d98008b935 SHA512 1017b10aca136c619d0dd10c35f1eac649a4c0f04d5adc0d3c0571c326933a1f537fda48e39361336b5a6c41a1b784ffa402a1ebf388e89d3e18e99f51f4a3ee WHIRLPOOL 16eab35be9c511bae6302577675ba08dccd92f9de3327d82d13cc46c53156f139ab78666433339d1c7bfc4100cdd989e71b014ea3e4209e5c01120cd031f04bb
+EBUILD xplico-1.1.0-r1.ebuild 1447 SHA256 1b78c2b0b10f4564c0d463d943317e6d1bde5687622982c2782b8a8e1aa287eb SHA512 48ebdb32071b6845d4edf6c850ee7c858f7251a913cf56439f3c904ae054a50639052302606d25c4c1458c4dae1b72dda9969ac10561c709190d1952420e5b7c WHIRLPOOL d4645aa73b7b09fb78d71d24ebd660ffac48e7e703910f0d5d148b0c2b4631a3174c3532e9f12e8c4a4fd6b6d2058c420addccf81ee12cfa4cd954debbdd5365
 EBUILD xplico-1.1.0.ebuild 1447 SHA256 98b5155bb49c3a9a5fe382b6bf16e0cb12dc52e8c0f33f3b643b154415ce22f3 SHA512 f85e4d68f270ad422221b7c692f912f91ec334d4a89b044fdfdc1aaf15db41e347ab49b162b7dbcdc0ddb6e77c1f8aca797aede1367699ed8057ac4277ecf06c WHIRLPOOL 22562a4168eb0416f616e31269918b599c61da1d0f744d498d504e7858ba289d5d6418bf31b6d5c3d43e10d769a71429b6980085e25b7c57c4ab18d781bf6bb7
--- a/net-analyzer/xplico/files/xplico-1.1.0-libndpi15.patch
+++ b/net-analyzer/xplico/files/xplico-1.1.0-libndpi15.patch
@ -0,0 +1,79 @@
+diff -urN xplico-1.1.0.orig/dissectors/tcp_grbg/Makefile xplico-1.1.0/dissectors/tcp_grbg/Makefile
+--- xplico-1.1.0.orig/dissectors/tcp_grbg/Makefile	2013-09-29 04:45:11.000000000 +0800
+++ xplico-1.1.0/dissectors/tcp_grbg/Makefile	2014-07-19 14:55:47.091503427 +0800
+@@ -36,10 +36,10 @@
+ SRC = dis_log.c tcp_garbage.c
+ 
+ # C flags specific to the dissector
+-CFLAGS += -I$(ROOT_DIR)/../nDPI/src/include -I$(ROOT_DIR)/../nDPI/src/lib
+CFLAGS += -I/usr/include/libndpi -I/usr/lib/libndpi
+ 
+ # library specific to the dissector
+-LDFLAGS = $(ROOT_DIR)/../nDPI/src/lib/.libs/libndpi.a
+LDFLAGS = -lndpi
+ 
+ # To make it visible
+ export CC CCPP ROOT_DIR CFLAGS LDFLAGS INCLUDE_DIR
+@@ -48,7 +48,7 @@
+ all: subdir $(DIS_SO)
+ 
+ 
+-$(DIS_SO): $(SRC:.c=.o) $(ROOT_DIR)/../nDPI/src/lib/.libs/libndpi.a
+$(DIS_SO): $(SRC:.c=.o)
+ 	$(CC) $(CFLAGS) -shared -Wl,-soname,$@ -o $@ $(SRC:.c=.o) $(LDFLAGS)
+ 
+ 
+diff -urN xplico-1.1.0.orig/dissectors/tcp_grbg/tcp_garbage.c xplico-1.1.0/dissectors/tcp_grbg/tcp_garbage.c
+--- xplico-1.1.0.orig/dissectors/tcp_grbg/tcp_garbage.c	2013-11-24 00:58:21.000000000 +0800
+++ xplico-1.1.0/dissectors/tcp_grbg/tcp_garbage.c	2014-07-19 14:08:27.189312773 +0800
+@@ -48,9 +48,9 @@
+ #include "pcap_gfile.h"
+ 
+ /* nDPI library */
+-#include "ndpi_main.h"
+-#include "ndpi_api.h"
+-#include "ndpi_structs.h"
+#include <ndpi_main.h>
+#include <ndpi_api.h>
+#include <ndpi_typedefs.h>
+ 
+ 
+ #define GRB_FILE           0           /* to put (or not) data in to a pcap file */
+--- xplico-1.1.0.orig/dissectors/udp_grbg/Makefile	2013-09-29 04:45:11.000000000 +0800
+++ xplico-1.1.0/dissectors/udp_grbg/Makefile	2014-07-19 16:23:00.409854761 +0800
+@@ -36,10 +36,10 @@
+ SRC = dis_log.c udp_garbage.c
+ 
+ # C flags specific to the dissector
+-CFLAGS += -I$(ROOT_DIR)/../nDPI/src/include -I$(ROOT_DIR)/../nDPI/src/lib
+CFLAGS += -I/usr/include/libndpi -I/usr/lib/libndpi
+ 
+ # library specific to the dissector
+-LDFLAGS = $(ROOT_DIR)/../nDPI/src/lib/.libs/libndpi.a
+LDFLAGS = -lndpi
+ 
+ # To make it visible
+ export CC CCPP ROOT_DIR CFLAGS LDFLAGS INCLUDE_DIR
+@@ -48,7 +48,7 @@
+ all: subdir $(DIS_SO)
+ 
+ 
+-$(DIS_SO): $(SRC:.c=.o) $(ROOT_DIR)/../nDPI/src/lib/.libs/libndpi.a
+$(DIS_SO): $(SRC:.c=.o)
+ 	$(CC) $(CFLAGS) -shared -Wl,-soname,$@ -o $@ $(SRC:.c=.o) $(LDFLAGS)
+ 
+ 
+diff -urN xplico-1.1.0.orig/dissectors/udp_grbg/udp_garbage.c xplico-1.1.0/dissectors/udp_grbg/udp_garbage.c
+--- xplico-1.1.0.orig/dissectors/udp_grbg/udp_garbage.c	2013-09-29 04:45:11.000000000 +0800
+++ xplico-1.1.0/dissectors/udp_grbg/udp_garbage.c	2014-07-19 14:09:15.261316001 +0800
+@@ -47,9 +47,9 @@
+ #include "pcap_gfile.h"
+ 
+ /* nDPI library */
+-#include "ndpi_main.h"
+-#include "ndpi_api.h"
+-#include "ndpi_structs.h"
+#include <ndpi_main.h>
+#include <ndpi_api.h>
+#include <ndpi_typedefs.h>
+ 
--- a/net-analyzer/xplico/xplico-1.1.0-r1.ebuild
+++ b/net-analyzer/xplico/xplico-1.1.0-r1.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit multilib webapp eutils
+
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="Extract data from TCP/IP traffic"
+HOMEPAGE="http://www.xplico.org"
+SRC_URI="mirror://sourceforge/$PN/$P.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+geoip"
+SLOT="1.0.0"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="dev-db/mysql
+		media-sound/sox
+		media-sound/lame
+		dev-lang/php
+		virtual/httpd-cgi
+		dev-db/sqlite:3
+		>=net-libs/libndpi-1.5.0
+		geoip? ( dev-libs/geoip ) "
+#		cups? ( app-text/ghostscript-gpl ) "
+#videosnarf
+
+src_prepare() {
+	epatch "${FILESDIR}"/"${P}"-dont-strip.patch
+	#unbundle libndpi
+	epatch "${FILESDIR}"/"${P}"-libndpi15.patch
+
+	# TODO:
+	# unbundle json-c and geoip
+
+	# fix CFLAGS
+	sed -i "s|CFLAGS = -rdynamic|CFLAGS += -rdynamic|g" Makefile
+#	sed -i "s|CFLAGS = -rdynamic|CFLAGS += -rdynamic|g" system/dema/Makefile
+	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
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	webapp_src_preinst
+#	mv xi "${D}"/${MY_HTDOCSDIR}/xplico
+	DESTDIR="${D}" emake -j1 install
+	webapp_src_install
+}
--- a/profiles/pentoo/base/package.accept_keywords/net-libs
+++ b/profiles/pentoo/base/package.accept_keywords/net-libs
@ -10,7 +10,8 @@ net-libs/cppzmq

 #xplico, ntop
 #~net-libs/libndpi-20121108
-=net-libs/libndpi-2014*
+#=net-libs/libndpi-2014*
+~net-libs/libndpi-1.5.0

 #requried by zarp
 ~net-libs/nfqueue-bindings-0.4