From nobody Mon Jun 24 17:07:20 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W7Dsj158Mz5PGxn; Mon, 24 Jun 2024 17:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W7Dsj0SSMz4S0w; Mon, 24 Jun 2024 17:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719248841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j2AixBngbelRxC3nh1w+hPG3tTGLDGM8ohuEXpWRHZ8=; b=Htcnz8AAGfUDsgbep5wEr4MJhKq3ZIToSXT3sSj24V5t65sHWD6O10eHeHqDfpxGR7OJGS E7gJ9kRyKCOpgEW37dfCtufRP5AO6mTSyhjvHaSP9gEObAfVFCPcf370d5sbAP4dWb0lP8 b4jOR7KaYw+/F7CkUcc+5vebW2kFIIdMfBXn+EPu5qcQMZ4jvJjjfIyVg+hC4ZNBQauVUw 0vb8DedIfAL+EBqvaqkdwlDpGbOzS1VZed+6fvpk6Az1Bo/i7LYWJbvKUKiMEGWGCL25g/ GjEFwdJ/4L/sazpCeYi4a97gel8ipHVF43UeTizePSmRfuT9wwhP3CVk5+Ft/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719248841; a=rsa-sha256; cv=none; b=mw+gOuPlAJGvaNsu3sMLSSNHa8eE534LM5bjujj0clFr0qzrYSffz4MLcyvCiUsIVF/1K2 nh81OkX7an9RAvSsiEbvf7sN0ySXo2gstVUKTgIlP9aHVV3V5FzCpdRFw3SbMlfH3CjBQN ngDHS8eluYQwiv7cyTRdk3ZQySKJstFJ/cr/S1QvN14Ks7SXbgDRXpckRme+oAT2fwRRM0 GmRaqHcTJx3DV/RocPGlfdQb4ngrzltH7A0WVaCgvF7lH0Z4zJjHj0JF83hpCA5exZw5c2 nwGKVbIW3ifu+1joyLvEdMxPuTcfxk9Fd6qjKKB3Vb9zz3aSFTSpzU7i7iHgfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719248841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j2AixBngbelRxC3nh1w+hPG3tTGLDGM8ohuEXpWRHZ8=; b=Fl3ayaiGxNJMhKfGStuxSTQdrlF4+SR/DudYUvLa1ewn0MaPtr7W5ygNwn39W41Vasol9P 7RZJ3l2JNshPEXzc4klbuFR3l3Zjpi1hNP21EOerEyK/zvFrNPGJr87Cu2sLWeNiitp6C8 ebxQE/nAycGoax5gRLUlikmnQPOm2qKSqHj0X0QrW3a/k6VZ10GNxg3HBoevAt4B4j2Mxg iXxjl9ygd3jcbEHyvVYKcgvya2DPq71DfPfvmShutC6QeBOQY6NqUP1/I75x+fwU29zHUV X0u9yoFAk5l2ObMtxXgMSZG/5o871VfhqJlRepmIbEuib377mImJ1Vo8I8zenQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W7Dsj03VNzRBG; Mon, 24 Jun 2024 17:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45OH7KKA026268; Mon, 24 Jun 2024 17:07:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45OH7Kc1026265; Mon, 24 Jun 2024 17:07:20 GMT (envelope-from git) Date: Mon, 24 Jun 2024 17:07:20 GMT Message-Id: <202406241707.45OH7Kc1026265@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Larry Rosenman Subject: git: e39e03c9e703 - main - mail/dovecot: remove extra call to doveconf in rc.d script List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ler X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e39e03c9e703c8f613d87bafd0a0f182ba3ed4e9 Auto-Submitted: auto-generated The branch main has been updated by ler: URL: https://cgit.FreeBSD.org/ports/commit/?id=e39e03c9e703c8f613d87bafd0a0f182ba3ed4e9 commit e39e03c9e703c8f613d87bafd0a0f182ba3ed4e9 Author: Larry Rosenman AuthorDate: 2024-06-24 17:05:31 +0000 Commit: Larry Rosenman CommitDate: 2024-06-24 17:05:31 +0000 mail/dovecot: remove extra call to doveconf in rc.d script PR: 279867 Reported by: Siva Mahadevan --- 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 fd6c823fef69..c789da0a2294 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=="