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 2.x development tree".

The branch, next has been updated via 80de6b5647309874d5af3f7f4cba78cbd08b3fd4 (commit) via d04dd6f2cd981d306dcb3405c2db32ca59709864 (commit) via df84336ef8f7c20f7337a0d078f198a135815db1 (commit) from ed2c97b799fab266b2a1daa9596e0f0077a07dc9 (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 80de6b5647309874d5af3f7f4cba78cbd08b3fd4 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Aug 2 16:49:15 2024 +0000

vectorscan: Fix check for CPU support

According to the documentation, Vectorscan checks whether the CPU is supporting the minimum requirement of SSE4.2. However the check is still checking for SSSE3 which makes the library fail on systems without SSE4.2.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit d04dd6f2cd981d306dcb3405c2db32ca59709864 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Aug 2 16:48:59 2024 +0000

Config: Fix computing the package file size

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit df84336ef8f7c20f7337a0d078f198a135815db1 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Aug 2 16:48:39 2024 +0000

Config: Use the correct variable for the package release

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: lfs/Config | 11 ++++------- lfs/vectorscan | 1 + src/patches/vectorscan-5.4.11-sse4.2.patch | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 src/patches/vectorscan-5.4.11-sse4.2.patch

Difference in files: diff --git a/lfs/Config b/lfs/Config index d90d1a605..f02675630 100644 --- a/lfs/Config +++ b/lfs/Config @@ -342,7 +342,7 @@ ARCHIVE_DIR = /tmp/archive ARCHIVE_TMP = $(ARCHIVE_DIR)/.tmp

# The filename of the package file -PACKAGE_FILENAME = $(PROG)-$(VER)-$(RELEASE).ipfire +PACKAGE_FILENAME = $(PROG)-$(VER)-$(PAK_VER).ipfire

# The filename of the meta file META_FILENAME = meta-$(PROG) @@ -418,9 +418,6 @@ define CREATE_PACKAGE . endef

-# Returns the filesize in bytes -PACKAGE_SIZE = stat --format=%s $(1) - # Creates the meta file for a Pakfire package define CREATE_META # Clear/create the file @@ -430,10 +427,10 @@ define CREATE_META echo "Name: $(PROG)" >> $(2) echo "Summary: $(SUMMARY)" >> $(2) echo "ProgVersion: $(VER)" >> $(2) - echo "Release: $(RELEASE)" >> $(2) - echo "Size: $(call PACKAGE_SIZE,$(1))" >> $(2) + echo "Release: $(PAK_VER)" >> $(2) + echo "Size: $(shell stat --format=%s $(1))" >> $(2) echo "Dependencies: $(DEPS)" >> $(2) - echo "File: $(PROG)-$(VER)-$(RELEASE).ipfire" >> $(2) + echo "File: $(PROG)-$(VER)-$(PAK_VER).ipfire" >> $(2) echo "Services: $(SERVICES)" >> $(2) endef

diff --git a/lfs/vectorscan b/lfs/vectorscan index 585fc2894..b56243c42 100644 --- a/lfs/vectorscan +++ b/lfs/vectorscan @@ -92,6 +92,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vectorscan-5.4.11-sse4.2.patch cd $(DIR_APP) && cmake . \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DBUILD_SHARED_LIBS=ON \ diff --git a/src/patches/vectorscan-5.4.11-sse4.2.patch b/src/patches/vectorscan-5.4.11-sse4.2.patch new file mode 100644 index 000000000..feb867aeb --- /dev/null +++ b/src/patches/vectorscan-5.4.11-sse4.2.patch @@ -0,0 +1,16 @@ +diff --git a/src/hs_valid_platform.c b/src/hs_valid_platform.c +index 0af36b6c..12ae5d9a 100644 +--- a/src/hs_valid_platform.c ++++ b/src/hs_valid_platform.c +@@ -37,9 +37,9 @@ + + HS_PUBLIC_API + hs_error_t HS_CDECL hs_valid_platform(void) { +- /* Hyperscan requires SSSE3, anything else is a bonus */ ++ /* Vectorscan requires SSE4.2, anything else is a bonus */ + #if defined(ARCH_IA32) || defined(ARCH_X86_64) +- if (check_ssse3()) { ++ if (check_sse42()) { + return HS_SUCCESS; + } else { + return HS_ARCH_ERROR;

hooks/post-receive -- IPFire 2.x development tree