diff options
| -rw-r--r-- | sys-apps/watchdog/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/watchdog/files/musl-Fix-build-issues-found-with-non-glibc-C-libraries.patch | 96 | ||||
| -rw-r--r-- | sys-apps/watchdog/watchdog-5.14.ebuild | 42 |
3 files changed, 1 insertions, 140 deletions
diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest index b521b01b..e264a38a 100644 --- a/sys-apps/watchdog/Manifest +++ b/sys-apps/watchdog/Manifest @@ -1,2 +1 @@ -DIST watchdog-5.14.tar.gz 216384 SHA256 620b2f49e9879f2e85c73d4c1f422f9101e6b38e824fea2414befd8bb6866ad1 SHA512 ccfaca7a68a47cff42dbeae047dfa691e1cfc23851f9ca0634ea6315ff55a13cdbb0020bde7df38b702c82c0535ad41f520617dd639037e171701a6b0f8991aa WHIRLPOOL 5520e0a4970a20c25780d507260380acf2056828bad8702de98039876526c39a40f884eb1b684cf39386479e6d40c08f3134b138cc6caf51b4150289a364239c -DIST watchdog-5.15.tar.gz 228132 SHA256 ffdc865137ad5d8e53664bd22bad4de6ca136d1b4636720320cb52af0c18947c SHA512 a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75 WHIRLPOOL ebd7ee604ddbad856760949b16615693b1665289d57312f7dee10cea1d358dbd20f2beb2656e549a80c81ad08e5e6de8621cda3ad4eb696e9af7b63b8b4045b9 +DIST watchdog-5.15.tar.gz 228132 SHA256 ffdc865137ad5d8e53664bd22bad4de6ca136d1b4636720320cb52af0c18947c SHA512 a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75
\ No newline at end of file diff --git a/sys-apps/watchdog/files/musl-Fix-build-issues-found-with-non-glibc-C-libraries.patch b/sys-apps/watchdog/files/musl-Fix-build-issues-found-with-non-glibc-C-libraries.patch deleted file mode 100644 index ca2b9c7f..00000000 --- a/sys-apps/watchdog/files/musl-Fix-build-issues-found-with-non-glibc-C-libraries.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 83ec34df357218a1c9cfc13a23d3367d333652c3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 30 Dec 2015 01:01:15 +0000 -Subject: [PATCH] Fix build issues found with non glibc C libraries - -Add time.h for getting time_t definition -limits.h for PATH_MAX -linux/param.h for EXEC_PAGESIZE -Replace deprecated MNTTAB with _PATH_MNTTAB -include ext2_mnt.h for MNTOPT_USRQUOTA and MNTOPT_GRPQUOTA and -MNTTYPE_EXT2 -Include sys/types.h for u_char definition - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - include/extern.h | 1 + - src/configfile.c | 1 + - src/memory.c | 3 +++ - src/net.c | 1 + - src/shutdown.c | 3 ++- - 5 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/include/extern.h b/include/extern.h -index 21db11b..04b16bc 100644 ---- a/include/extern.h -+++ b/include/extern.h -@@ -3,6 +3,7 @@ - - #include <netinet/in.h> - #include <stdio.h> -+#include <time.h> - - #include "logmessage.h" - #include "xmalloc.h" -diff --git a/src/configfile.c b/src/configfile.c -index be5d7b3..7c1d1dd 100644 ---- a/src/configfile.c -+++ b/src/configfile.c -@@ -16,6 +16,7 @@ - #include <errno.h> - #include <string.h> - #include <dirent.h> -+#include <limits.h> - #include <sys/stat.h> - - #include "extern.h" -diff --git a/src/memory.c b/src/memory.c -index e9607e4..b5e08aa 100644 ---- a/src/memory.c -+++ b/src/memory.c -@@ -21,6 +21,9 @@ - #include <sys/stat.h> - #include <sys/param.h> - #include <sys/mman.h> -+#ifdef __linux__ -+#include <linux/param.h> -+#endif - - #include "extern.h" - #include "watch_err.h" -diff --git a/src/net.c b/src/net.c -index 21823ae..8930caf 100644 ---- a/src/net.c -+++ b/src/net.c -@@ -17,6 +17,7 @@ - #include <string.h> - #include <unistd.h> /* for gethostname() etc */ - #include <netdb.h> /* for gethostbyname() */ -+#include <sys/types.h> - #include <sys/param.h> /* for MAXHOSTNAMELEN */ - #include <sys/socket.h> - #include <netinet/in.h> -diff --git a/src/shutdown.c b/src/shutdown.c -index 74aafa5..46b99cf 100644 ---- a/src/shutdown.c -+++ b/src/shutdown.c -@@ -25,6 +25,7 @@ - - #include "watch_err.h" - #include "extern.h" -+#include "ext2_mnt.h" - - #if defined __GLIBC__ - #include "ext2_mnt.h" -@@ -123,7 +124,7 @@ static void mnt_off() - FILE *fp; - struct mntent *mnt; - -- fp = setmntent(MNTTAB, "r"); -+ fp = setmntent(_PATH_MNTTAB, "r"); - /* in some rare cases fp might be NULL so be careful */ - while (fp != NULL && ((mnt = getmntent(fp)) != (struct mntent *)0)) { - /* First check if swap */ --- -2.6.4 - diff --git a/sys-apps/watchdog/watchdog-5.14.ebuild b/sys-apps/watchdog/watchdog-5.14.ebuild deleted file mode 100644 index b9a6ae9c..00000000 --- a/sys-apps/watchdog/watchdog-5.14.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs flag-o-matic systemd - -DESCRIPTION="A software watchdog and /dev/watchdog daemon" -HOMEPAGE="https://sourceforge.net/projects/watchdog/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~mips ppc x86" -IUSE="nfs" - -DEPEND="nfs? ( net-libs/libtirpc )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/musl-Fix-build-issues-found-with-non-glibc-C-libraries.patch" - "${FILESDIR}/musl-Compile-with-musl-when-nfs-is-disabled.patch" -) - -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} - systemd_dounit "${FILESDIR}"/watchdog.service -} |