Fixed init script so openrc no longer sees uptimed as crashed (bug #448382)

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 33 insertions, 23 deletions

diff --git a/app-misc/uptimed/ChangeLog b/app-misc/uptimed/ChangeLog
index 1e9ebe4d94ad..1397befe6f98 100644
--- a/app-misc/uptimed/ChangeLog
+++ b/app-misc/uptimed/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/uptimed
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/ChangeLog,v 1.84 2012/12/19 16:32:17 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/ChangeLog,v 1.85 2012/12/24 09:27:05 polynomial-c Exp $
+
+*uptimed-0.3.17-r1 (24 Dec 2012)
+*uptimed-0.3.16-r6 (24 Dec 2012)
+
+  24 Dec 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -uptimed-0.3.16-r5.ebuild, +uptimed-0.3.16-r6.ebuild, -uptimed-0.3.17.ebuild,
+  +uptimed-0.3.17-r1.ebuild, files/uptimed.init:
+  Fixed init script so openrc no longer sees uptimed as crashed. Thanks to
+  Nikolaj Sjujskij for reporting this in bug #448382.
 
   19 Dec 2012; Lars Wendler <polynomial-c@gentoo.org> metadata.xml:
   Took over maintenance.
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index 58e960b8a341..4e802150975a 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX uptimed.init 553 SHA256 be79a08358add9786ace6ea248ce436d3d82e5631d745c3cea7da4b78aa3e879 SHA512 e8f442040f1eb882a827fff7d5b2199d5cce1c3da3421ef1984fbd7f83c3223af5978b6b6763c33b7a790ff84a80d44a96ea3d6819adcd03da3f717b73f21937 WHIRLPOOL 890d4cc4d129b249faa3f52b581b3ba1a6bdd03bf9c6cdba7318e609ee4681e6d894ed77151543d58ce258fcd4c56b94b326de2c48449804ad00899342b537ff
+AUX uptimed.init 602 SHA256 edc25d291faf24057cac36fafecdbc50ffdaf135bdf542a42f8f182efb2e67ef SHA512 e0ddb1135845f02c14d51c7063a5f4cd125446fa533ab3959256f1c798c02c9f1017be0c41a40c155ae1a0df16d0fdc58056b750124625435b9e1fca4fd99432 WHIRLPOOL d1116b9bc48175ebfabbfde8c0540ec4ae28f4e9150f0c3345b762b35146816a712bd6ed48c10a5c4aa2ca6bfa140bbf3faad78593562e3ec4f1c114a6cab3aa
 DIST uptimed-0.3.16.tar.bz2 197338 SHA256 f508ff5e98fab9c1bc0c342bf03cc6d1c01a24f2c7ab7ea8fcbfda477e16b12b SHA512 b6a51c0b30059767bd260b25cc43647c24f32bb9bcd5a3ff895ece800dbeb03d7de64cbdcec4f5571ea42ee72d38ea665733f59f74aecdc5e20a4e1c7b3a5123 WHIRLPOOL b7170beb21a742adcc0c25fb36636a3c4212727ba89b6585e4a0d066f2d323abcef6bbfa204c01afa82b92d6f958b354e9aeaad468c6384159e82cf5753396e2
 DIST uptimed-0.3.17.tar.bz2 269102 SHA256 524ce8984c0d0a780a32025ba3ffb980e5eec3d78e65cf68c91edec7fe833a06 SHA512 d462fa435b07bc335738dfccddd374aaa94fe2671a652afb8cb85d5e69e2148c296dec2a575ef074675e64e5453cb2d0807f80b191d9aeb5233168a617e842c5 WHIRLPOOL 38ce1ec75a0a3b82d448d85f256dce4b77265e59dead4557c8a039056bd2f230355cffb90a776badc351315d072c10d227744905b8fcc6b3f6f32ac7d6492125
-EBUILD uptimed-0.3.16-r5.ebuild 1285 SHA256 60256cd830153e417a9a2f0a0d89ca0edaef5e7f79c485aed1815a728dd74703 SHA512 cb91009aabe6c08fc33dc50fb683e5c38484577f716366cb99a251e7e27ff5f68e2d5759bd82ba66659f9260dc806ed273ff1ec9970abec63b009c5509fddbdc WHIRLPOOL cc19e48db1680006cfab70ac159a846ccf9eb682e2666fac42bc56836f668ab700f8c18155a70bfdf3c224b1a3ed558ccb312e64645cf29d810f5d5b79e5b9d3
-EBUILD uptimed-0.3.17.ebuild 1289 SHA256 0cccaab1abdb3da0ca5187de14dac8d6221d6569609f363bd237c8a45831ed9a SHA512 d57bf1d4023cfcd3add2deb4226006dfa92f025b5768afe3c5a9da731a1dbfedd5d2e159a5cce82918df1ff96873a4e8ac8287eb7fd2abab8edbe89110bb6faf WHIRLPOOL 8e400bdef0bc280eae4512e1cea0466421a52fd38aed6022f55dce9eea49f368e005659f55656b2e9226fbaad84f04c25a2010dd14fd613f774dc826c6e20638
-MISC ChangeLog 10712 SHA256 3da72cada271ff27008b124f05127c6f8b9fa12b238941e1cfc1513a34117be1 SHA512 d83161b3faa5492a1d481415ea5ceb9605a2d415234712f7c5cbd711e4ff1e68ab672cd64251bb6cdc8098e61e7f3366787b4dcad707607736de763390f5fbcc WHIRLPOOL 3ded49443aac243eadbdb807b6392fca2676ccf27bd9043f9ede5b67afef6454f2290155ebb3b0474940498bee0b032af6f760173bbac4ef04e4ced9343ca6dd
+EBUILD uptimed-0.3.16-r6.ebuild 1285 SHA256 175cc8d41bd5dc39e3f9923b9a9b0b3e6c43b50c6e9d1c5d5d0271c173c2149f SHA512 f3e1b513561987de2f713b201ac9124700873fa5e7d3954f8021255469e90bd3a76d55614a90168175594d264c00ffc95b536eed8bba21b40182291cbaf73ba2 WHIRLPOOL b4916f99ab2f5ad41bb1a4a5139b05383d1fc68592413adfcc39199aae0ce50a0e301208071eb079a25e9efb1b9a0d779e1a0abf098822914f35bb70fcd8f076
+EBUILD uptimed-0.3.17-r1.ebuild 1292 SHA256 61ec411bbc5dc1b8ffcc4f1cf3cc6a05756178c616bdca7ccb37c03f09712e63 SHA512 34eb6afccef690ab7a81339e95731b523c6dddd985829eac14480df0e2f2da345c0723ec2802b5824f27c7e99af64a493faad44f7c1a83421280e8217e310e5c WHIRLPOOL 98b9019f13e9322276dc766c407d61e1553218b40a872b4eda9900385d4b939835b4f9bc348e7b8846e869f4e8ba9ff4def3dff27c6c9ea44e5a4bec9476dadc
+MISC ChangeLog 11092 SHA256 b9f46e2ad6d27926211ee0792ccdeca78a4d452b7ff6553a5b43d3aa4c6d58a6 SHA512 418715d5744fc303a287146018bf802f8fa3a8ebaa585f37a85ba51c9f2b473856576dc7b031bc517926b3ae8969652a11d6cab116f17d5b699abd42e816d1f1 WHIRLPOOL 909dd677460e50e88b0ab4c266443e2d99f7992be71e6ffa4044510fe6dfb41482313a401214c8e79e2159cebafc969447fe40fdecb541ccb624a79b638256b1
 MISC metadata.xml 237 SHA256 97e2852866e146fd242be6cddceb93aebc2b28056cdafa3ff688a0cfc97a5065 SHA512 d21eed02cc15021ad5f18c4c932afdf4d6cfbb64a243764b61914aac9e57f6089ebb9e3a37e136e5bb7bf4f28d29bba49279d52a75acc3a6f921c770213758a5 WHIRLPOOL 92462bf73803127a88d9e2a02503d36efd2b8f1c938f3f2c00145db02871ea9ce241eba371138b6ab80c4774f858250b5eba08886ff355c0f212bfbc2cda3d9f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ0ewSAAoJEPiazRVxLXTFJnEQAJrJVhNrDP7ShAWt6HPUTVL+
-9voO8yDnpTjigpENqmFPkOp27STDRprBJrOGEkM9xruoawbIjke6OP7pOdg+SODZ
-X2eQ0YzBqlgErv7szLQSITDPZIrQruFC82YFjevGJAXmdHOeC5RGdYP4he5vZx6O
-jh0Bbf7gB6ykawlJEQW/CO2p+mP1HcsL4vdu02gn7VvLcRBA2RwvDM7eh3iiT9zC
-guHzYTJ6J91lxLi09v4mpGhZZ9QwiWAIhSiazR2ngnKFY97YDEOm9DSaVD22pPlm
-ZH9W8/mWcS8a2q2RqU8yIlJheQ5FVXBJdKyDT45t4SK6EtwWRwBywY0p/rLWjIZf
-UeTOE1VfHfEAuDE/bOn7Cen74SFPpfUnFuII/3nWg4PweLhMwbcCvvsb/JAhkutW
-hValDudCcDJD0BdXD6fPhKos4bhbzuMtMCei2g7k74ohZWYEbu1crjfc0D0r15pe
-sZpnm4qhJu8Fza5njb83o2sRu8GER/TzeRF5SH6kWAKWkaIZjW+IUeJ60kuBrr5m
-XD9ZWL4U2PY5/MVxaZ8rD0AaNXxG8f91La6g3QFnRaLzl+anOedpojaV4uWab5te
-vfLbeNtV6OFUWFRY+QUPExzmlg8l6cU5YnWabZH5TuHp93Py8zTtgvSOlGMq38dp
-JRWxUk8xr4CFqVyQEF3x
-=LCRa
+iQIcBAEBCAAGBQJQ2B/rAAoJEPiazRVxLXTF6s4P/i3g94l3YkKJPp2o8ytoiEdr
+4TDyn9r2MJL+mJK015BBP1lURQhJC2Gv9kCCIFJMbh7VkSvP9FTngEWfcXuKusRV
+bVHQNfen/WnaqmCOYRXjcPUqnGhBxmD40FunLwH4GBkRw6fAfmOPZ/jryWO3RHH0
+sI5/zjSxWMQpAjLLmgfr3kuirFwlmOrC9SQMSvNr2MLJCX3tCK7wCmIdKvOUZlRL
+PAduZ2gxFDaHdJDelLjk1u2W01tuIMK4Oj0dz3j4kDXEtj9gf0y1bIUFyP/Yu5+Y
+qfWO1O1E7L2hW4ntShAMk2V/nTNKaDKFuZ+wKIofXvLf9XCvwg3gfSGXOw6Tftsv
+y+hDWj5hhFMmJVaPHX5Goj+K+L/lN9pXo3wLpxNQk7WZIp8q8xtjjKgEIZFesdaC
+t6hIdXmm46IgSnPDCwSr73jJNkEL+U5CBzqe1//tcEiRKyUjh3D6lYay6p95CQui
+p5AoKRVDjGppAQ342wmdsts1ORIeMVde/USlmgLY2MpVtgEF3RDFa14N0I1ZFE7m
+w61hPBW20ZsNsYUOYzF/GT8MTOE2s0dj6KdkJKGOFRKLhvOygSKAkjEu6wi908L3
+Jv37ojXpMJai6C3jrScPRzTX6Kb1/lvAxFLjXEuOJ/CxV1u7dQ3KmW/37sHVCXD6
+mth7cvHqElPVVrz9MRzH
+=jLqx
 -----END PGP SIGNATURE-----
diff --git a/app-misc/uptimed/files/uptimed.init b/app-misc/uptimed/files/uptimed.init
index aaaae61ce923..71c409778070 100644
--- a/app-misc/uptimed/files/uptimed.init
+++ b/app-misc/uptimed/files/uptimed.init
@@ -1,18 +1,19 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/files/uptimed.init,v 1.5 2012/12/19 00:31:18 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/files/uptimed.init,v 1.6 2012/12/24 09:27:06 polynomial-c Exp $
 
 pidfile="/var/run/uptimed/uptimed.pid"
 command="/usr/sbin/uptimed"
 command_args="-p ${pidfile}"
-start_stop_daemon_args="--user uptimed"
+ssd_pre_start_args="-u uptimed"
+start_stop_daemon_args="${ssd_pre_start_args} -p ${pidfile}"
 
 start_pre() {
 	checkpath -d -o uptimed ${pidfile%/*}
 
 	# Initialize bootid
-	start-stop-daemon --start ${start_stop_daemon_args} --exec ${command} \
+	start-stop-daemon --start ${ssd_pre_start_args} --exec ${command} \
 		-- -b \
 			|| eend $?
 }
diff --git a/app-misc/uptimed/uptimed-0.3.16-r5.ebuild b/app-misc/uptimed/uptimed-0.3.16-r6.ebuild
index bd14fff18201..ff7217d1e7e2 100644
--- a/app-misc/uptimed/uptimed-0.3.16-r5.ebuild
+++ b/app-misc/uptimed/uptimed-0.3.16-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.3.16-r5.ebuild,v 1.1 2012/12/19 00:31:18 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.3.16-r6.ebuild,v 1.1 2012/12/24 09:27:05 polynomial-c Exp $
 
 inherit autotools user
 
diff --git a/app-misc/uptimed/uptimed-0.3.17.ebuild b/app-misc/uptimed/uptimed-0.3.17-r1.ebuild
index 021ab91863fb..508dd61672bd 100644
--- a/app-misc/uptimed/uptimed-0.3.17.ebuild
+++ b/app-misc/uptimed/uptimed-0.3.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.3.17.ebuild,v 1.1 2012/12/19 00:31:18 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.3.17-r1.ebuild,v 1.1 2012/12/24 09:27:05 polynomial-c Exp $
 
 inherit autotools user