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 5437E138334 for ; Fri, 17 Aug 2018 21:38:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F927E08D4; Fri, 17 Aug 2018 21:38:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 1FE85E08D4 for ; Fri, 17 Aug 2018 21:38:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 58EB3335D5C for ; Fri, 17 Aug 2018 21:38:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B5F2F2BA for ; Fri, 17 Aug 2018 21:38:31 +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: <1534541312.2b50e51cc165207171239c8202b298104b03e751.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-antivirus/clamav-unofficial-sigs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-antivirus/clamav-unofficial-sigs/Manifest app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.1.ebuild app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild X-VCS-Directories: app-antivirus/clamav-unofficial-sigs/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 2b50e51cc165207171239c8202b298104b03e751 X-VCS-Branch: master Date: Fri, 17 Aug 2018 21:38:31 +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-Archives-Salt: 6a46d0c7-6de5-4169-a36c-a9b7e9fd4f2c X-Archives-Hash: a54f8a150899caf4800eedae43511cdc commit: 2b50e51cc165207171239c8202b298104b03e751 Author: Michael Orlitzky gentoo org> AuthorDate: Fri Aug 17 21:17:05 2018 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Fri Aug 17 21:28:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b50e51c app-antivirus/clamav-unofficial-sigs: new version 5.6.2. Closes: https://bugs.gentoo.org/663552 Package-Manager: Portage-2.3.40, Repoman-2.3.9 app-antivirus/clamav-unofficial-sigs/Manifest | 2 +- ....ebuild => clamav-unofficial-sigs-5.6.2.ebuild} | 29 +++++++++++++--------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app-antivirus/clamav-unofficial-sigs/Manifest b/app-antivirus/clamav-unofficial-sigs/Manifest index 7577334bb11..7b61422eb31 100644 --- a/app-antivirus/clamav-unofficial-sigs/Manifest +++ b/app-antivirus/clamav-unofficial-sigs/Manifest @@ -1,2 +1,2 @@ DIST clamav-unofficial-sigs-3.7.2.tar.gz 38549 BLAKE2B 2f00e9adf5f54e2b38c602da56a2daeb70618123ab4e59a74804885252f3cad2c23f7b9b10f4ec664c6977bca849947b83d0fc69f76669dbae58ebff54c6755b SHA512 ee07bf521cca229bc85acb887c8e520149955732797a9d220e24f09cb9e89f9bd189ad77dc781c03c60bdaaec2bfa91a6c96cf7a0b689759cddf3ff231b8b0a4 -DIST clamav-unofficial-sigs-5.6.1.tar.gz 51024 BLAKE2B 6c1da70c0ef93738533e69902ea8dc418ed76004361bf10199a7a661bd54cbcbcd3cfd4b32d5f592155ff354e4f8330fd2a92ab06b6b7c05211224bc1892d86a SHA512 a3660abe301e96104393d337ff2b7f73324241bb921d71626e4a6ea4cec39709ce76dbb9432fd048c66441f0acbb1b92fa561397669ffdca98f463d7da8e7402 +DIST clamav-unofficial-sigs-5.6.2.tar.gz 50931 BLAKE2B 6fea42f8f76ae5344c2b96c9203d2b09e755573d03f2b9d3d9ee2a488150fbb6f598e052b730daf12c551920a71fd8daad1dc10002fca12fa4a74554cf7d445e SHA512 79978db065a22d778490d0a2673f5a0bb7ab73e42de64563e7d26ac23459f7e5b2e73b0548e1ea6483e3c5f43eed65cdbc6814037cc0c46a339366a0150e5427 diff --git a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.1.ebuild b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild similarity index 69% rename from app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.1.ebuild rename to app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild index eb77bf7756b..f87f76fff1a 100644 --- a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.1.ebuild +++ b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +inherit user DESCRIPTION="Download and install third-party clamav signatures" HOMEPAGE="https://github.com/extremeshok/${PN}" @@ -12,9 +14,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -# We need its user/group. -DEPEND="app-antivirus/clamav" - # The script relies on either net-misc/socat, or Perl's # IO::Socket::UNIX. We already depend on Perl, and Gentoo's Perl ships # with IO::Socket::UNIX, so we can leave out net-misc/socat here. @@ -28,9 +27,10 @@ src_install() { dosbin "${PN}.sh" # The script's working directory (set in the conf file). By default, - # it runs as clamav/clamav. - diropts -m 0755 -o clamav -g clamav - dodir "/var/lib/${PN}" + # it runs as clamav/clamav. We set the owner/group later, in + # pkg_preinst, after the user/group is sure to exist (because we + # create them otherwise). + keepdir "/var/lib/${PN}" insinto /etc/logrotate.d doins "${FILESDIR}/${PN}.logrotate" @@ -43,6 +43,15 @@ src_install() { dodoc README.md } +pkg_preinst() { + # Should agree with app-antivirus/clamav. We don't actually need + # clamav to function, so it isn't one of our dependencies, and + # that's why we might need to create its user ourselves. + enewgroup clamav + enewuser clamav -1 -1 /dev/null clamav + fowners clamav:clamav "/var/lib/${PN}" +} + pkg_postinst() { elog '' elog "You will need to select databases in /etc/${PN}/master.conf." @@ -53,8 +62,4 @@ pkg_postinst() { elog '' elog ' http://sanesecurity.com/usage/signatures/' elog '' - ewarn 'The configuration file has moved in the 5.x version!' - ewarn "You should migrate your config from /etc/${PN}.conf to" - ewarn "/etc/${PN}/master.conf" - ewarn '' }