Version Bump. Long overdue

diff --git a/mail-filter/qmail-scanner/ChangeLog b/mail-filter/qmail-scanner/ChangeLog
index 449b7d55f3f7c265b57691793e9cc747a23ccc5d..d166b3c527ed8cda48bf3bded9147c526777e0af 100644 (file)
--- 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.12 2004/10/03 15:12:42 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.13 2004/11/22 16:21:23 st_lim Exp $
+
+*qmail-scanner-1.24 (21 Nov 2004)
+
+  21 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> +qmail-scanner-1.24.ebuild:
+  Version bump. There are some interesting new options in the new st patch,
+  but not used here.
 
   03 Oct 2004; Jason Wever <weeve@gentoo.org> qmail-scanner-1.23-r3.ebuild:
   Stable on sparc.

diff --git a/mail-filter/qmail-scanner/Manifest b/mail-filter/qmail-scanner/Manifest
index 9fa02167a0907f5f91b7feeeb1d97449613c010c..73622f2fb60ce744b562ada79ff12350c2010b8b 100644 (file)
--- a/mail-filter/qmail-scanner/Manifest
+++ b/mail-filter/qmail-scanner/Manifest
@@ -1,11 +1,13 @@
-MD5 b65eddf7bc7f20ef3660d15afea941bb ChangeLog 4629
+MD5 99cb9db2960f9b50f13a399779e27d7c ChangeLog 4839
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 89736eec390a312f283640b9bcc40f9d qmail-scanner-1.24.ebuild 4919
 MD5 7321b01e7d7a3fb311f6f892ed290f50 qmail-scanner-1.16-r2.ebuild 2314
 MD5 1cf3518549dde5589d2e6e89772c1149 qmail-scanner-1.23-r2.ebuild 4926
 MD5 d23490bf8c0a35194a2d82776f80a1fa qmail-scanner-1.23-r3.ebuild 4921
+MD5 6f6fc9e3db3985ba4ae5a6203d2d6abf files/qmailscanner.cronjob 50
+MD5 055c5ac64c689a669b8ccd6bc5f6553d files/qmailscanner.logrotate 147
+MD5 b626340aa9646bcd929b6f8ce0e4a0e2 files/digest-qmail-scanner-1.24 139
+MD5 21cbccfc2015bf74d509a5b329ef4b30 files/digest-qmail-scanner-1.16-r2 67
 MD5 c6351759d589862bf81247f857fb2038 files/digest-qmail-scanner-1.23-r2 139
 MD5 109da745344755ce96b85ccb255ff736 files/digest-qmail-scanner-1.23-r3 139
-MD5 21cbccfc2015bf74d509a5b329ef4b30 files/digest-qmail-scanner-1.16-r2 67
 MD5 1d80eca1d4792a4073f51eb59f02960b files/qmail-scanner-queue.pl.patch 240
-MD5 6f6fc9e3db3985ba4ae5a6203d2d6abf files/qmailscanner.cronjob 50
-MD5 055c5ac64c689a669b8ccd6bc5f6553d files/qmailscanner.logrotate 147

diff --git a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.24 b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.24
new file mode 100644 (file)
index 0000000..8782b92
--- /dev/null
+++ b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.24
@@ -0,0 +1,2 @@
+MD5 0281b721b059e09c8470982d26e4ccb0 qmail-scanner-1.24.tgz 197398
+MD5 5f4b18334906c60bce40b2dd1c4d8b11 q-s-1.24st-20041101.patch.gz 90889

diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.24.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.24.ebuild
new file mode 100644 (file)
index 0000000..6ecd91c
--- /dev/null
+++ b/mail-filter/qmail-scanner/qmail-scanner-1.24.ebuild
@@ -0,0 +1,162 @@
+# 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.24.ebuild,v 1.1 2004/11/22 16:21:23 st_lim Exp $
+
+inherit fixheadtails gcc eutils
+
+Q_S_DATE=20041101
+DESCRIPTION="E-Mail virus scanner for qmail."
+HOMEPAGE="http://qmail-scanner.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz
+               http://xoomer.virgilio.it/j.toribio/qmail-scanner/download/q-s-${PV}st-${Q_S_DATE}.patch.gz"
+
+IUSE="spamassassin"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 sparc ~ppc"
+
+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.64 )"
+
+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}
+       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
+       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"
+}