1 |
commit: 591c43d3d90dd3aa1752e8a90b49cc8467058a4b |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 4 00:07:50 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 4 00:09:19 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591c43d3 |
7 |
|
8 |
mail-filter/dspam: remove last-rited pkg |
9 |
|
10 |
Bug: https://bugs.gentoo.org/692436 |
11 |
Bug: https://bugs.gentoo.org/630884 |
12 |
Bug: https://bugs.gentoo.org/626474 |
13 |
Bug: https://bugs.gentoo.org/490322 |
14 |
Bug: https://bugs.gentoo.org/707274 |
15 |
Bug: https://bugs.gentoo.org/713404 |
16 |
Bug: https://bugs.gentoo.org/665910 |
17 |
Bug: https://bugs.gentoo.org/520844 |
18 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
19 |
|
20 |
mail-filter/dspam/Manifest | 1 - |
21 |
mail-filter/dspam/dspam-3.10.2-r2.ebuild | 221 -------------------- |
22 |
mail-filter/dspam/dspam-3.10.2-r3.ebuild | 223 --------------------- |
23 |
.../dspam-3.10.2-mysql8-my_bool-typedef.patch | 13 -- |
24 |
mail-filter/dspam/files/dspam.confd | 7 - |
25 |
mail-filter/dspam/files/dspam.cron-r4 | 5 - |
26 |
mail-filter/dspam/files/dspam.initd | 44 ---- |
27 |
mail-filter/dspam/files/dspam.logrotate | 10 - |
28 |
mail-filter/dspam/metadata.xml | 35 ---- |
29 |
profiles/package.mask | 1 - |
30 |
10 files changed, 560 deletions(-) |
31 |
|
32 |
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest |
33 |
deleted file mode 100644 |
34 |
index eac0fb7711f..00000000000 |
35 |
--- a/mail-filter/dspam/Manifest |
36 |
+++ /dev/null |
37 |
@@ -1 +0,0 @@ |
38 |
-DIST dspam-3.10.2.tar.gz 1035054 BLAKE2B 9200e6a3449feea3cec80572d7856597e487e553a69b52e7ecee1cd17c0792faf48fbda9e253d1fe52be40b8f0d4dcab4006b898abdcc62289550f17d7d876d3 SHA512 5fe53e1d0d7cabb3983f5c67274b074b7c647c1bae10ebc7ea3805542f99dbfb39abd4697e344e6eb80554522319a1253e1082ed6b389364bbaec1d6ddd43856 |
39 |
|
40 |
diff --git a/mail-filter/dspam/dspam-3.10.2-r2.ebuild b/mail-filter/dspam/dspam-3.10.2-r2.ebuild |
41 |
deleted file mode 100644 |
42 |
index 0144efda569..00000000000 |
43 |
--- a/mail-filter/dspam/dspam-3.10.2-r2.ebuild |
44 |
+++ /dev/null |
45 |
@@ -1,221 +0,0 @@ |
46 |
-# Copyright 1999-2019 Gentoo Authors |
47 |
-# Distributed under the terms of the GNU General Public License v2 |
48 |
- |
49 |
-EAPI=7 |
50 |
- |
51 |
-inherit user |
52 |
- |
53 |
-DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter" |
54 |
-HOMEPAGE="http://dspam.sourceforge.net/" |
55 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
56 |
- |
57 |
-LICENSE="AGPL-3" |
58 |
-SLOT="0" |
59 |
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" |
60 |
-DRIVERS_IUSE="+hash mysql postgres sqlite" |
61 |
-SCALES_IUSE="small-scale +domain-scale large-scale" |
62 |
-IUSE="clamav daemon debug ldap static-libs syslog virtual-users user-homedirs ${DRIVERS_IUSE} ${SCALES_IUSE}" |
63 |
- |
64 |
-DEPEND=" |
65 |
- net-mail/mailbase |
66 |
- ldap? ( net-nds/openldap ) |
67 |
- mysql? ( dev-db/mysql-connector-c:0= ) |
68 |
- postgres? ( dev-db/postgresql ) |
69 |
- sqlite? ( dev-db/sqlite:3 ) |
70 |
-" |
71 |
-RDEPEND=" |
72 |
- ${DEPEND} |
73 |
- clamav? ( app-antivirus/clamav ) |
74 |
- syslog? ( virtual/logger ) |
75 |
-" |
76 |
- |
77 |
-# Demands on sane USE flags: |
78 |
-# - find out what driver to use: select at least one |
79 |
-# - if static-libs is set, only one driver may be selected |
80 |
-# - find out what scale to use: select exactly one |
81 |
-# - user-homedirs does not work with virtual-users |
82 |
-REQUIRED_USE=" |
83 |
- || ( ${DRIVERS_IUSE//+} ) |
84 |
- static-libs? ( ^^ ( ${DRIVERS_IUSE//+} ) ) |
85 |
- ^^ ( ${SCALES_IUSE//+} ) |
86 |
- virtual-users? ( !user-homedirs ) |
87 |
-" |
88 |
- |
89 |
-# dspam setup defaults |
90 |
-DSPAM_HOME=/var/spool/dspam |
91 |
-DSPAM_CONF=/etc/dspam |
92 |
-DSPAM_LOG=/var/log/dspam |
93 |
-DSPAM_MODE=2510 |
94 |
-DSPAM_DRIVERS= |
95 |
-DSPAM_DRIVERS_EXTRAS= |
96 |
- |
97 |
-pkg_setup() { |
98 |
- # setup storage, this sets DSPAM_DRIVERS |
99 |
- dspam_setup_storage_drivers |
100 |
- |
101 |
- # create dspam user and group |
102 |
- dspam_setup_user |
103 |
-} |
104 |
- |
105 |
-src_configure() { |
106 |
- econf \ |
107 |
- --sysconfdir=${DSPAM_CONF} \ |
108 |
- --with-dspam-home=${DSPAM_HOME} \ |
109 |
- --with-dspam-home-group=dspam \ |
110 |
- --with-dspam-mode=${DSPAM_MODE} \ |
111 |
- --with-dspam-group=dspam \ |
112 |
- --with-logdir=${DSPAM_LOG} \ |
113 |
- --enable-external-lookup \ |
114 |
- --enable-long-usernames \ |
115 |
- --enable-split-configuration \ |
116 |
- $(use_enable clamav) \ |
117 |
- $(use_enable daemon) \ |
118 |
- $(use_enable debug) \ |
119 |
- $(use_enable debug bnr-debug) \ |
120 |
- $(use_enable debug verbose-debug) \ |
121 |
- $(use_enable domain-scale) \ |
122 |
- $(use_enable large-scale) \ |
123 |
- $(use_enable static-libs static) \ |
124 |
- $(use_enable syslog) \ |
125 |
- $(use_enable user-homedirs homedir) \ |
126 |
- $(use_enable virtual-users) \ |
127 |
- --with-storage-driver=${DSPAM_DRIVERS} ${DSPAM_DRIVERS_EXTRAS} \ |
128 |
- $(use mysql || use postgres && echo "--enable-preferences-extension") \ |
129 |
- $(use syslog || echo "--with-logfile=${DSPAM_LOG}/dspam.log") |
130 |
-} |
131 |
- |
132 |
-dspam_setup_user() { |
133 |
- # DSPAM CGI web gui (www-apps/dspam-web) needs to run as a regular user |
134 |
- # under suexec in apache, so DSPAM user/group need to be regular users too |
135 |
- |
136 |
- local euid egid |
137 |
- for euid in {1000..5000} ; do |
138 |
- [ -z "$(egetent passwd ${euid})" ] && break |
139 |
- done |
140 |
- for egid in {1000..5000} ; do |
141 |
- [ -z "$(egetent group ${egid})" ] && break |
142 |
- done |
143 |
- enewgroup dspam ${egid} |
144 |
- enewuser dspam ${euid} -1 "${DSPAM_HOMEDIR}" dspam,mail |
145 |
-} |
146 |
- |
147 |
-dspam_setup_storage_drivers() { |
148 |
- # Find out which storage drivers need to be enabled, and set some |
149 |
- # variables so that src_configure can pick them up |
150 |
- |
151 |
- if use hash; then |
152 |
- DSPAM_DRIVERS+=",hash_drv" |
153 |
- fi |
154 |
- |
155 |
- if use mysql; then |
156 |
- DSPAM_DRIVERS+=",mysql_drv" |
157 |
- DSPAM_DRIVERS_EXTRAS+="--with-mysql-includes=/usr/include/mysql " |
158 |
- fi |
159 |
- |
160 |
- if use postgres; then |
161 |
- DSPAM_DRIVERS+=",pgsql_drv" |
162 |
- fi |
163 |
- |
164 |
- if use sqlite; then |
165 |
- DSPAM_DRIVERS+=",sqlite3_drv" |
166 |
- fi |
167 |
- |
168 |
- if ! use static-libs; then |
169 |
- # set the driver name twice to avoid a static build |
170 |
- DSPAM_DRIVERS+=${DSPAM_DRIVERS} |
171 |
- fi |
172 |
- |
173 |
- # remove first comma separator |
174 |
- DSPAM_DRIVERS=${DSPAM_DRIVERS:1} |
175 |
- einfo "Building with drivers: ${DSPAM_DRIVERS}" |
176 |
- #echo DSPAM_DRIVERS_EXTRAS=$DSPAM_DRIVERS_EXTRAS |
177 |
-} |
178 |
- |
179 |
-src_install() { |
180 |
- default |
181 |
- |
182 |
- if use daemon; then |
183 |
- newinitd "${FILESDIR}/dspam.initd" dspam |
184 |
- newconfd "${FILESDIR}/dspam.confd" dspam |
185 |
- fi |
186 |
- |
187 |
- if use mysql; then |
188 |
- insinto "/usr/share/${PN}/mysql" |
189 |
- |
190 |
- local files="mysql_objects-4.1.sql mysql_objects-space.sql mysql_objects-speed.sql purge-4.1.sql purge.sql" |
191 |
- if use virtual-users; then |
192 |
- files+=" virtual_user_aliases.sql virtual_users.sql" |
193 |
- fi |
194 |
- |
195 |
- for file in $files; do |
196 |
- doins src/tools.mysql_drv/${file} |
197 |
- done |
198 |
- fi |
199 |
- |
200 |
- if use postgres; then |
201 |
- insinto "/usr/share/${PN}/pgsql" |
202 |
- |
203 |
- local files="pgsql_objects.sql purge-pe.sql purge.sql" |
204 |
- if use virtual-users; then |
205 |
- files+=" virtual_users.sql" |
206 |
- fi |
207 |
- |
208 |
- for file in $files; do |
209 |
- doins src/tools.pgsql_drv/${file} |
210 |
- done |
211 |
- fi |
212 |
- |
213 |
- if use sqlite; then |
214 |
- insinto "/usr/share/${PN}/sqlite" |
215 |
- newins src/tools.sqlite_drv/purge-3.sql purge.sql |
216 |
- fi |
217 |
- |
218 |
- insinto "${DSPAM_HOME}/txt" |
219 |
- doins txt/*.txt |
220 |
- local i |
221 |
- for i in spam nonspam; do |
222 |
- echo "Scanned and tagged with DSPAM ${PV} on Gentoo Linux as ${i} by ISP" > "${T}/msgtag.${i}" |
223 |
- doins "${T}/msgtag.${i}" |
224 |
- done |
225 |
- |
226 |
- newbin contrib/dspam_maintenance/dspam_maintenance.sh dspam_maintenance |
227 |
- exeinto /etc/cron.daily |
228 |
- newexe "${FILESDIR}/dspam.cron-r4" dspam |
229 |
- |
230 |
- insinto /etc/logrotate.d |
231 |
- newins "${FILESDIR}/dspam.logrotate" dspam |
232 |
- |
233 |
- dodoc CHANGELOG README* RELEASE.NOTES UPGRADING doc/*.txt |
234 |
- |
235 |
- # stop logrotate-3.8 from complaining |
236 |
- dodir /var/log/dspam |
237 |
- fowners dspam:dspam /var/log/dspam |
238 |
- fperms 0750 /var/log/dspam |
239 |
- |
240 |
- # Install dspamc setgid |
241 |
- fowners root:dspam /usr/bin/dspamc |
242 |
- fperms g+s /usr/bin/dspamc |
243 |
-} |
244 |
- |
245 |
-pkg_preinst() { |
246 |
- # dspam-3.10.0: config dir change, should be removed at some later point |
247 |
- if [ -d "${ROOT}/etc/mail/dspam" ]; then |
248 |
- ewarn "The configuration directory of DSPAM has been relocated from /etc/mail/dspam to ${DSPAM_CONF}." |
249 |
- if [ -h "${ROOT}${DSPAM_CONF}" ]; then |
250 |
- # symlink, this is the setup in older ebuilds |
251 |
- ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..." |
252 |
- rm "${ROOT}${DSPAM_CONF}" && mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}" |
253 |
- eend $? |
254 |
- |
255 |
- elif [ -d "${ROOT}${DSPAM_CONF}" ]; then |
256 |
- # directory and no symlink, do it manually since we cannot decide. |
257 |
- ewarn "You have both /etc/mail/dspam and ${DSPAM_CONF} directories, please delete the former." |
258 |
- |
259 |
- else |
260 |
- # nothing interesting in /etc/dspam |
261 |
- ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..." |
262 |
- mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}" |
263 |
- eend $? |
264 |
- fi |
265 |
- fi |
266 |
-} |
267 |
|
268 |
diff --git a/mail-filter/dspam/dspam-3.10.2-r3.ebuild b/mail-filter/dspam/dspam-3.10.2-r3.ebuild |
269 |
deleted file mode 100644 |
270 |
index 5343bc91d6d..00000000000 |
271 |
--- a/mail-filter/dspam/dspam-3.10.2-r3.ebuild |
272 |
+++ /dev/null |
273 |
@@ -1,223 +0,0 @@ |
274 |
-# Copyright 1999-2020 Gentoo Authors |
275 |
-# Distributed under the terms of the GNU General Public License v2 |
276 |
- |
277 |
-EAPI=7 |
278 |
- |
279 |
-inherit user |
280 |
- |
281 |
-DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter" |
282 |
-HOMEPAGE="http://dspam.sourceforge.net/" |
283 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
284 |
- |
285 |
-LICENSE="AGPL-3" |
286 |
-SLOT="0" |
287 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" |
288 |
-DRIVERS_IUSE="+hash mysql postgres sqlite" |
289 |
-SCALES_IUSE="small-scale +domain-scale large-scale" |
290 |
-IUSE="clamav daemon debug ldap static-libs syslog virtual-users user-homedirs ${DRIVERS_IUSE} ${SCALES_IUSE}" |
291 |
- |
292 |
-DEPEND=" |
293 |
- net-mail/mailbase |
294 |
- ldap? ( net-nds/openldap ) |
295 |
- mysql? ( dev-db/mysql-connector-c:0= ) |
296 |
- postgres? ( dev-db/postgresql ) |
297 |
- sqlite? ( dev-db/sqlite:3 ) |
298 |
-" |
299 |
-RDEPEND=" |
300 |
- ${DEPEND} |
301 |
- clamav? ( app-antivirus/clamav ) |
302 |
- syslog? ( virtual/logger ) |
303 |
-" |
304 |
- |
305 |
-# Demands on sane USE flags: |
306 |
-# - find out what driver to use: select at least one |
307 |
-# - if static-libs is set, only one driver may be selected |
308 |
-# - find out what scale to use: select exactly one |
309 |
-# - user-homedirs does not work with virtual-users |
310 |
-REQUIRED_USE=" |
311 |
- || ( ${DRIVERS_IUSE//+} ) |
312 |
- static-libs? ( ^^ ( ${DRIVERS_IUSE//+} ) ) |
313 |
- ^^ ( ${SCALES_IUSE//+} ) |
314 |
- virtual-users? ( !user-homedirs ) |
315 |
-" |
316 |
- |
317 |
-PATCHES=( "${FILESDIR}/${P}-mysql8-my_bool-typedef.patch" ) |
318 |
- |
319 |
-# dspam setup defaults |
320 |
-DSPAM_HOME=/var/spool/dspam |
321 |
-DSPAM_CONF=/etc/dspam |
322 |
-DSPAM_LOG=/var/log/dspam |
323 |
-DSPAM_MODE=2510 |
324 |
-DSPAM_DRIVERS= |
325 |
-DSPAM_DRIVERS_EXTRAS= |
326 |
- |
327 |
-pkg_setup() { |
328 |
- # setup storage, this sets DSPAM_DRIVERS |
329 |
- dspam_setup_storage_drivers |
330 |
- |
331 |
- # create dspam user and group |
332 |
- dspam_setup_user |
333 |
-} |
334 |
- |
335 |
-src_configure() { |
336 |
- econf \ |
337 |
- --sysconfdir=${DSPAM_CONF} \ |
338 |
- --with-dspam-home=${DSPAM_HOME} \ |
339 |
- --with-dspam-home-group=dspam \ |
340 |
- --with-dspam-mode=${DSPAM_MODE} \ |
341 |
- --with-dspam-group=dspam \ |
342 |
- --with-logdir=${DSPAM_LOG} \ |
343 |
- --enable-external-lookup \ |
344 |
- --enable-long-usernames \ |
345 |
- --enable-split-configuration \ |
346 |
- $(use_enable clamav) \ |
347 |
- $(use_enable daemon) \ |
348 |
- $(use_enable debug) \ |
349 |
- $(use_enable debug bnr-debug) \ |
350 |
- $(use_enable debug verbose-debug) \ |
351 |
- $(use_enable domain-scale) \ |
352 |
- $(use_enable large-scale) \ |
353 |
- $(use_enable static-libs static) \ |
354 |
- $(use_enable syslog) \ |
355 |
- $(use_enable user-homedirs homedir) \ |
356 |
- $(use_enable virtual-users) \ |
357 |
- --with-storage-driver=${DSPAM_DRIVERS} ${DSPAM_DRIVERS_EXTRAS} \ |
358 |
- $(use mysql || use postgres && echo "--enable-preferences-extension") \ |
359 |
- $(use syslog || echo "--with-logfile=${DSPAM_LOG}/dspam.log") |
360 |
-} |
361 |
- |
362 |
-dspam_setup_user() { |
363 |
- # DSPAM CGI web gui (www-apps/dspam-web) needs to run as a regular user |
364 |
- # under suexec in apache, so DSPAM user/group need to be regular users too |
365 |
- |
366 |
- local euid egid |
367 |
- for euid in {1000..5000} ; do |
368 |
- [ -z "$(egetent passwd ${euid})" ] && break |
369 |
- done |
370 |
- for egid in {1000..5000} ; do |
371 |
- [ -z "$(egetent group ${egid})" ] && break |
372 |
- done |
373 |
- enewgroup dspam ${egid} |
374 |
- enewuser dspam ${euid} -1 "${DSPAM_HOMEDIR}" dspam,mail |
375 |
-} |
376 |
- |
377 |
-dspam_setup_storage_drivers() { |
378 |
- # Find out which storage drivers need to be enabled, and set some |
379 |
- # variables so that src_configure can pick them up |
380 |
- |
381 |
- if use hash; then |
382 |
- DSPAM_DRIVERS+=",hash_drv" |
383 |
- fi |
384 |
- |
385 |
- if use mysql; then |
386 |
- DSPAM_DRIVERS+=",mysql_drv" |
387 |
- DSPAM_DRIVERS_EXTRAS+="--with-mysql-includes=/usr/include/mysql " |
388 |
- fi |
389 |
- |
390 |
- if use postgres; then |
391 |
- DSPAM_DRIVERS+=",pgsql_drv" |
392 |
- fi |
393 |
- |
394 |
- if use sqlite; then |
395 |
- DSPAM_DRIVERS+=",sqlite3_drv" |
396 |
- fi |
397 |
- |
398 |
- if ! use static-libs; then |
399 |
- # set the driver name twice to avoid a static build |
400 |
- DSPAM_DRIVERS+=${DSPAM_DRIVERS} |
401 |
- fi |
402 |
- |
403 |
- # remove first comma separator |
404 |
- DSPAM_DRIVERS=${DSPAM_DRIVERS:1} |
405 |
- einfo "Building with drivers: ${DSPAM_DRIVERS}" |
406 |
- #echo DSPAM_DRIVERS_EXTRAS=$DSPAM_DRIVERS_EXTRAS |
407 |
-} |
408 |
- |
409 |
-src_install() { |
410 |
- default |
411 |
- |
412 |
- if use daemon; then |
413 |
- newinitd "${FILESDIR}/dspam.initd" dspam |
414 |
- newconfd "${FILESDIR}/dspam.confd" dspam |
415 |
- fi |
416 |
- |
417 |
- if use mysql; then |
418 |
- insinto "/usr/share/${PN}/mysql" |
419 |
- |
420 |
- local files="mysql_objects-4.1.sql mysql_objects-space.sql mysql_objects-speed.sql purge-4.1.sql purge.sql" |
421 |
- if use virtual-users; then |
422 |
- files+=" virtual_user_aliases.sql virtual_users.sql" |
423 |
- fi |
424 |
- |
425 |
- for file in $files; do |
426 |
- doins src/tools.mysql_drv/${file} |
427 |
- done |
428 |
- fi |
429 |
- |
430 |
- if use postgres; then |
431 |
- insinto "/usr/share/${PN}/pgsql" |
432 |
- |
433 |
- local files="pgsql_objects.sql purge-pe.sql purge.sql" |
434 |
- if use virtual-users; then |
435 |
- files+=" virtual_users.sql" |
436 |
- fi |
437 |
- |
438 |
- for file in $files; do |
439 |
- doins src/tools.pgsql_drv/${file} |
440 |
- done |
441 |
- fi |
442 |
- |
443 |
- if use sqlite; then |
444 |
- insinto "/usr/share/${PN}/sqlite" |
445 |
- newins src/tools.sqlite_drv/purge-3.sql purge.sql |
446 |
- fi |
447 |
- |
448 |
- insinto "${DSPAM_HOME}/txt" |
449 |
- doins txt/*.txt |
450 |
- local i |
451 |
- for i in spam nonspam; do |
452 |
- echo "Scanned and tagged with DSPAM ${PV} on Gentoo Linux as ${i} by ISP" > "${T}/msgtag.${i}" |
453 |
- doins "${T}/msgtag.${i}" |
454 |
- done |
455 |
- |
456 |
- newbin contrib/dspam_maintenance/dspam_maintenance.sh dspam_maintenance |
457 |
- exeinto /etc/cron.daily |
458 |
- newexe "${FILESDIR}/dspam.cron-r4" dspam |
459 |
- |
460 |
- insinto /etc/logrotate.d |
461 |
- newins "${FILESDIR}/dspam.logrotate" dspam |
462 |
- |
463 |
- dodoc CHANGELOG README* RELEASE.NOTES UPGRADING doc/*.txt |
464 |
- |
465 |
- # stop logrotate-3.8 from complaining |
466 |
- dodir /var/log/dspam |
467 |
- fowners dspam:dspam /var/log/dspam |
468 |
- fperms 0750 /var/log/dspam |
469 |
- |
470 |
- # Install dspamc setgid |
471 |
- fowners root:dspam /usr/bin/dspamc |
472 |
- fperms g+s /usr/bin/dspamc |
473 |
-} |
474 |
- |
475 |
-pkg_preinst() { |
476 |
- # dspam-3.10.0: config dir change, should be removed at some later point |
477 |
- if [ -d "${ROOT}/etc/mail/dspam" ]; then |
478 |
- ewarn "The configuration directory of DSPAM has been relocated from /etc/mail/dspam to ${DSPAM_CONF}." |
479 |
- if [ -h "${ROOT}${DSPAM_CONF}" ]; then |
480 |
- # symlink, this is the setup in older ebuilds |
481 |
- ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..." |
482 |
- rm "${ROOT}${DSPAM_CONF}" && mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}" |
483 |
- eend $? |
484 |
- |
485 |
- elif [ -d "${ROOT}${DSPAM_CONF}" ]; then |
486 |
- # directory and no symlink, do it manually since we cannot decide. |
487 |
- ewarn "You have both /etc/mail/dspam and ${DSPAM_CONF} directories, please delete the former." |
488 |
- |
489 |
- else |
490 |
- # nothing interesting in /etc/dspam |
491 |
- ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..." |
492 |
- mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}" |
493 |
- eend $? |
494 |
- fi |
495 |
- fi |
496 |
-} |
497 |
|
498 |
diff --git a/mail-filter/dspam/files/dspam-3.10.2-mysql8-my_bool-typedef.patch b/mail-filter/dspam/files/dspam-3.10.2-mysql8-my_bool-typedef.patch |
499 |
deleted file mode 100644 |
500 |
index 8edafbdf0da..00000000000 |
501 |
--- a/mail-filter/dspam/files/dspam-3.10.2-mysql8-my_bool-typedef.patch |
502 |
+++ /dev/null |
503 |
@@ -1,13 +0,0 @@ |
504 |
---- a/src/mysql_drv.c 2020-07-07 10:40:33.871152228 -0400 |
505 |
-+++ b/src/mysql_drv.c 2020-07-07 10:43:16.187818893 -0400 |
506 |
-@@ -35,6 +35,10 @@ |
507 |
- #include <fcntl.h> |
508 |
- #include <signal.h> |
509 |
- #include <mysql.h> |
510 |
-+#if defined(LIBMYSQL_VERSION_ID) && (LIBMYSQL_VERSION_ID >= 80000) |
511 |
-+ typedef bool my_bool; |
512 |
-+#endif |
513 |
-+ |
514 |
- #include <limits.h> |
515 |
- |
516 |
- /* Work around broken limits.h on debian etch (and possibly others?) */ |
517 |
|
518 |
diff --git a/mail-filter/dspam/files/dspam.confd b/mail-filter/dspam/files/dspam.confd |
519 |
deleted file mode 100644 |
520 |
index 75e0d4bda7d..00000000000 |
521 |
--- a/mail-filter/dspam/files/dspam.confd |
522 |
+++ /dev/null |
523 |
@@ -1,7 +0,0 @@ |
524 |
-# Change this to the user:group you want to run the dspam daemon as. |
525 |
-# If you need dspam to switch uids, this is root:root. |
526 |
-# If you use virtual users and deliver via LMTP, this can be nonprivileged such as dspam:dspam. |
527 |
-DAEMON_USER_GROUP="root:root" |
528 |
- |
529 |
-# Pid file |
530 |
-PID_FILE="/var/run/dspam/dspam.pid" |
531 |
|
532 |
diff --git a/mail-filter/dspam/files/dspam.cron-r4 b/mail-filter/dspam/files/dspam.cron-r4 |
533 |
deleted file mode 100644 |
534 |
index edf97dce541..00000000000 |
535 |
--- a/mail-filter/dspam/files/dspam.cron-r4 |
536 |
+++ /dev/null |
537 |
@@ -1,5 +0,0 @@ |
538 |
-#!/bin/sh |
539 |
- |
540 |
-# See dspam_maintenance --help for a list additional parameters |
541 |
- |
542 |
-/usr/bin/dspam_maintenance --verbose --purgescriptdir=/usr/share/dspam 1> /dev/null |
543 |
|
544 |
diff --git a/mail-filter/dspam/files/dspam.initd b/mail-filter/dspam/files/dspam.initd |
545 |
deleted file mode 100644 |
546 |
index e452630ab94..00000000000 |
547 |
--- a/mail-filter/dspam/files/dspam.initd |
548 |
+++ /dev/null |
549 |
@@ -1,44 +0,0 @@ |
550 |
-#!/sbin/openrc-run |
551 |
-# Copyright 1999-2011 Gentoo Foundation |
552 |
-# Distributed under the terms of the GNU General Public License v2 |
553 |
- |
554 |
-extra_started_commands="reload" |
555 |
-PIDFILE=${PID_FILE:-/var/run/dspam/dspam.pid} |
556 |
- |
557 |
-depend() { |
558 |
- use logger |
559 |
- before mta |
560 |
- after postgresql mysql ldap |
561 |
-} |
562 |
- |
563 |
-checkconfig() { |
564 |
- local PIDDIR |
565 |
- PIDDIR=${PIDFILE%/*} |
566 |
- if [ ! -d "${PIDDIR:-/var/run/dspam}" ]; then |
567 |
- checkpath -q -d -o dspam:dspam -m 0755 "${PIDDIR}" || return 1 |
568 |
- fi |
569 |
-} |
570 |
- |
571 |
-start() { |
572 |
- checkconfig || return 1 |
573 |
- ebegin "Starting dspam" |
574 |
- start-stop-daemon --start --quiet \ |
575 |
- --user ${DAEMON_USER_GROUP} \ |
576 |
- --pidfile ${PIDFILE} \ |
577 |
- --exec /usr/bin/dspam -- --daemon |
578 |
- eend $? |
579 |
-} |
580 |
- |
581 |
-stop() { |
582 |
- ebegin "Stopping dspam" |
583 |
- start-stop-daemon --stop \ |
584 |
- --pidfile ${PIDFILE} \ |
585 |
- --exec /usr/bin/dspam |
586 |
- eend $? |
587 |
-} |
588 |
- |
589 |
-reload() { |
590 |
- ebegin "Reloading dspam" |
591 |
- start-stop-daemon --signal SIGHUP /usr/bin/dspam |
592 |
- eend $? |
593 |
-} |
594 |
|
595 |
diff --git a/mail-filter/dspam/files/dspam.logrotate b/mail-filter/dspam/files/dspam.logrotate |
596 |
deleted file mode 100644 |
597 |
index f5e13067cfc..00000000000 |
598 |
--- a/mail-filter/dspam/files/dspam.logrotate |
599 |
+++ /dev/null |
600 |
@@ -1,10 +0,0 @@ |
601 |
-/var/log/dspam/bnr.log |
602 |
-/var/log/dspam/dspam.debug |
603 |
-/var/log/dspam/dspam.log |
604 |
-/var/log/dspam/dspam.messages |
605 |
-/var/log/dspam/sql.errors { |
606 |
- weekly |
607 |
- compress |
608 |
- missingok |
609 |
- copytruncate |
610 |
-} |
611 |
|
612 |
diff --git a/mail-filter/dspam/metadata.xml b/mail-filter/dspam/metadata.xml |
613 |
deleted file mode 100644 |
614 |
index 63838d86ccb..00000000000 |
615 |
--- a/mail-filter/dspam/metadata.xml |
616 |
+++ /dev/null |
617 |
@@ -1,35 +0,0 @@ |
618 |
-<?xml version="1.0" encoding="UTF-8"?> |
619 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
620 |
-<pkgmetadata> |
621 |
- <!-- maintainer-needed --> |
622 |
- <longdescription>A statistical-algorithmic hybrid anti-spam filter</longdescription> |
623 |
- <use> |
624 |
- <flag name="daemon"> |
625 |
- Enable support for DSPAM to run in --daemon mode |
626 |
- </flag> |
627 |
- <flag name="debug"> |
628 |
- Enable debugging support (don't enable this unless something needs testing!) |
629 |
- </flag> |
630 |
- <flag name="user-homedirs"> |
631 |
- Build with user homedir support |
632 |
- </flag> |
633 |
- <flag name="virtual-users"> |
634 |
- Build with virtual-users support |
635 |
- </flag> |
636 |
- <flag name="small-scale"> |
637 |
- Build for small scale setups - puts data to $HOME/data/user |
638 |
- </flag> |
639 |
- <flag name="domain-scale"> |
640 |
- Build for domain scale setups - puts data to $HOME/data/domain.com/user |
641 |
- </flag> |
642 |
- <flag name="large-scale"> |
643 |
- Build for large scale setups - puts data to $HOME/data/u/s/user |
644 |
- </flag> |
645 |
- <flag name="hash"> |
646 |
- Enable support for the file-orientated hash driver |
647 |
- </flag> |
648 |
- </use> |
649 |
- <upstream> |
650 |
- <remote-id type="sourceforge">dspam</remote-id> |
651 |
- </upstream> |
652 |
-</pkgmetadata> |
653 |
|
654 |
diff --git a/profiles/package.mask b/profiles/package.mask |
655 |
index 1e6a9053567..4b9500f859e 100644 |
656 |
--- a/profiles/package.mask |
657 |
+++ b/profiles/package.mask |
658 |
@@ -623,7 +623,6 @@ dev-haskell/hans |
659 |
# bug #520844, bug #665910, bug #626474, |
660 |
# bug #490322, bug #692436, bug #707274, |
661 |
# bug #713404. bug #680486, bug #459724. |
662 |
-mail-filter/dspam |
663 |
www-apps/dspam-web |
664 |
|
665 |
# Mikle Kolyada <zlogene@g.o> (2020-08-02) |