diff options
| author | sergei <sergei@FreeBSD.org> | 2004-10-22 19:45:25 +0800 |
|---|---|---|
| committer | sergei <sergei@FreeBSD.org> | 2004-10-22 19:45:25 +0800 |
| commit | 1db2a7945bff6ee40628644a5d80bed524adf7fe (patch) | |
| tree | 4fd4b5071cbcb31688640e2cfcc2104f9d2578d6 /mail/qmail-scanner1/files | |
| parent | ea30ab06f7552ad22259ccfd6fedbdafbfe1b34e (diff) | |
| download | freebsd-ports-gnome-1db2a7945bff6ee40628644a5d80bed524adf7fe.tar.gz freebsd-ports-gnome-1db2a7945bff6ee40628644a5d80bed524adf7fe.tar.zst freebsd-ports-gnome-1db2a7945bff6ee40628644a5d80bed524adf7fe.zip | |
- 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/files')
| -rw-r--r-- | mail/qmail-scanner1/files/patch-configure | 43 | ||||
| -rw-r--r-- | mail/qmail-scanner1/files/patch-qmail-scanner-queue.template | 2 |
2 files changed, 33 insertions, 12 deletions
diff --git a/mail/qmail-scanner1/files/patch-configure b/mail/qmail-scanner1/files/patch-configure index f447881360eb..e368f0b5eb7c 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 aa2d3c6788a0..ad2728979032 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(); |