diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2021-09-03 13:28:57 +0100 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2021-09-03 13:28:57 +0100 |
| commit | 006177dd01fe7fa3b6dbe378189b0cba1e9e69ee (patch) | |
| tree | 372f66cf91442bbad352edf377af26e00bbaff69 | |
| parent | net-analyzer/suricata: add TODO note about hyperscan automagic (diff) | |
| download | gentoo-006177dd.tar.gz gentoo-006177dd.tar.bz2 gentoo-006177dd.zip | |
net-analyzer/suricata: get rid of dev-libs/hyperscan automagic
Signed-off-by: Marek Szuba <marecki@gentoo.org>
3 files changed, 28 insertions, 2 deletions
diff --git a/net-analyzer/suricata/files/suricata-5.0.7_configure-no-hyperscan-automagic.patch b/net-analyzer/suricata/files/suricata-5.0.7_configure-no-hyperscan-automagic.patch new file mode 100644 index 000000000000..69a857408eee --- /dev/null +++ b/net-analyzer/suricata/files/suricata-5.0.7_configure-no-hyperscan-automagic.patch @@ -0,0 +1,24 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -729,8 +729,11 @@ + fi + + # libhs +- enable_hyperscan="no" +- ++ AC_ARG_ENABLE(hyperscan, ++ AS_HELP_STRING([--enable-hyperscan], [Enable high-performance regex matching with hyperscan]), ++ [enable_hyperscan=$enableval], ++ [enable_hyperscan=no]) ++ if test "x$enable_hyperscan" != "xno"; then + # Try pkg-config first: + PKG_CHECK_MODULES([libhs], libhs,, [with_pkgconfig_libhs=no]) + if test "$with_pkgconfig_libhs" != "no"; then +@@ -765,6 +768,7 @@ + enable_hyperscan="no" + fi + fi ++ fi + AS_IF([test "x$enable_hyperscan" = "xyes"], [AC_DEFINE([BUILD_HYPERSCAN], [1], [Intel Hyperscan support enabled])]) + + # libyaml diff --git a/net-analyzer/suricata/suricata-5.0.7-r1.ebuild b/net-analyzer/suricata/suricata-5.0.7-r1.ebuild index 8d11af4dcc51..58594b6169af 100644 --- a/net-analyzer/suricata/suricata-5.0.7-r1.ebuild +++ b/net-analyzer/suricata/suricata-5.0.7-r1.ebuild @@ -53,11 +53,11 @@ DEPEND="${RDEPEND} >=sys-devel/autoconf-2.69-r5 virtual/rust" -# TODO: get rid of hyperscan automagic as well PATCHES=( "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch" "${FILESDIR}/${PN}-5.0.1_default-config.patch" "${FILESDIR}/${PN}-5.0.6_configure-no-sphinx-pdflatex-automagic.patch" + "${FILESDIR}/${PN}-5.0.7_configure-no-hyperscan-automagic.patch" ) pkg_pretend() { @@ -94,6 +94,7 @@ src_configure() { $(use_enable geoip) \ $(use_enable hardened gccprotect) \ $(use_enable hardened pie) \ + $(use_enable hyperscan) \ $(use_enable lz4) \ $(use_enable nflog) \ $(use_enable nfqueue) \ diff --git a/net-analyzer/suricata/suricata-6.0.3-r1.ebuild b/net-analyzer/suricata/suricata-6.0.3-r1.ebuild index 64dd427cc0d3..29b2cdff3c06 100644 --- a/net-analyzer/suricata/suricata-6.0.3-r1.ebuild +++ b/net-analyzer/suricata/suricata-6.0.3-r1.ebuild @@ -53,10 +53,10 @@ DEPEND="${RDEPEND} >=sys-devel/autoconf-2.69-r5 virtual/rust" -# TODO: get rid of hyperscan automagic as well PATCHES=( "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch" "${FILESDIR}/${PN}-5.0.6_configure-no-sphinx-pdflatex-automagic.patch" + "${FILESDIR}/${PN}-5.0.7_configure-no-hyperscan-automagic.patch" "${FILESDIR}/${PN}-6.0.0_default-config.patch" ) @@ -94,6 +94,7 @@ src_configure() { $(use_enable geoip) \ $(use_enable hardened gccprotect) \ $(use_enable hardened pie) \ + $(use_enable hyperscan) \ $(use_enable lz4) \ $(use_enable nflog) \ $(use_enable nfqueue) \ |