From owner-svn-ports-all@freebsd.org Fri Aug 18 20:49:18 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33271DD6281; Fri, 18 Aug 2017 20:49:18 +0000 (UTC) (envelope-from swills@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 mx1.freebsd.org (Postfix) with ESMTPS id 0D1D474EBB; Fri, 18 Aug 2017 20:49:17 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7IKnHJ6024288; Fri, 18 Aug 2017 20:49:17 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7IKnGJ9024286; Fri, 18 Aug 2017 20:49:16 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201708182049.v7IKnGJ9024286@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 18 Aug 2017 20:49:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448274 - in head/mail/opendkim: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/mail/opendkim: . files X-SVN-Commit-Revision: 448274 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.23 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, 18 Aug 2017 20:49:18 -0000 Author: swills Date: Fri Aug 18 20:49:16 2017 New Revision: 448274 URL: https://svnweb.freebsd.org/changeset/ports/448274 Log: mail/opendkim: Add GID support to the rc script PR: 208056 Submitted by: Krzysztof Approved by: Daniel Austin (maintainer) Modified: head/mail/opendkim/Makefile head/mail/opendkim/files/milter-opendkim.in Modified: head/mail/opendkim/Makefile ============================================================================== --- head/mail/opendkim/Makefile Fri Aug 18 20:34:25 2017 (r448273) +++ head/mail/opendkim/Makefile Fri Aug 18 20:49:16 2017 (r448274) @@ -3,7 +3,7 @@ PORTNAME= opendkim PORTVERSION= 2.10.3 -PORTREVISION= 6 +PORTREVISION= 7 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 Aug 18 20:34:25 2017 (r448273) +++ head/mail/opendkim/files/milter-opendkim.in Fri Aug 18 20:49:16 2017 (r448274) @@ -16,6 +16,7 @@ # milteropendkim_enable (bool): Set to "NO" by default. # Set it to "YES" to enable dkim-milter # milteropendkim_uid (str): Set username to run milter. +# milteropendkim_gid (str): Set group to run milter. # milteropendkim_profiles (list): Set to "" by default. # Define your profiles here. # milteropendkim_cfgfile (str): Configuration file. See opendkim.conf(5) @@ -38,9 +39,11 @@ rcvar=milteropendkim_enable extra_commands="reload" start_precmd="dkim_prepcmd" +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" @@ -51,6 +54,7 @@ load_rc_config $name # : ${milteropendkim_enable="NO"} : ${milteropendkim_uid="mailnull"} +: ${milteropendkim_gid="mailnull"} : ${milteropendkim_cfgfile="%%PREFIX%%/etc/mail/opendkim.conf"} # Options other than above can be set with $milteropendkim_flags. @@ -82,6 +86,9 @@ if [ -n "$2" ]; then fi if [ "x${milteropendkim_uid}" != "x" ];then _uid_prefix="-u" + if [ "x${milteropendkim_gid}" != "x" ];then + milteropendkim_uid=${milteropendkim_uid}:${milteropendkim_gid} + fi fi if [ "x${milteropendkim_domain}" != "x" ];then milteropendkim_domain="-d ${milteropendkim_domain}" @@ -127,6 +134,9 @@ else fi if [ "x${milteropendkim_uid}" != "x" ];then _uid_prefix="-u" + if [ "x${milteropendkim_gid}" != "x" ];then + milteropendkim_uid=${milteropendkim_uid}:${milteropendkim_gid} + fi fi if [ "x${milteropendkim_domain}" != "x" ];then milteropendkim_domain="-d ${milteropendkim_domain}" @@ -156,6 +166,22 @@ dkim_prepcmd () fi if [ -n "${milteropendkim_uid}" ] ; then chown ${milteropendkim_uid} ${_piddir} + fi + if [ -n "${milteropendkim_gid}" ] ; then + chgrp ${milteropendkim_gid} ${_piddir} + _piddir_perms="0775" + fi + chmod ${_piddir_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:} fi }