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 4094F15802E for ; Mon, 24 Jun 2024 22:30:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F4C0E2A3F; Mon, 24 Jun 2024 22:30:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 F3F65E2A3F for ; Mon, 24 Jun 2024 22:30:02 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6A11342FFE for ; Mon, 24 Jun 2024 22:30:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1CC7C1D32 for ; Mon, 24 Jun 2024 22:29:59 +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: <1719268140.cdab26dbefdc03b1dd47c3e396914a393e6d8e48.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: cdab26dbefdc03b1dd47c3e396914a393e6d8e48 X-VCS-Branch: master Date: Mon, 24 Jun 2024 22:29:59 +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: 6525945a-e034-40ed-be01-9e6f307f7de8 X-Archives-Hash: 83892cabad64399ecb1afbaee4a976a8 commit: cdab26dbefdc03b1dd47c3e396914a393e6d8e48 Author: Matt Jolly gentoo org> AuthorDate: Mon Jun 24 21:42:58 2024 +0000 Commit: Matt Jolly gentoo org> CommitDate: Mon Jun 24 22:29:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdab26db app-antivirus/clamav: 1.3.1-r1: fix build with USE=milter I dropped the escape and the end of a capture group! Also drop superfluous 'MilterSocket Unix.*' sed. Closes: https://bugs.gentoo.org/934816 Signed-off-by: Matt Jolly gentoo.org> app-antivirus/clamav/clamav-1.3.1-r1.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app-antivirus/clamav/clamav-1.3.1-r1.ebuild b/app-antivirus/clamav/clamav-1.3.1-r1.ebuild index fed1a8c4198a..04fcfda4d498 100644 --- a/app-antivirus/clamav/clamav-1.3.1-r1.ebuild +++ b/app-antivirus/clamav/clamav-1.3.1-r1.ebuild @@ -331,10 +331,9 @@ src_install() { if use milter ; then # Note: only keep the "unix" ClamdSocket and MilterSocket! sed -e "s:^\(Example\):\# \1:" \ - -e "s:^#\(PidFile) .*\:\1 ${EPREFIX}/run/clamav-milter.pid:" \ + -e "s:^\#\(PidFile\) .*:\1 ${EPREFIX}/run/clamav-milter.pid:" \ -e "s/^#\(ClamdSocket unix:.*\)/\1/" \ -e "s/^#\(User .*\)/\1/" \ - -e "s/^#\(MilterSocket unix:.*\)/\1/" \ -e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \ "${ED}"/etc/clamav/clamav-milter.conf.sample > \ "${ED}"/etc/clamav/clamav-milter.conf || die