From nobody Sat Jan 8 13:12:21 2022 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 5EA5A1942368; Sat, 8 Jan 2022 13:12:22 +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 4JWL920c16z3nJh; Sat, 8 Jan 2022 13:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E88B11F1CB; Sat, 8 Jan 2022 13:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 208DCLYe027221; Sat, 8 Jan 2022 13:12:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 208DCLNV027220; Sat, 8 Jan 2022 13:12:21 GMT (envelope-from git) Date: Sat, 8 Jan 2022 13:12:21 GMT Message-Id: <202201081312.208DCLNV027220@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Chris Rees Subject: git: d5d57b5a024f - main - mail/opendkim: Fix errors when no value is set for socket in RC 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: crees X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5d57b5a024f884392cf7358279dfd2f623abbe2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641647542; 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=pf5+r8zFDUZMiFONgz/6oI3XntASDcb3SUUawj273o4=; b=SvM0suqEZAbTRmwtjZORCFC2rDQCQHDNrNw4Yb44ew1DdyH94cRj6H9mzbLjb9/kVSIUI4 IVIR0pwWNsgbBe63E6usoIpJNPR8IHvTjLE3D14Nf8SJuNQazzWGB1XAPQ2/wC71ovLWV+ oSkpe5V+zaS0nz6X60z+YjZwwpK8or3qSaN9FU2yqwjAJDlyD0PyR+iTD+0iSWiTegAIlZ Jnui5SL1uvHVE+yU1MocxE8WppPzBMFdnrTnk5kZ6LBvPV42ndIHo6hPQjYsxpJwkARWZM I/us5ZEehIwyKqFMgJojBMAj2NZa7N6f/Pxl0bwG+shGqpNOM8LJeyeXpmRXMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641647542; a=rsa-sha256; cv=none; b=aGeA2oBozYOFTWq7KyQSM7uK8AswHoLGVIAMdUOOKx9PeUg4Jz6aRjuBPFJ0qC0EzD6/4R 5CNyqgdD+YBt2MI9ayT1r5JmNQMZK4m6H4oyx2y/g/OISLCeGS/yo1ticAM+PuW0a7j6nN Oz766+XJVnulRmJT0hNhbCznRIxaBU9tV/ug9yqou1FbnOWum6OnlIiO0Jwp2ZGKUKaWf2 vLzFxT4aS0H3YQjEoG1D9o6OWZnlOcVvMS6h6K64YrvvnfpL9msKIW8qL9Y90L3PJutrGf eHDFJXYZwzyKwLJfNXFx9jMVBo+GGr7FnRz7NS1xQOnoQuPgK0Au1U/wPbB80g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by crees: URL: https://cgit.FreeBSD.org/ports/commit/?id=d5d57b5a024f884392cf7358279dfd2f623abbe2 commit d5d57b5a024f884392cf7358279dfd2f623abbe2 Author: Chris Rees AuthorDate: 2022-01-08 13:07:55 +0000 Commit: Chris Rees CommitDate: 2022-01-08 13:07:55 +0000 mail/opendkim: Fix errors when no value is set for socket in RC script Fix errors PR: ports/222122 Submitted by: Matthias Pfaller (Fix) While here, various style fixes; no need for the "x$var" != "x" idiom as that is confusing to follow. Approved by: maintainer timeout (3 years) --- mail/opendkim/Makefile | 2 +- mail/opendkim/files/milter-opendkim.in | 60 +++++++++++++++++----------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile index 7d91eeafbec5..18cf989dcb06 100644 --- a/mail/opendkim/Makefile +++ b/mail/opendkim/Makefile @@ -2,7 +2,7 @@ PORTNAME= opendkim PORTVERSION= 2.10.3 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= mail security MASTER_SITES= SF/${PORTNAME} \ SF/${PORTNAME}/Previous%20Releases \ diff --git a/mail/opendkim/files/milter-opendkim.in b/mail/opendkim/files/milter-opendkim.in index 5a7add4ec242..930b91ee32d5 100644 --- a/mail/opendkim/files/milter-opendkim.in +++ b/mail/opendkim/files/milter-opendkim.in @@ -62,7 +62,7 @@ load_rc_config $name if [ -n "$2" ]; then profile="$2" - if [ "x${milteropendkim_profiles}" != "x" ]; then + if [ -n "${milteropendkim_profiles}" ]; then pidfile="${_piddir}/${profile}.pid" eval milteropendkim_enable="\${milteropendkim_${profile}_enable:-${milteropendkim_enable}}" eval milteropendkim_socket="\${milteropendkim_${profile}_socket:-}" @@ -82,25 +82,25 @@ if [ -n "$2" ]; then else milteropendkim_cfgfile="" fi - if [ "x${milteropendkim_socket}" != "x" ];then + if [ -n "${milteropendkim_socket}" ];then _socket_prefix="-p" fi - if [ "x${milteropendkim_uid}" != "x" ];then + if [ -n "${milteropendkim_uid}" ];then _uid_prefix="-u" - if [ "x${milteropendkim_gid}" != "x" ];then + if [ -n "${milteropendkim_gid}" ];then milteropendkim_uid=${milteropendkim_uid}:${milteropendkim_gid} fi fi - if [ "x${milteropendkim_domain}" != "x" ];then + if [ -n "${milteropendkim_domain}" ];then milteropendkim_domain="-d ${milteropendkim_domain}" fi - if [ "x${milteropendkim_key}" != "x" ];then + if [ -n "${milteropendkim_key}" ];then milteropendkim_key="-k ${milteropendkim_key}" fi - if [ "x${milteropendkim_selector}" != "x" ];then + if [ -n "${milteropendkim_selector}" ];then milteropendkim_selector="-s ${milteropendkim_selector}" fi - if [ "x${milteropendkim_alg}" != "x" ];then + if [ -n "${milteropendkim_alg}" ];then milteropendkim_alg="-S ${milteropendkim_alg}" fi command_args="-l ${_socket_prefix} ${milteropendkim_socket} ${_uid_prefix} ${milteropendkim_uid} -P ${pidfile} ${milteropendkim_cfgfile} ${milteropendkim_domain} ${milteropendkim_key} ${milteropendkim_selector} ${milteropendkim_alg}" @@ -108,13 +108,13 @@ if [ -n "$2" ]; then echo "$0: extra argument ignored" fi else - if [ "x${milteropendkim_profiles}" != "x" -a "x$1" != "x" ]; then - if [ "x$1" != "xrestart" ]; then + if [ -n "${milteropendkim_profiles}" ] && [ -n "$1" ]; then + if [ "$1" != "restart" ]; then for profile in ${milteropendkim_profiles}; do echo "===> milteropendkim profile: ${profile}" %%PREFIX%%/etc/rc.d/milter-opendkim $1 ${profile} retcode="$?" - if [ "0${retcode}" -ne 0 ]; then + if [ "${retcode}" -ne 0 ]; then failed="${profile} (${retcode}) ${failed:-}" else success="${profile} ${success:-}" @@ -130,25 +130,25 @@ else else milteropendkim_cfgfile="" fi - if [ "x${milteropendkim_socket}" != "x" ];then + if [ -n "${milteropendkim_socket}" ];then _socket_prefix="-p" fi - if [ "x${milteropendkim_uid}" != "x" ];then + if [ -n "${milteropendkim_uid}" ];then _uid_prefix="-u" - if [ "x${milteropendkim_gid}" != "x" ];then + if [ -n "${milteropendkim_gid}" ];then milteropendkim_uid=${milteropendkim_uid}:${milteropendkim_gid} fi fi - if [ "x${milteropendkim_domain}" != "x" ];then + if [ -n "${milteropendkim_domain}" ];then milteropendkim_domain="-d ${milteropendkim_domain}" fi - if [ "x${milteropendkim_key}" != "x" ];then + if [ -n "${milteropendkim_key}" ];then milteropendkim_key="-k ${milteropendkim_key}" fi - if [ "x${milteropendkim_selector}" != "x" ];then + if [ -n "${milteropendkim_selector}" ];then milteropendkim_selector="-s ${milteropendkim_selector}" fi - if [ "x${milteropendkim_alg}" != "x" ];then + if [ -n "${milteropendkim_alg}" ];then milteropendkim_alg="-S ${milteropendkim_alg}" fi command_args="-l ${_socket_prefix} ${milteropendkim_socket} ${_uid_prefix} ${milteropendkim_uid} -P ${pidfile} ${milteropendkim_cfgfile} ${milteropendkim_domain} ${milteropendkim_key} ${milteropendkim_selector} ${milteropendkim_alg}" @@ -157,10 +157,10 @@ fi dkim_prepcmd () { - if [ -S ${milteropendkim_socket##local:} ] ; then - rm -f ${milteropendkim_socket##local:} - elif [ -S ${milteropendkim_socket##unix:} ] ; then - rm -f ${milteropendkim_socket##unix:} + if [ -S "${milteropendkim_socket##local:}" ] ; then + rm -f "${milteropendkim_socket##local:}" + elif [ -S "${milteropendkim_socket##unix:}" ] ; then + rm -f "${milteropendkim_socket##unix:}" fi if [ ! -d ${_piddir} ] ; then mkdir -p ${_piddir} @@ -176,12 +176,12 @@ dkim_prepcmd () dkim_start_postcmd () { - if [ "x${milteropendkim_socket}" != "x" ] ; then + if [ -n "${milteropendkim_socket}" ] ; then # postcmd is executed too fast and socket is not created before checking... sleep 1 - if [ -S ${milteropendkim_socket##local:} ] ; then + if [ -S "${milteropendkim_socket##local:}" ] ; then chmod ${milteropendkim_socket_perms} ${milteropendkim_socket##local:} - elif [ -S ${milteropendkim_socket##unix:} ] ; then + elif [ -S "${milteropendkim_socket##unix:}" ] ; then chmod ${milteropendkim_socket_perms} ${milteropendkim_socket##unix:} fi fi @@ -189,11 +189,11 @@ dkim_start_postcmd () dkim_postcmd() { - if [ "x${milteropendkim_socket}" != "x" ] ; then - if [ -S ${milteropendkim_socket##local:} ] ; then - rm -f ${milteropendkim_socket##local:} - elif [ -S ${milteropendkim_socket##unix:} ] ; then - rm -f ${milteropendkim_socket##unix:} + if [ -n "${milteropendkim_socket}" ] ; then + if [ -S "${milteropendkim_socket##local:}" ] ; then + rm -f "${milteropendkim_socket##local:}" + elif [ -S "${milteropendkim_socket##unix:}" ] ; then + rm -f "${milteropendkim_socket##unix:}" fi fi # just if the directory is empty