Version bump to 2.05

Package-Manager: portage-2.1.4.5

6 files changed, 217 insertions, 12 deletions

diff --git a/mail-filter/qmail-scanner/ChangeLog b/mail-filter/qmail-scanner/ChangeLog
index 5fd2313489b0..faf08cc8dbd4 100644
--- a/mail-filter/qmail-scanner/ChangeLog
+++ b/mail-filter/qmail-scanner/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/qmail-scanner
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.42 2008/08/23 05:57:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.43 2008/10/29 20:17:44 tupone Exp $
+
+*qmail-scanner-2.05 (29 Oct 2008)
+
+  29 Oct 2008; Tupone Alfredo <tupone@gentoo.org>
+  +files/qmail-scanner-2.05.logrotate, qmail-scanner-2.01-r1.ebuild,
+  qmail-scanner-2.02-r1.ebuild, +qmail-scanner-2.05.ebuild:
+  Version bump to 2.05 & some minor fix
 
   23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/mail-filter/qmail-scanner/Manifest b/mail-filter/qmail-scanner/Manifest
index b2b3e2a23597..c029fa15489e 100644
--- a/mail-filter/qmail-scanner/Manifest
+++ b/mail-filter/qmail-scanner/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX qmail-scanner-2.01.logrotate 135 RMD160 2958597e646453f198ec6a4a3533e9b9398c9fe7 SHA1 f31c44239f9d56af3d4be6b422b3a4a834351748 SHA256 d61514a06570b55089915c134beefe5222eaa1199cba7afbe91681b7d67248f5
 AUX qmail-scanner-2.02.logrotate 135 RMD160 2958597e646453f198ec6a4a3533e9b9398c9fe7 SHA1 f31c44239f9d56af3d4be6b422b3a4a834351748 SHA256 d61514a06570b55089915c134beefe5222eaa1199cba7afbe91681b7d67248f5
+AUX qmail-scanner-2.05.logrotate 135 RMD160 2958597e646453f198ec6a4a3533e9b9398c9fe7 SHA1 f31c44239f9d56af3d4be6b422b3a4a834351748 SHA256 d61514a06570b55089915c134beefe5222eaa1199cba7afbe91681b7d67248f5
 AUX qmail-scanner-queue.pl.patch 240 RMD160 6d644003bb6386ad2e21e775352fe01bf8cc81c1 SHA1 98be0f8c45f7917ea809a68c19627217b8c4c3d7 SHA256 77f09de11c2d448c17dd0b377cae3cedd756e404b1e611e2bf69e74d7e05be8e
 AUX qmailscanner.cronjob 50 RMD160 afec02a08f7824fbea506b14372af9ea62270b8a SHA1 773b938347d27a042537cd925543fdde732231a2 SHA256 09354f2ef42b6423a5947d004a4d3bf76355aafaf11a0db12052bf088115dee1
 AUX qmailscanner.logrotate 147 RMD160 d4eccf7f1169a448c0ce8115f426214927935385 SHA1 d3f763ed9dd1ba8a9c41837e5110950c14b40591 SHA256 eae732e0be2ace1ddcd4cc17a9c6a54012684c76dd30faa5349d394f3befc62f
@@ -10,19 +11,22 @@ DIST q-s-1.25st-20050406.patch.gz 124325 RMD160 162f325c0d77deaca4f49f06bf4cb6b6
 DIST q-s-2.01st-20060423.patch.gz 99463 RMD160 e395948089886cdd79c40e6a9c59a1048b0dbe49 SHA1 e5b4d3483484fd36efa847beede68e6a7389449f SHA256 b6f507dc0f199aff798f6189c1af6f337d859c7d1eb1af5e44539d45864f367c
 DIST q-s-2.01st-20070204.patch.gz 90410 RMD160 da89d1233d63e0a4bd462721df295e973e398def SHA1 2aa3ef010ccc0f7fd5f99cf6b1d477334a34d87a SHA256 d8d2db13a17de228acb9e0b403ac7930a5488ee64a7d72d37e3feddf7b243cac
 DIST q-s-2.02st-20080119.patch.gz 101067 RMD160 820dea7bba37de3002ebe7d8087ffa035c88aaec SHA1 9929369479dbbb610118c233e210fb73ce1c4eac SHA256 265eea06510f2af88bca413cd7f25b9449d2a41bcec63500887ab775492d33b3
+DIST q-s-2.05st-20080728.patch.gz 102235 RMD160 6983d3481fe3163d2e833e04d2c34132f22cbe05 SHA1 b403abe1b8dccb1038a83a16c411e0e62e1f7880 SHA256 03f6b5c030fcd95a726b15b68ce722495b73cea406356fe00a51f0f52c0aa840
 DIST qmail-scanner-1.25.tgz 221156 RMD160 404feea1291ff4f40d7041f112ed86352735a88f SHA1 d8bf1b968eaec64309404f3253e513e1ae6d5cac SHA256 6fa5743a0d180bc4d1a626c4bf56c06a29ec3c0d7cb2ce834add8faceefb9c01
 DIST qmail-scanner-2.01.tgz 226699 RMD160 77ed1ca024b99b30cd6973faf6595c71f85eaf5b SHA1 7ac4de517c9fc66b1ea058e1d15d7ab52ca12ad0 SHA256 4bf69d3581c23b552deffafcfca49f325c5fe6c5ee6012055f201b8535243472
 DIST qmail-scanner-2.02.tgz 236440 RMD160 49a8b3465546071e6ff07a6faa8059f11e185a45 SHA1 1173fb993d46eed50089d71fa3824eace89a07c3 SHA256 50b7d0d7b6caabc0e58fd62f7f4483b89fc528a7f78cfd795f40c0f0825fae03
+DIST qmail-scanner-2.05.tgz 5276 RMD160 7070fd0070ca8b0410e45eb5840e0a5b018df227 SHA1 7462746a7e93877ad84c3efb3904952e8e02fdad SHA256 ff084bc44d487ba573f9a08083f54ec3a1a60f0bd1b0214f4634717d28a7e795
 EBUILD qmail-scanner-1.25-r1.ebuild 4943 RMD160 ecc34b4f580318694c2fe392c35a398c2f6fe87a SHA1 5cb9f503bc381c1db3e59e3e3c96d77f01b0925b SHA256 4a723d46700d58c291026a76536b52316defef7c92ec499aea1d416f49ef0efb
-EBUILD qmail-scanner-2.01-r1.ebuild 5524 RMD160 3d98c524b9acfcdbddfc54107fe926fd1b5563ff SHA1 0cb62baead635a4c7f63656dbc1d73892ef91a52 SHA256 6b83b5e0fd3b38c554ae7281f84f86143f1bff5b7430e8a708fdb9fb3a5d5f15
+EBUILD qmail-scanner-2.01-r1.ebuild 5526 RMD160 868b8034aa36946d378bbd7a21b3abe87a19c384 SHA1 a43f7ba448db10b4b702440e54c5e8c9d731692a SHA256 edd16606b9b2fdf4598311288e94d344479bc0cf98faa0fe2fc1510dc9d82eed
 EBUILD qmail-scanner-2.01.ebuild 4973 RMD160 19d44f0d8f18806c1f29991a66527afcb845ee01 SHA1 39fec8460e663e1f9d722196af0efcf46f691df3 SHA256 a3dd91f71b5a7c7522ca69c566b25f300431aa916df41b1616058806af9cc6f4
-EBUILD qmail-scanner-2.02-r1.ebuild 5630 RMD160 95aaaec19422adc2ceab2bb9d67afba2db0dd56f SHA1 3e8504b5eb20ec3907272e5054c4c75f2a4dd1ab SHA256 299282c157b135332642d4cab687392060dcfb88ba22bf299462c659dde0fb5c
-MISC ChangeLog 10018 RMD160 632b70902925e6d89e764dc57ab3e7ce02eff40d SHA1 5515b7789f2dd648c70a946cb9ff718c78c8841f SHA256 a3c6541ab1d73202341c26b4744580985b0844a383d9be6cb2a248a56b30c042
+EBUILD qmail-scanner-2.02-r1.ebuild 5630 RMD160 eec78a13796762e572e24485faf886152fd9bf5b SHA1 d55e0778325b5d6af9b783b32e1fe09f70fd9503 SHA256 bad0c10f70f6a96b9e3d90958e8fcdd2a30ab56d33bf08ef6357d6c5f46fe415
+EBUILD qmail-scanner-2.05.ebuild 5571 RMD160 3adb4cdbc27ae0f4521d0026d6f5da4ae1b4bb9d SHA1 213c719209e7cdde761af257b614280b6bf2a919 SHA256 6caef506beab457ab0f647d000516ff369ff6faac32209bbc9d04a68fba2b2fc
+MISC ChangeLog 10273 RMD160 18a2b2c9fc13a62e74bf4063df3b0c99b82c5859 SHA1 7db488b0b6c97e7018547a7c9b90e543e152fcf4 SHA256 ec7d9d29da22ac6316a5c68f3c2ddc18d82d10a74bef51a8b2f84b38d9194693
 MISC metadata.xml 282 RMD160 6047a02ca8e523b09e783bbe055f9f7cb62b0016 SHA1 4569f60d2043a11bf769109750076c03327b26e5 SHA256 48e16cc43d5cf9869e871f9779e3188fbb3321a16a119c19e5f8d7cdf08649bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkivps4ACgkQoeSe8B0zEfy6kgCfbJ5iQlTQ6lKp1iK1YDS9zx5Y
-jwIAn05FSdCvNCsTPFdypACSz7byj6kv
-=35Ae
+iEYEARECAAYFAkkIxPYACgkQmAYtPIR1e6RuJQCgmjWlw4qsS98pOMe8r005u3hg
+XZIAni3ZRDCL3HiNC6HJnu1KaA+tM0ot
+=N39I
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/qmail-scanner/files/qmail-scanner-2.05.logrotate b/mail-filter/qmail-scanner/files/qmail-scanner-2.05.logrotate
new file mode 100644
index 000000000000..a0f3cbd880e8
--- /dev/null
+++ b/mail-filter/qmail-scanner/files/qmail-scanner-2.05.logrotate
@@ -0,0 +1,4 @@
+/var/spool/qscan/qmail-queue.log /var/spool/qscan/quarantine.log /var/spool/qscan/mailstats.csv {
+	weekly
+	create 0600 qscand qscand
+}
diff --git a/mail-filter/qmail-scanner/qmail-scanner-2.01-r1.ebuild b/mail-filter/qmail-scanner/qmail-scanner-2.01-r1.ebuild
index ce751430f193..ffa82bf5b1a6 100644
--- a/mail-filter/qmail-scanner/qmail-scanner-2.01-r1.ebuild
+++ b/mail-filter/qmail-scanner/qmail-scanner-2.01-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r1.ebuild,v 1.1 2008/01/04 22:45:16 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-2.01-r1.ebuild,v 1.2 2008/10/29 20:17:44 tupone Exp $
 
 inherit fixheadtails toolchain-funcs eutils
 
@@ -46,7 +46,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	rm index.php && cp README.html index.php
-	epatch ${DISTDIR}/q-s-${PV}st-${Q_S_DATE}.patch.gz
+	epatch "${DISTDIR}"/q-s-${PV}st-${Q_S_DATE}.patch.gz
 	ht_fix_file autoupdaters/* configure
 	sed -i \
 		-e "s:/var/spool/qscand:/var/spool/qscan:g" \
diff --git a/mail-filter/qmail-scanner/qmail-scanner-2.02-r1.ebuild b/mail-filter/qmail-scanner/qmail-scanner-2.02-r1.ebuild
index 0a59bd7d61f1..521d01ff4ef2 100644
--- a/mail-filter/qmail-scanner/qmail-scanner-2.02-r1.ebuild
+++ b/mail-filter/qmail-scanner/qmail-scanner-2.02-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.02-r1.ebuild,v 1.1 2008/02/13 06:03:51 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-2.02-r1.ebuild,v 1.2 2008/10/29 20:17:44 tupone Exp $
 
 inherit fixheadtails toolchain-funcs eutils
 
@@ -14,7 +14,7 @@ IUSE="clamav spamassassin"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="userpriv"
 
 DEPEND=">=dev-lang/perl-5.6.1-r1
@@ -48,7 +48,7 @@ pkg_preinst() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch ${DISTDIR}/q-s-${PV}st-${Q_S_DATE}.patch.gz
+	epatch "${DISTDIR}"/q-s-${PV}st-${Q_S_DATE}.patch.gz
 	ht_fix_file autoupdaters/* configure
 	sed -i \
 		-e "s:/var/spool/qscand:/var/spool/qscan:g" \
diff --git a/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild b/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild
new file mode 100644
index 000000000000..7d90432939ba
--- /dev/null
+++ b/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2008 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.05.ebuild,v 1.1 2008/10/29 20:17:44 tupone Exp $
+
+inherit fixheadtails toolchain-funcs eutils
+
+Q_S_DATE=20080728
+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="clamav spamassassin"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="userpriv"
+
+DEPEND="dev-lang/perl
+	virtual/perl-Time-HiRes
+	net-mail/tnef
+	virtual/perl-DB_File
+	mail-filter/maildrop
+	virtual/qmail
+	app-arch/unzip
+	sys-process/daemontools
+	virtual/antivirus
+	clamav? ( app-antivirus/clamav )
+	spamassassin? ( mail-filter/spamassassin )"
+
+pkg_setup() {
+	enewgroup qscand 210
+	enewuser qscand 210 -1 /var/spool/qscan qscand
+	use clamav && usermod -a -G qscand,nofiles clamav
+}
+
+pkg_preinst() {
+	local oldname="/var/qmail/bin/qmail-scanner-queue.pl"
+	if [ -f ${oldname} ]; then
+		newname=${oldname}.`date +%Y%m%d%H%M%S`
+		elog "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
+	sed -i \
+		-e "s:/var/spool/qscand:/var/spool/qscan:g" \
+		README-st-patch.html \
+		README-st-patch.txt || die "Fixing doc with sed failed"
+
+	EXTRA_VIRII="bagle,beagle,mydoom,sco,maldal,mimail,novarg,shimg,bugler,cissi,cissy,dloade,netsky,qizy"
+	elog "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 \
+	--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/qscan
+	keepdir /var/spool/qscan
+	diropts -m 750 -o qscand -g qscand
+	dodir /var/spool/qscan/quarantine
+	for i in quarantine/{viruses,policy,spam} working archives; do
+		for j in tmp new cur; do
+			dodir /var/spool/qscan/${i}/${j}
+			keepdir /var/spool/qscan/${i}/${j}
+		done
+	done
+	dodir /var/spool/qscan/tmp
+	keepdir /var/spool/qscan/tmp
+
+	# Install standard quarantine events file
+	insinto /var/spool/qscan
+	insopts -m 644 -o qscand -g qscand
+	doins quarantine-events.txt
+
+	# create quarantine.log and viruses.log
+	touch quarantine.log
+	insinto /var/spool/qscan
+	insopts -m 644 -o qscand -g qscand
+	doins quarantine.log
+	dosym quarantine.log ${DESTDIR}/var/spool/qscan/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}"/${P}.logrotate qmail-scanner
+
+	exeinto /etc/cron.daily/
+	newexe "${FILESDIR}"/qmailscanner.cronjob qmail-scanner
+
+	# Install documentation
+	dodoc README CHANGES
+	dohtml README.html FAQ.php TODO.php configure-options.php manual-install.php perlscanner.php
+
+	docinto contrib
+	cd "${S}"/contrib
+	dodoc spamc-nice.eml \
+		test-trophie.pl \
+		logrotate.qmail-scanner \
+		sub-avpdaemon.pl \
+		logging_first_80_chars.eml \
+		spamc-nasty.eml \
+		avpdeamon.init \
+		test_installation.sh \
+		test-sophie.pl \
+		reformime-test.eml \
+		sub-sender-cache.pl \
+		rbl_scanner.txt \
+		test-clamd.pl \
+		qs2mrtg.pl \
+		mrtg-qmail-scanner.cfg \
+		check_AV_daemons \
+		patch_for_nod32_single_user.eml \
+		qmail-delay \
+		qs-scanner-report.sh \
+		qs_config.sh \
+		qscan-spam-to-users.pl \
+		test-avgd.pl \
+		test_password.zip \
+		vpopmail-issues.eml
+}
+
+pkg_postinst () {
+	einfo "Fixing ownerships"
+	chown -R qscand:qscand /var/spool/qscan
+	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
+
+	elog "To activate qmail-scanner, please edit your"
+	elog "/var/qmail/control/conf-common file and set:"
+	elog "export QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue"
+	elog "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"
+
+	ewarn "If this is an upgrade from <=2.0.1 the home directory of the qscand"
+	ewarn "user is changed. Please update it manually to /var/spool/qscan"
+	ewarn "or remove the user and emerge again this package"
+
+	if use clamav; then
+		ewarn "To allow clamav integration comment-out in /etc/clamd.conf:"
+		ewarn "AllowSupplementaryGroups putting yes."
+		ewarn "After that, restart clamd with"
+		ewarn "/etc/init.d/clamd restart"
+	fi
+}