| 1 |
commit: 2b50e51cc165207171239c8202b298104b03e751 |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 17 21:17:05 2018 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 17 21:28:32 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b50e51c |
| 7 |
|
| 8 |
app-antivirus/clamav-unofficial-sigs: new version 5.6.2. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/663552 |
| 11 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 12 |
|
| 13 |
app-antivirus/clamav-unofficial-sigs/Manifest | 2 +- |
| 14 |
....ebuild => clamav-unofficial-sigs-5.6.2.ebuild} | 29 +++++++++++++--------- |
| 15 |
2 files changed, 18 insertions(+), 13 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-antivirus/clamav-unofficial-sigs/Manifest b/app-antivirus/clamav-unofficial-sigs/Manifest |
| 18 |
index 7577334bb11..7b61422eb31 100644 |
| 19 |
--- a/app-antivirus/clamav-unofficial-sigs/Manifest |
| 20 |
+++ b/app-antivirus/clamav-unofficial-sigs/Manifest |
| 21 |
@@ -1,2 +1,2 @@ |
| 22 |
DIST clamav-unofficial-sigs-3.7.2.tar.gz 38549 BLAKE2B 2f00e9adf5f54e2b38c602da56a2daeb70618123ab4e59a74804885252f3cad2c23f7b9b10f4ec664c6977bca849947b83d0fc69f76669dbae58ebff54c6755b SHA512 ee07bf521cca229bc85acb887c8e520149955732797a9d220e24f09cb9e89f9bd189ad77dc781c03c60bdaaec2bfa91a6c96cf7a0b689759cddf3ff231b8b0a4 |
| 23 |
-DIST clamav-unofficial-sigs-5.6.1.tar.gz 51024 BLAKE2B 6c1da70c0ef93738533e69902ea8dc418ed76004361bf10199a7a661bd54cbcbcd3cfd4b32d5f592155ff354e4f8330fd2a92ab06b6b7c05211224bc1892d86a SHA512 a3660abe301e96104393d337ff2b7f73324241bb921d71626e4a6ea4cec39709ce76dbb9432fd048c66441f0acbb1b92fa561397669ffdca98f463d7da8e7402 |
| 24 |
+DIST clamav-unofficial-sigs-5.6.2.tar.gz 50931 BLAKE2B 6fea42f8f76ae5344c2b96c9203d2b09e755573d03f2b9d3d9ee2a488150fbb6f598e052b730daf12c551920a71fd8daad1dc10002fca12fa4a74554cf7d445e SHA512 79978db065a22d778490d0a2673f5a0bb7ab73e42de64563e7d26ac23459f7e5b2e73b0548e1ea6483e3c5f43eed65cdbc6814037cc0c46a339366a0150e5427 |
| 25 |
|
| 26 |
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 |
| 27 |
similarity index 69% |
| 28 |
rename from app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.1.ebuild |
| 29 |
rename to app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild |
| 30 |
index eb77bf7756b..f87f76fff1a 100644 |
| 31 |
--- a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.1.ebuild |
| 32 |
+++ b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild |
| 33 |
@@ -1,7 +1,9 @@ |
| 34 |
-# Copyright 1999-2017 Gentoo Foundation |
| 35 |
+# Copyright 1999-2018 Gentoo Foundation |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
-EAPI=6 |
| 39 |
+EAPI=7 |
| 40 |
+ |
| 41 |
+inherit user |
| 42 |
|
| 43 |
DESCRIPTION="Download and install third-party clamav signatures" |
| 44 |
HOMEPAGE="https://github.com/extremeshok/${PN}" |
| 45 |
@@ -12,9 +14,6 @@ SLOT="0" |
| 46 |
KEYWORDS="~amd64 ~x86" |
| 47 |
IUSE="" |
| 48 |
|
| 49 |
-# We need its user/group. |
| 50 |
-DEPEND="app-antivirus/clamav" |
| 51 |
- |
| 52 |
# The script relies on either net-misc/socat, or Perl's |
| 53 |
# IO::Socket::UNIX. We already depend on Perl, and Gentoo's Perl ships |
| 54 |
# with IO::Socket::UNIX, so we can leave out net-misc/socat here. |
| 55 |
@@ -28,9 +27,10 @@ src_install() { |
| 56 |
dosbin "${PN}.sh" |
| 57 |
|
| 58 |
# The script's working directory (set in the conf file). By default, |
| 59 |
- # it runs as clamav/clamav. |
| 60 |
- diropts -m 0755 -o clamav -g clamav |
| 61 |
- dodir "/var/lib/${PN}" |
| 62 |
+ # it runs as clamav/clamav. We set the owner/group later, in |
| 63 |
+ # pkg_preinst, after the user/group is sure to exist (because we |
| 64 |
+ # create them otherwise). |
| 65 |
+ keepdir "/var/lib/${PN}" |
| 66 |
|
| 67 |
insinto /etc/logrotate.d |
| 68 |
doins "${FILESDIR}/${PN}.logrotate" |
| 69 |
@@ -43,6 +43,15 @@ src_install() { |
| 70 |
dodoc README.md |
| 71 |
} |
| 72 |
|
| 73 |
+pkg_preinst() { |
| 74 |
+ # Should agree with app-antivirus/clamav. We don't actually need |
| 75 |
+ # clamav to function, so it isn't one of our dependencies, and |
| 76 |
+ # that's why we might need to create its user ourselves. |
| 77 |
+ enewgroup clamav |
| 78 |
+ enewuser clamav -1 -1 /dev/null clamav |
| 79 |
+ fowners clamav:clamav "/var/lib/${PN}" |
| 80 |
+} |
| 81 |
+ |
| 82 |
pkg_postinst() { |
| 83 |
elog '' |
| 84 |
elog "You will need to select databases in /etc/${PN}/master.conf." |
| 85 |
@@ -53,8 +62,4 @@ pkg_postinst() { |
| 86 |
elog '' |
| 87 |
elog ' http://sanesecurity.com/usage/signatures/' |
| 88 |
elog '' |
| 89 |
- ewarn 'The configuration file has moved in the 5.x version!' |
| 90 |
- ewarn "You should migrate your config from /etc/${PN}.conf to" |
| 91 |
- ewarn "/etc/${PN}/master.conf" |
| 92 |
- ewarn '' |
| 93 |
} |
Archives