app-antivirus/clamav: fixup systemd units

Closes: https://bugs.gentoo.org/627700
Closes: https://github.com/gentoo/gentoo/pull/6621
Package-Manager: Portage-2.3.19_p2, Repoman-2.3.6_p36

diff --git a/app-antivirus/clamav/clamav-0.99.2-r2.ebuild b/app-antivirus/clamav/clamav-0.99.2-r3.ebuild
similarity index 100%
rename from app-antivirus/clamav/clamav-0.99.2-r2.ebuild
rename to app-antivirus/clamav/clamav-0.99.2-r3.ebuild

diff --git a/app-antivirus/clamav/files/clamd.service b/app-antivirus/clamav/files/clamd.service
index efdab4314a224a7b8b9539199308bf1f38786851..75aa2ccb624db0efd8c9b48d9136e00d77e94291 100644 (file)
--- a/app-antivirus/clamav/files/clamd.service
+++ b/app-antivirus/clamav/files/clamd.service
@@ -1,7 +1,12 @@
-.include /usr/lib/systemd/system/clamd@.service
-
 [Unit]
-Description=Generic ClamAV scanner daemon
+Description=clamd scanner daemon
+After=nss-lookup.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/clamd
+Restart=on-failure
+PrivateTmp=true
 
 [Install]
 WantedBy=multi-user.target

diff --git a/app-antivirus/clamav/files/clamd_at.service b/app-antivirus/clamav/files/clamd_at.service
index c5ad8dfa6899813ddbb04ac25aad027a53fbab1a..9008ba7e82edc88b552cc1ae49b3661ea916960e 100644 (file)
--- a/app-antivirus/clamav/files/clamd_at.service
+++ b/app-antivirus/clamav/files/clamd_at.service
@@ -7,3 +7,6 @@ Type=forking
 ExecStart=/usr/sbin/clamd -c /etc/clamd%i.conf
 Restart=on-failure
 PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target