diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog --- a/app-antivirus/clamav/ChangeLog +++ b/app-antivirus/clamav/ChangeLog @@ -2,6 +2,12 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.308 2008/09/13 22:48:04 dertobi123 Exp $ + 30 Nov 2008; Nathan Brink clamav-0.94.2-r1.ebuild: + In response to Gentoo bug #249231 : pulls in changes to files/clamd.rc + + 30 Nov 2008; Nathan Brink clamav-0.94.2.ebuild: + In response to bump for Gentoo bug #248798 + 13 Sep 2008; Tobias Scherbaum clamav-0.94.ebuild: Add missing buildtime dep on dev-util/pkgconfig, #237552 diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest --- a/app-antivirus/clamav/Manifest +++ b/app-antivirus/clamav/Manifest @@ -9,7 +9,7 @@ AUX clamav-0.94.2-nls.patch~ 2429 RMD160 AUX clamav-milter.README.gentoo 1124 RMD160 4fb1e2d9b444874838bcea1071969ca6862fb15b SHA1 0b9b86a0e7732eaaf7f880859265754f7a4efd3a SHA256 5e7b142b68964bc3463b077e5698fa77cace45ea9612258b1e1849cee944dd11 AUX clamav.logrotate 355 RMD160 f59cd8ce96da8210aa858ee59ee3b6940e3253a6 SHA1 5fbd9364997400681d5a93cb50cac8a0f188e56f SHA256 ab91f784d5098d2162be9277e3a006bdb392d9d89975838ad4ac7dfd8b418170 AUX clamd.conf 234 RMD160 b517b05e587637cbdd443f7ca3625d582e32722f SHA1 564b1e2f6cf85567f69f2e20cbc942967fa6304b SHA256 17bf4fe3596dc5b145e4163d85181e2edcaa214df3cf9072d852ba0e7a569891 -AUX clamd.rc 3686 RMD160 0298ad54c13bb2c9d2e667270546308dbc581d7d SHA1 22299bf3a4812afbf45b792c55bc31c552fe12df SHA256 0f68262e6c55883d2f32cfdbbfeb33f64fc9c4bf019f59ae6b7bc864fa2d346c +AUX clamd.rc 3715 RMD160 372286b13c7c9b6f9d4cf8038387465d1b823596 SHA1 864ff3b8cb37771683fc6badd63df729056bb2fe SHA256 3fecac149ce0f7a16857113f4f3a58773e94bd665f6f8a67f9012a4d524edfa2 AUX lib-ld.m4 3417 RMD160 7b412510e7ef9966f70ed29937e3556283128a9b SHA1 8b72b8f5f76e41e4ca0f2521c06c568490894a84 SHA256 18c4c458009da32c9daf0ea332a539e5edc82ba009b6c2faac004626313f00e5 DIST clamav-0.94.1.tar.gz 21817818 RMD160 268d3b4b00c208f8a9aa3bfaa430eb8d22a4bf33 SHA1 8eed11eb68dc6cb15d4bb12de034a4252dc09373 SHA256 15cd3f5ed349f736b9926dd118d0b8edda7d58fe1f73118d4ffd21b3016f5dea DIST clamav-0.94.1rc1.tar.gz 21534700 RMD160 b837748d2e6ef6cc052b386ae326945d8538d0b1 SHA1 01c6a6c7c3bde28948e5e57b6e23939b4b5c742f SHA256 c8aa6ca9fce67ebc5dceb8bc3370132f46cd20d2d0e069882f6b7c25ef44299e @@ -17,5 +17,5 @@ DIST clamav-0.94.2.tar.gz 22107637 RMD16 EBUILD clamav-0.94.1.ebuild 5277 RMD160 47b1cca419956a461cebfff288c05e319fc93fce SHA1 2ba1d6975c3685a58d7fc79d327a147181a79ba2 SHA256 a6508ed88a33a0276d563bb1e2754c2fc15f5b6e49ae7aa0862e73b64f5a1dbe EBUILD clamav-0.94.1_rc1.ebuild 5277 RMD160 47b1cca419956a461cebfff288c05e319fc93fce SHA1 2ba1d6975c3685a58d7fc79d327a147181a79ba2 SHA256 a6508ed88a33a0276d563bb1e2754c2fc15f5b6e49ae7aa0862e73b64f5a1dbe EBUILD clamav-0.94.2.ebuild 5277 RMD160 47b1cca419956a461cebfff288c05e319fc93fce SHA1 2ba1d6975c3685a58d7fc79d327a147181a79ba2 SHA256 a6508ed88a33a0276d563bb1e2754c2fc15f5b6e49ae7aa0862e73b64f5a1dbe -MISC ChangeLog 46988 RMD160 e876395945075dc49b16db0f0d2d4f0d86bb83fa SHA1 8482fbd8b7480b32616265d18fd45557e4caebc5 SHA256 3f400d8adbd5919d969d5893bc64214c21cf2b5b84b0bc67f927c2675562c472 +MISC ChangeLog 47271 RMD160 7ee6b0d6774883828b9d138913dc732fd7ea31ba SHA1 6fa5835811f9d31686db7c23afff0b9fb7621718 SHA256 de108b2b6eb62960c5a965378e4d94a3d0fe0ee5726e25d62bb29bc8c9ab64d0 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58 diff --git a/app-antivirus/clamav/clamav-0.94.2-r1.ebuild b/app-antivirus/clamav/clamav-0.94.2-r1.ebuild new file mode 100644 --- /dev/null +++ b/app-antivirus/clamav/clamav-0.94.2-r1.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.94.ebuild,v 1.10 2008/09/13 22:48:04 dertobi123 Exp $ + +inherit autotools eutils flag-o-matic fixheadtails multilib versionator + +# for when rc1 is appended to release candidates: +MY_PV=$(replace_version_separator 3 ''); +MY_P="${PN}-${MY_PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Clam Anti-Virus Scanner" +HOMEPAGE="http://www.clamav.net/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="bzip2 crypt iconv mailwrapper milter nls selinux test ipv6" + +COMMON_DEPEND="bzip2? ( app-arch/bzip2 ) + crypt? ( >=dev-libs/gmp-4.1.2 ) + milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) + iconv? ( virtual/libiconv ) + nls? ( sys-devel/gettext ) + dev-libs/gmp + >=sys-libs/zlib-1.2.1-r3 + >=sys-apps/sed-4" + +DEPEND="${COMMON_DEPEND} + >=dev-util/pkgconfig-0.20 + test? ( dev-libs/check >=dev-util/duma-2.5.13 dev-util/valgrind )" + +RDEPEND="${COMMON_DEPEND} + selinux? ( sec-policy/selinux-clamav ) + sys-apps/grep" + +PROVIDE="virtual/antivirus" + +#until bug #235581 is cleared up: +RESTRICT="test" + +pkg_setup() { + if use milter; then + if [ ! -e /usr/$(get_libdir)/libmilter.a ] ; then + ewarn "In order to enable milter support, clamav needs sendmail with enabled milter" + ewarn "USE flag, or mail-filter/libmilter package." + fi + fi + + enewgroup clamav + enewuser clamav -1 -1 /dev/null clamav +} + +src_unpack() { + unpack ${A} + cd "${S}" + # This newer version of ClamAV packages libtool.m4 and lt*.m4 in m4, + # while previous versions did not. + # Since autoreconf invokes libtoolize, a different version of ltmain.sh that doesn't + # match up with the version of the *.m4 files gets thrown into this directory. + # This problem showed up for me in the packages libtool's use of $ECHO while my + # system's libtool's instead used $echo internally, and the .m4 file provides the value of + # $echo or $ECHO. + einfo "removing possibly incompatible libtool-related m4 files" + rm m4/libtool.m4 m4/lt*.m4 || die "unable to remove possibly incompatible libtool-related m4 files" + epatch "${FILESDIR}"/${MY_P}-buildfix.patch + epatch "${FILESDIR}"/${MY_P}-nls.patch + + # If nls flag is disabled, gettext may not be available, but eautoreconf + # needs this file (bug #218892). + use nls || cp "${FILESDIR}"/lib-ld.m4 m4/ + + AT_M4DIR="m4" eautoreconf +} + +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" + use mailwrapper && \ + myconf="${myconf} --with-sendmail=/usr/sbin/sendmail.sendmail" + } + + ht_fix_file configure + econf ${myconf} \ + $(use_enable bzip2) \ + $(use_enable nls) \ + $(use_enable ipv6) \ + $(use_with iconv) \ + --disable-experimental \ + --with-dbdir=/var/lib/clamav || die + emake || die +} + +src_install() { + make DESTDIR="${D}" install || die + dodoc AUTHORS BUGS NEWS README ChangeLog FAQ + newconfd "${FILESDIR}"/clamd.conf clamd + newinitd "${FILESDIR}"/clamd.rc 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 yes:" \ + -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ + "${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:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \ + -e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \ + -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \ + -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ + "${D}"/etc/freshclam.conf + + if use milter ; then + echo " +START_MILTER=no +MILTER_NICELEVEL=19" \ + >> "${D}"/etc/conf.d/clamd + echo "MILTER_SOCKET=\"/var/run/clamav/clmilter.sock\"" \ + >>"${D}"/etc/conf.d/clamd + echo "MILTER_OPTS=\"-m 10 --timeout=0\"" \ + >>"${D}"/etc/conf.d/clamd + fi + + diropts "" + dodir /etc/logrotate.d + insopts -m0644 + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}.logrotate ${PN} +} + +pkg_postinst() { + echo + if use milter ; then + elog "For simple instructions how to setup the clamav-milter" + elog "read /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz" + echo + fi + ewarn "The soname for libclamav has changed in clamav-0.94." + ewarn "If you have upgraded from that or earlier version, it is" + ewarn "recommended to run revdep-rebuild, in order to fix anything" + ewarn "that links against libclamav.so library." + echo +} diff --git a/app-antivirus/clamav/files/clamd.rc b/app-antivirus/clamav/files/clamd.rc --- a/app-antivirus/clamav/files/clamd.rc +++ b/app-antivirus/clamav/files/clamd.rc @@ -96,17 +96,17 @@ start() { stop() { if [ "${START_CLAMD}" = "yes" ]; then ebegin "Stopping clamd" - start-stop-daemon --stop --quiet --name clamd + start-stop-daemon --stop --quiet --exec /usr/sbin/clamd eend $? "Failed to stop clamd" fi if [ "${START_FRESHCLAM}" = "yes" ]; then ebegin "Stopping freshclam" - start-stop-daemon --stop --quiet --name freshclam + start-stop-daemon --stop --quiet --exec /usr/bin/freshclam eend $? "Failed to stop freshclam" fi if [ "${START_MILTER}" = "yes" ]; then ebegin "Stopping clamav-milter" - start-stop-daemon --stop --quiet --name clamav-milter + start-stop-daemon --stop --quiet --exec /usr/sbin/clamav-milter eend $? "Failed to stop clamav-milter" fi }