Version bump. Add bzip2, curl, gmp USE flags to control dependencies some more. Remov...

Package-Manager: portage-2.1.2-r6

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 49ee5bbd5bdce2c0ceea0615f4f4a37a45c90aa0..20bd26ad59492add8890866c293ed337ebf0dfe4 100644 (file)
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.197 2007/02/04 18:07:56 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.198 2007/02/14 14:49:33 ticho Exp $
+
+*clamav-0.90 (14 Feb 2007)
+
+  14 Feb 2007; Andrej Kacian <ticho@gentoo.org> -clamav-0.90_rc3.ebuild,
+  +clamav-0.90.ebuild:
+  Version bump. Add bzip2, curl, gmp USE flags to control dependencies some
+  more. Remove the rc3 ebuild.
 
   04 Feb 2007; Andrej Kacian <ticho@gentoo.org> -clamav-0.90_rc1.ebuild,
   -clamav-0.90_rc2.ebuild:

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 16061ecd47ef882240e56fd0dbfa71feb199b837..7449cb676dfe97b8d341217f34635c19a885e256 100644 (file)
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -20,7 +20,7 @@ SHA256 6ccae0a0f3f7be2946ed0975ea5093dac605889c44952bd4e02f20e91e606bce files/cl
 DIST clamav-0.88.5.tar.gz 8663193 RMD160 b0e24b90f2a085ded89fcd90f3434d6bc1981caf SHA1 eb4c671d14d43b7079f19da9d9ef37357fa24c83 SHA256 8b807fcb64e2c523d7da8002ca1174c4173526ae48a7deecca41db30f51cee8f
 DIST clamav-0.88.6.tar.gz 8929534 RMD160 efa53c600a70a8f808fbf9cde92ebf193b76e574 SHA1 5fe6efa7c7dc9eb157a78e7851392c737d586bb7 SHA256 cc7f90983aa61b3d893c3311e3f832c5faa204467143cff597ad80bf8ad24daa
 DIST clamav-0.88.7.tar.gz 9510548 RMD160 14d7c6255df618b16b704fc1cb5ce2b1385fa0e8 SHA1 7d7833dc454437ed7044b1c734f0a13e4dc1ead2 SHA256 702cb5928bff3d0e647a4a6b505d434e3a0f10f2af74bddac5239a200b92d1e2
-DIST clamav-0.90rc3.tar.gz 10784835 RMD160 24e66ec3352c7e1007cddea278cba161d0fb4e3d SHA1 77c33aa472c6a7cecb0b617ba8799bb0f18bacb4 SHA256 aba20f98453affeeb60427bdd432b7c5a5115f17aa2734cf1393c750f95d66ad
+DIST clamav-0.90.tar.gz 11575374 RMD160 1b22144d3a41376093b73bbeb5302092a18ca685 SHA1 574b84429b878df3a9d862ea386c970326850158 SHA256 c39005318d4a7d27d9710c3d71396b8c500e0bc5a184cb7392051c9ca9dea60d
 EBUILD clamav-0.88.5.ebuild 3393 RMD160 a2dafd606e79d9bc986fb1fe396c307e2f698da4 SHA1 d2563f545414e8d8bebc8a038f57670f5e8f0913 SHA256 28d7e0bdfff92a2ed345b5288552878a5a5da2e0676b7b0245bfb8c7dace97e2
 MD5 a13e71f6ea0d390f5337681d90f5da84 clamav-0.88.5.ebuild 3393
 RMD160 a2dafd606e79d9bc986fb1fe396c307e2f698da4 clamav-0.88.5.ebuild 3393
@@ -41,14 +41,14 @@ EBUILD clamav-0.88.7.ebuild 3432 RMD160 e96b060fd6cdb828ed19f25fcb66606a09949c27
 MD5 28a0ef2c2910d9e96558ca1c3e33f239 clamav-0.88.7.ebuild 3432
 RMD160 e96b060fd6cdb828ed19f25fcb66606a09949c27 clamav-0.88.7.ebuild 3432
 SHA256 cee9e104b7e6a6f3c2d4659b6b92825ece9078ff941b91ceac1b29ed0c245a78 clamav-0.88.7.ebuild 3432
