diff options
| -rw-r--r-- | app-antivirus/clamav/ChangeLog | 16 | ||||
| -rw-r--r-- | app-antivirus/clamav/Manifest | 13 | ||||
| -rw-r--r-- | app-antivirus/clamav/clamav-0.85-r1.ebuild | 100 | ||||
| -rw-r--r-- | app-antivirus/clamav/files/clamd.conf | 8 | ||||
| -rw-r--r-- | app-antivirus/clamav/files/clamd.rc.new | 48 | ||||
| -rw-r--r-- | app-antivirus/clamav/files/digest-clamav-0.85-r1 | 1 |
6 files changed, 175 insertions, 11 deletions
diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog index 65c46981361a..c1ed0721f5b2 100644 --- a/app-antivirus/clamav/ChangeLog +++ b/app-antivirus/clamav/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for app-antivirus/clamav # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.65 2005/05/11 21:27:33 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.66 2005/05/14 21:31:33 ticho Exp $ + +*clamav-0.85-r1 (14 May 2005) + + 14 May 2005; Andrej Kacian <ticho@gentoo.org> files/clamd.conf, + +files/clamd.rc.new, +clamav-0.85-r1.ebuild: + Provide useful out-of-the-box default configuration (bugs #66905, reported + by Steph L <linux4ibook@free.fr> and #86777, by Eero Volotinen + <eero@pronics.com>). Change location of clamd socket, pidfiles and logfiles. + (#70960 by Phil Pennock <gentoo@spodhuis.demon.nl>). Fixed initscript not to + print error message when freshclam reports database is up-to-date (#58446, + by Carsten Milkau <chat.noir@arcor.de>). Only use /etc/conf.d/clamd for + START_* settings (fixes #59911, by caspar-gentoo-bugs@cbothmer.org). Fix + configure options to use 'id' utility instead of /etc/passwd parsing + (#72540, by Gudleik Rasch <gudleik@rastamatra.org>). *clamav-0.85 (11 May 2005) diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest index 48bf465a4c29..10177627bc79 100644 --- a/app-antivirus/clamav/Manifest +++ b/app-antivirus/clamav/Manifest @@ -3,19 +3,22 @@ Hash: SHA1 MD5 34a649543043b4506c5ecdca94ddad41 clamav-0.85.ebuild 2314 MD5 bf2cf15ce5fddd93fffa28e8b0a3f50f clamav-0.84.ebuild 2314 -MD5 5c024f0b974bad76e9640c2af248ef1f ChangeLog 13342 +MD5 c7318a9877ba0eb3a720b9b8e90d96f9 clamav-0.85-r1.ebuild 3048 +MD5 87f5af61a9766e98fbe1da8fc69fc56c ChangeLog 14139 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184 MD5 6ea55388f51845c2f815589dfed047a4 clamav-0.83.ebuild 2332 +MD5 0bd0d31062475433335752e126830799 files/digest-clamav-0.85-r1 64 MD5 ad7d45b1be51c06986cb42c53e733d19 files/clamav-milter.README.gentoo 1311 MD5 9bbf2754f8178fd5164875d784aa9ffa files/digest-clamav-0.83 64 MD5 3e9877b8901f604bd65ea89ff18833b6 files/digest-clamav-0.84 64 MD5 0bd0d31062475433335752e126830799 files/digest-clamav-0.85 64 -MD5 e8dcbdecd955708ddc7c79399ffa6276 files/clamd.conf 166 +MD5 196736a2cfb77956ff3f22fd91886c0e files/clamd.rc.new 1252 +MD5 e29ee77ca9bfe28ed18dbf67a9c90e75 files/clamd.conf 193 MD5 1b3268d3723e003ad99bf706e6bf4312 files/clamd.rc 1444 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCgnjNQlM6RnzZP+IRAtI/AJ0W+ut3vatQhGglggtjT8xkILmo4wCgii/D -3zbVuP0D1X2Fpuv8oq47CM4= -=7m5z +iD8DBQFChm4/QlM6RnzZP+IRAhCwAJ9xb9OCU8VDC7P8cxHb6aPa7JvRqQCfdCvR +4bV8YtmmpjJFObIuoakxkRw= +=YJJD -----END PGP SIGNATURE----- diff --git a/app-antivirus/clamav/clamav-0.85-r1.ebuild b/app-antivirus/clamav/clamav-0.85-r1.ebuild new file mode 100644 index 000000000000..f480ba927998 --- /dev/null +++ b/app-antivirus/clamav/clamav-0.85-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.85-r1.ebuild,v 1.1 2005/05/14 21:31:33 ticho Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="Clam Anti-Virus Scanner" +HOMEPAGE="http://www.clamav.net/" +SRC_URI="mirror://sourceforge/clamav/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~hppa ~alpha ~ppc64 ~ia64" +IUSE="crypt milter selinux" + +DEPEND="virtual/libc + crypt? ( >=dev-libs/gmp-4.1.2 ) + milter? ( mail-mta/sendmail ) + >=sys-libs/zlib-1.2.1-r3 + >=net-misc/curl-7.10.0 + net-dns/libidn + >=sys-apps/sed-4" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-clamav ) + sys-apps/grep" +PROVIDE="virtual/antivirus" + +pkg_setup() { + if use milter; then + if ! built_with_use mail-mta/sendmail milter; then + ewarn "In order to enable milter support, clamav needs sendmail with enabled milter" + ewarn "USE flag. Either recompile sendmail with milter USE flag enabled, or disable" + ewarn "this flag for clamav as well to disable milter support." + die "need milter-enabled sendmail" + fi + fi + enewgroup clamav + enewuser clamav -1 /bin/false /dev/null clamav + pwconv || die +} + +src_compile() { + has_version =sys-libs/glibc-2.2* && filter-lfs-flags + + local myconf + + # we depend on fixed zlib, so we can disable this check to prevent redundant + # warning (bug #61749) + myconf="${myconf} --disable-zlib-vcheck" + # use id utility instead of /etc/passwd parsing (bug #72540) + myconf="${myconf} --enable-id-check" + use milter && myconf="${myconf} --enable-milter" + + econf ${myconf} --with-dbdir=/var/lib/clamav || die + emake || die +} + +src_install() { + make DESTDIR=${D} install || die + dodoc AUTHORS BUGS NEWS README ChangeLog FAQ INSTALL + newinitd ${FILESDIR}/clamd.rc.new clamd + dodoc ${FILESDIR}/clamav-milter.README.gentoo + + dodir /var/run/clamav + keepdir /var/run/clamav + fowners clamav:clamav /var/run/clamav + dodir /var/log/clamav + keepdir /var/log/clamav + fowners clamav:clamav /var/log/clamav + + # Change /etc/clamd.conf to be usable out of the box + sed -i -e "s:^\(Example\):\# \1:" \ + -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \ + -e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \ + -e "s:.*\(User\) .*:\1 clamav:" \ + -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \ + -e "s:^\#\(LogTime\).*:\1:" \ + ${D}/etc/clamd.conf + + # Do the same for /etc/freshclam.conf + sed -i -e "s:^\(Example\):\# \1:" \ + -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \ + -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \ + -e "s:^\#\(LogFile\) .*:\1 /var/log/freshclam.log:" \ + -e "s:^\#\(LogTime\).*:\1:" \ + ${D}/etc/freshclam.conf +} + +pkg_postinst() { + echo + ewarn "Warning: clamd and/or freshclam have not been restarted." + ewarn "You should restart them with: /etc/init.d/clamd restart" + echo + if use milter ; then + einfo "For simple instructions howto setup the clamav-milter..." + einfo "" + einfo "less /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz" + echo + fi +} diff --git a/app-antivirus/clamav/files/clamd.conf b/app-antivirus/clamav/files/clamd.conf index 94be9e1e8408..e50660bfabbb 100644 --- a/app-antivirus/clamav/files/clamd.conf +++ b/app-antivirus/clamav/files/clamd.conf @@ -1,9 +1,7 @@ # Config file for /etc/init.d/clamd -START_CLAMD=no -CLAMD_OPTS="" -CLAMD_LOG="" +# NOTICE: Since clamav-0.85-r1, only START_CLAMD and START_FRESHCLAM settings +# are used, other are silently ignored +START_CLAMD=yes START_FRESHCLAM=yes -FRESHCLAM_OPTS="-d -c 2" -FRESHCLAM_LOG="/var/log/clam-update.log" diff --git a/app-antivirus/clamav/files/clamd.rc.new b/app-antivirus/clamav/files/clamd.rc.new new file mode 100644 index 000000000000..8a3ebb4bda76 --- /dev/null +++ b/app-antivirus/clamav/files/clamd.rc.new @@ -0,0 +1,48 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.rc.new,v 1.1 2005/05/14 21:31:33 ticho Exp $ + +CLAMD_SOCKET=`grep ^LocalSocket /etc/clamd.conf | cut -d\ -f 2` + +depend() { + use net + provide antivirus +} + +start() { + if [ "${START_CLAMD}" = "yes" ]; then + if [ -S "${CLAMD_SOCKET:-/tmp/clamd}" ]; then + rm -f ${CLAMD_SOCKET:-/tmp/clamd} + fi + ebegin "Starting clamd" + start-stop-daemon --start --quiet \ + --exec /usr/sbin/clamd + eend $? "Failed to start clamd" + fi + if [ "${START_FRESHCLAM}" = "yes" ]; then + ebegin "Starting freshclam" + start-stop-daemon --start --quiet \ + --exec /usr/bin/freshclam + retcode=$? + if [ ${retcode} = 1 ]; then + eend 0 + einfo "Virus databases are already up to date." + else + eend ${retcode} "Failed to start freshclam." + fi + fi +} + +stop() { + if [ "${START_CLAMD}" = "yes" ]; then + ebegin "Stopping clamd" + start-stop-daemon --stop --quiet --name clamd + eend $? "Failed to stop clamd" + fi + if [ "${START_FRESHCLAM}" = "yes" ]; then + ebegin "Stopping freshclam" + start-stop-daemon --stop --quiet --name freshclam + eend $? "Failed to stop freshclam" + fi +} diff --git a/app-antivirus/clamav/files/digest-clamav-0.85-r1 b/app-antivirus/clamav/files/digest-clamav-0.85-r1 new file mode 100644 index 000000000000..dc72428f9d37 --- /dev/null +++ b/app-antivirus/clamav/files/digest-clamav-0.85-r1 @@ -0,0 +1 @@ +MD5 b6bf9b04d69b4e9cf917beca99d8169a clamav-0.85.tar.gz 4047244 |