diff options
| author |   Felix Janda <felix.janda@posteo.de> | 2017-04-14 17:56:20 -0400 |
|---|---|---|
| committer |   Robin H. Johnson <robbat2@gentoo.org> | 2017-06-05 14:13:39 -0700 |
| commit | b25df17dd08aa5150ea3e09dbf79cdf7c73e02ed (patch) | |
| tree | ed93cacc492226cf7ff4702e1d878d19779857d1 /sys-apps/watchdog/files | |
| parent | sys-apps/iucode_tool: Security cleanup (bug #606724) (diff) | |
| download | gentoo-b25df17dd08aa5150ea3e09dbf79cdf7c73e02ed.tar.gz gentoo-b25df17dd08aa5150ea3e09dbf79cdf7c73e02ed.tar.bz2 gentoo-b25df17dd08aa5150ea3e09dbf79cdf7c73e02ed.zip | |
sys-apps/watchdog: add two musl patches and bump eapi
Gentoo-Bug: https://bugs.gentoo.org/604260
(cherry picked from commit 02ab37b0d2b57a6c40e0b93978d37d8c4dc611bb)
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Fixes: https://github.com/gentoo/gentoo/pull/4423
Diffstat (limited to 'sys-apps/watchdog/files')
| -rw-r--r-- | sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch | 27 | ||||
| -rw-r--r-- | sys-apps/watchdog/files/watchdog-5.15-musl.patch | 23 |
2 files changed, 50 insertions, 0 deletions
diff --git a/sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch b/sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch new file mode 100644 index 000000000000..bee4ddc8d7bc --- /dev/null +++ b/sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch @@ -0,0 +1,27 @@ +commit f52c40680f0aad44b9ae16648803453ec00cbb2c +Author: Paul Crawford <psc@sat.dundee.ac.uk> +Date: Fri Dec 30 15:55:45 2016 +0000 + + Compile with musl when nfs is disabled + + musl does by default not ship with rpc headers. The watchdog should + not require rpc headers when nfs support is disabled. + + Patch by Felix Janda <fjanda@users.sf.net> + +diff --git a/include/sundries.h b/include/sundries.h +index 4379982..98c489a 100644 +--- a/include/sundries.h ++++ b/include/sundries.h +@@ -9,9 +9,11 @@ + #include <signal.h> + #include <stdarg.h> + #include <stdlib.h> ++#if HAVE_NFS + #if !defined(bool_t) && !defined(__GLIBC__) + #include <rpc/types.h> + #endif ++#endif + + extern int mount_mount_quiet; + extern int mount_verbose; diff --git a/sys-apps/watchdog/files/watchdog-5.15-musl.patch b/sys-apps/watchdog/files/watchdog-5.15-musl.patch new file mode 100644 index 000000000000..ae62c8014e5b --- /dev/null +++ b/sys-apps/watchdog/files/watchdog-5.15-musl.patch @@ -0,0 +1,23 @@ +commit c5cb4e1a0339844ae3f55ff1dc4a716c28012f05 +Author: Paul Crawford <psc@sat.dundee.ac.uk> +Date: Tue Jun 28 18:08:48 2016 +0100 + + Include linux/param.h for EXEC_PAGESIZE definition + + Musl does not include linux/param.h whereas glibc does, so it fails + to build on musl. Patch supplied by Khem Raj <raj.khem@gmail.com> + +diff --git a/src/watchdog.c b/src/watchdog.c +index acf6450..486384a 100644 +--- a/src/watchdog.c ++++ b/src/watchdog.c +@@ -26,6 +26,9 @@ + #include <sys/param.h> /* For EXEC_PAGESIZE */ + #include <linux/oom.h> + #include <linux/watchdog.h> ++#ifdef __linux__ ++#include <linux/param.h> ++#endif + #include <string.h> + + #include <libgen.h> |