mail-mta/nullmailer: Enable sysloging

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 76 insertions, 18 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index e2bb122f29b3..ce5acd091fa4 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/nullmailer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.80 2014/01/08 15:03:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.81 2014/01/08 15:08:13 jlec Exp $
+
+*nullmailer-1.13-r4 (08 Jan 2014)
+
+  08 Jan 2014; Justin Lecher <jlec@gentoo.org> -nullmailer-1.13-r3.ebuild,
+  +nullmailer-1.13-r4.ebuild, +files/init.d-nullmailer-r4:
+  Enable sysloging
 
 *nullmailer-1.13-r3 (08 Jan 2014)
 
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 167fa0167bcf..05290d973f12 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -2,28 +2,29 @@
 Hash: SHA512
 
 AUX init.d-nullmailer-r3 1076 SHA256 1f59a1e06c5c709f16343c581ffa318f4c8eb342b77f86af52af8d736f77b6bd SHA512 041d6269a270cd8aea1b1d5b9175d5de3e44386e87e6f14109416459f6b484caf4f85a200644c4e0ea5c431e6b58c6804e56c0f961ac23eecfd7ff7026761945 WHIRLPOOL b71cef10bfe9211d08f03c4fa480a8a5c2a33ff42c8889a273303af37b8e6b75a7bf29e0f90ddff4410675daf0cb4276efa1e3186b4c6006a22c1c3a0bbfe60b
+AUX init.d-nullmailer-r4 1094 SHA256 91d39a07d712f03be51e15682ae92ce4e260e6add9f3c0fe452db9121d2b5022 SHA512 86554e37fa06a3e58946f283324206638419a78a48e8b754a1546b49dd26c7c9c165a192d5d3b9ce0db423fe4a2e9fd98818503249417c9cac999d6de83620d0 WHIRLPOOL 29a130e1220926af4a9ce037662cf40d2bdd152220b7adf44c0b04bdc6ddac93800a298bc06e288fdc3944836dbd9252d6a43cad5304fa07895c9da6189aa21d
 AUX nullmailer.service 398 SHA256 a8083aa8c784fef00c6b0dab6733874edbbf1d01c2060bc512f83168eba8485a SHA512 09efea2dde679f5fda9afee376351c54a71742aff21457481ced5cffdcccd837e12c742c9f1cf65dfb63cbf73f2a7ddfa89d09dee1169a8a05daf47d0e5f73c9 WHIRLPOOL 2d6697dbf52f10ae3136828b018c7bd949e61e8d170001207aaa1d16f3ac60e3ec64d15e6ff73a32a40de1aaefa6dda4d55fa54e54f2735babe3241925310a19
 AUX remotes.sample-1.13 970 SHA256 56b9adc7762cfac88769ee6a87fa5057a42599a3d50a3cfd1c6d8d9327d02080 SHA512 8ff23a3f30e9f3b8bfca05f6e8bda44d8142b547c667d604e5e1f15b49342e0a098591578ef26c599a965d0b17e7237232e6713bb7b95b2af4e3bf6bde2604c6 WHIRLPOOL 39e87ec264d023c4d3852d1173bf9e87b8eb35fe3809c9ebfa3d2c9be81ad9a709fc1c873697be8ad80c01881566542cb8950a5e312ed9e06c65535c8cd4dac4
 DIST nullmailer-1.13.tar.gz 205431 SHA256 3f8861ebb1b46cea0a1caf1e6236e1e0d2a5a91def19551b7cad12eab676277d SHA512 96dcb3ddecde77a73e5ca1afa5167d35f965d04999f02cc2ef60b54ea7eb7a006e5cf5678fc34a54d4be4f9fd71bd0f784a8671aca40c70dbc307666c548e1d7 WHIRLPOOL b041f7cc33a257fad11c5f4c9bf74f8d849d9c45f0dc19be28268462b9d029c07e1d5802698e647a4208d5f66cac2177a1d12e49a03caac51e0244c3f9a0599c
 DIST nullmailer-patches-1.13.tar.xz 8384 SHA256 8685dfbf23e9dc15269b1a0d14f700c4ef990cf49d4e6e830c0217289e8f4733 SHA512 393531e39a92b0978bccbcdf123e05b2cdad1ec8e600825cc24177ba414c1f615995c0344291ebb664f42b384a160c0359fec5ba3308cc14cbc9ceb8577d799c WHIRLPOOL 84f523be7963ceb7fbafd3f5632571e7bc12085b1b4bce5bb5c63871fd6c7ed1367a49ddf5ed66acad7055e28856b23fb1dcb59e60158fed26447128edd0a4fa
 EBUILD nullmailer-1.13-r2.ebuild 4591 SHA256 9e0436548344929ca230a5fac83425f4faa16e0aff77e969d208f2254db10106 SHA512 c75584d2b01022cb89ea80654154598314b017cb3bd83c88c3b102a3b5be38f8ce6cf3ce518b8606626ac67dd75bf4238f27b5af23d3d1338c65212e0c952361 WHIRLPOOL dda295707aa653c8bb5e81b8d4df88a70e89b7a8cb7088aca6f23491203b4f3a83c51befb48ee7e3ed708eeeb1e2f15ff5aa80f8bfe150c9c2d2d35b86d52aa4
