1 |
commit: c8244c3de06e6a1b6ba8d3d179b1f77d39fce964 |
2 |
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 23 14:29:18 2015 +0000 |
4 |
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 23 14:29:51 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8244c3d |
7 |
|
8 |
mail-filter/postgrey: revbump to 1.35-r2 |
9 |
|
10 |
Inherit systemd eclass, add service for systemd, rm old versions, |
11 |
ack to Stefan G. Weichinger for submitting service file, |
12 |
fixes Bug 528032 |
13 |
|
14 |
Package-Manager: portage-2.2.20.1 |
15 |
|
16 |
mail-filter/postgrey/files/postgrey.service | 17 ++++++ |
17 |
mail-filter/postgrey/postgrey-1.34-r1.ebuild | 68 --------------------- |
18 |
mail-filter/postgrey/postgrey-1.34.ebuild | 62 ------------------- |
19 |
mail-filter/postgrey/postgrey-1.35-r1.ebuild | 2 +- |
20 |
...grey-1.34-r2.ebuild => postgrey-1.35-r2.ebuild} | 15 +++-- |
21 |
mail-filter/postgrey/postgrey-1.35.ebuild | 70 ---------------------- |
22 |
6 files changed, 27 insertions(+), 207 deletions(-) |
23 |
|
24 |
diff --git a/mail-filter/postgrey/files/postgrey.service b/mail-filter/postgrey/files/postgrey.service |
25 |
new file mode 100644 |
26 |
index 0000000..7321eee |
27 |
--- /dev/null |
28 |
+++ b/mail-filter/postgrey/files/postgrey.service |
29 |
@@ -0,0 +1,17 @@ |
30 |
+[Unit] |
31 |
+Description=Postfix Greylisting Service |
32 |
+Before=postfix.service |
33 |
+ |
34 |
+[Service] |
35 |
+Type=simple |
36 |
+ExecStart=/usr/sbin/postgrey --inet=127.0.0.1:10030 \ |
37 |
+ --pidfile=/var/run/postgrey.pid \ |
38 |
+ --group=postgrey --user=postgrey \ |
39 |
+ --greylist-text="Greylisted for %%s seconds" |
40 |
+Restart=always |
41 |
+RestartSec=5 |
42 |
+TimeoutSec=10 |
43 |
+ |
44 |
+[Install] |
45 |
+WantedBy=multi-user.target |
46 |
+ |
47 |
|
48 |
diff --git a/mail-filter/postgrey/postgrey-1.34-r1.ebuild b/mail-filter/postgrey/postgrey-1.34-r1.ebuild |
49 |
deleted file mode 100644 |
50 |
index d865c23..0000000 |
51 |
--- a/mail-filter/postgrey/postgrey-1.34-r1.ebuild |
52 |
+++ /dev/null |
53 |
@@ -1,68 +0,0 @@ |
54 |
-# Copyright 1999-2012 Gentoo Foundation |
55 |
-# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Id$ |
57 |
- |
58 |
-EAPI=4 |
59 |
- |
60 |
-inherit eutils user |
61 |
- |
62 |
-DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting" |
63 |
-HOMEPAGE="http://postgrey.schweikert.ch/" |
64 |
-SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz |
65 |
- http://postgrey.schweikert.ch/pub/old/${P}.tar.gz" |
66 |
- |
67 |
-LICENSE="GPL-2" |
68 |
-SLOT="0" |
69 |
-KEYWORDS="amd64 hppa ~ppc ppc64 x86" |
70 |
-IUSE="targrey" |
71 |
- |
72 |
-DEPEND="" |
73 |
-RDEPEND=">=dev-lang/perl-5.6.0 |
74 |
- dev-perl/net-server |
75 |
- dev-perl/IO-Multiplex |
76 |
- dev-perl/BerkeleyDB |
77 |
- dev-perl/Net-DNS |
78 |
- dev-perl/Parse-Syslog |
79 |
- dev-perl/Net-RBLClient |
80 |
- >=sys-libs/db-4.1" |
81 |
- |
82 |
-pkg_setup() { |
83 |
- enewgroup ${PN} |
84 |
- enewuser ${PN} -1 -1 /dev/null ${PN} |
85 |
-} |
86 |
- |
87 |
-src_prepare() { |
88 |
- if use targrey ; then |
89 |
- epatch "${FILESDIR}"/targrey-0.31-postgrey-1.34.patch |
90 |
- fi |
91 |
-} |
92 |
- |
93 |
-src_install() { |
94 |
- # postgrey data/DB in /var |
95 |
- diropts -m0770 -o ${PN} -g ${PN} |
96 |
- dodir /var/spool/postfix/${PN} |
97 |
- keepdir /var/spool/postfix/${PN} |
98 |
- fowners postgrey:postgrey /var/spool/postfix/${PN} |
99 |
- fperms 0770 /var/spool/postfix/${PN} |
100 |
- |
101 |
- # postgrey binary |
102 |
- dosbin ${PN} |
103 |
- dosbin contrib/postgreyreport |
104 |
- |
105 |
- # policy-test script |
106 |
- dosbin policy-test |
107 |
- |
108 |
- # postgrey data in /etc/postfix |
109 |
- insinto /etc/postfix |
110 |
- insopts -o root -g ${PN} -m 0640 |
111 |
- doins postgrey_whitelist_clients postgrey_whitelist_recipients |
112 |
- |
113 |
- # documentation |
114 |
- dodoc Changes README |
115 |
- |
116 |
- # init.d + conf.d files |
117 |
- insopts -o root -g root -m 755 |
118 |
- newinitd "${FILESDIR}"/${PN}.rc.new ${PN} |
119 |
- insopts -o root -g root -m 640 |
120 |
- newconfd "${FILESDIR}"/${PN}.conf.new ${PN} |
121 |
-} |
122 |
|
123 |
diff --git a/mail-filter/postgrey/postgrey-1.34.ebuild b/mail-filter/postgrey/postgrey-1.34.ebuild |
124 |
deleted file mode 100644 |
125 |
index fc55259..0000000 |
126 |
--- a/mail-filter/postgrey/postgrey-1.34.ebuild |
127 |
+++ /dev/null |
128 |
@@ -1,62 +0,0 @@ |
129 |
-# Copyright 1999-2012 Gentoo Foundation |
130 |
-# Distributed under the terms of the GNU General Public License v2 |
131 |
-# $Id$ |
132 |
- |
133 |
-EAPI=4 |
134 |
- |
135 |
-inherit eutils user |
136 |
- |
137 |
-DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting" |
138 |
-HOMEPAGE="http://postgrey.schweikert.ch/" |
139 |
-SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz |
140 |
- http://postgrey.schweikert.ch/pub/old/${P}.tar.gz" |
141 |
- |
142 |
-LICENSE="GPL-2" |
143 |
-SLOT="0" |
144 |
-KEYWORDS="amd64 hppa ~ppc ppc64 x86" |
145 |
-IUSE="" |
146 |
- |
147 |
-DEPEND="" |
148 |
-RDEPEND=">=dev-lang/perl-5.6.0 |
149 |
- dev-perl/net-server |
150 |
- dev-perl/IO-Multiplex |
151 |
- dev-perl/BerkeleyDB |
152 |
- dev-perl/Net-DNS |
153 |
- dev-perl/Parse-Syslog |
154 |
- dev-perl/Net-RBLClient |
155 |
- >=sys-libs/db-4.1" |
156 |
- |
157 |
-pkg_setup() { |
158 |
- enewgroup ${PN} |
159 |
- enewuser ${PN} -1 -1 /dev/null ${PN} |
160 |
-} |
161 |
- |
162 |
-src_install() { |
163 |
- # postgrey data/DB in /var |
164 |
- diropts -m0770 -o ${PN} -g ${PN} |
165 |
- dodir /var/spool/postfix/${PN} |
166 |
- keepdir /var/spool/postfix/${PN} |
167 |
- fowners postgrey:postgrey /var/spool/postfix/${PN} |
168 |
- fperms 0770 /var/spool/postfix/${PN} |
169 |
- |
170 |
- # postgrey binary |
171 |
- dosbin ${PN} |
172 |
- dosbin contrib/postgreyreport |
173 |
- |
174 |
- # policy-test script |
175 |
- dosbin policy-test |
176 |
- |
177 |
- # postgrey data in /etc/postfix |
178 |
- insinto /etc/postfix |
179 |
- insopts -o root -g ${PN} -m 0640 |
180 |
- doins postgrey_whitelist_clients postgrey_whitelist_recipients |
181 |
- |
182 |
- # documentation |
183 |
- dodoc Changes README |
184 |
- |
185 |
- # init.d + conf.d files |
186 |
- insopts -o root -g root -m 755 |
187 |
- newinitd "${FILESDIR}"/${PN}.rc.new ${PN} |
188 |
- insopts -o root -g root -m 640 |
189 |
- newconfd "${FILESDIR}"/${PN}.conf.new ${PN} |
190 |
-} |
191 |
|
192 |
diff --git a/mail-filter/postgrey/postgrey-1.35-r1.ebuild b/mail-filter/postgrey/postgrey-1.35-r1.ebuild |
193 |
index 6fbe9ee..c5a9e3c 100644 |
194 |
--- a/mail-filter/postgrey/postgrey-1.35-r1.ebuild |
195 |
+++ b/mail-filter/postgrey/postgrey-1.35-r1.ebuild |
196 |
@@ -1,4 +1,4 @@ |
197 |
-# Copyright 1999-2014 Gentoo Foundation |
198 |
+# Copyright 1999-2015 Gentoo Foundation |
199 |
# Distributed under the terms of the GNU General Public License v2 |
200 |
# $Id$ |
201 |
|
202 |
|
203 |
diff --git a/mail-filter/postgrey/postgrey-1.34-r2.ebuild b/mail-filter/postgrey/postgrey-1.35-r2.ebuild |
204 |
similarity index 82% |
205 |
rename from mail-filter/postgrey/postgrey-1.34-r2.ebuild |
206 |
rename to mail-filter/postgrey/postgrey-1.35-r2.ebuild |
207 |
index 0ece65f..9a4ec78 100644 |
208 |
--- a/mail-filter/postgrey/postgrey-1.34-r2.ebuild |
209 |
+++ b/mail-filter/postgrey/postgrey-1.35-r2.ebuild |
210 |
@@ -1,15 +1,15 @@ |
211 |
-# Copyright 1999-2013 Gentoo Foundation |
212 |
+# Copyright 1999-2015 Gentoo Foundation |
213 |
# Distributed under the terms of the GNU General Public License v2 |
214 |
# $Id$ |
215 |
|
216 |
-EAPI=4 |
217 |
+EAPI=5 |
218 |
|
219 |
-inherit eutils user |
220 |
+inherit eutils systemd user |
221 |
|
222 |
DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting" |
223 |
HOMEPAGE="http://postgrey.schweikert.ch/" |
224 |
SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz |
225 |
- http://postgrey.schweikert.ch/pub/old/${P}.tar.gz" |
226 |
+http://postgrey.schweikert.ch/pub/old/${P}.tar.gz" |
227 |
|
228 |
LICENSE="GPL-2" |
229 |
SLOT="0" |
230 |
@@ -24,6 +24,7 @@ RDEPEND=">=dev-lang/perl-5.6.0 |
231 |
dev-perl/Net-DNS |
232 |
dev-perl/Parse-Syslog |
233 |
dev-perl/Net-RBLClient |
234 |
+ virtual/perl-Digest-SHA |
235 |
>=sys-libs/db-4.1" |
236 |
|
237 |
pkg_setup() { |
238 |
@@ -35,6 +36,7 @@ src_prepare() { |
239 |
if use targrey ; then |
240 |
epatch "${FILESDIR}"/targrey-0.31-postgrey-1.34.patch |
241 |
fi |
242 |
+ # bug 479400 |
243 |
sed -i 's@#!/usr/bin/perl -T -w@#!/usr/bin/perl -w@' postgrey || die "sed failed" |
244 |
} |
245 |
|
246 |
@@ -59,11 +61,12 @@ src_install() { |
247 |
doins postgrey_whitelist_clients postgrey_whitelist_recipients |
248 |
|
249 |
# documentation |
250 |
- dodoc Changes README |
251 |
+ dodoc Changes README README.exim |
252 |
|
253 |
# init.d + conf.d files |
254 |
insopts -o root -g root -m 755 |
255 |
- newinitd "${FILESDIR}"/${PN}.rc.new ${PN} |
256 |
+ newinitd "${FILESDIR}"/${PN}-1.34-r3.rc.new ${PN} |
257 |
insopts -o root -g root -m 640 |
258 |
newconfd "${FILESDIR}"/${PN}.conf.new ${PN} |
259 |
+ systemd_dounit "${FILESDIR}"/postgrey.service |
260 |
} |
261 |
|
262 |
diff --git a/mail-filter/postgrey/postgrey-1.35.ebuild b/mail-filter/postgrey/postgrey-1.35.ebuild |
263 |
deleted file mode 100644 |
264 |
index 938b52e..0000000 |
265 |
--- a/mail-filter/postgrey/postgrey-1.35.ebuild |
266 |
+++ /dev/null |
267 |
@@ -1,70 +0,0 @@ |
268 |
-# Copyright 1999-2014 Gentoo Foundation |
269 |
-# Distributed under the terms of the GNU General Public License v2 |
270 |
-# $Id$ |
271 |
- |
272 |
-EAPI=5 |
273 |
- |
274 |
-inherit eutils user |
275 |
- |
276 |
-DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting" |
277 |
-HOMEPAGE="http://postgrey.schweikert.ch/" |
278 |
-SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz |
279 |
-http://postgrey.schweikert.ch/pub/old/${P}.tar.gz" |
280 |
- |
281 |
-LICENSE="GPL-2" |
282 |
-SLOT="0" |
283 |
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" |
284 |
-IUSE="targrey" |
285 |
- |
286 |
-DEPEND="" |
287 |
-RDEPEND=">=dev-lang/perl-5.6.0 |
288 |
-dev-perl/net-server |
289 |
-dev-perl/IO-Multiplex |
290 |
-dev-perl/BerkeleyDB |
291 |
-dev-perl/Net-DNS |
292 |
-dev-perl/Parse-Syslog |
293 |
-dev-perl/Net-RBLClient |
294 |
-virtual/perl-Digest-SHA |
295 |
->=sys-libs/db-4.1" |
296 |
- |
297 |
-pkg_setup() { |
298 |
-enewgroup ${PN} |
299 |
-enewuser ${PN} -1 -1 /dev/null ${PN} |
300 |
-} |
301 |
- |
302 |
-src_prepare() { |
303 |
-if use targrey ; then |
304 |
-epatch "${FILESDIR}"/targrey-0.31-postgrey-1.34.patch |
305 |
-fi |
306 |
-sed -i 's@#!/usr/bin/perl -T -w@#!/usr/bin/perl -w@' postgrey || die "sed failed" |
307 |
-} |
308 |
- |
309 |
-src_install() { |
310 |
-# postgrey data/DB in /var |
311 |
-diropts -m0770 -o ${PN} -g ${PN} |
312 |
-dodir /var/spool/postfix/${PN} |
313 |
-keepdir /var/spool/postfix/${PN} |
314 |
-fowners postgrey:postgrey /var/spool/postfix/${PN} |
315 |
-fperms 0770 /var/spool/postfix/${PN} |
316 |
- |
317 |
-# postgrey binary |
318 |
-dosbin ${PN} |
319 |
-dosbin contrib/postgreyreport |
320 |
- |
321 |
-# policy-test script |
322 |
-dosbin policy-test |
323 |
- |
324 |
-# postgrey data in /etc/postfix |
325 |
-insinto /etc/postfix |
326 |
-insopts -o root -g ${PN} -m 0640 |
327 |
-doins postgrey_whitelist_clients postgrey_whitelist_recipients |
328 |
- |
329 |
-# documentation |
330 |
-dodoc Changes README README.exim |
331 |
- |
332 |
-# init.d + conf.d files |
333 |
-insopts -o root -g root -m 755 |
334 |
-newinitd "${FILESDIR}"/${PN}.rc.new ${PN} |
335 |
-insopts -o root -g root -m 640 |
336 |
-newconfd "${FILESDIR}"/${PN}.conf.new ${PN} |
337 |
-} |