Fixing init script to ensure /run directory exists, fixing #448464

Package-Manager: portage-2.2.0_alpha163/cvs/Linux i686
Manifest-Sign-Key: 0x15AE484C

4 files changed, 33 insertions, 16 deletions

diff --git a/net-irc/anope/ChangeLog b/net-irc/anope/ChangeLog
index 9a598e86bd7e..b72ae54c8db2 100644
--- a/net-irc/anope/ChangeLog
+++ b/net-irc/anope/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/anope
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/anope/ChangeLog,v 1.21 2012/07/01 21:07:35 binki Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/anope/ChangeLog,v 1.22 2013/02/18 08:25:51 gurligebis Exp $
+
+*anope-1.8.7-r1 (18 Feb 2013)
+
+  18 Feb 2013; <gurligebis@gentoo.org> -anope-1.8.7.ebuild,
+  +anope-1.8.7-r1.ebuild, files/anope-init.d:
+  Fixing init script to ensure /run directory exists, fixing #448464
 
   01 Jul 2012; Nathan Phillip Brink <binki@gentoo.org> anope-1.8.7.ebuild:
   Ensure that /var/lib/anope/backups directory exists so that database backups
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index b7962fa446b6..1e821ad48d67 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX anope-1.8.7-ldflags-fix.patch 1715 SHA256 49c20cf2dc85d1a9b86b0876f27f5da37a26b2fbb2bd3666155d529d7129db6c SHA512 f92b8ff3d6c7d4cd9a56aa4cdcf98b9c1da93aa8a6a00e2e0a09e7a4facf937878b7abda32b698dbb19781863263e2eb21fbc8b5adfd4619898dacf34920fe23 WHIRLPOOL 1a0c0ec67ca7d722ec504d1874a366bff88675d381268e3349c1ec9a57f50de60723673ce1458809cb8d4a77daaed7858020ba4265ef25d7af844c50fd02a4a5
 AUX anope-1.8.7-libdir-gentoo.patch 2584 SHA256 e639064792827b2797f1ca21865146c880720d844f1aa3d4725484c5e2c7772c SHA512 50d80ac51e781b97b7db0ba9e8dbf20de1471c29d603ae14ba907d562de977be3242226d4e71edbec6a497856a87f41eb05bcc19e7a2854ff4dc37365c3a0089 WHIRLPOOL 398cea99a4d89949847e9ce353afd861952f73f42d7529ba843d3890871d4c5b493b0cc3cb60924bd07f946b396e4805baa0ac2d5e50a68db6054ae607041fab
 AUX anope-1.8.7-mariadb.patch 3452 SHA256 770a15ae09e1a56aa8f3775646e945822761136dda208b1772ebf0d6a2d5e246 SHA512 4f0172a0113601be01117585d75ecc59c5fc36a9dc21b49faba525b0af5145d1180b0bddfd3ca8685b4ed7ef4eaeb14921a6940979c0d8a3c66a57e0a77c388b WHIRLPOOL 4e44aae225c47b7b39c0e416b57d831bbcaa1371756ec5d7f47f1fdb945dc43958f3a35307333598992b064f2fe09c47871a1c2e71ed1918094a54e8cf1b4139
 AUX anope-conf.d 320 SHA256 e78db9ffa9a79141de513c2b0b0bb08e8e80c63fc957e9cd9377577a389ca63e SHA512 51c3ca3649e35038fd4c797888c1168fd4c7e9e92f18e660af547a7588b041c1170b779e45cbac106f6d26d1ea235bfc786773aa54c939a2d321d1a369888114 WHIRLPOOL 62a214fc2243e36cc6cd59c6123d7c2d39b7cca5ffbc46c5945a3e121dda50c45908c7032121c93d04ac0bea7daec1ce404230ba195483bd7868203c8b25780e
