Add new version, add more virii. Bug 60201. Spamassassin support NOT yet available.

5 files changed, 175 insertions, 3 deletions

diff --git a/mail-filter/qmail-scanner/ChangeLog b/mail-filter/qmail-scanner/ChangeLog
index 4923f99db624..e932a914bfbd 100644
--- a/mail-filter/qmail-scanner/ChangeLog
+++ b/mail-filter/qmail-scanner/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2004/08/09 08:25:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.6 2004/08/14 21:53:44 robbat2 Exp $
+
+*qmail-scanner-1.23 (14 Aug 2004)
+
+  14 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> +qmail-scanner-1.23:
+  Add new version, add more virii. Bug 60201. Spamassassin support NOT yet
+  available.
 
   09 Aug 2004; Robin H. Johnson <robbat2@gentoo.org>
   qmail-scanner-1.22-r1.ebuild:
diff --git a/mail-filter/qmail-scanner/Manifest b/mail-filter/qmail-scanner/Manifest
index d08c2541efdf..a89df1e2c99b 100644
--- a/mail-filter/qmail-scanner/Manifest
+++ b/mail-filter/qmail-scanner/Manifest
@@ -1,13 +1,15 @@
 MD5 792e9b596d840233436101caf6c106f5 qmail-scanner-1.16.ebuild 2563
 MD5 92c45eef552c016e9bb044d8f8accd25 qmail-scanner-1.16-r1.ebuild 2565
-MD5 ea2a3f49f374862d2e832f0691d9ef3b qmail-scanner-1.22-r1.ebuild 4854
+MD5 d4b039fe9efe1514186502e8c5ba0d61 qmail-scanner-1.22-r1.ebuild 4890
 MD5 7321b01e7d7a3fb311f6f892ed290f50 qmail-scanner-1.16-r2.ebuild 2314
+MD5 d4b039fe9efe1514186502e8c5ba0d61 qmail-scanner-1.23.ebuild 4890
 MD5 27eec415dad76beddd9f348e6acadf87 ChangeLog 3455
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 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
+MD5 3fa63560e99f7a3a41192e99d7297c2c files/digest-qmail-scanner-1.23 139
 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
diff --git a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23 b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23
new file mode 100644
index 000000000000..e1bc6485ca87
--- /dev/null
+++ b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23
@@ -0,0 +1,2 @@
+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/qmail-scanner-1.22-r1.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.22-r1.ebuild
index 9d206e2db439..62d95ca898cc 100644
--- a/mail-filter/qmail-scanner/qmail-scanner-1.22-r1.ebuild
+++ b/mail-filter/qmail-scanner/qmail-scanner-1.22-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2004/08/09 08:25:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.22-r1.ebuild,v 1.5 2004/08/14 21:53:44 robbat2 Exp $
 
 inherit fixheadtails gcc eutils
 
@@ -78,6 +78,7 @@ src_install () {
 	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}
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.23.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.23.ebuild
new file mode 100644
index 000000000000..741bc5b9a1f9
--- /dev/null
+++ b/mail-filter/qmail-scanner/qmail-scanner-1.23.ebuild
@@ -0,0 +1,161 @@
+# 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"
+}