Fix pid dir creation in init script.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 34 insertions, 23 deletions

diff --git a/net-mail/perdition/ChangeLog b/net-mail/perdition/ChangeLog
index 7117d42490ae..1e6071eefd3f 100644
--- a/net-mail/perdition/ChangeLog
+++ b/net-mail/perdition/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/perdition
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/perdition/ChangeLog,v 1.13 2011/06/15 14:44:11 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/perdition/ChangeLog,v 1.14 2011/06/15 15:24:06 eras Exp $
+
+  15 Jun 2011; Eray Aslan <eras@gentoo.org> perdition-1.18.ebuild,
+  files/perdition.initd:
+  Fix pid dir creation in init script.
 
 *perdition-1.18 (15 Jun 2011)
 
diff --git a/net-mail/perdition/Manifest b/net-mail/perdition/Manifest
index b3bdcd26f58a..0e8af952ddce 100644
--- a/net-mail/perdition/Manifest
+++ b/net-mail/perdition/Manifest
@@ -2,27 +2,27 @@
 Hash: SHA256
 
 AUX perdition.confd 1734 RMD160 611cfa5196c5af6188dda91feb2e100d88a81732 SHA1 378892bb91ee63798d003d356a6e28afe0a3d014 SHA256 9f8c4b0fd0d49dc0903a71c2c42e34b7108f6017307a22d6da4afa2f2b0c86ee
-AUX perdition.initd 2443 RMD160 6ec6b9a1e2e3462b04075ebb8520de2df6ec0e20 SHA1 767578d068c5873d72c98184e7258834c6e503c0 SHA256 d732db7d7b71dbaa5cfd68f298d40b58ec74d823277ce8ea548c9d88099342c4
+AUX perdition.initd 2732 RMD160 d61d327d6f1ad1838735b5d03d92f403fcceddec SHA1 dd4652432b8858e1eb33461e04f64c53f8735a84 SHA256 66dd88a07518a84548680bd1b4ccd32caa6f038c1ff26b2115a584a9a1179b5b
 DIST perdition-1.17.1.tar.gz 638162 RMD160 2ea351c189b330308a022e97c9dcc8c9bd381377 SHA1 ddfde903f6a77f80355d789eedd54b4631106735 SHA256 e2abd57aa76b106591056ef835e26816c71c3b39dc55bc3aeba6dfeefac7af26
 DIST perdition-1.18.tar.gz 602933 RMD160 82065dcfb7f05d7bebcf98b72334f676d4fd5dad SHA1 60d76e2fca810fa1a12bebe369fc3e7d3452ebbb SHA256 cad541ca1881de8eec74106851d10c2027588b96cf1f70e3cf395f2c24c4ecaa
 EBUILD perdition-1.17.1.ebuild 1475 RMD160 b01f6c699c54b7a8d80fecaf666a1af76610a6df SHA1 39cc6597f4085843849d7a1882c8187c8a7c64c8 SHA256 19fbcc62136aff1db565383e188f3db23fa105aca64d405012100d2bdffee2f3
-EBUILD perdition-1.18.ebuild 1657 RMD160 be890ea0bc70783809dca3f44fbe6e780588b70d SHA1 9ed8f570238ac427f720cf00effb544c9a067c26 SHA256 6bee7f921bfc221118916e503d35deddae5fdf5e9e5aad9ccac57780bf97026c
-MISC ChangeLog 2332 RMD160 942f95a55bea7634a80a498998d6a23f81ef1694 SHA1 cf3d95df1cf5506382ca3ebd5eb81a57bad7e9c2 SHA256 d9c969cfcf1efc122fa9b08ba3d6bd5844392d7594542558fc468c9be343e9d0
+EBUILD perdition-1.18.ebuild 1607 RMD160 0e0c846b45db29fc6889f8eb52dfebae52ffcaf7 SHA1 d1c9ebb6ac33e6ee3f8a7ad723bd378d5532aae3 SHA256 7bb84ecc30a5829fe9727b33343641ef16ab9439c90b87582768afd29c224d02
+MISC ChangeLog 2464 RMD160 352734809f971fa04d2c184d8cc5287ffc6a4f7f SHA1 9fadcb3b7cd501873fdc9b6b503eb86e7efa88dd SHA256 3a2d406369f76f4b6b4ff53d9c52dc2fa2c1b60daa7b0a689f06a9f6dedb926e
 MISC metadata.xml 644 RMD160 a7afa6f7df8118df2a2b7f8bfb0ba71f9a8c2098 SHA1 ed2c42fb9ae72021d2ae961c3ac24a03450163da SHA256 a44bf144f474ac8ee4b0169437e227636197965bace9963e01a3070be8a4019f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN+MVJAAoJEHfx8XVYajsfOvoP/3sMp3Z5cOCTlFtNfbPyn0B6
-IxCz8HP1q5/yJ5K7brZsVXExCV9KsE+9D5kFiy0wG4Mg1hFcMH1/zdAScKlXPm6+
-1FtKPyQfqMoa2b1G0cDwvAfSBz1tlLNAE8wIydEV3z6SCrdx1AH/ReUuUHtY8Ymw
-ZpYnUSi8rBNDXbywrqBcOmXdHGRb1Dv4YBnccT4cvFxTRXXqSFBW+6trgsmfDEJ+
-V0Kokj08VSNTVvy17c0m7pdlnnq5/Tu/GZT7sjtGi86gXpzbGWUa2Mt0pVDI3T+G
-Hp2bBgEnGv2/orDRDbH21iVYd7+Sjyog6XIXx4/GHfoC+7zk1O2xyMXTE/CxzuDL
-PGgpHL7eYlPBEe/EDoH25gOD4MZayezi8ozTEjIQ+AN4BguaZxJzwMQjdUfTHk1V
-/6EWvUmXlSkeN70yUghg10vzKMey+V4wQnUJdrJjBKJIkpAKEOz1XMDOPVB9KN9B
-8rIHLtWsB5wRfOG9eRD2fc6EFCPPq+7xTWG8yhBWdAHXjqe/FLV+W19/gHyLZmqc
-PDYAkBcrJy2y1xSBV0W/GBGI4UdIekOb59d8iKk4OBPtVzOBMzAaKhKC/TaUZp/m
-QxxBMCTsfm7NkxrNa5JAVROhDYOrgdXV62T6AqycpHuWdKSTEqt8zG3vVcJEkui4
-B3iiD11y4D9vgND3FeUl
-=E0wb
+iQIcBAEBCAAGBQJN+M6kAAoJEHfx8XVYajsfRMsQAKo8mnVfutKEpFh8GE1FNMqQ
+6WqoeQj0WNEkEaXTpnCbxW0g7wibLYJktG3zEe7Zyqtqjtk0lEakw2rWELlf2aIR
+UcQ1HgyLqh0EBgisPoMIngKTncsj5925lf5rZ4MN8pLSjEMTJMUTilvNA/2CASqa
+t8OrAkK7o/fugPPpZUtWsEVwv0HMRdTqs4IA7MXc61OLNBUNEKU9d+KgtmgJ3VbT
+/LcoIMQDx4GUY29GzQ/Z/U3a8wBQ9XQWvFKGppxSBzfutRxncqYVDXI/+FLpp3cp
+34Z5APP2vXzuCrksDpoMBQ7uZdtySdP5QDk8M7gKVAErPFe8ZeFxurfMQwbtlNs7
+ZytMn8kKquuzxOfRtKtGRShwsuM1y6Rq0OVg9Sy7OaoCJ9iPmaqn8kKyi1LSxhsi
+meCzMNKpXmWTEWJK15xgYgYf1m+12pejuEkrgZCZgOhA6vttzmT1jHPf3aLHJ++E
+xBpqlZDEQMkmeGI7jUA6RjwgqLwqVmHwwI5+4h3AueBsoNZdw9TWIzgeLigOqZvO
+VChjuYjuLXXj8BMZanAtVgYe6IqD8TfAh4JSLnMExLqjcEJ+8pu2iKQZKhcOSAEd
+HufJtzXTOkPyfftgeDZw+YcgelzcUuoCgjElpvmIdv0Fj4CMXZRY/pfxGg5EfgPx
+gfAJ+Vgc2DtsLgRpNwY2
+=vqia
 -----END PGP SIGNATURE-----
diff --git a/net-mail/perdition/files/perdition.initd b/net-mail/perdition/files/perdition.initd
index cb7f680d5ae7..397ed4775156 100755
--- a/net-mail/perdition/files/perdition.initd
+++ b/net-mail/perdition/files/perdition.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/perdition/files/perdition.initd,v 1.2 2008/06/10 18:28:27 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/perdition/files/perdition.initd,v 1.3 2011/06/15 15:24:06 eras Exp $
 
 depend() {
 	need net
@@ -16,7 +16,16 @@ check_key() {
 	fi
 }
 
+checkconfig() {
+	# create PIDDIR (usually /var/run/perdition) if necessary
+	if [ ! -d  "${PIDDIR:-/var/run/perdition}" ] ; then
+		checkpath -q -d -o ${PERDITION_USER:-perdition}:${PERDITION_USER:-perdition} \
+		-m 0775 "${PIDDIR:-/var/run/perdition}" || return 1
+	fi
+}
+
 start() {
+	checkconfig || return 1
 	if [ "${POP3}" = "yes" ]; then
 		ebegin "Starting perdition services (POP3)"
 		start-stop-daemon --quiet --start --startas /usr/sbin/perdition.pop3 -p ${PIDDIR}/pop3.pid \
diff --git a/net-mail/perdition/perdition-1.18.ebuild b/net-mail/perdition/perdition-1.18.ebuild
index 534466efa2d1..29df3599224a 100644
--- a/net-mail/perdition/perdition-1.18.ebuild
+++ b/net-mail/perdition/perdition-1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/perdition/perdition-1.18.ebuild,v 1.1 2011/06/15 14:44:11 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/perdition/perdition-1.18.ebuild,v 1.2 2011/06/15 15:24:06 eras Exp $
 
 EAPI=4
 inherit eutils pam
@@ -32,6 +32,7 @@ RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	enewuser perdition
+	enewgroup perdition
 }
 
 src_configure() {
@@ -57,7 +58,4 @@ src_install() {
 
 	rm -f "${D}"/etc/pam.d/perdition
 	pamd_mimic sys-auth perdition auth account password session
-
-	keepdir /var/run/perdition
-	chown perdition "${D}"/var/run/perdition
 }