Fix init.d script by Dennis Lichtenthäler (bug #452370). Inherit user.

Package-Manager: portage-2.2.0_alpha152/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 22 insertions, 87 deletions

diff --git a/net-mail/perdition/ChangeLog b/net-mail/perdition/ChangeLog
index 1e6071eefd3f..c3b2d4b233fc 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.14 2011/06/15 15:24:06 eras Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/perdition/ChangeLog,v 1.15 2013/01/15 16:34:23 jer Exp $
+
+  15 Jan 2013; Jeroen Roovers <jer@gentoo.org> -perdition-1.17.1.ebuild,
+  perdition-1.18.ebuild, files/perdition.initd:
+  Fix init.d script by Dennis Lichtenthäler (bug #452370). Inherit user.
 
   15 Jun 2011; Eray Aslan <eras@gentoo.org> perdition-1.18.ebuild,
   files/perdition.initd:
diff --git a/net-mail/perdition/Manifest b/net-mail/perdition/Manifest
index 0e8af952ddce..7a4e4bdbb875 100644
--- a/net-mail/perdition/Manifest
+++ b/net-mail/perdition/Manifest
@@ -1,28 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX perdition.confd 1734 RMD160 611cfa5196c5af6188dda91feb2e100d88a81732 SHA1 378892bb91ee63798d003d356a6e28afe0a3d014 SHA256 9f8c4b0fd0d49dc0903a71c2c42e34b7108f6017307a22d6da4afa2f2b0c86ee
-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 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
+AUX perdition.confd 1734 SHA256 9f8c4b0fd0d49dc0903a71c2c42e34b7108f6017307a22d6da4afa2f2b0c86ee SHA512 49c765a24d828be9a0e8032778a5430028e41de18fa83bbe10806f454283e91fdda7f7cb62cfab4778501582597228806d3a86984cb9f2cb3254cf2d989a08ea WHIRLPOOL 000361a159413117a6c5e4bb62a165250584b3bac44e59ae8c5acc6014dcefad11e0d5f261ddd9cdac92174a30fa33855712c405f40a6fab7161fedeabb8e159
+AUX perdition.initd 2732 SHA256 33818e7f1d341943fd4b05c57516badba063ec9a3a4b6d207e570cf1c04e259d SHA512 f483f9b408bb0645dff1ab32257b9ece711ac60c781952a93651d2f0eee1ed2ea3c8bda06d255631b84a9d545f2c203770121ad931e7b956c6bfbd56b6ea8f22 WHIRLPOOL ca923f2274c6f8161f08756fd55890ab87996609ea867995822ef9b2bc81be27b23d43d5903eb0601086b6fd4ae538716af9b8a756ab3eb19094332c7f84d376
+DIST perdition-1.18.tar.gz 602933 SHA256 cad541ca1881de8eec74106851d10c2027588b96cf1f70e3cf395f2c24c4ecaa
+EBUILD perdition-1.18.ebuild 1611 SHA256 dcb044997f186b6fdb584dedc5b2985f3e82879f3c456ae3a18742eb42e0f420 SHA512 4797080f891b9dc37b2c4c12c014e31f001b523c9617529ad0a47244b126bc72d45b915058b36effb2f0a69764f30c986fb92e44d71fb5f83d828eb74dfba159 WHIRLPOOL f16dcc4c4f1136dadc43150d19a1ca101af8ed35b1738aee9eedac83fba0d13e7a11a2aaf8687c101749a4e47be861111691e6bc903bed623511103292b6612b
+MISC ChangeLog 2659 SHA256 e736c9e0b3095e1ae8ec8ab4107395728f48f45bcce05380096da1f266cbfbbc SHA512 eed5ef53801852eb20b3a00f9502d533970a845ccad922de0b06c6e167db9802c1cb7e5425fdb799257c403a7e1f00d3564eed106fab9f84dfbe43eeade3e652 WHIRLPOOL d4799f49eec9fb17f86881c840e9944e24e7ef9d402d2292733020cc9930fb7d62900b9a8c58852a56fbf77d3b2b754cb0131e56090ffd2c603e4af607dd22a9
+MISC metadata.xml 644 SHA256 a44bf144f474ac8ee4b0169437e227636197965bace9963e01a3070be8a4019f SHA512 4a49f66f6d2384a380b5742436e07e239a2054c66cb25dccc310ca2d3f6cf4f920f5cf188fb8821edaf50b8c8aeb532c01d7207233ddc9fad8c9d35907c086d1 WHIRLPOOL 3629be975d5f6292f2dac70511d3f529df4062fab21445a3101355fd0c7a114d47a378723d8999a0bc569c086929919fb2fe4baebec71de13f746be7639b9c26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iEYEAREIAAYFAlD1hRAACgkQVWmRsqeSphNBTwCfU/jrejxs8hMTkReyIApRmO1v
+xLAAn3NxLRfd2ma/T5ZU4WCx1jSXwJum
+=UJpu
 -----END PGP SIGNATURE-----
diff --git a/net-mail/perdition/files/perdition.initd b/net-mail/perdition/files/perdition.initd
index 397ed4775156..917cfad45268 100755
--- a/net-mail/perdition/files/perdition.initd
+++ b/net-mail/perdition/files/perdition.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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.3 2011/06/15 15:24:06 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/perdition/files/perdition.initd,v 1.4 2013/01/15 16:34:23 jer Exp $
 
 depend() {
 	need net
@@ -79,7 +79,7 @@ stop() {
 
 	if [ "${IMAP4S}" = "yes" ]; then
         	ebegin "Shutting down perdition services (IMAP4S)"
-		start-stop-daemon -o --quiet --stop --pidfile ${PIDDIR}/imaps.pid 
+		start-stop-daemon -o --quiet --stop --pidfile ${PIDDIR}/imap4s.pid 
 		eend $?
 	fi
 }
diff --git a/net-mail/perdition/perdition-1.17.1.ebuild b/net-mail/perdition/perdition-1.17.1.ebuild
deleted file mode 100644
index f17b5d78f4db..000000000000
--- a/net-mail/perdition/perdition-1.17.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/perdition/perdition-1.17.1.ebuild,v 1.4 2010/06/17 21:54:54 patrick Exp $
-
-inherit eutils
-
-DESCRIPTION="modular and fully featured POP3 and IMAP4 proxy"
-HOMEPAGE="http://www.vergenet.net/linux/perdition/"
-SRC_URI="http://www.vergenet.net/linux/${PN}/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls pam ssl mysql odbc postgres gdbm ldap"
-
-DEPEND="dev-scheme/guile
-	>=dev-libs/vanessa-logger-0.0.6
-	>=dev-libs/vanessa-adt-0.0.6
-	>=net-libs/vanessa-socket-0.0.7
-	ssl? ( dev-libs/openssl )
-	odbc? ( dev-db/unixODBC )
-	gdbm? ( sys-libs/gdbm )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-server )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	econf --disable-sendmail \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_enable ssl) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable postgres) \
-		$(use_enable gdbm) \
-		$(use_enable ldap) \
-		|| die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-
-	dodoc README AUTHORS TODO
-
-	newinitd "${FILESDIR}"/perdition.initd perdition
-	newconfd "${FILESDIR}"/perdition.confd perdition
-
-	keepdir /var/run/perdition
-}
-
-pkg_preinst() {
-	enewuser perdition
-	chown perdition "${D}"/var/run/perdition
-}
diff --git a/net-mail/perdition/perdition-1.18.ebuild b/net-mail/perdition/perdition-1.18.ebuild
index 29df3599224a..77866d56c194 100644
--- a/net-mail/perdition/perdition-1.18.ebuild
+++ b/net-mail/perdition/perdition-1.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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.2 2011/06/15 15:24:06 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/perdition/perdition-1.18.ebuild,v 1.3 2013/01/15 16:34:23 jer Exp $
 
 EAPI=4
-inherit eutils pam
+inherit eutils pam user
 
 DESCRIPTION="modular and fully featured POP3 and IMAP4 proxy"
 HOMEPAGE="http://www.vergenet.net/linux/perdition/"