diff options
author | sergei <sergei@FreeBSD.org> | 2004-10-22 11:45:25 +0000 |
---|---|---|
committer | sergei <sergei@FreeBSD.org> | 2004-10-22 11:45:25 +0000 |
commit | 1db2a7945bff6ee40628644a5d80bed524adf7fe (patch) | |
tree | 4fd4b5071cbcb31688640e2cfcc2104f9d2578d6 /mail/qmail-scanner1 | |
parent | ea30ab06f7552ad22259ccfd6fedbdafbfe1b34e (diff) | |
download | FreeBSD-ports-1db2a7945bff6ee40628644a5d80bed524adf7fe.zip FreeBSD-ports-1db2a7945bff6ee40628644a5d80bed524adf7fe.tar.gz |
- Update to 1.24
- Fix RUN_DEPENDS to properly include unzip dependency when needed [1]
- Fix "--block-password-protected" bug [3]
- Add QMAILSCAN_NOTUNZIP knob (requested by David Sieborger)
- Change default for QMAILSCAN_NOTIFY to 'psender, precips'
- Add QMAILSCAN_LANG knob to select language [2]
PR: ports/71376 [1], ports/68770 [2]
Submitted by: freebsd@simplerezo.com (maintainer) [1],
Renato Botelho <renato@galle.com.br> [2]
Obtained from: David Sieborger [3]
Diffstat (limited to 'mail/qmail-scanner1')
-rw-r--r-- | mail/qmail-scanner1/Makefile | 42 | ||||
-rw-r--r-- | mail/qmail-scanner1/distinfo | 4 | ||||
-rw-r--r-- | mail/qmail-scanner1/files/patch-configure | 43 | ||||
-rw-r--r-- | mail/qmail-scanner1/files/patch-qmail-scanner-queue.template | 2 |
4 files changed, 66 insertions, 25 deletions
diff --git a/mail/qmail-scanner1/Makefile b/mail/qmail-scanner1/Makefile index bb9d02e..64d142f 100644 --- a/mail/qmail-scanner1/Makefile +++ b/mail/qmail-scanner1/Makefile @@ -6,8 +6,7 @@ # PORTNAME= qmail-scanner -PORTVERSION= 1.22 -PORTREVISION= 1 +PORTVERSION= 1.24 CATEGORIES= mail security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -20,7 +19,6 @@ COMMENT= Content/Anti-virus Scanner for qmail BUILD_DEPENDS= ${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \ reformime:${PORTSDIR}/mail/maildrop \ ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -RUN_DEPENDS= ${BUILD_DEPENDS} # A normal qmail installation puts everything into /var/qmail/. # Must match your qmail installation @@ -43,16 +41,27 @@ CONFIGURE_ARGS+= --admin-realname "${QMAILSCAN_ADMINREALNAME}" .if defined(QMAILSCAN_ARCHIVE) CONFIGURE_ARGS+= --archive yes .endif -QMAILSCAN_NOTIFY?= psender,recips -.if defined(QMAILSCAN_LOCALDOMAINS) +QMAILSCAN_NOTIFY?= psender,precips +.if defined(QMAILSCAN_LANG) +CONFIGURE_ARGS+= --lang "${QMAILSCAN_LANG}" +.endif +.if defined(QMAILSCAN_LOCALDOMAINS) && !empty(QMAILSCAN_LOCALDOMAINS) CONFIGURE_ARGS+= --local-domains "${QMAILSCAN_LOCALDOMAINS}" .endif .if defined(QMAILSCAN_LOGCRYPTO) CONFIGURE_ARGS+= --log-crypto yes .endif +.if defined(QMAILSCAN_NOTUNZIP) +CONFIGURE_ARGS+= --unzip no +.else +CONFIGURE_ARGS+= --unzip yes +.if defined(QMAILSCAN_MAXZIPSIZE) +CONFIGURE_ARGS+= --max-zip-size "${QMAILSCAN_MAXZIPSIZE}" +.endif .if !defined(QMAILSCAN_NOTBLKZIPPW) BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -CONFIGURE_ARGS+= --block-password-protected +CONFIGURE_ARGS+= --block-password-protected yes +.endif .endif .if defined(QMAILSCAN_SCANNERS) CONFIGURE_ARGS+= --scanners "${QMAILSCAN_SCANNERS}" @@ -67,16 +76,18 @@ CONFIGURE_ARGS+= --spams-redirect "${QMAILSCAN_SPAMSREDIRECT}" CONFIGURE_ARGS+= --spams-tosuffix "${QMAILSCAN_SPAMSTOSUFFIX}" .endif +RUN_DEPENDS= ${BUILD_DEPENDS} + SPOOLDIR= ${PREFIX}/qmailscan PLIST_SUB= SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}" HAS_CONFIGURE= yes CONFIGURE_ARGS+= \ - --qmaildir ${QMAIL_DIR} --spooldir ${SPOOLDIR} \ - --bindir ${PREFIX}/bin --qmail-queue-binary ${QMAIL_QUEUE} \ + --qmaildir "${QMAIL_DIR}" --spooldir "${SPOOLDIR}" \ + --bindir "${PREFIX}/bin" --qmail-queue-binary "${QMAIL_QUEUE}" \ --admin "${QMAILSCAN_ADMIN}" --notify "${QMAILSCAN_NOTIFY}" \ --silent-viruses "${QMAILSCAN_SILENTVIRUSES}" \ - --redundant yes --unzip yes \ + --redundant yes \ --add-dscr-hdrs yes \ --log-details syslog --debug no \ --batch @@ -88,17 +99,26 @@ pre-configure: @${ECHO_MSG} "" @${ECHO_MSG} "QMAILSCAN_ADMIN email adress of qmail-scanner admin for alerts" @${ECHO_MSG} "QMAILSCAN_ADMINREALNAME* name to use when sending alerts" - @${ECHO_MSG} " (do not use spaces but underscores here)" + @${ECHO_MSG} "QMAILSCAN_LANG specify languages for QS mails (notify, etc..)" + @${ECHO_MSG} " supported languages are: af_ZA, cs_CZ, da_DK, de_DE," + @${ECHO_MSG} " en_GB, en_PL, enlt_LT, enlt_LT_short, es_ES, fr_FR," + @${ECHO_MSG} " it_IT, ja_JP.EUC, nl_NL, no_NO, pl_PL, pt_BR, pt_PT," + @${ECHO_MSG} " sk_SK, sv_SE, tr_TR, tr_TR_ascii and tw_BIG5" + @${ECHO_MSG} " default depends on your LANG variable" + @${ECHO_MSG} " (en_GB if LANG is not set)" @${ECHO_MSG} "QMAILSCAN_LOCALDOMAINS domains classified as local domains preventing alerts" @${ECHO_MSG} " of externals users (and mailing-lists...)" @${ECHO_MSG} "QMAILSCAN_LOGCRYPTO simply notes in the log record if the message" @${ECHO_MSG} " contained any form of digital signing or encryption" @${ECHO_MSG} " (S/MIME, PGP and password protected files)" @${ECHO_MSG} " default is disabled" + @${ECHO_MSG} "QMAILSCAN_MAXZIPSIZE zip that would have unpacked into more diskspace" + @${ECHO_MSG} " than this value will be blocked (prevent DoS)" + @${ECHO_MSG} " default is 1000000000" @${ECHO_MSG} "QMAILSCAN_NOTBLKZIPPW zip password protected are blocked by default" @${ECHO_MSG} " setting this variable to disable this function" @${ECHO_MSG} "QMAILSCAN_NOTIFY who has to be notify of viruses/spams" - @${ECHO_MSG} " defaults to 'psender,recips'" + @${ECHO_MSG} " defaults to 'psender,precips'" @${ECHO_MSG} "QMAILSCAN_SCANNERS list of installed content scanner" @${ECHO_MSG} " default is automatic, so you do not need to set this" @${ECHO_MSG} "QMAILSCAN_SILENTVIRUSES viruses that qs shoud not notify about" diff --git a/mail/qmail-scanner1/distinfo b/mail/qmail-scanner1/distinfo index b03ac40..c1fed31 100644 --- a/mail/qmail-scanner1/distinfo +++ b/mail/qmail-scanner1/distinfo @@ -1,2 +1,2 @@ -MD5 (qmail-scanner-1.22.tgz) = ae9124b43e1194d577951c8260a258bd -SIZE (qmail-scanner-1.22.tgz) = 148568 +MD5 (qmail-scanner-1.24.tgz) = 0281b721b059e09c8470982d26e4ccb0 +SIZE (qmail-scanner-1.24.tgz) = 197398 diff --git a/mail/qmail-scanner1/files/patch-configure b/mail/qmail-scanner1/files/patch-configure index f447881..e368f0b 100644 --- a/mail/qmail-scanner1/files/patch-configure +++ b/mail/qmail-scanner1/files/patch-configure @@ -1,6 +1,20 @@ ---- configure.orig Mon Apr 12 12:29:06 2004 -+++ configure Sun May 30 02:11:14 2004 -@@ -51,6 +51,12 @@ +--- configure.orig Tue Oct 19 02:26:55 2004 ++++ configure Fri Oct 22 01:36:34 2004 +@@ -1,13 +1,6 @@ + #!/bin/sh + # + +-#Pipe into bash if it's present +- +-if [ "`bash --version 2>&1|grep 'GNU bash'`" != "" -a "$BASH_VERSION" = "" ]; then +- exec bash $0 $* +- exit +-fi +- + umask 007 + + OLD_LANG="$LANG" +@@ -51,6 +44,12 @@ #reset all English to en_GB QSLANG="en_GB" fi @@ -13,7 +27,7 @@ if [ ! -d "./locale/$QSLANG" ]; then echo " -@@ -87,7 +93,8 @@ +@@ -87,7 +86,8 @@ QUARANTINE_PASSWORD_PROTECTED="0" DESCRIPTIVE_HEADERS="0" NOTIFY_ADDRESSES="psender,nmlvadm" @@ -23,20 +37,27 @@ MANUAL_INSTALL="0" INSTALLIT="0" DONOTCONFIRM="0" -@@ -104,8 +111,10 @@ +@@ -100,13 +100,17 @@ + + while [ -n "$1" ] + do ++ ++ + case $1 in + --qs-user) if [ "$2" != "" ] ; then shift ; fi ; QS_USER="$1" ;; --spooldir) if [ "$2" != "" ] ; then shift ; fi ; AS_QQ="$1" ;; --qmaildir) if [ "$2" != "" ]; then shift ; fi ; QMAILDIR="$1" ;; --bindir) if [ "$2" != "" ] ; then shift ; fi ; BINDIR="$1" ;; - --user|--admin) if [ "$2" != "" ] ; then shift ; fi ; USERNAME="$1" ;; - --domain) if [ "$2" != "" ] ; then shift ; fi ; MAILDOMAIN="$1" ;; + --admin|--user) if [ "$2" != "" ] ; then shift ; fi ; ADMIN_MAIL=`echo $1 | sed 's/@/\\\\@/'` ;; -+ --admin-realname) if [ "$2" != "" ] ; then shift ; fi ; ADMIN_REALNAME=`echo $1 | sed 's/_/ /g'` ;; ++ --admin-realname) if [ "$2" != "" ] ; then shift ; fi ; ADMIN_REALNAME="$1" ;; + --spams-redirect) if [ "$2" != "" ] ; then shift ; fi ; SPAMS_REDIRECT=`echo $1 | sed 's/@/\\\\@/'` ;; + --spams-tosuffix) if [ "$2" != "" ] ; then shift ; fi ; SPAMS_TOSUFFIX="$1" ;; --notify) if [ "$2" != "" ]; then shift ; fi ; NOTIFY_ADDRESSES="$1" ;; --batch) DONOTCONFIRM="1" ; if [ "$2" != "" -a "`echo $2|grep '\-'`" = "" ] ; then shift ; fi ;; --silent-viruses) if [ "$2" != "" ]; then shift ; fi ; FIND_SILENT_VIRUSES="$1" ;; -@@ -136,9 +145,17 @@ +@@ -138,9 +142,17 @@ --spooldir <spooldir> defaults to $AS_QQ/ --bindir <installdir> where to install qmail-scanner-queue.pl Defaults to /var/qmail/bin/ @@ -57,7 +78,7 @@ --scanners <list of installed content scanners> Defaults to "auto" - will use whatever scanners are found on system. -@@ -946,9 +963,14 @@ +@@ -1005,9 +1017,14 @@ MAILDOMAIN=${MAILDOMAIN:-$FQDN} LOCAL_DOMAINS_ARRAY=${LOCAL_DOMAINS_ARRAY:-$MAILDOMAIN} @@ -74,7 +95,7 @@ if [ "$MANUAL_INSTALL" = "1" ]; then CMDLINE="$CMDLINE --no-QQ-check $MANUAL_INSTALL" fi -@@ -1312,7 +1334,7 @@ +@@ -1381,7 +1398,7 @@ fi fi @@ -83,7 +104,7 @@ SCANNER_ARRAY=`echo $SCANNER_ARRAY|sed 's/^,//g'` -@@ -1389,7 +1411,13 @@ +@@ -1461,7 +1478,13 @@ fi echo "archiving $ASTRING into $AS_QQ/$ARCHIVEDIR/" fi @@ -98,7 +119,7 @@ echo "local-domains=$LOCAL_DOMAINS_ARRAY" echo "silent-viruses=$FIND_SILENT_VIRUSES_ARRAY" echo "scanners=$SCANNER_ARRAY" -@@ -1545,10 +1573,12 @@ +@@ -1623,10 +1646,12 @@ s?SPAMC_BINARY?$SPAMC_BINARY?g; s?SPAMC_OPTIONS?$SPAMC_OPTIONS?g; s?SPAMC_SUBJECT?$SPAMC_SUBJECT?g; diff --git a/mail/qmail-scanner1/files/patch-qmail-scanner-queue.template b/mail/qmail-scanner1/files/patch-qmail-scanner-queue.template index aa2d3c6..ad27289 100644 --- a/mail/qmail-scanner1/files/patch-qmail-scanner-queue.template +++ b/mail/qmail-scanner1/files/patch-qmail-scanner-queue.template @@ -24,7 +24,7 @@ @@ -302,6 +308,7 @@ } - my ($quarantine_event,$quarantine_event_tmp)=0; + my ($quarantine_event,$quarantine_event_tmp,$quarantine_DOS)=0; +my $spam_event=0; my $file_id = &uniq_id(); |