Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-05-01 03:00:57 +02:00
Code Issues Projects Releases Wiki Activity

xplico: version bump with libndpi patches. More QA need to be fixed

Browse source
This commit is contained in:
Anton Bolshakov 2012-11-08 00:23:22 +00:00
parent df198e3d61
commit 855735cea4
6 changed files with 132 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net-analyzer/xplico/Manifest
View file

@ -1,4 +1,8 @@
AUX xplico-1.0.1-dont-strip.patch 305 SHA256 2eb07e32ae5c1013396aa2eb255c1acc1fdd0a5bc899dcb5f04c98906b9fd4cd SHA512 75219bdb3dd8e1840cd3852335804ca4adc3fcebb61ca307315f42aa1f7daf760dba8a429cf12791d70118de6ebd423e0bbe9651176eedf835a242896b25d563 WHIRLPOOL 6a1e8952ef3a78fad2458d49974733746b74f00ed4dc243458b96f140cdfc30104c95708c043abe721b4b6d0cd028317e9487f177243c8dc7de59bcfe9d0707d
AUX xplico-1.0.1-libndpi.patch 2472 SHA256 b93ae8d108c37994bde4a69688dabc4b6024798617f3ab149429f62618a5cb7d SHA512 2c6e7a169ee17a4b53dba9bbb4c9f5e9d0fed65855251959c6605eb1bd1fef109ab7bfe0df254314e2de3bfc62768673fd919fd7a87b1fada5ee5affe232b6fc WHIRLPOOL a37923fdc8845263c75a4a10c3cab0353687086dfdc6bc33e4366891225dce7dac4eeb73ffe4ba2cbbff9295d0f68d8c874994633cbd520a39a53b47b7eef830
DIST xplico-0.7.0.tgz 1924027 SHA256 b14cfacb7f28738ac93e30480b98d56d985e51eb3e4cd68d8f6dc9b0c39181cd
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
EBUILD xplico-0.7.0.ebuild 1145 SHA256 8ace12b9553892fe1a99f81daabdb24283d7f4199cdfa591d98d92be4c71ce3a SHA512 390e01a09e972377b28d43edc61c92334a060b2f5164ac20b1d335200955e5b6099431e54453f1a028a270011ca315d3756cd1ee40da02d8a1b92627d13b423c WHIRLPOOL 09ad2690059296e822a87d3c5cbd8982cba67b7348c8e72c5f9b81516e468667e0de9206a694f7654b6054cb5669f0aa9499605c7e7069b913abf248b2f391c2
EBUILD xplico-1.0.0.ebuild 1183 SHA256 15516368175fcd20add4d7fd369d4b2224234bcab0f7a09c84a411539f97ba64 SHA512 c606d0b71be58f7b1ba70e9ae8c41762017e83d17ebb2cd205775e869a85927fa7974d1d5ea4fabf7849dde0030f7cb1be92f407c4b08cb24283a17ba0886071 WHIRLPOOL 8836e6e71938371fafc9685a8a91053c0fc135966c61d610518fd128acc5ea5a95dbef15ab0a402ce0a1b1244da6e14be4ccf30927e14c74626ecede32aefe2c
EBUILD xplico-1.0.1.ebuild 1299 SHA256 fd1485055127f3cf1c7d0f058f744dc32a89297bcfb209301cc827179568ac2c SHA512 c44754fab502ed7af283b3d8ff16399a14173ab58ec9138fc2e832b645623e965ad5551e5e3f03c719ec068ac809a15d8c96867120434ee9a7cfad0f3ab6d54b WHIRLPOOL 2187e5fb15d383efaf40e24916c667978b076692a3b4034accc33316b1f150f8a15edfb0dfa5563ff254a8898160e2da1c11bb8e67f758779f62d6737f892fb3

10
net-analyzer/xplico/files/xplico-1.0.1-dont-strip.patch Normal file
View file

@ -0,0 +1,10 @@
--- system/trigcap/Makefile.orig 2010-06-28 13:34:45.000000000 +0800
+++ system/trigcap/Makefile 2012-11-07 18:01:16.898093244 +0800
@@ -90,7 +90,6 @@
mkdir -p $(INSTALL_DIR)
mkdir -p $(INSTALL_DIR)/bin
cp -a trigcap $(INSTALL_DIR)/bin
- strip -s $(INSTALL_DIR)/bin/trigcap
.PHONY: reset
reset:

