From 929c7d2f088e2df92d67d6ea53fbd85723cbe21b Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Mon, 9 Jan 2012 15:00:08 +0100 Subject: [PATCH] patches/ipvs_h_include, rules: Let the ipvs plugin use linux/ip_vs.h. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit … rather than net/ip_vs.h. Also, make sure to look for the header in /usr/include rather than the kernel directory (which has been deprecated). Force building of the ipvs plugin since configure is not currently able to correctly check for ip_vs.h. --- debian/changelog | 10 ++++++++-- debian/patches/00list | 1 + debian/patches/ipvs_h_include.dpatch | 18 ++++++++++++++++++ debian/rules | 5 +++++ 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100755 debian/patches/ipvs_h_include.dpatch diff --git a/debian/changelog b/debian/changelog index c1accf6..20dd09a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,8 +25,14 @@ collectd (4.10.4-1) unstable; urgency=low * debian/rules: - Append DEB_BUILD_ARCH to JAVA_HOME; this is how it's done in the OpenJDK package. - - -- Sebastian Harl Thu, 05 Jan 2012 16:18:51 +0100 + * debian/patches/ipvs_h_include, debian/rules: + - Let the ipvs plugin use linux/ip_vs.h rather than net/ip_vs.h. Also, + make sure to look for the header in /usr/include rather than the kernel + directory (which has been deprecated). + - Force building of the ipvs plugin since configure is not currently able + to correctly check for ip_vs.h. + + -- Sebastian Harl Mon, 09 Jan 2012 14:35:27 +0100 collectd (4.10.1-2.1) unstable; urgency=high diff --git a/debian/patches/00list b/debian/patches/00list index 070e1e0..87f4b78 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,3 +1,4 @@ rrd_filter_path.dpatch collection_conf_path.dpatch +ipvs_h_include.dpatch bts559801_plugin_find_fix.dpatch diff --git a/debian/patches/ipvs_h_include.dpatch b/debian/patches/ipvs_h_include.dpatch new file mode 100755 index 0000000..b57fb9d --- /dev/null +++ b/debian/patches/ipvs_h_include.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ipvs_h_include.dpatch by Sebastian Harl +## +## DP: Include linux/ip_vs.h. + +@DPATCH@ + +diff a/src/ipvs.c b/src/ipvs.c +--- a/src/ipvs.c ++++ b/src/ipvs.c +@@ -45,6 +45,7 @@ + #endif /* HAVE_NETINET_IN_H */ + + /* this can probably only be found in the kernel sources */ ++#include + #if HAVE_NET_IP_VS_H + # include + #elif HAVE_IP_VS_H diff --git a/debian/rules b/debian/rules index be4441e..7d8139a 100755 --- a/debian/rules +++ b/debian/rules @@ -98,6 +98,11 @@ ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH))) --disable-netlink \ --disable-sensors \ --disable-vserver +else + # configure is not currently able to correctly check for ip_vs.h. + # ipvs_h_include.dpatch takes care of using the right one. Overwriting + # KERNEL_DIR makes sure we don't use any kernel headers directly. + confflags += --enable-ipvs=force KERNEL_DIR=/usr endif # These plugins have not been ported to FreeBSD yet. -- 2.30.2