Compare commits

..

6 commits

Author SHA1 Message Date
Fedora Release Engineering
17dc558448 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:26:37 +00:00
Fedora Release Engineering
9fd6aee4b0 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 19:51:56 +00:00
Jeremy Linton
8b3e160ada Fix removal of i686 build patches
Signed-off-by: Jeremy Linton <jlinton@redhat.com>
2025-07-30 17:29:09 -05:00
Jeremy Linton
a3ef2e04a2 Disable i686 and ppc64le benchmark utility
Upstream issue: https://github.com/VectorCamp/vectorscan/issues/343

The i686 build is broken by a number of 64-bit type size assumptions
that aren't true on 32-bit platforms. Similarly the benchmark tool
is missing some of its dependent symbols.

Signed-off-by: Jeremy Linton <jlinton@redhat.com>
2025-07-30 17:17:13 -05:00
Jeremy Linton
5f1970d0c7 Update to upstream 5.4.12, drop patches except for doc/build ones
Signed-off-by: Jeremy Linton <jlinton@redhat.com>
2025-07-28 19:29:17 -05:00
Fedora Release Engineering
b7fddf2d72 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:02:43 +00:00
6 changed files with 66 additions and 1459 deletions

1
.gitignore vendored
View file

@ -1 +1,2 @@
/d29730e1cb9daaa66bda63426cdce83505d2c809.tar.gz
/b585ad466658624bb31fb1d194cdb168df34833c.tar.gz

View file

