Apply patch to fix false positives. Bug #81477.

(Portage version: 2.0.51.16)

5 files changed, 115 insertions, 15 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 85c6d3706b5a..7019f62400d3 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,14 @@
 # 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.46 2005/02/08 18:02:22 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.47 2005/02/13 17:51:30 ticho Exp $
+
+*clamav-0.82-r1 (13 Feb 2005)
+
+  13 Feb 2005; Andrej Kacian <ticho@gentoo.org>
+  +files/clamav-0.82-MS05-002-false-positive-fix.patch,
+  +clamav-0.82-r1.ebuild:
+  Apply patch to prevent false positives. See bug #81477 for more info.
+  Reported by Jakub Moc <jakub.moc@seznam.cz>.
 
   08 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> clamav-0.82.ebuild:
   Stable on sparc
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index f81b2c3d74aa..c86a637bbb82 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,23 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9231f807ea29f2e46647d82f0cbb5a0b ChangeLog 10585
-MD5 4f620361b61c91340a4858f468d068d8 clamav-0.75.1.ebuild 1582
 MD5 9d62360a7a38f6147a6cfe97c777e035 clamav-0.80.ebuild 1790
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
+MD5 d9074b727d4cc50d263626058df2293a clamav-0.82-r1.ebuild 2075
 MD5 f3e0a0e2a0af48eb9d16fc66fdb6f78f clamav-0.81.ebuild 1963
 MD5 64d6a92024c638d9bbd9d4fd3b2fadf4 clamav-0.82.ebuild 1968
-MD5 ad7d45b1be51c06986cb42c53e733d19 files/clamav-milter.README.gentoo 1311
-MD5 e8dcbdecd955708ddc7c79399ffa6276 files/clamd.conf 166
+MD5 4f620361b61c91340a4858f468d068d8 clamav-0.75.1.ebuild 1582
+MD5 21e06147c74a196e333ab2feafff5998 files/digest-clamav-0.82-r1 64
 MD5 1b3268d3723e003ad99bf706e6bf4312 files/clamd.rc 1444
+MD5 9717d2ef21ce9c5fa9a08fb97d7c5269 files/clamav-0.82-MS05-002-false-positive-fix.patch 571
+MD5 e8dcbdecd955708ddc7c79399ffa6276 files/clamd.conf 166
 MD5 f0090a77dc10ba3899900622336b8610 files/digest-clamav-0.75.1 66
-MD5 a42aa0e5135bd2ad22288e4150ec89e2 files/digest-clamav-0.80 64
 MD5 90e45ae4932ab5efa4baa1936e016e10 files/digest-clamav-0.81 64
 MD5 21e06147c74a196e333ab2feafff5998 files/digest-clamav-0.82 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCCP69KRy60XGEcJIRAqezAJ9JT8/FCdWlPXsC4uTl4nNpEizFNwCeNEuQ
-kQpVXJZISL1PyZLDrUZlQqw=
-=ScGd
------END PGP SIGNATURE-----
+MD5 a42aa0e5135bd2ad22288e4150ec89e2 files/digest-clamav-0.80 64
+MD5 ad7d45b1be51c06986cb42c53e733d19 files/clamav-milter.README.gentoo 1311
diff --git a/app-antivirus/clamav/clamav-0.82-r1.ebuild b/app-antivirus/clamav/clamav-0.82-r1.ebuild
new file mode 100644
index 000000000000..0eb9325a2764
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.82-r1.ebuild
@@ -0,0 +1,74 @@
+# 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.82-r1.ebuild,v 1.1 2005/02/13 17:51:30 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"
+IUSE="crypt milter selinux"
+
+DEPEND="virtual/libc
+	crypt? ( >=dev-libs/gmp-4.1.2 )
+	>=sys-libs/zlib-1.2.1-r3
+	>=net-misc/curl-7.10.0"
+RDEPEND="selinux? ( sec-policy/selinux-clamav )"
+PROVIDE="virtual/antivirus"
+
+#S="${WORKDIR}/${P/_/}"
+
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 /bin/false /dev/null clamav
+	pwconv || die
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-MS05-002-false-positive-fix.patch || 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 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 TODO FAQ INSTALL
+	exeinto /etc/init.d ; newexe ${FILESDIR}/clamd.rc clamd
+	insinto /etc/conf.d ; newins ${FILESDIR}/clamd.conf clamd
+	dodoc ${FILESDIR}/clamav-milter.README.gentoo
+}
+
+pkg_postinst() {
+	echo
+	einfo "NOTE: As of clamav-0.80, the config file for clamd is no longer"
+	einfo "      /etc/clamav.conf, but /etc/clamd.conf. Adjust your"
+	einfo "      configuration accordingly before (re)starting clamd."
+	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/clamav-0.82-MS05-002-false-positive-fix.patch b/app-antivirus/clamav/files/clamav-0.82-MS05-002-false-positive-fix.patch
new file mode 100644
index 000000000000..3323864a5a20
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.82-MS05-002-false-positive-fix.patch
@@ -0,0 +1,24 @@
+diff -bur clamav-0.82/libclamav/special.c clamav-0.82-fixed/libclamav/special.c
+--- clamav-0.82/libclamav/special.c	2005-02-05 16:47:47.000000000 +0100
++++ clamav-0.82-fixed/libclamav/special.c	2005-02-13 18:40:08.923297848 +0100
+@@ -224,6 +224,12 @@
+ 		return 0;
+ 	}
+ 
++	if (memcmp(&form_type, "ACON", 4) != 0) {
++		/* Only scan MS animated icon files */
++		/* There is a *lot* of broken software out there that produces bad RIFF files */
++		return 0;
++	}
++
+ 	chunk_size = riff_endian_convert_32(chunk_size, big_endian);
+ 
+ 	do {
+@@ -234,6 +240,6 @@
+ 
+ 	if (offset < chunk_size) {
+ 		retval = 2;
+-	};
++	}
+ 	return retval;
+ }
diff --git a/app-antivirus/clamav/files/digest-clamav-0.82-r1 b/app-antivirus/clamav/files/digest-clamav-0.82-r1
new file mode 100644
index 000000000000..2f92ff85ec7b
--- /dev/null
+++ b/app-antivirus/clamav/files/digest-clamav-0.82-r1
@@ -0,0 +1 @@
+MD5 1b58972d8918f5174d7f05a35a48856b clamav-0.82.tar.gz 3565864