-EBUILD clamav-0.90_rc3.ebuild 3650 RMD160 72f4728577b467a51df6c7b52caf7c66b59d852f SHA1 02a01defba6b20485e281e59ba696387ce2c0aab SHA256 7e822129ede7098d49838ae8e2c4555ba35e4e81a922ba7a3871f197581c1e26
-MD5 11f9d065e2a37710eb185c11f1bbe83a clamav-0.90_rc3.ebuild 3650
-RMD160 72f4728577b467a51df6c7b52caf7c66b59d852f clamav-0.90_rc3.ebuild 3650
-SHA256 7e822129ede7098d49838ae8e2c4555ba35e4e81a922ba7a3871f197581c1e26 clamav-0.90_rc3.ebuild 3650
-MISC ChangeLog 30849 RMD160 e109a7d65cb5345bc8dff2120725272232b06c8d SHA1 061394831eafac4c95c0ecb761a04e484676624c SHA256 7d605ec129d9cb1a0760179969085d657957f2a72fb240764879e63d25d3ca4c
-MD5 53cee73313f6a3ea4019080f296d51c4 ChangeLog 30849
-RMD160 e109a7d65cb5345bc8dff2120725272232b06c8d ChangeLog 30849
-SHA256 7d605ec129d9cb1a0760179969085d657957f2a72fb240764879e63d25d3ca4c ChangeLog 30849
+EBUILD clamav-0.90.ebuild 4252 RMD160 2bf5e8b55f6b1e24f5594313a262ea014aac0506 SHA1 f520e50f8d4738c1bdf854d9b787b0dfc873312c SHA256 5d482c89c634f16c04fbb1857597aee5e1a6065ec4390870b9321a705b8400e7
+MD5 ebaafba27fc4032dc7e674b94dad15c1 clamav-0.90.ebuild 4252
+RMD160 2bf5e8b55f6b1e24f5594313a262ea014aac0506 clamav-0.90.ebuild 4252
+SHA256 5d482c89c634f16c04fbb1857597aee5e1a6065ec4390870b9321a705b8400e7 clamav-0.90.ebuild 4252
+MISC ChangeLog 31081 RMD160 3ed9a1c38fbecc31bf8d910e705715a986f0fa88 SHA1 f8937d54d192c336c182deecba283db9891c3c48 SHA256 7c2302dc2d4017b785018781ca9050f4fc57bc73d282bac028bcfbe0c996f4d5
+MD5 91b1d6576ccbc7e28b85037a2c047a0a ChangeLog 31081
+RMD160 3ed9a1c38fbecc31bf8d910e705715a986f0fa88 ChangeLog 31081
+SHA256 7c2302dc2d4017b785018781ca9050f4fc57bc73d282bac028bcfbe0c996f4d5 ChangeLog 31081
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -68,13 +68,13 @@ SHA256 2e2d87de95403702c16fdcf253ab8f6faaec955053a2eabd917b097e50322d9e files/di
 MD5 bccf90d7043a4dcf5e63ebfb791fba03 files/digest-clamav-0.88.7-r2 244
 RMD160 5da87304d411960a91d80f102be4c2d4937479b6 files/digest-clamav-0.88.7-r2 244
 SHA256 2e2d87de95403702c16fdcf253ab8f6faaec955053a2eabd917b097e50322d9e files/digest-clamav-0.88.7-r2 244
-MD5 2e3a05dd18d1a8613dcd6db8a81e83e5 files/digest-clamav-0.90_rc3 250
-RMD160 d37cd4a4572faddc4815836278e7be7d839a9070 files/digest-clamav-0.90_rc3 250
-SHA256 11f2f8257bcad66dc24eca24ce8ae2ce1e6f0803150b77ae4dc79be449702d1a files/digest-clamav-0.90_rc3 250
+MD5 86c5fb07d5e490ef03e5b7837181c66d files/digest-clamav-0.90 241
+RMD160 50f0394e921a2e5b445a7202757943ef14680ac5 files/digest-clamav-0.90 241
+SHA256 9efe02b7f40c318f512bed0e5ddc59d52834a088a0528102ee8ece709ff5966e files/digest-clamav-0.90 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFxiEOQlM6RnzZP+IRAgmEAKCeuX6JoMrE4OHjRSLZSj0zKRC4HACfekIU
-kQ3lAX+4sQ8fTjatOz8RJco=
-=oDiU
+iD8DBQFF0yGMQlM6RnzZP+IRAlH/AKCqwSiOwbH4PSGoHEYWPAakYnd+YQCgihyS
+DQbV6nZwJLSm/HfvpnOasgI=
+=Aqxl
 -----END PGP SIGNATURE-----

diff --git a/app-antivirus/clamav/clamav-0.90_rc3.ebuild b/app-antivirus/clamav/clamav-0.90.ebuild
similarity index 73%
rename from app-antivirus/clamav/clamav-0.90_rc3.ebuild
rename to app-antivirus/clamav/clamav-0.90.ebuild
index 05006b80257768f67ddd83dd991861c44712fed6..b04e347579d22d539e1b2b7f8ae147f7341581ab 100644 (file)
--- a/app-antivirus/clamav/clamav-0.90_rc3.ebuild
+++ b/app-antivirus/clamav/clamav-0.90.ebuild
@@ -1,32 +1,33 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.90_rc3.ebuild,v 1.1 2007/02/01 18:08:25 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.90.ebuild,v 1.1 2007/02/14 14:49:33 ticho Exp $
 
 inherit eutils flag-o-matic fixheadtails
 