@ -1,27 +0,0 @@
From 014ce45e1c8a415b77fe1f8fe925ae39d8d3b1d0 Mon Sep 17 00:00:00 2001
From: Jeremy Linton <jlinton@redhat.com>
Date: Wed, 6 Dec 2023 16:00:35 -0600
Subject: [PATCH] Change PPC default to power8
Signed-off-by: Jeremy Linton <jlinton@redhat.com>
---
cmake/archdetect.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/archdetect.cmake b/cmake/archdetect.cmake
index 015140f..2126840 100644
--- a/cmake/archdetect.cmake
+++ b/cmake/archdetect.cmake
@@ -85,7 +85,7 @@ else()
set(GNUCC_ARCH armv7a)
set(TUNE_FLAG generic)
else()
- set(GNUCC_ARCH power9)
- set(TUNE_FLAG power9)
+ set(GNUCC_ARCH power8)
+ set(TUNE_FLAG power8)
endif()
endif()
--
2.41.0

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,45 @@
From ab1fd57a767791313ff3aa795102c813bb608a1a Mon Sep 17 00:00:00 2001
From: Jeremy Linton <jeremy.linton@arm.com>
Date: Mon, 28 Jul 2025 18:41:50 -0500
Subject: [PATCH] update python/sphinx to use non deprecated api
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
---
doc/dev-reference/CMakeLists.txt | 5 ++++-
doc/dev-reference/conf.py.in | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/doc/dev-reference/CMakeLists.txt b/doc/dev-reference/CMakeLists.txt
index 6f48e2e4..48349c22 100644
--- a/doc/dev-reference/CMakeLists.txt
+++ b/doc/dev-reference/CMakeLists.txt
@@ -34,7 +34,7 @@ add_custom_target(dev-reference
DEPENDS dev-reference-doxygen
COMMENT "Building HTML dev reference with Sphinx")
-add_custom_target(dev-reference-man
+add_custom_target(dev-reference-man ALL
${SPHINX_BUILD}
-b man
-c "${CMAKE_CURRENT_BINARY_DIR}"
@@ -43,4 +43,7 @@ add_custom_target(dev-reference-man
"${SPHINX_MAN_DIR}"
DEPENDS dev-reference-doxygen
COMMENT "Building man page reference with Sphinx")
+
+install(FILES ${CMAKE_BINARY_DIR}/doc/dev-reference/man/vectorscan.7
+ DESTINATION "${CMAKE_INSTALL_MANDIR}/man7/")
endif()
diff --git a/doc/dev-reference/conf.py.in b/doc/dev-reference/conf.py.in
index 298a54b1..082f07e0 100644
--- a/doc/dev-reference/conf.py.in
+++ b/doc/dev-reference/conf.py.in
@@ -272,4 +272,4 @@ breathe_domain_by_extension = {"h" : "c"}
# -- Add some customisation -----------------------------------------------
def setup(app):
- app.add_stylesheet("hyperscan.css") # Custom stylesheet for e.g. :regex:
+ app.add_css_file("hyperscan.css") # Custom stylesheet for e.g. :regex:
--
2.50.1

View file

@ -1 +1,2 @@
SHA512 (d29730e1cb9daaa66bda63426cdce83505d2c809.tar.gz) = 8882427a75bf9ac894f4a2b41993266df70d14a3d656a43b8ce50b836d52588abfa55921a03a8ba2bbdda9affbb49b2a354db32aadfa4d8f559f4b73d91acca3
SHA512 (b585ad466658624bb31fb1d194cdb168df34833c.tar.gz) = 9493957edbc138937400d7217c9871a1d09005bdc7892c31aa7c8779d4fd65fa286ec91407833804e6231e61d8f9e2ca859e63fd7ce94fa523ae22b2b7cf7ff9

View file

@ -1,10 +1,10 @@
%global vectorscan_tag d29730e1cb9daaa66bda63426cdce83505d2c809
%global vectorscan_tag b585ad466658624bb31fb1d194cdb168df34833c
%global __cmake_in_source_build 1
%global _lto_cflags %{nil}
Name: vectorscan
Version: 5.4.11
Release: 9%{?dist}
Version: 5.4.12
Release: 2%{?dist}
Summary: A portable fork of hyperscan, used as a high performance pcre replacement
# note google test framework not part of shipped binary
# vectorscan is BSD-3-Clause but it utilizes boost, which is a C++ template
@ -13,12 +13,12 @@ Summary: A portable fork of hyperscan, used as a high performance pcre re
# the source is contained in the boost-devel packages.
License: BSD-3-Clause AND BSL-1.0
# https://bugzilla.redhat.com/show_bug.cgi?id=2264465
ExcludeArch: s390x
# 32-bit x86 disabled because upstream can't keep it working.
ExcludeArch: s390x i686
URL: https://github.com/VectorCamp/vectorscan
Source0: https://github.com/VectorCamp/vectorscan/archive/%{vectorscan_tag}.tar.gz
Patch0: 0001-Change-PPC-default-to-power8.patch
Patch1: 0001-documentation-Add-cmake-option-to-build-man-pages.patch
Patch0: 0001-update-python-sphinx-to-use-non-deprecated-api.patch
# hyperscan is x86 only, so lets obsolete it. There is one package in the
# fedora repos that depends on hyperscan (suricata) and it appears to work
@ -49,7 +49,7 @@ BuildRequires: libpcap-devel
%ifarch aarch64
%global fatruntime -DFAT_RUNTIME=ON -DBUILD_SVE=ON -DBUILD_SVE2=ON -DBUILD_SVE2_BITPERM=ON
%else
%global fatruntime -DFAT_RUNTIME=OFF
%global fatruntime -DFAT_RUNTIME=OFF -DBUILD_BENCHMARKS=OFF
%endif
%endif
@ -80,13 +80,11 @@ to develop .
%prep
%setup -q -n vectorscan-%{vectorscan_tag}
%patch -P0 -p1
%patch -P1 -p1
%build
%cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS:BOOL=ON %{fatruntime} . -Wno-dev
%cmake_build
%install
%cmake_install
@ -114,6 +112,18 @@ bin/unit-hyperscan
#------------------------------------------------------------------------------
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.12-1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Mon Jul 28 2025 Jeremy Linton <jeremy.linton@arm.com> - 5.4.12-0
- Update to upstream 5.4.12, drop patches except for doc/build ones
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.11-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.11-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild