Fix initial permissions of /var/run/atheme and remove bad prefix-support logic from init script. Reported by the_mgt/ich.

Package-Manager: portage-2.2.0_alpha41-r1/cvs/Linux x86_64

5 files changed, 66 insertions, 68 deletions

diff --git a/net-irc/atheme-services/ChangeLog b/net-irc/atheme-services/ChangeLog
index fbe7f7fdbdff..1f8e1af33fad 100644
--- a/net-irc/atheme-services/ChangeLog
+++ b/net-irc/atheme-services/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/atheme-services
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.7 2011/06/24 03:08:33 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.8 2011/07/20 02:24:17 binki Exp $
+
+*atheme-services-6.0.8-r1 (20 Jul 2011)
+
+  20 Jul 2011; Nathan Phillip Brink <binki@gentoo.org>
+  -atheme-services-6.0.8.ebuild, +atheme-services-6.0.8-r1.ebuild,
+  +files/atheme-services.initd, -files/atheme-services.initd.in:
+  Fix initial permissions of /var/run/atheme and remove bad prefix-support
+  logic from init script. Reported by the_mgt/ich.
 
   24 Jun 2011; Nathan Phillip Brink <binki@gentoo.org>
   atheme-services-6.0.8.ebuild:
diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
index 068efe3938af..73d508a57469 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 AUX atheme-services-6.0.8-configure-disable.patch 4067 RMD160 83b845addd7af78d10a4b8447e9ec3c88f7efa17 SHA1 a893c2fab189495b31525332a8c4c9ffdcbd3aaf SHA256 861b9b458e6e2122aca923425dec407a5d2a13fecde613544c5aafb2cb161595
-AUX atheme-services.initd.in 1226 RMD160 5f8c08d9852ebbfb45728746231e6e403d315863 SHA1 860fc6cc6d130eeffcdafb6ae6fff51bb6c14ccb SHA256 4199d305397133d34ad15eeaa19b94f6f6b971b33d23cbeeaa0dc5bdb57ca1a6
+AUX atheme-services.initd 921 RMD160 677a41e5500ae67f798bf57a47dd01ce5bae2d09 SHA1 66b1d5d14c1ad8eef0f9adf8bfde296fb71fdf10 SHA256 f42f7b42256920b88066797bd9d96d9a8a0c7f03c4cc970877f09be08b7d3626
 DIST atheme-services-6.0.8.tar.bz2 860407 RMD160 31c1ba46ee5ede98108b51970bde134b259f1b3b SHA1 d201a41592fe0137e00625d7d6ed99fd79a752a7 SHA256 7dffcf8e768ca442d1fcc2b0e3031c41e34f6b3d8ee47164f84f20cb30515c24
-EBUILD atheme-services-6.0.8.ebuild 2778 RMD160 d5ccfe4874b963741dcbe8dea50c6b97e7f5eee9 SHA1 7b948c6efaa9b2a566f811daf244af48abdaa9d4 SHA256 a4cf25e0384b03bf8cdce5fcab64e18fd84b8839d1eafdbd16fef5e9b4904b04
-MISC ChangeLog 1997 RMD160 e48c3faf3e774e04b4ab1f711b180b7f31a45a81 SHA1 8a30ace6354de5224e6057e0af5ae9b6d4b34a8c SHA256 42633a113817b926411facd846a3609a11601318c2f3b6e7e4976de49e3d2ae9
+EBUILD atheme-services-6.0.8-r1.ebuild 2703 RMD160 68b4fba28f71aadaab2211d78277c4037c22f5f1 SHA1 89e7124b7637ca7dcbb43e1305c160c17f05f04a SHA256 3aacc07a8e59d47a6dd10fae86a5dfccf17942a41dca148268b3a40a45069434
+MISC ChangeLog 2352 RMD160 9caf40f348e45f2c6f35a85faa4c634939f470db SHA1 5f31ff1a1e1aef31f4d4a1724e817f42e2fe51f3 SHA256 e65a5f071a0973de73c48a3fd00781c4f99663b49d442ce33f14df7418935151
 MISC metadata.xml 522 RMD160 62256e4afba65ef587fb4314adeeb178b57246c0 SHA1 6765fd4304513a1aca8ba55294f417e11f1a4c8d SHA256 0eb4b26200c6ae7b351c45b9744c0bedd49e2de925f09161af89e5aefb8a5dcf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOA//eAAoJEHQ6UuhrqBBQtFsQAJph7dwrYvGcVel5uD2xTn4I
