* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f1a186fd032e8e5718e41120a27103c83ed69a3e
@ 2025-04-05 12:18 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2025-04-05 12:18 UTC (permalink / raw)
To: ipfire-scm
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via f1a186fd032e8e5718e41120a27103c83ed69a3e (commit)
via ef298b077642666dc71df6882641f4e6846d657a (commit)
via fc4128e419ca731e61a4466956efab5bcbf0acb3 (commit)
via e472da9b95bfadcafa7729cbb3290372f05c311b (commit)
from 8ddbced2ff2ee39d9a1fe6c7f9ea285175885cb3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f1a186fd032e8e5718e41120a27103c83ed69a3e
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat Apr 5 12:17:09 2025 +0000
snort: Update to 3.7.2.0
This is the latest upstream version. It replaces PCRE with PCRE2 and we
explicitely depend on vectorscan for aarch64 and x86_64.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit ef298b077642666dc71df6882641f4e6846d657a
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat Apr 5 12:16:58 2025 +0000
libdaq: Update to 3.0.19
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit fc4128e419ca731e61a4466956efab5bcbf0acb3
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat Apr 5 12:16:07 2025 +0000
vectorscan: New package
This replaces hyperscan which will no longer be free software. On top of
it, vectorscan supports aarch64, too.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit e472da9b95bfadcafa7729cbb3290372f05c311b
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun Mar 30 15:42:51 2025 +0000
expat: Update to 2.7.1
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
expat/expat.nm | 13 ++-
hyperscan/hyperscan.nm | 67 ---------------
.../hyperscan-5.4.0-build_wrapper_fix.patch0 | 11 ---
libdaq/libdaq.nm | 10 ++-
snort/snort.nm | 17 ++--
vectorscan/vectorscan.nm | 95 ++++++++++++++++++++++
6 files changed, 122 insertions(+), 91 deletions(-)
delete mode 100644 hyperscan/hyperscan.nm
delete mode 100644 hyperscan/patches/hyperscan-5.4.0-build_wrapper_fix.patch0
create mode 100644 vectorscan/vectorscan.nm
Difference in files:
diff --git a/expat/expat.nm b/expat/expat.nm
index 0114515b9..af0a823fb 100644
--- a/expat/expat.nm
+++ b/expat/expat.nm
@@ -4,8 +4,8 @@
###############################################################################
name = expat
-version = 2.5.0
-release = 1.1
+version = 2.7.1
+release = 1
groups = System/Libraries
url = https://www.libexpat.org/
@@ -21,8 +21,13 @@ description
register handlers.
end
-source_dl = https://github.com/libexpat/libexpat/releases/download/R_2_5_0/
-sources = %{thisapp}.tar.xz
+# This project is hosted on GitHub
+github_organization = libexpat
+github_project = libexpat
+github_version = R_2_7_1
+
+source_dl = %{github_download_url}
+sources = %{thisapp}.tar.xz
build
test
diff --git a/hyperscan/hyperscan.nm b/hyperscan/hyperscan.nm
deleted file mode 100644
index a4242420a..000000000
--- a/hyperscan/hyperscan.nm
+++ /dev/null
@@ -1,67 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info@ipfire.org> #
-###############################################################################
-
-name = hyperscan
-version = 5.4.0
-release = 1.2
-
-groups = System/Libraries
-url = https://github.com/intel/hyperscan
-license = BSD
-summary = High-performance regular expression matching library
-
-description
- Hyperscan is a high-performance multiple regex matching library. It
- follows the regular expression syntax of the commonly-used libpcre
- library, but is a standalone library with its own C API.
-
- Hyperscan uses hybrid automata techniques to allow simultaneous
- matching of large numbers (up to tens of thousands) of regular
- expressions and for the matching of regular expressions across
- streams of data.
-end
-
-# This project is hosted on GitHub
-github_organization = intel
-github_version = v%{version}
-
-source_dl = %{github_url}
-
-build
- # This package only supports x86_64
- arches = x86_64
-
- requires
- boost-devel >= 1.57
- cmake
- gcc-c++
- pcre-devel
- ragel
- sqlite-devel
- end
-
- # Disable LTO
- LTO_CFLAGS =
-
- build
- %{cmake} . \
- -DBUILD_SHARED_LIBS:BOOL=ON \
- -DBUILD_STATIC_AND_SHARED:BOOL=OFF
-
- make %{PARALLELISMFLAGS}
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/hyperscan/patches/hyperscan-5.4.0-build_wrapper_fix.patch0 b/hyperscan/patches/hyperscan-5.4.0-build_wrapper_fix.patch0
deleted file mode 100644
index e6e91c4fc..000000000
--- a/hyperscan/patches/hyperscan-5.4.0-build_wrapper_fix.patch0
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/build_wrapper_orig.sh 2021-08-11 11:53:31.365377531 -0400
-+++ cmake/build_wrapper.sh 2021-08-11 11:54:03.003069431 -0400
-@@ -17,7 +17,7 @@
- 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
diff --git a/libdaq/libdaq.nm b/libdaq/libdaq.nm
index 9b8c7747a..722505739 100644
--- a/libdaq/libdaq.nm
+++ b/libdaq/libdaq.nm
@@ -4,8 +4,8 @@
###############################################################################
name = libdaq
-version = 3.0.10
-release = 2.1
+version = 3.0.19
+release = 1
groups = System/Libraries
url = https://github.com/snort3/libdaq
@@ -19,7 +19,11 @@ description
configure, and interact with pluggable DAQ modules.
end
-source_dl = https://github.com/snort3/libdaq/archive/refs/tags/v%{version}.tar.gz#/
+# This project is hosted on GitHub
+github_organization = snort3
+github_version = v%{version}
+
+source_dl = %{github_url}
build
requires
diff --git a/snort/snort.nm b/snort/snort.nm
index c7f516b8c..a793490a1 100644
--- a/snort/snort.nm
+++ b/snort/snort.nm
@@ -4,8 +4,8 @@
###############################################################################
name = snort
-version = 3.1.50.0
-release = 2.1
+version = 3.7.2.0
+release = 1
thisapp = snort3-%{version}
groups = Networking/Tools
@@ -28,7 +28,7 @@ build
cmake
flex-devel >= 2.6.0
hwloc-devel
- libdaq-devel >= 3.0.10
+ libdaq-devel >= 3.0.19
libdnet-devel
libpcap-devel
libtirpc-devel
@@ -36,12 +36,17 @@ build
libuuid-devel
luajit-devel
openssl-devel
- pcre-devel
+ pcre2-devel
xz-devel
zlib-devel
- # Hyperscan only exists on x86_64
- (hyperscan-devel if arch(x86_64))
+ # Hyperscan only exists on aarch64 and x86_64
+ # XXX The page seems to find the library, but still
+ # does not seem link against it. I couldn't find the
+ # problem and it is not urgent, but it eventually
+ # will need looking after. -ms
+ (vectorscan-devel if arch(aarch64))
+ (vectorscan-devel if arch(x86_64))
end
build
diff --git a/vectorscan/vectorscan.nm b/vectorscan/vectorscan.nm
new file mode 100644
index 000000000..050d76694
--- /dev/null
+++ b/vectorscan/vectorscan.nm
@@ -0,0 +1,95 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info@ipfire.org> #
+###############################################################################
+
+name = vectorscan
+version = 5.4.11
+release = 1
+
+groups = System/Libraries
+url = https://github.com/VectorCamp/vectorscan
+license = BSD
+summary = High-performance regular expression matching library
+
+description
+ A fork of Intel's Hyperscan, modified to run on more platforms.
+ Currently ARM NEON/ASIMD and Power VSX are 100% functional. ARM SVE2
+ support is in ongoing with access to hardware now. More platforms will
+ follow in the futur. Further more there is now a SIMDe port, which
+ can be either used for platforms without official SIMD support, as
+ SIMDe can emulate SIMD instructions, or as an alternative backend
+ for existing architectures, for reference and comparison purposes.
+end
+
+# This project is hosted on GitHub
+github_organization = VectorCamp
+github_version = %{name}/%{version}
+
+source_dl = %{github_url}
+
+build
+ # This package only supports aarch64 and x86_64
+ arches = aarch64 x86_64
+
+ requires
+ boost-devel >= 1.57
+ cmake
+ gcc-c++
+ pcre-devel
+ ragel
+ sqlite-devel
+ end
+
+ DIR_APP = %{DIR_SRC}/%{name}-%{name}-%{version}
+
+ # Disable LTO
+ LTO_CFLAGS =
+
+ if "%{arch}" == "aarch64"
+ arch_flags += \
+ -DFAT_RUNTIME=ON \
+ -DBUILD_SVE=ON \
+ -DBUILD_SVE2=ON \
+ -DBUILD_SVE2_BITPERM=ON
+ end
+
+ if "%{arch}" == "x86_64"
+ arch_flags += \
+ -DFAT_RUNTIME=ON \
+ -DBUILD_AVX2=ON \
+ -DBUILD_AVX512=ON \
+ -DBUILD_AVX512VBMI=ON
+ end
+
+ build
+ %{cmake} . \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
+ -DBUILD_STATIC_AND_SHARED:BOOL=OFF \
+ -DCMAKE_BUILD_TYPE=RELEASE \
+ -DBUILD_EXAMPLES=OFF \
+ %{arch_flags}
+
+ make %{PARALLELISMFLAGS}
+ end
+end
+
+packages
+ package %{name}
+ # This replaces hyperscan
+ provides = hyperscan
+ obsoletes = hyperscan < 5.4.3
+ end
+
+ package %{name}-devel
+ template DEVEL
+
+ # This replaces hyperscan-devel
+ provides = hyperscan-devel
+ obsoletes = hyperscan-devel < 5.4.3
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-04-05 12:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-04-05 12:18 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f1a186fd032e8e5718e41120a27103c83ed69a3e Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox