Wed Dec 12 10:48:44 2012 UTC ()
Update to 0.8.8a, slightly based on PR 46399 by Nils Ratusznik.

0.8.8a:
Important Notices

    Plugin Architecture is now part of Cacti

Changelog
bug#0002207: cannot export graph templates
bug#0002208: Graphs with CDEFs fail to generate
bug#0002209: External auth does not work behind a reverse proxy
bug#0002211: creating an index USING BTREE fails ony MySQL < 5.0.60
bug#0002213: CLI upgrade script is missing 0.8.7i as a target
bug#0002214: SQL error during non-PIA upgrade to 088 when giving a default for a text field in plugin_realms
bug#0002216: use of define_syslog_variables() gone in PHP 5.4
bug#0002217: url_path should default to /cacti/
bug#0002221: Missing plugin directory causes endless loop in plugins.php
bug#0002222: tail_logfile hangs when cacti.log not readable, filling apache log with fgets warnings

0.8.8:
Important Notices

    Plugin Architecture is now part of Cacti

Changelog
bug#0002056: un-initialized datetime used for host status (was: Zero length string != NULL)
bug#0002081: In Graph Management, search display graph title breaks when using pattern symbol "/"
bug#0002132: need to include pa.sql with the 0.8.7i and future releases
bug#0002134: rebuild_poller_cache.php --host-id deletes table poller_item completely
bug#0002141: cacti.sql missing BTREE PRIMARY KEY for poller_output
bug#0002146: Utilities -> View Log File -> refresh does not work
bug#0002150: usort_data_query_index() is broken -> graph order for hosts with data query sort option fails
bug#0002151: When building HTML forms with sub_checkbox on_change parameter is not used
bug#0002152: Issue with filter on graphs_new.php
bug#0002153: Cant search for patterns containing a forward-slash
bug#0002156: CDEF strings are not escaped before passed to rrdtool command
bug#0002158: Minor changes to grammar of displayed messages
bug#0002165: Using data input field in data source name (related to 2079 in 0.8.7i)
bug#0002167: New poller hook poller_finishing
bug#0002172: structure_rra_paths.php does not handle disabled data sources
bug#0002174: poller_item.host_id has wrong type
bug#0002178: typo in include/global_form.php: Mimimum -> Minimum
bug#0002181: session_unregister (use in functions.php) doesn't exist anymore in PHP 5.4
bug#0002182: When there is no suitable (unique) index, graphs are not shown in data query ordering on host leafs
bug#0002189: Proper graph hooks
bug#0002191: Refresh issues
bug#0002194: changing data query XML does not propagate to existing data sources
bug: Fix input validation on cli/api_device.php
bug: Fix issue with data source template associate command line script inserting incorrect rra information
bug: Fix minor display issue on data source pages
bug: Fix minor issue with counting items in the poller_output table
bug: Graph settings and settings check boxes do not allow unchecking to be saved
bug: Fix minor issue with plugin library caused by non-session
bug: Fix SQL error on data input save for non-templated graphs
bug: user_log index added to increase performance
feature: Merge Plugin Architecture into Cacti
feature: Added index to data_template_data to increase performance


(wiz)
diff -r1.11 -r1.12 pkgsrc/net/cacti/Makefile
diff -r1.2 -r1.3 pkgsrc/net/cacti/PLIST
diff -r1.2 -r1.3 pkgsrc/net/cacti/distinfo
cvs diff -r1.11 -r1.12 pkgsrc/net/cacti/Makefile (expand / switch to unified diff)

--- pkgsrc/net/cacti/Makefile 2012/10/23 17:18:13 1.11
+++ pkgsrc/net/cacti/Makefile 2012/12/12 10:48:43 1.12
@@ -1,19 +1,17 @@ @@ -1,19 +1,17 @@
1# $NetBSD: Makefile,v 1.11 2012/10/23 17:18:13 asau Exp $ 1# $NetBSD: Makefile,v 1.12 2012/12/12 10:48:43 wiz Exp $
2# 2#
3 3
4PKGNAME= cacti-0.8.7i 4DISTNAME= cacti-0.8.8a
5DISTNAME= cacti-0.8.7i-PIA-3.1 
6PKGREVISION= 7 
7CATEGORIES= net 5CATEGORIES= net
8MASTER_SITES= http://www.cacti.net/downloads/ 6MASTER_SITES= http://www.cacti.net/downloads/
9 7
10MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.cacti.net/ 9HOMEPAGE= http://www.cacti.net/
12COMMENT= Frontend to rrdtool for monitoring systems and services 10COMMENT= Frontend to rrdtool for monitoring systems and services
13LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
14 12
15USE_LANGUAGES= # none 13USE_LANGUAGES= # none
16USE_TOOLS+= pax 14USE_TOOLS+= pax
17NO_BUILD= yes 15NO_BUILD= yes
18 16
19DEPENDS+= ${PHP_PKG_PREFIX}-mysql-[0-9]*:../../databases/php-mysql 17DEPENDS+= ${PHP_PKG_PREFIX}-mysql-[0-9]*:../../databases/php-mysql
@@ -36,26 +34,28 @@ PKG_GROUPS_VARS+= CACTI_GROUP @@ -36,26 +34,28 @@ PKG_GROUPS_VARS+= CACTI_GROUP
36BUILD_DEFS+= PKG_SYSCONFBASE 34BUILD_DEFS+= PKG_SYSCONFBASE
37PKG_SYSCONFSUBDIR?= httpd 35PKG_SYSCONFSUBDIR?= httpd
38EGDIR= ${PREFIX}/share/examples/cacti 36EGDIR= ${PREFIX}/share/examples/cacti
39CONF_FILES+= ${EGDIR}/httpd-cacti.conf ${PKG_SYSCONFDIR}/httpd-cacti.conf 37CONF_FILES+= ${EGDIR}/httpd-cacti.conf ${PKG_SYSCONFDIR}/httpd-cacti.conf
40CACTIDIR= ${PREFIX}/share/cacti 38CACTIDIR= ${PREFIX}/share/cacti
41CACTI_LOGDIR?= ${CACTIDIR}/log 39CACTI_LOGDIR?= ${CACTIDIR}/log
42CACTI_RRADIR?= ${CACTIDIR}/rra 40CACTI_RRADIR?= ${CACTIDIR}/rra
43 41
44REPLACE_INTERPRETER+= php 42REPLACE_INTERPRETER+= php
45REPLACE.php.old= .*php[^ ]* 43REPLACE.php.old= .*php[^ ]*
46REPLACE.php.new= ${PREFIX}/bin/php 44REPLACE.php.new= ${PREFIX}/bin/php
47REPLACE_FILES.php= cli/*.php 45REPLACE_FILES.php= cli/*.php
48 46
 47REPLACE_PERL+= scripts/*.pl
 48
49MESSAGE_SUBST+= CACTIDIR=${CACTIDIR} 49MESSAGE_SUBST+= CACTIDIR=${CACTIDIR}
50MESSAGE_SUBST+= CACTI_LOGDIR=${CACTI_LOGDIR} 50MESSAGE_SUBST+= CACTI_LOGDIR=${CACTI_LOGDIR}
51MESSAGE_SUBST+= CACTI_USER=${CACTI_USER} 51MESSAGE_SUBST+= CACTI_USER=${CACTI_USER}
52MESSAGE_SUBST+= EGDIR=${EGDIR} 52MESSAGE_SUBST+= EGDIR=${EGDIR}
53MESSAGE_SUBST+= PREFIX=${PREFIX} 53MESSAGE_SUBST+= PREFIX=${PREFIX}
54MESSAGE_SUBST+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE} 54MESSAGE_SUBST+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE}
55FILES_SUBST+= CACTIDIR=${CACTIDIR} 55FILES_SUBST+= CACTIDIR=${CACTIDIR}
56 56
57SUBST_CLASSES+= paths 57SUBST_CLASSES+= paths
58SUBST_STAGE.paths= pre-configure 58SUBST_STAGE.paths= pre-configure
59SUBST_FILES.paths= ${WRKDIR}/httpd-cacti.conf install/index.php 59SUBST_FILES.paths= ${WRKDIR}/httpd-cacti.conf install/index.php
60SUBST_FILES.paths+= include/global.php include/global_settings.php 60SUBST_FILES.paths+= include/global.php include/global_settings.php
61SUBST_VARS.paths= CACTIDIR PREFIX CACTI_USER CACTI_LOGDIR CACTI_RRADIR 61SUBST_VARS.paths= CACTIDIR PREFIX CACTI_USER CACTI_LOGDIR CACTI_RRADIR
cvs diff -r1.2 -r1.3 pkgsrc/net/cacti/PLIST (expand / switch to unified diff)

--- pkgsrc/net/cacti/PLIST 2011/12/21 17:18:21 1.2
+++ pkgsrc/net/cacti/PLIST 2012/12/12 10:48:43 1.3
@@ -1,51 +1,51 @@ @@ -1,51 +1,51 @@
1@comment $NetBSD: PLIST,v 1.2 2011/12/21 17:18:21 tez Exp $ 1@comment $NetBSD: PLIST,v 1.3 2012/12/12 10:48:43 wiz Exp $
2share/cacti/LICENSE 2share/cacti/LICENSE
3share/cacti/README 3share/cacti/README
4share/cacti/about.php 4share/cacti/about.php
5share/cacti/auth_changepassword.php 5share/cacti/auth_changepassword.php
6share/cacti/auth_login.php 6share/cacti/auth_login.php
7share/cacti/cacti.sql 7share/cacti/cacti.sql
8share/cacti/cdef.php 8share/cacti/cdef.php
9share/cacti/cli/.htaccess 9share/cacti/cli/.htaccess
10share/cacti/cli/add_data_query.php 10share/cacti/cli/add_data_query.php
11share/cacti/cli/add_device.php 11share/cacti/cli/add_device.php
12share/cacti/cli/add_graph_template.php 12share/cacti/cli/add_graph_template.php
13share/cacti/cli/add_graphs.php 13share/cacti/cli/add_graphs.php
14share/cacti/cli/add_perms.php 14share/cacti/cli/add_perms.php
15share/cacti/cli/add_tree.php 15share/cacti/cli/add_tree.php
16share/cacti/cli/analyze_database.php 16share/cacti/cli/analyze_database.php
17share/cacti/cli/convert_innodb.php 17share/cacti/cli/convert_innodb.php
18share/cacti/cli/copy_user.php 18share/cacti/cli/copy_user.php
19share/cacti/cli/data_template_associate_rra.php 19share/cacti/cli/data_template_associate_rra.php
20share/cacti/cli/host_update_template.php 20share/cacti/cli/host_update_template.php
21share/cacti/cli/import_template.php 21share/cacti/cli/import_template.php
22share/cacti/cli/poller_data_sources_reapply_names.php 22share/cacti/cli/poller_data_sources_reapply_names.php
23share/cacti/cli/poller_graphs_reapply_names.php 23share/cacti/cli/poller_graphs_reapply_names.php
24share/cacti/cli/poller_output_empty.php 24share/cacti/cli/poller_output_empty.php
25share/cacti/cli/poller_reindex_hosts.php 25share/cacti/cli/poller_reindex_hosts.php
26share/cacti/cli/rebuild_poller_cache.php 26share/cacti/cli/rebuild_poller_cache.php
 27share/cacti/cli/reorder_data_query.php
27share/cacti/cli/repair_database.php 28share/cacti/cli/repair_database.php
28share/cacti/cli/repair_templates.php 29share/cacti/cli/repair_templates.php
29share/cacti/cli/structure_rra_paths.php 30share/cacti/cli/structure_rra_paths.php
30share/cacti/cli/upgrade_database.php 31share/cacti/cli/upgrade_database.php
31share/cacti/cmd.php 32share/cacti/cmd.php
32share/cacti/color.php 33share/cacti/color.php
33share/cacti/data_input.php 34share/cacti/data_input.php
34share/cacti/data_queries.php 35share/cacti/data_queries.php
35share/cacti/data_sources.php 36share/cacti/data_sources.php
36share/cacti/data_templates.php 37share/cacti/data_templates.php
37share/cacti/docs/CHANGELOG 38share/cacti/docs/CHANGELOG
38share/cacti/docs/CHANGELOG.PIA 
39share/cacti/docs/CONTRIB 39share/cacti/docs/CONTRIB
40share/cacti/docs/README 40share/cacti/docs/README
41share/cacti/docs/html/LICENSE.html 41share/cacti/docs/html/LICENSE.html
42share/cacti/docs/html/advanced_topics.html 42share/cacti/docs/html/advanced_topics.html
43share/cacti/docs/html/basics.html 43share/cacti/docs/html/basics.html
44share/cacti/docs/html/batch_copy_users.html 44share/cacti/docs/html/batch_copy_users.html
45share/cacti/docs/html/bsd_ports.html 45share/cacti/docs/html/bsd_ports.html
46share/cacti/docs/html/cacti_help.html 46share/cacti/docs/html/cacti_help.html
47share/cacti/docs/html/cdefs.html 47share/cacti/docs/html/cdefs.html
48share/cacti/docs/html/check_cacti_poller.html 48share/cacti/docs/html/check_cacti_poller.html
49share/cacti/docs/html/check_data_gathering.html 49share/cacti/docs/html/check_data_gathering.html
50share/cacti/docs/html/check_mysql_updating.html 50share/cacti/docs/html/check_mysql_updating.html
51share/cacti/docs/html/check_rrd_graph.html 51share/cacti/docs/html/check_rrd_graph.html
@@ -304,26 +304,28 @@ share/cacti/install/0_8_6d_to_0_8_6e.php @@ -304,26 +304,28 @@ share/cacti/install/0_8_6d_to_0_8_6e.php
304share/cacti/install/0_8_6f_to_0_8_6g.php 304share/cacti/install/0_8_6f_to_0_8_6g.php
305share/cacti/install/0_8_6g_to_0_8_6h.php 305share/cacti/install/0_8_6g_to_0_8_6h.php
306share/cacti/install/0_8_6h_to_0_8_6i.php 306share/cacti/install/0_8_6h_to_0_8_6i.php
307share/cacti/install/0_8_6j_to_0_8_7.php 307share/cacti/install/0_8_6j_to_0_8_7.php
308share/cacti/install/0_8_7_to_0_8_7a.php 308share/cacti/install/0_8_7_to_0_8_7a.php
309share/cacti/install/0_8_7a_to_0_8_7b.php 309share/cacti/install/0_8_7a_to_0_8_7b.php
310share/cacti/install/0_8_7b_to_0_8_7c.php 310share/cacti/install/0_8_7b_to_0_8_7c.php
311share/cacti/install/0_8_7c_to_0_8_7d.php 311share/cacti/install/0_8_7c_to_0_8_7d.php
312share/cacti/install/0_8_7d_to_0_8_7e.php 312share/cacti/install/0_8_7d_to_0_8_7e.php
313share/cacti/install/0_8_7e_to_0_8_7f.php 313share/cacti/install/0_8_7e_to_0_8_7f.php
314share/cacti/install/0_8_7f_to_0_8_7g.php 314share/cacti/install/0_8_7f_to_0_8_7g.php
315share/cacti/install/0_8_7g_to_0_8_7h.php 315share/cacti/install/0_8_7g_to_0_8_7h.php
316share/cacti/install/0_8_7h_to_0_8_7i.php 316share/cacti/install/0_8_7h_to_0_8_7i.php
 317share/cacti/install/0_8_7i_to_0_8_8.php
 318share/cacti/install/0_8_8_to_0_8_8a.php
317share/cacti/install/0_8_to_0_8_1.php 319share/cacti/install/0_8_to_0_8_1.php
318share/cacti/install/index.php 320share/cacti/install/index.php
319share/cacti/install/install_finish.gif 321share/cacti/install/install_finish.gif
320share/cacti/install/install_next.gif 322share/cacti/install/install_next.gif
321share/cacti/lib/adodb/adodb-csvlib.inc.php 323share/cacti/lib/adodb/adodb-csvlib.inc.php
322share/cacti/lib/adodb/adodb-datadict.inc.php 324share/cacti/lib/adodb/adodb-datadict.inc.php
323share/cacti/lib/adodb/adodb-error.inc.php 325share/cacti/lib/adodb/adodb-error.inc.php
324share/cacti/lib/adodb/adodb-errorhandler.inc.php 326share/cacti/lib/adodb/adodb-errorhandler.inc.php
325share/cacti/lib/adodb/adodb-errorpear.inc.php 327share/cacti/lib/adodb/adodb-errorpear.inc.php
326share/cacti/lib/adodb/adodb-exceptions.inc.php 328share/cacti/lib/adodb/adodb-exceptions.inc.php
327share/cacti/lib/adodb/adodb-iterator.inc.php 329share/cacti/lib/adodb/adodb-iterator.inc.php
328share/cacti/lib/adodb/adodb-lib.inc.php 330share/cacti/lib/adodb/adodb-lib.inc.php
329share/cacti/lib/adodb/adodb-pear.inc.php 331share/cacti/lib/adodb/adodb-pear.inc.php
@@ -449,28 +451,28 @@ share/cacti/poller.php @@ -449,28 +451,28 @@ share/cacti/poller.php
449share/cacti/poller_commands.php 451share/cacti/poller_commands.php
450share/cacti/poller_export.php 452share/cacti/poller_export.php
451share/cacti/resource/script_queries/host_cpu.xml 453share/cacti/resource/script_queries/host_cpu.xml
452share/cacti/resource/script_queries/host_disk.xml 454share/cacti/resource/script_queries/host_disk.xml
453share/cacti/resource/script_queries/unix_disk.xml 455share/cacti/resource/script_queries/unix_disk.xml
454share/cacti/resource/script_server/host_cpu.xml 456share/cacti/resource/script_server/host_cpu.xml
455share/cacti/resource/script_server/host_disk.xml 457share/cacti/resource/script_server/host_disk.xml
456share/cacti/resource/snmp_queries/host_disk.xml 458share/cacti/resource/snmp_queries/host_disk.xml
457share/cacti/resource/snmp_queries/interface.xml 459share/cacti/resource/snmp_queries/interface.xml
458share/cacti/resource/snmp_queries/kbridge.xml 460share/cacti/resource/snmp_queries/kbridge.xml
459share/cacti/resource/snmp_queries/net-snmp_disk.xml 461share/cacti/resource/snmp_queries/net-snmp_disk.xml
460share/cacti/resource/snmp_queries/netware_cpu.xml 462share/cacti/resource/snmp_queries/netware_cpu.xml
461share/cacti/resource/snmp_queries/netware_disk.xml 463share/cacti/resource/snmp_queries/netware_disk.xml
462share/cacti/rra/.htaccess 
463share/cacti/rra.php 464share/cacti/rra.php
 465share/cacti/rra/.htaccess
464share/cacti/script_server.php 466share/cacti/script_server.php
465share/cacti/script_server.pl 467share/cacti/script_server.pl
466share/cacti/scripts/3com_cable_modem.pl 468share/cacti/scripts/3com_cable_modem.pl
467share/cacti/scripts/diskfree.pl 469share/cacti/scripts/diskfree.pl
468share/cacti/scripts/diskfree.sh 470share/cacti/scripts/diskfree.sh
469share/cacti/scripts/freebsd_memory.pl 471share/cacti/scripts/freebsd_memory.pl
470share/cacti/scripts/linux_memory.pl 472share/cacti/scripts/linux_memory.pl
471share/cacti/scripts/loadavg.pl 473share/cacti/scripts/loadavg.pl
472share/cacti/scripts/loadavg_multi.pl 474share/cacti/scripts/loadavg_multi.pl
473share/cacti/scripts/netbsd_memory.pl 475share/cacti/scripts/netbsd_memory.pl
474share/cacti/scripts/ping.pl 476share/cacti/scripts/ping.pl
475share/cacti/scripts/query_host_cpu.php 477share/cacti/scripts/query_host_cpu.php
476share/cacti/scripts/query_host_partitions.php 478share/cacti/scripts/query_host_partitions.php
cvs diff -r1.2 -r1.3 pkgsrc/net/cacti/distinfo (expand / switch to unified diff)

--- pkgsrc/net/cacti/distinfo 2011/12/20 23:57:33 1.2
+++ pkgsrc/net/cacti/distinfo 2012/12/12 10:48:43 1.3
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.2 2011/12/20 23:57:33 tez Exp $ 1$NetBSD: distinfo,v 1.3 2012/12/12 10:48:43 wiz Exp $
2 2
3SHA1 (cacti-0.8.7i-PIA-3.1.tar.gz) = 84cb6326645a2d08059dcc6767f777147a0a4607 3SHA1 (cacti-0.8.8a.tar.gz) = e66f5fde96b28b273a9e62f79f8a7bb8827812c2
4RMD160 (cacti-0.8.7i-PIA-3.1.tar.gz) = 691d2fad7d7071475076556ab643a480ef2ee84c 4RMD160 (cacti-0.8.8a.tar.gz) = 1462a71af844810a3451c24fd733b3f2351b75df
5Size (cacti-0.8.7i-PIA-3.1.tar.gz) = 2270714 bytes 5Size (cacti-0.8.8a.tar.gz) = 2273280 bytes
6SHA1 (patch-cacti.sql) = 37e18026c4136630d939ab5a7a4d6336bf166282 6SHA1 (patch-cacti.sql) = 37e18026c4136630d939ab5a7a4d6336bf166282
7SHA1 (patch-include_global.php) = fb0d2f15596b051c60ed6032ecb9038315b7c663 7SHA1 (patch-include_global.php) = fb0d2f15596b051c60ed6032ecb9038315b7c663
8SHA1 (patch-include_global__settings.php) = 54ffd0c3fc9d927595b1568a874c45a4a6033f7b 8SHA1 (patch-include_global__settings.php) = 54ffd0c3fc9d927595b1568a874c45a4a6033f7b
9SHA1 (patch-install_index.php) = 84b25c39a4ce1bc6144cffcdb9e32bf257cfcae6 9SHA1 (patch-install_index.php) = 84b25c39a4ce1bc6144cffcdb9e32bf257cfcae6