Version bumped q-s version

15 files changed, 14 insertions, 650 deletions

diff --git a/mail-filter/qmail-scanner/ChangeLog b/mail-filter/qmail-scanner/ChangeLog
index dd2f4dadd935..afb7ec74eef6 100644
--- a/mail-filter/qmail-scanner/ChangeLog
+++ b/mail-filter/qmail-scanner/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/qmail-scanner
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.8 2004/08/17 13:33:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.9 2004/08/18 14:34:21 st_lim Exp $
+
+*qmail-scanner-1.23-r2 (18 Aug 2004)
+
+  18 Aug 2004; Lim Swee Tat <st_lim@gentoo.org> +qmail-scanner-1.23-r2.ebuild:
+  Version bumped the q-s patch. Using new system for using that patch.
 
   17 Aug 2004; Aron Griffis <agriffis@gentoo.org>
   qmail-scanner-1.22-r1.ebuild, qmail-scanner-1.23-r1.ebuild:
diff --git a/mail-filter/qmail-scanner/Manifest b/mail-filter/qmail-scanner/Manifest
index dae924d70a71..a5dd8993c774 100644
--- a/mail-filter/qmail-scanner/Manifest
+++ b/mail-filter/qmail-scanner/Manifest
@@ -2,6 +2,7 @@ MD5 792e9b596d840233436101caf6c106f5 qmail-scanner-1.16.ebuild 2563
 MD5 23967139533782f9e5938f7d24847b70 qmail-scanner-1.23-r1.ebuild 4931
 MD5 92c45eef552c016e9bb044d8f8accd25 qmail-scanner-1.16-r1.ebuild 2565
 MD5 3e4b9e27ccfa364f98f34ce75a5c281f qmail-scanner-1.22-r1.ebuild 4892
+MD5 a3057d9a6b439eabfadcfe4ae429a517 qmail-scanner-1.23-r2.ebuild 4921
 MD5 7321b01e7d7a3fb311f6f892ed290f50 qmail-scanner-1.16-r2.ebuild 2314
 MD5 daeada31932e229dcc51ebf4b5b193df qmail-scanner-1.23.ebuild 4932
 MD5 adfb96c7936594bfff7a8c56ce5e0042 ChangeLog 4018
@@ -17,3 +18,4 @@ MD5 21cbccfc2015bf74d509a5b329ef4b30 files/digest-qmail-scanner-1.16-r1 67
 MD5 21cbccfc2015bf74d509a5b329ef4b30 files/digest-qmail-scanner-1.16-r2 67
 MD5 27df0427325d13d6974b9d0b4faf112e files/digest-qmail-scanner-1.22-r1 139
 MD5 148b78c4a68db8d47c44cef535b3685f files/digest-qmail-scanner-1.23-r1 139
