Home directory fix, clamav integration, various upstream changes, and updating of st patches: Bug #178680 #151801 #135636 #73001

Package-Manager: portage-2.1.3.19

5 files changed, 224 insertions, 10 deletions

diff --git a/mail-filter/qmail-scanner/ChangeLog b/mail-filter/qmail-scanner/ChangeLog
index 34fdb01c3d17..7e30472a3211 100644
--- a/mail-filter/qmail-scanner/ChangeLog
+++ b/mail-filter/qmail-scanner/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for mail-filter/qmail-scanner
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.37 2007/07/02 15:01:42 peper Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.38 2008/01/04 22:45:16 tupone Exp $
+
+*qmail-scanner-2.01-r1 (03 Jan 2008)
+
+  03 Jan 2008; Tupone Alfredo <tupone@gentoo.org>
+  +files/qmail-scanner-2.01.logrotate, +qmail-scanner-2.01-r1.ebuild:
+  Directory misconfiguration fix, various upstream changes, and updating of st
+  patches:
+  bug #178680 by Stanislav Kogan
+  bug #151801 by Michail Baikov
+  bug #135636 by Peter Gantner (a.k.a. nephros)
+  Adding instruction to make clamav working with qmail-scanner:
+  bug #73001 by David Röhr <david@rohr.se>
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
   qmail-scanner-1.25-r1.ebuild, qmail-scanner-2.01.ebuild:
diff --git a/mail-filter/qmail-scanner/Manifest b/mail-filter/qmail-scanner/Manifest
index 0cf78b0a40f0..958c134e4d9c 100644
--- a/mail-filter/qmail-scanner/Manifest
+++ b/mail-filter/qmail-scanner/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX qmail-scanner-2.01.logrotate 135 RMD160 2958597e646453f198ec6a4a3533e9b9398c9fe7 SHA1 f31c44239f9d56af3d4be6b422b3a4a834351748 SHA256 d61514a06570b55089915c134beefe5222eaa1199cba7afbe91681b7d67248f5
+MD5 d43764c3cf09870468ea24034f2e3552 files/qmail-scanner-2.01.logrotate 135
+RMD160 2958597e646453f198ec6a4a3533e9b9398c9fe7 files/qmail-scanner-2.01.logrotate 135
+SHA256 d61514a06570b55089915c134beefe5222eaa1199cba7afbe91681b7d67248f5 files/qmail-scanner-2.01.logrotate 135
 AUX qmail-scanner-queue.pl.patch 240 RMD160 6d644003bb6386ad2e21e775352fe01bf8cc81c1 SHA1 98be0f8c45f7917ea809a68c19627217b8c4c3d7 SHA256 77f09de11c2d448c17dd0b377cae3cedd756e404b1e611e2bf69e74d7e05be8e
 MD5 1d80eca1d4792a4073f51eb59f02960b files/qmail-scanner-queue.pl.patch 240
 RMD160 6d644003bb6386ad2e21e775352fe01bf8cc81c1 files/qmail-scanner-queue.pl.patch 240
@@ -15,20 +19,25 @@ RMD160 d4eccf7f1169a448c0ce8115f426214927935385 files/qmailscanner.logrotate 147
 SHA256 eae732e0be2ace1ddcd4cc17a9c6a54012684c76dd30faa5349d394f3befc62f files/qmailscanner.logrotate 147
 DIST q-s-1.25st-20050406.patch.gz 124325 RMD160 162f325c0d77deaca4f49f06bf4cb6b6e0b548f5 SHA1 fb1b516b4ace278a1834a264690a1e1927ded530 SHA256 a758b902150f432cc0fa0cc76448bf975e75395ab6b614ca1d8f3be64ab6535a
 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 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
 EBUILD qmail-scanner-1.25-r1.ebuild 4943 RMD160 ecc34b4f580318694c2fe392c35a398c2f6fe87a SHA1 5cb9f503bc381c1db3e59e3e3c96d77f01b0925b SHA256 4a723d46700d58c291026a76536b52316defef7c92ec499aea1d416f49ef0efb
 MD5 3dee4e05ea87e909b9389ee20f316105 qmail-scanner-1.25-r1.ebuild 4943
 RMD160 ecc34b4f580318694c2fe392c35a398c2f6fe87a qmail-scanner-1.25-r1.ebuild 4943
 SHA256 4a723d46700d58c291026a76536b52316defef7c92ec499aea1d416f49ef0efb qmail-scanner-1.25-r1.ebuild 4943
+EBUILD qmail-scanner-2.01-r1.ebuild 5524 RMD160 3d98c524b9acfcdbddfc54107fe926fd1b5563ff SHA1 0cb62baead635a4c7f63656dbc1d73892ef91a52 SHA256 6b83b5e0fd3b38c554ae7281f84f86143f1bff5b7430e8a708fdb9fb3a5d5f15
+MD5 87d7b23860cb8591dcdb38a614481100 qmail-scanner-2.01-r1.ebuild 5524
+RMD160 3d98c524b9acfcdbddfc54107fe926fd1b5563ff qmail-scanner-2.01-r1.ebuild 5524
+SHA256 6b83b5e0fd3b38c554ae7281f84f86143f1bff5b7430e8a708fdb9fb3a5d5f15 qmail-scanner-2.01-r1.ebuild 5524
 EBUILD qmail-scanner-2.01.ebuild 4973 RMD160 19d44f0d8f18806c1f29991a66527afcb845ee01 SHA1 39fec8460e663e1f9d722196af0efcf46f691df3 SHA256 a3dd91f71b5a7c7522ca69c566b25f300431aa916df41b1616058806af9cc6f4
 MD5 13bfb927787cb210ea00723d1a97084e qmail-scanner-2.01.ebuild 4973
 RMD160 19d44f0d8f18806c1f29991a66527afcb845ee01 qmail-scanner-2.01.ebuild 4973
 SHA256 a3dd91f71b5a7c7522ca69c566b25f300431aa916df41b1616058806af9cc6f4 qmail-scanner-2.01.ebuild 4973
