[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendmarc/files/, mail-filter/opendmarc/

[Fabian Groffen]

commit:     2a8aa5f3e4847d8f79a9e25597745e5ba5128205
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 07:36:34 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 07:36:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a8aa5f3

mail-filter/opendmarc: create /var/run/opendmarc at runtime, bug #605512

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 mail-filter/opendmarc/files/opendmarc.initd  | 5 ++++-
 mail-filter/opendmarc/opendmarc-1.1.3.ebuild | 2 +-
 mail-filter/opendmarc/opendmarc-1.3.0.ebuild | 4 +---
 mail-filter/opendmarc/opendmarc-1.3.1.ebuild | 4 +---
 mail-filter/opendmarc/opendmarc-1.3.2.ebuild | 2 --
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/mail-filter/opendmarc/files/opendmarc.initd 
b/mail-filter/opendmarc/files/opendmarc.initd
index 0f248fcb86c..6a8300f145d 100644
--- a/mail-filter/opendmarc/files/opendmarc.initd
+++ b/mail-filter/opendmarc/files/opendmarc.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 CONFFILE="/etc/opendmarc/${SVCNAME}.conf"
@@ -14,6 +14,9 @@ check_cfg() {
                eerror "Configuration file ${CONFFILE} is missing"
                return 1
        fi
+       # create /var/run/opendmarc
+       mkdir -p /var/run/opendmarc >& /dev/null
+       chown ${OPENDMARC_USER}:${OPENDMARC_GROUP} /var/run/opendmarc >& 
/dev/null
        PIDFILE=$(sed -ne 's/^[[:space:]]*PidFile[[:space:]]\+//p' 
"${CONFFILE}")
        local PIDDIR="${PIDFILE%/*}"
        if [ ! -d  "${PIDDIR}" ] ; then

diff --git a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild 
b/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
index b1320258961..776550c0112 100644
--- a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5

diff --git a/mail-filter/opendmarc/opendmarc-1.3.0.ebuild 
b/mail-filter/opendmarc/opendmarc-1.3.0.ebuild
index e646fa51722..7a751418a03 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.0.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -39,8 +39,6 @@ src_install() {
        newconfd "${FILESDIR}"/opendmarc.confd opendmarc
 
        dodir /etc/opendmarc
-       dodir /var/run/opendmarc
-       fowners milter:milter /var/run/opendmarc
 
        # create config file
        sed \

diff --git a/mail-filter/opendmarc/opendmarc-1.3.1.ebuild 
b/mail-filter/opendmarc/opendmarc-1.3.1.ebuild
index 6c4e05392bb..22347bba539 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.1.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -39,8 +39,6 @@ src_install() {
        newconfd "${FILESDIR}"/opendmarc.confd opendmarc
 
        dodir /etc/opendmarc
-       dodir /var/run/opendmarc
-       fowners milter:milter /var/run/opendmarc
 
        # create config file
        sed \

diff --git a/mail-filter/opendmarc/opendmarc-1.3.2.ebuild 
b/mail-filter/opendmarc/opendmarc-1.3.2.ebuild
index 0e47fc1dc99..5b2effd5d43 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2.ebuild
@@ -40,8 +40,6 @@ src_install() {
        newconfd "${FILESDIR}"/opendmarc.confd opendmarc
 
        dodir /etc/opendmarc
-       dodir /var/run/opendmarc
-       fowners milter:milter /var/run/opendmarc
 
        # create config file
        sed \