Remove vulnerable app-antivirus/f-prot from deps wrt #233928.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

4 files changed, 11 insertions, 12 deletions

diff --git a/mail-filter/MailScanner/ChangeLog b/mail-filter/MailScanner/ChangeLog
index 25691f38bba6..200f8cf7174d 100644
--- a/mail-filter/MailScanner/ChangeLog
+++ b/mail-filter/MailScanner/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/MailScanner
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/MailScanner/ChangeLog,v 1.10 2010/01/03 16:46:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/MailScanner/ChangeLog,v 1.11 2010/03/06 18:41:09 ssuominen Exp $
+
+  06 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  MailScanner-4.70.7.1.ebuild:
+  Remove vulnerable app-antivirus/f-prot from deps wrt #233928.
 
   03 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
   MailScanner-4.70.7.1.ebuild:
diff --git a/mail-filter/MailScanner/MailScanner-4.70.7.1.ebuild b/mail-filter/MailScanner/MailScanner-4.70.7.1.ebuild
index 174e7d411f91..4249ec73ce80 100644
--- a/mail-filter/MailScanner/MailScanner-4.70.7.1.ebuild
+++ b/mail-filter/MailScanner/MailScanner-4.70.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/MailScanner/MailScanner-4.70.7.1.ebuild,v 1.7 2010/01/03 16:47:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/MailScanner/MailScanner-4.70.7.1.ebuild,v 1.8 2010/03/06 18:41:09 ssuominen Exp $
 
 inherit eutils versionator
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.mailscanner.info/files/4/tar/${PN}-install-${MY_PVR}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="clamav doc exim f-prot postfix spamassassin"
+IUSE="clamav doc exim postfix spamassassin"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
@@ -46,7 +46,6 @@ RDEPEND="${DEPEND}
 	exim? ( !postfix? ( mail-mta/exim ) )
 	!postfix? ( !exim? ( mail-mta/sendmail ) )
 	clamav? ( >=app-antivirus/clamav-0.88.4 )
-	f-prot? ( app-antivirus/f-prot )
 	spamassassin? ( >=mail-filter/spamassassin-3.1.5 )"
 
 S="${WORKDIR}/${PN}-${MY_PVR}"
@@ -87,7 +86,6 @@ src_unpack() {
 	# setup virus scanner(s)
 	VIRUS_SCANNERS=""
 	use clamav && VIRUS_SCANNERS="clamav ${VIRUS_SCANNERS}"
-	use f-prot && VIRUS_SCANNERS="f-prot ${VIRUS_SCANNERS}"
 
 	if [ "$VIRUS_SCANNERS" == "" ]; then
 		VIRUS_SCANNERS="none"
@@ -184,11 +182,10 @@ src_unpack() {
 	# update spam.assassin.prefs.conf
 	sed -i -e "s#YOURDOMAIN-COM#${YOURSITE}#" "${S}"/etc/spam.assassin.prefs.conf
 
-	# net-mail/clamav net-mail/f-prot package compatibility
+	# net-mail/clamav package compatibility
 	sed -i \
 		-e "s#/opt/MailScanner/lib#/usr/lib/MailScanner#" \
 		-e 's#^\(clamav\t.*/usr\)/local$#\1#' \
-		-e 's#^\(f-prot.*\)/usr/local/f-prot$#\1/opt/f-prot#' \
 		"${S}/etc/virus.scanners.conf"
 
 	# update lib files
diff --git a/mail-filter/MailScanner/Manifest b/mail-filter/MailScanner/Manifest
index 7e687dc1d1b7..89b37b0fdbc8 100644
--- a/mail-filter/MailScanner/Manifest
+++ b/mail-filter/MailScanner/Manifest
@@ -1,6 +1,6 @@
 AUX confd.mailscanner 147 RMD160 2472095d115d136498f93a6dca3ce540e335222f SHA1 377447317cf1354b4e377912d18a459b12f7a8d6 SHA256 d0ef32a53c83a2c2938d970f30b3765676fe4669b2ec98407c39ca070cd24bbb
 AUX initd.mailscanner 756 RMD160 f75589025bbe9e7a3bc2f10a4a5eadab11f8d36a SHA1 cb4c505b3c9f4f993b656b6c96c6992ae00be5e0 SHA256 ba63aec0dae9c820b533d467c3325ada70a4b73761bed2207d10814f82f31b65
 DIST MailScanner-install-4.70.7-1.tar.gz 8329186 RMD160 245e3e5f06f90d227a76bd7b4c28763ee2c06cdb SHA1 1e54cb379de9f79e4f4014bf2d91e1db878bb422 SHA256 b5d7487438dfd1559a4e8b6c6f42839a4fe87170760e3661002cc5f31ece4cc2
-EBUILD MailScanner-4.70.7.1.ebuild 9365 RMD160 582077cae1363d3639acbd6c675a7d9215b34368 SHA1 c0d72f7b651b829310a7bac243b91bcb4185c949 SHA256 48621165a815f0e33bfa217b45ea6d268c8264038a02c199c072a16b15745f2b
-MISC ChangeLog 3255 RMD160 78f30272785b631e2df2f08e5bd3dff954f9e407 SHA1 43d8f4b5a2aeea3c00dd41012c1018ba86da11c2 SHA256 1804af2f0a2972accdef2253b1884b6788f994847b2188cc52ae546b2a6586ad
-MISC metadata.xml 599 RMD160 b9b080a8834f777472235ce94c30f13ac0a085e8 SHA1 5472091f49bce3e6d0c1a41b72b9892dda4b0002 SHA256 bcef3288e4bea52714c4e2005128be0e823ba862d5fb8d84897ebda968f06f38
+EBUILD MailScanner-4.70.7.1.ebuild 9193 RMD160 f72927aee90087165611650821cbe5d1de813708 SHA1 df48a2521f59b80f9a7679ca381b43444c71a931 SHA256 10fcb0c11acfd03e948f3c66a5594d61b8ea375a025080a975521f50433fcf37
+MISC ChangeLog 3405 RMD160 7861663c7c205632ca9f5a64b8c2714853d4684e SHA1 f58c7ef2e003c0c5d623c7a77ada056f2ae3b137 SHA256 d90f7953c04e5d8a8b055c0db309bb128e8cc4ee720dd29147d4d20d76f8c54b
+MISC metadata.xml 507 RMD160 2288900de2cd3e263a463bad0df7df0c350837e5 SHA1 1f5af39db35da2555491bc93675eb51fca6097ed SHA256 015cd4117483ca9805b641ee8a3b5cbca689a1c8622c7c8d8c967fa861880fca
diff --git a/mail-filter/MailScanner/metadata.xml b/mail-filter/MailScanner/metadata.xml
index 68ec026e2427..60a157e0a420 100644
--- a/mail-filter/MailScanner/metadata.xml
+++ b/mail-filter/MailScanner/metadata.xml
@@ -8,8 +8,6 @@
 </maintainer>
 <use>
 	<flag name='exim'>Set <pkg>mail-mta</pkg> to used MTA</flag>
-	<flag name='f-prot'>Enable usage of <pkg>app-antivirus/f-prot</pkg> virus
-		scanner</flag>
 	<flag name='postfix'>Set <pkg>mail-mta/postfix</pkg> to used MTA</flag>
 	<flag name='spamassassin'>Enable usage of
 		<pkg>mail-filter/spamassassin</pkg> for spam protection</flag>