From 4f6007861e1b6a440ba1b48af0120678c63fa3c4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 13 Dec 2010 19:19:53 +0100 Subject: update package, simplify --- package/rrdcollect/Makefile | 23 +++------ package/rrdcollect/files/rrdcollect.conf | 26 +++++----- package/rrdcollect/files/rrdcollect.init | 9 +--- package/rrdcollect/patches/rrdcollect-scan.patch | 66 ------------------------ 4 files changed, 21 insertions(+), 103 deletions(-) delete mode 100644 package/rrdcollect/patches/rrdcollect-scan.patch diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile index 1a025f37e..f4d562e3a 100644 --- a/package/rrdcollect/Makefile +++ b/package/rrdcollect/Makefile @@ -4,25 +4,22 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rrdcollect -PKG_VERSION:= 0.2.3 -PKG_RELEASE:= 8 -PKG_MD5SUM:= 5e4305c612bc3cccbaf802c275c81a11 +PKG_VERSION:= 0.2.9 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 1e94eb0f8d55ebf0f042c10baebc2d3d PKG_DESCR:= Round-Robin Database (RRD) collecting daemon PKG_SECTION:= admin PKG_DEPENDS:= librrd PKG_BUILDDEP:= rrdtool PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=rrdcollect/} -PKG_SUBPKGS:= RRDCOLLECT RRDCOLLECT_EXAMPLE - ifneq (${ADK_PACKAGE_LIBRRD},) -RRDTOOL_LIBS:=-lart_lgpl_2 -lfreetype -lpng +RRDTOOL_LIBS:= -lart_lgpl_2 -lfreetype -lpng endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,RRDCOLLECT,rrdcollect,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,RRDCOLLECT_EXAMPLE,rrdcollect-example,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ENV+= LIBS="${RRDTOOL_LIBS} -lz" \ ac_cv_func_malloc_0_nonnull=yes @@ -37,14 +34,8 @@ post-install: ${INSTALL_DIR} ${IDIR_RRDCOLLECT}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/rrdcollect \ ${IDIR_RRDCOLLECT}/usr/sbin/ - ${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/etc - ${INSTALL_DATA} ./files/rrd.conf ./files/rrdcollect.conf \ - ${IDIR_RRDCOLLECT_EXAMPLE}/etc/ - ${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/usr/bin - ${INSTALL_BIN} ./files/rrd.sh ${IDIR_RRDCOLLECT_EXAMPLE}/usr/bin/ - ${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/www/cgi-bin - ln -sf /var/lib/rrdcollect/rrd.cgi \ - ${IDIR_RRDCOLLECT_EXAMPLE}/www/cgi-bin/rrd.cgi - ln -sf /var/lib/rrdcollect/img ${IDIR_RRDCOLLECT_EXAMPLE}/www/img + ${INSTALL_DIR} ${IDIR_RRDCOLLECT}/etc + ${INSTALL_DATA} ./files/rrdcollect.conf \ + ${IDIR_RRDCOLLECT}/etc/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rrdcollect/files/rrdcollect.conf b/package/rrdcollect/files/rrdcollect.conf index e34c9bff7..392661e87 100644 --- a/package/rrdcollect/files/rrdcollect.conf +++ b/package/rrdcollect/files/rrdcollect.conf @@ -1,5 +1,5 @@ step = 360 -directory = /var/lib/rrdcollect/rrd +directory = /var/lib/rrdcollect file:///proc/stat "cpu0 %d %d %d %d" SYS.rrd:cu,cn,cs,ci @@ -14,20 +14,20 @@ file:///proc/meminfo file:///proc/loadavg "%f %f %f %d/%d %*d" SYS.rrd:l1,l2,l3,pr,pt -exec:///bin/df -"/dev/mtdblock/4 %*d %d %d" SYS.rrd:us,av +#exec:///bin/df +#"/dev/mtdblock/4 %*d %d %d" SYS.rrd:us,av # LAN: vlan0, WAN: vlan1, WIFI: eth1 -file:///proc/net/dev -" vlan0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Labi,Lapi,Labo,Lapo -" vlan1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wabi,Wapi,Wabo,Wapo -" eth1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wibi,Wipi,Wibo,Wipo +#file:///proc/net/dev +#" vlan0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Labi,Lapi,Labo,Lapo +#" vlan1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wabi,Wapi,Wabo,Wapo +#" eth1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wibi,Wipi,Wibo,Wipo #" tun0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:tbi,tpi,tbo,tpo -file:///proc/slabinfo -"ip_conntrack %d %*d %*d %*d %*d %*d" SYS.rrd:con -"arp_cache %d %*d %*d %*d %*d %*d" SYS.rrd:arp +#file:///proc/slabinfo +#"ip_conntrack %d %*d %*d %*d %*d %*d" SYS.rrd:con +#"arp_cache %d %*d %*d %*d %*d %*d" SYS.rrd:arp -file:///proc/interrupts -" 4: %d MIPS eth1" SYS.rrd:irw -" 5: %d MIPS eth0" SYS.rrd:ire +#file:///proc/interrupts +#" 4: %d MIPS eth1" SYS.rrd:irw +#" 5: %d MIPS eth0" SYS.rrd:ire diff --git a/package/rrdcollect/files/rrdcollect.init b/package/rrdcollect/files/rrdcollect.init index 5c83ae013..478150e90 100644 --- a/package/rrdcollect/files/rrdcollect.init +++ b/package/rrdcollect/files/rrdcollect.init @@ -4,11 +4,6 @@ . /etc/rc.conf -LIB_D=/var/lib/rrdcollect -CGI_S=$LIB_D/rrd.cgi -RRD_D=$LIB_D/rrd -RRD_F=$(find $RRD_D -name "*.rrd" 2>/dev/null) - case $1 in autostop) ;; autostart) @@ -16,9 +11,7 @@ autostart) exec sh $0 start ;; start) - [ -d $LIB_D/img ] || mkdir -p $LIB_D/img - [ -n "$RRD_F" ] || /usr/bin/rrd.sh init - [ -x $CGI_S ] || /usr/bin/rrd.sh cgi + [ -d /var/lib/rrdcollect ] || mkdir -p /var/lib/rrdcollect rrdcollect ;; stop) diff --git a/package/rrdcollect/patches/rrdcollect-scan.patch b/package/rrdcollect/patches/rrdcollect-scan.patch deleted file mode 100644 index f47301ed1..000000000 --- a/package/rrdcollect/patches/rrdcollect-scan.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -ruN rrdcollect-0.2.3.orig/src/scan.c rrdcollect-0.2.3/src/scan.c ---- rrdcollect-0.2.3.orig/src/scan.c 2005-01-20 18:42:17.000000000 +0100 -+++ rrdcollect-0.2.3/src/scan.c 2006-01-22 00:51:52.000000000 +0100 -@@ -74,6 +74,11 @@ - } while (isdigit(*fmt)); - } - -+ /* skip white spaces like scanf does */ -+ if (strchr("difuoxX", *fmt)) -+ while (isspace(*buf)) -+ buf++; -+ - /* FIXME: we should check afterward: - * if (start == buf || start == '-' && buf-start == 1) - * die("WTF??? zero-length number???"); -@@ -150,27 +155,22 @@ - buf++, length--; - } - -- /* ignore if value not found */ -- if(value == 0) -- return 0; -- - if (!ignore) -- counter[i++]->value = valuedup(value); -+ counter[i++]->value = strndup(start, buf - start); - break; - - case 'c': -+ if (length < 0) -+ length = 1; // default length is 1 -+ - while (*buf && length > 0) { - buf++, length--; - } - if (length > 0) - return 2; - -- /* ignore if value not found */ -- if(value == 0) -- return 0; -- - if (!ignore) -- counter[i++]->value = valuedup(value); -+ counter[i++]->value = strndup(start, buf - start); - break; - - -@@ -192,7 +192,7 @@ - case '\f': - case '\v': - /* don't match if not at least one space */ -- if(!isspace(*(buf))) -+ if(!isspace(*buf)) - return 0; - else - buf++; -@@ -208,7 +208,7 @@ - case '\v': - break; - default: -- while (isspace(*(buf))) -+ while (isspace(*buf)) - buf++; - } - fmt++; -- cgit v1.2.3