Apply PaX workaround (bug #83695). Keep /var/bdc/* dirs.

(Portage version: 2.0.51.22-r1)

5 files changed, 97 insertions, 3 deletions

diff --git a/app-antivirus/bitdefender-console/ChangeLog b/app-antivirus/bitdefender-console/ChangeLog
index 4e72e16de17f..9aeb71e3be56 100644
--- a/app-antivirus/bitdefender-console/ChangeLog
+++ b/app-antivirus/bitdefender-console/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-antivirus/bitdefender-console
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/bitdefender-console/ChangeLog,v 1.8 2005/04/24 23:56:58 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/bitdefender-console/ChangeLog,v 1.9 2005/05/30 20:42:50 ticho Exp $
+
+*bitdefender-console-7.0.1-r1 (30 May 2005)
+
+  30 May 2005; Andrej Kacian <ticho@gentoo.org>
+  bitdefender-console-7.0.1.ebuild, +bitdefender-console-7.0.1-r1.ebuild:
+  Added PaX workaround as suggested in bug #83695. Keep dirs
+  /var/bdc/infected, /var/bdc/suspected.
 
   24 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
   bitdefender-console-7.0.1.ebuild:
diff --git a/app-antivirus/bitdefender-console/Manifest b/app-antivirus/bitdefender-console/Manifest
index 4fafb67e8763..e4c5d44bfb4f 100644
--- a/app-antivirus/bitdefender-console/Manifest
+++ b/app-antivirus/bitdefender-console/Manifest
@@ -1,4 +1,6 @@
+MD5 b90e6caef45b609106d152836fc238c9 bitdefender-console-7.0.1-r1.ebuild 1753
+MD5 cdb33f19f9ac40289e243964faa5d36e bitdefender-console-7.0.1.ebuild 1587
 MD5 e91e6d019ca821039e9c9da7fa8505ac ChangeLog 1259
 MD5 b799e6d40bbe29a415e5c3f80faca25a metadata.xml 376
-MD5 cdb33f19f9ac40289e243964faa5d36e bitdefender-console-7.0.1.ebuild 1587
+MD5 3956e0264dc3f7ec9cddc5cd82cdbb90 files/digest-bitdefender-console-7.0.1-r1 104
 MD5 3956e0264dc3f7ec9cddc5cd82cdbb90 files/digest-bitdefender-console-7.0.1 104
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
new file mode 100644
index 000000000000..10c69f4c2b7c
--- /dev/null
+++ b/app-antivirus/bitdefender-console/bitdefender-console-7.0.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2005 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.1 2005/05/30 20:42:50 ticho Exp $
+
+IUSE="emul-linux-x86"
+
+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}"
+
+DEPEND="app-arch/tar
+	app-arch/gzip"
+RDEPEND="virtual/libc
+	 emul-linux-x86? ( >=app-emulation/emul-linux-x86-baselibs-1.0 )"
+PROVIDE="virtual/antivirus"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="-* ~x86 ~amd64"
+
+src_unpack () {
+	#Extract the tgz achive contained in MY_P
+	SKIP=`sed -n '/^\x1F/q;p' < ${DISTDIR}/${MY_P} | wc -c`
+	dd if=${DISTDIR}/${MY_P} ibs=1 skip=$SKIP 2> /dev/null | tar -xz || die "Failed to extract from archive"
+}
+
+src_install ()
+{
+	cd ${S}
+
+	INSTALLDIR=/opt
+	QUARDIR=/var/bdc
+	INIFILE=bdc.ini
+
+	(
+		dodir ${QUARDIR} &&
+		dodir ${QUARDIR}/infected &&
+		dodir ${QUARDIR}/suspected
+	) || die "Unable to create quarantine directories"
+
+	cd opt/bdc
+	echo "InfectedFolder = ${QUARDIR}/infected" >> $INIFILE
+	echo "SuspectedFolder = ${QUARDIR}/suspected" >> $INIFILE
+
+	insinto /opt/bdc
+	insopts -m 755
+	doins bdc
+	dodir /usr/bin
+	dosym /opt/bdc/bdc /usr/bin/bdc
+
+	dodir /var/bdc
+	dodir /var/bdc/infected
+	keepdir /var/bdc/infected
+	dodir /var/bdc/suspected
+	keepdir /var/bdc/suspected
+
+	insopts -m 644
+	doins bdc.ini *.so
+	insinto /opt/bdc/Plugins
+	doins Plugins/*
+
+	doman man/*
+	dodoc doc/*
+}
+
+pkg_postinst ()
+{
+	einfo You should upgrade  virus database by running bdc --update
+	[ -x /sbin/chpax ] && {
+		echo
+		ewarn "Disabling some PaX restrictions (\`/sbin/chpax -spm /opt/bdc/bdc\`, see bug #83695)"
+		/sbin/chpax -spm /opt/bdc/bdc
+		echo
+	}
+}
diff --git a/app-antivirus/bitdefender-console/bitdefender-console-7.0.1.ebuild b/app-antivirus/bitdefender-console/bitdefender-console-7.0.1.ebuild
index fee23a8ea858..f8a5791b8c53 100644
--- a/app-antivirus/bitdefender-console/bitdefender-console-7.0.1.ebuild
+++ b/app-antivirus/bitdefender-console/bitdefender-console-7.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.ebuild,v 1.9 2005/04/24 23:56:58 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/bitdefender-console/bitdefender-console-7.0.1.ebuild,v 1.10 2005/05/30 20:42:50 ticho Exp $
 
 IUSE="emul-linux-x86"
 
@@ -51,6 +51,12 @@ src_install ()
 	dodir /usr/bin
 	dosym /opt/bdc/bdc /usr/bin/bdc
 
+	dodir /var/bdc
+	dodir /var/bdc/infected
+	keepdir /var/bdc/infected
+	dodir /var/bdc/suspected
+	keepdir /var/bdc/suspected
+
 	insopts -m 644
 	doins bdc.ini *.so
 	insinto /opt/bdc/Plugins
diff --git a/app-antivirus/bitdefender-console/files/digest-bitdefender-console-7.0.1-r1 b/app-antivirus/bitdefender-console/files/digest-bitdefender-console-7.0.1-r1
new file mode 100644
index 000000000000..3f0a38ce97ac
--- /dev/null
+++ b/app-antivirus/bitdefender-console/files/digest-bitdefender-console-7.0.1-r1
@@ -0,0 +1 @@
+MD5 ff101d6c1cd9388a932117a1c5f52f83 BitDefender-Console-Antivirus-7.0.1-3.linux-gcc3x.i586.run 2348482