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() {