-T2JhnOQjMWQvMLRDMldlxVHgYpFu4t4SuTT70Ate0DX6IsZO62npZUqpYajzcdiN
-Xo//LgmaJD5SVlq3x7H4+HVMEGdiiJJ2TSUAv2vDc59XwVQLZOcKexrSsMZN6pr3
-1mBqze76dT/dfE4bJ94IZ+ypZrZWBpsEEK3Hm29kitnbIdINMe3Krb3EtKUaL/OL
-QGHfyn00I8Sejj6oF0mzryrAOUSgLwLAXZIvu1zlWgPEpEFMfxHbXmjpeKpSKMjw
-rAr4mImODECN6mdKzyLFA2f+Etq2Do+RCQMimQLRxT6Rd3Zxn31g29rtBXjHGlvx
-bzfxpzAQA5BPUEg8boi2UpgghwySIRZzTwjuL02sR3H38zBQMV4kC8rrYC/7siRc
-aBCl/DNVzIU5wQ4KZzt9x+bjf4GxNef5lLZAmswjSt30GORYWgHBYCwcgI6uJTIY
-kBgoJKJH9C8BfDp8PtUwSfvGVOhU2B85Fge6j0iaznA69RzUztJSIGUXxl7XO1SV
-470gZP9aSZBw3cba1bHWXbY/jH/klwwyZCdEulatf/KDzgu7S6WM0YruVpIhiz+J
-GL0NmQ4hUQ/EisyqKgNdLmN4dpwyHzeDsEcZroF+7vTklvBz9SYQ1TXgp5OLEx3h
-bPdiohA+QC9JHDrfiuYi
-=5KrS
+iQIcBAEBCAAGBQJOJjy5AAoJEHQ6UuhrqBBQ/R4P/1yFLhTFclM+k1W7Bo2RW5DQ
+GJ7yZmOn6DHwO8lLpAUJTVH5oJrV7mEybebHBprcfKPvMnEh4coAdv0fWKr2S9TS
+j7nR9XzDxAHd0/+bsYZ3LFhMG7SZEbjTrplauIbkkQpGsALc9+6VgJMTjd2kAZPs
+qiVFPZ9L9lj418Qt3RbId4Z/J2ypgjVshRwhwuw2Ys8+bhdI8BVtHhM3Wo6FtMb5
+rJcIFjcxqvkXGI/mNpT80Lm8ZV2bRrxVT68UhdDxOwX982SNhHCaAWCtuE3LAgWN
+N2yNoTUheOQHdv3SUPMqMQbWN86KMEAYLSYWEy4c+4bwfDMI9/lh0clfD+c8zxCv
+2j3BTeNCRa9IFX0d0hLkXfWjCcF9wXBd/dO8IkQSXXryAq3WLA+DqW+YcN0S4a3z
+LzCiWyhOU538zRWDTShbxjLv5L0myYwx86wd9ojHPR0XI+b9+GDM3FH+OOGvP2tI
+cnf9zcSX4PhPdxv50onjQkLetBzw74ZhZsJmXvtSRgFOoVCKzMy69Jyf8qpDyB+l
+sG7p8fe1H4Xjee2IFFnK1Eos9OiT9YMp3X7lw1PHUYUyZq2ySxaEavIJ4XCJSex2
+DZwUnyumYxsBtKNDsBZ/TD13kXMV0vsy4BZdMUcwiqBEeKfFAaVeLKoAvhwimvz5
+em6zmGYqcrQL5PHzmo07
+=zLe4
 -----END PGP SIGNATURE-----
