1 |
commit: b738a5b5fb44be3e4ef584c256f3e37b9a055c7e |
2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
3 |
AuthorDate: Mon Aug 31 13:48:36 2020 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 2 07:21:40 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b738a5b5 |
7 |
|
8 |
mail-filter/rspamd: clean old and buggy versions |
9 |
|
10 |
- Version 2.3 does not work with libressl, however, the bug was resolved |
11 |
in 2.4 and later |
12 |
- Version 2.4 contains bugs in plugins/lua/neural.lua and |
13 |
plugins/lua/phishing.lua and users should not use it. |
14 |
|
15 |
Closes: https://bugs.gentoo.org/708620 |
16 |
Package-Manager: Portage-3.0.4, Repoman-2.3.23 |
17 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
18 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
19 |
|
20 |
mail-filter/rspamd/Manifest | 2 - |
21 |
mail-filter/rspamd/rspamd-2.3.ebuild | 94 ------------------------------------ |
22 |
mail-filter/rspamd/rspamd-2.4.ebuild | 94 ------------------------------------ |
23 |
3 files changed, 190 deletions(-) |
24 |
|
25 |
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest |
26 |
index c1caf263ac8..31a2bd1b901 100644 |
27 |
--- a/mail-filter/rspamd/Manifest |
28 |
+++ b/mail-filter/rspamd/Manifest |
29 |
@@ -1,3 +1 @@ |
30 |
-DIST rspamd-2.3.tar.gz 4409924 BLAKE2B 825326c8c92b9937be1aed8640acc1c94762bf8de564642e4d1d429025eb9cc7ba943217b35c881c92b888cff0bec68ffae737bfc77ccb02bfc2ebd9d5948bcc SHA512 20fae1b088acafaaaa406980dc10da5efa66680f10ca8f0d262ddc735a0498f2026091806206995430d28ae27a7d348556eb1586a9217a02c39dfcf0f7c6eb95 |
31 |
-DIST rspamd-2.4.tar.gz 4462119 BLAKE2B 073a27dc8ca76ede3928a2bbc1c3908d442e2d70e0cb51fea73f23fea55536f84e8154b7b6423af13002c0bd5cda60ae9948b3c6321a73d365c7fbd6541c3dca SHA512 47d64fdadc1c61642efebe4772add48848a45c8106bf431dacb458d85cdd9bf996ca46bcb75d60cedb15ae72518089e9b3e63a0716d22843f5b9f38d7d86be08 |
32 |
DIST rspamd-2.5.tar.gz 4490310 BLAKE2B 8d117b1b03e8092d0c724a4da4de23dd145f5b22696aa6b4ef1c208ade28f0d143dd783c9173b6987514b2aef9327ff8fd29eeae5e3da3039d2568384e50a697 SHA512 6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540 |
33 |
|
34 |
diff --git a/mail-filter/rspamd/rspamd-2.3.ebuild b/mail-filter/rspamd/rspamd-2.3.ebuild |
35 |
deleted file mode 100644 |
36 |
index 38a8793ea03..00000000000 |
37 |
--- a/mail-filter/rspamd/rspamd-2.3.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,94 +0,0 @@ |
40 |
-# Copyright 1999-2020 Gentoo Authors |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
- |
43 |
-EAPI=7 |
44 |
- |
45 |
-inherit cmake pax-utils systemd tmpfiles |
46 |
- |
47 |
-if [[ ${PV} == *9999 ]] ; then |
48 |
- EGIT_REPO_URI="https://github.com/rspamd/rspamd.git" |
49 |
- inherit git-r3 |
50 |
-else |
51 |
- SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" |
52 |
- KEYWORDS="~amd64 ~x86" |
53 |
-fi |
54 |
- |
55 |
-DESCRIPTION="Rapid spam filtering system" |
56 |
-HOMEPAGE="https://rspamd.com/ https://github.com/rspamd/rspamd" |
57 |
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB" |
58 |
-SLOT="0" |
59 |
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2" |
60 |
- |
61 |
-RDEPEND=" |
62 |
- acct-group/rspamd |
63 |
- acct-user/rspamd |
64 |
- dev-db/sqlite:3 |
65 |
- dev-libs/glib:2 |
66 |
- dev-libs/icu:= |
67 |
- dev-libs/libev |
68 |
- dev-libs/libsodium |
69 |
- dev-util/ragel |
70 |
- net-libs/libnsl |
71 |
- sys-apps/file |
72 |
- blas? ( sci-libs/openblas ) |
73 |
- cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) |
74 |
- jemalloc? ( dev-libs/jemalloc ) |
75 |
- jit? ( dev-lang/luajit:2 ) |
76 |
- !jit? ( dev-lang/lua:* ) |
77 |
- !libressl? ( dev-libs/openssl:0=[-bindist] ) |
78 |
- libressl? ( dev-libs/libressl:0= ) |
79 |
- pcre2? ( dev-libs/libpcre2[jit=] ) |
80 |
- !pcre2? ( dev-libs/libpcre[jit=] )" |
81 |
-DEPEND="${RDEPEND}" |
82 |
- |
83 |
-src_prepare() { |
84 |
- cmake_src_prepare |
85 |
- |
86 |
- sed -i -e 's/User=_rspamd/User=rspamd/g' \ |
87 |
- rspamd.service \ |
88 |
- || die |
89 |
-} |
90 |
- |
91 |
-src_configure() { |
92 |
- local mycmakeargs=( |
93 |
- -DCONFDIR=/etc/rspamd |
94 |
- -DRUNDIR=/var/run/rspamd |
95 |
- -DDBDIR=/var/lib/rspamd |
96 |
- -DLOGDIR=/var/log/rspamd |
97 |
- -DENABLE_BLAS=$(usex blas ON OFF) |
98 |
- -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) |
99 |
- -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) |
100 |
- -DENABLE_LUAJIT=$(usex jit ON OFF) |
101 |
- -DENABLE_PCRE2=$(usex pcre2 ON OFF) |
102 |
- ) |
103 |
- cmake_src_configure |
104 |
-} |
105 |
- |
106 |
-src_test() { |
107 |
- cmake_src_test |
108 |
-} |
109 |
- |
110 |
-src_install() { |
111 |
- cmake_src_install |
112 |
- |
113 |
- newconfd "${FILESDIR}"/rspamd.conf rspamd |
114 |
- newinitd "${FILESDIR}/rspamd-r7.init" rspamd |
115 |
- systemd_newunit rspamd.service rspamd.service |
116 |
- |
117 |
- newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf |
118 |
- |
119 |
- # Remove mprotect for JIT support |
120 |
- if use jit; then |
121 |
- pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* |
122 |
- fi |
123 |
- |
124 |
- insinto /etc/logrotate.d |
125 |
- newins "${FILESDIR}"/rspamd-r1.logrotate rspamd |
126 |
- |
127 |
- diropts -o rspamd -g rspamd |
128 |
- keepdir /var/{lib,log}/rspamd |
129 |
-} |
130 |
- |
131 |
-pkg_postinst() { |
132 |
- tmpfiles_process "${PN}.conf" |
133 |
-} |
134 |
|
135 |
diff --git a/mail-filter/rspamd/rspamd-2.4.ebuild b/mail-filter/rspamd/rspamd-2.4.ebuild |
136 |
deleted file mode 100644 |
137 |
index 38a8793ea03..00000000000 |
138 |
--- a/mail-filter/rspamd/rspamd-2.4.ebuild |
139 |
+++ /dev/null |
140 |
@@ -1,94 +0,0 @@ |
141 |
-# Copyright 1999-2020 Gentoo Authors |
142 |
-# Distributed under the terms of the GNU General Public License v2 |
143 |
- |
144 |
-EAPI=7 |
145 |
- |
146 |
-inherit cmake pax-utils systemd tmpfiles |
147 |
- |
148 |
-if [[ ${PV} == *9999 ]] ; then |
149 |
- EGIT_REPO_URI="https://github.com/rspamd/rspamd.git" |
150 |
- inherit git-r3 |
151 |
-else |
152 |
- SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" |
153 |
- KEYWORDS="~amd64 ~x86" |
154 |
-fi |
155 |
- |
156 |
-DESCRIPTION="Rapid spam filtering system" |
157 |
-HOMEPAGE="https://rspamd.com/ https://github.com/rspamd/rspamd" |
158 |
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB" |
159 |
-SLOT="0" |
160 |
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2" |
161 |
- |
162 |
-RDEPEND=" |
163 |
- acct-group/rspamd |
164 |
- acct-user/rspamd |
165 |
- dev-db/sqlite:3 |
166 |
- dev-libs/glib:2 |
167 |
- dev-libs/icu:= |
168 |
- dev-libs/libev |
169 |
- dev-libs/libsodium |
170 |
- dev-util/ragel |
171 |
- net-libs/libnsl |
172 |
- sys-apps/file |
173 |
- blas? ( sci-libs/openblas ) |
174 |
- cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) |
175 |
- jemalloc? ( dev-libs/jemalloc ) |
176 |
- jit? ( dev-lang/luajit:2 ) |
177 |
- !jit? ( dev-lang/lua:* ) |
178 |
- !libressl? ( dev-libs/openssl:0=[-bindist] ) |
179 |
- libressl? ( dev-libs/libressl:0= ) |
180 |
- pcre2? ( dev-libs/libpcre2[jit=] ) |
181 |
- !pcre2? ( dev-libs/libpcre[jit=] )" |
182 |
-DEPEND="${RDEPEND}" |
183 |
- |
184 |
-src_prepare() { |
185 |
- cmake_src_prepare |
186 |
- |
187 |
- sed -i -e 's/User=_rspamd/User=rspamd/g' \ |
188 |
- rspamd.service \ |
189 |
- || die |
190 |
-} |
191 |
- |
192 |
-src_configure() { |
193 |
- local mycmakeargs=( |
194 |
- -DCONFDIR=/etc/rspamd |
195 |
- -DRUNDIR=/var/run/rspamd |
196 |
- -DDBDIR=/var/lib/rspamd |
197 |
- -DLOGDIR=/var/log/rspamd |
198 |
- -DENABLE_BLAS=$(usex blas ON OFF) |
199 |
- -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) |
200 |
- -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) |
201 |
- -DENABLE_LUAJIT=$(usex jit ON OFF) |
202 |
- -DENABLE_PCRE2=$(usex pcre2 ON OFF) |
203 |
- ) |
204 |
- cmake_src_configure |
205 |
-} |
206 |
- |
207 |
-src_test() { |
208 |
- cmake_src_test |
209 |
-} |
210 |
- |
211 |
-src_install() { |
212 |
- cmake_src_install |
213 |
- |
214 |
- newconfd "${FILESDIR}"/rspamd.conf rspamd |
215 |
- newinitd "${FILESDIR}/rspamd-r7.init" rspamd |
216 |
- systemd_newunit rspamd.service rspamd.service |
217 |
- |
218 |
- newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf |
219 |
- |
220 |
- # Remove mprotect for JIT support |
221 |
- if use jit; then |
222 |
- pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* |
223 |
- fi |
224 |
- |
225 |
- insinto /etc/logrotate.d |
226 |
- newins "${FILESDIR}"/rspamd-r1.logrotate rspamd |
227 |
- |
228 |
- diropts -o rspamd -g rspamd |
229 |
- keepdir /var/{lib,log}/rspamd |
230 |
-} |
231 |
- |
232 |
-pkg_postinst() { |
233 |
- tmpfiles_process "${PN}.conf" |
234 |
-} |