Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/files/
Date: Tue, 04 Sep 2018 22:32:23
Message-Id: 1536099881.a560f07d06e12d9bb6c84c79e01bd9fff9a0008d.monsieurp@gentoo
1 commit: a560f07d06e12d9bb6c84c79e01bd9fff9a0008d
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Aug 31 18:11:57 2018 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 4 22:24:41 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a560f07d
7
8 mail-filter/spamassassin: remove unused files.
9
10 Closes: https://github.com/gentoo/gentoo/pull/9744
11
12 mail-filter/spamassassin/files/3.4.1-spamd.conf | 25 ----------
13 mail-filter/spamassassin/files/3.4.1-spamd.init | 55 ----------------------
14 .../spamassassin/files/spamassassin.service-r1 | 15 ------
15 .../spamassassin/files/spamassassin.service.conf | 10 ----
16 4 files changed, 105 deletions(-)
17
18 diff --git a/mail-filter/spamassassin/files/3.4.1-spamd.conf b/mail-filter/spamassassin/files/3.4.1-spamd.conf
19 deleted file mode 100644
20 index 0cb7cbbfc47..00000000000
21 --- a/mail-filter/spamassassin/files/3.4.1-spamd.conf
22 +++ /dev/null
23 @@ -1,25 +0,0 @@
24 -# Config file for /etc/init.d/spamd
25 -#
26 -# ***WARNING***
27 -#
28 -# spamd was not designed to listed to an untrusted network. spamd
29 -# is vulnerable to DoS attacks (and eternal doom) if used to listen
30 -# to an untrusted network.
31 -#
32 -# ***WARNING***
33 -#
34 -
35 -# Additional options to pass to the spamd daemon. The spamd(1) man
36 -# page explains the available options. If you choose to listen on a
37 -# non-default interface, you will need to use OpenRC's "rc_need"
38 -# mechanism to ensure that your interface comes up before spamd
39 -# starts. The openrc-run(8) man page describes rc_need.
40 -SPAMD_OPTS="--max-children=5 --create-prefs --helper-home-dir"
41 -
42 -# Sets the 'nice' level of the spamd process.
43 -SPAMD_NICELEVEL=0
44 -
45 -# How long (in seconds) should we wait for spamd to stop after we've
46 -# asked it to? After this amount of time, if spamd is still running,
47 -# we will assume that it has failed to stop.
48 -SPAMD_TIMEOUT=15
49
50 diff --git a/mail-filter/spamassassin/files/3.4.1-spamd.init b/mail-filter/spamassassin/files/3.4.1-spamd.init
51 deleted file mode 100644
52 index cbe91e93231..00000000000
53 --- a/mail-filter/spamassassin/files/3.4.1-spamd.init
54 +++ /dev/null
55 @@ -1,55 +0,0 @@
56 -#!/sbin/openrc-run
57 -# Copyright 1999-2016 Gentoo Foundation
58 -# Distributed under the terms of the GNU General Public License v2
59 -
60 -PIDDIR=/run/spamd
61 -PIDFILE=${PIDDIR}/spamd.pid
62 -
63 -extra_started_commands="reload"
64 -
65 -depend() {
66 - before mta
67 - use logger
68 -@USEPOSTGRES@ use postgresql
69 -@USEMYSQL@ use mysql
70 -}
71 -
72 -start() {
73 - ebegin "Starting spamd"
74 -
75 - # Ensure that the PID file's directory exists.
76 - checkpath --directory "${PIDDIR}"
77 -
78 - # Reloading spamd causes its PID to change, so we track it by
79 - # name instead.
80 - start-stop-daemon --start --quiet \
81 - --name spamd \
82 - --nicelevel ${SPAMD_NICELEVEL} \
83 - --pidfile ${PIDFILE} \
84 - --exec /usr/sbin/spamd -- \
85 - --daemonize \
86 - --pidfile=${PIDFILE} \
87 - ${SPAMD_OPTS}
88 -
89 - retval=$?
90 -
91 - eend ${retval} "Failed to start spamd"
92 -}
93 -
94 -stop() {
95 - ebegin "Stopping spamd"
96 - # Retry after SPAMD_TIMEOUT seconds because spamd can take a
97 - # while to kill off all of its children. This was bug 322025.
98 - start-stop-daemon --stop \
99 - --quiet \
100 - --retry ${SPAMD_TIMEOUT} \
101 - --pidfile ${PIDFILE}
102 - eend $? "Failed to stop spamd"
103 -}
104 -
105 -reload() {
106 - ebegin "Reloading configuration"
107 - # Warning: causes the PID of the spamd process to change.
108 - start-stop-daemon --signal HUP --quiet --pidfile ${PIDFILE}
109 - eend $?
110 -}
111
112 diff --git a/mail-filter/spamassassin/files/spamassassin.service-r1 b/mail-filter/spamassassin/files/spamassassin.service-r1
113 deleted file mode 100644
114 index 3d145817f12..00000000000
115 --- a/mail-filter/spamassassin/files/spamassassin.service-r1
116 +++ /dev/null
117 @@ -1,15 +0,0 @@
118 -[Unit]
119 -Description=Spamassassin daemon
120 -After=syslog.target network.target
121 -
122 -[Service]
123 -Type=forking
124 -PIDFile=/run/spamd.pid
125 -ExecStart=/usr/sbin/spamd -d --pidfile /run/spamd.pid -m 5 $SPAMD_OPTS
126 -ExecReload=/bin/kill -HUP $MAINPID
127 -StandardOutput=syslog
128 -StandardError=syslog
129 -Restart=always
130 -
131 -[Install]
132 -WantedBy=multi-user.target
133
134 diff --git a/mail-filter/spamassassin/files/spamassassin.service.conf b/mail-filter/spamassassin/files/spamassassin.service.conf
135 deleted file mode 100644
136 index 9fc1f629452..00000000000
137 --- a/mail-filter/spamassassin/files/spamassassin.service.conf
138 +++ /dev/null
139 @@ -1,10 +0,0 @@
140 -# Here you can append some options to spamd process, please
141 -# double check that you make needed changes in service file if
142 -# you use options requiring it
143 -# Some options:
144 -#
145 -# -c to create a per user configuration file
146 -# -H [dir] to switch home dirs for helper apps, dir optional
147 -
148 -[Service]
149 -Environment="SPAMD_OPTS= -c -H"