Moved qmail-scanner to mail-filter, and added a new patch to it that allows for more options at the spamassassin usage.

4 files changed, 162 insertions, 6 deletions

diff --git a/mail-filter/qmail-scanner/ChangeLog b/mail-filter/qmail-scanner/ChangeLog
index 15782cae3cd7..1964612dbbfb 100644
--- a/mail-filter/qmail-scanner/ChangeLog
+++ b/mail-filter/qmail-scanner/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/qmail-scanner
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.1 2004/07/17 08:48:36 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.2 2004/07/17 09:07:13 st_lim Exp $
+
+*qmail-scanner-1.22-r1 (17 Jul 2004)
+
+  17 Jul 2004; Lim Swee Tat <st_lim@gentoo.org> +qmail-scanner-1.22-r1.ebuild:
+  - Transfered over to the mail-filter category - Added qmail-scanner-1.22 -
+  Using the qmail-scanner-st patch that allows for more options at qmail-scanner
+  - TODO: Add dspam to qmail-scanner
 
   17 Jul 2004; Lim Swee Tat <st_lim@gentoo.org> +metadata.xml,
   +files/qmail-scanner-queue.pl.patch, +files/qmailscanner.cronjob,
diff --git a/mail-filter/qmail-scanner/Manifest b/mail-filter/qmail-scanner/Manifest
index c389ca991146..ad996b5d3d93 100644
--- a/mail-filter/qmail-scanner/Manifest
+++ b/mail-filter/qmail-scanner/Manifest
@@ -1,9 +1,10 @@
-MD5 b2862c588cff6cef11df50d94fe4febc qmail-scanner-1.16.ebuild 2562
-MD5 3c9f9d1e6a1939991b5558b6ddef15d5 qmail-scanner-1.16-r1.ebuild 2564
-MD5 3b5b76dac0b18229fa56a6c02900bd81 qmail-scanner-1.16-r2.ebuild 1981
-MD5 7e98a265eaa724a906d07db029d6436e ChangeLog 2522
+MD5 792e9b596d840233436101caf6c106f5 qmail-scanner-1.16.ebuild 2563
+MD5 92c45eef552c016e9bb044d8f8accd25 qmail-scanner-1.16-r1.ebuild 2565
+MD5 6ab99bf7de6461883b0b2bf96220fe2e qmail-scanner-1.22-r1.ebuild 4391
+MD5 9078318d5b92cbdd80741c5c7b02a860 qmail-scanner-1.16-r2.ebuild 1982
+MD5 f30fa299fd2aeeddeb6741493f251bf4 ChangeLog 2817
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 cb8fa23f9bbd463f8c4ac0683748cb82 qmail-scanner-1.20.ebuild 4403
+MD5 beb74fb9980c2a0c58171cc7198862ca qmail-scanner-1.20.ebuild 4404
 MD5 6f6fc9e3db3985ba4ae5a6203d2d6abf files/qmailscanner.cronjob 50
 MD5 21cbccfc2015bf74d509a5b329ef4b30 files/digest-qmail-scanner-1.16 67
 MD5 797efb400e5d84070bd2237518cff4ba files/digest-qmail-scanner-1.20 67
@@ -11,3 +12,4 @@ MD5 055c5ac64c689a669b8ccd6bc5f6553d files/qmailscanner.logrotate 147
 MD5 1d80eca1d4792a4073f51eb59f02960b files/qmail-scanner-queue.pl.patch 240
 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
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
new file mode 100644
index 000000000000..27d7d15071fe
--- /dev/null
+++ b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.22-r1
@@ -0,0 +1,2 @@
+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/qmail-scanner-1.22-r1.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.22-r1.ebuild
new file mode 100644
index 000000000000..dfb90bce7f0d
--- /dev/null
+++ b/mail-filter/qmail-scanner/qmail-scanner-1.22-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/07/17 09:07:13 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
+	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" \
+	${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
+	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 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
+	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"
+}