From nobody Sun Jan 16 19:27:40 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 EA9A8195E69F; Sun, 16 Jan 2022 19:27:40 +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 4JcQ6N6DZzz4gYW; Sun, 16 Jan 2022 19:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642361260; 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=bSppiFGwmU7YHBehk2+rd7+WgUgTItIQVBvh9CPj1lA=; b=sYiwYBr/AmvufPRr4A2JYMhlWQK5vp4oeE8yUSgGSIBH/uA2Hl+zxVmrh4hgGCwpXmzGEc 21oGtwr0azb4KBJtRmwfPjs38miRffQrCPrXj2Pqr1auPq1XmPaIqIzZGKmyJxS3vfnppQ UcOXrPvRMMhMDPto8yDgXC6/1lHA8UTrexo4zL3edUOuyrjYW3onlScph0lihpSYlGZBts sEc2xw2vQKN8nA5eVIQawIXQBQFYleGvpzhhCDCu/1y6xgkjWnVv6RSvJEGsPk8nNm0S4W fFk6xZe9tfs/9+rN1UlvoJk3zMkfNal9j32IR0nSQAXE5J/aUxYyNI51rwY+5w== 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 B5EC91FEF7; Sun, 16 Jan 2022 19:27:40 +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 20GJReLW034753; Sun, 16 Jan 2022 19:27:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20GJReSo034752; Sun, 16 Jan 2022 19:27:40 GMT (envelope-from git) Date: Sun, 16 Jan 2022 19:27:40 GMT Message-Id: <202201161927.20GJReSo034752@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: 27f7397a8f59 - main - mail/opendkim: Silence RC script warning 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: 27f7397a8f598df0953ed8f9db562308ac6f1bee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642361260; 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=bSppiFGwmU7YHBehk2+rd7+WgUgTItIQVBvh9CPj1lA=; b=ChaAdz4BZE5VD0/oaWJ8eNM6gqNUtA2fYhbqAFRnZGK89QjBfsolWGCU4odqo6X3SbjNAG xpqROSpFly/UsrssJqbZot79oxQ0HCbz1ybPz3Gzh9EyWhHwf4jtbTBUJrFLSaMBTL0yG4 pgfRr1ZUtUqepnS0UZCaDhwxhv7wW4E7m/3lOwhuhVf3F7l8/H4Mq6qefag+59M/Kwz+Kc eB637WoW6vQHqgV+fcXX6ZaT19F0PXmXYcAUEynqu9E75FeLGTFoH4XVQx8/G6UzQZFDa2 671kSshyiFzkUXtPOhnrZRSfyArFtJLWIB2+FSljrYWj76nNPp8pIywHBAtxVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642361260; a=rsa-sha256; cv=none; b=W8iACpJ7Sd90VYvFpADKfRjmx+rzuiTl5m3w9bTMpx2Wn/5Jze+IcnA/Vz5XkbBym9Lp6Q w1gWdb2yItHp1xOzONATqOLQh0+qNfevkQ9CRbzpeRnhmbteo10yaotFK9NFTajHLB77SO hnZYL6G+2unNzNgD4n+zZ2/6Vzs0HYanTqnzWVyPPjny/Q4gMThiwvAz3JhFRihDNDzpRc LgrdSqWa35GL98dXVUNCNU69KsrdeTQjKmFwaHIrXTvwRVGgCLShBIa3rtTq/Fosnwosod rWYP3u31CKrc5Gx+qJtl0N0L9JNF+PiatDAa6uUtq0FjnSEMZaPNq5LU+AcN8w== 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=27f7397a8f598df0953ed8f9db562308ac6f1bee commit 27f7397a8f598df0953ed8f9db562308ac6f1bee Author: Chris Rees AuthorDate: 2022-01-16 19:18:53 +0000 Commit: Chris Rees CommitDate: 2022-01-16 19:26:46 +0000 mail/opendkim: Silence RC script warning Reported by: Herbert J. Skuhra --- mail/opendkim/Makefile | 2 +- mail/opendkim/files/milter-opendkim.in | 26 ++++++++++++++++++-------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile index 620252c2fff5..7e8e2f02bda1 100644 --- a/mail/opendkim/Makefile +++ b/mail/opendkim/Makefile @@ -2,7 +2,7 @@ PORTNAME= opendkim PORTVERSION= 2.10.3 -PORTREVISION= 14 +PORTREVISION= 15 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 8d83197d8884..7672c9352e68 100644 --- a/mail/opendkim/files/milter-opendkim.in +++ b/mail/opendkim/files/milter-opendkim.in @@ -69,7 +69,11 @@ sig_reload="USR1" dkim_cleansockets() { - rm -f "${milteropendkim_socket##local:}" "${milteropendkim_socket##unix:}" + case ${milteropendkim_socket%:*} in + local|unix) + rm -f "${milteropendkim_socket#*:}" + ;; + esac } dkim_get_pidfile() @@ -85,19 +89,25 @@ dkim_prepcmd() { dkim_cleansockets dkim_get_pidfile - install -d -o ${milteropendkim_uid%:*} -g $milteropendkim_gid \ - -m ${milteropendkim_socket_perms} ${pidfile%/*} + case ${milteropendkim_socket%:*} in + local|unix) + socketfile=${milteropendkim_socket#*:} + install -d -o ${milteropendkim_uid%:*} -g $milteropendkim_gid \ + -m ${milteropendkim_socket_perms} \ + ${pidfile%/*} ${socketfile%/*} + ;; + esac } dkim_start_postcmd() { - if [ -n "${milteropendkim_socket}" ] ; then + case ${milteropendkim_socket%:*} in + local|unix) # postcmd is executed too fast and socket is not created before checking... sleep 1 - chmod -f ${milteropendkim_socket_perms} \ - ${milteropendkim_socket##local:} \ - ${milteropendkim_socket##unix:} - fi + chmod -f ${milteropendkim_socket_perms} ${milteropendkim_socket#*:} + ;; + esac } if [ -n "$2" ]; then