bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] utils/collectd: Updated to 4.4.2

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@11854 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
cyrus 2008-07-17 19:35:09 +00:00
parent 89ba936c96
commit 980b2ca8e6
4 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/collectd/Makefile
View File

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=collectd PKG_NAME:=collectd
PKG_VERSION:=4.4.1 PKG_VERSION:=4.4.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://collectd.org/files/ PKG_SOURCE_URL:=http://collectd.org/files/
PKG_MD5SUM:=176880c32a06bee9d5e6e2e7c76751a3 PKG_MD5SUM:=faee2bb6e38da1051fdd31762bdf3ab7
PKG_FIXUP=libtool PKG_FIXUP=libtool

8
utils/collectd/patches/010-rrdtool-link-zlib.patch
View File

@ -1,6 +1,8 @@
--- collectd-4.4.0.orig/configure 2008-05-26 17:54:07.000000000 +0200 Index: collectd-4.4.2/configure
+++ collectd-4.4.0/configure 2008-05-26 19:10:23.000000000 +0200 ===================================================================
@@ -31551,7 +31551,7 @@ --- 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" withval=$with_rrdtool; if test "x$withval" != "xno" && test "x$withval" != "xyes"
then then
librrd_cflags="-I$withval/include" librrd_cflags="-I$withval/include"

8
utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch
View File

@ -1,6 +1,7 @@
diff -ur collectd-4.4.0.orig/src/rrdtool.c collectd-4.4.0/src/rrdtool.c Index: collectd-4.4.2/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 --- 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 @@ @@ -87,6 +87,7 @@
"HeartBeat", "HeartBeat",
"RRARows", "RRARows",
@ -24,4 +25,3 @@ diff -ur collectd-4.4.0.orig/src/rrdtool.c collectd-4.4.0/src/rrdtool.c
else else
{ {
return (-1); return (-1);
Nur in collectd-4.4.0/src: rrdtool.c~.

26
utils/collectd/patches/200-wireless-compat.patch
View File

@ -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);