[2/2] hyperscan: Remove from IPFire.
Commit Message
- hyperscan will move from BSD licence to a proprietary paid for licence from version 5.5
onwards.
- hyperscan will be replaced by vectorscan, a fork of hyperscan.
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
config/rootfiles/common/x86_64/hyperscan | 18 ----
lfs/hyperscan | 89 -------------------
...can-5.4.0-fix-undefined-reference-to.patch | 24 -----
3 files changed, 131 deletions(-)
delete mode 100644 config/rootfiles/common/x86_64/hyperscan
delete mode 100644 lfs/hyperscan
delete mode 100644 src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch
Comments
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
> On 14 May 2024, at 11:39, Adolf Belka <adolf.belka@ipfire.org> wrote:
>
> - hyperscan will move from BSD licence to a proprietary paid for licence from version 5.5
> onwards.
> - hyperscan will be replaced by vectorscan, a fork of hyperscan.
>
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
> config/rootfiles/common/x86_64/hyperscan | 18 ----
> lfs/hyperscan | 89 -------------------
> ...can-5.4.0-fix-undefined-reference-to.patch | 24 -----
> 3 files changed, 131 deletions(-)
> delete mode 100644 config/rootfiles/common/x86_64/hyperscan
> delete mode 100644 lfs/hyperscan
> delete mode 100644 src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch
>
> diff --git a/config/rootfiles/common/x86_64/hyperscan b/config/rootfiles/common/x86_64/hyperscan
> deleted file mode 100644
> index 006e0fff9..000000000
> --- a/config/rootfiles/common/x86_64/hyperscan
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -#usr/include/hs
> -#usr/include/hs/hs.h
> -#usr/include/hs/hs_common.h
> -#usr/include/hs/hs_compile.h
> -#usr/include/hs/hs_runtime.h
> -#usr/lib/libhs.so
> -usr/lib/libhs.so.5
> -usr/lib/libhs.so.5.4.0
> -usr/lib/libhs_runtime.so
> -usr/lib/libhs_runtime.so.5
> -usr/lib/libhs_runtime.so.5.4.0
> -#usr/lib/pkgconfig/libhs.pc
> -#usr/share/doc/hyperscan
> -#usr/share/doc/hyperscan/examples
> -#usr/share/doc/hyperscan/examples/README.md
> -#usr/share/doc/hyperscan/examples/patbench.cc
> -#usr/share/doc/hyperscan/examples/pcapscan.cc
> -#usr/share/doc/hyperscan/examples/simplegrep.c
> diff --git a/lfs/hyperscan b/lfs/hyperscan
> deleted file mode 100644
> index 56c6290b5..000000000
> --- a/lfs/hyperscan
> +++ /dev/null
> @@ -1,89 +0,0 @@
> -###############################################################################
> -# #
> -# IPFire.org - A linux based firewall #
> -# Copyright (C) 2007-2021 IPFire Team <info@ipfire.org> #
> -# #
> -# This program is free software: you can redistribute it and/or modify #
> -# it under the terms of the GNU General Public License as published by #
> -# the Free Software Foundation, either version 3 of the License, or #
> -# (at your option) any later version. #
> -# #
> -# This program is distributed in the hope that it will be useful, #
> -# but WITHOUT ANY WARRANTY; without even the implied warranty of #
> -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
> -# GNU General Public License for more details. #
> -# #
> -# You should have received a copy of the GNU General Public License #
> -# along with this program. If not, see <http://www.gnu.org/licenses/>. #
> -# #
> -###############################################################################
> -
> -###############################################################################
> -# Definitions
> -###############################################################################
> -
> -include Config
> -
> -VER = 5.4.0
> -
> -THISAPP = hyperscan-$(VER)
> -DL_FILE = $(THISAPP).tar.gz
> -DL_FROM = $(URL_IPFIRE)
> -DIR_APP = $(DIR_SRC)/$(THISAPP)
> -TARGET = $(DIR_INFO)/$(THISAPP)
> -SUP_ARCH = x86_64
> -
> -# The compiler uses a lot of memory to compile hyperscan, hence we reduce
> -# the total number of processes a little bit to be able to build on
> -# smaller machines
> -MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 1024)))
> -
> -###############################################################################
> -# Top-level Rules
> -###############################################################################
> -
> -objects = $(DL_FILE)
> -
> -$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> -
> -$(DL_FILE)_BLAKE2 = 1a5af88655854b4c1ec58e6663b6c9c4b6fca0aa9d3e4daad3992daf911b8f359f48a95b65e4f05c71aa644e0271471d016fafaca05d547b838a9c52ea016e27
> -
> -install : $(TARGET)
> -
> -check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> -
> -download :$(patsubst %,$(DIR_DL)/%,$(objects))
> -
> -b2 : $(subst %,%_BLAKE2,$(objects))
> -
> -###############################################################################
> -# Downloading, checking, b2sum
> -###############################################################################
> -
> -$(patsubst %,$(DIR_CHK)/%,$(objects)) :
> - @$(CHECK)
> -
> -$(patsubst %,$(DIR_DL)/%,$(objects)) :
> - @$(LOAD)
> -
> -$(subst %,%_BLAKE2,$(objects)) :
> - @$(B2SUM)
> -
> -###############################################################################
> -# Installation Details
> -###############################################################################
> -
> -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> - @$(PREBUILD)
> - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch
> - cd $(DIR_APP) && cmake . \
> - -DCMAKE_INSTALL_PREFIX:PATH=/usr \
> - -DBUILD_SHARED_LIBS:BOOL=ON \
> - -DBUILD_STATIC_AND_SHARED:BOOL=OFF \
> - -DCMAKE_BUILD_TYPE=Release \
> - -DBUILD_EXAMPLES=OFF
> - cd $(DIR_APP) && make $(MAKETUNING)
> - cd $(DIR_APP) && make install
> - @rm -rf $(DIR_APP)
> - @$(POSTBUILD)
> diff --git a/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch b/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch
> deleted file mode 100644
> index fdd2543f1..000000000
> --- a/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -From 66189546403e5476c560bdbad89d24c3df87b172 Mon Sep 17 00:00:00 2001
> -From: Yue Ni <niyue.com@gmail.com>
> -Date: Tue, 19 Jan 2021 17:03:02 +0800
> -Subject: [PATCH] Fix hyperscan compilation issue for
> - https://github.com/intel/hyperscan/issues/292, avoid the compilation error
> - reporting 'undefined reference to `avx2_snprintf`'.
> -
> ----
> - cmake/build_wrapper.sh | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/cmake/build_wrapper.sh b/cmake/build_wrapper.sh
> -index 1962813f..895610c0 100755
> ---- a/cmake/build_wrapper.sh
> -+++ b/cmake/build_wrapper.sh
> -@@ -17,7 +17,7 @@ KEEPSYMS=$(mktemp -p /tmp keep.syms.XXXXX)
> - LIBC_SO=$("$@" --print-file-name=libc.so.6)
> - cp ${KEEPSYMS_IN} ${KEEPSYMS}
> - # get all symbols from libc and turn them into patterns
> --nm -f p -g -D ${LIBC_SO} | sed -s 's/\([^ ]*\).*/^\1$/' >> ${KEEPSYMS}
> -+nm -f p -g -D ${LIBC_SO} | sed -s 's/\([^ @]*\).*/^\1$/' >> ${KEEPSYMS}
> - # build the object
> - "$@"
> - # rename the symbols in the object
> --
> 2.44.0
>
deleted file mode 100644
@@ -1,18 +0,0 @@
-#usr/include/hs
-#usr/include/hs/hs.h
-#usr/include/hs/hs_common.h
-#usr/include/hs/hs_compile.h
-#usr/include/hs/hs_runtime.h
-#usr/lib/libhs.so
-usr/lib/libhs.so.5
-usr/lib/libhs.so.5.4.0
-usr/lib/libhs_runtime.so
-usr/lib/libhs_runtime.so.5
-usr/lib/libhs_runtime.so.5.4.0
-#usr/lib/pkgconfig/libhs.pc
-#usr/share/doc/hyperscan
-#usr/share/doc/hyperscan/examples
-#usr/share/doc/hyperscan/examples/README.md
-#usr/share/doc/hyperscan/examples/patbench.cc
-#usr/share/doc/hyperscan/examples/pcapscan.cc
-#usr/share/doc/hyperscan/examples/simplegrep.c
deleted file mode 100644
@@ -1,89 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info@ipfire.org> #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 5.4.0
-
-THISAPP = hyperscan-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH = x86_64
-
-# The compiler uses a lot of memory to compile hyperscan, hence we reduce
-# the total number of processes a little bit to be able to build on
-# smaller machines
-MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 1024)))
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 1a5af88655854b4c1ec58e6663b6c9c4b6fca0aa9d3e4daad3992daf911b8f359f48a95b65e4f05c71aa644e0271471d016fafaca05d547b838a9c52ea016e27
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
- @$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch
- cd $(DIR_APP) && cmake . \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DBUILD_SHARED_LIBS:BOOL=ON \
- -DBUILD_STATIC_AND_SHARED:BOOL=OFF \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_EXAMPLES=OFF
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
deleted file mode 100644
@@ -1,24 +0,0 @@
-From 66189546403e5476c560bdbad89d24c3df87b172 Mon Sep 17 00:00:00 2001
-From: Yue Ni <niyue.com@gmail.com>
-Date: Tue, 19 Jan 2021 17:03:02 +0800
-Subject: [PATCH] Fix hyperscan compilation issue for
- https://github.com/intel/hyperscan/issues/292, avoid the compilation error
- reporting 'undefined reference to `avx2_snprintf`'.
-
----
- cmake/build_wrapper.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/build_wrapper.sh b/cmake/build_wrapper.sh
-index 1962813f..895610c0 100755
---- a/cmake/build_wrapper.sh
-+++ b/cmake/build_wrapper.sh
-@@ -17,7 +17,7 @@ KEEPSYMS=$(mktemp -p /tmp keep.syms.XXXXX)
- LIBC_SO=$("$@" --print-file-name=libc.so.6)
- cp ${KEEPSYMS_IN} ${KEEPSYMS}
- # get all symbols from libc and turn them into patterns
--nm -f p -g -D ${LIBC_SO} | sed -s 's/\([^ ]*\).*/^\1$/' >> ${KEEPSYMS}
-+nm -f p -g -D ${LIBC_SO} | sed -s 's/\([^ @]*\).*/^\1$/' >> ${KEEPSYMS}
- # build the object
- "$@"
- # rename the symbols in the object