From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1138673-garchives=archives.gentoo.org@lists.gentoo.org>
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 72FF9138351
for <garchives@archives.gentoo.org>; Sat, 18 Jan 2020 04:11:17 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 489C5E0835;
Sat, 18 Jan 2020 04:11:16 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 01B83E0833
for <gentoo-commits@lists.gentoo.org>; Sat, 18 Jan 2020 04:11:15 +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 AA18634E1F8
for <gentoo-commits@lists.gentoo.org>; Sat, 18 Jan 2020 04:11:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 95ADED6
for <gentoo-commits@lists.gentoo.org>; Sat, 18 Jan 2020 04:11:12 +0000 (UTC)
From: "Michael Orlitzky" <mjo@gentoo.org>
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" <mjo@gentoo.org>
Message-ID: <1579319101.edecfb4874573b0a2d8e6c93b1fed972e285e61e.mjo@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-antivirus/clamav/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-antivirus/clamav/clamav-0.102.1-r2.ebuild app-antivirus/clamav/clamav-0.102.1-r3.ebuild
X-VCS-Directories: app-antivirus/clamav/
X-VCS-Committer: mjo
X-VCS-Committer-Name: Michael Orlitzky
X-VCS-Revision: edecfb4874573b0a2d8e6c93b1fed972e285e61e
X-VCS-Branch: master
Date: Sat, 18 Jan 2020 04:11:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: ec0d2373-6980-40a2-8baf-05c5ba9990a5
X-Archives-Hash: b2b283dd512d93fda886d1d8f3cbb8ec
commit: edecfb4874573b0a2d8e6c93b1fed972e285e61e
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 17 18:41:46 2020 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 03:45:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edecfb48
app-antivirus/clamav: new revision with GLEP81 user/group.
Bug: https://bugs.gentoo.org/701222
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
...-0.102.1-r2.ebuild => clamav-0.102.1-r3.ebuild} | 25 +++++++++++-----------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/app-antivirus/clamav/clamav-0.102.1-r2.ebuild b/app-antivirus/clamav/clamav-0.102.1-r3.ebuild
similarity index 92%
rename from app-antivirus/clamav/clamav-0.102.1-r2.ebuild
rename to app-antivirus/clamav/clamav-0.102.1-r3.ebuild
index 8a85bf5c112..ea67c867663 100644
--- a/app-antivirus/clamav/clamav-0.102.1-r2.ebuild
+++ b/app-antivirus/clamav/clamav-0.102.1-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit autotools eutils flag-o-matic user systemd
+inherit autotools eutils flag-o-matic systemd
DESCRIPTION="Clam Anti-Virus Scanner"
HOMEPAGE="https://www.clamav.net/"
@@ -15,7 +15,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-l
IUSE="bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux static-libs test uclibc xml"
RESTRICT="!test? ( test )"
-CDEPEND="bzip2? ( app-arch/bzip2 )
+# Require acct-{user,group}/clamav at build time so that we can set
+# the permissions on /var/lib/clamav in src_install rather than in
+# pkg_postinst; calling "chown" on the live filesystem scares me.
+CDEPEND="acct-group/clamav
+ acct-user/clamav
+ bzip2? ( app-arch/bzip2 )
clamdtop? ( sys-libs/ncurses:0 )
iconv? ( virtual/libiconv )
metadata-analysis-api? ( dev-libs/json-c:= )
@@ -51,11 +56,6 @@ PATCHES=(
"${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
)
-pkg_setup() {
- enewgroup clamav
- enewuser clamav -1 -1 /dev/null clamav
-}
-
src_prepare() {
default
eautoconf
@@ -117,11 +117,6 @@ src_install() {
systemd_dounit "${FILESDIR}/clamd.service"
systemd_dounit "${FILESDIR}/freshclamd.service"
- keepdir /var/lib/clamav
- fowners clamav:clamav /var/lib/clamav
- keepdir /var/log/clamav
- fowners clamav:clamav /var/log/clamav
-
dodir /etc/logrotate.d
insinto /etc/logrotate.d
newins "${FILESDIR}"/clamav.logrotate clamav
@@ -177,6 +172,12 @@ src_install() {
done
prune_libtool_files --all
+
+ # These both need to be writable by the clamav user.
+ # TODO: use syslog by default; that's what it's for.
+ diropts -o clamav -g clamav
+ keepdir /var/lib/clamav
+ keepdir /var/log/clamav
}
src_test() {