[gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/files/

[gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/files/

[Michael Orlitzky]

commit:     4acf0f5abd37c33197f7ccccac72757ee28962d7
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 23:33:17 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 00:43:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4acf0f5a

mail-filter/spamassassin: remove unused files/spamassassin.service.

Package-Manager: portage-2.2.28

 mail-filter/spamassassin/files/spamassassin.service | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mail-filter/spamassassin/files/spamassassin.service b/mail-filter/spamassassin/files/spamassassin.service
deleted file mode 100644
index 5c9e9ed..0000000
--- a/mail-filter/spamassassin/files/spamassassin.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Spamassassin daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/spamd.pid
-ExecStart=/usr/sbin/spamd -d --pidfile /var/run/spamd.pid -m 5 -c -H
-StandardOutput=syslog
-StandardError=syslog
-Restart=always
-
-[Install]
-WantedBy=multi-user.target

[gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/files/

[Michael Orlitzky]

commit:     db54891dc68ce65539310fefa703f82d5ce0bb2e
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 14:49:57 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 14:49:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db54891d

mail-filter/spamassassin: remove redundant systemd service file lines.

This commit drops the StandardOutput=syslog and StandardError=syslog
lines from the new systemd service file. The defaults for those two
options are now "journal" which will eventually hit syslog anyway if
the user so desires. Consequently, we drop After=syslog.target too.

Thanks to grawity on Freenode for the tip.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 mail-filter/spamassassin/files/spamassassin.service-r2 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mail-filter/spamassassin/files/spamassassin.service-r2 b/mail-filter/spamassassin/files/spamassassin.service-r2
index ecb9ba39216..80320571784 100644
--- a/mail-filter/spamassassin/files/spamassassin.service-r2
+++ b/mail-filter/spamassassin/files/spamassassin.service-r2
@@ -1,14 +1,12 @@
 [Unit]
 Description=Spamassassin daemon
-After=syslog.target network.target
+After=network.target
 
 [Service]
 ExecStart=/usr/sbin/spamd $SPAMD_OPTS
 ExecReload=/bin/kill -HUP $MAINPID
 User=spamd
 Group=spamd
-StandardOutput=syslog
-StandardError=syslog
 
 [Install]
 WantedBy=multi-user.target

[gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/files/

[Michael Orlitzky]

commit:     bbce59d3a81609bfbc1048656b005fc84a32c142
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Sep  6 16:35:00 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Sep  6 17:26:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbce59d3

mail-filter/spamassassin: remove unused files

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/spamassassin/files/3.0.0-spamd.conf | 46 -------------------------
 mail-filter/spamassassin/files/3.3.1-spamd.init | 45 ------------------------
 2 files changed, 91 deletions(-)

diff --git a/mail-filter/spamassassin/files/3.0.0-spamd.conf b/mail-filter/spamassassin/files/3.0.0-spamd.conf
deleted file mode 100644
index b3cd1acd8fa..00000000000
--- a/mail-filter/spamassassin/files/3.0.0-spamd.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# Config file for /etc/init.d/spamd
-
-
-# ***WARNING***
-# spamd was not designed to listed to an untrusted network. spamd
-# is vulnerable to DoS attacks (and eternal doom) if used to listen
-# to an untrusted network.
-#
-
-
-# Some options:
-#
-# -c          to create a per user configuration file
-# -H [dir]    to switch home dirs for helper apps, dir optional
-# -i [ip]     to listen on the specified IP,
-#             127.0.0.1 if omitted,
-#             0.0.0.0 (ie. all) if given without value;
-#             must be used in combination with -A to actually allow
-#             connections from anybody but localhost
-# -m limit    to set the number of children, default 5
-# -u user     the user to run spamd as
-# -L          if you want to run no net tests
-#
-# for more help look in man spamd
-#
-# Note: if you plan on using the -u flag to spamd you will need to
-# make sure the location of the PID file is writable by that user.
-# This can be done by making the directory /var/run/spamd and
-# changing the owner to the UID that runs spamd.  You will then
-# need to edit $pidfile in /etc/init.d/spamd. This should fix the
-# problem with stop/restart in the init scripts.
-#
-# See http://bugs.gentoo.org/show_bug.cgi?id=70124 for a full
-# explanation.
-
-SPAMD_OPTS="-m 5 -c -H"
-
-# spamd stores its pid in this file. If you use the -u option to
-# run spamd under another user, you might need to adjust it.
-
-PIDFILE="/run/spamd.pid"
-
-# SPAMD_NICELEVEL lets you set the 'nice'ness of the running 
-# spamd process
-
-# SPAMD_NICELEVEL=5

diff --git a/mail-filter/spamassassin/files/3.3.1-spamd.init b/mail-filter/spamassassin/files/3.3.1-spamd.init
deleted file mode 100644
index 3f5fd1591af..00000000000
--- a/mail-filter/spamassassin/files/3.3.1-spamd.init
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# NB: Config is in /etc/conf.d/spamd
-
-# Provide a default location if they haven't in /etc/conf.d/spamd
-PIDFILE=${PIDFILE:-/run/spamd.pid}
-
-extra_started_commands="reload"
-
-depend() {
-	need net
-	before mta
-	use logger
-@USEPOSTGRES@	use postgresql
-@USEMYSQL@	use mysql
-}
-
-start() {
-	ebegin "Starting spamd"
-	start-stop-daemon --start --quiet \
-		--name spamd \
-		--nicelevel ${SPAMD_NICELEVEL:-0} \
-		--pidfile ${PIDFILE} \
-		--exec /usr/sbin/spamd -- -d -r ${PIDFILE} \
-		${SPAMD_OPTS}
-	retval=$?
-	if ! [ -f "${PIDFILE}" ]; then
-		sleep 1
-	fi
-	eend ${retval} "Failed to start spamd"
-}
-
-stop() {
-	ebegin "Stopping spamd"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-	eend $? "Failed to stop spamd"
-}
-
-reload() {
-	ebegin "Reloading configuration"
-	start-stop-daemon --signal HUP --quiet --pidfile ${PIDFILE}
-	eend $?
-}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/files/

[Michael Orlitzky]

commit:     0777d57a9a3afc953c8b4b6c023d660bbb0ca12d
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Nov 28 19:40:17 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Nov 28 20:01:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0777d57a

mail-filter/spamassassin: remove unused files

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 mail-filter/spamassassin/files/3.4.1-spamd.init-r1 | 34 ----------------------
 .../spamassassin/files/spamassassin.service-r3     | 10 -------
 .../files/spamassassin.service.conf-r1             |  2 --
 3 files changed, 46 deletions(-)

diff --git a/mail-filter/spamassassin/files/3.4.1-spamd.init-r1 b/mail-filter/spamassassin/files/3.4.1-spamd.init-r1
deleted file mode 100755
index 5f981d8e2c3..00000000000
--- a/mail-filter/spamassassin/files/3.4.1-spamd.init-r1
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/spamd"
-pidfile="/run/spamd.pid"
-command_args="--username=spamd
-              --groupname=spamd
-              --pidfile=${pidfile}
-              ${SPAMD_OPTS}"
-command_args_background="--daemonize"
-
-: ${SPAMD_NICELEVEL:=0}
-start_stop_daemon_args="--nicelevel ${SPAMD_NICELEVEL}"
-
-# Retry after SPAMD_TIMEOUT seconds because spamd can take a
-# while to kill off all of its children. This was bug 322025.
-: ${SPAMD_TIMEOUT:=15}
-retry="${SPAMD_TIMEOUT}"
-
-extra_started_commands="reload"
-
-depend() {
-    before mta
-    use logger mysql postgres
-}
-
-reload() {
-	ebegin "Reloading configuration"
-	# Warning: reload causes the PID of the spamd process to
-	# change, but spamd does update its PID file afterwards.
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}

diff --git a/mail-filter/spamassassin/files/spamassassin.service-r3 b/mail-filter/spamassassin/files/spamassassin.service-r3
deleted file mode 100644
index 6bc74c46cc5..00000000000
--- a/mail-filter/spamassassin/files/spamassassin.service-r3
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Spamassassin daemon
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/spamd --username=spamd --groupname=spamd $SPAMD_OPTS
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target

diff --git a/mail-filter/spamassassin/files/spamassassin.service.conf-r1 b/mail-filter/spamassassin/files/spamassassin.service.conf-r1
deleted file mode 100644
index 75918e824f2..00000000000
--- a/mail-filter/spamassassin/files/spamassassin.service.conf-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-Environment="SPAMD_OPTS=--max-children=5 --create-prefs --helper-home-dir"

[gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/files/

[Patrice Clement]

commit:     a560f07d06e12d9bb6c84c79e01bd9fff9a0008d
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Aug 31 18:11:57 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Sep  4 22:24:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a560f07d

mail-filter/spamassassin: remove unused files.

Closes: https://github.com/gentoo/gentoo/pull/9744

 mail-filter/spamassassin/files/3.4.1-spamd.conf    | 25 ----------
 mail-filter/spamassassin/files/3.4.1-spamd.init    | 55 ----------------------
 .../spamassassin/files/spamassassin.service-r1     | 15 ------
 .../spamassassin/files/spamassassin.service.conf   | 10 ----
 4 files changed, 105 deletions(-)

diff --git a/mail-filter/spamassassin/files/3.4.1-spamd.conf b/mail-filter/spamassassin/files/3.4.1-spamd.conf
deleted file mode 100644
index 0cb7cbbfc47..00000000000
--- a/mail-filter/spamassassin/files/3.4.1-spamd.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Config file for /etc/init.d/spamd
-#
-# ***WARNING***
-#
-# spamd was not designed to listed to an untrusted network. spamd
-# is vulnerable to DoS attacks (and eternal doom) if used to listen
-# to an untrusted network.
-#
-# ***WARNING***
-#
-
-# Additional options to pass to the spamd daemon. The spamd(1) man
-# page explains the available options. If you choose to listen on a
-# non-default interface, you will need to use OpenRC's "rc_need"
-# mechanism to ensure that your interface comes up before spamd
-# starts. The openrc-run(8) man page describes rc_need.
-SPAMD_OPTS="--max-children=5 --create-prefs --helper-home-dir"
-
-# Sets the 'nice' level of the spamd process.
-SPAMD_NICELEVEL=0
-
-# How long (in seconds) should we wait for spamd to stop after we've
-# asked it to? After this amount of time, if spamd is still running,
-# we will assume that it has failed to stop.
-SPAMD_TIMEOUT=15

diff --git a/mail-filter/spamassassin/files/3.4.1-spamd.init b/mail-filter/spamassassin/files/3.4.1-spamd.init
deleted file mode 100644
index cbe91e93231..00000000000
--- a/mail-filter/spamassassin/files/3.4.1-spamd.init
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PIDDIR=/run/spamd
-PIDFILE=${PIDDIR}/spamd.pid
-
-extra_started_commands="reload"
-
-depend() {
-	before mta
-	use logger
-@USEPOSTGRES@	use postgresql
-@USEMYSQL@	use mysql
-}
-
-start() {
-	ebegin "Starting spamd"
-
-	# Ensure that the PID file's directory exists.
-	checkpath --directory "${PIDDIR}"
-
-	# Reloading spamd causes its PID to change, so we track it by
-	# name instead.
-	start-stop-daemon --start --quiet \
-		--name spamd \
-		--nicelevel ${SPAMD_NICELEVEL} \
-		--pidfile ${PIDFILE} \
-		--exec /usr/sbin/spamd -- \
-			--daemonize \
-			--pidfile=${PIDFILE} \
-			${SPAMD_OPTS}
-
-	retval=$?
-
-	eend ${retval} "Failed to start spamd"
-}
-
-stop() {
-	ebegin "Stopping spamd"
-	# Retry after SPAMD_TIMEOUT seconds because spamd can take a
-	# while to kill off all of its children. This was bug 322025.
-	start-stop-daemon --stop \
-			  --quiet \
-			  --retry ${SPAMD_TIMEOUT} \
-			  --pidfile ${PIDFILE}
-	eend $? "Failed to stop spamd"
-}
-
-reload() {
-	ebegin "Reloading configuration"
-	# Warning: causes the PID of the spamd process to change.
-	start-stop-daemon --signal HUP --quiet --pidfile ${PIDFILE}
-	eend $?
-}

diff --git a/mail-filter/spamassassin/files/spamassassin.service-r1 b/mail-filter/spamassassin/files/spamassassin.service-r1
deleted file mode 100644
index 3d145817f12..00000000000
--- a/mail-filter/spamassassin/files/spamassassin.service-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Spamassassin daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/spamd.pid
-ExecStart=/usr/sbin/spamd -d --pidfile /run/spamd.pid -m 5 $SPAMD_OPTS
-ExecReload=/bin/kill -HUP $MAINPID
-StandardOutput=syslog
-StandardError=syslog
-Restart=always
-
-[Install]
-WantedBy=multi-user.target

diff --git a/mail-filter/spamassassin/files/spamassassin.service.conf b/mail-filter/spamassassin/files/spamassassin.service.conf
deleted file mode 100644
index 9fc1f629452..00000000000
--- a/mail-filter/spamassassin/files/spamassassin.service.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Here you can append some options to spamd process, please
-# double check that you make needed changes in service file if
-# you use options requiring it
-# Some options:
-#
-# -c          to create a per user configuration file
-# -H [dir]    to switch home dirs for helper apps, dir optional
-
-[Service]
-Environment="SPAMD_OPTS= -c -H"

[gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/files/

[Patrice Clement]

commit:     c8dbdb1e60b3d6ce7a8e70e7092cff4af99b1ee6
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jan 13 14:03:12 2019 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 22:50:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8dbdb1e

mail-filter/spamassassin: remove unused file.

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10822
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 mail-filter/spamassassin/files/3.4.1-spamd.init-r2 | 38 ----------------------
 1 file changed, 38 deletions(-)

diff --git a/mail-filter/spamassassin/files/3.4.1-spamd.init-r2 b/mail-filter/spamassassin/files/3.4.1-spamd.init-r2
deleted file mode 100644
index c704782f3a4..00000000000
--- a/mail-filter/spamassassin/files/3.4.1-spamd.init-r2
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/spamd"
-pidfile="/run/spamd.pid"
-command_args="--pidfile=${pidfile} ${SPAMD_OPTS}"
-command_args_background="--daemonize"
-
-if ! [ "${SPAMD_RUN_AS_ROOT}" = "true" ]; then
-    # Passing --username=root to spamd kills it, so if SPAMD_RUN_AS_ROOT
-    # is true, then we want to pass no user/group command args at all.
-    # Any value other than "true" gets the default user/group of "spamd".
-    command_args="${command_args} --username=spamd --groupname=spamd"
-fi
-
-: ${SPAMD_NICELEVEL:=0}
-start_stop_daemon_args="--nicelevel ${SPAMD_NICELEVEL}"
-
-# Retry after SPAMD_TIMEOUT seconds because spamd can take a
-# while to kill off all of its children. This was bug 322025.
-: ${SPAMD_TIMEOUT:=15}
-retry="${SPAMD_TIMEOUT}"
-
-extra_started_commands="reload"
-
-depend() {
-    before mta
-    use logger mysql postgres
-}
-
-reload() {
-	ebegin "Reloading configuration"
-	# Warning: reload causes the PID of the spamd process to
-	# change, but spamd does update its PID file afterwards.
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}

[gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/files/

[Joonas Niilola]

commit:     bef992729dfdbf22bd07ea238370a2a3b8a7f0bc
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 11:47:49 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 11:47:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bef99272

mail-filter/spamassassin: add spamassassin.service.conf-r2 back

 - accidentally deleted with previous commit,
   d04c5d81f9165702939ffcaf1dda981b8c36d711

Closes: https://bugs.gentoo.org/712796
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 mail-filter/spamassassin/files/spamassassin.service.conf-r2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mail-filter/spamassassin/files/spamassassin.service.conf-r2 b/mail-filter/spamassassin/files/spamassassin.service.conf-r2
new file mode 100644
index 00000000000..442dde44e07
--- /dev/null
+++ b/mail-filter/spamassassin/files/spamassassin.service.conf-r2
@@ -0,0 +1,2 @@
+[Service]
+Environment="SPAMD_OPTS=--username=spamd --groupname=spamd --max-children=5 --create-prefs --helper-home-dir"

[gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/files/

[Sam James]

commit:     5d171c2f33400acf8517e5ddbf0ad9e53bf8db25
Author:     Hank Leininger <hlein <AT> korelogic <DOT> com>
AuthorDate: Sun Jun 27 18:15:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 29 04:12:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d171c2f

mail-filter/spamassassin: Fixed command -v usage

command -v writes to stdout, not stderr. As it happens this whole
script is >/dev/null, so this instance is Mostly Harmless - unless
someone copies it as an example of what to do.

Signed-off-by: Hank Leininger <hlein <AT> korelogic.com>
Bug: https://bugs.gentoo.org/798933
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/21448
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron b/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron
index 7c6990b847c..edac381b5de 100644
--- a/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron
+++ b/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron
@@ -19,7 +19,7 @@ if (( $? == 0 || $? == 3 )); then
 
     # Do you run spamd or amavisd? Both daemons need to be reloaded
     # in order to pick up the newly-updated rules.
-    if command -v rc-service 2>/dev/null; then
+    if command -v rc-service >/dev/null; then
         # OpenRC is installed. These "status" checks should succeed
         # only when the daemon is running under OpenRC. We redirect
         # stderr to hide the lecture that OpenRC gives you if you
@@ -28,7 +28,7 @@ if (( $? == 0 || $? == 3 )); then
         rc-service amavisd status 2>/dev/null && rc-service amavisd reload
     fi
 
-    if command -v systemctl 2>/dev/null; then
+    if command -v systemctl >/dev/null; then
         # The systemctl (systemd) executable is installed, so try to
         # use it to restart spamd and amavisd. These are safe to run
         # if systemd is installed but not in use.  The is-active

[gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/files/

[Joonas Niilola]

commit:     8cbc788fa83b225e7fd72f38b248a50a1e21e616
Author:     Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift <DOT> com>
AuthorDate: Fri Nov 24 18:19:30 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 08:48:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cbc788f

mail-filter/spamassassin: Fix script output when amavisd is disabled

Because bash scripts exit with the status of the last command. If systemctl
is installed but amavisd is not active the script returns with the value 4.

This causes cron to send an email.

Switching from "&&" to an if fixes this.

Signed-off-by: Philippe Chaintreuil <gentoo_bugs_peep <AT> parallaxshift.com>
Closes: https://bugs.gentoo.org/681872
Closes: https://github.com/gentoo/gentoo/pull/33969
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron b/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron
index edac381b5de4..37c04f5b6ad8 100644
--- a/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron
+++ b/mail-filter/spamassassin/files/update-spamassassin-rules-r1.cron
@@ -35,7 +35,8 @@ if (( $? == 0 || $? == 3 )); then
 	# check is to keep systemctl from outputting warnings if
 	# amavisd is not installed (bug #681872).
         systemctl try-restart spamassassin
-        systemctl is-active --quiet amavisd \
-            && systemctl try-reload-or-restart amavisd
+	if ( systemctl is-active --quiet amavisd ); then
+            systemctl try-reload-or-restart amavisd
+	fi
     fi
 fi