Various enhancements by Lars (Polynomial-C) <polynomial-C at gmx dot de>, bug #251465

(Portage version: 2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 ia64)

4 files changed, 43 insertions, 42 deletions

diff --git a/app-misc/uptimed/ChangeLog b/app-misc/uptimed/ChangeLog
index 0704da6094ab..e167ab4009b7 100644
--- a/app-misc/uptimed/ChangeLog
+++ b/app-misc/uptimed/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/uptimed
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/ChangeLog,v 1.69 2009/01/02 12:05:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/ChangeLog,v 1.70 2009/02/19 19:33:20 armin76 Exp $
+
+*uptimed-0.3.16-r1 (19 Feb 2009)
+
+  19 Feb 2009; Raúl Porcel <armin76@gentoo.org> +files/uptimed.init,
+  -uptimed-0.3.13.ebuild, -uptimed-0.3.16.ebuild, +uptimed-0.3.16-r1.ebuild:
+  Various enhancements by Lars (Polynomial-C) <polynomial-C at gmx dot de>,
+  bug #251465
 
 *uptimed-0.3.16 (02 Jan 2009)
 
diff --git a/app-misc/uptimed/files/uptimed.init b/app-misc/uptimed/files/uptimed.init
new file mode 100644
index 000000000000..b4a7966a7814
--- /dev/null
+++ b/app-misc/uptimed/files/uptimed.init
@@ -0,0 +1,25 @@
+--- /usr/portage/app-misc/uptimed/files/uptimed
++++ /usr/local/portage/app-misc/uptimed/files/uptimed
+@@ -5,15 +5,19 @@
+ 
+ # Copyright 2002 Sean Russell
+ 
++PIDFILE="/var/run/uptimed/uptimed.pid"
++
+ start() {
+ 	ebegin "Starting uptimed"
+-	uptimed -b
+-	start-stop-daemon --quiet --start --pidfile /var/run/uptimed --exec /usr/sbin/uptimed
++	start-stop-daemon --quiet --start --chuid uptimed \
++		--exec /usr/sbin/uptimed -- -b
++	start-stop-daemon --quiet --start --chuid uptimed \
++		--exec /usr/sbin/uptimed -- -p ${PIDFILE}
+ 	eend $?
+ }
+ 
+ stop() {
+ 	ebegin "Stopping uptimed"
+-	start-stop-daemon --quiet --stop --pidfile /var/run/uptimed
++	start-stop-daemon --quiet --stop --user uptimed --pidfile ${PIDFILE}
+ 	eend $?
+ }
diff --git a/app-misc/uptimed/uptimed-0.3.13.ebuild b/app-misc/uptimed/uptimed-0.3.13.ebuild
deleted file mode 100644
index ca1b151bcadc..000000000000
--- a/app-misc/uptimed/uptimed-0.3.13.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.3.13.ebuild,v 1.1 2008/12/17 12:13:01 armin76 Exp $
-
-inherit autotools
-
-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 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-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
-	dodoc ChangeLog README TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/*
-	doinitd "${FILESDIR}"/uptimed
-}
-
-pkg_postinst() {
-	echo
-	elog "Start uptimed with '/etc/init.d/uptimed start'"
-	elog "To view your uptime records, use the command 'uprecords'."
-	echo
-}
diff --git a/app-misc/uptimed/uptimed-0.3.16.ebuild b/app-misc/uptimed/uptimed-0.3.16-r1.ebuild
index bd00302095de..86daf4969ae4 100644
--- a/app-misc/uptimed/uptimed-0.3.16.ebuild
+++ b/app-misc/uptimed/uptimed-0.3.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.ebuild,v 1.1 2009/01/02 12:05:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.3.16-r1.ebuild,v 1.1 2009/02/19 19:33:20 armin76 Exp $
 
 inherit autotools
 
@@ -13,6 +13,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~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}"
@@ -26,9 +31,12 @@ 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/*
-	doinitd "${FILESDIR}"/uptimed
+	doinitd "${FILESDIR}"/uptimed.init
 }
 
 pkg_postinst() {