-AUX anope-init.d 814 SHA256 4dca225c99e6237a00fe0a36163e7d456f43f0c32174cee09a076194a793b953 SHA512 0b01678e778f4828daa0b8139438ca2c53d2a78f5bd8cbc9d88d30e75c40b51b2b7d5ecb6954408b6b4a4d8dff186b545ca5cde91f53851bc2048c860f212f1b WHIRLPOOL 4e3f1bf6f4a71a47e0737ae19464282101257c4b4f5575d29ad2a35886b75205a30c909f75796b5853a5e347503584309b81f250d336acea75123e2066515cc3
+AUX anope-init.d 810 SHA256 5f9092b2c86633ea9ba77b968b0b23504eaac37168460745c9efed6660e61377 SHA512 ebbb0036f699b8c6e22fbf81dc0e38776a5651fce582b6e5099ac7635de28f40e7a1cd601dfae7f0fecf59b997080553da0d202dedb9c37ee1430dd2f5671e86 WHIRLPOOL 986c7295cb12a75ffba2980e4e4319ba93be39d2b05642c842a93f3fdc2ca42f0833a12ccf043fe7951f185b72f35be154be3796048204f42ebeb3d0dccf8c34
 AUX pid-patch.diff 450 SHA256 cd3f266cd236e6a5bb7d15b502631e8992289455f7e308d94ac14e3b13314dc5 SHA512 eae4208a3014a6e4d787b19395606f96d9d9d382dc25985e63a40f0e488b6596112acffbe554ac7226daa8b87d090be6fd11d0bf22f1edd41e5dcd21f62df6ed WHIRLPOOL ed3e030e1f3347114914570a2b361ed83f70714683ea8d02ab2325fc035793eb63f32aa2b8d334f89f2a076b321aff42d7094b7ece9c2e495a98e096ae347268
 DIST anope-1.8.7.tar.gz 1586164 SHA256 804516153936b1147a79960a283229191d29e1d9162c3ec70d86d099ee04447b SHA512 3fb67f73b8f4dbdfbb9b4ac41a20e3b5c46d54cf5abb303f4a25d3a5863ef860ba5bdffc67439e5f1435675f80f86b2c283932c1a05edde2ae49612947fbd074 WHIRLPOOL 347231e1a9be8bfd9f09a895af5ede179a24c1ac56cefbfb0fb343ea060497f2985e9cc2fd368857e58ea919751fde1c10bef1f02333f989928c7504314c0f13
-EBUILD anope-1.8.7.ebuild 3536 SHA256 4c3af8496a0b663f56f19160ccf22221e4d3c3f47d1bf65e6ddbba756c6cf5d3 SHA512 5dbfe0233db535a03ee33e5c3b8ef344acaeb365ae51e6fce86b1f83841a51138d73d8980e0409cee7eb0a04ad50dc19bb0828f5d19154cca465bc471199f308 WHIRLPOOL 7c6f38728effaed40bbdfe90490fbd461fd6a78a1ce42d60fbf70810c4741577342a1183bd4bf6a441b4c5359c6a67bb07228e53f330c8ea8efa7abec7017169
-MISC ChangeLog 3578 SHA256 ea7bd4095fbbe4894fc03b2a8b8295ab00d4a40479ef519ed9889c42b03d86f9 SHA512 188084722fec615ba4b0d194278b48fdf0f218de7afb655527457773a50f41931337705eeb3612ddf8c2a32c38e7c685bbb8c38e1336860f26744c68b6f57d0d WHIRLPOOL 41c7f560f8ecdc1470c8e3cd050e2fb99340d90e9e9d19eb7eb3ba3e0213a11594e56d117090c7b8de3cdccbb5b7391aab1b15d2314a271d8c96ada512e37c77
+EBUILD anope-1.8.7-r1.ebuild 3549 SHA256 e21041824cf0f41cf9a4a6af27aa7e27a5a4e87edb0b60690a15e4bb12e1074a SHA512 0c5799fdab217622557985dab1c4f287f8825fb0e03c0abe233bc4360c6df3f6e0d698a570df1e779fa4f096397e3935ee9cc43ca47bc03433bf61b307513259 WHIRLPOOL 51704f72a1a8babe50696eea8d34565901fa39ad6f54b1b038a81a10a27e808c329bf52313950335cb57acbc604f45ea28b8fd902b2ae8eb3d098e4585e4a4f9
+MISC ChangeLog 3790 SHA256 9be0e0085c12178c6aeb0d5e93037c67813ecc915d7bf1c0100d0573d203cbf7 SHA512 5e50d10ff9cd19cb8e1a8baacacb5e8d675598190b71b513540571476ee0d88e8d4a9125fee3137a3e190fd9b5c5c06b0513a6a9b4540d3534d33cde5abc88c6 WHIRLPOOL 1fbe8ade8dad0ba8e2cd27900a923d56e2405859df1eef3f28583278d682e18b4b2ae6bd50d11855d163ebf35dd5434138a871e4871b9848b83c775507a1a03f
 MISC metadata.xml 322 SHA256 4240b9effe8d7796234c47e4f4af9ef4250bcfcafa9ec09e4b6a4a503de10b71 SHA512 911e1bee9f423797c7eebd37eb54ae19717f3a3f687b2f2e4bdff64a5206f74a78142b74ca8ad26480fa077ef77c12e89bad4d592c0c5bfbdf37033bcbf50374 WHIRLPOOL 2a89ca39f5d07bd0d4b2cc41c8eda302acf30096e3aff70739b2b501801eac213ba00c8aaa59b54025ae15a15af9d3efa511eb0494851c955d88b116589c7d94
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEh5YYACgkQsR7PQhRXYEnoMACffTqo0+f9P1MAOZmOZp5qUlJE
+c50AmgL7HBuXohVlcMPUYawkPREjyL9l
+=AtmJ
+-----END PGP SIGNATURE-----
diff --git a/net-irc/anope/anope-1.8.7.ebuild b/net-irc/anope/anope-1.8.7-r1.ebuild
index a1829fcf0191..6ca2cfc24159 100644
--- a/net-irc/anope/anope-1.8.7.ebuild
+++ b/net-irc/anope/anope-1.8.7-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/anope/anope-1.8.7.ebuild,v 1.3 2012/07/01 21:07:35 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/anope/anope-1.8.7-r1.ebuild,v 1.1 2013/02/18 08:25:51 gurligebis Exp $
 
 EAPI=4
 
-inherit autotools eutils multilib versionator
+inherit autotools eutils multilib versionator user
 
 DESCRIPTION="Anope IRC Services"
 HOMEPAGE="http://www.anope.org"
diff --git a/net-irc/anope/files/anope-init.d b/net-irc/anope/files/anope-init.d
index a7a529626dd5..66e6ecf11a8c 100644
--- a/net-irc/anope/files/anope-init.d
+++ b/net-irc/anope/files/anope-init.d
@@ -1,33 +1,34 @@
 #!/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-irc/anope/files/anope-init.d,v 1.1 2011/12/28 20:25:48 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/anope/files/anope-init.d,v 1.2 2013/02/18 08:25:51 gurligebis Exp $
+
+PIDFILE=/run/anope/services.pid
 
 extra_started_commands="reload"
 
-depend() {
-	use net mysql ircd
-	provide irc-services
+start_pre() {
+	checkpath -o ${ANOPE_USER} -d "$(dirname $PIDFILE)"
 }
 
 start() {
 	ebegin "Starting Anope IRC Services"
 	start-stop-daemon --start --exec /usr/bin/services \
-		--user ${ANOPE_USER} --pidfile /var/run/anope/services.pid \
+		--user ${ANOPE_USER} --pidfile ${PIDFILE} \
 		-- ${ANOPE_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Anope IRC Services"
-	start-stop-daemon --stop --pidfile /var/run/anope/services.pid
+	start-stop-daemon --stop --pidfile ${PIDFILE}
 	eend $?
 }
 
 reload() {
 	ebegin "Reloading Anope IRC Services"
         start-stop-daemon --signal USR2 --exec /usr/bin/services \
-		--pidfile /var/run/anope/services.pid
+		--pidfile ${PIDFILE}
 	eend $?
 }