Version bump to 2.01

4 files changed, 201 insertions, 10 deletions

diff --git a/mail-filter/qmail-scanner/ChangeLog b/mail-filter/qmail-scanner/ChangeLog
index c03cea5ec634..0b5cd1d3398e 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.31 2006/02/20 22:36:18 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.32 2006/05/29 16:02:59 st_lim Exp $
+
+*qmail-scanner-2.01 (29 May 2006)
+
+  29 May 2006; Lim Swee Tat <st_lim@gentoo.org> +qmail-scanner-2.01.ebuild:
+  Version bump to 2.01
 
   20 Feb 2006; Michael Hanselmann <hansmi@gentoo.org>
   -qmail-scanner-1.16-r2.ebuild, -qmail-scanner-1.23-r2.ebuild,
diff --git a/mail-filter/qmail-scanner/Manifest b/mail-filter/qmail-scanner/Manifest
index acf08ef808e1..41a523dbfbea 100644
--- a/mail-filter/qmail-scanner/Manifest
+++ b/mail-filter/qmail-scanner/Manifest
@@ -1,21 +1,38 @@
-MD5 9fb027dbcabe45c29a2e1f3f4e9221d8 ChangeLog 7975
-RMD160 2226eddde33d56f4cd53e82e61ee94bcbd0b7fae ChangeLog 7975
-SHA256 1535884778d668f52328d414f4ff3003e0e09266eaeaff151db63eaf15bdcea4 ChangeLog 7975
-MD5 ff83ea44513fae0bbfc5bcacbc34e394 files/digest-qmail-scanner-1.25-r1 140
-RMD160 3bfb51c90c7818cf1028eca2ddc5edc139e44d17 files/digest-qmail-scanner-1.25-r1 140
-SHA256 f0907b490ece1ff059a72422c692d2e299718d6410238d483b595ecc7d715a65 files/digest-qmail-scanner-1.25-r1 140
+AUX qmail-scanner-queue.pl.patch 240 RMD160 6d644003bb6386ad2e21e775352fe01bf8cc81c1 SHA1 98be0f8c45f7917ea809a68c19627217b8c4c3d7 SHA256 77f09de11c2d448c17dd0b377cae3cedd756e404b1e611e2bf69e74d7e05be8e size 240
 MD5 1d80eca1d4792a4073f51eb59f02960b files/qmail-scanner-queue.pl.patch 240
 RMD160 6d644003bb6386ad2e21e775352fe01bf8cc81c1 files/qmail-scanner-queue.pl.patch 240
 SHA256 77f09de11c2d448c17dd0b377cae3cedd756e404b1e611e2bf69e74d7e05be8e files/qmail-scanner-queue.pl.patch 240
+AUX qmailscanner.cronjob 50 RMD160 afec02a08f7824fbea506b14372af9ea62270b8a SHA1 773b938347d27a042537cd925543fdde732231a2 SHA256 09354f2ef42b6423a5947d004a4d3bf76355aafaf11a0db12052bf088115dee1 size 50
 MD5 6f6fc9e3db3985ba4ae5a6203d2d6abf files/qmailscanner.cronjob 50
 RMD160 afec02a08f7824fbea506b14372af9ea62270b8a files/qmailscanner.cronjob 50
 SHA256 09354f2ef42b6423a5947d004a4d3bf76355aafaf11a0db12052bf088115dee1 files/qmailscanner.cronjob 50
+AUX qmailscanner.logrotate 147 RMD160 d4eccf7f1169a448c0ce8115f426214927935385 SHA1 d3f763ed9dd1ba8a9c41837e5110950c14b40591 SHA256 eae732e0be2ace1ddcd4cc17a9c6a54012684c76dd30faa5349d394f3befc62f size 147
 MD5 055c5ac64c689a669b8ccd6bc5f6553d files/qmailscanner.logrotate 147
 RMD160 d4eccf7f1169a448c0ce8115f426214927935385 files/qmailscanner.logrotate 147
 SHA256 eae732e0be2ace1ddcd4cc17a9c6a54012684c76dd30faa5349d394f3befc62f files/qmailscanner.logrotate 147
-MD5 7df733d43f5875dfc63bae636203b8cb metadata.xml 158
-RMD160 1bd73d3a80f2670284225f39ce0a4a1c01954966 metadata.xml 158
-SHA256 940554be041a57d02888d9f414efb7768e9f72565c642327ecb4f9f64ca6d8d4 metadata.xml 158
+DIST q-s-1.25st-20050406.patch.gz 124325 size 124325
+DIST q-s-2.01st-20060423.patch.gz 99463 RMD160 e395948089886cdd79c40e6a9c59a1048b0dbe49 SHA1 e5b4d3483484fd36efa847beede68e6a7389449f SHA256 b6f507dc0f199aff798f6189c1af6f337d859c7d1eb1af5e44539d45864f367c size 99463
+DIST qmail-scanner-1.25.tgz 221156 size 221156
+DIST qmail-scanner-2.01.tgz 226699 RMD160 77ed1ca024b99b30cd6973faf6595c71f85eaf5b SHA1 7ac4de517c9fc66b1ea058e1d15d7ab52ca12ad0 SHA256 4bf69d3581c23b552deffafcfca49f325c5fe6c5ee6012055f201b8535243472 size 226699
+EBUILD qmail-scanner-1.25-r1.ebuild 4962 RMD160 fe6bf0ce794d0c0014f4a267a4eefd0bde147281 SHA1 81a2d630fa34cfb4a644e846be6ca78a5cd09214 SHA256 c9c8b90ff35c47b9d76c6ff367a59775abb9d8ac63236022be940ef7736bd843 size 4962
 MD5 d39aed1157cdaec9b46c650812fc5560 qmail-scanner-1.25-r1.ebuild 4962
 RMD160 fe6bf0ce794d0c0014f4a267a4eefd0bde147281 qmail-scanner-1.25-r1.ebuild 4962
 SHA256 c9c8b90ff35c47b9d76c6ff367a59775abb9d8ac63236022be940ef7736bd843 qmail-scanner-1.25-r1.ebuild 4962
+EBUILD qmail-scanner-2.01.ebuild 4962 RMD160 880d4d5c63e27e8266d3f10de7d242832c0ca5a3 SHA1 e5ea170ca8dad0465368c9c9f4db9a04953dfa52 SHA256 3302676ac87ca4e4c59f92be0014de15757b1eb02a654715fc32c2964d8021f6 size 4962
+MD5 ed0d58cbd08a584c541729a9cbac0b1c qmail-scanner-2.01.ebuild 4962
+RMD160 880d4d5c63e27e8266d3f10de7d242832c0ca5a3 qmail-scanner-2.01.ebuild 4962
+SHA256 3302676ac87ca4e4c59f92be0014de15757b1eb02a654715fc32c2964d8021f6 qmail-scanner-2.01.ebuild 4962
+MISC ChangeLog 7975 RMD160 2226eddde33d56f4cd53e82e61ee94bcbd0b7fae SHA1 cb1b669fbb9bcb9365189177b1b4835fbcbf7f43 SHA256 1535884778d668f52328d414f4ff3003e0e09266eaeaff151db63eaf15bdcea4 size 7975
+MD5 9fb027dbcabe45c29a2e1f3f4e9221d8 ChangeLog 7975
+RMD160 2226eddde33d56f4cd53e82e61ee94bcbd0b7fae ChangeLog 7975
+SHA256 1535884778d668f52328d414f4ff3003e0e09266eaeaff151db63eaf15bdcea4 ChangeLog 7975
+MISC metadata.xml 158 RMD160 1bd73d3a80f2670284225f39ce0a4a1c01954966 SHA1 d4831c624efba996486f0fd640d04e06d9e6d1fa SHA256 940554be041a57d02888d9f414efb7768e9f72565c642327ecb4f9f64ca6d8d4 size 158
+MD5 7df733d43f5875dfc63bae636203b8cb metadata.xml 158
+RMD160 1bd73d3a80f2670284225f39ce0a4a1c01954966 metadata.xml 158
+SHA256 940554be041a57d02888d9f414efb7768e9f72565c642327ecb4f9f64ca6d8d4 metadata.xml 158
+MD5 ff83ea44513fae0bbfc5bcacbc34e394 files/digest-qmail-scanner-1.25-r1 140
+RMD160 3bfb51c90c7818cf1028eca2ddc5edc139e44d17 files/digest-qmail-scanner-1.25-r1 140
+SHA256 f0907b490ece1ff059a72422c692d2e299718d6410238d483b595ecc7d715a65 files/digest-qmail-scanner-1.25-r1 140
+MD5 79abb177b79bf5720af899802036cff4 files/digest-qmail-scanner-2.01 509
+RMD160 d90a9d035c50e0f8ec153ac41500eafccbdec7cf files/digest-qmail-scanner-2.01 509
+SHA256 3fcfc17951129da1b77325ca63a0a38fe2a50d6973c4f568885578aceeb8da69 files/digest-qmail-scanner-2.01 509
diff --git a/mail-filter/qmail-scanner/files/digest-qmail-scanner-2.01 b/mail-filter/qmail-scanner/files/digest-qmail-scanner-2.01
new file mode 100644
index 000000000000..ae6aa52fab43
--- /dev/null
+++ b/mail-filter/qmail-scanner/files/digest-qmail-scanner-2.01
@@ -0,0 +1,6 @@
+MD5 328935e3da7e8919d643f219e0856b7b q-s-2.01st-20060423.patch.gz 99463
+RMD160 e395948089886cdd79c40e6a9c59a1048b0dbe49 q-s-2.01st-20060423.patch.gz 99463
+SHA256 b6f507dc0f199aff798f6189c1af6f337d859c7d1eb1af5e44539d45864f367c q-s-2.01st-20060423.patch.gz 99463
+MD5 3fa95fb2e6bcea5adf450b6f1497ff5e qmail-scanner-2.01.tgz 226699
+RMD160 77ed1ca024b99b30cd6973faf6595c71f85eaf5b qmail-scanner-2.01.tgz 226699
+SHA256 4bf69d3581c23b552deffafcfca49f325c5fe6c5ee6012055f201b8535243472 qmail-scanner-2.01.tgz 226699
diff --git a/mail-filter/qmail-scanner/qmail-scanner-2.01.ebuild b/mail-filter/qmail-scanner/qmail-scanner-2.01.ebuild
new file mode 100644
index 000000000000..887ab2c81a60
--- /dev/null
+++ b/mail-filter/qmail-scanner/qmail-scanner-2.01.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-2.01.ebuild,v 1.1 2006/05/29 16:02:59 st_lim Exp $
+
+inherit fixheadtails toolchain-funcs eutils
+
+Q_S_DATE=20060423
+DESCRIPTION="E-Mail virus scanner for qmail."
+HOMEPAGE="http://qmail-scanner.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz
+		http://toribio.apollinare.org/qmail-scanner/download/q-s-${PV}st-${Q_S_DATE}.patch.gz"
+
+IUSE="spamassassin"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+RESTRICT="userpriv usersandbox"
+
+DEPEND=">=dev-lang/perl-5.6.1-r1
+	>=virtual/perl-Time-HiRes-01.20-r2
+	>=net-mail/tnef-1.1.1
+	>=virtual/perl-DB_File-1.803-r2
+	>=net-mail/ripmime-1.3.0.4
+	virtual/qmail
+	>=app-arch/unzip-5.42-r1
+	virtual/antivirus
+	spamassassin? ( >=mail-filter/spamassassin-2.64 )"
+
+pkg_setup() {
+	enewgroup qscand 210
+	enewuser qscand 210 -1 /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}
+	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"
+	einfo "Adding items to the SILENT_VIRUSES list (${EXTRA_VIRII})"
+	sed -e "/^SILENT_VIRUSES/s/\"$/,${EXTRA_VIRII}\"/g"  -i configure
+}
+
+src_compile () {
+	local myconf
+
+	addpredict /var/log/kav/kavscan.log
+	addpredict /opt/bdc/plugins.htm
+
+	use spamassassin && myconf="--virus-to-delete yes --sa-quarantine 2.1 --sa-delete 4.2 --sa-reject no --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
+	$(tc-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"
+}