-MISC ChangeLog 8800 RMD160 3c4c1c81a62afd433601218ac14532a905f33b96 SHA1 a6fc85a87cb9a8dd0b6d6af7bc576139638c7077 SHA256 29168cf3247e67f76ec1dbec790c3a371553e86738140f4a92ecd9f242e81f1d
-MD5 e5141fa60a959136b6a682230cf73fdc ChangeLog 8800
-RMD160 3c4c1c81a62afd433601218ac14532a905f33b96 ChangeLog 8800
-SHA256 29168cf3247e67f76ec1dbec790c3a371553e86738140f4a92ecd9f242e81f1d ChangeLog 8800
+MISC ChangeLog 9271 RMD160 9311b0f2328d5213a9a22649462351a054fb9b05 SHA1 1027dd513a3195ee4943d0522206b3f58492cf3b SHA256 550b2b4638106536648bec4c1e7f51c87fbc27022e7f13b07c77bd77708249cc
+MD5 fa83865c2e6a0b89c8a98732a324392d ChangeLog 9271
+RMD160 9311b0f2328d5213a9a22649462351a054fb9b05 ChangeLog 9271
+SHA256 550b2b4638106536648bec4c1e7f51c87fbc27022e7f13b07c77bd77708249cc ChangeLog 9271
 MISC metadata.xml 158 RMD160 1bd73d3a80f2670284225f39ce0a4a1c01954966 SHA1 d4831c624efba996486f0fd640d04e06d9e6d1fa SHA256 940554be041a57d02888d9f414efb7768e9f72565c642327ecb4f9f64ca6d8d4
 MD5 7df733d43f5875dfc63bae636203b8cb metadata.xml 158
 RMD160 1bd73d3a80f2670284225f39ce0a4a1c01954966 metadata.xml 158
@@ -39,10 +48,13 @@ SHA256 cd800f3aed17a7f7541630d473c7acd460076c470a2319a39b1a65c31cecf775 files/di
 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
+MD5 59c4e752ab1df2cced478003a78060b0 files/digest-qmail-scanner-2.01-r1 509
+RMD160 aa4456c29af016490bf68be0711a0215118ad936 files/digest-qmail-scanner-2.01-r1 509
+SHA256 1377a44626dca66358c6d929f9e1d462a03f0e8b68ab72cc087dfb15a87853e0 files/digest-qmail-scanner-2.01-r1 509
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGiRNbppoStNGKGywRAituAKCmgd4ER5o5spH8yHmzLABlY4t8lQCgyrVE
-veauF6hXcPuinpW8BidVCAM=
-=i/0e
+iD8DBQFHfrcG8qKy9+b2Hl0RAruvAJ9JtWdEkLnnjkv2hXpxYLv3KpEmhwCffm2p
+lb64wVKe3Cmeij7Q2Y8HhI8=
+=WP22
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/qmail-scanner/files/digest-qmail-scanner-2.01-r1 b/mail-filter/qmail-scanner/files/digest-qmail-scanner-2.01-r1
new file mode 100644
index 000000000000..e8c35cfb1535
--- /dev/null
+++ b/mail-filter/qmail-scanner/files/digest-qmail-scanner-2.01-r1
@@ -0,0 +1,6 @@
+MD5 da484a16eae5b3fd56f5220f8e4da0c5 q-s-2.01st-20070204.patch.gz 90410
+RMD160 da89d1233d63e0a4bd462721df295e973e398def q-s-2.01st-20070204.patch.gz 90410
+SHA256 d8d2db13a17de228acb9e0b403ac7930a5488ee64a7d72d37e3feddf7b243cac q-s-2.01st-20070204.patch.gz 90410
+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/files/qmail-scanner-2.01.logrotate b/mail-filter/qmail-scanner/files/qmail-scanner-2.01.logrotate
new file mode 100644
index 000000000000..a0f3cbd880e8
--- /dev/null
+++ b/mail-filter/qmail-scanner/files/qmail-scanner-2.01.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
new file mode 100644
index 000000000000..ce751430f193
--- /dev/null
+++ b/mail-filter/qmail-scanner/qmail-scanner-2.01-r1.ebuild
@@ -0,0 +1,180 @@
+# 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 $
+
+inherit fixheadtails toolchain-funcs eutils
+
+Q_S_DATE=20070204
+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 ~x86"
+RESTRICT="userpriv"
+
+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
+	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/qscan 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`
+		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}"
+	rm index.php && cp README.html index.php
+	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 \
+	--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/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
+	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/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"
+
+	ewarn "For an integration with clamav, clamav user should have access"
+	ewarn "to files in the qscand group."
+	ewarn "To allow that, add clamav user to the qscand group and"
+	ewarn "comment-out in /etc/clamd.conf AllowSupplementaryGroups putting yes."
+	ewarn "After that, restart clamd with"
+	ewarn "/etc/init.d/clamd restart"
+}