-EBUILD nullmailer-1.13-r3.ebuild 4782 SHA256 c4391a3149478d2349aea19a28534798a75eaa29b8e907a62e584a92a5b18ff3 SHA512 551c77af036e4d7bc056bbc305057b2df7dfb23657528c985e09c9320fbbae4df470d4c512499b5784c0d26010c54a3a54e606ef5faf1f1ff6c402f7bef03850 WHIRLPOOL c30f6f467f9f1e738c716c00744e5020d41db186cc9f3a0d372dfd7ac6ede910a637b80321b56e56a894f6dfa5fd35f9ebdf061b751a803420f6b5d849885b75
-MISC ChangeLog 14907 SHA256 55d1c7451b7bfcb1c421ec8f5cac33de0a48a67bc44c2ae65fb00290ace6171f SHA512 58aa54e5a81d2a5a04009e92cbb456affa6048e6dab0beb8604cfcea39d8819c089fcd66584756850630540059396ffa47305db0e0dbee326f598d4512d93f9d WHIRLPOOL fe1e2d49c1b805aabe0f9cead500e75c0c39e3c23f0334a282aea9c27cbc114a1680d85bf6757bcda7c312846176e6ca2311c952ef5d9e84a51457caddf6e5bc
+EBUILD nullmailer-1.13-r4.ebuild 4782 SHA256 4681b401a567f53636fbdeb0c8541cac5cb841b9abef03f224eed7944c75e225 SHA512 6b021008f904f823b65a98813ba258d69cb600b4fc15fbcd9e4182ce3c501ad9b5480aedff60cdc3c0c12590694c14990aa09b59fccf41e0183ad51bee0e309e WHIRLPOOL c75146e9dd0e7edd598d5ff1db42099fb23c466f4b1213bde73f742fc7156c81affa045d5fb9286360e8c90580147fb3d932670e15fc4dc3ca71df88c19c62af
+MISC ChangeLog 15096 SHA256 89408b8e78c1418a0d2b8474cc0d6029506946a71b8e19d38b811011a85cab25 SHA512 57f664a3ac121bea7c95970d1fa329b2df15268f24dc5c01a2368a466ff805c05ae57fb719ccb03221b1dd1e9122fac1c67330f4c8b9a76d8d46ee2ee9241d7b WHIRLPOOL ed3252f19fe71b83a4351b7c7a6fb25d8f8de968b2786a0bca846d7f6737cd9d78686d33dc692f8ef174fe7e4709b23d4656107138c70b3f7f1204610654a903
 MISC metadata.xml 363 SHA256 838fae6a4f4cabb0217b0d1ebbd63acf840e802b3852e7360a4b9ae12a10459e SHA512 18675ce1eba12e093f0d73ac35ca6e456d2d7c0b1f3eee41d9b5bb466391778e3aed877d06028e7fa28c121dfff20fd6729451e5c5706a5ebc33a4f3c10c6f85 WHIRLPOOL d8911b227b42c2f4e47d68cb72f65c1e3349df2e34659aa4a597522138e9f8b055913829e504e11492db81081fbeb51e4b62512aeffde65d105e1120fbd572a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSzWiqAAoJELnU8jG9FVir7jEP/iqVzJBTxrsldvKr8ZWOq4ET