+MD5 c6351759d589862bf81247f857fb2038 files/digest-qmail-scanner-1.23-r2 139
diff --git a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.16 b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.16
deleted file mode 100644
index 8cd551a81271..000000000000
--- a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 37b89fc12ef602886fe2bed7a2551309 qmail-scanner-1.16.tgz 117703
diff --git a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.16-r1 b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.16-r1
deleted file mode 100644
index 8cd551a81271..000000000000
--- a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.16-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 37b89fc12ef602886fe2bed7a2551309 qmail-scanner-1.16.tgz 117703
diff --git a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.20 b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.20
deleted file mode 100644
index 9de3791b9c2d..000000000000
--- a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d1e1753bd966fe6b20a7ef46ed2da524 qmail-scanner-1.20.tgz 137633
diff --git a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.22-r1 b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.22-r1
deleted file mode 100644
index 27d7d15071fe..000000000000
--- a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.22-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ae9124b43e1194d577951c8260a258bd qmail-scanner-1.22.tgz 148568
-MD5 003475e4af669eba5b1de46885ddc863 q-s-1.22st-20040606.patch.gz 78654
diff --git a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23 b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23
deleted file mode 100644
index e1bc6485ca87..000000000000
--- a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d16e912b89126b2d957f86bf78d52be5 qmail-scanner-1.23.tgz 153107
-MD5 003475e4af669eba5b1de46885ddc863 q-s-1.22st-20040606.patch.gz 78654
diff --git a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23-r1 b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23-r1
deleted file mode 100644
index a0c6de301937..000000000000
--- a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d16e912b89126b2d957f86bf78d52be5 qmail-scanner-1.23.tgz 153107
-MD5 f09df2d19e4a9eaedab72c03e6270c74 q-s-1.23st-20040815.patch.gz 86193
diff --git a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23-r2 b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23-r2
new file mode 100644
index 000000000000..16efe6198934
--- /dev/null
+++ b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23-r2
@@ -0,0 +1,2 @@
+MD5 d16e912b89126b2d957f86bf78d52be5 qmail-scanner-1.23.tgz 153107
+MD5 b8ad9c2258108dd47c548de201943410 q-s-1.23st-20040817.patch.gz 86595
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.16-r1.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.16-r1.ebuild
deleted file mode 100644
index 10e4afe3ee83..000000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-1.16-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.16-r1.ebuild,v 1.1 2004/07/17 08:48:36 st_lim Exp $
-
-DESCRIPTION="E-Mail virus scanner for qmail."
-HOMEPAGE="http://qmail-scanner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz"
-
-DEPEND=">=dev-lang/perl-5.6.1-r1
-	>=dev-perl/Time-HiRes-01.20-r2
-	>=net-mail/tnef-1.1.1
-	>=mail-filter/maildrop-1.3.9
-	>=dev-perl/DB_File-1.803-r2
-	>=mail-mta/qmail-1.03-r8
-	>=app-arch/unzip-5.42-r1
-	virtual/antivirus"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc"
-IUSE=""
-
-src_compile () {
-	yes | PATH=${PATH}:/opt/f-prot:/opt/vlnx ./configure \
-		--domain localhost \
-			|| die "./configure failed!"
-}
-
-src_install () {
-	# Create Directory Structure
-	diropts -m 755 -o qmailq -g qmail
-	dodir /var/spool/qmailscan
-	keepdir /var/spool/qmailscan
-	dodir /var/spool/qmailscan/quarantine
-	keepdir /var/spool/qmailscan/quarantine
-	dodir /var/spool/qmailscan/quarantine/tmp
-	keepdir /var/spool/qmailscan/quarantine/tmp
-	dodir /var/spool/qmailscan/quarantine/new
-	keepdir /var/spool/qmailscan/quarantine/new
-	dodir /var/spool/qmailscan/quarantine/cur
-	keepdir /var/spool/qmailscan/quarantine/cur
-	dodir /var/spool/qmailscan/working
-	keepdir /var/spool/qmailscan/working
-	dodir /var/spool/qmailscan/working/tmp
-	keepdir /var/spool/qmailscan/working/tmp
-	dodir /var/spool/qmailscan/working/new
-	keepdir /var/spool/qmailscan/working/new
-	dodir /var/spool/qmailscan/working/cur
-	keepdir /var/spool/qmailscan/working/cur
-	dodir /var/spool/qmailscan/archive
-	keepdir /var/spool/qmailscan/archive
-	dodir /var/spool/qmailscan/archive/tmp
-	keepdir /var/spool/qmailscan/archive/tmp
-	dodir /var/spool/qmailscan/archive/new
-	keepdir /var/spool/qmailscan/archive/new
-	dodir /var/spool/qmailscan/archive/cur
-	keepdir /var/spool/qmailscan/archive/cur
-
-	# Install standard quarantine attachments file
-	insinto /var/spool/qmailscan
-	insopts -m 644 -o qmailq -g qmail
-	doins quarantine-attachments.txt
-
-	# Install qmail-scanner script
-	insinto /var/qmail/bin
-	insopts -m 4755 -o qmailq -g qmail
-	doins qmail-scanner-queue.pl
-
-	# Install documentation
-	dodoc README CHANGES COPYING
-	dohtml README.html
-}
-
-pkg_postinst () {
-	# Setup perlscanner + Version Info
-	/var/qmail/bin/qmail-scanner-queue.pl -z
-	/var/qmail/bin/qmail-scanner-queue.pl -g
-
-	einfo
-	einfo "NOTICE:"
-	einfo "Set QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue.pl"
-	einfo "in your /etc/tcp.smtp file to activate qmail-scanner."
-	einfo
-}
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.16.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.16.ebuild
deleted file mode 100644
index 67bceaa888ab..000000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-1.16.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.16.ebuild,v 1.1 2004/07/17 08:48:36 st_lim Exp $
-
-DESCRIPTION="E-Mail virus scanner for qmail."
-HOMEPAGE="http://qmail-scanner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz"
-
-DEPEND=">=dev-lang/perl-5.6.1-r1
-	>=dev-perl/Time-HiRes-01.20-r2
-	>=net-mail/tnef-1.1.1
-	>=app-antivirus/f-prot-3.12a
-	>=mail-filter/maildrop-1.3.9
-	>=dev-perl/DB_File-1.803-r2
-	>=mail-mta/qmail-1.03-r8
-	>=app-arch/unzip-5.42-r1"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 -sparc"
-IUSE=""
-
-src_compile () {
-	yes | PATH=${PATH}:/opt/f-prot ./configure \
-		--domain localhost \
-			|| die "./configure failed!"
-}
-
-src_install () {
-	# Create Directory Structure
-	diropts -m 755 -o qmailq -g qmail
-	dodir /var/spool/qmailscan
-	keepdir /var/spool/qmailscan
-	dodir /var/spool/qmailscan/quarantine
-	keepdir /var/spool/qmailscan/quarantine
-	dodir /var/spool/qmailscan/quarantine/tmp
-	keepdir /var/spool/qmailscan/quarantine/tmp
-	dodir /var/spool/qmailscan/quarantine/new
-	keepdir /var/spool/qmailscan/quarantine/new
-	dodir /var/spool/qmailscan/quarantine/cur
-	keepdir /var/spool/qmailscan/quarantine/cur
-	dodir /var/spool/qmailscan/working
-	keepdir /var/spool/qmailscan/working
-	dodir /var/spool/qmailscan/working/tmp
-	keepdir /var/spool/qmailscan/working/tmp
-	dodir /var/spool/qmailscan/working/new
-	keepdir /var/spool/qmailscan/working/new
-	dodir /var/spool/qmailscan/working/cur
-	keepdir /var/spool/qmailscan/working/cur
-	dodir /var/spool/qmailscan/archive
-	keepdir /var/spool/qmailscan/archive
-	dodir /var/spool/qmailscan/archive/tmp
-	keepdir /var/spool/qmailscan/archive/tmp
-	dodir /var/spool/qmailscan/archive/new
-	keepdir /var/spool/qmailscan/archive/new
-	dodir /var/spool/qmailscan/archive/cur
-	keepdir /var/spool/qmailscan/archive/cur
-
-	# Install standard quarantine attachments file
-	insinto /var/spool/qmailscan
-	insopts -m 644 -o qmailq -g qmail
-	doins quarantine-attachments.txt
-
-	# Install qmail-scanner script
-	insinto /var/qmail/bin
-	insopts -m 4755 -o qmailq -g qmail
-	doins qmail-scanner-queue.pl
-
-	# Install documentation
-	dodoc README CHANGES COPYING
-	dohtml README.html
-}
-
-pkg_postinst () {
-	# Setup perlscanner + Version Info
-	/var/qmail/bin/qmail-scanner-queue.pl -z
-	/var/qmail/bin/qmail-scanner-queue.pl -g
-
-	einfo
-	einfo "NOTICE:"
-	einfo "Set QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue.pl"
-	einfo "in your /etc/tcp.smtp file to activate qmail-scanner."
-	einfo
-}
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.20.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.20.ebuild
deleted file mode 100644
index 7d9f911b66a5..000000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-1.20.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.20.ebuild,v 1.1 2004/07/17 08:48:36 st_lim Exp $
-
-inherit fixheadtails gcc eutils
-
-DESCRIPTION="E-Mail virus scanner for qmail."
-HOMEPAGE="http://qmail-scanner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6.1-r1
-	>=dev-perl/Time-HiRes-01.20-r2
-	>=net-mail/tnef-1.1.1
-	>=dev-perl/DB_File-1.803-r2
-	>=net-mail/ripmime-1.3.0.4
-	|| (
-	>=mail-mta/qmail-1.03-r8
-	>=mail-mta/qmail-ldap-1.03-r1
-	  mail-mta/qmail-mysql
-	)
-	>=app-arch/unzip-5.42-r1
-	virtual/antivirus"
-
-pkg_setup() {
-	enewgroup qscand 210
-	enewuser qscand 210 /bin/false /var/spool/qmailscan qscand
-}
-
-pkg_preinst() {
-	local oldname="/var/qmail/bin/qmail-scanner-queue.pl"
-	if [ -f ${oldname} ]; then
-		newname=${oldname}.`date +%Y%m%d%H%M%S`
-		einfo "Backing up old qmail-scanner as $newname in case of modifications."
-		cp ${oldname} ${newname}
-		chmod 600 ${newname}
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	ht_fix_file autoupdaters/* configure
-
-	EXTRA_VIRII="bagle,beagle,mydoom,sco,maldal,mimail,novarg,shimg"
-	einfo "Adding items to the SILENT_VIRUSES list (${EXTRA_VIRII})"
-	sed -e "/^SILENT_VIRUSES/s/\"$/,${EXTRA_VIRII}\"/g"  -i configure
-
-	einfo "Forcing use of clamscan instead of clamuko due to detection bug"
-	sed -e '788,804 d' -i configure
-}
-
-src_compile () {
-	PATH=${PATH}:/opt/f-prot:/opt/vlnx ./configure \
-	--domain localhost \
-	--batch \
-	--log-details yes \
-	--mime-unpacker "ripmime" \
-	|| die "./configure failed!"
-
-	#patch for suidperl -> perl
-	EPATCH_SINGLE_MSG="Changing suidperl to plain perl" \
-	epatch ${FILESDIR}/qmail-scanner-queue.pl.patch
-
-
-	# build for qmail-scanner-queue wrapper, so we don't need suidperl
-	cd contrib
-	`gcc-getCC` ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
-}
-
-src_install () {
-	# Create Directory Structure
-	diropts -m 755 -o qscand -g qscand
-	dodir /var/spool/qmailscan
-	keepdir /var/spool/qmailscan
-	for i in quarantine working archive; do
-		for j in tmp new cur; do
-			dodir /var/spool/qmailscan/${i}/${j}
-			keepdir /var/spool/qmailscan/${i}/${j}
-		done
-	done
-	dodir /var/spool/qmailscan/tmp
-	keepdir /var/spool/qmailscan/tmp
-
-	# Install standard quarantine attachments file
-	insinto /var/spool/qmailscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine-attachments.txt
-
-	# create quarantine.log and viruses.log
-	touch quarantine.log
-	insinto /var/spool/qmailscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine.log
-	dosym quarantine.log ${DESTDIR}/var/spool/qmailscan/viruses.log
-
-	# Install qmail-scanner wrapper
-	insinto /var/qmail/bin
-	insopts -m 4755 -o qscand -g qscand
-	doins contrib/qmail-scanner-queue
-
-	# Install qmail-scanner script
-	insinto /var/qmail/bin
-	insopts -m 4755 -o qscand -g qscand
-	doins qmail-scanner-queue.pl
-
-	insinto /etc/logrotate.d/
-	insopts -m 644 -o root -g root
-	newins ${FILESDIR}/qmailscanner.logrotate qmail-scanner
-
-	exeinto /etc/cron.daily/
-	newexe ${FILESDIR}/qmailscanner.cronjob qmail-scanner
-
-	# Install documentation
-	dodoc README CHANGES COPYING
-	dohtml README.html FAQ.php TODO.php configure-options.php manual-install.php perlscanner.php
-
-	docinto contrib
-	cd contrib
-	dodoc qs2mrtg.pl mrtg-qmail-scanner.cfg
-}
-
-pkg_postinst () {
-	einfo "Fixing ownerships"
-	chown -R qscand:qscand /var/spool/qmailscan/tmp /var/spool/qmailscan/working /var/spool/qmailscan/quarantine* /var/spool/qmailscan/archive /var/spool/qmailscan/qmail*
-	touch /var/qmail/bin/qmail-scanner-queue.pl
-
-	# Setup perlscanner + Version Info
-	#/var/qmail/bin/qmail-scanner-queue.pl -z
-	#/var/qmail/bin/qmail-scanner-queue.pl -g
-	chmod -s ${ROOT}/var/qmail/bin/qmail-scanner-queue.pl
-	${ROOT}/var/qmail/bin/qmail-scanner-queue -z
-	${ROOT}/var/qmail/bin/qmail-scanner-queue -g
-
-	einfo "To activate qmail-scanner, please edit your"
-	einfo "/var/qmail/control/conf-common file and set:"
-	einfo "export QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue"
-	einfo "Or place it in your tcprules file."
-	ewarn "Please note that it was a call to qmail-scanner-queue.pl before,"
-	ewarn "but this is now changed to use a wrapper to improve security!"
-	ewarn "Once you have changed to the wrapper, you can remove the setuid "
-	ewarn "bit on qmail-scanner-queue.pl"
-}
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.22-r1.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.22-r1.ebuild
deleted file mode 100644
index 97dbd2d0ad5f..000000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-1.22-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.22-r1.ebuild,v 1.6 2004/08/17 13:33:02 agriffis Exp $
-
-inherit fixheadtails gcc eutils
-
-DESCRIPTION="E-Mail virus scanner for qmail."
-HOMEPAGE="http://qmail-scanner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz
-	spamassassin? (http://xoomer.virgilio.it/j.toribio/qmail-scanner/download/q-s-1.22st-20040606.patch.gz)"
-
-IUSE="spamassassin"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-
-DEPEND=">=dev-lang/perl-5.6.1-r1
-	>=dev-perl/Time-HiRes-01.20-r2
-	>=net-mail/tnef-1.1.1
-	>=dev-perl/DB_File-1.803-r2
-	>=net-mail/ripmime-1.3.0.4
-	|| (
-	>=mail-mta/qmail-1.03-r8
-	>=mail-mta/qmail-ldap-1.03-r1
-	  mail-mta/qmail-mysql
-	)
-	>=app-arch/unzip-5.42-r1
-	spamassassin? ( >=mail-filter/spamassassin-2.63 )
-	virtual/antivirus"
-
-pkg_setup() {
-	enewgroup qscand 210
-	enewuser qscand 210 /bin/false /var/spool/qmailscan qscand
-}
-
-pkg_preinst() {
-	local oldname="/var/qmail/bin/qmail-scanner-queue.pl"
-	if [ -f ${oldname} ]; then
-		newname=${oldname}.`date +%Y%m%d%H%M%S`
-		einfo "Backing up old qmail-scanner as $newname in case of modifications."
-		cp ${oldname} ${newname}
-		chmod 600 ${newname}
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use spamassassin && epatch ${DISTDIR}/q-s-1.22st-20040606.patch.gz
-	ht_fix_file autoupdaters/* configure
-
-	EXTRA_VIRII="bagle,beagle,mydoom,sco,maldal,mimail,novarg,shimg"
-	einfo "Adding items to the SILENT_VIRUSES list (${EXTRA_VIRII})"
-	sed -e "/^SILENT_VIRUSES/s/\"$/,${EXTRA_VIRII}\"/g"  -i configure
-}
-
-src_compile () {
-	local myconf
-	use spamassassin && myconf="--virus-to-delete yes --sa-quarantine 2.1 --sa-delete 4.2 --sa-reject yes --sa-subject SPAM: --sa-delta 0.5 --sa-alt yes"
-
-	PATH=${PATH}:/opt/f-prot:/opt/vlnx ./configure \
-	--domain localhost \
-	--batch \
-	--log-details yes \
-	--mime-unpacker "ripmime" \
-	--skip-setuid-test \
-	${myconf} \
-	|| die "./configure failed!"
-
-	# build for qmail-scanner-queue wrapper, so we don't need suidperl
-	cd contrib
-	`gcc-getCC` ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
-}
-
-src_install () {
-	# Create Directory Structure
-	diropts -m 755 -o qscand -g qscand
-	dodir /var/spool/qmailscan
-	keepdir /var/spool/qmailscan
-	diropts -m 750 -o qscand -g qscand
-	for i in quarantine working archive; do
-		for j in tmp new cur; do
-			dodir /var/spool/qmailscan/${i}/${j}
-			keepdir /var/spool/qmailscan/${i}/${j}
-		done
-	done
-	dodir /var/spool/qmailscan/tmp
-	keepdir /var/spool/qmailscan/tmp
-
-	# Install standard quarantine attachments file
-	insinto /var/spool/qmailscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine-attachments.txt
-
-	# create quarantine.log and viruses.log
-	touch quarantine.log
-	insinto /var/spool/qmailscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine.log
-	dosym quarantine.log ${DESTDIR}/var/spool/qmailscan/viruses.log
-
-	# Install qmail-scanner wrapper
-	insinto /var/qmail/bin
-	insopts -m 4755 -o qscand -g qscand
-	doins contrib/qmail-scanner-queue
-
-	# Install qmail-scanner script
-	insinto /var/qmail/bin
-	insopts -m 0755 -o qscand -g qscand
-	doins qmail-scanner-queue.pl
-
-	insinto /etc/logrotate.d/
-	insopts -m 644 -o root -g root
-	newins ${FILESDIR}/qmailscanner.logrotate qmail-scanner
-
-	exeinto /etc/cron.daily/
-	newexe ${FILESDIR}/qmailscanner.cronjob qmail-scanner
-
-	# Install documentation
-	dodoc README CHANGES COPYING
-	dohtml README.html FAQ.php TODO.php configure-options.php manual-install.php perlscanner.php
-
-	docinto contrib
-	cd ${S}/contrib
-	dodoc spamc-nice.eml
-	dodoc test-trophie.pl
-	dodoc logrotate.qmailscanner
-	dodoc sub-avpdaemon.pl
-	dodoc logging_first_80_chars.eml
-	dodoc spamc-nasty.eml
-	dodoc avpdeamon.init
-	dodoc test_installation.sh
-	dodoc test-sophie.pl
-	dodoc reformime-test.eml
-	dodoc sub-sender-cache.pl
-	dodoc rbl_scanner.txt
-	dodoc test-clamd.pl
-	dodoc qs2mrtg.pl
-	dodoc mrtg-qmail-scanner.cfg
-}
-
-pkg_postinst () {
-	einfo "Fixing ownerships"
-	chown -R qscand:qscand /var/spool/qmailscan/tmp /var/spool/qmailscan/working /var/spool/qmailscan/quarantine* /var/spool/qmailscan/archive /var/spool/qmailscan/qmail*
-	touch /var/qmail/bin/qmail-scanner-queue.pl
-
-	# Setup perlscanner + Version Info
-	chmod -s ${ROOT}/var/qmail/bin/qmail-scanner-queue.pl
-	${ROOT}/var/qmail/bin/qmail-scanner-queue -z
-	${ROOT}/var/qmail/bin/qmail-scanner-queue -g
-
-	einfo "To activate qmail-scanner, please edit your"
-	einfo "/var/qmail/control/conf-common file and set:"
-	einfo "export QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue"
-	einfo "Or place it in your tcprules file."
-	ewarn "Please note that it was a call to qmail-scanner-queue.pl before,"
-	ewarn "but this is now changed to use a wrapper to improve security!"
-	ewarn "Once you have changed to the wrapper, you can remove the setuid "
-	ewarn "bit on qmail-scanner-queue.pl"
-}
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.23-r1.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.23-r2.ebuild
index 90b81c95c39c..dc49c793a3cf 100644
--- a/mail-filter/qmail-scanner/qmail-scanner-1.23-r1.ebuild
+++ b/mail-filter/qmail-scanner/qmail-scanner-1.23-r2.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.23-r1.ebuild,v 1.2 2004/08/17 13:33:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.23-r2.ebuild,v 1.1 2004/08/18 14:34:21 st_lim Exp $
 
 inherit fixheadtails gcc eutils
 
+Q_S_DATE=20040817
 DESCRIPTION="E-Mail virus scanner for qmail."
 HOMEPAGE="http://qmail-scanner.sourceforge.net/"
 SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz
-		spamassassin? (http://xoomer.virgilio.it/j.toribio/qmail-scanner/download/q-s-1.23st-20040815.patch.gz)"
+		http://xoomer.virgilio.it/j.toribio/qmail-scanner/download/q-s-${PV}st-${Q_S_DATE}.patch.gz"
 
 IUSE="spamassassin"
 
@@ -47,7 +48,7 @@ pkg_preinst() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	use spamassassin && epatch ${DISTDIR}/q-s-1.23st-20040815.patch.gz
+	epatch ${DISTDIR}/q-s-${PV}st-${Q_S_DATE}.patch.gz
 	ht_fix_file autoupdaters/* configure
 
 	EXTRA_VIRII="bagle,beagle,mydoom,sco,maldal,mimail,novarg,shimg,bugler,cissi,cissy,dloade,netsky,qizy"
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.23.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.23.ebuild
deleted file mode 100644
index 741bc5b9a1f9..000000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-1.23.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.23.ebuild,v 1.1 2004/08/14 21:53:44 robbat2 Exp $
-
-inherit fixheadtails gcc eutils
-
-DESCRIPTION="E-Mail virus scanner for qmail."
-HOMEPAGE="http://qmail-scanner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz"
-	#spamassassin? (http://xoomer.virgilio.it/j.toribio/qmail-scanner/download/q-s-1.22st-20040606.patch.gz)"
-
-IUSE="" #spamassassin
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-
-DEPEND=">=dev-lang/perl-5.6.1-r1
-	>=dev-perl/Time-HiRes-01.20-r2
-	>=net-mail/tnef-1.1.1
-	>=dev-perl/DB_File-1.803-r2
-	>=net-mail/ripmime-1.3.0.4
-	|| (
-	>=mail-mta/qmail-1.03-r8
-	>=mail-mta/qmail-ldap-1.03-r1
-	  mail-mta/qmail-mysql
-	)
-	>=app-arch/unzip-5.42-r1
-	virtual/antivirus"
-	#spamassassin ( >=mail-filter/spamassassin-2.63 )
-
-pkg_setup() {
-	enewgroup qscand 210
-	enewuser qscand 210 /bin/false /var/spool/qmailscan qscand
-}
-
-pkg_preinst() {
-	local oldname="/var/qmail/bin/qmail-scanner-queue.pl"
-	if [ -f ${oldname} ]; then
-		newname=${oldname}.`date +%Y%m%d%H%M%S`
-		einfo "Backing up old qmail-scanner as $newname in case of modifications."
-		cp ${oldname} ${newname}
-		chmod 600 ${newname}
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	#use spamassassin && epatch ${DISTDIR}/q-s-1.22st-20040606.patch.gz
-	ht_fix_file autoupdaters/* configure
-
-	EXTRA_VIRII="bagle,beagle,mydoom,sco,maldal,mimail,novarg,shimg,bugler,cissi,cissy,dloade,netsky,qizy"
-	einfo "Adding items to the SILENT_VIRUSES list (${EXTRA_VIRII})"
-	sed -e "/^SILENT_VIRUSES/s/\"$/,${EXTRA_VIRII}\"/g"  -i configure
-}
-
-src_compile () {
-	local myconf
-	#use spamassassin && myconf="--virus-to-delete yes --sa-quarantine 2.1 --sa-delete 4.2 --sa-reject yes --sa-subject SPAM: --sa-delta 0.5 --sa-alt yes"
-
-	PATH=${PATH}:/opt/f-prot:/opt/vlnx ./configure \
-	--domain localhost \
-	--batch \
-	--log-details yes \
-	--mime-unpacker "ripmime" \
-	--skip-setuid-test \
-	${myconf} \
-	|| die "./configure failed!"
-
-	# build for qmail-scanner-queue wrapper, so we don't need suidperl
-	cd contrib
-	`gcc-getCC` ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
-}
-
-src_install () {
-	# Create Directory Structure
-	diropts -m 755 -o qscand -g qscand
-	dodir /var/spool/qmailscan
-	keepdir /var/spool/qmailscan
-	diropts -m 750 -o qscand -g qscand
-	for i in quarantine working archive; do
-		for j in tmp new cur; do
-			dodir /var/spool/qmailscan/${i}/${j}
-			keepdir /var/spool/qmailscan/${i}/${j}
-		done
-	done
-	dodir /var/spool/qmailscan/tmp
-	keepdir /var/spool/qmailscan/tmp
-
-	# Install standard quarantine attachments file
-	insinto /var/spool/qmailscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine-attachments.txt
-
-	# create quarantine.log and viruses.log
-	touch quarantine.log
-	insinto /var/spool/qmailscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine.log
-	dosym quarantine.log ${DESTDIR}/var/spool/qmailscan/viruses.log
-
-	# Install qmail-scanner wrapper
-	insinto /var/qmail/bin
-	insopts -m 4755 -o qscand -g qscand
-	doins contrib/qmail-scanner-queue
-
-	# Install qmail-scanner script
-	insinto /var/qmail/bin
-	insopts -m 0755 -o qscand -g qscand
-	doins qmail-scanner-queue.pl
-
-	insinto /etc/logrotate.d/
-	insopts -m 644 -o root -g root
-	newins ${FILESDIR}/qmailscanner.logrotate qmail-scanner
-
-	exeinto /etc/cron.daily/
-	newexe ${FILESDIR}/qmailscanner.cronjob qmail-scanner
-
-	# Install documentation
-	dodoc README CHANGES COPYING
-	dohtml README.html FAQ.php TODO.php configure-options.php manual-install.php perlscanner.php
-
-	docinto contrib
-	cd ${S}/contrib
-	dodoc spamc-nice.eml
-	dodoc test-trophie.pl
-	dodoc logrotate.qmailscanner
-	dodoc sub-avpdaemon.pl
-	dodoc logging_first_80_chars.eml
-	dodoc spamc-nasty.eml
-	dodoc avpdeamon.init
-	dodoc test_installation.sh
-	dodoc test-sophie.pl
-	dodoc reformime-test.eml
-	dodoc sub-sender-cache.pl
-	dodoc rbl_scanner.txt
-	dodoc test-clamd.pl
-	dodoc qs2mrtg.pl
-	dodoc mrtg-qmail-scanner.cfg
-}
-
-pkg_postinst () {
-	einfo "Fixing ownerships"
-	chown -R qscand:qscand /var/spool/qmailscan/tmp /var/spool/qmailscan/working /var/spool/qmailscan/quarantine* /var/spool/qmailscan/archive /var/spool/qmailscan/qmail*
-	touch /var/qmail/bin/qmail-scanner-queue.pl
-
-	# Setup perlscanner + Version Info
-	chmod -s ${ROOT}/var/qmail/bin/qmail-scanner-queue.pl
-	${ROOT}/var/qmail/bin/qmail-scanner-queue -z
-	${ROOT}/var/qmail/bin/qmail-scanner-queue -g
-
-	einfo "To activate qmail-scanner, please edit your"
-	einfo "/var/qmail/control/conf-common file and set:"
-	einfo "export QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue"
-	einfo "Or place it in your tcprules file."
-	ewarn "Please note that it was a call to qmail-scanner-queue.pl before,"
-	ewarn "but this is now changed to use a wrapper to improve security!"
-	ewarn "Once you have changed to the wrapper, you can remove the setuid "
-	ewarn "bit on qmail-scanner-queue.pl"
-}