1 |
commit: 7319c4e904277ecc9ec7fb8f0e1e91dbfdd75546 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 10 10:34:55 2018 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 10 10:34:55 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7319c4e9 |
7 |
|
8 |
mail-filter/opendmarc: cleanup and fix bugs #655728, #662112 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/640012 |
11 |
Closes: https://bugs.gentoo.org/655728 |
12 |
Closes: https://bugs.gentoo.org/662112 |
13 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
14 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
15 |
|
16 |
mail-filter/opendmarc/Manifest | 2 - |
17 |
mail-filter/opendmarc/files/opendmarc.service | 5 +-- |
18 |
mail-filter/opendmarc/opendmarc-1.3.0.ebuild | 51 ---------------------- |
19 |
...marc-1.3.1.ebuild => opendmarc-1.3.2-r2.ebuild} | 37 +++++++++++----- |
20 |
4 files changed, 29 insertions(+), 66 deletions(-) |
21 |
|
22 |
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest |
23 |
index aafb9dd996d..7769c4748e3 100644 |
24 |
--- a/mail-filter/opendmarc/Manifest |
25 |
+++ b/mail-filter/opendmarc/Manifest |
26 |
@@ -1,4 +1,2 @@ |
27 |
DIST opendmarc-1.1.3.tar.gz 586574 BLAKE2B a5574aa705db6e5b87a704f3073039d667c9052d1ec907ca9423532f62d52cbdaf7af1680a2179198616f27786940650492ad39c4fdb668c27c5979804471eea SHA512 30de56b6da1665e0ed68484702bfcfcbd0b65275053818c807c16dea26f0e014a0484dc9d5ed6d1405628ea22a61082f13cecf66714a414139f612c51a294086 |
28 |
-DIST opendmarc-1.3.0.tar.gz 640017 BLAKE2B 6ffe63ac8a610ae4ef9904379e42e11f2dbc09e14a7febe36e875247f72d958b9ff931cd1a034f28d0a9eff15663cf0acb75d8d0c91186243fbab94470bf10db SHA512 c685cae0e02a72b797f24a28b9965f8745f165a3ce3a8f3f2e0167ebf6121e92389990870271204ca02b06703f4ad98c6d343345478040f7fc4013b1ce331b03 |
29 |
-DIST opendmarc-1.3.1.tar.gz 640151 BLAKE2B 8e0e29ac9b95730f226a16c6130ff78aca7ecaf8c896864d9868f7d285676b84c2896bd0663fafbd79a9a7e182655a644aa51e37dd23a08662406099a7f1c5d5 SHA512 0be11540bc26bd3b3e6cc9817bc379a5d290b63ef16c5d3559bf96b241ad6628bea7a9daeb468afac855bc16be16676f722b3c1d468ea82c8d8364e8a8137226 |
30 |
DIST opendmarc-1.3.2.tar.gz 593448 BLAKE2B 80f47a82e38c6cdc5791a695485262c50e9363b81537a52d7af204bd6a830df6eea9e9b6f710b72b7934c3ab7df800def7d4b3e54f53b8908a7f1b42bcea2b2d SHA512 6045fb7d2be8f0ffdeca07324857d92908a41c6792749017c2fcc1058f05f55317b1919c67c780827dd7094ec8fff2e1fa4aeb5bab7ff7461537957af2652748 |
31 |
|
32 |
diff --git a/mail-filter/opendmarc/files/opendmarc.service b/mail-filter/opendmarc/files/opendmarc.service |
33 |
index e450637a02f..90ee5ccb434 100644 |
34 |
--- a/mail-filter/opendmarc/files/opendmarc.service |
35 |
+++ b/mail-filter/opendmarc/files/opendmarc.service |
36 |
@@ -1,7 +1,6 @@ |
37 |
[Unit] |
38 |
Description=Domain-based Message Authentication, Reporting and Conformance (DMARC) Milter |
39 |
-Documentation=man:opendmarc(8) man:opendmarc.conf(5) man:opendmarc-expire(8) man:opendmarc-importstats(8) man:opendmarc-reports(8) |
40 |
-man:opendmarc-check(8) man:opendmarc-import(8) man:opendmarc-params(8) http://www.trusteddomain.org/opendmarc/ |
41 |
+Documentation=man:opendmarc(8) man:opendmarc.conf(5) man:opendmarc-expire(8) man:opendmarc-importstats(8) man:opendmarc-reports(8) man:opendmarc-check(8) man:opendmarc-import(8) man:opendmarc-params(8) http://www.trusteddomain.org/opendmarc/ |
42 |
After=network.target nss-lookup.target syslog.target |
43 |
|
44 |
[Service] |
45 |
@@ -17,4 +16,4 @@ Restart=on-failure |
46 |
RestartSec=3 |
47 |
|
48 |
[Install] |
49 |
-WantedBy=multi-user.target |
50 |
\ No newline at end of file |
51 |
+WantedBy=multi-user.target |
52 |
|
53 |
diff --git a/mail-filter/opendmarc/opendmarc-1.3.0.ebuild b/mail-filter/opendmarc/opendmarc-1.3.0.ebuild |
54 |
deleted file mode 100644 |
55 |
index 7a751418a03..00000000000 |
56 |
--- a/mail-filter/opendmarc/opendmarc-1.3.0.ebuild |
57 |
+++ /dev/null |
58 |
@@ -1,51 +0,0 @@ |
59 |
-# Copyright 1999-2017 Gentoo Foundation |
60 |
-# Distributed under the terms of the GNU General Public License v2 |
61 |
- |
62 |
-EAPI=5 |
63 |
- |
64 |
-inherit user |
65 |
- |
66 |
-DESCRIPTION="Open source DMARC implementation " |
67 |
-HOMEPAGE="http://www.trusteddomain.org/opendmarc/" |
68 |
-SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz" |
69 |
- |
70 |
-LICENSE="BSD" |
71 |
-SLOT="0" |
72 |
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~x86 ~x86-fbsd" |
73 |
-IUSE="spf" |
74 |
- |
75 |
-DEPEND="dev-perl/DBI |
76 |
- || ( mail-filter/libmilter mail-mta/sendmail )" |
77 |
-RDEPEND="${DEPEND} |
78 |
- dev-perl/Switch |
79 |
- spf? ( mail-filter/libspf2 )" |
80 |
- |
81 |
-pkg_setup() { |
82 |
- enewgroup milter |
83 |
- enewuser milter -1 -1 /var/lib/milter milter |
84 |
-} |
85 |
- |
86 |
-src_configure() { |
87 |
- econf \ |
88 |
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \ |
89 |
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
90 |
- $(use_with spf) |
91 |
-} |
92 |
- |
93 |
-src_install() { |
94 |
- default |
95 |
- |
96 |
- newinitd "${FILESDIR}"/opendmarc.initd opendmarc |
97 |
- newconfd "${FILESDIR}"/opendmarc.confd opendmarc |
98 |
- |
99 |
- dodir /etc/opendmarc |
100 |
- |
101 |
- # create config file |
102 |
- sed \ |
103 |
- -e 's/^# UserID .*$/UserID milter/' \ |
104 |
- -e 's/^# PidFile .*/PidFile \/var\/run\/opendmarc\/opendmarc.pid/' \ |
105 |
- -e '/^# Socket /s/^# //' \ |
106 |
- "${S}"/opendmarc/opendmarc.conf.sample \ |
107 |
- > "${ED}"/etc/opendmarc/opendmarc.conf \ |
108 |
- || die |
109 |
-} |
110 |
|
111 |
diff --git a/mail-filter/opendmarc/opendmarc-1.3.1.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild |
112 |
similarity index 54% |
113 |
rename from mail-filter/opendmarc/opendmarc-1.3.1.ebuild |
114 |
rename to mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild |
115 |
index 22347bba539..1a13e2ea9f9 100644 |
116 |
--- a/mail-filter/opendmarc/opendmarc-1.3.1.ebuild |
117 |
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild |
118 |
@@ -1,9 +1,9 @@ |
119 |
-# Copyright 1999-2017 Gentoo Foundation |
120 |
+# Copyright 1999-2018 Gentoo Authors |
121 |
# Distributed under the terms of the GNU General Public License v2 |
122 |
|
123 |
-EAPI=5 |
124 |
+EAPI=6 |
125 |
|
126 |
-inherit user |
127 |
+inherit user multilib systemd |
128 |
|
129 |
DESCRIPTION="Open source DMARC implementation " |
130 |
HOMEPAGE="http://www.trusteddomain.org/opendmarc/" |
131 |
@@ -12,12 +12,16 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz" |
132 |
LICENSE="BSD" |
133 |
SLOT="0" |
134 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~x86-fbsd" |
135 |
-IUSE="spf" |
136 |
+IUSE="spf +reports static-libs" |
137 |
|
138 |
-DEPEND="dev-perl/DBI |
139 |
+DEPEND="reports? ( dev-perl/DBI ) |
140 |
|| ( mail-filter/libmilter mail-mta/sendmail )" |
141 |
RDEPEND="${DEPEND} |
142 |
- dev-perl/Switch |
143 |
+ reports? ( |
144 |
+ dev-perl/DBD-mysql |
145 |
+ dev-perl/HTTP-Message |
146 |
+ dev-perl/Switch |
147 |
+ ) |
148 |
spf? ( mail-filter/libspf2 )" |
149 |
|
150 |
pkg_setup() { |
151 |
@@ -25,26 +29,39 @@ pkg_setup() { |
152 |
enewuser milter -1 -1 /var/lib/milter milter |
153 |
} |
154 |
|
155 |
+src_prepare() { |
156 |
+ default |
157 |
+ if use !reports ; then |
158 |
+ sed -i -e '/^SUBDIRS =/s/reports//' Makefile.in || die |
159 |
+ fi |
160 |
+} |
161 |
+ |
162 |
src_configure() { |
163 |
econf \ |
164 |
--docdir="${EPREFIX}"/usr/share/doc/${PF} \ |
165 |
--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
166 |
- $(use_with spf) |
167 |
+ $(use_with spf) \ |
168 |
+ $(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \ |
169 |
+ $(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \ |
170 |
+ $(use_enable static-libs static) |
171 |
} |
172 |
|
173 |
src_install() { |
174 |
default |
175 |
|
176 |
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la |
177 |
+ |
178 |
newinitd "${FILESDIR}"/opendmarc.initd opendmarc |
179 |
newconfd "${FILESDIR}"/opendmarc.confd opendmarc |
180 |
+ systemd_dounit "${FILESDIR}/${PN}.service" |
181 |
|
182 |
dodir /etc/opendmarc |
183 |
|
184 |
# create config file |
185 |
sed \ |
186 |
- -e 's/^# UserID .*$/UserID milter/' \ |
187 |
- -e 's/^# PidFile .*/PidFile \/var\/run\/opendmarc\/opendmarc.pid/' \ |
188 |
- -e '/^# Socket /s/^# //' \ |
189 |
+ -e 's:^# UserID .*$:UserID milter:' \ |
190 |
+ -e "s:^# PidFile .*:PidFile ${EPREFIX}/var/run/opendmarc/opendmarc.pid:" \ |
191 |
+ -e '/^# Socket /s:^# ::' \ |
192 |
"${S}"/opendmarc/opendmarc.conf.sample \ |
193 |
> "${ED}"/etc/opendmarc/opendmarc.conf \ |
194 |
|| die |