| 1 |
commit: 65005df6050d33d3eb5001d958aaae17bb72a962 |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 27 16:28:12 2019 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 27 17:18:08 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65005df6 |
| 7 |
|
| 8 |
mail-filter/opendkim: new revision with a consistent config file. |
| 9 |
|
| 10 |
The previous revisions installed a variable config file, and only did |
| 11 |
so conditionally, based on the state of the live filesystem. The new |
| 12 |
revision always installs the same config file. This should be simpler |
| 13 |
and more predictable. In addition, the temporary directory "${T}" is |
| 14 |
now used as "scratch space" while mangling that config file. |
| 15 |
|
| 16 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
| 17 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
| 18 |
|
| 19 |
...im-2.10.3-r7.ebuild => opendkim-2.10.3-r8.ebuild} | 20 +++++++++++--------- |
| 20 |
1 file changed, 11 insertions(+), 9 deletions(-) |
| 21 |
|
| 22 |
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r7.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild |
| 23 |
similarity index 93% |
| 24 |
rename from mail-filter/opendkim/opendkim-2.10.3-r7.ebuild |
| 25 |
rename to mail-filter/opendkim/opendkim-2.10.3-r8.ebuild |
| 26 |
index 9a16abcce51..c45d7104150 100644 |
| 27 |
--- a/mail-filter/opendkim/opendkim-2.10.3-r7.ebuild |
| 28 |
+++ b/mail-filter/opendkim/opendkim-2.10.3-r8.ebuild |
| 29 |
@@ -135,15 +135,17 @@ src_install() { |
| 30 |
fowners root:opendkim /var/lib/opendkim |
| 31 |
fperms 750 /var/lib/opendkim |
| 32 |
|
| 33 |
- # default configuration |
| 34 |
- if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then |
| 35 |
- grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \ |
| 36 |
- > "${D}"/etc/opendkim/opendkim.conf |
| 37 |
- if use unbound; then |
| 38 |
- echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf |
| 39 |
- fi |
| 40 |
- echo UserID opendkim >> "${D}"/etc/opendkim/opendkim.conf |
| 41 |
- fi |
| 42 |
+ # Strip the comments out of the "simple" example configuration... |
| 43 |
+ grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \ |
| 44 |
+ > "${T}/opendkim.conf" || die |
| 45 |
+ |
| 46 |
+ # and tweak it a bit before installing it unconditionally. |
| 47 |
+ echo "# For use with unbound" >> "${T}/opendkim.conf" || die |
| 48 |
+ echo "#TrustAnchorFile /etc/dnssec/root-anchors.txt" \ |
| 49 |
+ >> "${T}/opendkim.conf" || die |
| 50 |
+ echo UserID opendkim >> "${T}/opendkim.conf" || die |
| 51 |
+ insinto /etc/opendkim |
| 52 |
+ doins "${T}/opendkim.conf" |
| 53 |
} |
| 54 |
|
| 55 |
pkg_postinst() { |
Archives