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.
This commit is contained in:
schmonz 2004-12-21 05:32:56 +00:00
parent 08ebb30525
commit 2cdc1d129b
4 changed files with 36 additions and 6 deletions

View file

@ -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 @@ QUEUE_EXTRA.
===========================================================================
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
;;

View file

@ -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 @@ MESSAGE_SUBST+= DOCDIR=${DOCDIR} EGDIR=${EGDIR}
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

View file

@ -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 @@ SHA1 (qmail-1.03-realrcptto-2004.08.20.patch) = 1406bddae6eb59c50324c15907ef3178
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

View file

@ -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_DEFAULT_OPTIONS+= netqmail # for the errno patches
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 @@ SUBST_SED.load+= -e '$$s|$$| -bind_at_load|'
. 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