From nobody Fri Jan 14 18:01:44 2022 X-Original-To: dev-commits-ports-all@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 27D0319647B1; Fri, 14 Jan 2022 18:01:45 +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 4Jb8J835jfz4lPv; Fri, 14 Jan 2022 18:01:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642183304; 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=7TNwyTWrS3SDXNShnR9VBKYwKcso+zu5/dbqbJiqAkE=; b=ENoBKNeh/CNPGPW+sf3H0PbTfFz0PPwy48bcIeDIYHS1aYZVmyO+Eal+B6Juarj7Z6xPdv RJcACED0mzKpynKniCIS0euZhdiv0RNzxPdOY+l+OJrhqPiPpZUGjHDM7uFqyeWur9FqdB Heqjufe3RMfO7QEmlitgWYmRaXVVG53bEu3xhxtoxZuKQxvNeS54VZI/SqoO6eVtp62zi4 Dys5A7G/3TeMqlF0RW4XPeewA2lcp0YYAmdfVSlfg3QDvzj0M+Y4OTXldQICUrkczdEPgl lrLCpG6c8TCEQ8KwRkV4ZhFkPNMCJJjqE/rPujve3zEka+/LTn59fBbKdkqpeA== 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 4B6AD1848A; Fri, 14 Jan 2022 18:01:44 +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 20EI1i7j085951; Fri, 14 Jan 2022 18:01:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20EI1ifJ085950; Fri, 14 Jan 2022 18:01:44 GMT (envelope-from git) Date: Fri, 14 Jan 2022 18:01:44 GMT Message-Id: <202201141801.20EI1ifJ085950@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: 0e46cdf18498 - main - mail/opendkim: Respect PidFile setting in opendkim.conf List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 0e46cdf18498118d3309812946e1df0245d62cb0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642183304; 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=7TNwyTWrS3SDXNShnR9VBKYwKcso+zu5/dbqbJiqAkE=; b=CpsjvvyozjoKv6XwKHWtQ7SXBfyg4VCi6AE2uqftMyfojyKRHMs/ni4HpTpsp6u75hGMOH wFxMtTPt0GdDaIgq9jQ+pYoiRCyIAgPOSRTXSOpbSDMxf9gunM8cYHydQkyC/t0IkDPegW 79ww6D/92zFgK/5BvRTOMb5zMREdEdLupBG5xMJbAu1vYR0TH6Bio0JWN3l8pjeksCJs5N EPo7MWPipwbyHLj9LBkcPunxJ+YoMq7KnLIE4TGqXYDZ3UrYQD5GPPO8Kv5fpmeTlTU0hf tRnKbRhSKvkf2SCklmjExYWMF3iH9Lp2NKdkcSLNyp68lAsz9AxzHSouiS4XvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642183304; a=rsa-sha256; cv=none; b=ekge1HWwMznt6MFTaQyi6jcVwAOKa6iG5rIgKRH3jLIBeMMh7Fsve1vYxu3h4V3iunpb1X tHAEa92czgtcx9QSGpTZXAB1oNaKgy+qlAUlSC9vRESU0l7/eyBMwpzs5TiR/Sq0cJxqH+ EH8W4d5EgOMwb0sdU2ZFCIn8NhG4R1FqkHadaDEEapJgJp0VCSsZLfnK1Rvv6MnUZM94j0 RSSt0+z5uCT8ZJTeLGc0N6w9dNCDHQK3QLC4jVwnGTnHXsbxkZ3gTkqTnEVyUuFXO8fxim JFA2ME6ozqDFb8TcL5Orcjq5kjw1+aVOD3wTeYgjK27FPvwMhcdmD7Wx0i/+0w== 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=0e46cdf18498118d3309812946e1df0245d62cb0 commit 0e46cdf18498118d3309812946e1df0245d62cb0 Author: Chris Rees AuthorDate: 2022-01-14 17:56:38 +0000 Commit: Chris Rees CommitDate: 2022-01-14 18:01:28 +0000 mail/opendkim: Respect PidFile setting in opendkim.conf While here, pet rclint a bit, though it doesn't like the profile parts not being in functions PR: ports/254762 Reported by: Rob LA LAU Reviewed by: skozlov (a previous iteration) Approved by: maintainer timeout, 9 months Differential Revision: https://reviews.freebsd.org/D29586 --- mail/opendkim/Makefile | 2 +- mail/opendkim/files/milter-opendkim.in | 98 ++++++++++++++++------------------ 2 files changed, 48 insertions(+), 52 deletions(-) diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile index 18cf989dcb06..620252c2fff5 100644 --- a/mail/opendkim/Makefile +++ b/mail/opendkim/Makefile @@ -2,7 +2,7 @@ PORTNAME= opendkim PORTVERSION= 2.10.3 -PORTREVISION= 13 +PORTREVISION= 14 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 930b91ee32d5..8d83197d8884 100644 --- a/mail/opendkim/files/milter-opendkim.in +++ b/mail/opendkim/files/milter-opendkim.in @@ -51,15 +51,55 @@ load_rc_config $name # # DO NOT CHANGE THESE DEFAULT VALUES HERE # -: ${milteropendkim_enable="NO"} -: ${milteropendkim_uid="mailnull"} -: ${milteropendkim_gid="mailnull"} -: ${milteropendkim_cfgfile="%%PREFIX%%/etc/mail/opendkim.conf"} -: ${milteropendkim_socket_perms="0755"} +: ${milteropendkim_enable:="NO"} +: ${milteropendkim_uid:="mailnull"} +: ${milteropendkim_gid:="mailnull"} +: ${milteropendkim_cfgfile:="%%PREFIX%%/etc/mail/opendkim.conf"} +: ${milteropendkim_socket_perms:="0755"} # Options other than above can be set with $milteropendkim_flags. # see dkim-milter documentation for detail. +extra_commands="reload" +start_precmd="dkim_prepcmd" +start_postcmd="dkim_start_postcmd" +stop_postcmd="dkim_cleansockets" +command="%%PREFIX%%/sbin/opendkim" +sig_reload="USR1" + +dkim_cleansockets() +{ + rm -f "${milteropendkim_socket##local:}" "${milteropendkim_socket##unix:}" +} + +dkim_get_pidfile() +{ + if get_pidfile_from_conf PidFile ${milteropendkim_cfgfile#-x }; then + pidfile="$_pidfile_from_conf" + else + pidfile="/var/run/milteropendkim/${profile:-pid}" + fi +} + +dkim_prepcmd() +{ + dkim_cleansockets + dkim_get_pidfile + install -d -o ${milteropendkim_uid%:*} -g $milteropendkim_gid \ + -m ${milteropendkim_socket_perms} ${pidfile%/*} +} + +dkim_start_postcmd() +{ + if [ -n "${milteropendkim_socket}" ] ; then + # 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 +} + if [ -n "$2" ]; then profile="$2" if [ -n "${milteropendkim_profiles}" ]; then @@ -67,7 +107,7 @@ if [ -n "$2" ]; then eval milteropendkim_enable="\${milteropendkim_${profile}_enable:-${milteropendkim_enable}}" eval milteropendkim_socket="\${milteropendkim_${profile}_socket:-}" eval milteropendkim_socket_perms="\${milteropendkim_${profile}_socket_perms:-}" - if [ "x${milteropendkim_socket}" = "x" ];then + if [ -z "${milteropendkim_socket}" ];then echo "You must define a socket (milteropendkim_${profile}_socket)" exit 1 fi @@ -103,6 +143,7 @@ if [ -n "$2" ]; then 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}" else echo "$0: extra argument ignored" @@ -155,49 +196,4 @@ else fi 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:}" - fi - if [ ! -d ${_piddir} ] ; then - mkdir -p ${_piddir} - fi - if [ -n "${milteropendkim_uid}" ] ; then - chown ${milteropendkim_uid} ${_piddir} - fi - if [ -n "${milteropendkim_gid}" ] ; then - chgrp ${milteropendkim_gid} ${_piddir} - fi - chmod ${milteropendkim_socket_perms} ${_piddir} -} - -dkim_start_postcmd () -{ - 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 - chmod ${milteropendkim_socket_perms} ${milteropendkim_socket##local:} - elif [ -S "${milteropendkim_socket##unix:}" ] ; then - chmod ${milteropendkim_socket_perms} ${milteropendkim_socket##unix:} - fi - fi -} - -dkim_postcmd() -{ - 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 - rmdir ${_piddir} > /dev/null 2>&1 -} - run_rc_command "$1"