1 |
commit: 250d3d079190d5f98e29f7c68e64ab340587a933 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 24 16:33:37 2016 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 24 16:35:40 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=250d3d07 |
7 |
|
8 |
mail-mta/nullmailer: Version Bump |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=573090 |
11 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=562912 |
12 |
|
13 |
Package-Manager: portage-2.2.27 |
14 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
15 |
|
16 |
mail-mta/nullmailer/Manifest | 1 + |
17 |
mail-mta/nullmailer/asd | 123 ++++++++++++++++++++++ |
18 |
mail-mta/nullmailer/files/init.d-nullmailer-r5 | 52 ++++++++++ |
19 |
mail-mta/nullmailer/files/remotes.sample-2.0 | 30 ++++++ |
20 |
mail-mta/nullmailer/metadata.xml | 2 +- |
21 |
mail-mta/nullmailer/nullmailer-2.0.ebuild | 136 +++++++++++++++++++++++++ |
22 |
6 files changed, 343 insertions(+), 1 deletion(-) |
23 |
|
24 |
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest |
25 |
index dab1022..9f254a4 100644 |
26 |
--- a/mail-mta/nullmailer/Manifest |
27 |
+++ b/mail-mta/nullmailer/Manifest |
28 |
@@ -1,2 +1,3 @@ |
29 |
DIST nullmailer-1.13.tar.gz 205431 SHA256 3f8861ebb1b46cea0a1caf1e6236e1e0d2a5a91def19551b7cad12eab676277d SHA512 96dcb3ddecde77a73e5ca1afa5167d35f965d04999f02cc2ef60b54ea7eb7a006e5cf5678fc34a54d4be4f9fd71bd0f784a8671aca40c70dbc307666c548e1d7 WHIRLPOOL b041f7cc33a257fad11c5f4c9bf74f8d849d9c45f0dc19be28268462b9d029c07e1d5802698e647a4208d5f66cac2177a1d12e49a03caac51e0244c3f9a0599c |
30 |
+DIST nullmailer-2.0.tar.gz 249538 SHA256 d70f4cc4a0c1ff2630d9e2c54c967700d641d06035dd8998a43e616469834f84 SHA512 2a7c914c5effcf796f987256ac68836f0ba875cc7f2da1aeb8f23767e15a556da168b8da5cc52d9f800986883bbdbcd49a9610ae220f463164a906c1d82fbce6 WHIRLPOOL c6ed5dcf5669beff4d440b1862a8155bc414c202382de0d998e76c0d241b7974c255bbfebcee2853ca7997cd239c44b5d472d15a913aa7cd0646bdda9f1797c9 |
31 |
DIST nullmailer-patches-1.13.tar.xz 8384 SHA256 8685dfbf23e9dc15269b1a0d14f700c4ef990cf49d4e6e830c0217289e8f4733 SHA512 393531e39a92b0978bccbcdf123e05b2cdad1ec8e600825cc24177ba414c1f615995c0344291ebb664f42b384a160c0359fec5ba3308cc14cbc9ceb8577d799c WHIRLPOOL 84f523be7963ceb7fbafd3f5632571e7bc12085b1b4bce5bb5c63871fd6c7ed1367a49ddf5ed66acad7055e28856b23fb1dcb59e60158fed26447128edd0a4fa |
32 |
|
33 |
diff --git a/mail-mta/nullmailer/asd b/mail-mta/nullmailer/asd |
34 |
new file mode 100644 |
35 |
index 0000000..c461dea |
36 |
--- /dev/null |
37 |
+++ b/mail-mta/nullmailer/asd |
38 |
@@ -0,0 +1,123 @@ |
39 |
+# Copyright 1999-2015 Gentoo Foundation |
40 |
+# Distributed under the terms of the GNU General Public License v2 |
41 |
+# $Id$ |
42 |
+ |
43 |
+EAPI=5 |
44 |
+ |
45 |
+inherit autotools eutils flag-o-matic multilib systemd user |
46 |
+ |
47 |
+DESCRIPTION="Simple relay-only local mail transport agent" |
48 |
+HOMEPAGE="http://untroubled.org/nullmailer/" |
49 |
+SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz" |
50 |
+ |
51 |
+SLOT="0" |
52 |
+LICENSE="GPL-2" |
53 |
+KEYWORDS="amd64 ppc x86" |
54 |
+IUSE="ssl" |
55 |
+ |
56 |
+DEPEND=" |
57 |
+ sys-apps/groff |
58 |
+ ssl? ( net-libs/gnutls )" |
59 |
+RDEPEND=" |
60 |
+ virtual/logger |
61 |
+ virtual/shadow |
62 |
+ ssl? ( net-libs/gnutls ) |
63 |
+ !mail-mta/courier |
64 |
+ !mail-mta/esmtp |
65 |
+ !mail-mta/exim |
66 |
+ !mail-mta/mini-qmail |
67 |
+ !mail-mta/msmtp |
68 |
+ !mail-mta/netqmail |
69 |
+ !mail-mta/postfix |
70 |
+ !mail-mta/qmail-ldap |
71 |
+ !mail-mta/sendmail |
72 |
+ !mail-mta/opensmtpd |
73 |
+ !mail-mta/ssmtp" |
74 |
+ |
75 |
+pkg_setup() { |
76 |
+ enewgroup nullmail 88 |
77 |
+ enewuser nullmail 88 -1 /var/spool/nullmailer nullmail |
78 |
+} |
79 |
+ |
80 |
+src_prepare() { |
81 |
+ sed -e "s#/usr/local/etc#/etc#" -e "s#/usr/local/libexec#/usr/libexec#" -i doc/nullmailer-send.8 |
82 |
+} |
83 |
+ |
84 |
+src_configure() { |
85 |
+ econf \ |
86 |
+ --localstatedir=/var \ |
87 |
+ $(use_enable ssl tls) |
88 |
+} |
89 |
+ |
90 |
+src_install () { |
91 |
+ emake DESTDIR="${D}" install |
92 |
+ |
93 |
+ dodoc AUTHORS BUGS HOWTO INSTALL ChangeLog NEWS README TODO doc/DIAGRAM |
94 |
+ |
95 |
+ # A small bit of sample config |
96 |
+ insinto /etc/nullmailer |
97 |
+ newins "${FILESDIR}"/remotes.sample-1.13 remotes |
98 |
+ |
99 |
+ # This contains passwords, so should be secure |
100 |
+ fperms 0640 /etc/nullmailer/remotes |
101 |
+ fowners root:nullmail /etc/nullmailer/remotes |
102 |
+ |
103 |
+ # daemontools stuff |
104 |
+ dodir /var/spool/nullmailer/service{,/log} |
105 |
+ |
106 |
+ insinto /var/spool/nullmailer/service |
107 |
+ newins scripts/nullmailer.run run |
108 |
+ fperms 700 /var/spool/nullmailer/service/run |
109 |
+ |
110 |
+ insinto /var/spool/nullmailer/service/log |
111 |
+ newins scripts/nullmailer-log.run run |
112 |
+ fperms 700 /var/spool/nullmailer/service/log/run |
113 |
+ |
114 |
+ # usability |
115 |
+ dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail |
116 |
+ |
117 |
+ # permissions stuff |
118 |
+ keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue} |
119 |
+ fperms 770 /var/log/nullmailer /var/spool/nullmailer/{tmp,queue} |
120 |
+ fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq |
121 |
+ fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq |
122 |
+ |
123 |
+ newinitd "${FILESDIR}"/init.d-nullmailer-r4 nullmailer |
124 |
+ systemd_dounit scripts/${PN}.service |
125 |
+} |
126 |
+ |
127 |
+pkg_postinst() { |
128 |
+ if [ ! -e "${ROOT}"/var/spool/nullmailer/trigger ]; then |
129 |
+ mkfifo "${ROOT}"/var/spool/nullmailer/trigger |
130 |
+ fi |
131 |
+ chown nullmail:nullmail \ |
132 |
+ "${ROOT}"/var/log/nullmailer "${ROOT}"/var/spool/nullmailer/{tmp,queue,trigger} || die |
133 |
+ chmod 770 "${ROOT}"/var/log/nullmailer "${ROOT}"/var/spool/nullmailer/{tmp,queue} || die |
134 |
+ chmod 660 "${ROOT}"/var/spool/nullmailer/trigger || die |
135 |
+ |
136 |
+ # This contains passwords, so should be secure |
137 |
+ chmod 0640 "${ROOT}"/etc/nullmailer/remotes || die |
138 |
+ chown root:nullmail "${ROOT}"/etc/nullmailer/remotes || die |
139 |
+ |
140 |
+ if [[ -z ${REPLACING_VERSIONS} ]]; then |
141 |
+ elog "To create an initial setup, please do:" |
142 |
+ elog "emerge --config =${CATEGORY}/${PF}" |
143 |
+ fi |
144 |
+} |
145 |
+ |
146 |
+pkg_postrm() { |
147 |
+ if [[ -e "${ROOT}"/var/spool/nullmailer/trigger ]]; then |
148 |
+ rm "${ROOT}"/var/spool/nullmailer/trigger || die |
149 |
+ fi |
150 |
+} |
151 |
+ |
152 |
+pkg_config() { |
153 |
+ if [ ! -s "${ROOT}"/etc/nullmailer/me ]; then |
154 |
+ einfo "Setting /etc/nullmailer/me" |
155 |
+ /bin/hostname --fqdn > "${ROOT}"/etc/nullmailer/me |
156 |
+ fi |
157 |
+ if [ ! -s "${ROOT}"/etc/nullmailer/defaultdomain ]; then |
158 |
+ einfo "Setting /etc/nullmailer/defaultdomain" |
159 |
+ /bin/hostname --domain > "${ROOT}"/etc/nullmailer/defaultdomain |
160 |
+ fi |
161 |
+} |
162 |
|
163 |
diff --git a/mail-mta/nullmailer/files/init.d-nullmailer-r5 b/mail-mta/nullmailer/files/init.d-nullmailer-r5 |
164 |
new file mode 100644 |
165 |
index 0000000..6d27d8b |
166 |
--- /dev/null |
167 |
+++ b/mail-mta/nullmailer/files/init.d-nullmailer-r5 |
168 |
@@ -0,0 +1,52 @@ |
169 |
+#!/sbin/runscript |
170 |
+# Copyright 1999-2016 Gentoo Foundation |
171 |
+# Distributed under the terms of the GNU General Public License, v2 or later |
172 |
+# $Id$ |
173 |
+ |
174 |
+command="/usr/sbin/nullmailer-send" |
175 |
+ |
176 |
+start_stop_daemon_args="--chdir /var/spool/nullmailer --user nullmail:nullmail" |
177 |
+start_stop_daemon_args+=" --stdout /var/log/nullmailer/nullmailer.log" |
178 |
+start_stop_daemon_args+=" --stderr /var/log/nullmailer/nullmailer.log" |
179 |
+ |
180 |
+required_dirs="/var/spool/nullmailer /var/log/nullmailer" |
181 |
+pidfile="/run/nullmailer.pid" |
182 |
+command_background="true" |
183 |
+ |
184 |
+depend() { |
185 |
+ use net logger |
186 |
+} |
187 |
+ |
188 |
+checkconfig() { |
189 |
+ local error=0 |
190 |
+ local f=/etc/nullmailer/me |
191 |
+ if [ ! -s ${f} ]; then |
192 |
+ eerror "${f} does not exist" |
193 |
+ error=1 |
194 |
+ fi |
195 |
+ f=/etc/nullmailer/defaultdomain |
196 |
+ if [ ! -s ${f} ]; then |
197 |
+ eerror "${f} does not exist" |
198 |
+ error=1 |
199 |
+ fi |
200 |
+ if [ ${error} -eq 1 ]; then |
201 |
+ einfo "You need to run 'emerge --config nullmailer'!" |
202 |
+ fi |
203 |
+ if [ -e /service/nullmailer ]; then |
204 |
+ eerror "Nullmailer is already running under svscan!" |
205 |
+ error=2 |
206 |
+ fi |
207 |
+ if [ ${error} -ne 0 ]; then |
208 |
+ return 1 |
209 |
+ else |
210 |
+ return 0 |
211 |
+ fi |
212 |
+} |
213 |
+ |
214 |
+start_pre() { |
215 |
+ checkconfig |
216 |
+} |
217 |
+ |
218 |
+stop_pre() { |
219 |
+ checkconfig # to avoid init.d stopping svscan instance |
220 |
+} |
221 |
|
222 |
diff --git a/mail-mta/nullmailer/files/remotes.sample-2.0 b/mail-mta/nullmailer/files/remotes.sample-2.0 |
223 |
new file mode 100644 |
224 |
index 0000000..59535d6 |
225 |
--- /dev/null |
226 |
+++ b/mail-mta/nullmailer/files/remotes.sample-2.0 |
227 |
@@ -0,0 +1,30 @@ |
228 |
+# Format is: HOST PROTOCOL [OPTIONS] |
229 |
+# HOST = IP or DNS |
230 |
+# PROTOCOL = smtp | qmtp |
231 |
+# OPTIONS = [port=NUMBER] [user] [pass] [starttls | ssl [insecure] ] |
232 |
+# |
233 |
+# Examples: |
234 |
+# A standard SMTP server: |
235 |
+# somesendmailserver.domain.com smtp |
236 |
+# |
237 |
+# A qmail server with QMQP setup: |
238 |
+# someqmailserver.domain.com qmqp |
239 |
+# |
240 |
+# A nonstandard SMTP server setup: |
241 |
+# someotherserver.domain.com smtp port=2525 |
242 |
+# |
243 |
+# SMTP server supporting AUTH PLAIN |
244 |
+# mailserver smtp user=<user> pass=<pass> |
245 |
+# |
246 |
+# SMTP server supporting AUTH LOGIN |
247 |
+# mailserver smtp user=<user> pass=<pass> auth-login |
248 |
+# |
249 |
+# SMTP server with smtps (legacy - use starttls instead) |
250 |
+# mailserver smtp user=<user> pass=<pass> port=465 ssl |
251 |
+# |
252 |
+# SMTP server on submission port with starttls |
253 |
+# mailserver smtp user=<user> pass=<pass> port=587 starttls |
254 |
+# |
255 |
+# SMTP server on submission port with starttls and self-signed certificate |
256 |
+# mailserver smtp user=<user> pass=<pass> port=587 starttls insecure |
257 |
+ |
258 |
|
259 |
diff --git a/mail-mta/nullmailer/metadata.xml b/mail-mta/nullmailer/metadata.xml |
260 |
index eddb655..fc963bb 100644 |
261 |
--- a/mail-mta/nullmailer/metadata.xml |
262 |
+++ b/mail-mta/nullmailer/metadata.xml |
263 |
@@ -5,7 +5,7 @@ |
264 |
<email>robbat2@g.o</email> |
265 |
<name>Robin H. Johnson</name> |
266 |
</maintainer> |
267 |
-<maintainer type="project"> |
268 |
+ <maintainer type="project"> |
269 |
<email>net-mail@g.o</email> |
270 |
<name>Net-Mail</name> |
271 |
</maintainer> |
272 |
|
273 |
diff --git a/mail-mta/nullmailer/nullmailer-2.0.ebuild b/mail-mta/nullmailer/nullmailer-2.0.ebuild |
274 |
new file mode 100644 |
275 |
index 0000000..1c3e959 |
276 |
--- /dev/null |
277 |
+++ b/mail-mta/nullmailer/nullmailer-2.0.ebuild |
278 |
@@ -0,0 +1,136 @@ |
279 |
+# Copyright 1999-2016 Gentoo Foundation |
280 |
+# Distributed under the terms of the GNU General Public License v2 |
281 |
+# $Id$ |
282 |
+ |
283 |
+EAPI=6 |
284 |
+ |
285 |
+inherit autotools eutils flag-o-matic multilib systemd user |
286 |
+ |
287 |
+DESCRIPTION="Simple relay-only local mail transport agent" |
288 |
+HOMEPAGE="http://untroubled.org/nullmailer/" |
289 |
+SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz" |
290 |
+ |
291 |
+SLOT="0" |
292 |
+LICENSE="GPL-2" |
293 |
+KEYWORDS="~amd64 ~ppc ~x86" |
294 |
+IUSE="ssl" |
295 |
+ |
296 |
+DEPEND=" |
297 |
+ sys-apps/groff |
298 |
+ ssl? ( net-libs/gnutls )" |
299 |
+RDEPEND=" |
300 |
+ virtual/logger |
301 |
+ virtual/shadow |
302 |
+ ssl? ( net-libs/gnutls ) |
303 |
+ !mail-mta/courier |
304 |
+ !mail-mta/esmtp |
305 |
+ !mail-mta/exim |
306 |
+ !mail-mta/mini-qmail |
307 |
+ !mail-mta/msmtp |
308 |
+ !mail-mta/netqmail |
309 |
+ !mail-mta/postfix |
310 |
+ !mail-mta/qmail-ldap |
311 |
+ !mail-mta/sendmail |
312 |
+ !mail-mta/opensmtpd |
313 |
+ !mail-mta/ssmtp" |
314 |
+ |
315 |
+pkg_setup() { |
316 |
+ enewgroup nullmail 88 |
317 |
+ enewuser nullmail 88 -1 /var/spool/nullmailer nullmail |
318 |
+} |
319 |
+ |
320 |
+src_prepare() { |
321 |
+ default |
322 |
+ sed -i.orig \ |
323 |
+ -e '/\$(localstatedir)\/trigger/d' \ |
324 |
+ "${S}"/Makefile.am || die "Sed failed" |
325 |
+ sed \ |
326 |
+ -e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \ |
327 |
+ -i configure.ac || die |
328 |
+ sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die |
329 |
+ sed \ |
330 |
+ -e "s#/usr/lib#\0exec#" -e "s#/usr/local#/usr#" \ |
331 |
+ -e 's:/usr/etc/:/etc/:g' \ |
332 |
+ -i doc/nullmailer-send.8 || die |
333 |
+ eautoreconf |
334 |
+} |
335 |
+ |
336 |
+src_configure() { |
337 |
+ econf \ |
338 |
+ --localstatedir=/var \ |
339 |
+ $(use_enable ssl tls) |
340 |
+} |
341 |
+ |
342 |
+src_install () { |
343 |
+ default |
344 |
+ |
345 |
+ # A small bit of sample config |
346 |
+ insinto /etc/nullmailer |
347 |
+ newins "${FILESDIR}"/remotes.sample-${PV} remotes |
348 |
+ |
349 |
+ # This contains passwords, so should be secure |
350 |
+ fperms 0640 /etc/nullmailer/remotes |
351 |
+ fowners root:nullmail /etc/nullmailer/remotes |
352 |
+ |
353 |
+ # daemontools stuff |
354 |
+ dodir /var/spool/nullmailer/service{,/log} |
355 |
+ |
356 |
+ insinto /var/spool/nullmailer/service |
357 |
+ newins scripts/nullmailer.run run |
358 |
+ fperms 700 /var/spool/nullmailer/service/run |
359 |
+ |
360 |
+ insinto /var/spool/nullmailer/service/log |
361 |
+ newins scripts/nullmailer-log.run run |
362 |
+ fperms 700 /var/spool/nullmailer/service/log/run |
363 |
+ |
364 |
+ # usability |
365 |
+ dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail |
366 |
+ |
367 |
+ # permissions stuff |
368 |
+ keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue} |
369 |
+ fperms 770 /var/log/nullmailer |
370 |
+ fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq |
371 |
+ fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq |
372 |
+ |
373 |
+ newinitd "${FILESDIR}"/init.d-nullmailer-r5 nullmailer |
374 |
+ systemd_dounit scripts/${PN}.service |
375 |
+} |
376 |
+ |
377 |
+pkg_postinst() { |
378 |
+ if [ ! -e "${ROOT}"/var/spool/nullmailer/trigger ]; then |
379 |
+ mkfifo "${ROOT}"/var/spool/nullmailer/trigger || die |
380 |
+ fi |
381 |
+ chown nullmail:nullmail \ |
382 |
+ "${ROOT}"/var/log/nullmailer \ |
383 |
+ "${ROOT}"/var/spool/nullmailer/{tmp,queue,trigger} || die |
384 |
+ chmod 770 \ |
385 |
+ "${ROOT}"/var/log/nullmailer \ |
386 |
+ "${ROOT}"/var/spool/nullmailer/{tmp,queue} || die |
387 |
+ chmod 660 "${ROOT}"/var/spool/nullmailer/trigger || die |
388 |
+ |
389 |
+ # This contains passwords, so should be secure |
390 |
+ chmod 0640 "${ROOT}"/etc/nullmailer/remotes || die |
391 |
+ chown root:nullmail "${ROOT}"/etc/nullmailer/remotes || die |
392 |
+ |
393 |
+ if [[ -z ${REPLACING_VERSIONS} ]]; then |
394 |
+ elog "To create an initial setup, please do:" |
395 |
+ elog "emerge --config =${CATEGORY}/${PF}" |
396 |
+ fi |
397 |
+} |
398 |
+ |
399 |
+pkg_postrm() { |
400 |
+ if [[ -e "${ROOT}"/var/spool/nullmailer/trigger ]]; then |
401 |
+ rm "${ROOT}"/var/spool/nullmailer/trigger || die |
402 |
+ fi |
403 |
+} |
404 |
+ |
405 |
+pkg_config() { |
406 |
+ if [ ! -s "${ROOT}"/etc/nullmailer/me ]; then |
407 |
+ einfo "Setting /etc/nullmailer/me" |
408 |
+ /bin/hostname --fqdn > "${ROOT}"/etc/nullmailer/me |
409 |
+ fi |
410 |
+ if [ ! -s "${ROOT}"/etc/nullmailer/defaultdomain ]; then |
411 |
+ einfo "Setting /etc/nullmailer/defaultdomain" |
412 |
+ /bin/hostname --domain > "${ROOT}"/etc/nullmailer/defaultdomain |
413 |
+ fi |
414 |
+} |