svn commit: r477601 - in head/mail: dovecot dovecot/files dovecot22 dovecot22/files

[Larry Rosenman]

Author: ler
Date: Sun Aug 19 21:00:17 2018
New Revision: 477601
URL: https://svnweb.freebsd.org/changeset/ports/477601

Log:
  mail/dovecot, mail/dovecot22: suppress harmless error message when the symlink in /var/run/dovecot
  to the config file doesn't exist.
  
  PR:		225078
  Reported by:	pkubaj at anongoth.pl
  Reviewed by:	adamw
  MFH:		2018Q3

Modified:
  head/mail/dovecot/Makefile
  head/mail/dovecot/files/dovecot.in
  head/mail/dovecot22/Makefile
  head/mail/dovecot22/files/dovecot.in

Modified: head/mail/dovecot/Makefile
==============================================================================
--- head/mail/dovecot/Makefile	Sun Aug 19 20:54:13 2018	(r477600)
+++ head/mail/dovecot/Makefile	Sun Aug 19 21:00:17 2018	(r477601)
@@ -8,6 +8,7 @@
 
 PORTNAME=	dovecot
 PORTVERSION=	2.3.2.1
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	https://www.dovecot.org/releases/2.3/
 

Modified: head/mail/dovecot/files/dovecot.in
==============================================================================
--- head/mail/dovecot/files/dovecot.in	Sun Aug 19 20:54:13 2018	(r477600)
+++ head/mail/dovecot/files/dovecot.in	Sun Aug 19 21:00:17 2018	(r477601)
@@ -60,7 +60,7 @@ for config in ${dovecot_config}; do
 	required_files="${config}"
 	command_args="-c ${config}"
 	if [ -s ${config} ]; then
-		base_dir=$(${command} ${command_args} -a | /usr/bin/awk -F '= ' '/^base_dir =/ { print $2 }')
+		base_dir=$(${command} ${command_args} -a 2>/dev/null | /usr/bin/awk -F '= ' '/^base_dir =/ { print $2 }')
 		pidfile="${base_dir}/master.pid"
 	else
 		echo "==Error=="

Modified: head/mail/dovecot22/Makefile
==============================================================================
--- head/mail/dovecot22/Makefile	Sun Aug 19 20:54:13 2018	(r477600)
+++ head/mail/dovecot22/Makefile	Sun Aug 19 21:00:17 2018	(r477601)
@@ -13,7 +13,7 @@
 
 PORTNAME=	dovecot
 PORTVERSION=	2.2.36
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	https://www.dovecot.org/releases/2.2/
 PKGNAMESUFFIX=	22

Modified: head/mail/dovecot22/files/dovecot.in
==============================================================================
--- head/mail/dovecot22/files/dovecot.in	Sun Aug 19 20:54:13 2018	(r477600)
+++ head/mail/dovecot22/files/dovecot.in	Sun Aug 19 21:00:17 2018	(r477601)
@@ -63,7 +63,7 @@ for config in ${dovecot_config}; do
 	required_files="${config}"
 	command_args="-c ${config}"
 	if [ -s ${config} ]; then
-		base_dir=$(${command} ${command_args} -a | /usr/bin/awk -F '= ' '/^base_dir =/ { print $2 }')
+		base_dir=$(${command} ${command_args} -a 2>/dev/null | /usr/bin/awk -F '= ' '/^base_dir =/ { print $2 }')
 		pidfile="${base_dir}/master.pid"
 	else
 		echo "==Error=="