From: Steven Barth <cyrus@openwrt.org>
Date: Thu, 17 Jul 2008 19:35:09 +0000 (+0000)
Subject: [packages] utils/collectd: Updated to 4.4.2
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=81f721b22a43cffc5608db019cb12823c7facb83

[packages] utils/collectd: Updated to 4.4.2

SVN-Revision: 11854
---

diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile
index a3d682a987..233009b046 100644
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=collectd
-PKG_VERSION:=4.4.1
+PKG_VERSION:=4.4.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://collectd.org/files/
-PKG_MD5SUM:=176880c32a06bee9d5e6e2e7c76751a3
+PKG_MD5SUM:=faee2bb6e38da1051fdd31762bdf3ab7
 
 PKG_FIXUP=libtool
 
diff --git a/utils/collectd/patches/010-rrdtool-link-zlib.patch b/utils/collectd/patches/010-rrdtool-link-zlib.patch
index 771f3aedc6..da44a68266 100644
--- a/utils/collectd/patches/010-rrdtool-link-zlib.patch
+++ b/utils/collectd/patches/010-rrdtool-link-zlib.patch
@@ -1,6 +1,8 @@
---- collectd-4.4.0.orig/configure	2008-05-26 17:54:07.000000000 +0200
-+++ collectd-4.4.0/configure	2008-05-26 19:10:23.000000000 +0200
-@@ -31551,7 +31551,7 @@
+Index: collectd-4.4.2/configure
+===================================================================
+--- collectd-4.4.2.orig/configure	2008-07-17 19:34:16.000000000 +0200
++++ collectd-4.4.2/configure	2008-07-17 19:34:25.000000000 +0200
+@@ -31428,7 +31428,7 @@
    withval=$with_rrdtool; 	if test "x$withval" != "xno" && test "x$withval" != "xyes"
  	then
  		librrd_cflags="-I$withval/include"
diff --git a/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch b/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch
index dcab4a687d..23c7861cde 100644
--- a/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch
+++ b/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch
@@ -1,6 +1,7 @@
-diff -ur collectd-4.4.0.orig/src/rrdtool.c collectd-4.4.0/src/rrdtool.c
---- collectd-4.4.0.orig/src/rrdtool.c	2008-05-22 21:05:58.000000000 +0200
-+++ collectd-4.4.0/src/rrdtool.c	2008-05-22 21:08:11.000000000 +0200
+Index: collectd-4.4.2/src/rrdtool.c
+===================================================================
+--- collectd-4.4.2.orig/src/rrdtool.c	2008-07-17 19:30:00.000000000 +0200
++++ collectd-4.4.2/src/rrdtool.c	2008-07-17 19:30:44.000000000 +0200
 @@ -87,6 +87,7 @@
  	"HeartBeat",
  	"RRARows",
@@ -24,4 +25,3 @@ diff -ur collectd-4.4.0.orig/src/rrdtool.c collectd-4.4.0/src/rrdtool.c
  	else
  	{
  		return (-1);
-Nur in collectd-4.4.0/src: rrdtool.c~.
diff --git a/utils/collectd/patches/200-wireless-compat.patch b/utils/collectd/patches/200-wireless-compat.patch
deleted file mode 100644
index 72fe43fd1b..0000000000
--- a/utils/collectd/patches/200-wireless-compat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: collectd-4.4.0/src/wireless.c
-===================================================================
---- collectd-4.4.0.orig/src/wireless.c	2008-06-05 21:47:01.000000000 +0200
-+++ collectd-4.4.0/src/wireless.c	2008-06-05 21:48:33.000000000 +0200
-@@ -128,7 +128,9 @@
- 			power = 1.0; /* invalid */
- 		else if ((power >= 0.0) && (power <= 100.0))
- 			power = wireless_percent_to_power (power);
--		else if (power > 100.0)
-+		else if ((power > 100.0) && (power <= 256.0))
-+			power = power - 256.0;
-+		else if (power > 0.0)
- 			power = 1.0; /* invalid */
- 
- 		/* noise [dBm] < 0.0 */
-@@ -137,7 +139,9 @@
- 			noise = 1.0; /* invalid */
- 		else if ((noise >= 0.0) && (noise <= 100.0))
- 			noise = wireless_percent_to_power (noise);
--		else if (noise > 100.0)
-+		else if ((noise > 100.0) && (noise <= 256.0))
-+			noise = noise - 256.0;
-+		else if (noise > 0.0)
- 			noise = 1.0; /* invalid */
- 
- 		wireless_submit (device, "signal_quality", quality);