summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlawomir Lis <slis@gentoo.org>2016-02-21 21:25:35 +0100
committerSlawomir Lis <slis@gentoo.org>2016-04-26 08:12:16 +0200
commit909c0f0babd784307cae0c3d88c0e9e1d16f63b7 (patch)
tree31a07b4ff7624c85cc346a7791ff9c86c13f973b /net-analyzer/suricata
parentdev-games/cegui: fix so name (diff)
downloadgentoo-909c0f0babd784307cae0c3d88c0e9e1d16f63b7.tar.gz
gentoo-909c0f0babd784307cae0c3d88c0e9e1d16f63b7.tar.bz2
gentoo-909c0f0babd784307cae0c3d88c0e9e1d16f63b7.zip
drop system-htp use flag (#575144)
Package-Manager: portage-2.2.27
Diffstat (limited to 'net-analyzer/suricata')
-rw-r--r--net-analyzer/suricata/metadata.xml1
-rw-r--r--net-analyzer/suricata/suricata-2.0.11.ebuild8
2 files changed, 3 insertions, 6 deletions
diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml
index 517666e56cef..0f80bed1d8da 100644
--- a/net-analyzer/suricata/metadata.xml
+++ b/net-analyzer/suricata/metadata.xml
@@ -13,6 +13,5 @@
<flag name="nflog">Enable libnetfilter_log support</flag>
<flag name="nfqueue">Enable AF_PACKET support</flag>
<flag name="rules">Enable AF_PACKET support</flag>
- <flag name="system-htp">Use net-libs/libhtp instead of bundled one</flag>
</use>
</pkgmetadata>
diff --git a/net-analyzer/suricata/suricata-2.0.11.ebuild b/net-analyzer/suricata/suricata-2.0.11.ebuild
index 0323836a2407..a1a7eb39d390 100644
--- a/net-analyzer/suricata/suricata-2.0.11.ebuild
+++ b/net-analyzer/suricata/suricata-2.0.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue +rules system-htp test"
+IUSE="+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue +rules test"
DEPEND="
>=dev-libs/jansson-2.2
@@ -23,6 +23,7 @@ DEPEND="
net-libs/libnfnetlink
dev-libs/nspr
dev-libs/nss
+ >=net-libs/libhtp-0.5.18
net-libs/libpcap
sys-apps/file
cuda? ( dev-util/nvidia-cuda-toolkit )
@@ -31,7 +32,6 @@ DEPEND="
luajit? ( dev-lang/luajit:* )
nflog? ( net-libs/libnetfilter_log )
nfqueue? ( net-libs/libnetfilter_queue )
- system-htp? ( >=net-libs/libhtp-0.5.18 )
"
# #446814
# prelude? ( dev-libs/libprelude )
@@ -54,6 +54,7 @@ src_prepare() {
src_configure() {
local myeconfargs=(
"--localstatedir=/var/" \
+ "--enable-non-bundled-htp" \
$(use_enable af-packet) \
$(use_enable detection) \
$(use_enable nfqueue) \
@@ -85,9 +86,6 @@ src_configure() {
# if use prelude ; then
# myeconfargs+=( $(use_enable prelude) )
# fi
- if use system-htp ; then
- myeconfargs+=( $(use_enable system-htp non-bundled-htp) )
- fi
if use lua ; then
myeconfargs+=( $(use_enable lua) )
fi