From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4706E138359 for ; Wed, 23 Sep 2020 03:34:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7A7CE0863; Wed, 23 Sep 2020 03:34:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 90D62E0858 for ; Wed, 23 Sep 2020 03:34:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E1AA8340DE7 for ; Wed, 23 Sep 2020 03:34:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CA1D35F for ; Wed, 23 Sep 2020 03:34:47 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1600831404.76622421052176c051df0c19a518d6c064aa5e5e.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-antivirus/clamav/files/, app-antivirus/clamav/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-antivirus/clamav/clamav-0.103.0.ebuild app-antivirus/clamav/files/clamav-milter.logrotate app-antivirus/clamav/files/clamd.logrotate app-antivirus/clamav/files/freshclam.logrotate X-VCS-Directories: app-antivirus/clamav/files/ app-antivirus/clamav/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 76622421052176c051df0c19a518d6c064aa5e5e X-VCS-Branch: master Date: Wed, 23 Sep 2020 03:34:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ec9adcef-ac92-463a-a85f-6551df2b4c91 X-Archives-Hash: 45579fc1e92b88278f4734d748af23a0 commit: 76622421052176c051df0c19a518d6c064aa5e5e Author: Michael Orlitzky gentoo org> AuthorDate: Tue Sep 22 13:24:36 2020 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Wed Sep 23 03:23:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76622421 app-antivirus/clamav: new logrotate files for v0.103.0. Now that each ClamAV daemon has its own OpenRC service, we separate the logrotate entries as well. This fixes an old bug where we relied on the service manager being OpenRC. Closes: https://bugs.gentoo.org/508520 Closes: https://bugs.gentoo.org/709780 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Michael Orlitzky gentoo.org> app-antivirus/clamav/clamav-0.103.0.ebuild | 5 ++++- app-antivirus/clamav/files/clamav-milter.logrotate | 25 ++++++++++++++++++++++ app-antivirus/clamav/files/clamd.logrotate | 17 +++++++++++++++ app-antivirus/clamav/files/freshclam.logrotate | 17 +++++++++++++++ 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/app-antivirus/clamav/clamav-0.103.0.ebuild b/app-antivirus/clamav/clamav-0.103.0.ebuild index 9a1d28f8920..f5e3d508cf5 100644 --- a/app-antivirus/clamav/clamav-0.103.0.ebuild +++ b/app-antivirus/clamav/clamav-0.103.0.ebuild @@ -133,7 +133,10 @@ src_install() { fi insinto /etc/logrotate.d - newins "${FILESDIR}"/clamav.logrotate clamav + newins "${FILESDIR}/clamd.logrotate" clamd + newins "${FILESDIR}/freshclam.logrotate" freshclam + use milter && \ + newins "${FILESDIR}/clamav-milter.logrotate" clamav-milter # Modify /etc/{clamd,freshclam}.conf to be usable out of the box sed -i -e "s:^\(Example\):\# \1:" \ diff --git a/app-antivirus/clamav/files/clamav-milter.logrotate b/app-antivirus/clamav/files/clamav-milter.logrotate new file mode 100644 index 00000000000..24782df604b --- /dev/null +++ b/app-antivirus/clamav/files/clamav-milter.logrotate @@ -0,0 +1,25 @@ +# This script is intended to rotate the logs for clamav-milter in its +# default configuration on Gentoo, where clamav-milter writes to its +# own log file but does not rotate that file itself. The clamav-milter +# daemon is capable of rotating its own logs; if you have "LogRotate +# yes" in clamav-milter.conf then you do not need this script (and +# should disable it). Likewise, if you are logging to syslog +# (LogSyslog yes), this is redundant. +# +# This is more complicated than the clamd/freshclam scripts because +# the milter doesn't yet reopen its log files when it receives a +# SIGHUP. See https://bugzilla.clamav.net/show_bug.cgi?id=12615 +# for that. Instead we have to attempt OpenRC/systemd service +# restarts on (only) the machines that support them. +/var/log/clamav/clamav-milter.log { + su clamav clamav + missingok + postrotate + if command -v rc-service 2>/dev/null; then + rc-service clamav-milter status 2>/dev/null 1>&2 && rc-service clamav-milter restart 1>/dev/null + fi + if command -v systemctl 2>/dev/null; then + systemctl try-restart clamav-milter + fi + endscript +} diff --git a/app-antivirus/clamav/files/clamd.logrotate b/app-antivirus/clamav/files/clamd.logrotate new file mode 100644 index 00000000000..68ee9b36166 --- /dev/null +++ b/app-antivirus/clamav/files/clamd.logrotate @@ -0,0 +1,17 @@ +# This script is intended to rotate the logs for clamd in its default +# configuration on Gentoo, where clamd writes to its own log file but +# does not rotate that file itself. The clamd daemon is capable of +# rotating its own logs; if you have "LogRotate yes" in clamd.conf +# then you do not need this script (and should disable it). Likewise, +# if you are logging to syslog (LogSyslog yes), this is redundant. +/var/log/clamav/clamd.log { + su clamav clamav + missingok + postrotate + if test -f /run/clamd.pid; then + /bin/kill -HUP $(cat /run/clamd.pid) + else + true + fi + endscript +} diff --git a/app-antivirus/clamav/files/freshclam.logrotate b/app-antivirus/clamav/files/freshclam.logrotate new file mode 100644 index 00000000000..ba6b5de3ba1 --- /dev/null +++ b/app-antivirus/clamav/files/freshclam.logrotate @@ -0,0 +1,17 @@ +# This script is intended to rotate the logs for freshclam in its default +# configuration on Gentoo, where freshclam writes to its own log file but +# does not rotate that file itself. The freshclam daemon is capable of +# rotating its own logs; if you have "LogRotate yes" in freshclam.conf +# then you do not need this script (and should disable it). Likewise, +# if you are logging to syslog (LogSyslog yes), this is redundant. +/var/log/clamav/freshclam.log { + su clamav clamav + missingok + postrotate + if test -f /run/freshclam.pid; then + /bin/kill -HUP $(cat /run/freshclam.pid) + else + true + fi + endscript +}