From 4b4b828e09e761436472daad155437448944bcd4 Mon Sep 17 00:00:00 2001 From: Henrik Brix Andersen Date: Sun, 27 Nov 2005 10:14:24 +0000 Subject: Updated to patchlevel 5 from upstream. Don't check for /dev/watchdog as this package can be used without it (softboot functionality), bug #109541. Took ownership. (Portage version: 2.0.51.22-r3) --- sys-apps/watchdog/ChangeLog | 13 ++++- sys-apps/watchdog/Manifest | 9 +++- sys-apps/watchdog/files/digest-watchdog-5.2.4_p5 | 2 + sys-apps/watchdog/files/watchdog-5.2.4_p5-conf.d | 6 +++ sys-apps/watchdog/files/watchdog-5.2.4_p5-init.d | 22 ++++++++ .../files/watchdog-5.2.4_p5-sundries.patch | 19 +++++++ .../watchdog/files/watchdog-5.2.4_p5-uclibc.patch | 11 ++++ sys-apps/watchdog/metadata.xml | 8 +++ sys-apps/watchdog/watchdog-5.2.4_p5.ebuild | 60 ++++++++++++++++++++++ 9 files changed, 148 insertions(+), 2 deletions(-) create mode 100644 sys-apps/watchdog/files/digest-watchdog-5.2.4_p5 create mode 100644 sys-apps/watchdog/files/watchdog-5.2.4_p5-conf.d create mode 100644 sys-apps/watchdog/files/watchdog-5.2.4_p5-init.d create mode 100644 sys-apps/watchdog/files/watchdog-5.2.4_p5-sundries.patch create mode 100644 sys-apps/watchdog/files/watchdog-5.2.4_p5-uclibc.patch create mode 100644 sys-apps/watchdog/metadata.xml create mode 100644 sys-apps/watchdog/watchdog-5.2.4_p5.ebuild (limited to 'sys-apps/watchdog') diff --git a/sys-apps/watchdog/ChangeLog b/sys-apps/watchdog/ChangeLog index 614924482dac..9deafb5d707a 100644 --- a/sys-apps/watchdog/ChangeLog +++ b/sys-apps/watchdog/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sys-apps/watchdog # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.1 2005/11/27 10:07:03 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.2 2005/11/27 10:14:24 brix Exp $ + +*watchdog-5.2.4_p5 (27 Nov 2005) + + 27 Nov 2005; Henrik Brix Andersen + +files/watchdog-5.2.4_p5-conf.d, +files/watchdog-5.2.4_p5-init.d, + +files/watchdog-5.2.4_p5-sundries.patch, + +files/watchdog-5.2.4_p5-uclibc.patch, +metadata.xml, + +watchdog-5.2.4_p5.ebuild: + Updated to patchlevel 5 from upstream. Don't check for /dev/watchdog as this + package can be used without it (softboot functionality), bug #109541. Took + ownership. 27 Nov 2005; Henrik Brix Andersen +files/5.2.4-sundries.patch, +files/5.2.4-uclibc.patch, diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest index 5cfacea8b353..7629db067f77 100644 --- a/sys-apps/watchdog/Manifest +++ b/sys-apps/watchdog/Manifest @@ -1,11 +1,18 @@ +MD5 322f54a6e6f7d005903bb487a6962ffd watchdog-5.2.4_p5.ebuild 1367 MD5 a5b1a7192c34c50ca11ed6510c19d871 watchdog-5.2.4.ebuild 1311 MD5 3a45635e777248cf61bf145d6b9a31cf watchdog-5.2.ebuild 1324 -MD5 757e2ef6f00a0c712d9c4d0705997c57 ChangeLog 1644 +MD5 ba8be57f20895b3be9da92f235108d54 ChangeLog 2098 +MD5 c58db060ae5f8ffd1d141930b0c7c02c metadata.xml 219 +MD5 82c06c14c4fd4777578d6619a1887265 files/watchdog-5.2.4_p5-conf.d 171 +MD5 ba2c02768a2e772c14e6332dd6b2e65e files/watchdog-5.2.4_p5-sundries.patch 752 +MD5 996b8832d40c95b2eaa9aa786e8241e6 files/watchdog-5.2.4_p5-init.d 429 +MD5 e3a3640b31e70f2956ed8ed4bb39f04a files/watchdog-5.2.4_p5-uclibc.patch 312 MD5 4de4839057a43617fb483f691555ac09 files/watchdog.conf.d 270 MD5 0f333f39bc92c0a210e813ee338da9e7 files/digest-watchdog-5.2.4 71 MD5 e3a3640b31e70f2956ed8ed4bb39f04a files/5.2.4-uclibc.patch 312 MD5 96232179b747a1bcacf83442f9217ec4 files/5.2-alpha.patch 329 MD5 a9456456f029a5fdbe9a050e4bbf67ed files/watchdog 657 +MD5 287794d799d9743d47a4cdcaea6eadb1 files/digest-watchdog-5.2.4_p5 139 MD5 a9e8cf348af5828fbdc72e8c1a3bb730 files/5.2-sundries.patch 874 MD5 ba2c02768a2e772c14e6332dd6b2e65e files/5.2.4-sundries.patch 752 MD5 b8a1e49beda941e07c53020b8fb7a1a9 files/digest-watchdog-5.2 64 diff --git a/sys-apps/watchdog/files/digest-watchdog-5.2.4_p5 b/sys-apps/watchdog/files/digest-watchdog-5.2.4_p5 new file mode 100644 index 000000000000..4b35dd5be9ca --- /dev/null +++ b/sys-apps/watchdog/files/digest-watchdog-5.2.4_p5 @@ -0,0 +1,2 @@ +MD5 c6ac132d92110eb2c4670d4f684105c3 watchdog_5.2.4.orig.tar.gz 127791 +MD5 a3455cb38c645ad81cfc9c5864830fb8 watchdog_5.2.4-5.diff.gz 14854 diff --git a/sys-apps/watchdog/files/watchdog-5.2.4_p5-conf.d b/sys-apps/watchdog/files/watchdog-5.2.4_p5-conf.d new file mode 100644 index 000000000000..d61daf8930e7 --- /dev/null +++ b/sys-apps/watchdog/files/watchdog-5.2.4_p5-conf.d @@ -0,0 +1,6 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/files/watchdog-5.2.4_p5-conf.d,v 1.1 2005/11/27 10:14:24 brix Exp $ + +# for more info, see watchdog(8) +WATCHDOG_OPTS="" diff --git a/sys-apps/watchdog/files/watchdog-5.2.4_p5-init.d b/sys-apps/watchdog/files/watchdog-5.2.4_p5-init.d new file mode 100644 index 000000000000..927048606598 --- /dev/null +++ b/sys-apps/watchdog/files/watchdog-5.2.4_p5-init.d @@ -0,0 +1,22 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/files/watchdog-5.2.4_p5-init.d,v 1.1 2005/11/27 10:14:24 brix Exp $ + +depend() { + need localmount + use logger +} + +start() { + ebegin "Starting watchdog" + start-stop-daemon --start --quiet --exec /usr/sbin/watchdog \ + -- ${WATCHDOG_OPTS} + eend ${?} +} + +stop() { + ebegin "Stopping watchdog" + start-stop-daemon --stop --quiet --exec /usr/sbin/watchdog + eend ${?} +} diff --git a/sys-apps/watchdog/files/watchdog-5.2.4_p5-sundries.patch b/sys-apps/watchdog/files/watchdog-5.2.4_p5-sundries.patch new file mode 100644 index 000000000000..2d3d0a1f2986 --- /dev/null +++ b/sys-apps/watchdog/files/watchdog-5.2.4_p5-sundries.patch @@ -0,0 +1,19 @@ +--- include/sundries.h.orig 2004-08-06 01:33:43.525091352 -0400 ++++ include/sundries.h 2004-08-06 01:33:58.254852088 -0400 +@@ -46,16 +46,7 @@ + char *xstrconcat3 (const char *, const char *, const char *); + char *xstrconcat4 (const char *, const char *, const char *, const char *); + +-/* Here is some serious cruft. */ +-#ifdef __GNUC__ +-#if defined(__GNUC_MINOR__) && __GNUC__ == 2 && __GNUC_MINOR__ >= 5 + void die (int errcode, const char *fmt, ...) __attribute__ ((noreturn)); +-#else /* GNUC < 2.5 */ +-void die (int errcode, const char *fmt, ...); +-#endif /* GNUC < 2.5 */ +-#else /* !__GNUC__ */ +-void die (int errcode, const char *fmt, ...); +-#endif /* !__GNUC__ */ + + #ifdef HAVE_NFS + int nfsmount (const char *spec, const char *node, int *flags, diff --git a/sys-apps/watchdog/files/watchdog-5.2.4_p5-uclibc.patch b/sys-apps/watchdog/files/watchdog-5.2.4_p5-uclibc.patch new file mode 100644 index 000000000000..1986ed88774a --- /dev/null +++ b/sys-apps/watchdog/files/watchdog-5.2.4_p5-uclibc.patch @@ -0,0 +1,11 @@ +--- src/fstab.c.orig 2004-08-23 15:32:22 +0000 ++++ src/fstab.c 2004-08-23 15:32:36 +0000 +@@ -237,7 +237,7 @@ + /* Ensure that the lock is released if we are interrupted. */ + static void + handler (int sig) { +- die (EX_USER, "%s", sys_siglist[sig]); ++ die (EX_USER, "%s", strsignal(sig)); + } + + static void diff --git a/sys-apps/watchdog/metadata.xml b/sys-apps/watchdog/metadata.xml new file mode 100644 index 000000000000..5e9f503cc871 --- /dev/null +++ b/sys-apps/watchdog/metadata.xml @@ -0,0 +1,8 @@ + + + +kernel + + brix@gentoo.org + + diff --git a/sys-apps/watchdog/watchdog-5.2.4_p5.ebuild b/sys-apps/watchdog/watchdog-5.2.4_p5.ebuild new file mode 100644 index 000000000000..a3d1d724fa4a --- /dev/null +++ b/sys-apps/watchdog/watchdog-5.2.4_p5.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.2.4_p5.ebuild,v 1.1 2005/11/27 10:14:24 brix Exp $ + +inherit eutils + +MY_P=${PN}_${PV/_p*/} +S=${WORKDIR}/${P/_p*/}.orig + +DESCRIPTION="A software watchdog" +HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/" +SRC_URI="mirror://debian/pool/main/w/watchdog/${MY_P}.orig.tar.gz + mirror://debian/pool/main/w/watchdog/${MY_P}-5.diff.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" + +IUSE="" +DEPEND="" + +src_unpack() { + unpack ${A} + + cd "${S}" + epatch "${FILESDIR}"/${P}-sundries.patch + epatch "${FILESDIR}"/${P}-uclibc.patch + epatch "${WORKDIR}"/${MY_P}-5.diff +} + +src_compile() { + econf || die "econf failed" + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + + newconfd ${FILESDIR}/${P}-conf.d ${PN} + newinitd ${FILESDIR}/${P}-init.d ${PN} + + dodoc AUTHORS README TODO + docinto examples + dodoc examples/* +} + +pkg_postinst() { + einfo + einfo "To enable the start-up script run:" + einfo " # rc-update add watchdog boot" + einfo + + if [[ -f ${ROOT}/etc/watchdog/watchdog.conf ]]; then + ewarn + ewarn "Please notice that this release changes the configuration file" + ewarn "location to the standard /etc/watchdog.conf location. Make sure" + ewarn "you move the old /etc/watchdog/watchdog.conf file there." + ewarn + fi +} -- cgit v1.2.3-65-gdbad