commit: afe7a2be12b92b58850bb4381217043ca72be03d Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Sun Dec 6 22:00:54 2020 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Sun Dec 6 22:02:38 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afe7a2be
net-analyzer/suricata: bump to 6.0.1 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> net-analyzer/suricata/Manifest | 1 + ....0.0-r100.ebuild => suricata-6.0.1-r100.ebuild} | 2 +- ...ata-6.0.0-r100.ebuild => suricata-6.0.1.ebuild} | 23 +++++++++------------- profiles/package.mask | 2 +- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest index fde179dd2cb..ea206e75187 100644 --- a/net-analyzer/suricata/Manifest +++ b/net-analyzer/suricata/Manifest @@ -1,2 +1,3 @@ DIST suricata-5.0.4.tar.gz 29091046 BLAKE2B 38526ca39d2460d630fdd9e804f36c74bfcde54a529748896779b549ed1b55174d6080ddad8933ddfd26004f4e78748a503832f47ee5f52d84a133643aef482b SHA512 e5da14f80b628968e146839b828971e888fd0158b2ecbbcc15c0f42fda2bdcc8ad89632ba05cc45c88d88e537452e77f8e2f3a5e09ecd038d0d38b1a8cf8cea6 DIST suricata-6.0.0.tar.gz 30832555 BLAKE2B 9cea05b07520924706e961efed6a45b9ba73388a25777f43c1a90497aa00ec200bad15863b7b17b84e622c79309365596853423776da9c3d103c2a8c1126a0d2 SHA512 3c30f6f57c0e8a24992ff2b4ce8ce166d3c0d4b28c8f5e79434d04de9f2016773be01a1689fedfc9e54ff1c8bc9838206bc28f3ff2e47d60102a7016f1062ec3 +DIST suricata-6.0.1.tar.gz 30460439 BLAKE2B 55a24fa2f653a0a80f51e1ab102bb7046bd1f67d60c64c139b485086f4d8e0f5db58906bc33a7b5bdb76ba37b8206ded99b08034c4c292cf16d595bcafc7acc0 SHA512 be57150afc238b6627731e4463297e67469b66241779f5af3d1bd93bfad4fde41a5371298b54a06c7c3ea324e5642753ca57900173989ac738d663a85e9c33f4 diff --git a/net-analyzer/suricata/suricata-6.0.0-r100.ebuild b/net-analyzer/suricata/suricata-6.0.1-r100.ebuild similarity index 99% copy from net-analyzer/suricata/suricata-6.0.0-r100.ebuild copy to net-analyzer/suricata/suricata-6.0.1-r100.ebuild index 872fafeef3a..3d6679536b4 100644 --- a/net-analyzer/suricata/suricata-6.0.0-r100.ebuild +++ b/net-analyzer/suricata/suricata-6.0.1-r100.ebuild @@ -36,7 +36,7 @@ RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/pyyaml[${PYTHON_USEDEP}] ') - >=net-libs/libhtp-0.5.35 + >=net-libs/libhtp-0.5.36 net-libs/libpcap sys-apps/file sys-libs/libcap-ng diff --git a/net-analyzer/suricata/suricata-6.0.0-r100.ebuild b/net-analyzer/suricata/suricata-6.0.1.ebuild similarity index 93% rename from net-analyzer/suricata/suricata-6.0.0-r100.ebuild rename to net-analyzer/suricata/suricata-6.0.1.ebuild index 872fafeef3a..6602a4b80ad 100644 --- a/net-analyzer/suricata/suricata-6.0.0-r100.ebuild +++ b/net-analyzer/suricata/suricata-6.0.1.ebuild @@ -3,10 +3,9 @@ EAPI=7 -LUA_COMPAT=( lua5-1 luajit ) PYTHON_COMPAT=( python3_{6..9} ) -inherit autotools flag-o-matic linux-info lua-single python-single-r1 systemd +inherit autotools flag-o-matic linux-info python-single-r1 systemd DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" HOMEPAGE="https://suricata-ids.org/" @@ -15,13 +14,13 @@ SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua lz4 nflog +nfqueue redis systemd test" +IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} - bpf? ( af-packet ) - lua? ( ${LUA_REQUIRED_USE} )" + ?? ( lua luajit ) + bpf? ( af-packet )" RDEPEND="${PYTHON_DEPS} acct-group/suricata @@ -36,7 +35,7 @@ RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/pyyaml[${PYTHON_USEDEP}] ') - >=net-libs/libhtp-0.5.35 + >=net-libs/libhtp-0.5.36 net-libs/libpcap sys-apps/file sys-libs/libcap-ng @@ -44,7 +43,8 @@ RDEPEND="${PYTHON_DEPS} cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) - lua? ( ${LUA_DEPS} ) + lua? ( dev-lang/lua:0= ) + luajit? ( dev-lang/luajit:* ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) @@ -92,6 +92,8 @@ src_configure() { $(use_enable geoip) \ $(use_enable hardened gccprotect) \ $(use_enable hardened pie) \ + $(use_enable lua) \ + $(use_enable luajit) \ $(use_enable lz4) \ $(use_enable nflog) \ $(use_enable nfqueue) \ @@ -99,13 +101,6 @@ src_configure() { $(use_enable test unittests) \ "--disable-coccinelle" ) - if use lua; then - if use lua_single_target_luajit; then - myeconfargs+=( --enable-luajit ) - else - myeconfargs+=( --enable-lua ) - fi - fi if use debug; then myeconfargs+=( $(use_enable debug) ) diff --git a/profiles/package.mask b/profiles/package.mask index 24293b19022..df455800c6f 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -579,7 +579,7 @@ gnome-base/orbit >=mail-filter/imapfilter-2.6.16-r100 >=media-gfx/geeqie-1.5.1-r1 >=media-sound/aqualung-1.1-r100 ->=net-analyzer/suricata-6.0.0-r100 +>=net-analyzer/suricata-6.0.1-r100 >=net-im/prosody-0.11.7-r100 >=net-im/swift-4.0.2-r100 >=net-p2p/eiskaltdcpp-2.2.10-r100