Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Dirkjan Ochtman <djc@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
Date: Mon, 04 Nov 2019 11:22:44
Message-Id: 1572866550.b481cbb2f97f7453c04f9a94d98bd8c3e17e3cb8.djc@gentoo
1 commit: b481cbb2f97f7453c04f9a94d98bd8c3e17e3cb8
2 Author: Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 4 11:22:17 2019 +0000
4 Commit: Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 4 11:22:30 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b481cbb2
7
8 mail-filter/rspamd: version bump to 2.1
9
10 Closes: https://bugs.gentoo.org/698902
11 Package-Manager: Portage-2.3.76, Repoman-2.3.16
12 Signed-off-by: Dirkjan Ochtman <djc <AT> gentoo.org>
13
14 mail-filter/rspamd/Manifest | 1 +
15 mail-filter/rspamd/files/rspamd-r7.init | 55 ++++++++++++++++++++++
16 .../{rspamd-9999.ebuild => rspamd-2.1.ebuild} | 12 ++---
17 mail-filter/rspamd/rspamd-9999.ebuild | 12 ++---
18 4 files changed, 66 insertions(+), 14 deletions(-)
19
20 diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
21 index 32757315930..b4131458c7c 100644
22 --- a/mail-filter/rspamd/Manifest
23 +++ b/mail-filter/rspamd/Manifest
24 @@ -1,3 +1,4 @@
25 DIST rspamd-1.8.3.tar.gz 4319623 BLAKE2B b7fdd6791df5899710bb1d696a9b94d1840335b6a34d6cdeebc2b5eebe9f4e5b6da3e90ed9ab5e3945aab7ef33f54f048024b51c3de37db1a083ad89c656b456 SHA512 5e20255466fe2cd4842196fb2138732b59911de655e73d9cc13009b5179b84e5a2060083961b35fe40b9f550f8e18067056415a1d803fac54fac000070024c01
26 DIST rspamd-1.9.0.tar.gz 4402395 BLAKE2B 11f90fc232496b493296ef0fb9ff4118ac11863528cd6a52bcae6adbdc09ce86453bb39df35714702fcd5c6a535007ec402a580bd735abbddeeb154ff8807219 SHA512 fee2a60c10fbab087b12d9188974a0c47417a9894308f66980eb6311496b16661194d858d1e522d2d524b3e359f2f3ad88535421d1dc05be26414b5a346afec6
27 DIST rspamd-1.9.4.tar.gz 4476230 BLAKE2B e4866fb8fd97210e77b75d948ae97f038eccc33ec9f6214693579e5d84210c87ff9258204f466ffe6bea780159d24d819aaf393a06dbf2785659a784e4f4e8b6 SHA512 3acecec6adb91580ac2ad96419fdc9588b120ec5a3b4a44135fc5a3e7c15f2dbc99963a8337f9effb9423846489545a55d89d1849c5ba62d8cd91dc67c32d8dc
28 +DIST rspamd-2.1.tar.gz 4232297 BLAKE2B 4685fa404e5a66d2295da57ece8ce1830507b3464c5136952dbb85847a5002c9c45c4f5430d0d60bc199f3aeafde7abf3ac218451f1609b81a5edfd4d0394588 SHA512 7ecd42e9196ccad29a18bb3e6153fd13d3564c1630c4ec88c712d180f789ad2c36755bfeff65e8dd82737debfb5530a6ec4eb401b49dd82b9eb1dbdea991f84f
29
30 diff --git a/mail-filter/rspamd/files/rspamd-r7.init b/mail-filter/rspamd/files/rspamd-r7.init
31 new file mode 100644
32 index 00000000000..311fde9d637
33 --- /dev/null
34 +++ b/mail-filter/rspamd/files/rspamd-r7.init
35 @@ -0,0 +1,55 @@
36 +#!/sbin/openrc-run
37 +# Copyright 2015-2019 Gentoo Authors
38 +# Distributed under the terms of the GNU General Public License v2
39 +
40 +RSPAMD_CONFIGFILE=${RSPAMD_CONFIGFILE:-"/etc/rspamd/rspamd.conf"}
41 +RSPAMD_GROUP=${RSPAMD_GROUP:-rspamd}
42 +RSPAMD_OPTS=${RSPAMD_OPTS:-""}
43 +RSPAMD_PIDFILE=${RSPAMD_PIDFILE:-"/run/rspamd.pid"}
44 +RSPAMD_USER=${RSPAMD_USER:-rspamd}
45 +
46 +command="/usr/bin/rspamd"
47 +command_rspamadm="/usr/bin/rspamadm"
48 +command_args="${RSPAMD_OPTS} -c \"${RSPAMD_CONFIGFILE}\" -u ${RSPAMD_USER} -g ${RSPAMD_GROUP} --pid \"${RSPAMD_PIDFILE}\""
49 +start_stop_daemon_args=${RSPAMD_SSDARGS:-"--wait 1000"}
50 +pidfile="${RSPAMD_PIDFILE}"
51 +retry=${RSPAMD_TERMTIMEOUT:-"TERM/60/KILL/5"}
52 +
53 +required_files="${RSPAMD_CONFIGFILE}"
54 +
55 +description="Rapid spam filtering system"
56 +
57 +extra_commands="checkconfig"
58 +extra_started_commands="reload"
59 +
60 +description_checkconfig="Validate rspamd's configuration"
61 +description_reload="Sends rspamd a signal to reload its configuration"
62 +
63 +depend() {
64 + before mta
65 + use dns redis
66 +}
67 +
68 +checkconfig() {
69 + ${command_rspamadm} configtest 1>/dev/null || return 1
70 +}
71 +
72 +reload() {
73 + checkconfig || return 1
74 +
75 + ebegin "Reloading ${SVCNAME}"
76 + start-stop-daemon --signal HUP --pidfile "${pidfile}"
77 + eend $?
78 +}
79 +
80 +start_pre() {
81 + if [ "${RC_CMD}" != "restart" ]; then
82 + checkconfig || return 1
83 + fi
84 +}
85 +
86 +stop_pre() {
87 + if [ "${RC_CMD}" = "restart" ]; then
88 + checkconfig || return 1
89 + fi
90 +}
91
92 diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-2.1.ebuild
93 similarity index 88%
94 copy from mail-filter/rspamd/rspamd-9999.ebuild
95 copy to mail-filter/rspamd/rspamd-2.1.ebuild
96 index 2000be8f549..a44b355c466 100644
97 --- a/mail-filter/rspamd/rspamd-9999.ebuild
98 +++ b/mail-filter/rspamd/rspamd-2.1.ebuild
99 @@ -17,18 +17,18 @@ DESCRIPTION="Rapid spam filtering system"
100 HOMEPAGE="https://github.com/vstakhov/rspamd"
101 LICENSE="Apache-2.0"
102 SLOT="0"
103 -IUSE="cpu_flags_x86_ssse3 gd jemalloc +jit libressl pcre2 +torch"
104 -REQUIRED_USE="torch? ( jit )"
105 +IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
106
107 RDEPEND="dev-db/sqlite:3
108 dev-libs/glib:2
109 dev-libs/icu:=
110 - dev-libs/libevent:=
111 + dev-libs/libev
112 net-libs/libnsl
113 sys-apps/file
114 dev-util/ragel
115 + dev-libs/libsodium
116 + blas? ( sci-libs/openblas )
117 cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
118 - gd? ( media-libs/gd[jpeg] )
119 jemalloc? ( dev-libs/jemalloc )
120 jit? ( dev-lang/luajit:2 )
121 !libressl? ( dev-libs/openssl:0=[-bindist] )
122 @@ -57,11 +57,9 @@ src_configure() {
123 -DDBDIR=/var/lib/rspamd
124 -DLOGDIR=/var/log/rspamd
125 -DENABLE_LUAJIT=$(usex jit ON OFF)
126 - -DENABLE_GD=$(usex gd ON OFF)
127 -DENABLE_PCRE2=$(usex pcre2 ON OFF)
128 -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
129 -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
130 - -DENABLE_TORCH=$(usex torch ON OFF)
131 )
132 cmake-utils_src_configure
133 }
134 @@ -74,7 +72,7 @@ src_install() {
135 cmake-utils_src_install
136
137 newconfd "${FILESDIR}"/rspamd.conf rspamd
138 - newinitd "${FILESDIR}/rspamd-r6.init" rspamd
139 + newinitd "${FILESDIR}/rspamd-r7.init" rspamd
140 systemd_newunit rspamd.service rspamd.service
141
142 newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
143
144 diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
145 index 2000be8f549..a44b355c466 100644
146 --- a/mail-filter/rspamd/rspamd-9999.ebuild
147 +++ b/mail-filter/rspamd/rspamd-9999.ebuild
148 @@ -17,18 +17,18 @@ DESCRIPTION="Rapid spam filtering system"
149 HOMEPAGE="https://github.com/vstakhov/rspamd"
150 LICENSE="Apache-2.0"
151 SLOT="0"
152 -IUSE="cpu_flags_x86_ssse3 gd jemalloc +jit libressl pcre2 +torch"
153 -REQUIRED_USE="torch? ( jit )"
154 +IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
155
156 RDEPEND="dev-db/sqlite:3
157 dev-libs/glib:2
158 dev-libs/icu:=
159 - dev-libs/libevent:=
160 + dev-libs/libev
161 net-libs/libnsl
162 sys-apps/file
163 dev-util/ragel
164 + dev-libs/libsodium
165 + blas? ( sci-libs/openblas )
166 cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
167 - gd? ( media-libs/gd[jpeg] )
168 jemalloc? ( dev-libs/jemalloc )
169 jit? ( dev-lang/luajit:2 )
170 !libressl? ( dev-libs/openssl:0=[-bindist] )
171 @@ -57,11 +57,9 @@ src_configure() {
172 -DDBDIR=/var/lib/rspamd
173 -DLOGDIR=/var/log/rspamd
174 -DENABLE_LUAJIT=$(usex jit ON OFF)
175 - -DENABLE_GD=$(usex gd ON OFF)
176 -DENABLE_PCRE2=$(usex pcre2 ON OFF)
177 -DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
178 -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
179 - -DENABLE_TORCH=$(usex torch ON OFF)
180 )
181 cmake-utils_src_configure
182 }
183 @@ -74,7 +72,7 @@ src_install() {
184 cmake-utils_src_install
185
186 newconfd "${FILESDIR}"/rspamd.conf rspamd
187 - newinitd "${FILESDIR}/rspamd-r6.init" rspamd
188 + newinitd "${FILESDIR}/rspamd-r7.init" rspamd
189 systemd_newunit rspamd.service rspamd.service
190
191 newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
Report Message
Find on MARC Find on Google Groups