-MY_P="${P/_/}"
 DESCRIPTION="Clam Anti-Virus Scanner"
 HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt milter selinux mailwrapper"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 crypt curl gmp logrotate mailwrapper milter onaccess selinux"
 
 DEPEND="virtual/libc
+       bzip2? ( app-arch/bzip2 )
        crypt? ( >=dev-libs/gmp-4.1.2 )
+       curl? ( >=net-misc/curl-7.10.0 )
+       gmp? ( dev-libs/gmp )
        milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+       onaccess? ( sys-fs/dazuko )
        >=sys-libs/zlib-1.2.1-r3
-       >=net-misc/curl-7.10.0
        >=sys-apps/sed-4"
 RDEPEND="${DEPEND}
        selinux? ( sec-policy/selinux-clamav )
+       logrotate? ( app-admin/logrotate )
        sys-apps/grep"
 PROVIDE="virtual/antivirus"
 
-S="${WORKDIR}/${MY_P}"
-
 pkg_setup() {
        if use milter; then
                if [ ! -e /usr/lib/libmilter.a ] ; then
@@ -36,6 +37,11 @@ pkg_setup() {
                        die "need milter-enabled sendmail"
                fi
        fi
+       if use onaccess ; then
+               echo
+               ewarn "Warning: On access scan support is experimental, use at your own risk!"
+               echo
+       fi
        enewgroup clamav
        enewuser clamav -1 -1 /dev/null clamav
 }
@@ -58,7 +64,11 @@ src_compile() {
 
        ht_fix_file configure
        econf ${myconf} \
-               --enable-experimental \
+               $(use_enable bzip2) \
+               $(use_with curl libcurl) \
+               $(use_enable gmp dsig) \
+               $(use_enable onaccess clamuko) \
+               --disable-experimental \
                --with-dbdir=/var/lib/clamav || die
        emake || die
 }
@@ -91,6 +101,7 @@ src_install() {
                -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:" \
                ${D}/etc/freshclam.conf
 
        if use milter ; then
@@ -101,20 +112,30 @@ src_install() {
                echo "MILTER_OPTS=\"-m 10 --timeout=0\"" \
                        >>${D}/etc/conf.d/clamd
        fi
+
+       if use onaccess ; then
+               dodir /etc/udev/rules.d
+               echo "KERNEL==\"dazuko\", NAME=\"%k\", GROUP=\"clamav\", MODE=\"0660\"" \
+                       >${D}/etc/udev/rules.d/60-dazuko.rules
+       fi
+
+       if use logrotate ; then
+               diropts ""
+               dodir /etc/logrotate.d
+               insopts -m0644
+               insinto /etc/logrotate.d
+               newins ${FILESDIR}/${PN}.logrotate ${PN}
+       fi
 }
 
 pkg_postinst() {
        echo
        ewarn "Warning: clamd and/or freshclam have not been restarted."
-       ewarn "You should restart them with: /etc/init.d/clamd restart"
+       ewarn "You should restart them to start using new version: /etc/init.d/clamd restart"
        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 "This is a RELEASE CANDIDATE version, with EXPERIMENTAL code ENABLED."
-       ewarn "USE AT YOUR OWN RISK. Report bugs at http://bugs.clamav.net"
-       echo
-       ebeep 3
 }

diff --git a/app-antivirus/clamav/files/digest-clamav-0.90 b/app-antivirus/clamav/files/digest-clamav-0.90
new file mode 100644 (file)
index 0000000..e4c17f0
--- /dev/null
+++ b/app-antivirus/clamav/files/digest-clamav-0.90
@@ -0,0 +1,3 @@
+MD5 f04372e49c3c5ff3bd94bbe1fef2eaca clamav-0.90.tar.gz 11575374
+RMD160 1b22144d3a41376093b73bbeb5302092a18ca685 clamav-0.90.tar.gz 11575374
+SHA256 c39005318d4a7d27d9710c3d71396b8c500e0bc5a184cb7392051c9ca9dea60d clamav-0.90.tar.gz 11575374

diff --git a/app-antivirus/clamav/files/digest-clamav-0.90_rc3 b/app-antivirus/clamav/files/digest-clamav-0.90_rc3
deleted file mode 100644 (file)
index c80b075..0000000
--- a/app-antivirus/clamav/files/digest-clamav-0.90_rc3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5af2bdbbb255829dd590609d900c1854 clamav-0.90rc3.tar.gz 10784835
-RMD160 24e66ec3352c7e1007cddea278cba161d0fb4e3d clamav-0.90rc3.tar.gz 10784835
-SHA256 aba20f98453affeeb60427bdd432b7c5a5115f17aa2734cf1393c750f95d66ad clamav-0.90rc3.tar.gz 10784835