Attachment 251584 Details for Bug 279867 – [PATCH] mail/dovecot: remove extra call to doveconf in rc.d script

[patch] [PATCH] mail/dovecot: remove extra call to doveconf in rc.d script

0001-mail-dovecot-remove-extra-call-to-doveconf-in-rc.d-s.patch (text/plain), 1.89 KB, created by Siva Mahadevan on 2024-06-19 20:07:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Siva Mahadevan

Created: 2024-06-19 20:07:29 UTC

Size: 1.89 KB

patch

obsolete

>From 710425e8a5b93735b16856d121cb24919fea81ff Mon Sep 17 00:00:00 2001
>From: Siva Mahadevan <me@svmhdvn.name>
>Date: Wed, 22 May 2024 17:24:15 -0400
>Subject: [PATCH] mail/dovecot: remove extra call to doveconf in rc.d script
>
>---
> mail/dovecot/Makefile         |  2 +-
> mail/dovecot/files/dovecot.in | 18 +++++++++---------
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
>index 64b4b5de35d2..decf6fb19ff0 100644
>--- a/mail/dovecot/Makefile
>+++ b/mail/dovecot/Makefile
>@@ -10,7 +10,7 @@
> 
> PORTNAME=	dovecot
> PORTVERSION=	2.3.21
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	mail
> MASTER_SITES=	https://dovecot.org/releases/2.3/
> 
>diff --git a/mail/dovecot/files/dovecot.in b/mail/dovecot/files/dovecot.in
>index 8c717b0610c8..625ce85adcc5 100644
>--- a/mail/dovecot/files/dovecot.in
>+++ b/mail/dovecot/files/dovecot.in
>@@ -58,15 +58,15 @@ for config in ${dovecot_config}; do
> 	required_files="${config}"
> 	command_args="-c ${config}"
> 	if [ -s ${config} ]; then
>-               ${command} ${command_args} -a 2>&1 >/dev/null
>-                if [ $? -ne 0 ]; then
>-                       echo "==Error=="
>-                       echo "Configuration file check failed."
>-                       # Use dovecot to print the config error.
>-                       ${command} ${command_args} -a
>-                       exit $?
>-                fi
>-		base_dir=$(${command} ${command_args} -a 2>/dev/null | /usr/bin/awk -F '= ' '/^base_dir =/ { print $2 }')
>+		doveconf_settings="$(${command} ${command_args} -a 2>/dev/null)"
>+		if [ $? -ne 0 ]; then
>+			echo "==Error=="
>+			echo "Configuration file check failed."
>+			# Use dovecot to print the config error.
>+			${command} ${command_args} -a
>+			exit $?
>+		fi
>+		base_dir="$(echo "$doveconf_settings" | /usr/bin/awk -F '= ' '/^base_dir =/ { print $2 }')"
> 		pidfile="${base_dir}/master.pid"
> 	else
> 		echo "==Error=="
>-- 
>2.45.2
>

Actions: View | Diff

Attachments on bug 279867: 251584