diff --git a/net-irc/atheme-services/atheme-services-6.0.8.ebuild b/net-irc/atheme-services/atheme-services-6.0.8-r1.ebuild
index 4376abf64cfd..b97a387a2738 100644
--- a/net-irc/atheme-services/atheme-services-6.0.8.ebuild
+++ b/net-irc/atheme-services/atheme-services-6.0.8-r1.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-irc/atheme-services/atheme-services-6.0.8.ebuild,v 1.4 2011/06/24 03:08:33 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-6.0.8-r1.ebuild,v 1.1 2011/07/20 02:24:17 binki Exp $
 
 EAPI=4
 
@@ -36,7 +36,7 @@ pkg_setup() {
 	fi
 
 	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	enewuser ${PN} -1 -1 /var/lib/atheme ${PN}
 }
 
 src_prepare() {
@@ -84,13 +84,11 @@ src_install() {
 
 	fowners -R 0:${PN} /etc/${PN}
 	keepdir /var/{lib,log}/atheme
-	fowners ${PN}:${PN} /var/{lib,log}/atheme
+	fowners ${PN}:${PN} /var/{lib,log,run}/atheme
 	fperms -R go-w,o-rx /etc/${PN}
 	fperms 750 /etc/${PN} /var/{lib,log,run}/atheme
 
-	cp "${FILESDIR}"/${PN}.initd.in "${T}"/${PN}.initd || die
-	eprefixify "${T}"/${PN}.initd
-	newinitd "${T}"/${PN}.initd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 
 	# contributed scripts and such:
 	insinto /usr/share/doc/${PF}/contrib
diff --git a/net-irc/atheme-services/files/atheme-services.initd b/net-irc/atheme-services/files/atheme-services.initd
new file mode 100644
index 000000000000..7d643533ef1a
--- /dev/null
+++ b/net-irc/atheme-services/files/atheme-services.initd
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/files/atheme-services.initd,v 1.1 2011/07/20 02:24:17 binki Exp $
+
+opts="reload"
+
+depend() {
+	need net
+	use ircd
+	provide irc-services
+}
+
+start() {
+	ATHEME_SERVICES_RUNDIR=/var/run/atheme
+	if ! [ -d "${ATHEME_SERVICES_RUNDIR}" ]; then
+	    ebegin "Creating \`${ATHEME_SERVICES_RUNDIR}'"
+	    install -o atheme-services -d "${ATHEME_SERVICES_RUNDIR}"
+	    eend $?
+	fi
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --chuid atheme-services --exec /usr/bin/atheme-services
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile /var/run/atheme/atheme.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --pidfile /var/run/atheme/atheme.pid
+	eend $?
+}
diff --git a/net-irc/atheme-services/files/atheme-services.initd.in b/net-irc/atheme-services/files/atheme-services.initd.in
deleted file mode 100644
index b4ab6dba1f04..000000000000
--- a/net-irc/atheme-services/files/atheme-services.initd.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/files/atheme-services.initd.in,v 1.1 2011/06/09 04:38:07 binki Exp $
-
-opts="reload"
-
-depend() {
-	need net
-	use ircd
-	provide irc-services
-}
-
-start() {
-	ATHEME_SERVICES_RUNDIR="@GENTOO_PORTAGE_EPREFIX@"/var/run/atheme
-	if ! [ -d "${ATHEME_SERVICES_RUNDIR}" ]; then
-	    ebegin "Creating \`${ATHEME_SERVICES_RUNDIR}'"
-
-	    ATHEME_INSTALL_O="-o atheme-services"
-	    [ "@GENTOO_PORTAGE_EPREFIX@" ] && ATHEME_INSTALL_O=
-
-	    install ${ATHEME_INSTALL_O} -d "${ATHEME_SERVICES_RUNDIR}"
-	    eend $?
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-
-	ATHEME_SSD_CHUID="--chuid atheme-services"
-	[ "@GENTOO_PORTAGE_EPREFIX@" ] && ATHEME_SSD_CHUID=
-
-	start-stop-daemon --start ${ATHEME_SSD_CHUID} --exec "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/atheme-services
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile "@GENTOO_PORTAGE_EPREFIX@"/var/run/atheme/atheme.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --pidfile "@GENTOO_PORTAGE_EPREFIX@"/var/run/atheme/atheme.pid
-	eend $?
-}