-BmVLnG0FWvflrWo5vvfsZytALDc4OwFFPG640S8ySp8AG0eTYSdk7DlxmXCDiwKM
-cv5KTgoYP2QslkL+NTiNkFK8g6kwxbP79GbJJF9cPSmp1WMCyqQup5I/+SmXEs95
-7QhcKHX2+IC9lO4ueTZUPcBHqpK5nMXF9mcetU7NGJLwWfxQqLM1dVN1p9L8l+KM
-xz4TkKYeNTJDVizOFsjmFZpcJCWFQEq8szMMHMuHzYHdbSo5ng2P3MCCZhJrAclk
-mkBrpk7ohysceEuV5xEBF2Egz23U/N17UaJaNrWnQMpyF9skv/9Pc23O/A7vlkzQ
-Ki38TnzcrrkaJZN3h+S/bf+vVhqr/AnM6tgN9IYvfts1cnv0XPCEn//7cVP7xuNP
-dfEekcOWK80RLfVxxvWpMYJa4KyDBNxf4C2wWMxkgshMck7p0+Coig3prdQplJ8T
-Jl0eiSwHVy0ITcN2/JhbGrozJfQ9cpFPv6c6QdrjlVJukE+jtn/2erGTEzpSDvGV
-eP+a/rokfqrGWoaaGBm5VmVVkD3rlBOEAm8ghlveQoToKcJBaoYc17x8DxQem+DF
-+m/ca7edXkwK2l5ieKv9mE6MGk62QpVgX5lIaag9YQ8Mhp4rLnOIz6JFPrH4chx6
-X0accQznP25GHTnZa39W
-=68kx
+iQIcBAEBCgAGBQJSzWnfAAoJELnU8jG9FVirqo0P/jdKaCGS912kQKPuBW0m+zyF
+c8Cm5ZaeID1Hp12o7mCIEZ42V7CoKUm/jxJu3bHTiUtsyqZmYGUszRH7DSEKN2xG
+62f9cz6jLFkfRmUcBYEgeMKA0tz6DO3vYnBiWlfIHejXBWxsaL1dwl/hog42/HIG
+Pdi8Ziyqj9kQgihlqzHvIo9g6pQ+02hvaA7D6mFjNcUU2Rwxx9RZT0SFtgsiN6R1
+7/5S4vWNdblx3hC3D/8k85YaGR0KZiVsjc14M8VHNPtUQYje7sfdSx2n0f+ch8Nl
+mBSHluZ2t6sUrL/SopnBU0uLY7wNaDRpFw+u1L0fNVUbRF0SxfmI8jnpIRMH95mi
+tdl16swClXQevij3U1O6iClL/Yj6U9X5Rd746QSkUGI0zFys3Gu+n87pUn44RweT
+fctKqgeD12cLI0Zr2pBSp1O2YChhWGptBgwT01TIODKM6H3mWyMZP5OZLKmB2Zn+
+YLJ2KquFxzpyFt29JDORyF8K3JVU2OwEFZGhKGBShy4KEZ4o2F58mb469VBYf/FK
+XYghZ+n37C4aDfB95FZOPrqzVTbdUMQidpJWQnT94D4Cpi7d6S2nIoBkhAR3wfUj
+AX/anMyeBmnKLimRQs9EA8q57AGRKaF2YcJW075sC3wNua/vsnF6T8xPpPne7sqb
+rQTEHygcG/x4SFY7X+rY
+=7gBP
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/nullmailer/files/init.d-nullmailer-r4 b/mail-mta/nullmailer/files/init.d-nullmailer-r4
new file mode 100644
index 000000000000..4205a26f4bad
--- /dev/null
+++ b/mail-mta/nullmailer/files/init.d-nullmailer-r4
@@ -0,0 +1,51 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/files/init.d-nullmailer-r4,v 1.1 2014/01/08 15:08:13 jlec Exp $
+
+command="/usr/sbin/nullmailer-send"
+
+start_stop_daemon_args="--chdir /var/nullmailer --user nullmail:nullmail"
+
+required_dirs="/var/nullmailer"
+pidfile="/run/nullmailer.pid"
+command_background="true"
+command_args="-s"
+
+depend() {
+	use net logger
+}
+
+checkconfig() {
+	local error=0
+	local f=/etc/nullmailer/me
+	if [ ! -s ${f} ]; then
+		eerror "${f} does not exist"
+		error=1
+	fi
+	f=/etc/nullmailer/defaultdomain
+	if [ ! -s ${f} ]; then
+		eerror "${f} does not exist"
+		error=1
+	fi
+	if [ ${error} -eq 1 ]; then
+		einfo "You need to run 'emerge --config nullmailer'!"
+	fi
+	if [ -e /service/nullmailer ]; then
+		eerror "Nullmailer is already running under svscan!"
+		error=2
+	fi
+	if [ ${error} -ne 0 ]; then
+		return 1
+	else
+		return 0
+	fi
+}
+
+start_pre() {
+	checkconfig
+}
+
+stop_pre() {
+	checkconfig # to avoid init.d stopping svscan instance
+}
diff --git a/mail-mta/nullmailer/nullmailer-1.13-r3.ebuild b/mail-mta/nullmailer/nullmailer-1.13-r4.ebuild
index 41130af372a3..b182fcc5a8b1 100644
--- a/mail-mta/nullmailer/nullmailer-1.13-r3.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.13-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.13-r3.ebuild,v 1.1 2014/01/08 15:03:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.13-r4.ebuild,v 1.1 2014/01/08 15:08:13 jlec Exp $
 
 EAPI=5
 
@@ -119,7 +119,7 @@ src_install () {
 	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
 	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
 
-	newinitd "${FILESDIR}"/init.d-nullmailer-r3 nullmailer
+	newinitd "${FILESDIR}"/init.d-nullmailer-r4 nullmailer
 	systemd_dounit "${FILESDIR}"/${PN}.service
 }