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

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x981CA6FC)

5 files changed, 70 insertions, 41 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/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
+}