summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2014-11-24 02:16:58 +0000
committerTim Harder <radhermit@gentoo.org>2014-11-24 02:16:58 +0000
commita7bdde54436157ed98d3a77fe79e32d718b10221 (patch)
tree6e519b478fd36e956b8453197697eb4f9fb0fc29 /sys-apps
parentVersion bump. (diff)
downloadgentoo-2-a7bdde54436157ed98d3a77fe79e32d718b10221.tar.gz
gentoo-2-a7bdde54436157ed98d3a77fe79e32d718b10221.tar.bz2
gentoo-2-a7bdde54436157ed98d3a77fe79e32d718b10221.zip
Remove old.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/watchdog/ChangeLog9
-rw-r--r--sys-apps/watchdog/files/watchdog-5.2.6-headers.patch104
-rw-r--r--sys-apps/watchdog/files/watchdog-5.2.6-uclibc.patch13
-rw-r--r--sys-apps/watchdog/files/watchdog-5.6-headers.patch42
-rw-r--r--sys-apps/watchdog/files/watchdog-5.9-nfs.patch78
-rw-r--r--sys-apps/watchdog/watchdog-5.12.ebuild37
-rw-r--r--sys-apps/watchdog/watchdog-5.13.ebuild37
-rw-r--r--sys-apps/watchdog/watchdog-5.4.ebuild37
-rw-r--r--sys-apps/watchdog/watchdog-5.6.ebuild33
-rw-r--r--sys-apps/watchdog/watchdog-5.9-r1.ebuild42
-rw-r--r--sys-apps/watchdog/watchdog-5.9.ebuild23
11 files changed, 8 insertions, 447 deletions
diff --git a/sys-apps/watchdog/ChangeLog b/sys-apps/watchdog/ChangeLog
index 12e506ea893a..b8dbcbb4fd27 100644
--- a/sys-apps/watchdog/ChangeLog
+++ b/sys-apps/watchdog/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-apps/watchdog
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.41 2014/11/24 02:16:00 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.42 2014/11/24 02:16:58 radhermit Exp $
+
+ 24 Nov 2014; Tim Harder <radhermit@gentoo.org> -watchdog-5.4.ebuild,
+ -watchdog-5.6.ebuild, -watchdog-5.9.ebuild, -watchdog-5.9-r1.ebuild,
+ -watchdog-5.12.ebuild, -watchdog-5.13.ebuild,
+ -files/watchdog-5.2.6-headers.patch, -files/watchdog-5.2.6-uclibc.patch,
+ -files/watchdog-5.6-headers.patch, -files/watchdog-5.9-nfs.patch:
+ Remove old.
*watchdog-5.14 (24 Nov 2014)
diff --git a/sys-apps/watchdog/files/watchdog-5.2.6-headers.patch b/sys-apps/watchdog/files/watchdog-5.2.6-headers.patch
deleted file mode 100644
index 30b6325c00c8..000000000000
--- a/sys-apps/watchdog/files/watchdog-5.2.6-headers.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-http://sourceforge.net/tracker/index.php?func=detail&aid=1791328&group_id=172030&atid=860196
-
-pull in more headers for prototypes
-
---- watchdog-5.2.6/src/fstab.c
-+++ watchdog-5.2.6/src/fstab.c
-@@ -2,6 +2,7 @@
- #include "config.h"
- #endif
-
-+#define _GNU_SOURCE /* for strsignal() */
- #include <unistd.h>
- #include <errno.h>
- #include <stdio.h>
---- watchdog-5.2.6/src/nfsmount.c
-+++ watchdog-5.2.6/src/nfsmount.c
-@@ -41,6 +41,7 @@
- #include <rpc/pmap_prot.h>
- #include <rpc/pmap_clnt.h>
- #include <sys/socket.h>
-+#include <time.h>
- #include <sys/time.h>
- #include <sys/utsname.h>
- #include <sys/stat.h>
---- watchdog-5.2.6/src/pidfile.c
-+++ watchdog-5.2.6/src/pidfile.c
-@@ -4,6 +4,10 @@
-
- #include <errno.h>
- #include <fcntl.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <stdlib.h>
-+#include <signal.h>
- #include "extern.h"
- #include "watch_err.h"
-
---- watchdog-5.2.6/src/shutdown.c
-+++ watchdog-5.2.6/src/shutdown.c
-@@ -2,6 +2,8 @@
- #include "config.h"
- #endif
-
-+#define _GNU_SOURCE /* for getsid() */
-+
- #include <dirent.h>
- #include <errno.h>
- #include <fcntl.h>
-@@ -12,6 +14,7 @@
- #include <signal.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <time.h>
- #include <utmp.h>
- #include <sys/mman.h>
- #include <sys/param.h>
---- watchdog-5.2.6/src/test_binary.c
-+++ watchdog-5.2.6/src/test_binary.c
-@@ -8,6 +8,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <sys/wait.h>
-+#include <time.h>
- #include "extern.h"
- #include "watch_err.h"
-
---- watchdog-5.2.6/src/wd_keepalive.c
-+++ watchdog-5.2.6/src/wd_keepalive.c
-@@ -15,6 +15,7 @@
- *
- ***********************************************************/
-
-+#define _GNU_SOURCE
- #include <errno.h>
- #include <fcntl.h>
- #include <sched.h>
-@@ -23,7 +24,7 @@
- #include <stdlib.h>
- #include <sys/mman.h>
- #include <sys/wait.h>
--#define __USE_GNU
-+#include <unistd.h>
- #include <string.h>
- #include <syslog.h>
-
---- watchdog-5.2.6/src/watchdog.c
-+++ watchdog-5.2.6/src/watchdog.c
-@@ -11,6 +11,8 @@
-
- #include "extern.h"
-
-+#include <sys/stat.h>
-+#include <libgen.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <getopt.h>
-@@ -21,7 +23,6 @@
- #include <arpa/inet.h>
- #include <sys/mman.h>
- #include <sys/wait.h>
--#define __USE_GNU
- #include <string.h>
-
- #if !defined(__GLIBC__) /* __GLIBC__ */
diff --git a/sys-apps/watchdog/files/watchdog-5.2.6-uclibc.patch b/sys-apps/watchdog/files/watchdog-5.2.6-uclibc.patch
deleted file mode 100644
index a320d50f3aaf..000000000000
--- a/sys-apps/watchdog/files/watchdog-5.2.6-uclibc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://sourceforge.net/tracker/index.php?func=detail&aid=1791329&group_id=172030&atid=860196
-
---- src/fstab.c
-+++ src/fstab.c
-@@ -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/watchdog-5.6-headers.patch b/sys-apps/watchdog/files/watchdog-5.6-headers.patch
deleted file mode 100644
index 846832c6d347..000000000000
--- a/sys-apps/watchdog/files/watchdog-5.6-headers.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-http://sourceforge.net/tracker/index.php?func=detail&aid=1791328&group_id=172030&atid=860196
-
-pull in more headers for prototypes
-
---- watchdog-5.6/src/fstab.c
-+++ watchdog-5.6/src/fstab.c
-@@ -4,6 +4,7 @@
- #include "config.h"
- #endif
-
-+#define _GNU_SOURCE /* for strsignal() */
- #include <unistd.h>
- #include <errno.h>
- #include <stdio.h>
---- watchdog-5.6/src/wd_keepalive.c
-+++ watchdog-5.6/src/wd_keepalive.c
-@@ -24,7 +25,7 @@
- #include <stdlib.h>
- #include <sys/mman.h>
- #include <sys/wait.h>
--#define __USE_GNU
-+#include <libgen.h>
- #include <string.h>
- #include <syslog.h>
-
---- watchdog-5.6/src/watchdog.c
-+++ watchdog-5.6/src/watchdog.c
-@@ -26,12 +26,10 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <linux/watchdog.h>
--#define __USE_GNU
- #include <string.h>
-
--#if !defined(__GLIBC__) /* __GLIBC__ */
--extern char *basename(const char *);
--#endif /* __GLIBC__ */
-+#include <sys/ioctl.h>
-+#include <libgen.h>
-
- #include <unistd.h>
-
diff --git a/sys-apps/watchdog/files/watchdog-5.9-nfs.patch b/sys-apps/watchdog/files/watchdog-5.9-nfs.patch
deleted file mode 100644
index cf670f7d3b47..000000000000
--- a/sys-apps/watchdog/files/watchdog-5.9-nfs.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3314009&group_id=172030&atid=860196
-http://bugs.gentoo.org/370655
-
---- src/nfsmount_clnt.c
-+++ src/nfsmount_clnt.c
-@@ -3,6 +3,9 @@
- * It was generated using rpcgen.
- */
-
-+#include "config.h"
-+#if HAVE_NFS
-+
- #include "nfsmount.h"
- /*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-@@ -279,3 +282,5 @@
- }
- return (&clnt_res);
- }
-+
-+#endif
---- src/nfsmount.c
-+++ src/nfsmount.c
-@@ -34,6 +34,10 @@
- * nfsmount.c,v 1.1.1.1 1993/11/18 08:40:51 jrs Exp
- */
-
-+#include "config.h"
-+
-+#if HAVE_NFS
-+
- #include <unistd.h>
- #include <stdio.h>
- #include <string.h>
-@@ -865,3 +869,5 @@
- return port;
- }
- #endif
-+
-+#endif
---- src/nfsmount_xdr.c
-+++ src/nfsmount_xdr.c
-@@ -3,6 +3,9 @@
- * It was generated using rpcgen.
- */
-
-+#include "config.h"
-+#if HAVE_NFS
-+
- #include "nfsmount.h"
- /*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-@@ -300,3 +303,5 @@
- return FALSE;
- return TRUE;
- }
-+
-+#endif
---- src/shutdown.c
-+++ src/shutdown.c
-@@ -24,7 +24,6 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <time.h>
--#include <rpc/types.h> /* for caddr_t */
-
- #include "watch_err.h"
- #include "extern.h"
---- src/sundries.c
-+++ src/sundries.c
-@@ -12,7 +12,6 @@
- #include <mntent.h> /* for MNTTYPE_SWAP */
- #include "fstab.h"
- #include "sundries.h"
--#include "nfsmount.h"
-
-
- /* String list constructor. (car() and cdr() are defined in "sundries.h"). */
diff --git a/sys-apps/watchdog/watchdog-5.12.ebuild b/sys-apps/watchdog/watchdog-5.12.ebuild
deleted file mode 100644
index 5ed0fe879d48..000000000000
--- a/sys-apps/watchdog/watchdog-5.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.12.ebuild,v 1.2 2013/01/22 18:02:34 vapier Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A software watchdog and /dev/watchdog daemon"
-HOMEPAGE="http://sourceforge.net/projects/watchdog/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="nfs"
-
-DEPEND="nfs? ( net-libs/libtirpc )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- if use nfs ; then
- tc-export PKG_CONFIG
- append-cppflags $(${PKG_CONFIG} libtirpc --cflags)
- export LIBS+=" $(${PKG_CONFIG} libtirpc --libs)"
- fi
- econf $(use_enable nfs)
-}
-
-src_install() {
- default
- docinto examples
- dodoc examples/*
-
- newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
- newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-}
diff --git a/sys-apps/watchdog/watchdog-5.13.ebuild b/sys-apps/watchdog/watchdog-5.13.ebuild
deleted file mode 100644
index 07ca1d05aa03..000000000000
--- a/sys-apps/watchdog/watchdog-5.13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.13.ebuild,v 1.1 2013/02/08 08:18:45 vapier Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A software watchdog and /dev/watchdog daemon"
-HOMEPAGE="http://sourceforge.net/projects/watchdog/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="nfs"
-
-DEPEND="nfs? ( net-libs/libtirpc )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- if use nfs ; then
- tc-export PKG_CONFIG
- append-cppflags $(${PKG_CONFIG} libtirpc --cflags)
- export LIBS+=" $(${PKG_CONFIG} libtirpc --libs)"
- fi
- econf $(use_enable nfs)
-}
-
-src_install() {
- default
- docinto examples
- dodoc examples/*
-
- newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
- newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-}
diff --git a/sys-apps/watchdog/watchdog-5.4.ebuild b/sys-apps/watchdog/watchdog-5.4.ebuild
deleted file mode 100644
index c375d3d38db7..000000000000
--- a/sys-apps/watchdog/watchdog-5.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.4.ebuild,v 1.6 2011/02/12 18:56:15 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="A software watchdog"
-HOMEPAGE="http://sourceforge.net/projects/watchdog/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm m68k ~mips ppc s390 sh ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-5.2.6-headers.patch
- epatch "${FILESDIR}"/${PN}-5.2.6-uclibc.patch
-# epatch "${WORKDIR}"/${MY_P}-${PATCH_LEVEL}.diff
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
-
- newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
- newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-
- dodoc AUTHORS README TODO NEWS ChangeLog
- docinto examples
- dodoc examples/*
-}
diff --git a/sys-apps/watchdog/watchdog-5.6.ebuild b/sys-apps/watchdog/watchdog-5.6.ebuild
deleted file mode 100644
index 184071a949cd..000000000000
--- a/sys-apps/watchdog/watchdog-5.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.6.ebuild,v 1.2 2011/02/12 18:56:15 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="A software watchdog"
-HOMEPAGE="http://sourceforge.net/projects/watchdog/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-5.6-headers.patch
- epatch "${FILESDIR}"/${PN}-5.2.6-uclibc.patch
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
-
- newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
- newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-
- dodoc AUTHORS README TODO NEWS ChangeLog
- docinto examples
- dodoc examples/*
-}
diff --git a/sys-apps/watchdog/watchdog-5.9-r1.ebuild b/sys-apps/watchdog/watchdog-5.9-r1.ebuild
deleted file mode 100644
index 49755dadc502..000000000000
--- a/sys-apps/watchdog/watchdog-5.9-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.9-r1.ebuild,v 1.1 2011/06/09 01:36:47 vapier Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="A software watchdog"
-HOMEPAGE="http://sourceforge.net/projects/watchdog/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="nfs"
-
-DEPEND="nfs? ( net-libs/libtirpc )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-nfs.patch #370655
-}
-
-src_configure() {
- if use nfs ; then
- append-cppflags $($(tc-getPKG_CONFIG) libtirpc --cflags)
- export LIBS+=" $($(tc-getPKG_CONFIG) libtirpc --libs)"
- fi
- econf $(use_enable nfs)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
- newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-
- dodoc AUTHORS README TODO NEWS ChangeLog
- docinto examples
- dodoc examples/*
-}
diff --git a/sys-apps/watchdog/watchdog-5.9.ebuild b/sys-apps/watchdog/watchdog-5.9.ebuild
deleted file mode 100644
index c1368626a0b7..000000000000
--- a/sys-apps/watchdog/watchdog-5.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.9.ebuild,v 1.2 2011/02/12 18:56:15 armin76 Exp $
-
-DESCRIPTION="A software watchdog"
-HOMEPAGE="http://sourceforge.net/projects/watchdog/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
-
- newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
- newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-
- dodoc AUTHORS README TODO NEWS ChangeLog
- docinto examples
- dodoc examples/*
-}