diff options
author | Henrik Brix Andersen <brix@gentoo.org> | 2006-02-13 15:40:10 +0000 |
---|---|---|
committer | Henrik Brix Andersen <brix@gentoo.org> | 2006-02-13 15:40:10 +0000 |
commit | adb54a8141601c360242e7506fa818152c57128a (patch) | |
tree | f1d465a7cf37f5cabcd814631694aaebf6e5bee7 /sys-apps | |
parent | fix small typo (diff) | |
download | gentoo-2-adb54a8141601c360242e7506fa818152c57128a.tar.gz gentoo-2-adb54a8141601c360242e7506fa818152c57128a.tar.bz2 gentoo-2-adb54a8141601c360242e7506fa818152c57128a.zip |
Pruned old ebuild.
(Portage version: 2.0.54)
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/watchdog/ChangeLog | 8 | ||||
-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.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 |
9 files changed, 7 insertions, 150 deletions
diff --git a/sys-apps/watchdog/ChangeLog b/sys-apps/watchdog/ChangeLog index b815efecca5e..44d36b445f29 100644 --- a/sys-apps/watchdog/ChangeLog +++ b/sys-apps/watchdog/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/watchdog # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.7 2006/02/07 21:01:04 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.8 2006/02/13 15:40:10 brix Exp $ + + 13 Feb 2006; 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.4.ebuild: + Pruned old ebuild. 07 Feb 2006; Simon Stelling <blubb@gentoo.org> watchdog-5.2.4_p5.ebuild: stable on amd64 diff --git a/sys-apps/watchdog/files/5.2-alpha.patch b/sys-apps/watchdog/files/5.2-alpha.patch deleted file mode 100644 index 1762e87329f9..000000000000 --- a/sys-apps/watchdog/files/5.2-alpha.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 deleted file mode 100644 index e018571a4d00..000000000000 --- a/sys-apps/watchdog/files/5.2-sundries.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 deleted file mode 100644 index 2d3d0a1f2986..000000000000 --- a/sys-apps/watchdog/files/5.2.4-sundries.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 deleted file mode 100644 index 1986ed88774a..000000000000 --- a/sys-apps/watchdog/files/5.2.4-uclibc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.4 b/sys-apps/watchdog/files/digest-watchdog-5.2.4 deleted file mode 100644 index 7b72645ec9a8..000000000000 --- a/sys-apps/watchdog/files/digest-watchdog-5.2.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 c6ac132d92110eb2c4670d4f684105c3 watchdog_5.2.4.orig.tar.gz 127791 diff --git a/sys-apps/watchdog/files/watchdog b/sys-apps/watchdog/files/watchdog deleted file mode 100644 index cd89322bbdbe..000000000000 --- a/sys-apps/watchdog/files/watchdog +++ /dev/null @@ -1,30 +0,0 @@ -#!/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 deleted file mode 100644 index a7367c6d76ce..000000000000 --- a/sys-apps/watchdog/files/watchdog.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# 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 deleted file mode 100644 index 08f056ef636b..000000000000 --- a/sys-apps/watchdog/watchdog-5.2.4.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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 -} |