diff options
| -rw-r--r-- | mail-filter/opendkim/files/opendkim-2.10.3-openrc.patch | 12 | ||||
| -rw-r--r-- | mail-filter/opendkim/opendkim-2.10.3-r12.ebuild (renamed from mail-filter/opendkim/opendkim-2.10.3-r11.ebuild) | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-openrc.patch b/mail-filter/opendkim/files/opendkim-2.10.3-openrc.patch index 9033b84281ca..9b645ba0f0ce 100644 --- a/mail-filter/opendkim/files/opendkim-2.10.3-openrc.patch +++ b/mail-filter/opendkim/files/opendkim-2.10.3-openrc.patch @@ -119,17 +119,9 @@ index 76df01cd..401130bb 100644 +SUBDIRS = convert docs init ldap lua patches repute spec stats dist_doc_DATA = README -diff --git a/contrib/OpenRC/.gitignore b/contrib/OpenRC/.gitignore -new file mode 100644 -index 00000000..af0aa700 ---- /dev/null -+++ b/contrib/OpenRC/.gitignore -@@ -0,0 +1,2 @@ -+opendkim.openrc -+opendkim.openrc.in diff --git a/contrib/OpenRC/opendkim.openrc.in.in b/contrib/OpenRC/opendkim.openrc.in.in new file mode 100644 -index 00000000..d9631cdf +index 00000000..4b783615 --- /dev/null +++ b/contrib/OpenRC/opendkim.openrc.in.in @@ -0,0 +1,54 @@ @@ -137,7 +129,7 @@ index 00000000..d9631cdf +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + -+CONFFILE="@SYSCONFDIR@/opendkim/${RC_SVCNAME}.conf" ++CONFFILE="@SYSCONFDIR@/${RC_SVCNAME}.conf" +required_files="${CONFFILE}" + +command="@SBINDIR@/opendkim" diff --git a/mail-filter/opendkim/opendkim-2.10.3-r11.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r12.ebuild index 0db960be3c69..ee5908da59c4 100644 --- a/mail-filter/opendkim/opendkim-2.10.3-r11.ebuild +++ b/mail-filter/opendkim/opendkim-2.10.3-r12.ebuild @@ -80,6 +80,12 @@ src_configure() { if use ldap; then myconf+=( $(use_with sasl) ) fi + + # We install the our configuration filed under e.g. /etc/opendkim, + # so the next line is necessary to point the daemon and all of its + # documentation to the right location by default. + myconf+=( --sysconfdir="${EPREFIX}/etc/${PN}" ) + econf \ $(use_with berkdb db) \ $(use_with opendbx odbx) \ |