From root@xeon-web.ouestil.com  Sat Sep  4 14:12:14 2004
Return-Path: <root@xeon-web.ouestil.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 19B4716A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  4 Sep 2004 14:12:14 +0000 (GMT)
Received: from xeon-web.ouestil.com (home.ouestil.com [81.56.27.190])
	by mx1.FreeBSD.org (Postfix) with SMTP id CC89043D4C
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  4 Sep 2004 14:12:12 +0000 (GMT)
	(envelope-from root@xeon-web.ouestil.com)
Received: (qmail 32766 invoked by uid 0); 4 Sep 2004 14:12:05 -0000
Message-Id: <20040904141205.32765.qmail@xeon-web.ouestil.com>
Date: 4 Sep 2004 14:12:05 -0000
From: freebsd@simplerezo.com <freebsd@simplerezo.com>
Reply-To: freebsd@simplerezo.com <freebsd@simplerezo.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: drs@rucus.ru.ac.za, eikemeier@fillmore-labs.com,
	renato@galle.com.br, vs@freebsd.org
Subject: [maintainer-update] mail/qmail-scanner : some fixes and update to 1.23
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         71376
>Category:       ports
>Synopsis:       [maintainer-update] mail/qmail-scanner : some fixes and update to 1.23
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    sergei
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 04 14:20:21 GMT 2004
>Closed-Date:    Fri Oct 22 11:46:05 GMT 2004
>Last-Modified:  Fri Oct 22 11:46:05 GMT 2004
>Originator:     freebsd@simplerezo.com
>Release:        FreeBSD 4.9-RELEASE-p11 i386
>Organization:
SimpleRezo [http://www.simplerezo.com]
>Environment:
System: FreeBSD ---.simplerezo.com 4.9-RELEASE-p11 FreeBSD 4.9-RELEASE-p11 #0: Tue Aug 31 00:33:38 CEST 2004 root@:/usr/obj/usr/src/sys/KERNEL i386


	
>Description:
	Finally, added an option to select language (see PR#68770)...
	Fix RUN_DEPENDS location (for the unzip dependency)
	Fix "--block-password-protected" bug (thx for David Sieborger for submitting this)
	Add an option "QMAILSCAN_NOTUNZIP" (requested by David Sieborger)
	Update qmail-scanner to 1.23
	Change default for QMAILSCAN_NOTIFY to 'psender, precips'
	
>How-To-Repeat:
	N/A
	
>Fix:

	

--- qmail-scanner-1.23.diff begins here ---
diff -ruN qmail-scanner/Makefile qmail-scanner.updated/Makefile
--- qmail-scanner/Makefile	Mon Jul 12 22:32:52 2004
+++ qmail-scanner.updated/Makefile	Sat Sep  4 15:55:52 2004
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qmail-scanner
-PORTVERSION=	1.22
-PORTREVISION=	1
+PORTVERSION=	1.23
 CATEGORIES=	mail security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,7 +19,6 @@
 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,23 @@
 .if defined(QMAILSCAN_ARCHIVE)
 CONFIGURE_ARGS+=	--archive yes
 .endif
-QMAILSCAN_NOTIFY?=	psender,recips
+QMAILSCAN_NOTIFY?=	psender,precips
+.if defined(QMAILSCAN_LANG)
+CONFIGURE_ARGS+=	--lang "${QMAILSCAN_LANG}"
+.endif
 .if defined(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
 .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,6 +72,8 @@
 CONFIGURE_ARGS+=	--spams-tosuffix "${QMAILSCAN_SPAMSTOSUFFIX}"
 .endif
 
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 SPOOLDIR=	${PREFIX}/qmailscan
 PLIST_SUB=	SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}"
 
@@ -89,6 +96,13 @@
 	@${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"
@@ -98,7 +112,7 @@
 	@${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 -ruN qmail-scanner/distinfo qmail-scanner.updated/distinfo
--- qmail-scanner/distinfo	Sun May 30 02:37:25 2004
+++ qmail-scanner.updated/distinfo	Fri Aug 13 00:45:51 2004
@@ -1,2 +1,2 @@
-MD5 (qmail-scanner-1.22.tgz) = ae9124b43e1194d577951c8260a258bd
-SIZE (qmail-scanner-1.22.tgz) = 148568
+MD5 (qmail-scanner-1.23.tgz) = d16e912b89126b2d957f86bf78d52be5
+SIZE (qmail-scanner-1.23.tgz) = 153107
--- qmail-scanner-1.23.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sergei 
Responsible-Changed-By: sergei 
Responsible-Changed-When: Thu Oct 21 15:57:06 GMT 2004 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71376 
State-Changed-From-To: open->closed 
State-Changed-By: sergei 
State-Changed-When: Fri Oct 22 11:45:53 GMT 2004 
State-Changed-Why:  
Committed update to 1.24 - thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71376 
>Unformatted:
