From 1adebfde739793482dd60ed4cf567bf3bd0b6253 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Porcel?= Date: Sun, 7 Aug 2011 13:22:39 +0000 Subject: [PATCH] Fix init script, bug #377783 Package-Manager: portage-2.1.10.7/cvs/Linux ia64 --- app-misc/uptimed/ChangeLog | 8 ++++-- app-misc/uptimed/Manifest | 16 ++++++++--- app-misc/uptimed/files/uptimed.init | 8 +++--- app-misc/uptimed/uptimed-0.3.12.ebuild | 39 -------------------------- 4 files changed, 22 insertions(+), 49 deletions(-) delete mode 100644 app-misc/uptimed/uptimed-0.3.12.ebuild diff --git a/app-misc/uptimed/ChangeLog b/app-misc/uptimed/ChangeLog index 9a1660173beb..6a28b5069b97 100644 --- a/app-misc/uptimed/ChangeLog +++ b/app-misc/uptimed/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/uptimed -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/ChangeLog,v 1.80 2009/08/25 15:11:26 armin76 Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/ChangeLog,v 1.81 2011/08/07 13:22:38 armin76 Exp $ + + 07 Aug 2011; Raúl Porcel -uptimed-0.3.12.ebuild, + files/uptimed.init: + Fix init script, bug #377783 25 Aug 2009; Raúl Porcel uptimed-0.3.16-r4.ebuild: Add ~arm wrt #282190 diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest index 9e4a264d8866..134a64e6e175 100644 --- a/app-misc/uptimed/Manifest +++ b/app-misc/uptimed/Manifest @@ -1,8 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX uptimed 520 RMD160 ba9d7d0ab624a481f291f49aae39922a36e273d5 SHA1 5c32e827c7fd009d0def98ce961abc019c8747d1 SHA256 0f963cd8ae16fef0932e293c94491a914bf1c5ad9020041dd6bc50b516704654 -AUX uptimed.init 709 RMD160 18c9ef9d103d866d119a6a4ed964c35ee6681c76 SHA1 4a9eb8c90152477a0e1b4c251bfca6cef5af729b SHA256 3a3d7acce3cc9c2909b5d9cc7f568dfdae46e633d287731e283d1be74159f79a -DIST uptimed-0.3.12.tar.bz2 238886 RMD160 ffcfb47a538f7e236faefad2fa3e974791e2751f SHA1 753ab59bb99d7b88a35174ce83081ad0bb224e56 SHA256 8415d4bd4147c956d4d608f34ab6cda8765eee75f8650b92a5a2d8aa1575f773 +AUX uptimed.init 712 RMD160 3c46bc415e7a610f03efe2b043c4cc9f39a88ddc SHA1 01b3952c538f4958ab5d1f8de8d5b771332d6a4c SHA256 71e3ff306bed324a4e9ff0b8c5f8a57b84028b0ee27767fb824567b037b779d5 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.16-r4.ebuild 1330 RMD160 68a81a25c840ec80021a3780fde46f94e1367eb7 SHA1 a36d5a76ce34ce41704af2f755a47f7509215064 SHA256 59fe203072326f19f98aa6a992a2efaef7f5fa1a4b40beac2d399451dc0c5766 -MISC ChangeLog 9935 RMD160 d41d5698c715c6ce8b334847c13a205aa6fbe2e8 SHA1 74984e718dc81dbe8a312d6dd23841dffe4c3f74 SHA256 68ba101d3173f3ddaefa57fd7cebba4e2ab4602c4762b1fe9376c2a7909fd330 +MISC ChangeLog 10062 RMD160 831b1623c20052963e6bac3c9625e88b5944ed99 SHA1 c1a748a335b753f64783ee388e9e2ed4104c5154 SHA256 541efe96afd4d06cbb0cdda2caec9391d31be5f2ce111e8bd7419613a87c19ae MISC metadata.xml 226 RMD160 00525525a6f25de25a4d4a36ba478d6fb787dacd SHA1 0a6965f3e3bba0d374ca786469f7cb2af7d48aef SHA256 60846c519d869ef24034188698ade9b5afe329aed7a63b2bb6aa31ee7e7d62c5 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk4+kaQACgkQuQc30/atMkDlFACfe0nji2MvClT1fC16lS/xULG/ +KPIAn2SRRkFf1spqQRS2d5M1FVLxYVXw +=NKcG +-----END PGP SIGNATURE----- diff --git a/app-misc/uptimed/files/uptimed.init b/app-misc/uptimed/files/uptimed.init index fe0a6e90971b..cfd2998c1672 100644 --- a/app-misc/uptimed/files/uptimed.init +++ b/app-misc/uptimed/files/uptimed.init @@ -1,17 +1,17 @@ #!/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.init,v 1.3 2009/04/14 17:13:13 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/files/uptimed.init,v 1.4 2011/08/07 13:22:39 armin76 Exp $ -# Copyright 2002 Sean Russell +# Copyright 2002-2011 Sean Russell PIDFILE="/var/run/uptimed/uptimed.pid" start() { ebegin "Starting uptimed" - start-stop-daemon --quiet --start --chuid uptimed \ + start-stop-daemon --quiet --start --user uptimed \ --exec /usr/sbin/uptimed --pidfile "${PIDFILE}" -- -b - start-stop-daemon --quiet --start --chuid uptimed \ + start-stop-daemon --quiet --start --user uptimed \ --exec /usr/sbin/uptimed --pidfile "${PIDFILE}" \ -- -p ${PIDFILE} eend $? diff --git a/app-misc/uptimed/uptimed-0.3.12.ebuild b/app-misc/uptimed/uptimed-0.3.12.ebuild deleted file mode 100644 index ae8ae3da6446..000000000000 --- a/app-misc/uptimed/uptimed-0.3.12.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.12.ebuild,v 1.6 2008/01/20 19:11:20 angelos 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 -} -- 2.26.2