rspamd: 1.6.5

3 files changed, 16 insertions, 11 deletions

diff --git a/pcr/rspamd/PKGBUILD b/pcr/rspamd/PKGBUILD
index ba53e5b2f..9e346105d 100644
--- a/pcr/rspamd/PKGBUILD
+++ b/pcr/rspamd/PKGBUILD
@@ -2,16 +2,16 @@
 # Former maintainer: Andrew Lewis <nerf@judo.za.org>
 # Maintainer (Parabola): fauno <fauno@parabola.nu>
 pkgname=rspamd
-pkgver=1.5.6
+pkgver=1.6.5
 pkgrel=1
 epoch=
 pkgdesc="Fast and free spam filtering system."
 arch=('x86_64' 'i686' 'mips64el')
 url="https://rspamd.com"
 license=('Apache')
-depends=('libevent' 'glib2' 'gmime' 'lua' 'sqlite' 'lua-lpeg' 'libfann' 'gd'
+depends=('file' 'glib2' 'icu' 'libevent' 'libfann' 'luajit' 'sqlite'
   'jemalloc' 'hiredis' 'pcre2')
-makedepends=('cmake' 'pkgconfig' 'ragel')
+makedepends=('cmake' 'pkg-config' 'ragel')
 
 backup=('etc/rspamd/2tld.inc'
 		'etc/rspamd/common.conf'
@@ -24,6 +24,7 @@ backup=('etc/rspamd/2tld.inc'
 		'etc/rspamd/mime_types.inc'
 		'etc/rspamd/modules.conf'
 		'etc/rspamd/modules.d/antivirus.conf'
+		'etc/rspamd/modules.d/arc.conf'
 		'etc/rspamd/modules.d/asn.conf'
 		'etc/rspamd/modules.d/chartable.conf'
 		'etc/rspamd/modules.d/clickhouse.conf'
@@ -44,6 +45,7 @@ backup=('etc/rspamd/2tld.inc'
 		'etc/rspamd/modules.d/metadata_exporter.conf'
 		'etc/rspamd/modules.d/metric_exporter.conf'
 		'etc/rspamd/modules.d/mid.conf'
+		'etc/rspamd/modules.d/milter_headers.conf'
 		'etc/rspamd/modules.d/mime_types.conf'
 		'etc/rspamd/modules.d/multimap.conf'
 		'etc/rspamd/modules.d/mx_check.conf'
@@ -54,9 +56,9 @@ backup=('etc/rspamd/2tld.inc'
 		'etc/rspamd/modules.d/redis.conf'
 		'etc/rspamd/modules.d/regexp.conf'
 		'etc/rspamd/modules.d/replies.conf'
-		'etc/rspamd/modules.d/rmilter_headers.conf'
 		'etc/rspamd/modules.d/rspamd_update.conf'
 		'etc/rspamd/modules.d/spamassassin.conf'
+		'etc/rspamd/modules.d/spamtrap.conf'
 		'etc/rspamd/modules.d/spf.conf'
 		'etc/rspamd/modules.d/surbl.conf'
 		'etc/rspamd/modules.d/trie.conf'
@@ -67,30 +69,32 @@ backup=('etc/rspamd/2tld.inc'
 		'etc/rspamd/options.inc'
 		'etc/rspamd/redirectors.inc'
 		'etc/rspamd/rspamd.conf'
-		'etc/rspamd/rspamd.systemd.conf'
-		'etc/rspamd/rspamd.sysvinit.conf'
 		'etc/rspamd/spf_dkim_whitelist.inc'
 		'etc/rspamd/statistic.conf'
 		'etc/rspamd/surbl-whitelist.inc'
 		'etc/rspamd/worker-controller.inc'
 		'etc/rspamd/worker-fuzzy.inc'
-		'etc/rspamd/worker-normal.inc')
+		'etc/rspamd/worker-normal.inc'
+		'etc/rspamd/worker-proxy.inc')
 
 install="rspamd.install"
 
-source=("https://www.rspamd.com/downloads/${pkgname}-${pkgver}.tar.xz"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/vstakhov/${pkgname}/archive/${pkgver}.tar.gz"
 		"${pkgname}.tmpfile"
 		"${pkgname}.sysuser"
+		"fixes-${pkgver}.diff"
 		)
 
-sha256sums=('cda2a5b93f0e57b890767514ce00a2660baf9d48627f7367a36fe938ade14f31'
+sha256sums=('6007aba3a908c02ef71f95a92c9c1c2fe46d3f3c39186a68f6c1997c88decc7a'
             'f89edae5436a3c14e58210fb5c1d5bdd2f8a6f98c03dbc150ea9ff1a3fcfe441'
-            '59646874a5036f3f26cac2898a2f60713fe6147b3c60ee964494f07b6acc313f')
+            '59646874a5036f3f26cac2898a2f60713fe6147b3c60ee964494f07b6acc313f'
+            'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855')
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -re 's,<jemalloc.h>,<jemalloc/jemalloc.h>,' -i config.h.in
+  patch -Np1 <../fixes-${pkgver}.diff
 }
 
 build() {
@@ -112,7 +116,7 @@ build() {
         -DINSTALL_WEBUI=ON \
 		.
 
-	make -j$(nproc)
+	cmake --build .
 }
 
 package() {
diff --git a/pcr/rspamd/fixes-1.6.5.diff b/pcr/rspamd/fixes-1.6.5.diff
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/pcr/rspamd/fixes-1.6.5.diff
diff --git a/pcr/rspamd/rspamd.install b/pcr/rspamd/rspamd.install
index 705c21dbe..9cc8edd48 100644
--- a/pcr/rspamd/rspamd.install
+++ b/pcr/rspamd/rspamd.install
@@ -2,6 +2,7 @@
 post_install() {
 	systemd-sysusers rspamd.conf
 	systemd-tmpfiles --create rspamd.conf
+	install --directory --mode=0750 --owner=_rspamd --group=_rspamd /var/lib/rspamd
 }
 
 ## arg 1:  the old package version