Add unit files (#475858, thanks to Tim Harder for his help)

Package-Manager: portage-2.1.12.11/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

7 files changed, 172 insertions, 9 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 1bd3d9869dd5..82ffd0a7b96e 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.458 2013/06/12 21:13:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.459 2013/07/06 09:15:52 pacho Exp $
+
+*clamav-0.97.8-r1 (06 Jul 2013)
+
+  06 Jul 2013; Pacho Ramos <pacho@gentoo.org> +clamav-0.97.8-r1.ebuild,
+  +files/clamav-milter.service, +files/clamd.service, +files/clamd_at.service,
+  +files/tmpfiles.d/clamav.conf:
+  Add unit files (#475858, thanks to Tim Harder for his help)
 
   12 Jun 2013; Tim Harder <radhermit@gentoo.org> clamav-0.97.7.ebuild,
   clamav-0.97.8.ebuild:
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 91c33e3b924c..f08bc8c3476a 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -3,24 +3,25 @@ Hash: SHA256
 
 AUX clamav-0.97-nls.patch 269 SHA256 088b9edcdb678ce9c072042cf51266e061ab5f5ab0e8e42bd953242138c64fd1 SHA512 a0508590353c699d62d203398e4b84ea134348567fa5530e5c9c7ce850a9eeca106544e641ce011cc0a5097313dea780490e7db6fdda1ec2ab61dd6474e31458 WHIRLPOOL 95ce0a012bbb8d0cde2c255d7f15ab8eb24d412cd7b664ce2e7dc6ea887c608252076e45f7f4a007edda455f07b62884002a6d914b25b889da2682140d31f20c
 AUX clamav-milter.README.gentoo 1124 SHA256 5e7b142b68964bc3463b077e5698fa77cace45ea9612258b1e1849cee944dd11 SHA512 1c6160e48eddd28f83ec5f24757f788781cef55789d1934dfccc12c7c5e5635a226d26b0983cab7344c142f5a2f1db172640b1d0e6c840a6fa83abed9be1211a WHIRLPOOL f85b17448fd93205e2f38d024b96410cc8d143d077201e0a1b8f4cda95ae2447a70eded4cb90968a593ad2637229300fa04bfe5dba96d3d68c2d09c105ee3f16
+AUX clamav-milter.service 284 SHA256 b371725acfd102b6b7ee15ab0059e8795b7d3716d041d0dc11d0fe8f7454d5a9 SHA512 442148ac3c42ecbb893de5c6edde337b72a745d20f6c5ffa33131f9a0b2daadcffac39b686ada986a5ab500ea7b9153c448abc1b819e15fef488da1812bb0cee WHIRLPOOL 56b4ed79e06c764df37022f0638ceddb5fe8185c54b2e460b076a46ed4f5a68b67fb7966d424dabe836bfd7d6b9d770eb60cad4633ee17083baa50ad2c0a89cd
 AUX clamav.logrotate 355 SHA256 ab91f784d5098d2162be9277e3a006bdb392d9d89975838ad4ac7dfd8b418170 SHA512 39e8027db4cb2cf1b45dac6777dbd922640b41f47deb34199d910560d56431051432b68ab387101542d8f98069253c85bb2ab39c274eb99c2db26c5967abf512 WHIRLPOOL 0d201d6909d309e22526ed0d40da588602d0b34367b9e7d54b42d6626c7b7bac1150c1671740cead5d900baa8a6a098feaeb1127251d9a45eb35203016197193
 AUX clamd.conf 234 SHA256 17bf4fe3596dc5b145e4163d85181e2edcaa214df3cf9072d852ba0e7a569891 SHA512 ec069cf7aaf10b42a701938b57e1fde1ee15afd1d4af928edfa7e5d505ba8b3edaaceac449da0f4ac6beea09a3fb73453526ba0cd3a04e13259c1a2720f42f78 WHIRLPOOL 667ad1567bb398a20785096f2c2c7c72be4853ee3b0674c4fcc20eb2c9123815c273f40938961e348252e3376c4402a3f952b2a72d3bb3f0907aadb7ab77b8ed
 AUX clamd.initd-r3 3118 SHA256 68bfcbd582667c719b81a7f0c396de9733bc5efefa4e7b8dd3fc0c02dfcea887 SHA512 9a173f4eef3ef173b6267a7753acd221773ad22fc2b689e8e842783ea787a18ee5990607ebd434a0ad9e45a0347ad8f7ba40935456e4f336cf2b3dcbc09c9f46 WHIRLPOOL d5cd66a07937af859307ca5b22012c33dc3a2c767d42244e9cd5b28a13c235340d604d10baf30f134a74965ba4bec552b943fc659e90952d650387a867633f18
 AUX clamd.initd-r5 3267 SHA256 be51b60549925ef9fa81d71405c9d4ecbcededa746137c7ac90d23a203881bc3 SHA512 5db7ec5374881ca4342e4fcdb58584a73d6f96e3900161ff4ba48792d3168ec4a786def808f17a2f0c3c30649d13c49a60495539d40bbc3e445f3d47a160b3a4 WHIRLPOOL 62e8b9dd6115ba16d810a1f438813ad6c212bc7b0e99c69bdeb8d1dec6276dfaae3bb45bceca2ca847ca0507b5acdc123a077b23f0bc3a28d038bf1fbe1f7b08
+AUX clamd.service 136 SHA256 d50b2d7b291e1d03f142e0b113a90c600cf5a0f73f1a4847d8cf0528902728dd SHA512 2080e96e84d15d1ef4c670579ddca5bc9608c8e8564cd43fcd9d464d97c253eb89ca3ebbf3a6a799b31a6c6321ea8beeb386cbefbccbe5f097dbc492900dc2aa WHIRLPOOL 612ff77805a2ede8c526c798f3b5658ea5be5006d526eb7735750a1b86186c2214c34ba4658e3567845c503a0575cc15519ff5c9294be939cd200bf2c691a2f6
+AUX clamd_at.service 190 SHA256 7fb3eb55fbb0bff9884aa943ffc6439e328bc0e4a607c1615c924be9c3711c30 SHA512 b5121bfe761d21152356c8b1e0f0974a9c0bb9002b3d5b1af1c7940d94314250a4890388876b150b0f071c24b7261b93bbc9a6b94b896294c549fe6b572ee70a WHIRLPOOL d58f1d19de54183224ecccc78f9968473c8b891c6ce1f5a9045c1a1db962c152a4b22f58dc55ae54a3b21df20a422e173143e6b893a8913e7f038904e991cce6
+AUX tmpfiles.d/clamav.conf 33 SHA256 893bda174539a1a2ffc7f713f563d172593d9707da5c49e6c151832c57da6846 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2 WHIRLPOOL 74d92a4a54f6d38bd752ff46ed494abc823781f41e7663468cd94125076538a4a315808fd0efd2e988d94dcfb05251aef194225cb4bbc1cf05c23fcb491d7e98
 DIST clamav-0.97.7.tar.gz 14598481 SHA256 8527754e7eb235317e37a50706d94d3fc9d880fd0bf6f3cb83757d64a720e9ff SHA512 92120250afb882b7fb9f956f2095797f8e3c93076a229967123261c907d9b4436cda6cf2d18b2c61cec8b33afeacba9c2701ad3322aa3316163fe4f36f7a7bc7 WHIRLPOOL 1f3fb155ad4e35ef1ea3835941e40363f9da9c37ab46fe1b9d44e29add6fee9d775e1f5858648a6229f9d0f41c40ed4ade726a4fc044156d208bf10f6cc8c705
 DIST clamav-0.97.8.tar.gz 14609966 SHA256 d872bdfd692d440bc2ade2f4e5a7befc37feb8885cd81adfb6346a8214aafc12 SHA512 e3a80bbfc90922f7f49521d1ab53ec63fb948a42d448ecaa933023cbb256f35e5b695305bd2d56480ee1f94ac93703d10aa4193566c521a1fa62f2c0e1019fda WHIRLPOOL b0ddc29edd096007abc0183400f2b3ee54cf87f13bb2eab2388c444f038fab33eb25b6b5d678449d49da2258017a630ff2e6b36c27028557038a033b415b026c
 EBUILD clamav-0.97.7.ebuild 3801 SHA256 4b863c122e291bb2e2b6677cdc12c2d8f7b01d7189ff962378e1cbbacd76ee0c SHA512 a23307ef987345072a16040cbb592ce776ba7b3396b58f0a078ac0ac686ed75a596c21ab72987d84cf206ec23dfdae84c4b6a05e99b30f43938dbbc62b589fc1 WHIRLPOOL b242d845e96c98a27656ff27f765eda6fd824a687253100b5ab4a9e223b4e069227863d86f23f2b89b35612f5fab02e28f706f129eb325785f8f379546eca130
+EBUILD clamav-0.97.8-r1.ebuild 4037 SHA256 83264fe66dc4d301342a689762f03f287e233d54df8f7df1af0b5cb0a6682103 SHA512 96894acbc602ed220a6c30a6024aa5f75e2df4619d22bc38d80ea6f911f661c37257f501a961182eef7ba290979c03627ba6a5bbb776b798edf0a22af2723695 WHIRLPOOL 66d81959dca75676c9483234fae25b1c83c3ff185d4ee3f4a77f8a54c3013a54cd06baa0fdb16bcc97b7c9ce4ad58c1a086517e0040cf821eb2d31b9c6d641ae
 EBUILD clamav-0.97.8.ebuild 3808 SHA256 3900b6c7f9c25b8b6a2246462bfdb14175e5cdb2c1232173e28c2d564116c460 SHA512 4a1901e3181d8f69a987ee59e474d51a6a795fce71588e267b49b29904e7ddd88836766a355d94a1815a00075e8f6b915561fc1de664e86108589c6185498136 WHIRLPOOL a796948f0dcc9ea43fe3cb70647e6c1ec3728d9737e351f13eeeed8c49a3acba1fa960a7b46a6f6bb9f43b90c9b4ed947ce5864b4c4fa4324180917ddf66f24e
-MISC ChangeLog 66743 SHA256 4a705bd0add01a82102fb57b2ebf72d140f9438614007934fe3a4a12020469fa SHA512 db2a4579292a686ee906a94178a39b4ed44a29f50da99512b291d07b3e6b9bbe86d8c01e175ea07250071dcac6a38ec9459030e79554a47bbb942ed0da3de9af WHIRLPOOL 41b06f87f52eaabb35f4c959eddf6abcac9af8f56f5fa2634dbaa07b8c45046370ababaec2bcfb94372e8aa6a98f83e52bc8621227038f806874d1f50d55667c
+MISC ChangeLog 67019 SHA256 06e3db2d69cb61f8638c0e443f7ad531d87d97ebb07ebd2eda150be45d9085bc SHA512 690ec107100e82f84530e47f428c0934d85c59602795bb934ec7f380cb4acd7f6c4d802d7012a34158e5bd7cf5b9e34f9f10a6d3c351090ae0d6ae678d7e8575 WHIRLPOOL 914b1eaa8a9225a9b70082116e7951a09acd748087bdf794b3722678bc87ae2631934c8c9f0129fb818e836a668644f8410e67c900796782e23b55c3421723cb
 MISC metadata.xml 320 SHA256 e2a8c4c8bedbffe50a126c1c7395a4d92652c2d95347b9496d54aea1f230a22d SHA512 c5bb20c993b91112d9c9e0b7bb6c116ac7f711c769084eaaacc28bc7eeb54db09c9794c6ef057747d80a08cf1502f0f688cdefc741423a38da55b2deaebd6476 WHIRLPOOL 741ff80258dee2c145d08f72f10982bd5c1fcba44ed84054cd1a33787864a7d8821b432c3246ad5a04ce11edde7d045f3eb6e056200e3bd2e8505eeea3d7277d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRuORxAAoJEEqz6FtPBkyjjCQIAIS5F0v9YJMVsrMKpCI6c0Vo
-wydEwWKNaeCjhzlsVwE9lYWCk71tV9HZLTKnMgXK2xKPgU3vHf5KO/+AxRl0zmhj
-mNN/bYEFFC7lCKVdrEF5wvGkHaPSbwkCAvrio3PPlbmeLxGD2E2LiOjkg5JNEYU4
-mfgcZyQXIvuKawnZZoMJ+qn+LT5imb5NfPTVvySXXb+w2rBXCrG9snIi4iLC9p7O
-oLZdC5HqjZVoTWAXqj3Isuluh6FEjDLuSqJJaLHIuk/XjdiSqdQe0ls8BSNwl/8m
-ex6L4kLvVcwMpqQhg/ellyoy5w85MchjbnfEKz7VRgCNjt6U/BJR9gc+pIWN9jQ=
-=iamp
+iEYEAREIAAYFAlHX4EkACgkQCaWpQKGI+9QqNACfYnfkYrrHlUEyCdnwlZOULnYE
+g7EAn0CkLQ4S5mc4Db0T/E8XdAw8NvkJ
+=iTpH
 -----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.97.8-r1.ebuild b/app-antivirus/clamav/clamav-0.97.8-r1.ebuild
new file mode 100644
index 000000000000..769f16f00e0a
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.97.8-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.8-r1.ebuild,v 1.1 2013/07/06 09:15:52 pacho Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic user systemd
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="http://www.clamav.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc"
+
+CDEPEND="bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses )
+	iconv? ( virtual/libiconv )
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	dev-libs/libtommath
+	>=sys-libs/zlib-1.2.2
+	sys-devel/libtool"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+RESTRICT="test"
+
+DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
+
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_prepare() {
+	use ppc64 && append-flags -mminimal-toic
+	use uclibc && export ac_cv_type_error_t=yes
+	epatch "${FILESDIR}"/${PN}-0.97-nls.patch
+}
+
+src_configure() {
+	econf \
+		--disable-experimental \
+		--enable-id-check \
+		--with-dbdir="${EPREFIX}"/var/lib/clamav \
+		--with-system-tommath \
+		--with-zlib="${EPREFIX}"/usr \
+		$(use_enable bzip2) \
+		$(use_enable clamdtop) \
+		$(use_enable ipv6) \
+		$(use_enable milter) \
+		$(use_enable static-libs static) \
+		$(use_with iconv)
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}"/var/lib/clamav
+	newinitd "${FILESDIR}"/clamd.initd-r5 clamd
+	newconfd "${FILESDIR}"/clamd.conf clamd
+
+	systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
+	systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
+	systemd_dounit "${FILESDIR}/clamd.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
+
+	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
+		-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
+		-e "s:.*\(User\) .*:\1 clamav:" \
+		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+		-e "s:^\#\(LogTime\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/clamd.conf
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
+		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+		-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
+		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/freshclam.conf
+
+	if use milter ; then
+		# MilterSocket one to include ' /' because there is a 2nd line for
+		# inet: which we want to leave
+		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
+			-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
+			-e "s:.*\(User\) .*:\1 clamav:" \
+			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
+			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+			"${ED}"/etc/clamav-milter.conf
+		cat > "${ED}"/etc/conf.d/clamd <<-EOF
+			MILTER_NICELEVEL=19
+			START_MILTER=no
+		EOF
+
+		systemd_dounit "${FILESDIR}/clamav-milter.service"
+	fi
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+}
diff --git a/app-antivirus/clamav/files/clamav-milter.service b/app-antivirus/clamav/files/clamav-milter.service
new file mode 100644
index 000000000000..5a1a24faa27d
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-milter.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Milter module for the ClamAV scanner
+After=nss-lookup.target network.target
+Before=sendmail.service
+Before=postfix.service
+
+[Service]
+ExecStart=/usr/sbin/clamav-milter -c /etc/clamav-milter.conf --nofork=yes
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-antivirus/clamav/files/clamd.service b/app-antivirus/clamav/files/clamd.service
new file mode 100644
index 000000000000..efdab4314a22
--- /dev/null
+++ b/app-antivirus/clamav/files/clamd.service
@@ -0,0 +1,7 @@
+.include /usr/lib/systemd/system/clamd@.service
+
+[Unit]
+Description=Generic ClamAV scanner daemon
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-antivirus/clamav/files/clamd_at.service b/app-antivirus/clamav/files/clamd_at.service
new file mode 100644
index 000000000000..c5ad8dfa6899
--- /dev/null
+++ b/app-antivirus/clamav/files/clamd_at.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=clamd scanner (%i) daemon
+After=nss-lookup.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/clamd -c /etc/clamd%i.conf
+Restart=on-failure
+PrivateTmp=true
diff --git a/app-antivirus/clamav/files/tmpfiles.d/clamav.conf b/app-antivirus/clamav/files/tmpfiles.d/clamav.conf
new file mode 100644
index 000000000000..1672df60eab5
--- /dev/null
+++ b/app-antivirus/clamav/files/tmpfiles.d/clamav.conf
@@ -0,0 +1 @@
+d /run/clamav 0710 clamav clamav