* [PR PATCH] update to rspamd 3.6
@ 2023-09-01 17:40 adrian-bl
2023-09-02 9:59 ` [PR PATCH] [Updated] [WIP] " adrian-bl
` (13 more replies)
0 siblings, 14 replies; 15+ messages in thread
From: adrian-bl @ 2023-09-01 17:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 469 bytes --]
There is a new pull request by adrian-bl against master on the void-packages repository
https://github.com/adrian-bl/void-packages rspam
https://github.com/void-linux/void-packages/pull/45873
update to rspamd 3.6
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/45873.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rspam-45873.patch --]
[-- Type: text/x-diff, Size: 4429 bytes --]
From 5f503c3df40f02f7daa43fe32387e24904843548 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Fri, 1 Sep 2023 18:25:59 +0200
Subject: [PATCH] update to rspamd 3.6
---
srcpkgs/rspamd/patches/vsx.patch | 63 --------------------------------
srcpkgs/rspamd/template | 12 +++---
2 files changed, 6 insertions(+), 69 deletions(-)
delete mode 100644 srcpkgs/rspamd/patches/vsx.patch
diff --git a/srcpkgs/rspamd/patches/vsx.patch b/srcpkgs/rspamd/patches/vsx.patch
deleted file mode 100644
index ebcead9bdb9b1..0000000000000
--- a/srcpkgs/rspamd/patches/vsx.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit a6f43886153bfa63a609720e02bcc9c6f4a50140
-Author: q66 <daniel@octaforge.org>
-Date: Mon Jan 6 00:48:43 2020 +0100
-
- Disable VSX on platforms without it
-
-diff --git contrib/lua-torch/torch7/lib/TH/THVector.c contrib/lua-torch/torch7/lib/TH/THVector.c
-index 4410578..c972b13 100644
---- a/contrib/lua-torch/torch7/lib/TH/THVector.c
-+++ b/contrib/lua-torch/torch7/lib/TH/THVector.c
-@@ -6,7 +6,7 @@
- #include "vector/NEON.c"
- #endif
-
--#ifdef __PPC64__
-+#if defined(__PPC64__) && defined(__VSX__)
- #include "vector/VSX.c"
- #endif
-
-diff --git contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-index 5b88852..8ab4f67 100644
---- a/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-+++ b/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-@@ -20,7 +20,7 @@ static FunctionDescription THVector_(fill_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(fill_VSX), SIMDExtension_VSX),
- #endif
-@@ -85,7 +85,7 @@ static FunctionDescription THVector_(adds_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(adds_VSX), SIMDExtension_VSX),
- #endif
-@@ -146,7 +146,7 @@ static FunctionDescription THVector_(muls_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(muls_VSX), SIMDExtension_VSX),
- #endif
-diff --git contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-index 83c4c56..0919f73 100644
---- a/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-+++ b/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-@@ -43,7 +43,7 @@ enum SIMDExtensions
- {
- #if defined(__NEON__)
- SIMDExtension_NEON = 0x1,
--#elif defined(__PPC64__)
-+#elif defined(__PPC64__) && defined(__VSX__)
- SIMDExtension_VSX = 0x1,
- #else
- SIMDExtension_AVX2 = 0x1,
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 87cbe96b8b957..a9bd0b03d20fc 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,21 +1,21 @@
# Template file for 'rspamd'
pkgname=rspamd
-version=1.9.4
-revision=11
+version=3.6
+revision=1
archs="x86_64* i686* aarch64* armv[67]* ppc64*"
build_style=cmake
configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
-DDBDIR=/var/lib/rspamd"
hostmakedepends="perl pkg-config ragel"
makedepends="LuaJIT-devel fann-devel file-devel gd-devel pcre-devel
- hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel"
+ hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel libsodium-devel"
short_desc="Fast, free and open-source spam filtering system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Apache-2.0"
homepage="https://rspamd.com/"
-changelog="https://raw.githubusercontent.com/vstakhov/rspamd/master/ChangeLog"
-distfiles="https://github.com/vstakhov/rspamd/archive/${version}.tar.gz"
-checksum=e4720c1f45defd07dd17b9563d0ddc480c70beadbc1a833235c077960092e030
+changelog="https://raw.githubusercontent.com/rspamd/rspamd/master/ChangeLog"
+distfiles="https://github.com/rspamd/rspamd/archive/${version}.tar.gz"
+checksum=bae279f6365f709db9fc3af2dba0babcb8d19da4b0095953eb94f37b6733d5f7
system_accounts="rspamd"
rspamd_homedir=/var/lib/rspamd
conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf"
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] update to rspamd 3.6
2023-09-01 17:40 [PR PATCH] update to rspamd 3.6 adrian-bl
@ 2023-09-02 9:59 ` adrian-bl
2023-09-02 10:04 ` adrian-bl
` (12 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: adrian-bl @ 2023-09-02 9:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
There is an updated pull request by adrian-bl against master on the void-packages repository
https://github.com/adrian-bl/void-packages rspam
https://github.com/void-linux/void-packages/pull/45873
[WIP] update to rspamd 3.6
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/45873.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rspam-45873.patch --]
[-- Type: text/x-diff, Size: 4429 bytes --]
From f8e76a76bc5b3d779e483f123f0d7b95e01b9a0d Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Fri, 1 Sep 2023 18:25:59 +0200
Subject: [PATCH] update to rspamd 3.6
---
srcpkgs/rspamd/patches/vsx.patch | 63 --------------------------------
srcpkgs/rspamd/template | 12 +++---
2 files changed, 6 insertions(+), 69 deletions(-)
delete mode 100644 srcpkgs/rspamd/patches/vsx.patch
diff --git a/srcpkgs/rspamd/patches/vsx.patch b/srcpkgs/rspamd/patches/vsx.patch
deleted file mode 100644
index ebcead9bdb9b1..0000000000000
--- a/srcpkgs/rspamd/patches/vsx.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit a6f43886153bfa63a609720e02bcc9c6f4a50140
-Author: q66 <daniel@octaforge.org>
-Date: Mon Jan 6 00:48:43 2020 +0100
-
- Disable VSX on platforms without it
-
-diff --git contrib/lua-torch/torch7/lib/TH/THVector.c contrib/lua-torch/torch7/lib/TH/THVector.c
-index 4410578..c972b13 100644
---- a/contrib/lua-torch/torch7/lib/TH/THVector.c
-+++ b/contrib/lua-torch/torch7/lib/TH/THVector.c
-@@ -6,7 +6,7 @@
- #include "vector/NEON.c"
- #endif
-
--#ifdef __PPC64__
-+#if defined(__PPC64__) && defined(__VSX__)
- #include "vector/VSX.c"
- #endif
-
-diff --git contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-index 5b88852..8ab4f67 100644
---- a/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-+++ b/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-@@ -20,7 +20,7 @@ static FunctionDescription THVector_(fill_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(fill_VSX), SIMDExtension_VSX),
- #endif
-@@ -85,7 +85,7 @@ static FunctionDescription THVector_(adds_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(adds_VSX), SIMDExtension_VSX),
- #endif
-@@ -146,7 +146,7 @@ static FunctionDescription THVector_(muls_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(muls_VSX), SIMDExtension_VSX),
- #endif
-diff --git contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-index 83c4c56..0919f73 100644
---- a/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-+++ b/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-@@ -43,7 +43,7 @@ enum SIMDExtensions
- {
- #if defined(__NEON__)
- SIMDExtension_NEON = 0x1,
--#elif defined(__PPC64__)
-+#elif defined(__PPC64__) && defined(__VSX__)
- SIMDExtension_VSX = 0x1,
- #else
- SIMDExtension_AVX2 = 0x1,
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 87cbe96b8b957..a9bd0b03d20fc 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,21 +1,21 @@
# Template file for 'rspamd'
pkgname=rspamd
-version=1.9.4
-revision=11
+version=3.6
+revision=1
archs="x86_64* i686* aarch64* armv[67]* ppc64*"
build_style=cmake
configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
-DDBDIR=/var/lib/rspamd"
hostmakedepends="perl pkg-config ragel"
makedepends="LuaJIT-devel fann-devel file-devel gd-devel pcre-devel
- hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel"
+ hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel libsodium-devel"
short_desc="Fast, free and open-source spam filtering system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Apache-2.0"
homepage="https://rspamd.com/"
-changelog="https://raw.githubusercontent.com/vstakhov/rspamd/master/ChangeLog"
-distfiles="https://github.com/vstakhov/rspamd/archive/${version}.tar.gz"
-checksum=e4720c1f45defd07dd17b9563d0ddc480c70beadbc1a833235c077960092e030
+changelog="https://raw.githubusercontent.com/rspamd/rspamd/master/ChangeLog"
+distfiles="https://github.com/rspamd/rspamd/archive/${version}.tar.gz"
+checksum=bae279f6365f709db9fc3af2dba0babcb8d19da4b0095953eb94f37b6733d5f7
system_accounts="rspamd"
rspamd_homedir=/var/lib/rspamd
conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf"
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] update to rspamd 3.6
2023-09-01 17:40 [PR PATCH] update to rspamd 3.6 adrian-bl
2023-09-02 9:59 ` [PR PATCH] [Updated] [WIP] " adrian-bl
@ 2023-09-02 10:04 ` adrian-bl
2023-09-02 10:41 ` adrian-bl
` (11 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: adrian-bl @ 2023-09-02 10:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
There is an updated pull request by adrian-bl against master on the void-packages repository
https://github.com/adrian-bl/void-packages rspam
https://github.com/void-linux/void-packages/pull/45873
[WIP] update to rspamd 3.6
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/45873.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rspam-45873.patch --]
[-- Type: text/x-diff, Size: 5422 bytes --]
From 17ae5fabb1716c45f20143085fed509a7c2d74b2 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Fri, 1 Sep 2023 18:25:59 +0200
Subject: [PATCH] update to rspamd 3.6
---
srcpkgs/rspamd/patches/vsx.patch | 63 --------------------------------
srcpkgs/rspamd/template | 28 ++++++++------
2 files changed, 17 insertions(+), 74 deletions(-)
delete mode 100644 srcpkgs/rspamd/patches/vsx.patch
diff --git a/srcpkgs/rspamd/patches/vsx.patch b/srcpkgs/rspamd/patches/vsx.patch
deleted file mode 100644
index ebcead9bdb9b1..0000000000000
--- a/srcpkgs/rspamd/patches/vsx.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit a6f43886153bfa63a609720e02bcc9c6f4a50140
-Author: q66 <daniel@octaforge.org>
-Date: Mon Jan 6 00:48:43 2020 +0100
-
- Disable VSX on platforms without it
-
-diff --git contrib/lua-torch/torch7/lib/TH/THVector.c contrib/lua-torch/torch7/lib/TH/THVector.c
-index 4410578..c972b13 100644
---- a/contrib/lua-torch/torch7/lib/TH/THVector.c
-+++ b/contrib/lua-torch/torch7/lib/TH/THVector.c
-@@ -6,7 +6,7 @@
- #include "vector/NEON.c"
- #endif
-
--#ifdef __PPC64__
-+#if defined(__PPC64__) && defined(__VSX__)
- #include "vector/VSX.c"
- #endif
-
-diff --git contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-index 5b88852..8ab4f67 100644
---- a/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-+++ b/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-@@ -20,7 +20,7 @@ static FunctionDescription THVector_(fill_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(fill_VSX), SIMDExtension_VSX),
- #endif
-@@ -85,7 +85,7 @@ static FunctionDescription THVector_(adds_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(adds_VSX), SIMDExtension_VSX),
- #endif
-@@ -146,7 +146,7 @@ static FunctionDescription THVector_(muls_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(muls_VSX), SIMDExtension_VSX),
- #endif
-diff --git contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-index 83c4c56..0919f73 100644
---- a/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-+++ b/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-@@ -43,7 +43,7 @@ enum SIMDExtensions
- {
- #if defined(__NEON__)
- SIMDExtension_NEON = 0x1,
--#elif defined(__PPC64__)
-+#elif defined(__PPC64__) && defined(__VSX__)
- SIMDExtension_VSX = 0x1,
- #else
- SIMDExtension_AVX2 = 0x1,
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 87cbe96b8b957..b75fddd8d044f 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,21 +1,21 @@
# Template file for 'rspamd'
pkgname=rspamd
-version=1.9.4
-revision=11
+version=3.6
+revision=1
archs="x86_64* i686* aarch64* armv[67]* ppc64*"
build_style=cmake
configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
-DDBDIR=/var/lib/rspamd"
hostmakedepends="perl pkg-config ragel"
makedepends="LuaJIT-devel fann-devel file-devel gd-devel pcre-devel
- hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel"
+ hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel libsodium-devel"
short_desc="Fast, free and open-source spam filtering system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Apache-2.0"
homepage="https://rspamd.com/"
-changelog="https://raw.githubusercontent.com/vstakhov/rspamd/master/ChangeLog"
-distfiles="https://github.com/vstakhov/rspamd/archive/${version}.tar.gz"
-checksum=e4720c1f45defd07dd17b9563d0ddc480c70beadbc1a833235c077960092e030
+changelog="https://raw.githubusercontent.com/rspamd/rspamd/master/ChangeLog"
+distfiles="https://github.com/rspamd/rspamd/archive/${version}.tar.gz"
+checksum=bae279f6365f709db9fc3af2dba0babcb8d19da4b0095953eb94f37b6733d5f7
system_accounts="rspamd"
rspamd_homedir=/var/lib/rspamd
conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf"
@@ -38,14 +38,20 @@ if [ "$CROSS_BUILD" ]; then
fi
pre_configure() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl) # Remove non existing library nsl
- vsed -i CMakeLists.txt -e "/LIST(APPEND CMAKE_REQUIRED_LIBRARIES nsl)/d"
- esac
+ # cmake will pick up gold which may not be available on the target arch
+ # since there is no real reason to use it, just skip the attempt to detect it (which
+ # may pick up the host ld.gold while configuring cross compiling)
+ vsed -i cmake/Toolset.cmake -e '/find_program(GOLD_PATH NAMES "ld.gold" "gold")/d'
+ #case "$XBPS_TARGET_MACHINE" in
+ #*-musl) # Remove non existing library nsl
+ #vsed -i CMakeLists.txt -e "/LIST(APPEND CMAKE_REQUIRED_LIBRARIES nsl)/d"
+ #esac
+
if [ "$CROSS_BUILD" ]; then
+ # for building contrib/snowball:
configure_args+=" -C ${FILESDIR}/TryRunResults.cmake"
mkdir -p build_native
- ( cd build_native; LD= CC= CFLAGS= LDFLAGS= cmake .. )
+ ( cd build_native; env -i PATH=$PATH cmake .. )
fi
}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] update to rspamd 3.6
2023-09-01 17:40 [PR PATCH] update to rspamd 3.6 adrian-bl
2023-09-02 9:59 ` [PR PATCH] [Updated] [WIP] " adrian-bl
2023-09-02 10:04 ` adrian-bl
@ 2023-09-02 10:41 ` adrian-bl
2023-09-03 10:26 ` [PR PATCH] [Updated] " adrian-bl
` (10 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: adrian-bl @ 2023-09-02 10:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
There is an updated pull request by adrian-bl against master on the void-packages repository
https://github.com/adrian-bl/void-packages rspam
https://github.com/void-linux/void-packages/pull/45873
[WIP] update to rspamd 3.6
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/45873.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rspam-45873.patch --]
[-- Type: text/x-diff, Size: 5254 bytes --]
From fb28e399c1c718f20b124dd281759d75bf0f0af3 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Fri, 1 Sep 2023 18:25:59 +0200
Subject: [PATCH] update to rspamd 3.6
---
srcpkgs/rspamd/patches/vsx.patch | 63 --------------------------------
srcpkgs/rspamd/template | 24 ++++++------
2 files changed, 13 insertions(+), 74 deletions(-)
delete mode 100644 srcpkgs/rspamd/patches/vsx.patch
diff --git a/srcpkgs/rspamd/patches/vsx.patch b/srcpkgs/rspamd/patches/vsx.patch
deleted file mode 100644
index ebcead9bdb9b1..0000000000000
--- a/srcpkgs/rspamd/patches/vsx.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit a6f43886153bfa63a609720e02bcc9c6f4a50140
-Author: q66 <daniel@octaforge.org>
-Date: Mon Jan 6 00:48:43 2020 +0100
-
- Disable VSX on platforms without it
-
-diff --git contrib/lua-torch/torch7/lib/TH/THVector.c contrib/lua-torch/torch7/lib/TH/THVector.c
-index 4410578..c972b13 100644
---- a/contrib/lua-torch/torch7/lib/TH/THVector.c
-+++ b/contrib/lua-torch/torch7/lib/TH/THVector.c
-@@ -6,7 +6,7 @@
- #include "vector/NEON.c"
- #endif
-
--#ifdef __PPC64__
-+#if defined(__PPC64__) && defined(__VSX__)
- #include "vector/VSX.c"
- #endif
-
-diff --git contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-index 5b88852..8ab4f67 100644
---- a/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-+++ b/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-@@ -20,7 +20,7 @@ static FunctionDescription THVector_(fill_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(fill_VSX), SIMDExtension_VSX),
- #endif
-@@ -85,7 +85,7 @@ static FunctionDescription THVector_(adds_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(adds_VSX), SIMDExtension_VSX),
- #endif
-@@ -146,7 +146,7 @@ static FunctionDescription THVector_(muls_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(muls_VSX), SIMDExtension_VSX),
- #endif
-diff --git contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-index 83c4c56..0919f73 100644
---- a/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-+++ b/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-@@ -43,7 +43,7 @@ enum SIMDExtensions
- {
- #if defined(__NEON__)
- SIMDExtension_NEON = 0x1,
--#elif defined(__PPC64__)
-+#elif defined(__PPC64__) && defined(__VSX__)
- SIMDExtension_VSX = 0x1,
- #else
- SIMDExtension_AVX2 = 0x1,
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 87cbe96b8b957..58a7ce4f372f3 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,21 +1,21 @@
# Template file for 'rspamd'
pkgname=rspamd
-version=1.9.4
-revision=11
+version=3.6
+revision=1
archs="x86_64* i686* aarch64* armv[67]* ppc64*"
build_style=cmake
configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
-DDBDIR=/var/lib/rspamd"
hostmakedepends="perl pkg-config ragel"
makedepends="LuaJIT-devel fann-devel file-devel gd-devel pcre-devel
- hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel"
+ hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel libsodium-devel"
short_desc="Fast, free and open-source spam filtering system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Apache-2.0"
homepage="https://rspamd.com/"
-changelog="https://raw.githubusercontent.com/vstakhov/rspamd/master/ChangeLog"
-distfiles="https://github.com/vstakhov/rspamd/archive/${version}.tar.gz"
-checksum=e4720c1f45defd07dd17b9563d0ddc480c70beadbc1a833235c077960092e030
+changelog="https://raw.githubusercontent.com/rspamd/rspamd/master/ChangeLog"
+distfiles="https://github.com/rspamd/rspamd/archive/${version}.tar.gz"
+checksum=bae279f6365f709db9fc3af2dba0babcb8d19da4b0095953eb94f37b6733d5f7
system_accounts="rspamd"
rspamd_homedir=/var/lib/rspamd
conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf"
@@ -38,14 +38,16 @@ if [ "$CROSS_BUILD" ]; then
fi
pre_configure() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl) # Remove non existing library nsl
- vsed -i CMakeLists.txt -e "/LIST(APPEND CMAKE_REQUIRED_LIBRARIES nsl)/d"
- esac
+ # cmake will pick up gold which may not be available on the target arch
+ # since there is no real reason to use it, just skip the attempt to detect it (which
+ # may pick up the host ld.gold while configuring cross compiling)
+ vsed -i cmake/Toolset.cmake -e '/find_program(GOLD_PATH NAMES "ld.gold" "gold")/d'
+
if [ "$CROSS_BUILD" ]; then
+ # for building contrib/snowball:
configure_args+=" -C ${FILESDIR}/TryRunResults.cmake"
mkdir -p build_native
- ( cd build_native; LD= CC= CFLAGS= LDFLAGS= cmake .. )
+ ( cd build_native; env -i PATH=$PATH cmake .. )
fi
}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] update to rspamd 3.6
2023-09-01 17:40 [PR PATCH] update to rspamd 3.6 adrian-bl
` (2 preceding siblings ...)
2023-09-02 10:41 ` adrian-bl
@ 2023-09-03 10:26 ` adrian-bl
2023-09-07 9:17 ` Bnyro
` (9 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: adrian-bl @ 2023-09-03 10:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 474 bytes --]
There is an updated pull request by adrian-bl against master on the void-packages repository
https://github.com/adrian-bl/void-packages rspam
https://github.com/void-linux/void-packages/pull/45873
update to rspamd 3.6
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/45873.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rspam-45873.patch --]
[-- Type: text/x-diff, Size: 5311 bytes --]
From fd1606e468766877672c6a95f1c0669a82cf7b66 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Fri, 1 Sep 2023 18:25:59 +0200
Subject: [PATCH] update to rspamd 3.6
---
srcpkgs/rspamd/patches/vsx.patch | 63 --------------------------------
srcpkgs/rspamd/template | 25 +++++++------
2 files changed, 13 insertions(+), 75 deletions(-)
delete mode 100644 srcpkgs/rspamd/patches/vsx.patch
diff --git a/srcpkgs/rspamd/patches/vsx.patch b/srcpkgs/rspamd/patches/vsx.patch
deleted file mode 100644
index ebcead9bdb9b1..0000000000000
--- a/srcpkgs/rspamd/patches/vsx.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit a6f43886153bfa63a609720e02bcc9c6f4a50140
-Author: q66 <daniel@octaforge.org>
-Date: Mon Jan 6 00:48:43 2020 +0100
-
- Disable VSX on platforms without it
-
-diff --git contrib/lua-torch/torch7/lib/TH/THVector.c contrib/lua-torch/torch7/lib/TH/THVector.c
-index 4410578..c972b13 100644
---- a/contrib/lua-torch/torch7/lib/TH/THVector.c
-+++ b/contrib/lua-torch/torch7/lib/TH/THVector.c
-@@ -6,7 +6,7 @@
- #include "vector/NEON.c"
- #endif
-
--#ifdef __PPC64__
-+#if defined(__PPC64__) && defined(__VSX__)
- #include "vector/VSX.c"
- #endif
-
-diff --git contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-index 5b88852..8ab4f67 100644
---- a/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-+++ b/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-@@ -20,7 +20,7 @@ static FunctionDescription THVector_(fill_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(fill_VSX), SIMDExtension_VSX),
- #endif
-@@ -85,7 +85,7 @@ static FunctionDescription THVector_(adds_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(adds_VSX), SIMDExtension_VSX),
- #endif
-@@ -146,7 +146,7 @@ static FunctionDescription THVector_(muls_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(muls_VSX), SIMDExtension_VSX),
- #endif
-diff --git contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-index 83c4c56..0919f73 100644
---- a/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-+++ b/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-@@ -43,7 +43,7 @@ enum SIMDExtensions
- {
- #if defined(__NEON__)
- SIMDExtension_NEON = 0x1,
--#elif defined(__PPC64__)
-+#elif defined(__PPC64__) && defined(__VSX__)
- SIMDExtension_VSX = 0x1,
- #else
- SIMDExtension_AVX2 = 0x1,
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 87cbe96b8b957..7c5431bfa3d29 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,21 +1,21 @@
# Template file for 'rspamd'
pkgname=rspamd
-version=1.9.4
-revision=11
+version=3.6
+revision=1
archs="x86_64* i686* aarch64* armv[67]* ppc64*"
build_style=cmake
configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
-DDBDIR=/var/lib/rspamd"
hostmakedepends="perl pkg-config ragel"
makedepends="LuaJIT-devel fann-devel file-devel gd-devel pcre-devel
- hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel"
+ hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel libsodium-devel"
short_desc="Fast, free and open-source spam filtering system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Apache-2.0"
homepage="https://rspamd.com/"
-changelog="https://raw.githubusercontent.com/vstakhov/rspamd/master/ChangeLog"
-distfiles="https://github.com/vstakhov/rspamd/archive/${version}.tar.gz"
-checksum=e4720c1f45defd07dd17b9563d0ddc480c70beadbc1a833235c077960092e030
+changelog="https://raw.githubusercontent.com/rspamd/rspamd/master/ChangeLog"
+distfiles="https://github.com/rspamd/rspamd/archive/${version}.tar.gz"
+checksum=bae279f6365f709db9fc3af2dba0babcb8d19da4b0095953eb94f37b6733d5f7
system_accounts="rspamd"
rspamd_homedir=/var/lib/rspamd
conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf"
@@ -38,18 +38,19 @@ if [ "$CROSS_BUILD" ]; then
fi
pre_configure() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl) # Remove non existing library nsl
- vsed -i CMakeLists.txt -e "/LIST(APPEND CMAKE_REQUIRED_LIBRARIES nsl)/d"
- esac
+ # cmake will pick up gold which may not be available on the target arch
+ # since there is no real reason to use it, just skip the attempt to detect it (which
+ # may pick up the host ld.gold while configuring cross compiling)
+ vsed -i cmake/Toolset.cmake -e '/find_program(GOLD_PATH NAMES "ld.gold" "gold")/d'
+
if [ "$CROSS_BUILD" ]; then
+ # for building contrib/snowball:
configure_args+=" -C ${FILESDIR}/TryRunResults.cmake"
mkdir -p build_native
- ( cd build_native; LD= CC= CFLAGS= LDFLAGS= cmake .. )
+ ( cd build_native; env -i PATH=$PATH cmake .. )
fi
}
post_install() {
vsv rspamd
- vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: update to rspamd 3.6
2023-09-01 17:40 [PR PATCH] update to rspamd 3.6 adrian-bl
` (3 preceding siblings ...)
2023-09-03 10:26 ` [PR PATCH] [Updated] " adrian-bl
@ 2023-09-07 9:17 ` Bnyro
2023-09-07 14:01 ` [PR PATCH] [Updated] " adrian-bl
` (8 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Bnyro @ 2023-09-07 9:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New comment by Bnyro on void-packages repository
https://github.com/void-linux/void-packages/pull/45873#issuecomment-1709791581
Comment:
Please read `CONTRIBUTING.md` and follow the described commit style
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] update to rspamd 3.6
2023-09-01 17:40 [PR PATCH] update to rspamd 3.6 adrian-bl
` (4 preceding siblings ...)
2023-09-07 9:17 ` Bnyro
@ 2023-09-07 14:01 ` adrian-bl
2023-09-07 14:16 ` rspamd: update to 3.6 adrian-bl
` (7 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: adrian-bl @ 2023-09-07 14:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 474 bytes --]
There is an updated pull request by adrian-bl against master on the void-packages repository
https://github.com/adrian-bl/void-packages rspam
https://github.com/void-linux/void-packages/pull/45873
update to rspamd 3.6
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/45873.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rspam-45873.patch --]
[-- Type: text/x-diff, Size: 5311 bytes --]
From e60ad94d74c99395a0c1dc143cc3b5ccb0f65324 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Fri, 1 Sep 2023 18:25:59 +0200
Subject: [PATCH] update to rspamd 3.6
---
srcpkgs/rspamd/patches/vsx.patch | 63 --------------------------------
srcpkgs/rspamd/template | 25 +++++++------
2 files changed, 13 insertions(+), 75 deletions(-)
delete mode 100644 srcpkgs/rspamd/patches/vsx.patch
diff --git a/srcpkgs/rspamd/patches/vsx.patch b/srcpkgs/rspamd/patches/vsx.patch
deleted file mode 100644
index ebcead9bdb9b1..0000000000000
--- a/srcpkgs/rspamd/patches/vsx.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit a6f43886153bfa63a609720e02bcc9c6f4a50140
-Author: q66 <daniel@octaforge.org>
-Date: Mon Jan 6 00:48:43 2020 +0100
-
- Disable VSX on platforms without it
-
-diff --git contrib/lua-torch/torch7/lib/TH/THVector.c contrib/lua-torch/torch7/lib/TH/THVector.c
-index 4410578..c972b13 100644
---- a/contrib/lua-torch/torch7/lib/TH/THVector.c
-+++ b/contrib/lua-torch/torch7/lib/TH/THVector.c
-@@ -6,7 +6,7 @@
- #include "vector/NEON.c"
- #endif
-
--#ifdef __PPC64__
-+#if defined(__PPC64__) && defined(__VSX__)
- #include "vector/VSX.c"
- #endif
-
-diff --git contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-index 5b88852..8ab4f67 100644
---- a/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-+++ b/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-@@ -20,7 +20,7 @@ static FunctionDescription THVector_(fill_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(fill_VSX), SIMDExtension_VSX),
- #endif
-@@ -85,7 +85,7 @@ static FunctionDescription THVector_(adds_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(adds_VSX), SIMDExtension_VSX),
- #endif
-@@ -146,7 +146,7 @@ static FunctionDescription THVector_(muls_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(muls_VSX), SIMDExtension_VSX),
- #endif
-diff --git contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-index 83c4c56..0919f73 100644
---- a/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-+++ b/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-@@ -43,7 +43,7 @@ enum SIMDExtensions
- {
- #if defined(__NEON__)
- SIMDExtension_NEON = 0x1,
--#elif defined(__PPC64__)
-+#elif defined(__PPC64__) && defined(__VSX__)
- SIMDExtension_VSX = 0x1,
- #else
- SIMDExtension_AVX2 = 0x1,
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 87cbe96b8b957..7c5431bfa3d29 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,21 +1,21 @@
# Template file for 'rspamd'
pkgname=rspamd
-version=1.9.4
-revision=11
+version=3.6
+revision=1
archs="x86_64* i686* aarch64* armv[67]* ppc64*"
build_style=cmake
configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
-DDBDIR=/var/lib/rspamd"
hostmakedepends="perl pkg-config ragel"
makedepends="LuaJIT-devel fann-devel file-devel gd-devel pcre-devel
- hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel"
+ hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel libsodium-devel"
short_desc="Fast, free and open-source spam filtering system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Apache-2.0"
homepage="https://rspamd.com/"
-changelog="https://raw.githubusercontent.com/vstakhov/rspamd/master/ChangeLog"
-distfiles="https://github.com/vstakhov/rspamd/archive/${version}.tar.gz"
-checksum=e4720c1f45defd07dd17b9563d0ddc480c70beadbc1a833235c077960092e030
+changelog="https://raw.githubusercontent.com/rspamd/rspamd/master/ChangeLog"
+distfiles="https://github.com/rspamd/rspamd/archive/${version}.tar.gz"
+checksum=bae279f6365f709db9fc3af2dba0babcb8d19da4b0095953eb94f37b6733d5f7
system_accounts="rspamd"
rspamd_homedir=/var/lib/rspamd
conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf"
@@ -38,18 +38,19 @@ if [ "$CROSS_BUILD" ]; then
fi
pre_configure() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl) # Remove non existing library nsl
- vsed -i CMakeLists.txt -e "/LIST(APPEND CMAKE_REQUIRED_LIBRARIES nsl)/d"
- esac
+ # cmake will pick up gold which may not be available on the target arch
+ # since there is no real reason to use it, just skip the attempt to detect it (which
+ # may pick up the host ld.gold while configuring cross compiling)
+ vsed -i cmake/Toolset.cmake -e '/find_program(GOLD_PATH NAMES "ld.gold" "gold")/d'
+
if [ "$CROSS_BUILD" ]; then
+ # for building contrib/snowball:
configure_args+=" -C ${FILESDIR}/TryRunResults.cmake"
mkdir -p build_native
- ( cd build_native; LD= CC= CFLAGS= LDFLAGS= cmake .. )
+ ( cd build_native; env -i PATH=$PATH cmake .. )
fi
}
post_install() {
vsv rspamd
- vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: rspamd: update to 3.6.
2023-09-01 17:40 [PR PATCH] update to rspamd 3.6 adrian-bl
` (5 preceding siblings ...)
2023-09-07 14:01 ` [PR PATCH] [Updated] " adrian-bl
@ 2023-09-07 14:16 ` adrian-bl
2023-09-23 13:15 ` Duncaen
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: adrian-bl @ 2023-09-07 14:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 428 bytes --]
New comment by adrian-bl on void-packages repository
https://github.com/void-linux/void-packages/pull/45873#issuecomment-1710236491
Comment:
Thanks for the pointer: updated the title - i think the rest of the PR is in line with the contributing rules - please let me know if i missed something else.
Also i tested the current version of the PR locally and it builds on x86_64, x86_64-musl, aarch64, aarch64-musl and armv6l
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: rspamd: update to 3.6.
2023-09-01 17:40 [PR PATCH] update to rspamd 3.6 adrian-bl
` (6 preceding siblings ...)
2023-09-07 14:16 ` rspamd: update to 3.6 adrian-bl
@ 2023-09-23 13:15 ` Duncaen
2023-09-23 13:15 ` Duncaen
` (5 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Duncaen @ 2023-09-23 13:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/45873#issuecomment-1732316351
Comment:
The commit title has to be changed, the PR title doesn't matter much as it doesn't appear in the git history.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: rspamd: update to 3.6.
2023-09-01 17:40 [PR PATCH] update to rspamd 3.6 adrian-bl
` (7 preceding siblings ...)
2023-09-23 13:15 ` Duncaen
@ 2023-09-23 13:15 ` Duncaen
2023-09-23 13:15 ` Duncaen
` (4 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Duncaen @ 2023-09-23 13:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/45873#issuecomment-1732316377
Comment:
The commit title has to be changed, the PR title doesn't matter much as it doesn't appear in the git history.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: rspamd: update to 3.6.
2023-09-01 17:40 [PR PATCH] update to rspamd 3.6 adrian-bl
` (8 preceding siblings ...)
2023-09-23 13:15 ` Duncaen
@ 2023-09-23 13:15 ` Duncaen
2023-09-23 13:59 ` [PR PATCH] [Updated] " adrian-bl
` (3 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Duncaen @ 2023-09-23 13:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/45873#issuecomment-1732316377
Comment:
The commit title has to be changed, the PR title doesn't matter much as it doesn't appear in the git history.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] rspamd: update to 3.6.
2023-09-01 17:40 [PR PATCH] update to rspamd 3.6 adrian-bl
` (9 preceding siblings ...)
2023-09-23 13:15 ` Duncaen
@ 2023-09-23 13:59 ` adrian-bl
2023-09-23 14:00 ` adrian-bl
` (2 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: adrian-bl @ 2023-09-23 13:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
There is an updated pull request by adrian-bl against master on the void-packages repository
https://github.com/adrian-bl/void-packages rspam
https://github.com/void-linux/void-packages/pull/45873
rspamd: update to 3.6.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/45873.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rspam-45873.patch --]
[-- Type: text/x-diff, Size: 5312 bytes --]
From 54bf1f39bb5de652ed7210cfb83c64f9105ca9af Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Fri, 1 Sep 2023 18:25:59 +0200
Subject: [PATCH] rspamd: update to 3.6
---
srcpkgs/rspamd/patches/vsx.patch | 63 --------------------------------
srcpkgs/rspamd/template | 25 +++++++------
2 files changed, 13 insertions(+), 75 deletions(-)
delete mode 100644 srcpkgs/rspamd/patches/vsx.patch
diff --git a/srcpkgs/rspamd/patches/vsx.patch b/srcpkgs/rspamd/patches/vsx.patch
deleted file mode 100644
index ebcead9bdb9b1..0000000000000
--- a/srcpkgs/rspamd/patches/vsx.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit a6f43886153bfa63a609720e02bcc9c6f4a50140
-Author: q66 <daniel@octaforge.org>
-Date: Mon Jan 6 00:48:43 2020 +0100
-
- Disable VSX on platforms without it
-
-diff --git contrib/lua-torch/torch7/lib/TH/THVector.c contrib/lua-torch/torch7/lib/TH/THVector.c
-index 4410578..c972b13 100644
---- a/contrib/lua-torch/torch7/lib/TH/THVector.c
-+++ b/contrib/lua-torch/torch7/lib/TH/THVector.c
-@@ -6,7 +6,7 @@
- #include "vector/NEON.c"
- #endif
-
--#ifdef __PPC64__
-+#if defined(__PPC64__) && defined(__VSX__)
- #include "vector/VSX.c"
- #endif
-
-diff --git contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-index 5b88852..8ab4f67 100644
---- a/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-+++ b/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
-@@ -20,7 +20,7 @@ static FunctionDescription THVector_(fill_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(fill_VSX), SIMDExtension_VSX),
- #endif
-@@ -85,7 +85,7 @@ static FunctionDescription THVector_(adds_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(adds_VSX), SIMDExtension_VSX),
- #endif
-@@ -146,7 +146,7 @@ static FunctionDescription THVector_(muls_DISPATCHTABLE)[] = {
- #endif
- #endif
-
-- #if defined(__PPC64__)
-+ #if defined(__PPC64__) && defined(__VSX__)
- #if defined(TH_REAL_IS_DOUBLE) || defined(TH_REAL_IS_FLOAT)
- FUNCTION_IMPL(THVector_(muls_VSX), SIMDExtension_VSX),
- #endif
-diff --git contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-index 83c4c56..0919f73 100644
---- a/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-+++ b/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
-@@ -43,7 +43,7 @@ enum SIMDExtensions
- {
- #if defined(__NEON__)
- SIMDExtension_NEON = 0x1,
--#elif defined(__PPC64__)
-+#elif defined(__PPC64__) && defined(__VSX__)
- SIMDExtension_VSX = 0x1,
- #else
- SIMDExtension_AVX2 = 0x1,
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 87cbe96b8b957..7c5431bfa3d29 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,21 +1,21 @@
# Template file for 'rspamd'
pkgname=rspamd
-version=1.9.4
-revision=11
+version=3.6
+revision=1
archs="x86_64* i686* aarch64* armv[67]* ppc64*"
build_style=cmake
configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
-DDBDIR=/var/lib/rspamd"
hostmakedepends="perl pkg-config ragel"
makedepends="LuaJIT-devel fann-devel file-devel gd-devel pcre-devel
- hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel"
+ hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel libsodium-devel"
short_desc="Fast, free and open-source spam filtering system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Apache-2.0"
homepage="https://rspamd.com/"
-changelog="https://raw.githubusercontent.com/vstakhov/rspamd/master/ChangeLog"
-distfiles="https://github.com/vstakhov/rspamd/archive/${version}.tar.gz"
-checksum=e4720c1f45defd07dd17b9563d0ddc480c70beadbc1a833235c077960092e030
+changelog="https://raw.githubusercontent.com/rspamd/rspamd/master/ChangeLog"
+distfiles="https://github.com/rspamd/rspamd/archive/${version}.tar.gz"
+checksum=bae279f6365f709db9fc3af2dba0babcb8d19da4b0095953eb94f37b6733d5f7
system_accounts="rspamd"
rspamd_homedir=/var/lib/rspamd
conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf"
@@ -38,18 +38,19 @@ if [ "$CROSS_BUILD" ]; then
fi
pre_configure() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl) # Remove non existing library nsl
- vsed -i CMakeLists.txt -e "/LIST(APPEND CMAKE_REQUIRED_LIBRARIES nsl)/d"
- esac
+ # cmake will pick up gold which may not be available on the target arch
+ # since there is no real reason to use it, just skip the attempt to detect it (which
+ # may pick up the host ld.gold while configuring cross compiling)
+ vsed -i cmake/Toolset.cmake -e '/find_program(GOLD_PATH NAMES "ld.gold" "gold")/d'
+
if [ "$CROSS_BUILD" ]; then
+ # for building contrib/snowball:
configure_args+=" -C ${FILESDIR}/TryRunResults.cmake"
mkdir -p build_native
- ( cd build_native; LD= CC= CFLAGS= LDFLAGS= cmake .. )
+ ( cd build_native; env -i PATH=$PATH cmake .. )
fi
}
post_install() {
vsv rspamd
- vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: rspamd: update to 3.6.
2023-09-01 17:40 [PR PATCH] update to rspamd 3.6 adrian-bl
` (10 preceding siblings ...)
2023-09-23 13:59 ` [PR PATCH] [Updated] " adrian-bl
@ 2023-09-23 14:00 ` adrian-bl
2023-12-23 1:45 ` github-actions
2024-01-06 1:46 ` [PR PATCH] [Closed]: " github-actions
13 siblings, 0 replies; 15+ messages in thread
From: adrian-bl @ 2023-09-23 14:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New comment by adrian-bl on void-packages repository
https://github.com/void-linux/void-packages/pull/45873#issuecomment-1732325011
Comment:
Ah, got it: sorry for that! Updated the commit message
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: rspamd: update to 3.6.
2023-09-01 17:40 [PR PATCH] update to rspamd 3.6 adrian-bl
` (11 preceding siblings ...)
2023-09-23 14:00 ` adrian-bl
@ 2023-12-23 1:45 ` github-actions
2024-01-06 1:46 ` [PR PATCH] [Closed]: " github-actions
13 siblings, 0 replies; 15+ messages in thread
From: github-actions @ 2023-12-23 1:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/45873#issuecomment-1868167780
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Closed]: rspamd: update to 3.6.
2023-09-01 17:40 [PR PATCH] update to rspamd 3.6 adrian-bl
` (12 preceding siblings ...)
2023-12-23 1:45 ` github-actions
@ 2024-01-06 1:46 ` github-actions
13 siblings, 0 replies; 15+ messages in thread
From: github-actions @ 2024-01-06 1:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There's a closed pull request on the void-packages repository
rspamd: update to 3.6.
https://github.com/void-linux/void-packages/pull/45873
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2024-01-06 1:46 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-01 17:40 [PR PATCH] update to rspamd 3.6 adrian-bl
2023-09-02 9:59 ` [PR PATCH] [Updated] [WIP] " adrian-bl
2023-09-02 10:04 ` adrian-bl
2023-09-02 10:41 ` adrian-bl
2023-09-03 10:26 ` [PR PATCH] [Updated] " adrian-bl
2023-09-07 9:17 ` Bnyro
2023-09-07 14:01 ` [PR PATCH] [Updated] " adrian-bl
2023-09-07 14:16 ` rspamd: update to 3.6 adrian-bl
2023-09-23 13:15 ` Duncaen
2023-09-23 13:15 ` Duncaen
2023-09-23 13:15 ` Duncaen
2023-09-23 13:59 ` [PR PATCH] [Updated] " adrian-bl
2023-09-23 14:00 ` adrian-bl
2023-12-23 1:45 ` github-actions
2024-01-06 1:46 ` [PR PATCH] [Closed]: " github-actions
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).