Only install malware definition files conditionally, and issue an elog warning for...

Package-Manager: portage-2.1.2.3

diff --git a/app-antivirus/bitdefender-console/ChangeLog b/app-antivirus/bitdefender-console/ChangeLog
index c71169db1d9f4506014ade065f615083e3a630e9..16672cfbafe8de876e36f48338b6458cdcb2e718 100644 (file)
--- a/app-antivirus/bitdefender-console/ChangeLog
+++ b/app-antivirus/bitdefender-console/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-antivirus/bitdefender-console
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/bitdefender-console/ChangeLog,v 1.18 2007/04/08 20:58:05 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/bitdefender-console/ChangeLog,v 1.19 2007/04/08 22:55:16 ticho Exp $
+
+  08 Apr 2007; Andrej Kacian <ticho@gentoo.org>
+  bitdefender-console-7.0.1-r1.ebuild, bitdefender-console-7.1.ebuild:
+  Only install malware definition files conditionally, and issue an elog
+  warning for user to update the definitions himself - see bug #158219,
+  comment #5 for details. 7.1 is ready to be unmasked. Also updated SRC_URI
+  for 7.0.1-r1 (bug #152059).
 
   08 Apr 2007; Andrej Kacian <ticho@gentoo.org>
   -bitdefender-console-7.0.1.ebuild:

diff --git a/app-antivirus/bitdefender-console/Manifest b/app-antivirus/bitdefender-console/Manifest
index 0d5deff93d54fb3579dbccb7f9ea725df70cfb14..bb9ff70012b1ddf2d1f53aecf360fbaaed7e34fd 100644 (file)
--- a/app-antivirus/bitdefender-console/Manifest
+++ b/app-antivirus/bitdefender-console/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 DIST BitDefender-Console-Antivirus-7.0.1-3.linux-gcc3x.i586.run 2348482 RMD160 3cfe335bfb98cc4e4029252c2266a80b0c0540c2 SHA1 a858add82a491f29bd401de41979d8da08d08d53 SHA256 9043a752fb783dd02341859cd37b0c586e881d76fea19620f47bf230905a6cf9
 DIST BitDefender-Console-Antivirus-7.1-3.linux-gcc3x.i386.run 4387368 RMD160 e39354e778ee8e300f3979c85c1d14abf5b1d601 SHA1 25c2b7bde404feb6187c321eeae2c9a7d8a3ebc2 SHA256 c7cb158e95839faddb585875baa08e83d3f91d37e33367a95e0155627d11aefc
-EBUILD bitdefender-console-7.0.1-r1.ebuild 1967 RMD160 13b02e163c7dc21473776ce4c32d516567c198ed SHA1 f4bc5330a4acea72f124e95dc98d3766c352fa3c SHA256 5a32c1f9eeef5fde64c6ae3adec6a2bedcb55b3f4cc4abd7d676ee80002861c6
-MD5 7c82a8e69f3a94bee12c1aad9d0d6d1f bitdefender-console-7.0.1-r1.ebuild 1967
-RMD160 13b02e163c7dc21473776ce4c32d516567c198ed bitdefender-console-7.0.1-r1.ebuild 1967
-SHA256 5a32c1f9eeef5fde64c6ae3adec6a2bedcb55b3f4cc4abd7d676ee80002861c6 bitdefender-console-7.0.1-r1.ebuild 1967
-EBUILD bitdefender-console-7.1.ebuild 2278 RMD160 a94168cd3f047a00adf2b28d35e2d0e94e3c4ed0 SHA1 002f0c90858e74db37983ce7be3ef33217af00c0 SHA256 9254ba58e4051bace0392a838e275c013032facf81e8878b40864b5c2f261862
-MD5 7a05d9d34822b9026e210ad5035c32a9 bitdefender-console-7.1.ebuild 2278
-RMD160 a94168cd3f047a00adf2b28d35e2d0e94e3c4ed0 bitdefender-console-7.1.ebuild 2278
-SHA256 9254ba58e4051bace0392a838e275c013032facf81e8878b40864b5c2f261862 bitdefender-console-7.1.ebuild 2278
-MISC ChangeLog 2770 RMD160 102942f7b1f20d023e39174e204b8643904fb924 SHA1 11bf321a812d98fbec77af3fae517e51606451f3 SHA256 924a27b1c7b11a30afb389471406a48c8008fe97d725a1dab30a7f554d298fe2
-MD5 33c744d5f7fb81be2b2ce450f11cdb19 ChangeLog 2770
-RMD160 102942f7b1f20d023e39174e204b8643904fb924 ChangeLog 2770
-SHA256 924a27b1c7b11a30afb389471406a48c8008fe97d725a1dab30a7f554d298fe2 ChangeLog 2770
+EBUILD bitdefender-console-7.0.1-r1.ebuild 1979 RMD160 976169d669781c22e543e8db8ce957a723aa1543 SHA1 54a098af837d54c97fdbe75882e6b6b8dda7a721 SHA256 c94b0977f199e9dd58a06f7c9d85930bfb168d326e7868bf09404917d5554fba
+MD5 3d2ff33309d5c6eab73b197094affb88 bitdefender-console-7.0.1-r1.ebuild 1979
+RMD160 976169d669781c22e543e8db8ce957a723aa1543 bitdefender-console-7.0.1-r1.ebuild 1979
+SHA256 c94b0977f199e9dd58a06f7c9d85930bfb168d326e7868bf09404917d5554fba bitdefender-console-7.0.1-r1.ebuild 1979
+EBUILD bitdefender-console-7.1.ebuild 2374 RMD160 470e16ebf86ab4f123ded7537818c8117d52aff0 SHA1 16b4bfc3949f626cf714680ea5e98eb0f093a7a4 SHA256 9256a63975aa39ebf752b07ef8093aad8b30c2e969676307131fb5d7021bf704
+MD5 910878a47f46d1550b8e911110da790f bitdefender-console-7.1.ebuild 2374
+RMD160 470e16ebf86ab4f123ded7537818c8117d52aff0 bitdefender-console-7.1.ebuild 2374
+SHA256 9256a63975aa39ebf752b07ef8093aad8b30c2e969676307131fb5d7021bf704 bitdefender-console-7.1.ebuild 2374
+MISC ChangeLog 3141 RMD160 a90d33c705fe13f799eede7f150b834a8a64eb34 SHA1 a85fc0a05f17237fc4c8a5fd9746949361de04d5 SHA256 503ceec32998310e1cbf672eb16d38a08d166f3e45961a166e0bb819311e13dc
+MD5 cf0b1d2b1fe0d85e831e209b3e610b38 ChangeLog 3141
+RMD160 a90d33c705fe13f799eede7f150b834a8a64eb34 ChangeLog 3141
+SHA256 503ceec32998310e1cbf672eb16d38a08d166f3e45961a166e0bb819311e13dc ChangeLog 3141
 MISC metadata.xml 376 RMD160 063d66096bd572de8d1806641024caf616842aca SHA1 a15457eabd47bcf1d9577cb0ab0e9160dbfa0e0c SHA256 087d5501fd34e6c27ce3830ce3efa420cdfd46cdc53b7f5970ec8daa7d6153b7
 MD5 b799e6d40bbe29a415e5c3f80faca25a metadata.xml 376
 RMD160 063d66096bd572de8d1806641024caf616842aca metadata.xml 376
@@ -28,7 +28,7 @@ SHA256 753cbcde0a4132b40022662d95475c82ff1431395cad0f2706a37eb4508df6dd files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGGVdjQlM6RnzZP+IRAm76AKCJbODAHRr+LQYFNRXs/8dZtqm+mACfbUO1
-YQ1cZdJU4poIoJiZ3j1iVwY=
-=xDf3
+iD8DBQFGGXLcQlM6RnzZP+IRAq2ZAJ9vs57RwdBmkxyLe2HoM9yaoQ+U6wCgtpae
+YFSuLY8s8iV9PGaQl9UNPAg=
+=r6pC
 -----END PGP SIGNATURE-----

diff --git a/app-antivirus/bitdefender-console/bitdefender-console-7.0.1-r1.ebuild b/app-antivirus/bitdefender-console/bitdefender-console-7.0.1-r1.ebuild
index d568939368a94d3beb839a6e7882294a0dbe1c59..3d0dc25eae93f28abef41bddfba39fa873533839 100644 (file)
--- a/app-antivirus/bitdefender-console/bitdefender-console-7.0.1-r1.ebuild
+++ b/app-antivirus/bitdefender-console/bitdefender-console-7.0.1-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/bitdefender-console/bitdefender-console-7.0.1-r1.ebuild,v 1.7 2007/01/23 15:15:17 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/bitdefender-console/bitdefender-console-7.0.1-r1.ebuild,v 1.8 2007/04/08 22:55:16 ticho Exp $
 
 MY_P=BitDefender-Console-Antivirus-${PV}-3.linux-gcc3x.i586.run
 S=${WORKDIR}/i386
 
 DESCRIPTION="BitDefender console antivirus"
 HOMEPAGE="http://www.bitdefender.com/"
-SRC_URI="ftp://ftp.bitdefender.com/pub/linux/free/bitdefender-console/en/${MY_P}"
+SRC_URI="http://download.bitdefender.com/unices/old/linux/free/bitdefender-console/en/${MY_P}"
 
 DEPEND="app-arch/tar
        app-arch/gzip"

diff --git a/app-antivirus/bitdefender-console/bitdefender-console-7.1.ebuild b/app-antivirus/bitdefender-console/bitdefender-console-7.1.ebuild
index 27f8cb30c3c255f8921df82c4a26ba889a78d7a5..69a0793acecf69127bbc335c01989ed940b5aa63 100644 (file)
--- a/app-antivirus/bitdefender-console/bitdefender-console-7.1.ebuild
+++ b/app-antivirus/bitdefender-console/bitdefender-console-7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/bitdefender-console/bitdefender-console-7.1.ebuild,v 1.2 2007/01/23 15:15:18 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/bitdefender-console/bitdefender-console-7.1.ebuild,v 1.3 2007/04/08 22:55:16 ticho Exp $
 
 MY_P="BitDefender-Console-Antivirus-${PV}-3.linux-gcc3x.i386.run"
 S="${WORKDIR}/i386"
@@ -65,20 +65,21 @@ src_install() {
        insopts -m 644
        doins bdc.ini *.so
 
-       dodir /opt/bdc/Plugins
-       insinto /opt/bdc/Plugins
-       doins Plugins/*
+       # Conditionally installing malware definitions to workaround file
+       # collision issue described in bug #158219, comment #5.
+       if [[ ! -f /opt/bdc/Plugins/update.txt ]] ; then
+               dodir /opt/bdc/Plugins
+               insinto /opt/bdc/Plugins
+               doins Plugins/*
+       fi
 
        doman man/man?/*
        dodoc doc/*
 }
 
-pkg_preinst() {
-       [[ -f /opt/bdc/Plugins/update.txt ]] && rm -f /opt/bdc/Plugins/*
-}
-
 pkg_postinst() {
        elog You should update virus database by running bdc --update
+
        [ -x /sbin/chpax ] && {
                echo
                ewarn "Disabling some PaX restrictions (\`/sbin/chpax -spm /opt/bdc/bdc\`, see bug #83695)"