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

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 ia64

5 files changed, 46 insertions, 46 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/Manifest b/app-misc/uptimed/Manifest
index 874ba61c0b9d..cfc7489ed713 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -1,9 +1,8 @@
 AUX uptimed 520 RMD160 ba9d7d0ab624a481f291f49aae39922a36e273d5 SHA1 5c32e827c7fd009d0def98ce961abc019c8747d1 SHA256 0f963cd8ae16fef0932e293c94491a914bf1c5ad9020041dd6bc50b516704654
+AUX uptimed.init 723 RMD160 1107b38345ab0d0c54410f91d5a5b3978c39e18a SHA1 991f15754f6fab4cc2bfc3436171f8d1b71f20b1 SHA256 c76b3dd0744f951c15746024036cb5b42b3b3b31913e655a761b27561e90d75a
 DIST uptimed-0.3.12.tar.bz2 238886 RMD160 ffcfb47a538f7e236faefad2fa3e974791e2751f SHA1 753ab59bb99d7b88a35174ce83081ad0bb224e56 SHA256 8415d4bd4147c956d4d608f34ab6cda8765eee75f8650b92a5a2d8aa1575f773
-DIST uptimed-0.3.13.tar.bz2 119341 RMD160 c757194e8dd655faca6c9e96ce3418e5f4feea87 SHA1 fcb5173cf34b75c2272c981dc5850dc328fe1161 SHA256 012662ad86418c5879adff6311291e691d9beb184d7597053cd99cdc22ee6bba
 DIST uptimed-0.3.16.tar.bz2 197338 RMD160 cf3c2c513873f55c0ba3c1ce45080eccaac35ca4 SHA1 1579ae801277597b18a814d0dcf5613a1eb9ecfd SHA256 f508ff5e98fab9c1bc0c342bf03cc6d1c01a24f2c7ab7ea8fcbfda477e16b12b
 EBUILD uptimed-0.3.12.ebuild 1047 RMD160 21ecd0f25e3bf32c95378a6732ad55ec657afbf2 SHA1 3e18159d3e0b269e796c1c378a897410aa1d2354 SHA256 2f688f3d109385fa9b7461661954c614fcd1d8dda05616e11bf2083155ed4dcc
-EBUILD uptimed-0.3.13.ebuild 1054 RMD160 4463abfc5ef90e660ccb54b1f69f87d21faaeaf9 SHA1 ab562b4333c03f14f87a2307be0db19409e3b455 SHA256 81ae81093f255972bf2712d68b072724a09d8fc71efc4bf8649d153736d5e95e
-EBUILD uptimed-0.3.16.ebuild 1054 RMD160 a27dd3718ec59872d1bbdc4ef52b55855f8a9b65 SHA1 3a60f7b7fa4de9ce9761b626e88c3a9867c76745 SHA256 e505e6548bd8a8959ce25484c21bebec781d10c48e75ba64b498c9e949bd36dc
-MISC ChangeLog 8242 RMD160 e414205e1b09811b5097010f61d4af908db25255 SHA1 129319020ba54792aadbcdefb7449fef0a8c7a85 SHA256 9ae7c38bda7366d7722280c29be924e82a65e08ceeabd3fd1e1ff22129f05ee8
+EBUILD uptimed-0.3.16-r1.ebuild 1232 RMD160 e5cc716937a4ae50d3ce59be891ad6fe42868bb0 SHA1 9b0f41264769930e134897495d5c6edba08835fe SHA256 71624d1ab8ad2bc2bf99c4b4496c3feae9daec5e5d9aa4c51ebfc3cbb58b6f29
+MISC ChangeLog 8514 RMD160 429c68d3628cf41483f2a8531cc0cc853ceee2d0 SHA1 55ba379cbe30126df579ced8dc5f66462ae4c0c2 SHA256 c23d589867ce1a335e70629b28f93158052b4b99d8588ea0b0f75b7bc23411b4
 MISC metadata.xml 226 RMD160 00525525a6f25de25a4d4a36ba478d6fb787dacd SHA1 0a6965f3e3bba0d374ca786469f7cb2af7d48aef SHA256 60846c519d869ef24034188698ade9b5afe329aed7a63b2bb6aa31ee7e7d62c5
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() {