[pkgsrc/trunk]: pkgsrc/mail/qmail With the "viruscan" option, enable Russ Nel...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fcecc5f4046a
branches:  trunk
changeset: 486014:fcecc5f4046a
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Tue Dec 21 05:32:56 2004 +0000

description:
With the "viruscan" option, enable Russ Nelson's patch to SMTP-reject
messages with MIME attachments that match certain signatures, as
well as Jeremy Kitchen's patch that causes such rejections to be
logged.

Bump PKGREVISION.

diffstat:

 mail/qmail/INSTALL    |  11 ++++++++++-
 mail/qmail/Makefile   |   5 +++--
 mail/qmail/distinfo   |   6 +++++-
 mail/qmail/options.mk |  20 ++++++++++++++++++--
 4 files changed, 36 insertions(+), 6 deletions(-)

diffs (109 lines):

diff -r d2c83e7cf2de -r fcecc5f4046a mail/qmail/INSTALL
--- a/mail/qmail/INSTALL        Tue Dec 21 04:23:33 2004 +0000
+++ b/mail/qmail/INSTALL        Tue Dec 21 05:32:56 2004 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: INSTALL,v 1.3 2004/12/20 04:22:37 schmonz Exp $
+# $NetBSD: INSTALL,v 1.4 2004/12/21 05:32:56 schmonz Exp $
 
 DOCDIR=@DOCDIR@
 EGDIR=@EGDIR@
 QMAILDIR=@QMAILDIR@
 QMAIL_QUEUE_DIR=@QMAIL_QUEUE_DIR@
 QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@
+VIRUSCAN_SIGS_SRCFILE=@VIRUSCAN_SIGS_SRCFILE@
 
 VAR_QMAIL_DIRS="alias bin boot control doc man queue users"
 
@@ -62,6 +63,14 @@
 ===========================================================================
 EOF
        fi
+       if ! [ -z ${VIRUSCAN_SIGS_SRCFILE} ] && \
+               ! [ -s ${PKG_SYSCONFDIR}/control/signatures ]; then
+               ${SED} -e '1,15d' -e '34,$d' \
+                       < ${VIRUSCAN_SIGS_SRCFILE} \
+                       > ${PKG_SYSCONFDIR}/control/signatures
+               ${CHMOD} 644 ${PKG_SYSCONFDIR}/control/signatures
+       fi
+
 
        ;;
 
diff -r d2c83e7cf2de -r fcecc5f4046a mail/qmail/Makefile
--- a/mail/qmail/Makefile       Tue Dec 21 04:23:33 2004 +0000
+++ b/mail/qmail/Makefile       Tue Dec 21 05:32:56 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2004/12/03 15:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2004/12/21 05:32:56 schmonz Exp $
 #
 
 DISTNAME=              netqmail-1.05
 PKGNAME=               qmail-1.03
-PKGREVISION=           9
+PKGREVISION=           10
 CATEGORIES=            mail
 MASTER_SITES=          http://qmail.org/
 
@@ -56,6 +56,7 @@
 FILES_SUBST+=          DOCDIR=${DOCDIR} EGDIR=${EGDIR} SHAREDIR=${SHAREDIR}
 FILES_SUBST+=          QMAILDIR=${QMAILDIR} QMAIL_QUEUE_DIR=${QMAIL_QUEUE_DIR}
 FILES_SUBST+=          QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA}
+FILES_SUBST+=          VIRUSCAN_SIGS_SRCFILE=${VIRUSCAN_SIGS_SRCFILE}
 FILES_SUBST+=          PKGNAME=${PKGNAME}
 
 PLIST_SRC=             ${PKGDIR}/PLIST
diff -r d2c83e7cf2de -r fcecc5f4046a mail/qmail/distinfo
--- a/mail/qmail/distinfo       Tue Dec 21 04:23:33 2004 +0000
+++ b/mail/qmail/distinfo       Tue Dec 21 05:32:56 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2004/08/22 00:10:52 schmonz Exp $
+$NetBSD: distinfo,v 1.9 2004/12/21 05:32:56 schmonz Exp $
 
 SHA1 (netqmail-1.05.tar.gz) = fe4cbe97bd2f18a5ca1b36e4fbbd6c524256a829
 Size (netqmail-1.05.tar.gz) = 252264 bytes
@@ -18,3 +18,7 @@
 Size (qmail-1.03-realrcptto-2004.08.20.patch) = 16663 bytes
 SHA1 (netqmail-1.05-tls-smtpauth-20040705.patch) = 3d26efd3601bc6a88be2685dcaed51fc553a59d3
 Size (netqmail-1.05-tls-smtpauth-20040705.patch) = 57631 bytes
+SHA1 (qmail-smtpd-viruscan-1.3.patch) = 3a8f4e38df1c3f483f72b1a24ebc36664d075dd9
+Size (qmail-smtpd-viruscan-1.3.patch) = 8891 bytes
+SHA1 (qmail-smtpd-viruscan-logging.patch) = ca7105b5561cf280e9e3a465d2d68a16673ff56c
+Size (qmail-smtpd-viruscan-logging.patch) = 2157 bytes
diff -r d2c83e7cf2de -r fcecc5f4046a mail/qmail/options.mk
--- a/mail/qmail/options.mk     Tue Dec 21 04:23:33 2004 +0000
+++ b/mail/qmail/options.mk     Tue Dec 21 05:32:56 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2004/11/28 19:19:52 jlam Exp $
+# $NetBSD: options.mk,v 1.6 2004/12/21 05:32:56 schmonz Exp $
 
 .if ${OPSYS} == "Darwin"
 PKG_DEFAULT_OPTIONS+=  darwin
@@ -10,7 +10,7 @@
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS= badrcptto bigdns darwin nullenvsender netqmail
-PKG_SUPPORTED_OPTIONS+=        outgoingip qregex realrcptto sasl syncdir tls
+PKG_SUPPORTED_OPTIONS+=        outgoingip qregex realrcptto sasl syncdir tls viruscan
 .include "../../mk/bsd.options.mk"
 
 ###
@@ -136,3 +136,19 @@
 .  endif
 SUBST_MESSAGE.load=    "Setting linker flags for syncdir."
 .endif
+
+###
+### reject messages with MIME attachments that match certain signatures
+###
+.if !empty(PKG_OPTIONS:Mviruscan)
+VIRUSCAN_PATCH=                qmail-smtpd-viruscan-1.3.patch
+VIRUSCAN_LOG_PATCH=    qmail-smtpd-viruscan-logging.patch
+PATCHFILES+=           ${VIRUSCAN_PATCH} ${VIRUSCAN_LOG_PATCH}
+SITES_${VIRUSCAN_PATCH}=http://www.qmail.org/
+SITES_${VIRUSCAN_LOG_PATCH}=   http://scriptkitchen.com/qmail/
+PATCH_DIST_STRIP.${VIRUSCAN_PATCH}=    -p1
+PATCH_DIST_STRIP.${VIRUSCAN_LOG_PATCH}=        -p1
+VIRUSCAN_SIGS_SRCFILE= ${DISTDIR}/${VIRUSCAN_PATCH}
+.else
+VIRUSCAN_SIGS_SRCFILE= # undefined
+.endif