ports/83988: [PATCH] security/amavisd-new: properly set default values

[Petr Rehor]

>Number:         83988
>Category:       ports
>Synopsis:       [PATCH] security/amavisd-new: properly set default values
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 24 08:10:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Petr Rehor
>Release:        FreeBSD 5.3-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD charon.rx.cz 5.3-RELEASE-p2 FreeBSD 5.3-RELEASE-p2 #0: Sun Dec 5 01:31:43 UTC 2004 root at marvin.rx.cz:/usr/obj/usr/src/sys/GENERIC i386
>Description:
When amavisd_flags is in rc.conf is set to empty value, then rc script
set it to default value (wanted on czech FreeBSD mailing list).
>How-To-Repeat:
Add amavisd_flags="" to /etc/rc.conf and restart amavisd - it run with
default amavisd_flags="-u vscan"
>Fix:
--- amavisd-new.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/amavisd-new/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile	17 Jul 2005 21:42:11 -0000	1.29
+++ Makefile	24 Jul 2005 07:45:22 -0000
@@ -8,7 +8,7 @@
 
 PORTNAME=	amavisd-new
 PORTVERSION=	2.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
Index: files/amavisd.sh.in
===================================================================
RCS file: /home/ncvs/ports/security/amavisd-new/files/amavisd.sh.in,v
retrieving revision 1.1
diff -u -r1.1 amavisd.sh.in
--- files/amavisd.sh.in	6 Jul 2005 08:47:09 -0000	1.1
+++ files/amavisd.sh.in	24 Jul 2005 07:40:58 -0000
@@ -33,7 +33,7 @@
 # set defaults
 
 amavisd_enable=${amavisd_enable:-"NO"}
-amavisd_flags=${amavisd_flags:-"-u %%AMAVISUSER%%"}
+amavisd_flags=${amavisd_flags-"-u %%AMAVISUSER%%"}
 
 load_rc_config $name
 run_rc_command "$1"
--- amavisd-new.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: