# HG changeset patch # User Binki # Date 2009-07-02 23:36:33 # Node ID 643e26faadac2b4fbc93eb6a8331bff0d85fd45d # Parent a0b350127d6193855b124a9110e5967232fb002b app-antivirus/clamav: imported most of clamav-0.95.2 from Portage 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,11 @@ # Copyright 1999-2009 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 $ + 03 Jul 2009; Nathan Phillip Brink (ohnobinki) + +files/clamav-0.95.1-nls.patch, + +clamav-0.95.2.ebuild: + Imported most of clamav-0.95.2 from Portage. + 01 Jul 2009; Nathan Phillip Brink (ohnobinki) -clamav-0.94.1.ebuild, -files/clamav-0.94.1-buildfix.patch, -files/clamav-0.94.1-nls.patch, diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest --- a/app-antivirus/clamav/Manifest +++ b/app-antivirus/clamav/Manifest @@ -1,12 +1,15 @@ AUX clamav-0.94.2-buildfix.patch 845 RMD160 54d738e61fcae762c9e1445601845824f29dae2d SHA1 664e3c67af87c7bbd8a96a69ef047e3c2e68202f SHA256 d0353a0d698089e3e7fe29cbc6ac0386affd29d405a40bb4ba44753676762591 AUX clamav-0.94.2-nls.patch 2429 RMD160 0b1b54ade225791b3fada186dd60546fb4ebf1b9 SHA1 6368b108ea7932c5f0b75069f89ad861c8285e3b SHA256 0fd8c2a11d56685f88c8fddef446294df5e2c3f123682ebd652a0e948a1a8158 +AUX clamav-0.95.1-nls.patch 319 RMD160 403558e6e71e620da2092f80d1d5b450281cb468 SHA1 2ae10843856aa6d7fd9a42e92b8685a6e9e14fbf SHA256 7bba0e938ae577b2b338f1b48f0173a8ec7e3b6785893319fd044d77847d03ba 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 3825 RMD160 09da23ab2c5ebc7eac4f6f8feaff722e0658ac73 SHA1 073d4535a446d2a309d1503d2cb16ec97d572a02 SHA256 8253fb1a236b3346c1035b4fdc03597dbc44a170d4f871fab1ad2d17c1f355ce AUX lib-ld.m4 3417 RMD160 7b412510e7ef9966f70ed29937e3556283128a9b SHA1 8b72b8f5f76e41e4ca0f2521c06c568490894a84 SHA256 18c4c458009da32c9daf0ea332a539e5edc82ba009b6c2faac004626313f00e5 DIST clamav-0.94.2.tar.gz 22107637 RMD160 ae75e5f546f96b7fd0f76dcf9f4977ec95ba4dba SHA1 82373d25db8b836fd88b2414df43bb0c7192cced SHA256 1aec7fecff375958d067aceeb9782d3ff0be7c13bed0eecf6240fb089f8d268c +DIST clamav-0.95.2.tar.gz 25137010 RMD160 83cab51c224251316288e4c3189ba91f640e9f82 SHA1 7544b39d84f2233b984a9c2ce3ef74d407add483 SHA256 f5f2a5a9984fd1ade69a7c2cc78da2f5dc0c505f94ab58fb2aa6613399ab1c56 EBUILD clamav-0.94.2-r1.ebuild 5231 RMD160 4939f79b9dc95fa5cab9f5fac5b8761b508c1e43 SHA1 51f5c97a1474eac6f047148f2a6186ce033d1587 SHA256 8486b04ae3e7fe955a3c1da76d33e7db1c56b13025235b86947f0909a58192bd EBUILD clamav-0.94.2.ebuild 5231 RMD160 4939f79b9dc95fa5cab9f5fac5b8761b508c1e43 SHA1 51f5c97a1474eac6f047148f2a6186ce033d1587 SHA256 8486b04ae3e7fe955a3c1da76d33e7db1c56b13025235b86947f0909a58192bd +EBUILD clamav-0.95.2.ebuild 4111 RMD160 1c962a178dc749569835f56b948468153a7b26b8 SHA1 cf0bb9c093d6c6aff0b0f0aefa8fc84e4a0ffca7 SHA256 25ef28025a0b05baa0422386df8cf236d9c9d6eea3c6647f26d575d58f0c198a MISC ChangeLog 48135 RMD160 47d22809de95395fef0c49e6e784c923d76d3186 SHA1 5fd4b9df58eb5eb54862aa573b9152957bacc30b SHA256 f971d458143b2424f1ae31473b14fa11077e31bd0c4f8955b8aaf1596b503b1a MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58 diff --git a/app-antivirus/clamav/clamav-0.95.2.ebuild b/app-antivirus/clamav/clamav-0.95.2.ebuild new file mode 100644 --- /dev/null +++ b/app-antivirus/clamav/clamav-0.95.2.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.95.2.ebuild,v 1.5 2009/06/27 14:15:58 ranger Exp $ + +EAPI=2 + +inherit 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 clamdtop iconv milter selinux ipv6" + +COMMON_DEPEND="bzip2? ( app-arch/bzip2 ) + milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) + iconv? ( virtual/libiconv ) + clamdtop? ( sys-libs/ncurses ) + >=sys-libs/zlib-1.2.1-r3 + >=sys-apps/sed-4" + +DEPEND="${COMMON_DEPEND} + >=dev-util/pkgconfig-0.20" + +RDEPEND="${COMMON_DEPEND} + selinux? ( sec-policy/selinux-clamav ) + sys-apps/grep" + +PROVIDE="virtual/antivirus" + +RESTRICT="test" + +pkg_setup() { + enewgroup clamav + enewuser clamav -1 -1 /dev/null clamav +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-0.95.1-nls.patch" +} + +src_configure() { + has_version =sys-libs/glibc-2.2* && filter-lfs-flags + + ht_fix_file configure + econf \ + $(use_enable bzip2) \ + $(use_enable ipv6) \ + $(use_enable clamdtop) \ + $(use_enable milter) \ + $(use_with iconv) \ + --disable-experimental \ + --enable-id-check \ + --disable-zlib-vcheck \ + --with-dbdir=/var/lib/clamav || die +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS BUGS NEWS README ChangeLog FAQ + newconfd "${FILESDIR}/clamd.conf" clamd + newinitd "${FILESDIR}/clamd.rc" clamd + + 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 + + # Modify /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 + # And again same for /etc/clamav-milter.conf + # 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 /var/run/clamav/clamav-milter.pid:" \ + -e "s+^\#\(ClamdSocket\) .*+\1 unix:/var/run/clamav/clamd.sock+" \ + -e "s:.*\(User\) .*:\1 clamav:" \ + -e "s+^\#\(MilterSocket\) /.*+\1 unix:/var/run/clamav/clamav-milter.sock+" \ + -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ + -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamav-milter.log:" \ + "${D}"/etc/clamav-milter.conf + fi + + if use milter ; then + cat << EOF >> "${D}"/etc/conf.d/clamd +MILTER_NICELEVEL=19 +START_MILTER=no +EOF + fi + + diropts "" + dodir /etc/logrotate.d + insopts -m0644 + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}.logrotate ${PN} +} + +pkg_postinst() { + if use milter ; then + elog "For simple instructions how to setup the clamav-milter" + elog "read the clamav-milter.README.gentoo in /usr/share/doc/${PF}" + elog + fi + ewarn "The soname for libclamav has changed in clamav-0.95." + 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." +} diff --git a/app-antivirus/clamav/files/clamav-0.95.1-nls.patch b/app-antivirus/clamav/files/clamav-0.95.1-nls.patch new file mode 100644 --- /dev/null +++ b/app-antivirus/clamav/files/clamav-0.95.1-nls.patch @@ -0,0 +1,10 @@ +--- clamav-0.95.1/shared/output.c-orig 2009-04-04 10:17:42 +0000 ++++ clamav-0.95.1/shared/output.c 2009-04-04 10:18:30 +0000 +@@ -67,7 +67,7 @@ + pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER; + #endif + +-#ifdef C_LINUX ++#if defined(C_LINUX) && defined(HAVE_LIBINTL_H) + #include + #include