commit: 8f5935a130e2f36e50950b193cbf0f92e7616032 Author: Slawomir Lis <slis <AT> gentoo <DOT> org> AuthorDate: Fri Feb 19 05:36:04 2016 +0000 Commit: Slawek Lis <slis <AT> gentoo <DOT> org> CommitDate: Fri Feb 19 05:36:04 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f5935a1
Added detection USE flag, drop old Package-Manager: portage-2.2.27 net-analyzer/suricata/Manifest | 1 - net-analyzer/suricata/metadata.xml | 3 +- net-analyzer/suricata/suricata-2.0.10.ebuild | 120 --------------------------- net-analyzer/suricata/suricata-2.0.11.ebuild | 6 +- 4 files changed, 5 insertions(+), 125 deletions(-) diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest index e35b5b9..cff1749 100644 --- a/net-analyzer/suricata/Manifest +++ b/net-analyzer/suricata/Manifest @@ -1,2 +1 @@ -DIST suricata-2.0.10.tar.gz 3090730 SHA256 c8d1d3b6ce3d2a56577fca224424071afd921739d3859efc8a62229556d4beef SHA512 fa3683a93d85b26166b0f67a85f1a498941aadf4372ef98bd7fe62fcdef150af46b65456e3a764e054c385abbf44138ae6f70882c68ba320508eade6e181f2c6 WHIRLPOOL b867003e76df2b0b1b56c89415ed96acbf9d8966739d77aa303055d29ae5cdad8ad0b58e969336f0c1fc2e5d9990941622c19c062828dae58bf062f5662225f3 DIST suricata-2.0.11.tar.gz 3091124 SHA256 c607f1e18e5636830f42a83f7c67e1466f07db82853f3a9dba4ab8c6c3bc656e SHA512 659e893fef3cdcca8440f2af7596d5cc58b142d3350b9ea5ba57d855c6759a00adafeb15a1dfe91dd55eca1437487eb4e842b4e2913d12417f0b906ca3d54ec9 WHIRLPOOL 5cfa55abd90284a0a3441853af9db18075a23fa5661d89448b409b8fdd1031ad348d76d455b7dfe7b2688e69633f5bbb65dc060cc2426af017ab1bcb824c9ac5 diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml index 9ec4bf7..108297d 100644 --- a/net-analyzer/suricata/metadata.xml +++ b/net-analyzer/suricata/metadata.xml @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="person"> + <maintainer> <email>s...@gentoo.org</email> </maintainer> <use> <flag name="af-packet">Enable AF_PACKET support</flag> <flag name="control-socket">Enable unix socket</flag> <flag name="cuda">Enable NVIDIA Cuda computations support</flag> + <flag name="detection">Enable detection modules</flag> <flag name="luajit">Enable Luajit support</flag> <flag name="nflog">Enable libnetfilter_log support</flag> <flag name="nfqueue">Enable AF_PACKET support</flag> diff --git a/net-analyzer/suricata/suricata-2.0.10.ebuild b/net-analyzer/suricata/suricata-2.0.10.ebuild deleted file mode 100644 index 3c69998..0000000 --- a/net-analyzer/suricata/suricata-2.0.10.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools eutils user - -DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" -HOMEPAGE="http://suricata-ids.org/"; -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 geoip hardened lua luajit nflog +nfqueue +rules test" - -DEPEND=" - >=dev-libs/jansson-2.2 - dev-libs/libpcre - dev-libs/libyaml - net-libs/libnet:* - net-libs/libnfnetlink - dev-libs/nspr - dev-libs/nss - net-libs/libpcap - sys-apps/file - cuda? ( dev-util/nvidia-cuda-toolkit ) - geoip? ( dev-libs/geoip ) - lua? ( dev-lang/lua:* ) - luajit? ( dev-lang/luajit:* ) - nflog? ( net-libs/libnetfilter_log ) - nfqueue? ( net-libs/libnetfilter_queue ) -" -# #446814 -# prelude? ( dev-libs/libprelude ) -# pfring? ( sys-process/numactl net-libs/pf_ring) -# system-htp? ( >=net-analyzer/htp-0.5.5 ) -RDEPEND="${DEPEND}" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}" -} - -src_prepare() { - epatch "${FILESDIR}/fortify_source-numeric.patch" - epatch "${FILESDIR}/magic-location.patch" - epatch "${FILESDIR}/json.patch" - - eautoreconf -} - -src_configure() { - local myeconfargs=( - "--localstatedir=/var/" \ - "--disable-detection" \ - $(use_enable af-packet) \ - $(use_enable nfqueue) \ - $(use_enable test coccinelle) \ - $(use_enable test unittests) \ - $(use_enable control-socket unix-socket) - ) - - if use cuda ; then - myeconfargs+=( $(use_enable cuda) ) - fi - if use debug ; then - myeconfargs+=( $(use_enable debug) ) - fi - if use geoip ; then - myeconfargs+=( $(use_enable geoip) ) - fi - if use hardened ; then - myeconfargs+=( $(use_enable hardened gccprotect) ) - fi - if use nflog ; then - myeconfargs+=( $(use_enable nflog) ) - fi - # not supported yet (no pfring in portage) -# if use pfring ; then -# myeconfargs+=( $(use_enable pfring) ) -# fi - # no libprelude in portage -# if use prelude ; then -# myeconfargs+=( $(use_enable prelude) ) -# fi - # htp not added into portage yet -# if use system-htp ; then -# myeconfargs+=( $(use_enable system-htp non-bundled-htp) ) -# fi - if use lua ; then - myeconfargs+=( $(use_enable lua) ) - fi - if use luajit ; then - myeconfargs+=( $(use_enable luajit) ) - fi - -# this should be used when pf_ring use flag support will be added -# LIBS+="-lrt -lnuma" - - econf LIBS="${LIBS}" ${myeconfargs[@]} -} - -src_install() { - emake DESTDIR="${D}" install - - insinto "/etc/${PN}" - doins {classification,reference,threshold}.config suricata.yaml - - if use rules ; then - insinto "/etc/${PN}/rules" - doins rules/*.rules - fi - - dodir "/var/lib/${PN}" - dodir "/var/log/${PN}" - fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" -} \ No newline at end of file diff --git a/net-analyzer/suricata/suricata-2.0.11.ebuild b/net-analyzer/suricata/suricata-2.0.11.ebuild index 3c69998..250c663 100644 --- a/net-analyzer/suricata/suricata-2.0.11.ebuild +++ b/net-analyzer/suricata/suricata-2.0.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -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 geoip hardened lua luajit nflog +nfqueue +rules test" +IUSE="+af-packet control-socket cuda debug +detection geoip hardened lua luajit nflog +nfqueue +rules test" DEPEND=" >=dev-libs/jansson-2.2 @@ -54,8 +54,8 @@ src_prepare() { src_configure() { local myeconfargs=( "--localstatedir=/var/" \ - "--disable-detection" \ $(use_enable af-packet) \ + $(use_enable detection) \ $(use_enable nfqueue) \ $(use_enable test coccinelle) \ $(use_enable test unittests) \
