---
testing/rspamd/APKBUILD | 94 ++++++++++++++++++++-------------
testing/rspamd/config.patch | 56 ++++++++++++++++++++
testing/rspamd/rspamd.conf | 18 -------
testing/rspamd/rspamd.initd | 4 +-
testing/rspamd/rspamd.worker_controller | 11 ----
testing/rspamd/rspamd.worker_normal | 8 ---
6 files changed, 114 insertions(+), 77 deletions(-)
create mode 100644 testing/rspamd/config.patch
delete mode 100644 testing/rspamd/rspamd.conf
delete mode 100644 testing/rspamd/rspamd.worker_controller
delete mode 100644 testing/rspamd/rspamd.worker_normal
diff --git a/testing/rspamd/APKBUILD b/testing/rspamd/APKBUILD
index ee2b2e3..54fba8e 100644
--- a/testing/rspamd/APKBUILD
+++ b/testing/rspamd/APKBUILD
@@ -2,9 +2,9 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Contributor: Nathan Angelacos <nangel@alpinelinux.org>
pkgname=rspamd
-pkgver=1.3.4
-pkgrel=1
-pkgdesc="Rapid spam filtering system"
+pkgver=1.4.0
+pkgrel=0
+pkgdesc="Fast, free and open-source spam filtering system"
url="https://rspamd.com"
arch="x86_64 x86 armhf"
license="BSD"
@@ -12,53 +12,62 @@ pkgusers="rspamd"
pkggroups="rspamd"
depends=""
depends_dev=""
-makedepends="$depends_dev cmake libressl-dev libevent-dev glib-dev gmime-dev
- lua5.1-dev lua5.1 sqlite-dev hiredis-dev file-dev pcre-dev ragel"
+makedepends="$depends_dev cmake ragel perl
+ lua-dev glib-dev pcre-dev gmime-dev libevent-dev sqlite-dev
+ libressl-dev file-dev curl-dev"
install="$pkgname.pre-install"
-subpackages="$pkgname-doc $pkgname-web $pkgname-client"
+subpackages="$pkgname-doc $pkgname-controller::noarch $pkgname-client
+ $pkgname-fuzzy::noarch $pkgname-utils::noarch"
source="https://rspamd.com/downloads/$pkgname-$pkgver.tar.xz
$pkgname.logrotated
$pkgname.initd
$pkgname.confd
- $pkgname.conf
- $pkgname.worker_normal
- $pkgname.worker_controller
+ config.patch
"
-_builddir="$srcdir"/$pkgname-$pkgver
+builddir="$srcdir"/$pkgname-$pkgver
+
build() {
- cd "$_builddir"
+ cd "$builddir"
cmake CMakeLists.txt \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCONFDIR=/etc/$pkgname \
-DRUNDIR=/run/$pkgname \
-DRSPAMD_USER=$pkgusers \
-DRSPAMD_GROUP=$pkggroups \
+ -DENABLE_DB=ON \
+ -DENABLE_SQLITE=ON \
-DENABLE_HIREDIS=ON \
+ -DENABLE_REDIRECTOR=ON \
+ -DENABLE_URL_INCLUDE=ON \
-DINSTALL_EXAMPLES=ON \
|| return 1
make || return 1
}
package() {
- cd "$_builddir"
+ cd "$builddir"
make DESTDIR="$pkgdir" install || return 1
- find "$pkgdir"/usr/bin -type l -delete
- rm -fr "$pkgdir"/etc/$pkgname/rspamd* "$pkgdir"/etc/$pkgname/worker*
- sed -i -E 's~DBDIR(/rspamd.sock)~RUNDIR\1~' "$pkgdir"/etc/$pkgname/options.inc
- install -Dm644 "$srcdir"/$pkgname.conf "$pkgdir"/etc/$pkgname/$pkgname.conf
- install -Dm644 "$srcdir"/$pkgname.worker_normal "$pkgdir"/etc/$pkgname/worker.d/normal.conf
+ rm "$pkgdir"/etc/$pkgname/$pkgname.systemd.conf
+ mv "$pkgdir"/etc/$pkgname/$pkgname.sysvinit.conf \
+ "$pkgdir"/etc/$pkgname/$pkgname.conf
+ sed -ri -e 's~DBDIR(/rspamd.sock)~RUNDIR\1~' \
+ -e 's~rspamd_dynamic~dynamic~' \
+ "$pkgdir"/etc/$pkgname/options.inc
+
mkdir -p "$pkgdir"/etc/$pkgname/local.d "$pkgdir"/etc/$pkgname/override.d
install -Dm644 "$srcdir"/$pkgname.logrotated "$pkgdir"/etc/logrotate.d/$pkgname
install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
- install -dm750 -o $pkgusers -g $pkggroups "$pkgdir"/var/lib/$pkgname/rspamd_dynamic
+ install -dm750 -g $pkggroups "$pkgdir"/var/lib/$pkgname/dynamic
install -dm750 -g $pkggroups "$pkgdir"/var/log/$pkgname
+ chown $pkgusers "$pkgdir"/var/lib/$pkgname
mkdir "$pkgdir"/usr/sbin
+ find "$pkgdir"/usr/bin -type l -delete
mv "$pkgdir"/usr/bin/rspamd-$pkgver "$pkgdir"/usr/sbin/rspamd
mv "$pkgdir"/usr/bin/rspamadm-$pkgver "$pkgdir"/usr/bin/rspamadm
@@ -68,14 +77,13 @@ package() {
"$pkgdir"/usr/share/doc/$pkgname
}
-web() {
- arch="noarch"
+controller() {
license="MIT"
depends="$pkgname"
- pkgdesc="$pkgdesc (web control interface)"
- mkdir -p "$subpkgdir"/usr/share/$pkgname "$subpkgdir"/etc/$pkgname/worker.d
+ pkgdesc="$pkgdesc (controller web interface)"
+ mkdir -p "$subpkgdir"/usr/share/$pkgname "$subpkgdir"/etc/$pkgname
mv "$pkgdir"/usr/share/$pkgname/www "$subpkgdir"/usr/share/$pkgname/
- install -Dm644 "$srcdir"/$pkgname.worker_controller "$subpkgdir"/etc/$pkgname/worker.d/controller.conf
+ mv "$pkgdir"/etc/$pkgname/worker-controller.* "$subpkgdir"/etc/$pkgname
}
client() {
@@ -84,24 +92,34 @@ client() {
mv "$pkgdir"/usr/bin/rspamc-$pkgver "$subpkgdir"/usr/bin/rspamc
}
-md5sums="ab81d063861d68b1e2260d1c599bf29c rspamd-1.3.4.tar.xz
+fuzzy() {
+ depends="$pkgname"
+ pkgdesc="$pkgdesc (local fuzzy storage)"
+ mkdir -p "$subpkgdir"/etc/$pkgname/modules.d
+ mv "$pkgdir"/etc/$pkgname/worker-fuzzy.* "$subpkgdir"/etc/$pkgname
+ mv "$pkgdir"/etc/$pkgname/modules.d/fuzzy_* "$subpkgdir"/etc/$pkgname/modules.d
+}
+
+utils() {
+ depends="perl"
+ pkgdesc="$pkgdesc (utils)"
+ mkdir -p "$subpkgdir"/usr/bin
+ mv "$pkgdir"/usr/bin/${pkgname}_stats "$subpkgdir"/usr/bin/${pkgname}-stats
+ mv "$pkgdir"/usr/bin/${pkgname}-redirector "$subpkgdir"/usr/bin
+}
+
+md5sums="923b0d5fae691916feb243d61d48609f rspamd-1.4.0.tar.xz
c152c6a90f6ae9e5a7a1d137dfbc0305 rspamd.logrotated
-3f32a16e76e1461ffba9231cfb1e3d17 rspamd.initd
+0656acc12dcce7cba232857a848d0390 rspamd.initd
ecfea2a25b95727ae91c04001fbd3e46 rspamd.confd
-0ba1c9aea1820de74d831fd531cce51a rspamd.conf
-560b2d4746510fe9a7a2fb1c09181c38 rspamd.worker_normal
-15a9f5dde0076eaab4565549b05b991c rspamd.worker_controller"
-sha256sums="64fcabb3dc6767b5dc22c89f968414d1028f34ab8a21e1b22482aace069d527c rspamd-1.3.4.tar.xz
+ff0bf4f1b1447ca401865369f91418f1 config.patch"
+sha256sums="30c9acf93bdcc6c009524c8b2770931475929c6c9e948faa90d7412306055a1c rspamd-1.4.0.tar.xz
6c5e79e9052d957f3d0d634b2ae7a56bbc0901a5d6946dc991c92f19a72fce97 rspamd.logrotated
-6b531f95724b2a3990524ab09b7304ce4e811b6e082dfdbe633f201a6bc7eee3 rspamd.initd
+5bcf68a72e0582859799cd335a14d48914e5291f4087327b3b42562ef64e2958 rspamd.initd
82be6a663af2e2333b0dfbbbfd05a9ff3d02e05c7e506235b1b0dbd9d0b72972 rspamd.confd
-8b51fbd06a46adceb8cc4b0dc06e7b98d263336acbff913c34ff8e451173aa23 rspamd.conf
-ccb271cc6b1ff69add9d6e00edcb14e1c1ae664ee6ecf28304647f6cb32240c9 rspamd.worker_normal
-91848312e707032bb159f042da04b4a15efd43f69a17225481962cb07751e90a rspamd.worker_controller"
-sha512sums="41a3aa9b699ca1e40d229ebc9c3fd41ef07ad99b0badda44481fe4ff3003000069352f58379fa47013f96d98b08430a3c7bea0d97cab4a7e6db17a9084b082d6 rspamd-1.3.4.tar.xz
+7e0adb4a2e7e8f806fc5fdae0c37e6948ed56e9d46d4eed0c681806decb90e49 config.patch"
+sha512sums="39bfccee070b829f3ea5019ebde0020a850abf7fe92f7e5bb5b9212088d4c98544e6f55228984d3422c09c31f356b209237da6a6eb9c18e3feb7940429de663a rspamd-1.4.0.tar.xz
2efe28575c40d1fba84b189bb872860e744400db80dce2f6330be6c6287fb3f46e6511284729b957488bf40bcb9b0952e26df9934f5f138334bd2766075c45cb rspamd.logrotated
-30b45812ef68f2b82d0d7f370b44bec52691296c7349c96c8273342eb4f9b5708c13ad97b13f63d81bee588b4e459c0da3092a62adff9e5b8938f44546df3dcd rspamd.initd
+e240983c2fd91d8061b17e35e83a75c56ac2c3625dbe07b83a2e89e3dbf69b57c675d01772b93968aa6b22d150d54d366f2fb4a0c6551b3cfdedc77d82e28652 rspamd.initd
0b73b159cec9a4a1d337fbb429814f78da23b55f72c9fb8a777ab5f06634206a4f9b25e587f8dbfa7c3242ac5501ebcc90b9a0e926adfd37e14a12ac4607fa62 rspamd.confd
-856000ab9b76dd7acff95ab9a55a0eddfc66486a439fcba7fbb36ecdeaa9740f29301cf7248c982e2d5b745b1bad521abb0f4d5e240d442440a36103d3ee634d rspamd.conf
-e669882c35891eee37c4121ea065e72545c618ac5e16044ccd19db4cdb14bed271fa87dc261e43e587a08ea6149e13952626c8cea8a797a59b649203c2ac4731 rspamd.worker_normal
-e830ccd5d7999e8cf8d0a82baba1ca80c8b8eb3a7f710c8c067af937258fff49f010cead46619adebc1d481d1131c9e0146fa654a4f4c28749437e5b2c49e755 rspamd.worker_controller"
+2089429e6f44f8204f31c87c565cdd7abcd51b3146397ba1b2fb23b1be6faf46fd8ec36718f194a3fc38ac1d38d7be9010a84ac4b49d7e1597706699538c607a config.patch"
diff --git a/testing/rspamd/config.patch b/testing/rspamd/config.patch
new file mode 100644
index 0000000..1c8b991
--- /dev/null
+++ b/testing/rspamd/config.patch
@@ -0,0 +1,56 @@
+--- a/conf/rspamd.sysvinit.conf
++++ b/conf/rspamd.sysvinit.conf
+@@ -32,25 +32,4 @@
+ .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc"
+ }
+
+-worker {
+- bind_socket = "*:11333";
+- .include "$CONFDIR/worker-normal.inc"
+- .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-normal.inc"
+- .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-normal.inc"
+-}
+-
+-worker {
+- bind_socket = "localhost:11334";
+- .include "$CONFDIR/worker-controller.inc"
+- .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-controller.inc"
+- .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc"
+-}
+-
+-# Local fuzzy storage is disabled by default
+-
+-#worker {
+-# bind_socket = "*:11335";
+-# .include "$CONFDIR/worker-fuzzy.inc"
+-# .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-fuzzy.inc"
+-# .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-fuzzy.inc"
+-#}
++.include(glob=true) "$CONFDIR/worker-*.conf"
+--- /dev/null
++++ b/conf/worker-controller.conf
+@@ -0,0 +1,6 @@
++worker {
++ bind_socket = "localhost:11334";
++ .include "$CONFDIR/worker-controller.inc"
++ .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-controller.inc"
++ .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc"
++}
+--- /dev/null
++++ b/conf/worker-fuzzy.conf
+@@ -0,0 +1,6 @@
++worker {
++ bind_socket = "*:11335";
++ .include "$CONFDIR/worker-fuzzy.inc"
++ .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-fuzzy.inc"
++ .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-fuzzy.inc"
++}
+--- /dev/null
++++ b/conf/worker-normal.conf
+@@ -0,0 +1,6 @@
++worker {
++ bind_socket = "*:11333";
++ .include "$CONFDIR/worker-normal.inc"
++ .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-normal.inc"
++ .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-normal.inc"
++}
diff --git a/testing/rspamd/rspamd.conf b/testing/rspamd/rspamd.conf
deleted file mode 100644
index fe737f9..0000000
--- a/testing/rspamd/rspamd.conf
@@ -1,18 +0,0 @@
-.include "$CONFDIR/common.conf"
-
-options {
- pidfile = "$RUNDIR/rspamd.pid";
- .include "$CONFDIR/options.inc"
- .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/options.inc"
- .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc"
-}
-
-logging {
- type = "file";
- filename = "$LOGDIR/rspamd.log";
- .include "$CONFDIR/logging.inc"
- .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/logging.inc"
- .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc"
-}
-
-.include(glob=true) "$CONFDIR/worker.d/*.conf"
diff --git a/testing/rspamd/rspamd.initd b/testing/rspamd/rspamd.initd
index a20f784..93148cc 100644
--- a/testing/rspamd/rspamd.initd
+++ b/testing/rspamd/rspamd.initd
@@ -14,7 +14,7 @@ description_reopen="Reopen log files"
depend() {
need localmount net
- before exim postfix
+ before mta
}
start_pre() {
@@ -34,4 +34,4 @@ reopen() {
ebegin "Reopening ${SVCNAME} log files"
start-stop-daemon --signal USR1 --pidfile $pidfile
eend $?
-}
\ No newline at end of file
+}
diff --git a/testing/rspamd/rspamd.worker_controller b/testing/rspamd/rspamd.worker_controller
deleted file mode 100644
index 77464c1..0000000
--- a/testing/rspamd/rspamd.worker_controller
@@ -1,11 +0,0 @@
-worker {
- bind_socket = "localhost:11334";
- type = "controller";
- count = 1;
- password = "q1";
- secure_ip = "127.0.0.1";
- secure_ip = "::1";
- static_dir = "${WWWDIR}";
- .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/worker-controller.inc"
- .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc"
-}
diff --git a/testing/rspamd/rspamd.worker_normal b/testing/rspamd/rspamd.worker_normal
deleted file mode 100644
index 6fbee1d..0000000
--- a/testing/rspamd/rspamd.worker_normal
@@ -1,8 +0,0 @@
-worker {
- bind_socket = "*:11333";
- type = "normal";
- mime = true;
- task_timeout = 8s;
- .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/worker-normal.inc"
- .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-normal.inc"
-}
--
2.10.2
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---