commit: 506079cafa0b3a1417ba678192df931c24d98c41
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 1 09:46:04 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Jul 1 09:46:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=506079ca
net-analyzer/suricata: add 6.0.3, drop 6.0.2
Now with rust-1.53 compatibility and without CVE-2021-35063.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
net-analyzer/suricata/Manifest | 2 +-
.../{suricata-6.0.2.ebuild => suricata-6.0.3.ebuild} | 18 +++---------------
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 80b973ee171..b50527fd8c9 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -1,2 +1,2 @@
DIST suricata-5.0.7.tar.gz 29211384 BLAKE2B
939e672d9df61863c7adcc4bf52f5620e3760f0d6178362828474b1a72c4e3a69bf1ab52a3220c0069ae5a545c56307553c2796166af488a72a25dddd68782a8
SHA512
dce3929c796e04778eb9437bd4c7203aa9dae56be0baa4b7d986d3eedff3bfc71aa2886ecdeed9d87ec3d88cd3060ff8ef01540d15eb857698a2c4696da5899c
-DIST suricata-6.0.2.tar.gz 30514801 BLAKE2B
20604fa3332a9d99a1a30db55a0ccd689af0e08e686cd6739d6c4390456acc28d34702704f7e25537463b0c23600d123de361a227f9ef2420ee5c2b11df2866a
SHA512
230a74a5442cfa066c56528036b64c173702238c5075161119eaad08d320e528d3510c51095297f120030177fed9c84076d00f567f7a3a4cbdb23d382966cf00
+DIST suricata-6.0.3.tar.gz 32421197 BLAKE2B
c1b339823f2caab73aeb82f96fb703834cd3ca9f0f60662cf340cbc36734aea47106d49869bd70cf3acb419e954ca37bcd22ad1b2d789597bf36f8fe7ceebe11
SHA512
186b871959988ca7cbd0d69e725aed18af915f93363c7ecc0ffa20d8ad8f50a326be08452d085772b1df84ef25258ef0dd6b35d41b0988cb1c653e60aeb103a2
diff --git a/net-analyzer/suricata/suricata-6.0.2.ebuild
b/net-analyzer/suricata/suricata-6.0.3.ebuild
similarity index 88%
rename from net-analyzer/suricata/suricata-6.0.2.ebuild
rename to net-analyzer/suricata/suricata-6.0.3.ebuild
index 5a9b9a7ab1a..da57e2c8b34 100644
--- a/net-analyzer/suricata/suricata-6.0.2.ebuild
+++ b/net-analyzer/suricata/suricata-6.0.3.ebuild
@@ -4,7 +4,7 @@
EAPI=7
LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit autotools linux-info lua-single python-single-r1 systemd tmpfiles
@@ -36,7 +36,7 @@ RDEPEND="${PYTHON_DEPS}
$(python_gen_cond_dep '
dev-python/pyyaml[${PYTHON_USEDEP}]
')
- >=net-libs/libhtp-0.5.37
+ >=net-libs/libhtp-0.5.38
net-libs/libpcap
sys-apps/file
sys-libs/libcap-ng
@@ -51,7 +51,7 @@ RDEPEND="${PYTHON_DEPS}
redis? ( dev-libs/hiredis )"
DEPEND="${RDEPEND}
>=sys-devel/autoconf-2.69-r5
- <virtual/rust-1.53.0" # Bug #797370 part one. Hopefully to be fixed
come next release.
+ virtual/rust"
PATCHES=(
"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
@@ -60,18 +60,6 @@ PATCHES=(
)
pkg_pretend() {
- # Bug #797370 part deux, needed to address the edge case of both rust
and rust-bin being present
- # - in which case the version limit set on virtual/rust only affects
one of them.
- # Version-checking code shamelessly stolen from www-client/firefox.
- local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' |
awk '{ print $2 }')
- [[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
- if ver_test "${version_rust}" -ge "1.53.0"; then
- eerror "This version of ${PN} does not support Rust 1.53.0+.
Please switch to an older version using"
- eerror " eselect rust"
- eerror "before emerging ${PN}."
- die "Unsupported version of Rust selected"
- fi
-
if use bpf && use kernel_linux; then
if kernel_is -lt 4 15; then
ewarn "Kernel 4.15 or newer is necessary to use all XDP
features like the CPU redirect map"
