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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 089AC15802E for ; Mon, 24 Jun 2024 11:05:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A63F9E2B0A; Mon, 24 Jun 2024 11:05:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 82ECDE2B09 for ; Mon, 24 Jun 2024 11:05:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F200335C52 for ; Mon, 24 Jun 2024 11:05:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6AC41D34 for ; Mon, 24 Jun 2024 11:05:02 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1719227056.4ae5cd8e3ab88c25f68c1a9fc7bbc40cecafd9ed.kangie@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-antivirus/clamav/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-antivirus/clamav/clamav-1.3.1-r1.ebuild X-VCS-Directories: app-antivirus/clamav/ X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 4ae5cd8e3ab88c25f68c1a9fc7bbc40cecafd9ed X-VCS-Branch: master Date: Mon, 24 Jun 2024 11:05:02 +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: c6725476-48a6-481b-bffc-411c004c6135 X-Archives-Hash: 2d18a782bee98d37c90fc8aeef976ce7 commit: 4ae5cd8e3ab88c25f68c1a9fc7bbc40cecafd9ed Author: Matt Jolly gentoo org> AuthorDate: Mon Jun 24 10:42:36 2024 +0000 Commit: Matt Jolly gentoo org> CommitDate: Mon Jun 24 11:04:16 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ae5cd8e app-antivirus/clamav: drop our downstream systemd services Upstream have been providing better examples for a long time now, and we've been installing duplicate files. https://bugs.gentoo.org/662196 Signed-off-by: Matt Jolly gentoo.org> app-antivirus/clamav/clamav-1.3.1-r1.ebuild | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app-antivirus/clamav/clamav-1.3.1-r1.ebuild b/app-antivirus/clamav/clamav-1.3.1-r1.ebuild index 05280603ec9e..fed1a8c4198a 100644 --- a/app-antivirus/clamav/clamav-1.3.1-r1.ebuild +++ b/app-antivirus/clamav/clamav-1.3.1-r1.ebuild @@ -304,13 +304,9 @@ src_install() { # fundamentally flawed, and the maintainer is not up to # the task of fixing it. dotmpfiles "${FILESDIR}/tmpfiles.d/clamav.conf" - systemd_newunit "${FILESDIR}/clamd_at.service-0.104.0" "clamd@.service" - systemd_dounit "${FILESDIR}/clamd.service" - systemd_newunit "${FILESDIR}/freshclamd.service-r1" \ - "freshclamd.service" fi - if use clamapp ; then + if use clamapp ; then # Modify /etc/{clamd,freshclam}.conf to be usable out of the box sed -e "s:^\(Example\):\# \1:" \ -e "s:^#\(PidFile\) .*:\1 ${EPREFIX}/run/clamd.pid:" \ @@ -399,6 +395,13 @@ pkg_postinst() { ewarn "clamd service now starts only the clamd daemon itself. You" ewarn "should add freshclam (and perhaps clamav-milter) to any" ewarn "runlevels that previously contained clamd." + else + if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -le 1.3.1; then + ewarn "From 1.3.1-r1 the Gentoo-provided systemd services have been" + ewarn "Retired in favour of using the units shipped by upstream." + ewarn "Ensure that any required services are configured and started." + ewarn "clamd@.service has been retired as part of this transition." + fi fi if [[ -z ${REPLACING_VERSIONS} ]] && use clamonacc; then @@ -406,4 +409,5 @@ pkg_postinst() { einfo "can be enabled, and may not produce any output if not properly" einfo "configured. Read the appropriate man page if clamonacc is desired." fi + }