| 1 |
commit: 2a8aa5f3e4847d8f79a9e25597745e5ba5128205 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 29 07:36:34 2017 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 29 07:36:34 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a8aa5f3 |
| 7 |
|
| 8 |
mail-filter/opendmarc: create /var/run/opendmarc at runtime, bug #605512 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
mail-filter/opendmarc/files/opendmarc.initd | 5 ++++- |
| 13 |
mail-filter/opendmarc/opendmarc-1.1.3.ebuild | 2 +- |
| 14 |
mail-filter/opendmarc/opendmarc-1.3.0.ebuild | 4 +--- |
| 15 |
mail-filter/opendmarc/opendmarc-1.3.1.ebuild | 4 +--- |
| 16 |
mail-filter/opendmarc/opendmarc-1.3.2.ebuild | 2 -- |
| 17 |
5 files changed, 7 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/mail-filter/opendmarc/files/opendmarc.initd b/mail-filter/opendmarc/files/opendmarc.initd |
| 20 |
index 0f248fcb86c..6a8300f145d 100644 |
| 21 |
--- a/mail-filter/opendmarc/files/opendmarc.initd |
| 22 |
+++ b/mail-filter/opendmarc/files/opendmarc.initd |
| 23 |
@@ -1,5 +1,5 @@ |
| 24 |
#!/sbin/openrc-run |
| 25 |
-# Copyright 1999-2014 Gentoo Foundation |
| 26 |
+# Copyright 1999-2017 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
CONFFILE="/etc/opendmarc/${SVCNAME}.conf" |
| 30 |
@@ -14,6 +14,9 @@ check_cfg() { |
| 31 |
eerror "Configuration file ${CONFFILE} is missing" |
| 32 |
return 1 |
| 33 |
fi |
| 34 |
+ # create /var/run/opendmarc |
| 35 |
+ mkdir -p /var/run/opendmarc >& /dev/null |
| 36 |
+ chown ${OPENDMARC_USER}:${OPENDMARC_GROUP} /var/run/opendmarc >& /dev/null |
| 37 |
PIDFILE=$(sed -ne 's/^[[:space:]]*PidFile[[:space:]]\+//p' "${CONFFILE}") |
| 38 |
local PIDDIR="${PIDFILE%/*}" |
| 39 |
if [ ! -d "${PIDDIR}" ] ; then |
| 40 |
|
| 41 |
diff --git a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild b/mail-filter/opendmarc/opendmarc-1.1.3.ebuild |
| 42 |
index b1320258961..776550c0112 100644 |
| 43 |
--- a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild |
| 44 |
+++ b/mail-filter/opendmarc/opendmarc-1.1.3.ebuild |
| 45 |
@@ -1,4 +1,4 @@ |
| 46 |
-# Copyright 1999-2014 Gentoo Foundation |
| 47 |
+# Copyright 1999-2017 Gentoo Foundation |
| 48 |
# Distributed under the terms of the GNU General Public License v2 |
| 49 |
|
| 50 |
EAPI=5 |
| 51 |
|
| 52 |
diff --git a/mail-filter/opendmarc/opendmarc-1.3.0.ebuild b/mail-filter/opendmarc/opendmarc-1.3.0.ebuild |
| 53 |
index e646fa51722..7a751418a03 100644 |
| 54 |
--- a/mail-filter/opendmarc/opendmarc-1.3.0.ebuild |
| 55 |
+++ b/mail-filter/opendmarc/opendmarc-1.3.0.ebuild |
| 56 |
@@ -1,4 +1,4 @@ |
| 57 |
-# Copyright 1999-2015 Gentoo Foundation |
| 58 |
+# Copyright 1999-2017 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
|
| 61 |
EAPI=5 |
| 62 |
@@ -39,8 +39,6 @@ src_install() { |
| 63 |
newconfd "${FILESDIR}"/opendmarc.confd opendmarc |
| 64 |
|
| 65 |
dodir /etc/opendmarc |
| 66 |
- dodir /var/run/opendmarc |
| 67 |
- fowners milter:milter /var/run/opendmarc |
| 68 |
|
| 69 |
# create config file |
| 70 |
sed \ |
| 71 |
|
| 72 |
diff --git a/mail-filter/opendmarc/opendmarc-1.3.1.ebuild b/mail-filter/opendmarc/opendmarc-1.3.1.ebuild |
| 73 |
index 6c4e05392bb..22347bba539 100644 |
| 74 |
--- a/mail-filter/opendmarc/opendmarc-1.3.1.ebuild |
| 75 |
+++ b/mail-filter/opendmarc/opendmarc-1.3.1.ebuild |
| 76 |
@@ -1,4 +1,4 @@ |
| 77 |
-# Copyright 1999-2015 Gentoo Foundation |
| 78 |
+# Copyright 1999-2017 Gentoo Foundation |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
|
| 81 |
EAPI=5 |
| 82 |
@@ -39,8 +39,6 @@ src_install() { |
| 83 |
newconfd "${FILESDIR}"/opendmarc.confd opendmarc |
| 84 |
|
| 85 |
dodir /etc/opendmarc |
| 86 |
- dodir /var/run/opendmarc |
| 87 |
- fowners milter:milter /var/run/opendmarc |
| 88 |
|
| 89 |
# create config file |
| 90 |
sed \ |
| 91 |
|
| 92 |
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2.ebuild |
| 93 |
index 0e47fc1dc99..5b2effd5d43 100644 |
| 94 |
--- a/mail-filter/opendmarc/opendmarc-1.3.2.ebuild |
| 95 |
+++ b/mail-filter/opendmarc/opendmarc-1.3.2.ebuild |
| 96 |
@@ -40,8 +40,6 @@ src_install() { |
| 97 |
newconfd "${FILESDIR}"/opendmarc.confd opendmarc |
| 98 |
|
| 99 |
dodir /etc/opendmarc |
| 100 |
- dodir /var/run/opendmarc |
| 101 |
- fowners milter:milter /var/run/opendmarc |
| 102 |
|
| 103 |
# create config file |
| 104 |
sed \ |
Archives