diff options
author | Henrik Brix Andersen <brix@gentoo.org> | 2005-11-27 10:07:03 +0000 |
---|---|---|
committer | Henrik Brix Andersen <brix@gentoo.org> | 2005-11-27 10:07:03 +0000 |
commit | 1ac0a852d19fc52c1435c970d1164def04079679 (patch) | |
tree | d728254843f6e443a865afeef0149508b569b412 /sys-apps/watchdog | |
parent | Fixed digest issues that were causing digest failures for USE=static wrt secu... (diff) | |
download | historical-1ac0a852d19fc52c1435c970d1164def04079679.tar.gz historical-1ac0a852d19fc52c1435c970d1164def04079679.tar.bz2 historical-1ac0a852d19fc52c1435c970d1164def04079679.zip |
Moved from app-admin/watchdog to sys-apps/watchdog.
Diffstat (limited to 'sys-apps/watchdog')
-rw-r--r-- | sys-apps/watchdog/ChangeLog | 41 | ||||
-rw-r--r-- | sys-apps/watchdog/Manifest | 11 | ||||
-rw-r--r-- | sys-apps/watchdog/files/5.2-alpha.patch | 12 | ||||
-rw-r--r-- | sys-apps/watchdog/files/5.2-sundries.patch | 20 | ||||
-rw-r--r-- | sys-apps/watchdog/files/5.2.4-sundries.patch | 19 | ||||
-rw-r--r-- | sys-apps/watchdog/files/5.2.4-uclibc.patch | 11 | ||||
-rw-r--r-- | sys-apps/watchdog/files/digest-watchdog-5.2 | 1 | ||||
-rw-r--r-- | sys-apps/watchdog/files/digest-watchdog-5.2.4 | 1 | ||||
-rw-r--r-- | sys-apps/watchdog/files/watchdog | 30 | ||||
-rw-r--r-- | sys-apps/watchdog/files/watchdog.conf.d | 6 | ||||
-rw-r--r-- | sys-apps/watchdog/watchdog-5.2.4.ebuild | 50 | ||||
-rw-r--r-- | sys-apps/watchdog/watchdog-5.2.ebuild | 50 |
12 files changed, 252 insertions, 0 deletions
diff --git a/sys-apps/watchdog/ChangeLog b/sys-apps/watchdog/ChangeLog new file mode 100644 index 000000000000..614924482dac --- /dev/null +++ b/sys-apps/watchdog/ChangeLog @@ -0,0 +1,41 @@ +# 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 $ + + 27 Nov 2005; Henrik Brix Andersen <brix@gentoo.org> + +files/5.2.4-sundries.patch, +files/5.2.4-uclibc.patch, + +files/5.2-alpha.patch, +files/5.2-sundries.patch, +files/watchdog, + +files/watchdog.conf.d, +watchdog-5.2.ebuild, +watchdog-5.2.4.ebuild: + Moved from app-admin/watchdog to sys-apps/watchdog. + + 24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> watchdog-5.2.4.ebuild: + Stable on ppc. + + 31 Aug 2004; David Holm <dholm@gentoo.org> watchdog-5.2.4.ebuild: + Added to ~ppc. + +*watchdog-5.2.4 (06 Aug 2004) + + 06 Aug 2004; Mike Frysinger <vapier@gentoo.org> + +files/5.2.4-sundries.patch, +watchdog-5.2.4.ebuild: + Add mysterious 5.2.4 version from debian. + + 25 Apr 2004; Aron Griffis <agriffis@gentoo.org> watchdog-5.2.ebuild: + Add die following econf for bug 48950 + +*watchdog-5.2 (Mar 3, 2002) + + 27 Mar 2003; Alastair Tse <liquidx@gentoo.org> watchdog-5.2.ebuild, + files/watchdog-5.2-alpha.diff: + added glibc-2.3.2 errno fix. thanks to pst@ican.at. fixes #18219. + + 29 Oct 2002; Nick Hadaway <raker@gentoo.org> watchdog-5.2.ebuild, + files/sundries.diff : + Added a diff to fix compiling problems. See bug #8567 + + 30 Jul 2002; Calum Selkirk <cselkirk@gentoo.org> watchdog-5.2.ebuild : + Added -ppc to KEYWORDS. Added DEPEND and RDEPEND. + + 3 Mar 2002; Arcady Genkin <agenkin@thpoon.com> watchdog-5.2.ebuild : + This is the first version of this package, submitted by + Leknor@Leknor.com (William A. McArthur, Jr.). diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest new file mode 100644 index 000000000000..b9df5b365959 --- /dev/null +++ b/sys-apps/watchdog/Manifest @@ -0,0 +1,11 @@ +MD5 8709dad0d36ee7b8d5cb4afb862214ca ChangeLog 1340 +MD5 589ee02d80408ee2235c9abb2c48cba1 watchdog-5.2.ebuild 1332 +MD5 a8963102748c137e648c1dcaf28f1029 watchdog-5.2.4.ebuild 1314 +MD5 757b9ad893b290e7f0e8281d87970b1e files/watchdog.conf.d 273 +MD5 b8a1e49beda941e07c53020b8fb7a1a9 files/digest-watchdog-5.2 64 +MD5 96232179b747a1bcacf83442f9217ec4 files/5.2-alpha.patch 329 +MD5 9295e082000d8e9585828e14b9247524 files/watchdog 660 +MD5 a9e8cf348af5828fbdc72e8c1a3bb730 files/5.2-sundries.patch 874 +MD5 0f333f39bc92c0a210e813ee338da9e7 files/digest-watchdog-5.2.4 71 +MD5 ba2c02768a2e772c14e6332dd6b2e65e files/5.2.4-sundries.patch 752 +MD5 e3a3640b31e70f2956ed8ed4bb39f04a files/5.2.4-uclibc.patch 312 diff --git a/sys-apps/watchdog/files/5.2-alpha.patch b/sys-apps/watchdog/files/5.2-alpha.patch new file mode 100644 index 000000000000..1762e87329f9 --- /dev/null +++ b/sys-apps/watchdog/files/5.2-alpha.patch @@ -0,0 +1,12 @@ +--- watchdog-5.2/src/quotactl.c 1999-09-09 11:03:06.000000000 +0200 ++++ watchdog-5.2-modified/src/quotactl.c 2003-03-26 14:51:41.000000000 +0100 +@@ -23,8 +23,8 @@ + #include "config.h" + #endif + +-#if defined(__alpha__) + #include <errno.h> ++#if defined(__alpha__) + #include <sys/types.h> + #include <syscall.h> + #include <unistd.h> diff --git a/sys-apps/watchdog/files/5.2-sundries.patch b/sys-apps/watchdog/files/5.2-sundries.patch new file mode 100644 index 000000000000..e018571a4d00 --- /dev/null +++ b/sys-apps/watchdog/files/5.2-sundries.patch @@ -0,0 +1,20 @@ +diff -urN watchdog-5.2/include/sundries.h watchdog-5.2-modified/include/sundries.h +--- watchdog-5.2/include/sundries.h 1998-09-10 10:19:11.000000000 -0500 ++++ watchdog-5.2-modified/include/sundries.h 2002-10-29 10:30:49.000000000 -0600 +@@ -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 volatile 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/5.2.4-sundries.patch b/sys-apps/watchdog/files/5.2.4-sundries.patch new file mode 100644 index 000000000000..2d3d0a1f2986 --- /dev/null +++ b/sys-apps/watchdog/files/5.2.4-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/5.2.4-uclibc.patch b/sys-apps/watchdog/files/5.2.4-uclibc.patch new file mode 100644 index 000000000000..1986ed88774a --- /dev/null +++ b/sys-apps/watchdog/files/5.2.4-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/files/digest-watchdog-5.2 b/sys-apps/watchdog/files/digest-watchdog-5.2 new file mode 100644 index 000000000000..ff7a265cda3f --- /dev/null +++ b/sys-apps/watchdog/files/digest-watchdog-5.2 @@ -0,0 +1 @@ +MD5 aed04b6789fc592a401c05b8f3828a16 watchdog-5.2.tar.gz 126296 diff --git a/sys-apps/watchdog/files/digest-watchdog-5.2.4 b/sys-apps/watchdog/files/digest-watchdog-5.2.4 new file mode 100644 index 000000000000..7b72645ec9a8 --- /dev/null +++ b/sys-apps/watchdog/files/digest-watchdog-5.2.4 @@ -0,0 +1 @@ +MD5 c6ac132d92110eb2c4670d4f684105c3 watchdog_5.2.4.orig.tar.gz 127791 diff --git a/sys-apps/watchdog/files/watchdog b/sys-apps/watchdog/files/watchdog new file mode 100644 index 000000000000..cd89322bbdbe --- /dev/null +++ b/sys-apps/watchdog/files/watchdog @@ -0,0 +1,30 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/files/watchdog,v 1.1 2005/11/27 10:07:03 brix Exp $ + +depend() { + need localmount + use logger +} + +checkconfig() { + if [ ! -e /dev/watchdog ] ; then + eerror "/dev/watchdog does not exist!" + return 1 + fi + return 0 +} + +start() { + checkconfig || return 1 + 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.conf.d b/sys-apps/watchdog/files/watchdog.conf.d new file mode 100644 index 000000000000..a7367c6d76ce --- /dev/null +++ b/sys-apps/watchdog/files/watchdog.conf.d @@ -0,0 +1,6 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/files/watchdog.conf.d,v 1.1 2005/11/27 10:07:03 brix Exp $ + +# for more info, see watchdog(8) +WATCHDOG_OPTS="" diff --git a/sys-apps/watchdog/watchdog-5.2.4.ebuild b/sys-apps/watchdog/watchdog-5.2.4.ebuild new file mode 100644 index 000000000000..08f056ef636b --- /dev/null +++ b/sys-apps/watchdog/watchdog-5.2.4.ebuild @@ -0,0 +1,50 @@ +# 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.ebuild,v 1.1 2005/11/27 10:07:03 brix Exp $ + +inherit eutils + +DESCRIPTION="A software watchdog" +HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/" +SRC_URI="mirror://debian/pool/main/w/watchdog/${PN}_${PV}.orig.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm ~mips ppc x86" +IUSE="" + +DEPEND="" + +S=${WORKDIR}/${P}.orig + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PV}-sundries.patch + epatch "${FILESDIR}"/${PV}-uclibc.patch +} + +src_compile() { + econf \ + --sysconfdir=/etc/watchdog \ + --with-configfile=/etc/watchdog/watchdog.conf \ + || die "econf failed" + emake || die +} + +src_install() { + dodir /etc/watchdog + make DESTDIR="${D}" install || die + + doinitd ${FILESDIR}/watchdog + newconfd ${FILESDIR}/watchdog.conf.d watchdog +} + +pkg_postinst() { + einfo "To enable the start-up script run \"rc-update add watchdog boot\"." + if [[ ! -e ${ROOT}/dev/watchdog ]] ; then + ewarn "No /dev/watchdog found! Make sure your kernel has watchdog support" + ewarn "compiled in or the kernel module is loaded. The watchdog service" + ewarn "will not start at boot until your kernel is configured properly." + fi +} diff --git a/sys-apps/watchdog/watchdog-5.2.ebuild b/sys-apps/watchdog/watchdog-5.2.ebuild new file mode 100644 index 000000000000..016ca627a1ac --- /dev/null +++ b/sys-apps/watchdog/watchdog-5.2.ebuild @@ -0,0 +1,50 @@ +# 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.ebuild,v 1.1 2005/11/27 10:07:03 brix Exp $ + +inherit eutils + +DESCRIPTION="A software watchdog" +HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/" +SRC_URI="http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +DEPEND="virtual/libc" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${PV}-sundries.patch + epatch ${FILESDIR}/${PV}-alpha.patch +} + +src_compile() { + econf \ + --sysconfdir=/etc/watchdog \ + --with-configfile=/etc/watchdog/watchdog.conf \ + || die "econf failed" + emake || die +} + +src_install() { + dodir /etc/watchdog + make DESTDIR="${D}" install || die + + exeinto /etc/init.d + doexe ${FILESDIR}/watchdog + insinto /etc/conf.d + newins ${FILESDIR}/watchdog.conf.d watchdog +} + +pkg_postinst() { + einfo "To enable the start-up script run \"rc-update add watchdog boot\"." + if [ ! -e ${ROOT}/dev/watchdog ] ; then + ewarn "No /dev/watchdog found! Make sure your kernel has watchdog support" + ewarn "compiled in or the kernel module is loaded. The watchdog service" + ewarn "will not start at boot until your kernel is configured properly." + fi +} |