- Update to 4.79.10

PR:             ports/143277
Submitted by:   Mike Jakubik <mike.jakubik@intertainservices.com>

4 files changed, 23 insertions, 14 deletions

diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index cffe1280967b..03f1295e8bbd 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.79.5
-PORTREVISION=	1
+PORTVERSION=	4.79.10
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index cc5c585fd1d4..8fc30ee444d8 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1,3 +1,3 @@
-MD5 (MailScanner-install-4.79.5-1.tar.gz) = dfd238bd6c59176f097842b403b28f2a
-SHA256 (MailScanner-install-4.79.5-1.tar.gz) = 9acac2a01c8116f41c3ed5d817acdd4dcb6abfa1b0b9f7c8ef55d029f3d3eae1
-SIZE (MailScanner-install-4.79.5-1.tar.gz) = 9139558
+MD5 (MailScanner-install-4.79.10-1.tar.gz) = 85aada093503e1b8f4b3350f46aa4ad7
+SHA256 (MailScanner-install-4.79.10-1.tar.gz) = bb7715d3d2d73b5f33849f6c9addf3480d7c6f345d70065cf80dfd663fbe8645
+SIZE (MailScanner-install-4.79.10-1.tar.gz) = 9116976
diff --git a/mail/mailscanner/files/mailscanner.in b/mail/mailscanner/files/mailscanner.in
index aed829898704..10bfe7d0c5e0 100644
--- a/mail/mailscanner/files/mailscanner.in
+++ b/mail/mailscanner/files/mailscanner.in
@@ -10,7 +10,7 @@
 #                                 Set it to "YES" to enable mailscanner
 # mailscanner_configfile (path):  Set to "%%PREFIX%%/etc/MailScanner/MailScanner.conf" by default.
 # mailscanner_pidfile (path):     Set to "/var/run/MailScanner.pid" by default.
-# mailscanner_user (str):         Set to "root" by default. If you changed the "Run As User" variable in MailScanner.conf you MUST also set the same value here.
+# mailscanner_user (str):         Set to "root" by default. If you changed the "Run As User" variable in MailScanner.conf and wish to disable taint mode, you MUST also set the same value here.
 #
 
 . %%RC_SUBR%%
@@ -23,7 +23,6 @@ load_rc_config $name
 : ${mailscanner_enable="NO"}
 : ${mailscanner_configfile="%%PREFIX%%/etc/MailScanner/MailScanner.conf"}
 : ${mailscanner_pidfile="/var/run/MailScanner.pid"}
-: ${mailscanner_user="root"}
 
 command="%%PREFIX%%/sbin/mailscanner"
 pidfile=${mailscanner_pidfile}
@@ -32,9 +31,6 @@ procname="MailScanner"
 
 required_files="${mailscanner_configfile}"
 
-start_precmd=pid_touch
-start_cmd="mailscanner_start"
-
 pid_touch ()
 {
 	touch $mailscanner_pidfile
@@ -45,5 +41,10 @@ mailscanner_start() {
 	su -m ${mailscanner_user} -c "exec ${command} ${command_args}"
 }
 
+if [ -n "${mailscanner_user}" ]; then
+	start_cmd="mailscanner_start"
+	start_precmd="pid_touch"
+fi
+
 run_rc_command "$1"
 
diff --git a/mail/mailscanner/files/pkg-message.in b/mail/mailscanner/files/pkg-message.in
index 0b1a376d9c26..54730653fc61 100644
--- a/mail/mailscanner/files/pkg-message.in
+++ b/mail/mailscanner/files/pkg-message.in
@@ -39,15 +39,24 @@
 	script %%PREFIX%%/share/doc/MailScanner/Sophos.install.freebsd
 
 	*****************************************************************
-	A new rc variable called mailscanner_user has been added to the
-	startup script. This is a temporary workaround to address the
-	numerous taint mode problems that are still present in the code.
+	A new optional rc variable called mailscanner_user has been added
+	to the startup script. This is a temporary workaround to address
+	any possible taint mode problems that may still be present in the
+	code.
+	
+	Taint mode related problems can usually be identified from
+	undeliverable reports containing the following error:
+	
+	"MailScanner: Message attempted to kill MailScanner"
 
 	If you changed the "Run As User" variable in MailScanner.conf
-	you MUST also set the same value in /etc/rc.conf.
+	and wish to disable taint mode, you MUST also set the same value
+	in /etc/rc.conf.
 
 	i.e. mailscanner_user="postfix"
 
+	To re-enable taint mode, simply remove the variable from rc.conf.
+	
 	The new variable uses su to start the master perl script as the
 	specified user, this effectively disables perl's taint mode.
 	*****************************************************************