diff options
author | Clement Laforet <clement@FreeBSD.org> | 2006-01-15 13:51:34 +0000 |
---|---|---|
committer | Clement Laforet <clement@FreeBSD.org> | 2006-01-15 13:51:34 +0000 |
commit | 089eec4cf75dad35c916f08fecb4b4c3e6afc9e5 (patch) | |
tree | 7ad419a64add74abeae7230712cf11321344a1c4 /net-mgmt | |
parent | - Added missing installed module (diff) |
- Update to 0.8.6g
Notes
Notes:
svn path=/head/; revision=153562
Diffstat (limited to 'net-mgmt')
-rw-r--r-- | net-mgmt/cacti-spine/Makefile | 5 | ||||
-rw-r--r-- | net-mgmt/cacti-spine/distinfo | 6 | ||||
-rw-r--r-- | net-mgmt/cacti-spine/files/patch-fix-4.x | 75 | ||||
-rw-r--r-- | net-mgmt/cacti-spine/files/patch-nfs_popen.c | 10 | ||||
-rw-r--r-- | net-mgmt/cacti-spine/pkg-plist | 1 |
5 files changed, 16 insertions, 81 deletions
diff --git a/net-mgmt/cacti-spine/Makefile b/net-mgmt/cacti-spine/Makefile index 76aef98db697..8e56538a6fb9 100644 --- a/net-mgmt/cacti-spine/Makefile +++ b/net-mgmt/cacti-spine/Makefile @@ -6,11 +6,10 @@ # PORTNAME= cactid -PORTVERSION= 0.8.6.f -PORTREVISION= 2 +PORTVERSION= 0.8.6.g CATEGORIES= net MASTER_SITES= http://www.cacti.net/downloads/cactid/ -DISTNAME= cacti-${PORTNAME}-0.8.6f-1 +DISTNAME= cacti-${PORTNAME}-0.8.6g MAINTAINER= clement@FreeBSD.org COMMENT= A multithreaded poller for Cacti written in C diff --git a/net-mgmt/cacti-spine/distinfo b/net-mgmt/cacti-spine/distinfo index 18db9b49944f..abd6830956be 100644 --- a/net-mgmt/cacti-spine/distinfo +++ b/net-mgmt/cacti-spine/distinfo @@ -1,3 +1,3 @@ -MD5 (cacti-cactid-0.8.6f-1.tar.gz) = 95fe2d67c630dca9fe64a27c6ab2aff1 -SHA256 (cacti-cactid-0.8.6f-1.tar.gz) = 5ecc9c5d605b7daa18380fdc3ff951e42dd0652db4c5f1718c7607dfd0310e61 -SIZE (cacti-cactid-0.8.6f-1.tar.gz) = 136217 +MD5 (cacti-cactid-0.8.6g.tar.gz) = 8cd35272d86dc112ba1e82393d9f07c3 +SHA256 (cacti-cactid-0.8.6g.tar.gz) = 823d77fac9c7fd34d07004c7980bd621daaa1230c2e9c91fd9405a5bd05bfd80 +SIZE (cacti-cactid-0.8.6g.tar.gz) = 148921 diff --git a/net-mgmt/cacti-spine/files/patch-fix-4.x b/net-mgmt/cacti-spine/files/patch-fix-4.x deleted file mode 100644 index faec4010d4d9..000000000000 --- a/net-mgmt/cacti-spine/files/patch-fix-4.x +++ /dev/null @@ -1,75 +0,0 @@ ---- poller.c.orig Wed Oct 12 03:13:48 2005 -+++ poller.c Thu Nov 10 11:30:49 2005 -@@ -455,9 +455,9 @@ - (strcmp(last_snmp_password, poller_items[i].snmp_password) != 0)) { - - if (num_oids > 0) { -+ int j; - snmp_get_multi(host, snmp_oids, num_oids); - -- int j; - for (j = 0; j < num_oids; j++) { - if (host->ignore_host) { - snprintf(logmessage, LOGSIZE-1, "Host[%i] DS[%i] WARNING: SNMP timeout detected [%i ms], ignoring host '%s'\n", host_id, poller_items[snmp_oids[j].array_position].local_data_id, host->snmp_timeout, host->hostname); -@@ -500,9 +500,9 @@ - } - - if (num_oids > set.max_get_size) { -+ int j; - snmp_get_multi(host, snmp_oids, num_oids); - -- int j; - for (j = 0; j < num_oids; j++) { - if (host->ignore_host) { - snprintf(logmessage, LOGSIZE-1, "Host[%i] DS[%i] WARNING: SNMP timeout detected [%i ms], ignoring host '%s'\n", host_id, poller_items[snmp_oids[j].array_position].local_data_id, host->snmp_timeout, host->hostname); -@@ -617,9 +617,9 @@ - - /* process last bulk request if applicable */ - if (num_oids > 0) { -+ int j; - snmp_get_multi(host, snmp_oids, num_oids); - -- int j; - for (j = 0; j < num_oids; j++) { - if (host->ignore_host) { - snprintf(logmessage, LOGSIZE-1, "Host[%i] DS[%i] WARNING: SNMP timeout detected [%i ms], ignoring host '%s'\n", host_id, poller_items[snmp_oids[j].array_position].local_data_id, host->snmp_timeout, host->hostname); -@@ -648,9 +648,12 @@ - } - } - -+ { - /* format database insert */ - int buffer; - char result_string[BUFSIZE]; -+ char delim = ' '; -+ - buffer = 600*rows_processed+100; - - if (!(query3 = (char *)malloc(buffer))) { -@@ -662,12 +665,12 @@ - snprintf(query3, buffer-1, "INSERT INTO poller_output (local_data_id,rrd_name,time,output) VALUES"); - - i=0; -- char delim = ' '; - while (i < rows_processed) { - snprintf(result_string, sizeof(result_string)-1, "%c(%i,'%s','%s','%s')", delim, poller_items[i].local_data_id, poller_items[i].rrd_name, start_datetime, poller_items[i].result); - strncat(query3, result_string, strlen(result_string)); - delim = ','; - i++; -+ } - } - - /* only perform and insert if there is something to insert */ ---- snmp.c.orig Wed Oct 12 03:13:48 2005 -+++ snmp.c Thu Nov 10 11:25:26 2005 -@@ -306,9 +306,9 @@ - } - }else { - if (response->errindex != 0) { -+ int count; - /* removed errored OID and then retry */ - snprintf(snmp_oids[response->errindex].result, sizeof(snmp_oids[response->errindex].result)-1, "U"); -- int count; - for (count = 1, vars = response->variables; - vars && count != response->errindex; - vars = vars->next_variable, count++) { diff --git a/net-mgmt/cacti-spine/files/patch-nfs_popen.c b/net-mgmt/cacti-spine/files/patch-nfs_popen.c new file mode 100644 index 000000000000..3bc6e665ba31 --- /dev/null +++ b/net-mgmt/cacti-spine/files/patch-nfs_popen.c @@ -0,0 +1,10 @@ +--- nft_popen.c.orig Sun Jan 15 10:27:41 2006 ++++ nft_popen.c Sun Jan 15 10:28:08 2006 +@@ -66,6 +66,7 @@ + #include <string.h> + #include <unistd.h> + #include <sys/wait.h> ++#include <sys/signal.h> + + #include <nft_popen.h> + diff --git a/net-mgmt/cacti-spine/pkg-plist b/net-mgmt/cacti-spine/pkg-plist index 23b58900dced..23aafa65be4a 100644 --- a/net-mgmt/cacti-spine/pkg-plist +++ b/net-mgmt/cacti-spine/pkg-plist @@ -4,6 +4,7 @@ bin/cactid @exec [ -f %D/etc/cactid.conf ] || cp %D/%%EXAMPLESDIR%%/httpd-std.conf %D/etc/cactid.conf include/cactid/cactid.h include/cactid/common.h +include/cactid/keywords.h include/cactid/locks.h include/cactid/nft_popen.h include/cactid/php.h |