From d32b6b1b9925fad5de39c060644b4da56212f37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20K=C3=B6nig?= Date: Sun, 7 Sep 2014 18:39:14 +0200 Subject: [PATCH] collectd: Update to 4.10.9 Signed-off-by: Christoph Koenig --- utils/collectd/Makefile | 6 +++--- utils/collectd/patches/003-remove-werror.patch | 6 +++--- utils/collectd/patches/130-timeleft-max.patch | 1 - utils/collectd/patches/200-fix-git-describe-error.patch | 2 +- utils/collectd/patches/900-add-iwinfo-plugin.patch | 8 ++++---- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index a7b4315cfc088..ec8ca54adce55 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=collectd -PKG_VERSION:=4.10.8 -PKG_RELEASE:=3 +PKG_VERSION:=4.10.9 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://collectd.org/files/ -PKG_MD5SUM:=7a60495208b9383225493c6dd6abb2f0 +PKG_MD5SUM:=980dd3387508f9ad209df04a6f7a126c PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4 diff --git a/utils/collectd/patches/003-remove-werror.patch b/utils/collectd/patches/003-remove-werror.patch index 0e572bf312ec8..1ff2a15f7492f 100644 --- a/utils/collectd/patches/003-remove-werror.patch +++ b/utils/collectd/patches/003-remove-werror.patch @@ -11,7 +11,7 @@ AM_CPPFLAGS = -DPREFIX='"${prefix}"' --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -1833,7 +1833,7 @@ top_build_prefix = @top_build_prefix@ +@@ -1835,7 +1835,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = libcollectdclient $(am__append_1) $(am__append_2) @@ -33,7 +33,7 @@ pkginclude_HEADERS = client.h lcc_features.h --- a/src/libcollectdclient/Makefile.in +++ b/src/libcollectdclient/Makefile.in -@@ -327,7 +327,7 @@ top_build_prefix = @top_build_prefix@ +@@ -329,7 +329,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies @@ -55,7 +55,7 @@ noinst_LTLIBRARIES = libiptc.la --- a/src/owniptc/Makefile.in +++ b/src/owniptc/Makefile.in -@@ -296,7 +296,7 @@ top_builddir = @top_builddir@ +@@ -298,7 +298,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies EXTRA_DIST = libiptc.c README.collectd diff --git a/utils/collectd/patches/130-timeleft-max.patch b/utils/collectd/patches/130-timeleft-max.patch index f2631529504e8..5313c661a5e7a 100644 --- a/utils/collectd/patches/130-timeleft-max.patch +++ b/utils/collectd/patches/130-timeleft-max.patch @@ -11,4 +11,3 @@ Derived from uptream commit d5b09f2b: http://octo.cx/d5b09f2 time_offset seconds:GAUGE:-1000000:1000000 total_bytes value:DERIVE:0:U total_requests value:DERIVE:0:U - diff --git a/utils/collectd/patches/200-fix-git-describe-error.patch b/utils/collectd/patches/200-fix-git-describe-error.patch index 1946650a73013..7608d85f78d7c 100644 --- a/utils/collectd/patches/200-fix-git-describe-error.patch +++ b/utils/collectd/patches/200-fix-git-describe-error.patch @@ -2,7 +2,7 @@ +++ b/version-gen.sh @@ -2,7 +2,7 @@ - DEFAULT_VERSION="4.10.8.git" + DEFAULT_VERSION="4.10.9.git" -VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`" +#VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`" diff --git a/utils/collectd/patches/900-add-iwinfo-plugin.patch b/utils/collectd/patches/900-add-iwinfo-plugin.patch index a63549332572b..d2090dde640a7 100644 --- a/utils/collectd/patches/900-add-iwinfo-plugin.patch +++ b/utils/collectd/patches/900-add-iwinfo-plugin.patch @@ -10,7 +10,7 @@ # # Checks for typedefs, structures, and compiler characteristics. # -@@ -4081,6 +4084,7 @@ plugin_interface="no" +@@ -4078,6 +4081,7 @@ plugin_interface="no" plugin_ipmi="no" plugin_ipvs="no" plugin_irq="no" @@ -18,7 +18,7 @@ plugin_libvirt="no" plugin_load="no" plugin_memory="no" -@@ -4388,6 +4392,7 @@ AC_PLUGIN([ipmi], [$plugin_ipmi], +@@ -4385,6 +4389,7 @@ AC_PLUGIN([ipmi], [$plugin_ipmi], AC_PLUGIN([iptables], [$with_libiptc], [IPTables rule counters]) AC_PLUGIN([ipvs], [$plugin_ipvs], [IPVS connection statistics]) AC_PLUGIN([irq], [$plugin_irq], [IRQ statistics]) @@ -26,7 +26,7 @@ AC_PLUGIN([java], [$with_java], [Embed the Java Virtual Machine]) AC_PLUGIN([libvirt], [$plugin_libvirt], [Virtual machine statistics]) AC_PLUGIN([load], [$plugin_load], [System load]) -@@ -4666,6 +4671,7 @@ Configuration: +@@ -4663,6 +4668,7 @@ Configuration: protobuf-c . . . . . $have_protoc_c oracle . . . . . . . $with_oracle python . . . . . . . $with_python @@ -34,7 +34,7 @@ Features: daemon mode . . . . . $enable_daemon -@@ -4705,6 +4711,7 @@ Configuration: +@@ -4702,6 +4708,7 @@ Configuration: iptables . . . . . . $enable_iptables ipvs . . . . . . . . $enable_ipvs irq . . . . . . . . . $enable_irq