|
|
@@ -1,6 +1,6 @@
|
|
|
Name: hyperscan
|
|
|
Version: 5.4.0
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Release: 3%{?_dist_release}
|
|
|
Summary: High-performance regular expression matching library
|
|
|
Group: system
|
|
|
Vendor: Project Vine
|
|
|
@@ -11,12 +11,13 @@ URL: https://www.hyperscan.io/
|
|
|
Source0: https://github.com/intel/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
|
|
Patch0: hyperscan-5.4.0-fix-compilation-error.patch
|
|
|
Patch1: hyperscan-glibc234.patch
|
|
|
+Patch1000: CVE-2022-29486.patch
|
|
|
|
|
|
BuildRequires: gcc-c++
|
|
|
BuildRequires: libboost-devel
|
|
|
BuildRequires: cmake
|
|
|
BuildRequires: pcre2-devel
|
|
|
-BuildRequires: python
|
|
|
+BuildRequires: python3
|
|
|
BuildRequires: ragel
|
|
|
BuildRequires: sqlite3-devel
|
|
|
BuildRequires: libpcap-devel
|
|
|
@@ -68,6 +69,11 @@ needed for developing Hyperscan applications.
|
|
|
%build
|
|
|
export CXXFLAGS="%{optflags} -DBOOST_ALLOW_DEPRECATED_HEADERS"
|
|
|
|
|
|
+# LTO seems to be losing the target prefix on ifunc targets leading to
|
|
|
+# multiply defined symbols. This seems like a GCC bug
|
|
|
+# Disable LTO
|
|
|
+%define _lto_cflags %{nil}
|
|
|
+
|
|
|
#cmake -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_STATIC_AND_SHARED:BOOL=OFF .
|
|
|
# workaround for https://github.com/intel/hyperscan/issues/186
|
|
|
%cmake \
|
|
|
@@ -103,6 +109,9 @@ rm -f %{buildroot}%{_libdir}/*.a
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Nov 18 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.4.0-3
|
|
|
+- imported Patch1000 from upstream to fix CVE-2022-29486.
|
|
|
+
|
|
|
* Wed Nov 02 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.4.0-2
|
|
|
- rebuilt with current environment.
|
|
|
|
