Revision bump so stable users get a working init script again (bug #445398). Version bump

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

6 files changed, 95 insertions, 45 deletions

diff --git a/app-misc/uptimed/ChangeLog b/app-misc/uptimed/ChangeLog
index 3536cafc161c..93e987850d4a 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.82 2012/05/23 13:23:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/ChangeLog,v 1.83 2012/12/19 00:31:18 polynomial-c Exp $
+
+*uptimed-0.3.17 (19 Dec 2012)
+*uptimed-0.3.16-r5 (19 Dec 2012)
+
+  19 Dec 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -uptimed-0.3.16-r4.ebuild, +uptimed-0.3.16-r5.ebuild, +uptimed-0.3.17.ebuild,
+  -files/uptimed, files/uptimed.init:
+  Non-maintainer commit: Revision bump so stable users get a working
+  (completely rewritten) init script again (bug #445398). Version bump.
 
   23 May 2012; Kacper Kowalik <xarthisius@gentoo.org> uptimed-0.3.16-r4.ebuild:
   Add missing user.eclass for enewgroup. Fixes #417153 by Eugene Ho
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index 1174ed6f423b..4ea76390cfec 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -1,6 +1,27 @@
-AUX uptimed 520 SHA256 0f963cd8ae16fef0932e293c94491a914bf1c5ad9020041dd6bc50b516704654 SHA512 ee86c04f77822747127a462d762259ae2ab3f27bd195139a0e7bc6251af22bfec5ed75e883a9dd552e5f4c6a33a4aab48d122dc73860bd789306893a795d13c8 WHIRLPOOL 3559051905e4aa16f2459c7af2d7825f22105a39d9ce77a3c4fbf9bd2990f22bda56c722e98e9194778f427bcc706229f3578b9ebd1afd121133c7f0d219d395
-AUX uptimed.init 712 SHA256 71e3ff306bed324a4e9ff0b8c5f8a57b84028b0ee27767fb824567b037b779d5 SHA512 a0c83e0e5c328d6f2c9cb619efb02a3b67c6b77a7954f44b1828657ce0688ce4f766957ce6b52af992eaeee5d2c2e4d225cda3bf5c652d679010ac823a400a13 WHIRLPOOL 08595e34384e8c75b60906ff333a4ac6f7e3b2a6a5fe43a1fc930684edfd9fb9ea5c2d0996e9b26e423345af69cac57d557bcf4237085df72ac371a40034e2db
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX uptimed.init 553 SHA256 be79a08358add9786ace6ea248ce436d3d82e5631d745c3cea7da4b78aa3e879 SHA512 e8f442040f1eb882a827fff7d5b2199d5cce1c3da3421ef1984fbd7f83c3223af5978b6b6763c33b7a790ff84a80d44a96ea3d6819adcd03da3f717b73f21937 WHIRLPOOL 890d4cc4d129b249faa3f52b581b3ba1a6bdd03bf9c6cdba7318e609ee4681e6d894ed77151543d58ce258fcd4c56b94b326de2c48449804ad00899342b537ff
 DIST uptimed-0.3.16.tar.bz2 197338 SHA256 f508ff5e98fab9c1bc0c342bf03cc6d1c01a24f2c7ab7ea8fcbfda477e16b12b SHA512 b6a51c0b30059767bd260b25cc43647c24f32bb9bcd5a3ff895ece800dbeb03d7de64cbdcec4f5571ea42ee72d38ea665733f59f74aecdc5e20a4e1c7b3a5123 WHIRLPOOL b7170beb21a742adcc0c25fb36636a3c4212727ba89b6585e4a0d066f2d323abcef6bbfa204c01afa82b92d6f958b354e9aeaad468c6384159e82cf5753396e2
-EBUILD uptimed-0.3.16-r4.ebuild 1338 SHA256 bed56a8757d166859cdc68926128f2370c44dae32f7c97415a3e756d00117005 SHA512 bff9e367d29aeef5915c9e4fa5cc4f562423d8f6abbcecd1a1826609489f36cb6b3201e70837946c96af634333c667641a0062bb62e35d57656d221de7d18b6a WHIRLPOOL 321e9ef7b94ebe7329009cd0bb61dbad6a9af1204d81f22c0403876d84eef37ae5dcf9f0486e064869064772bfdb85f253eb5148c690cb2c028e71ade5a2a653
-MISC ChangeLog 10238 SHA256 175fb288860de30211a93a1476b0c21aa158cbd4f80bb4407d274a26ad930893 SHA512 ba030b29cd15efa4a2a686c1df118dd0c5436cc33d94d9d81c67c4d285a79b9df37f0260fdd8ad360324faa6a903ca6b066b6b11d12e287741f2be0e248b8855 WHIRLPOOL 73efe78731806fdaee4e5fd1e0857fdec7a5c1e7f0f9d1a338b0c76f2031aca9cda8fa41fc051f5f2a7459b8025ed7f8293c08fd5854b1996134a0a048b5facc
+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 10618 SHA256 0e501db448a1a28e50e555b731482a1ae712e81b0d834b4de216631a28f6f1ac SHA512 42ec571366fcae3a88dba3db5f41e12d9d8182b86df25d4a37649227325d1b0666f6d56f814b6da957c9e02458e8f443a406bb37b2e7945ccde2af78cc4a2832 WHIRLPOOL 3929e8deced6c42f5eecc4cdba6c590daf48aa2e32b2aaa6bd94e2be89c8c467dde9d63f5adb8db39c154bb264df81f68711575d8de22462d2d65c188d236acf
 MISC metadata.xml 204 SHA256 2f4ea04498e949dac3e4f5a6d628f12c4139908c58c94f67d4abf88854bedfc6 SHA512 b1cffd06295c8c2546c2b934b9335984318a6555ab8cd957d37a5d04a179a12406ddaa38a4cda605e978394065b4a1d1f663533d43f8d1a7127518d4376e8d76 WHIRLPOOL 06ac18d6c7bcc946e0e970f2b0ed94fc7294f7bb050373196a986d22aad00f101f1e09d8405f4c1c11d84f9e6030d9ac8816fdc34965e9fbe5ed5b441ed15764
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQ0QrYAAoJEPiazRVxLXTF3VEP/jIEna9Fc+9SJowCnUx3KdpP
+u3IrtIb9wXZefaVpoy6MVF6DFrcytYuvnAiPWlIhsXXQxJ70w58Crh8wmJfwrmwt
+ZufyfcRUfBNLJagDzs6Utn2Y75bgHvxALyy5o2SzUYzpu7HIaEE3I4jhLy9RwWt2
+8L0VoiJYIWfgJu7GxqxZsP/2PGckr+N2VWrGdbrBVyG97KvjZVfj0mrqk3JkS4TU
+V1XHWhpdA8O6MmiReYb4lnoN6IqI+b1cvjCbgzqDN0KBzjbHVCjiT+p+h9LOs0eQ
+lwbyZLVDss8Xu6OKqC1jhFU2hCeofisp3byHImRABYmze31a8pO5O2M2Uj/95ry7
+5EjMx5pwWRw1H1y5ohRXtgYZly2Jo+oJicv+ZYyMyVRGS1n31IKOZdaWuwnZGlQn
+dw+y2Gtv/jLURWP03lEH5jdgWiwgQWaP7TZ56dz1b3+ymXWMZI0/DIqUPddM8Doh
+KNa/u7aG4YSETiduFfPeqkWlYShrKx929U1MwFHV5YMivmTXLP3uhMQ6nC9v/DNT
+9j5jyCM0TOdK/BdHpgAevdMoW1CuTPjI127MDqQVmdQE1sDjUMyKtHu8wuflBHxi
+OpGCuxr0pVHndilOcXtnSGclWjMKBuUcLEX2y9H9iDICQ7zjwTThNOqiAdW5OUGi
+Df8EVapjH7g0FvgBKlTe
+=R3i5
+-----END PGP SIGNATURE-----
diff --git a/app-misc/uptimed/files/uptimed b/app-misc/uptimed/files/uptimed
deleted file mode 100644
index 8cbea21658ec..000000000000
--- a/app-misc/uptimed/files/uptimed
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/files/uptimed,v 1.4 2004/07/14 21:34:49 agriffis Exp $
-
-# Copyright 2002 Sean Russell
-
-start() {
-	ebegin "Starting uptimed"
-	uptimed -b
-	start-stop-daemon --quiet --start --pidfile /var/run/uptimed --exec /usr/sbin/uptimed
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping uptimed"
-	start-stop-daemon --quiet --stop --pidfile /var/run/uptimed
-	eend $?
-}
diff --git a/app-misc/uptimed/files/uptimed.init b/app-misc/uptimed/files/uptimed.init
index cfd2998c1672..aaaae61ce923 100644
--- a/app-misc/uptimed/files/uptimed.init
+++ b/app-misc/uptimed/files/uptimed.init
@@ -1,24 +1,18 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# 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.4 2011/08/07 13:22:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/files/uptimed.init,v 1.5 2012/12/19 00:31:18 polynomial-c Exp $
 
-# Copyright 2002-2011 Sean Russell
+pidfile="/var/run/uptimed/uptimed.pid"
+command="/usr/sbin/uptimed"
+command_args="-p ${pidfile}"
+start_stop_daemon_args="--user uptimed"
 
-PIDFILE="/var/run/uptimed/uptimed.pid"
+start_pre() {
+	checkpath -d -o uptimed ${pidfile%/*}
 
-start() {
-	ebegin "Starting uptimed"
-	start-stop-daemon --quiet --start --user uptimed \
-		--exec /usr/sbin/uptimed --pidfile "${PIDFILE}" -- -b
-	start-stop-daemon --quiet --start --user uptimed \
-		--exec /usr/sbin/uptimed --pidfile "${PIDFILE}" \
-		-- -p ${PIDFILE}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping uptimed"
-	start-stop-daemon --quiet --stop --user uptimed --pidfile "${PIDFILE}"
-	eend $?
+	# Initialize bootid
+	start-stop-daemon --start ${start_stop_daemon_args} --exec ${command} \
+		-- -b \
+			|| eend $?
 }
diff --git a/app-misc/uptimed/uptimed-0.3.16-r4.ebuild b/app-misc/uptimed/uptimed-0.3.16-r5.ebuild
index 46b9f20580b4..bd14fff18201 100644
--- a/app-misc/uptimed/uptimed-0.3.16-r4.ebuild
+++ b/app-misc/uptimed/uptimed-0.3.16-r5.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-r4.ebuild,v 1.3 2012/05/23 13:23:07 xarthisius Exp $
+# $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 $
 
 inherit autotools user
 
@@ -31,8 +31,6 @@ src_unpack() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."
-	diropts -o uptimed -g uptimed
-	dodir /var/run/uptimed
 	keepdir /var/spool/uptimed
 	fowners uptimed:uptimed /var/spool/uptimed
 	dodoc ChangeLog README TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/*
diff --git a/app-misc/uptimed/uptimed-0.3.17.ebuild b/app-misc/uptimed/uptimed-0.3.17.ebuild
new file mode 100644
index 000000000000..021ab91863fb
--- /dev/null
+++ b/app-misc/uptimed/uptimed-0.3.17.ebuild
@@ -0,0 +1,47 @@
+# 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 $
+
+inherit autotools user
+
+DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
+HOMEPAGE="http://podgorny.cz/uptimed"
+SRC_URI="http://podgorny.cz/uptimed/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+pkg_setup() {
+	enewgroup uptimed
+	enewuser uptimed -1 -1 -1 uptimed
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# respect DESTDIR
+	sed -i -e 's|-d \(/var/spool.*\)$|-d $(DESTDIR)\1|' Makefile.am || \
+		die "sed failed."
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	keepdir /var/spool/uptimed
+	fowners uptimed:uptimed /var/spool/uptimed
+	dodoc ChangeLog README TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/*
+	newinitd "${FILESDIR}"/uptimed.init uptimed
+}
+
+pkg_postinst() {
+	einfo "Fixing permissions in /var/spool/${PN}"
+	chown -R uptimed:uptimed /var/spool/${PN}
+	echo
+	elog "Start uptimed with '/etc/init.d/uptimed start'"
+	elog "To view your uptime records, use the command 'uprecords'."
+	echo
+}