diff options
| author |   Thomas D <whissi@whissi.de> | 2016-03-28 19:28:15 +0200 |
|---|---|---|
| committer |   Ian Delaney <idella4@gentoo.org> | 2016-03-29 21:42:09 +0800 |
| commit | 5fb0a46e73890b4189cdeb73523e1dde0cea9429 (patch) | |
| tree | 8e9f8ee2c9264cd5cc75580e5d93026c2331196c /app-admin/collectd/files | |
| parent | net-misc/connman: Disable compatibility logic to kernels < 4.5 (diff) | |
| download | gentoo-5fb0a46e73890b4189cdeb73523e1dde0cea9429.tar.gz gentoo-5fb0a46e73890b4189cdeb73523e1dde0cea9429.tar.bz2 gentoo-5fb0a46e73890b4189cdeb73523e1dde0cea9429.zip | |
app-admin/collectd: Revbump to fix multiple issues
- Fix building with sys-fs/xfsprogs-4.5.0 (upstream issues #1637)
- Workaround for bug #577846 applied
We are now enforcing <=sys-kernel/linux-headers-4.4 when building
collectd_plugins_iptables until the problem gets fixed in
non-collectd upstram.
- virtual/udev dependency is now optional for disk plugin
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1156
Signed-off-by: Ian Delaney <idella4@gentoo.org>
Diffstat (limited to 'app-admin/collectd/files')
| -rw-r--r-- | app-admin/collectd/files/collectd-5.5.1-issue-1637.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/app-admin/collectd/files/collectd-5.5.1-issue-1637.patch b/app-admin/collectd/files/collectd-5.5.1-issue-1637.patch new file mode 100644 index 000000000000..89baa1249ffb --- /dev/null +++ b/app-admin/collectd/files/collectd-5.5.1-issue-1637.patch @@ -0,0 +1,68 @@ +From 7630585ca596af6334f89db26272d80f4ef02a8a Mon Sep 17 00:00:00 2001 +From: Ruben Kerkhof <ruben@rubenkerkhof.com> +Date: Sat, 26 Mar 2016 18:18:44 +0100 +Subject: [PATCH 4/4] Fix building with xfsprogs 4.5.0 + +commit 865a6c83250e3d4381596a0d937df31d563f97c6 upstream. + +xfsprogs 4.5.0 started to use off64_t in its headers, +which is hidden behind _GNU_SOURCE + +Fixes #1637 +--- + configure.ac | 7 ++++++- + src/utils_mount.c | 13 ++++++++----- + 2 files changed, 14 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 129b9d4..a2058d0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -593,7 +593,12 @@ AC_CHECK_HEADERS(linux/un.h, [], [], + #endif + ]) + +-AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h xfs/xqm.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h sys/vmmeter.h kvm.h wordexp.h locale.h) ++AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h sys/vmmeter.h kvm.h wordexp.h locale.h) ++ ++AC_CHECK_HEADERS([xfs/xqm.h], [], [], ++[ ++#define _GNU_SOURCE ++]) + + # For the dns plugin + AC_CHECK_HEADERS(arpa/nameser.h) +diff --git a/src/utils_mount.c b/src/utils_mount.c +index f2b7943..cf5e97a 100644 +--- a/src/utils_mount.c ++++ b/src/utils_mount.c +@@ -21,18 +21,21 @@ + * Niki W. Waibel <niki.waibel@gmx.net> + **/ + +-#include "collectd.h" +-#include "utils_mount.h" +- +-#include "common.h" /* sstrncpy() et alii */ +-#include "plugin.h" /* ERROR() macro */ ++#if HAVE_CONFIG_H ++# include "config.h" ++#endif + + #if HAVE_XFS_XQM_H ++# define _GNU_SOURCE + # include <xfs/xqm.h> + #define XFS_SUPER_MAGIC_STR "XFSB" + #define XFS_SUPER_MAGIC2_STR "BSFX" + #endif + ++#include "common.h" ++#include "plugin.h" ++#include "utils_mount.h" ++ + #if HAVE_GETVFSSTAT + # if HAVE_SYS_TYPES_H + # include <sys/types.h> +-- +2.7.4 + |