From nobody Tue May 10 20:17:26 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 B96301AD5322; Tue, 10 May 2022 20:17:26 +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 4KyTqB4rxPz3mB8; Tue, 10 May 2022 20:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652213846; 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=Ms0lsHH6amQsnr+vejxcah8/NUrRF15U8+RfcQ0GusI=; b=AiRDygrgw7DH+dS97p2ClBmi8+gNbHktlDha52Z8rPFjmS4xgvfgUrm4A3FFA8jsSNVIqU mvYdY0OlhtMhNJDV05dmfOeMmXfGxmVJJNbvgckitFqhJSWK9LEBlQkvkYjo+L3czCyZwE mgRWhX/LFwqtAO6mSz87MvcJVBFGTAklzA1qQZvQYS3zkpRv3wgluv/c/AoJEEmiAo9Fiy 8wxWgrpxFDzvgYlA/3JdTSP/kPOy1uw76eSSGneBOp1ZD8ftYQq6RsfhYh78kvUAGJrnnY XRoedZA8bidozEcypdFURwArcbHEw98z/FET6ldu8EekLycUiM/O3oGVeSKnhA== 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 83003428A; Tue, 10 May 2022 20:17:26 +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 24AKHQ2Z015849; Tue, 10 May 2022 20:17:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24AKHQZs015848; Tue, 10 May 2022 20:17:26 GMT (envelope-from git) Date: Tue, 10 May 2022 20:17:26 GMT Message-Id: <202205102017.24AKHQZs015848@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: e0c54af8111e - main - mail/opendkim: Properly create pidfile dir 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: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0c54af8111e5e82e461dc2a15df341a6970801e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652213846; 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=Ms0lsHH6amQsnr+vejxcah8/NUrRF15U8+RfcQ0GusI=; b=AYY/9V/etZPZOeCOj7BRtQcPZDBgZcGNlDP7Gj6WavcQcgYkneDQbC6uET1PR8f5e0yjr+ d9kM9lbnCzihjogCJp97S4lI/5afvPwiSX6sIECOMJhG8MFl4o8DXSGA2GM3nztRxFOrxE y7pTJ3WwF5onr2c3SVgO/4j+MVNhEtsWxoa42N67oBbUEaES1c50Of9ZKZT3RGnLDEtiJz vHdpgRD5M1g+rGAUlYhKavGwlZY1pSdjV7zWzymecSSnLaMXwi3IVyawB1F6SH77XFpB2e 5cGoNtEBkrxkWkuKKy195qbu5kWghuTwZknbh4aWLXaKFKWkeRn4RGimrWG+1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652213846; a=rsa-sha256; cv=none; b=xCLqs3MJG9BwRblHlNbMnjpN6ui/D5ejELaonwkaeUUpWw4e9s3z+6iYcVmh29qFYvzoFZ VRv44os0R6OhProAG+aIpR6xi4RAaMSsAiiFwgcKQZopA8LQLfnWOiaGuGVHByUbMrPurb FGCBPS6jNnnH0zz0AkorA/giswXXhTlchc3+j21wDvl+ro4emF0Yf96XPXEHM41Vs+3PNR LvPdrsOEv5mErgk2u1ii1ClgmvlZyWPsz+rPj1pM1RUr78Ks2NgHtf3Hfh9FcciUL+ucO8 zDa/sAouPKzIwB2gP/W2SSqVB0vCZIiuKcBuHwlg8AxKQor4fq4kIOdsLCNu/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0c54af8111e5e82e461dc2a15df341a6970801e commit e0c54af8111e5e82e461dc2a15df341a6970801e Author: Evilham AuthorDate: 2022-03-10 18:41:48 +0000 Commit: Bryan Drewery CommitDate: 2022-05-10 20:17:23 +0000 mail/opendkim: Properly create pidfile dir Submitted by: Evilham Approved by: maintainer timeout PR: 262473 --- mail/opendkim/Makefile | 2 +- mail/opendkim/files/milter-opendkim.in | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile index 7e8e2f02bda1..b47fd551da7a 100644 --- a/mail/opendkim/Makefile +++ b/mail/opendkim/Makefile @@ -2,7 +2,7 @@ PORTNAME= opendkim PORTVERSION= 2.10.3 -PORTREVISION= 15 +PORTREVISION= 16 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 7672c9352e68..2ce969582af0 100644 --- a/mail/opendkim/files/milter-opendkim.in +++ b/mail/opendkim/files/milter-opendkim.in @@ -89,6 +89,9 @@ dkim_prepcmd() { dkim_cleansockets dkim_get_pidfile + if [ ! -d "$(dirname "$pidfile")" ]; then + mkdir "$(dirname "$pidfile")" + fi case ${milteropendkim_socket%:*} in local|unix) socketfile=${milteropendkim_socket#*:} @@ -202,6 +205,7 @@ else if [ -n "${milteropendkim_alg}" ];then milteropendkim_alg="-S ${milteropendkim_alg}" fi + dkim_get_pidfile command_args="-l ${_socket_prefix} ${milteropendkim_socket} ${_uid_prefix} ${milteropendkim_uid} -P ${pidfile} ${milteropendkim_cfgfile} ${milteropendkim_domain} ${milteropendkim_key} ${milteropendkim_selector} ${milteropendkim_alg}" fi fi