Attachment 169144 Details for Bug 208056 – milter-opendkim.in patch - v3

[patch] milter-opendkim.in patch - v3

p.patch (text/plain), 2.53 KB, created by Krzysztof on 2016-04-10 12:34:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof

Created: 2016-04-10 12:34:42 UTC

Size: 2.53 KB

patch

obsolete

>diff -ruN mail/opendkim/files/milter-opendkim.in mail/opendkim.new/files/milter-opendkim.in
>--- mail/opendkim/files/milter-opendkim.in	2014-01-24 01:14:07.000000000 +0100
>+++ mail/opendkim.new/files/milter-opendkim.in	2016-04-10 14:18:11.796137289 +0200
>@@ -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 @@
> 
> 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 @@
> #
> : ${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 @@
> 	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 @@
> 	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}"
>@@ -157,6 +167,22 @@
>     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
> }
> 
> dkim_postcmd()

Flags:

freebsd-ports: maintainer-approval+

Actions: View | Diff

Attachments on bug 208056: 168293 | 168614 | 169144 | 197154