60
net-analyzer/xplico/files/xplico-1.0.1-libndpi.patch Normal file
View file

@ -0,0 +1,60 @@
diff -urN xplico-1.0.1.orig/dissectors/tcp_grbg/Makefile xplico-1.0.1/dissectors/tcp_grbg/Makefile
--- xplico-1.0.1.orig/dissectors/tcp_grbg/Makefile 2012-04-14 22:58:37.000000000 +0800
+++ xplico-1.0.1/dissectors/tcp_grbg/Makefile 2012-11-07 17:37:28.000000000 +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
diff -urN xplico-1.0.1.orig/dissectors/tcp_grbg/tcp_garbage.c xplico-1.0.1/dissectors/tcp_grbg/tcp_garbage.c
--- xplico-1.0.1.orig/dissectors/tcp_grbg/tcp_garbage.c 2012-09-30 19:54:53.000000000 +0800
+++ xplico-1.0.1/dissectors/tcp_grbg/tcp_garbage.c 2012-11-07 17:29:59.000000000 +0800
@@ -47,8 +47,8 @@
#include "pei.h"
/* nDPI library */
-#include "ndpi_api.h"
-#include "ndpi_structs.h"
+#include <libndpi/ndpi_api.h>
+#include <libndpi/ndpi_structs.h>
#define GRB_FILE 0 /* to put (or not) data in to a pcap file */
diff -urN xplico-1.0.1.orig/dissectors/udp_grbg/Makefile xplico-1.0.1/dissectors/udp_grbg/Makefile
--- xplico-1.0.1.orig/dissectors/udp_grbg/Makefile 2012-04-14 23:05:37.000000000 +0800
+++ xplico-1.0.1/dissectors/udp_grbg/Makefile 2012-11-07 17:36:58.000000000 +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
diff -urN xplico-1.0.1.orig/dissectors/udp_grbg/udp_garbage.c xplico-1.0.1/dissectors/udp_grbg/udp_garbage.c
--- xplico-1.0.1.orig/dissectors/udp_grbg/udp_garbage.c 2012-09-30 19:55:17.000000000 +0800
+++ xplico-1.0.1/dissectors/udp_grbg/udp_garbage.c 2012-11-07 17:29:19.000000000 +0800
@@ -46,8 +46,8 @@
#include "pei.h"
/* nDPI library */
-#include "ndpi_api.h"
-#include "ndpi_structs.h"
+#include <libndpi/ndpi_api.h>
+#include <libndpi/ndpi_structs.h>
#define GRB_FILE 0 /* to put (or not) data in to a file */
#define UDP_GRB_TMP_DIR "udp_grb"

53
net-analyzer/xplico/xplico-1.0.1.ebuild Normal file
View file

@ -0,0 +1,53 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="4"
inherit multilib webapp eutils
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"
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
geoip? ( dev-libs/geoip ) "
# cups? ( app-text/ghostscript-gpl ) "
#videosnarf
src_prepare() {
epatch "${FILESDIR}"/"${P}"-libndpi.patch
epatch "${FILESDIR}"/"${P}"-dont-strip.patch
# fix CFLAGS
sed -i "s|-g -ggdb -O0|$CFLAGS|g" Makefile
sed -i "s|-g -ggdb|$CFLAGS|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
}

4
profiles/pentoo/base/package.accept_keywords/net-analyzer
View file

@ -73,7 +73,7 @@ net-analyzer/nessus-plugins
~net-analyzer/whatweb-0.4.7
~net-analyzer/wireshark-1.8.3
~net-analyzer/wolpertinger-0.6
~net-analyzer/xplico-1.0.0
~net-analyzer/xplico-1.0.1
~net-analyzer/xprobe-0.3
net-analyzer/sqlninja
~net-analyzer/sqlninja-0.2.6_p1

3
profiles/pentoo/base/package.accept_keywords/net-libs
View file

@ -4,3 +4,6 @@ net-libs/libwhisker
net-libs/libvidcap
~net-libs/netwib-5.39.0
~net-libs/netwib-5.38.0
#xplico, ntop
=net-libs/libndpi-20121108