summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksandr Natalenko2015-09-18 16:51:02 +0300
committerOleksandr Natalenko2015-09-18 16:51:02 +0300
commit1bbf57674b0097a9edffd027c8a83bb55d7b1c9c (patch)
treec951a96530fca97c8275c13c73d095c981915aeb
parent8f3e2c7025e5c355c1e7889c0df00748d301b43e (diff)
downloadaur-1bbf57674b0097a9edffd027c8a83bb55d7b1c9c.tar.gz
update to v0.9.10
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
-rw-r--r--rspamd.install4
-rw-r--r--rspamd.service16
4 files changed, 34 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e2904d55fd54..785de4790b12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = rspamd
pkgdesc = Fast, free and open-source spam filtering system.
- pkgver = 0.9.9
+ pkgver = 0.9.10
pkgrel = 1
url = http://rspamd.com
install = rspamd.install
@@ -27,8 +27,10 @@ pkgbase = rspamd
backup = etc/rspamd/2tld.inc
backup = etc/rspamd/statistic.conf
backup = etc/rspamd/metrics.conf
- source = https://www.rspamd.com/downloads/rspamd-0.9.9.tar.xz
- sha256sums = bb4e6d7f69376f8d9fcd4b5a84cc9973a3551eb3e430e7c10b1bd9094db7c211
+ source = https://www.rspamd.com/downloads/rspamd-0.9.10.tar.xz
+ source = rspamd.service
+ sha256sums = 5ff557610cc5b7000abe2df727d6b9bfec7e3fe019ce3fdcc386d16262b45652
+ sha256sums = 3ccbc157c2e73367e7cbab2b19d0847ef58cecb47194c3bdc5f1b118405d3d26
pkgname = rspamd
diff --git a/PKGBUILD b/PKGBUILD
index df3b3d5ccdbd..8191ff9b0f32 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Andrew Lewis <nerf@judo.za.org>
pkgname=rspamd
-pkgver=0.9.9
+pkgver=0.9.10
pkgrel=1
epoch=
pkgdesc="Fast, free and open-source spam filtering system."
@@ -23,26 +23,28 @@ backup=('etc/rspamd/logging.inc'
'etc/rspamd/metrics.conf')
install=rspamd.install
-source=("https://www.rspamd.com/downloads/${pkgname}-${pkgver}.tar.xz")
+source=("https://www.rspamd.com/downloads/${pkgname}-${pkgver}.tar.xz"
+ "rspamd.service")
-sha256sums=('bb4e6d7f69376f8d9fcd4b5a84cc9973a3551eb3e430e7c10b1bd9094db7c211')
+sha256sums=('5ff557610cc5b7000abe2df727d6b9bfec7e3fe019ce3fdcc386d16262b45652'
+ '3ccbc157c2e73367e7cbab2b19d0847ef58cecb47194c3bdc5f1b118405d3d26')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
cmake \
- -DWANT_SYSTEMD_UNITS=ON \
-DNO_SHARED=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCONFDIR=/etc/rspamd \
+ -DRUNDIR=/run/rspamd \
+ -DLOGDIR=/var/log/rspamd \
-DRSPAMD_USER='_rspamd' \
- -DRSPAMD_GROUP='_rspamd' \
-DDBDIR=/var/lib/rspamd \
-DENABLE_LUAJIT=OFF \
-DENABLE_HIREDIS=OFF \
.
- make
+ make -j$(nproc)
}
package() {
@@ -51,5 +53,6 @@ package() {
make DESTDIR="${pkgdir}/" install
install -Dm0644 'LICENSE' "${pkgdir}/usr/share/${pkgname}/LICENSE"
+ install -Dm0644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
}
diff --git a/rspamd.install b/rspamd.install
index 1d301db57b10..2261599e8d34 100644
--- a/rspamd.install
+++ b/rspamd.install
@@ -4,6 +4,10 @@ post_install() {
useradd -k /dev/null -r -m -c 'rspam daemon' -d /var/lib/rspamd -s /sbin/nologin _rspamd
passwd -l _rspamd >/dev/null
fi
+ mkdir -p /var/log/rspamd
+ mkdir -p /run/rspamd
+ chown _rspamd:_rspamd /var/log/rspamd
+ chown _rspamd:_rspamd /run/rspamd
}
## arg 1: the old package version
diff --git a/rspamd.service b/rspamd.service
new file mode 100644
index 000000000000..c55bcb2eb58b
--- /dev/null
+++ b/rspamd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=rapid spam filtering system
+After=nss-lookup.target
+
+[Service]
+Type=forking
+PIDFile=/run/rspamd/rspamd.pid
+ExecStartPre=/usr/bin/mkdir -p /run/rspamd
+ExecStartPre=/usr/bin/chown _rspamd:_rspamd /run/rspamd
+ExecStart=/usr/bin/rspamd -c /etc/rspamd/rspamd.conf
+User=_rspamd
+PermissionsStartOnly=true
+
+[Install]
+WantedBy=multi-user.target
+