From owner-svn-ports-all@freebsd.org Fri Oct 12 15:30:36 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 43FF910C1A34; Fri, 12 Oct 2018 15:30:36 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EB9F088816; Fri, 12 Oct 2018 15:30:35 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E579121386; Fri, 12 Oct 2018 15:30:35 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9CFUZkK095279; Fri, 12 Oct 2018 15:30:35 GMT (envelope-from uqs@FreeBSD.org) Received: (from uqs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9CFUZFR095278; Fri, 12 Oct 2018 15:30:35 GMT (envelope-from uqs@FreeBSD.org) Message-Id: <201810121530.w9CFUZFR095278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: uqs set sender to uqs@FreeBSD.org using -f From: Ulrich Spoerlein Date: Fri, 12 Oct 2018 15:30:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r481909 - in head/mail/opendkim: . files X-SVN-Group: ports-head X-SVN-Commit-Author: uqs X-SVN-Commit-Paths: in head/mail/opendkim: . files X-SVN-Commit-Revision: 481909 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Oct 2018 15:30:36 -0000 Author: uqs Date: Fri Oct 12 15:30:35 2018 New Revision: 481909 URL: https://svnweb.freebsd.org/changeset/ports/481909 Log: Fix mail/opendkim to work with standard sendmail in base PR: 208056 Submitted by: Krzysztof Reported by: Marcin Cieślak Modified: head/mail/opendkim/Makefile head/mail/opendkim/files/milter-opendkim.in Modified: head/mail/opendkim/Makefile ============================================================================== --- head/mail/opendkim/Makefile Fri Oct 12 15:15:15 2018 (r481908) +++ head/mail/opendkim/Makefile Fri Oct 12 15:30:35 2018 (r481909) @@ -3,7 +3,7 @@ PORTNAME= opendkim PORTVERSION= 2.10.3 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= mail security MASTER_SITES= SF/${PORTNAME} \ SF/${PORTNAME}/Previous%20Releases \ Modified: head/mail/opendkim/files/milter-opendkim.in ============================================================================== --- head/mail/opendkim/files/milter-opendkim.in Fri Oct 12 15:15:15 2018 (r481908) +++ head/mail/opendkim/files/milter-opendkim.in Fri Oct 12 15:30:35 2018 (r481909) @@ -24,6 +24,9 @@ # milteropendkim_${profile}_* : Variables per profile. # Sockets must be different from each other. # +# milteropendkim_socket_perms (str): +# Permissions for local|unix socket. +# # all parameters below now can be set in opendkim.conf(5). # milteropendkim_socket (str): Path to the milter socket. # milteropendkim_domain (str): Domainpart of From: in mails to sign. @@ -43,7 +46,6 @@ start_postcmd="dkim_start_postcmd" stop_postcmd="dkim_postcmd" command="%%PREFIX%%/sbin/opendkim" _piddir="/var/run/milteropendkim" -_piddir_perms="0755" pidfile="${_piddir}/pid" sig_reload="USR1" @@ -56,6 +58,7 @@ load_rc_config $name : ${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. @@ -66,6 +69,7 @@ if [ -n "$2" ]; then pidfile="${_piddir}/${profile}.pid" 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 echo "You must define a socket (milteropendkim_${profile}_socket)" exit 1 @@ -169,28 +173,31 @@ dkim_prepcmd () fi if [ -n "${milteropendkim_gid}" ] ; then chgrp ${milteropendkim_gid} ${_piddir} - _piddir_perms="0775" fi - chmod ${_piddir_perms} ${_piddir} + chmod ${milteropendkim_socket_perms} ${_piddir} } dkim_start_postcmd () { - # postcmd is executed too fast and socket is not created before checking... - sleep 1 - if [ -S ${milteropendkim_socket##local:} ] ; then - chmod ${_piddir_perms} ${milteropendkim_socket##local:} - elif [ -S ${milteropendkim_socket##unix:} ] ; then - chmod ${_piddir_perms} ${milteropendkim_socket##unix:} + if [ "x${milteropendkim_socket}" != "x" ] ; 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 [ -S ${milteropendkim_socket##local:} ] ; then - rm -f ${milteropendkim_socket##local:} - elif [ -S ${milteropendkim_socket##unix:} ] ; then - rm -f ${milteropendkim_socket##unix:} + 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:} + fi fi # just if the directory is empty rmdir ${_piddir} > /dev/null 2>&1