Wed Mar 11 13:56:46 2015 UTC ()
Changes 0.8.8c:

Important Security Fixes

CVE-2013-5588 - XSS issue via installer or device editing
CVE-2013-5589 - SQL injection vulnerability in device editing
CVE-2014-2326 - XSS issue via CDEF editing
CVE-2014-2327 - Cross-site request forgery (CSRF) vulnerability
CVE-2014-2328 - Remote Command Execution Vulnerability in graph export
CVE-2014-4002 - XSS issues in multiple files
CVE-2014-5025 - XSS issue via data source editing
CVE-2014-5026 - XSS issues in multiple files

Important Updates

New graph tree view
Updated graph list and graph preview
Refactor graph tree view to remove GPL incompatible code
Updated command line database upgrade utility
Graph zooming now from everywhere


(adam)
diff -r1.25 -r1.26 pkgsrc/net/cacti/Makefile
diff -r1.6 -r1.7 pkgsrc/net/cacti/PLIST
diff -r1.5 -r1.6 pkgsrc/net/cacti/distinfo
diff -r1.1 -r0 pkgsrc/net/cacti/patches/patch-cdef.php
diff -r1.1 -r0 pkgsrc/net/cacti/patches/patch-graph_xport.php
diff -r1.1 -r0 pkgsrc/net/cacti/patches/patch-host.php
diff -r1.1 -r0 pkgsrc/net/cacti/patches/patch-lib_api_device.php
diff -r1.1 -r0 pkgsrc/net/cacti/patches/patch-lib_graph_export.php
diff -r1.1 -r0 pkgsrc/net/cacti/patches/patch-lib_rrd.php
diff -r1.2 -r1.3 pkgsrc/net/cacti/patches/patch-install_index.php
cvs diff -r1.25 -r1.26 pkgsrc/net/cacti/Makefile (expand / switch to unified diff)

--- pkgsrc/net/cacti/Makefile 2015/03/11 07:39:15 1.25
+++ pkgsrc/net/cacti/Makefile 2015/03/11 13:56:46 1.26
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.25 2015/03/11 07:39:15 nils Exp $ 1# $NetBSD: Makefile,v 1.26 2015/03/11 13:56:46 adam Exp $
2 2
3DISTNAME= cacti-0.8.8b 3DISTNAME= cacti-0.8.8c
4PKGREVISION= 4 
5CATEGORIES= net 4CATEGORIES= net
6MASTER_SITES= http://www.cacti.net/downloads/ 5MASTER_SITES= http://www.cacti.net/downloads/
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.cacti.net/ 8HOMEPAGE= http://www.cacti.net/
10COMMENT= Frontend to rrdtool for monitoring systems and services 9COMMENT= Frontend to rrdtool for monitoring systems and services
11LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
12 11
13USE_LANGUAGES= # none 12USE_LANGUAGES= # none
14USE_TOOLS+= pax 13USE_TOOLS+= pax
15NO_BUILD= yes 14NO_BUILD= yes
16 15
17DEPENDS+= ${PHP_PKG_PREFIX}-mysql-[0-9]*:../../databases/php-mysql 16DEPENDS+= ${PHP_PKG_PREFIX}-mysql-[0-9]*:../../databases/php-mysql
cvs diff -r1.6 -r1.7 pkgsrc/net/cacti/PLIST (expand / switch to unified diff)

--- pkgsrc/net/cacti/PLIST 2015/03/11 07:39:15 1.6
+++ pkgsrc/net/cacti/PLIST 2015/03/11 13:56:46 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2015/03/11 07:39:15 nils Exp $ 1@comment $NetBSD: PLIST,v 1.7 2015/03/11 13:56:46 adam Exp $
2bin/cacti-poller 2bin/cacti-poller
3share/cacti/LICENSE 3share/cacti/LICENSE
4share/cacti/README 4share/cacti/README
5share/cacti/about.php 5share/cacti/about.php
6share/cacti/auth_changepassword.php 6share/cacti/auth_changepassword.php
7share/cacti/auth_login.php 7share/cacti/auth_login.php
8share/cacti/cacti.sql 8share/cacti/cacti.sql
9share/cacti/cdef.php 9share/cacti/cdef.php
10share/cacti/cli/.htaccess 10share/cacti/cli/.htaccess
11share/cacti/cli/add_data_query.php 11share/cacti/cli/add_data_query.php
12share/cacti/cli/add_device.php 12share/cacti/cli/add_device.php
13share/cacti/cli/add_graph_template.php 13share/cacti/cli/add_graph_template.php
14share/cacti/cli/add_graphs.php 14share/cacti/cli/add_graphs.php
@@ -193,52 +193,113 @@ share/cacti/images/graph_properties.gif @@ -193,52 +193,113 @@ share/cacti/images/graph_properties.gif
193share/cacti/images/graph_query.png 193share/cacti/images/graph_query.png
194share/cacti/images/graph_zoom.gif 194share/cacti/images/graph_zoom.gif
195share/cacti/images/hide.gif 195share/cacti/images/hide.gif
196share/cacti/images/install_icon.png 196share/cacti/images/install_icon.png
197share/cacti/images/install_icon_disabled.png 197share/cacti/images/install_icon_disabled.png
198share/cacti/images/left_border.gif 198share/cacti/images/left_border.gif
199share/cacti/images/menu_line.gif 199share/cacti/images/menu_line.gif
200share/cacti/images/menuarrow.gif 200share/cacti/images/menuarrow.gif
201share/cacti/images/move_down.gif 201share/cacti/images/move_down.gif
202share/cacti/images/move_left.gif 202share/cacti/images/move_left.gif
203share/cacti/images/move_right.gif 203share/cacti/images/move_right.gif
204share/cacti/images/move_up.gif 204share/cacti/images/move_up.gif
205share/cacti/images/reload_icon_small.gif 205share/cacti/images/reload_icon_small.gif
 206share/cacti/images/server.png
 207share/cacti/images/server_chart.png
 208share/cacti/images/server_chart_curve.png
 209share/cacti/images/server_dataquery.png
206share/cacti/images/shadow.gif 210share/cacti/images/shadow.gif
207share/cacti/images/shadow_gray.gif 211share/cacti/images/shadow_gray.gif
208share/cacti/images/show.gif 212share/cacti/images/show.gif
209share/cacti/images/tab_cacti.gif 213share/cacti/images/tab_cacti.gif
210share/cacti/images/tab_console.gif 214share/cacti/images/tab_console.gif
211share/cacti/images/tab_console_down.gif 215share/cacti/images/tab_console_down.gif
212share/cacti/images/tab_graphs.gif 216share/cacti/images/tab_graphs.gif
213share/cacti/images/tab_graphs_down.gif 217share/cacti/images/tab_graphs_down.gif
214share/cacti/images/tab_mode_list.gif 218share/cacti/images/tab_mode_list.gif
215share/cacti/images/tab_mode_list_down.gif 219share/cacti/images/tab_mode_list_down.gif
216share/cacti/images/tab_mode_preview.gif 220share/cacti/images/tab_mode_preview.gif
217share/cacti/images/tab_mode_preview_down.gif 221share/cacti/images/tab_mode_preview_down.gif
218share/cacti/images/tab_mode_tree.gif 222share/cacti/images/tab_mode_tree.gif
219share/cacti/images/tab_mode_tree_down.gif 223share/cacti/images/tab_mode_tree_down.gif
220share/cacti/images/tab_settings.gif 224share/cacti/images/tab_settings.gif
221share/cacti/images/tab_settings_down.gif 225share/cacti/images/tab_settings_down.gif
222share/cacti/images/transparent_line.gif 226share/cacti/images/transparent_line.gif
223share/cacti/images/uninstall_icon.gif 227share/cacti/images/uninstall_icon.gif
224share/cacti/images/view_none.gif 228share/cacti/images/view_none.gif
225share/cacti/include/auth.php 229share/cacti/include/auth.php
226share/cacti/include/bottom_footer.php 230share/cacti/include/bottom_footer.php
 231share/cacti/include/csrf/csrf-magic.js
 232share/cacti/include/csrf/csrf-magic.php
 233share/cacti/include/csrf/index.php
227share/cacti/include/global.php 234share/cacti/include/global.php
228share/cacti/include/global_arrays.php 235share/cacti/include/global_arrays.php
229share/cacti/include/global_constants.php 236share/cacti/include/global_constants.php
230share/cacti/include/global_form.php 237share/cacti/include/global_form.php
231share/cacti/include/global_settings.php 238share/cacti/include/global_settings.php
 239share/cacti/include/js/colorpicker.js
 240share/cacti/include/js/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 241share/cacti/include/js/images/ui-bg_diagonals-thick_20_666666_40x40.png
 242share/cacti/include/js/images/ui-bg_flat_10_000000_40x100.png
 243share/cacti/include/js/images/ui-bg_glass_100_f6f6f6_1x400.png
 244share/cacti/include/js/images/ui-bg_glass_100_fdf5ce_1x400.png
 245share/cacti/include/js/images/ui-bg_glass_65_ffffff_1x400.png
 246share/cacti/include/js/images/ui-bg_gloss-wave_35_f6a828_500x100.png
 247share/cacti/include/js/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 248share/cacti/include/js/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
 249share/cacti/include/js/images/ui-icons_222222_256x240.png
 250share/cacti/include/js/images/ui-icons_228ef1_256x240.png
 251share/cacti/include/js/images/ui-icons_ef8c08_256x240.png
 252share/cacti/include/js/images/ui-icons_ffd27a_256x240.png
 253share/cacti/include/js/images/ui-icons_ffffff_256x240.png
 254share/cacti/include/js/jquery-ui.css
 255share/cacti/include/js/jquery-ui.js
 256share/cacti/include/js/jquery.cookie.js
 257share/cacti/include/js/jquery.dd.js
 258share/cacti/include/js/jquery.dropdown.js
 259share/cacti/include/js/jquery.easytabs.js
 260share/cacti/include/js/jquery.js
 261share/cacti/include/js/jquery.tablednd.js
 262share/cacti/include/js/jquery.timepicker.js
 263share/cacti/include/js/jquery.zoom.css
 264share/cacti/include/js/jquery.zoom.js
 265share/cacti/include/js/jstree.js
 266share/cacti/include/js/themes/default-dark/32px.png
 267share/cacti/include/js/themes/default-dark/40px.png
 268share/cacti/include/js/themes/default-dark/style.css
 269share/cacti/include/js/themes/default-dark/style.min.css
 270share/cacti/include/js/themes/default-dark/throbber.gif
 271share/cacti/include/js/themes/default/32px.png
 272share/cacti/include/js/themes/default/40px.png
 273share/cacti/include/js/themes/default/style.css
 274share/cacti/include/js/themes/default/style.min.css
 275share/cacti/include/js/themes/default/throbber.gif
 276share/cacti/include/js/themes/proton/30px.png
 277share/cacti/include/js/themes/proton/32px.png
 278share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-bold-webfont.eot
 279share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-bold-webfont.svg
 280share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-bold-webfont.ttf
 281share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-bold-webfont.woff
 282share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-extralight-webfont.eot
 283share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-extralight-webfont.svg
 284share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-extralight-webfont.ttf
 285share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-extralight-webfont.woff
 286share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-regular-webfont.eot
 287share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-regular-webfont.svg
 288share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-regular-webfont.ttf
 289share/cacti/include/js/themes/proton/fonts/titillium/titilliumweb-regular-webfont.woff
 290share/cacti/include/js/themes/proton/style.css
 291share/cacti/include/js/themes/proton/style.min.css
 292share/cacti/include/js/themes/proton/throbber.gif
232share/cacti/include/jscalendar/calendar-setup.js 293share/cacti/include/jscalendar/calendar-setup.js
233share/cacti/include/jscalendar/calendar.js 294share/cacti/include/jscalendar/calendar.js
234share/cacti/include/jscalendar/lang/calendar-af.js 295share/cacti/include/jscalendar/lang/calendar-af.js
235share/cacti/include/jscalendar/lang/calendar-al.js 296share/cacti/include/jscalendar/lang/calendar-al.js
236share/cacti/include/jscalendar/lang/calendar-bg.js 297share/cacti/include/jscalendar/lang/calendar-bg.js
237share/cacti/include/jscalendar/lang/calendar-big5-utf8.js 298share/cacti/include/jscalendar/lang/calendar-big5-utf8.js
238share/cacti/include/jscalendar/lang/calendar-big5.js 299share/cacti/include/jscalendar/lang/calendar-big5.js
239share/cacti/include/jscalendar/lang/calendar-br.js 300share/cacti/include/jscalendar/lang/calendar-br.js
240share/cacti/include/jscalendar/lang/calendar-ca.js 301share/cacti/include/jscalendar/lang/calendar-ca.js
241share/cacti/include/jscalendar/lang/calendar-cs-utf8.js 302share/cacti/include/jscalendar/lang/calendar-cs-utf8.js
242share/cacti/include/jscalendar/lang/calendar-cs-win.js 303share/cacti/include/jscalendar/lang/calendar-cs-win.js
243share/cacti/include/jscalendar/lang/calendar-da.js 304share/cacti/include/jscalendar/lang/calendar-da.js
244share/cacti/include/jscalendar/lang/calendar-de.js 305share/cacti/include/jscalendar/lang/calendar-de.js
@@ -269,64 +330,53 @@ share/cacti/include/jscalendar/lang/cale @@ -269,64 +330,53 @@ share/cacti/include/jscalendar/lang/cale
269share/cacti/include/jscalendar/lang/calendar-ru_win_.js 330share/cacti/include/jscalendar/lang/calendar-ru_win_.js
270share/cacti/include/jscalendar/lang/calendar-si.js 331share/cacti/include/jscalendar/lang/calendar-si.js
271share/cacti/include/jscalendar/lang/calendar-sk.js 332share/cacti/include/jscalendar/lang/calendar-sk.js
272share/cacti/include/jscalendar/lang/calendar-sp.js 333share/cacti/include/jscalendar/lang/calendar-sp.js
273share/cacti/include/jscalendar/lang/calendar-sv.js 334share/cacti/include/jscalendar/lang/calendar-sv.js
274share/cacti/include/jscalendar/lang/calendar-tr.js 335share/cacti/include/jscalendar/lang/calendar-tr.js
275share/cacti/include/jscalendar/lang/calendar-zh.js 336share/cacti/include/jscalendar/lang/calendar-zh.js
276share/cacti/include/jscalendar/lang/cn_utf8.js 337share/cacti/include/jscalendar/lang/cn_utf8.js
277share/cacti/include/layout.js 338share/cacti/include/layout.js
278share/cacti/include/main.css 339share/cacti/include/main.css
279share/cacti/include/plugins.php 340share/cacti/include/plugins.php
280share/cacti/include/top_graph_header.php 341share/cacti/include/top_graph_header.php
281share/cacti/include/top_header.php 342share/cacti/include/top_header.php
282share/cacti/include/treeview/ftiens4.js 
283share/cacti/include/treeview/ftiens4_export.js 
284share/cacti/include/treeview/ftv2blank.gif 
285share/cacti/include/treeview/ftv2lastnode.gif 
286share/cacti/include/treeview/ftv2mlastnode.gif 
287share/cacti/include/treeview/ftv2mnode.gif 
288share/cacti/include/treeview/ftv2node.gif 
289share/cacti/include/treeview/ftv2plastnode.gif 
290share/cacti/include/treeview/ftv2pnode.gif 
291share/cacti/include/treeview/ftv2vertline.gif 
292share/cacti/include/treeview/ua.js 
293share/cacti/include/zoom.js 
294share/cacti/index.php 343share/cacti/index.php
295share/cacti/install/0_8_1_to_0_8_2.php 344share/cacti/install/0_8_1_to_0_8_2.php
296share/cacti/install/0_8_2_to_0_8_2a.php 345share/cacti/install/0_8_2_to_0_8_2a.php
297share/cacti/install/0_8_2a_to_0_8_3.php 346share/cacti/install/0_8_2a_to_0_8_3.php
298share/cacti/install/0_8_3_to_0_8_4.php 347share/cacti/install/0_8_3_to_0_8_4.php
299share/cacti/install/0_8_4_to_0_8_5.php 348share/cacti/install/0_8_4_to_0_8_5.php
300share/cacti/install/0_8_5a_to_0_8_6.php 349share/cacti/install/0_8_5a_to_0_8_6.php
301share/cacti/install/0_8_6_to_0_8_6a.php 350share/cacti/install/0_8_6_to_0_8_6a.php
302share/cacti/install/0_8_6c_to_0_8_6d.php 351share/cacti/install/0_8_6c_to_0_8_6d.php
303share/cacti/install/0_8_6d_to_0_8_6e.php 352share/cacti/install/0_8_6d_to_0_8_6e.php
304share/cacti/install/0_8_6f_to_0_8_6g.php 353share/cacti/install/0_8_6f_to_0_8_6g.php
305share/cacti/install/0_8_6g_to_0_8_6h.php 354share/cacti/install/0_8_6g_to_0_8_6h.php
306share/cacti/install/0_8_6h_to_0_8_6i.php 355share/cacti/install/0_8_6h_to_0_8_6i.php
307share/cacti/install/0_8_6j_to_0_8_7.php 356share/cacti/install/0_8_6j_to_0_8_7.php
308share/cacti/install/0_8_7_to_0_8_7a.php 357share/cacti/install/0_8_7_to_0_8_7a.php
309share/cacti/install/0_8_7a_to_0_8_7b.php 358share/cacti/install/0_8_7a_to_0_8_7b.php
310share/cacti/install/0_8_7b_to_0_8_7c.php 359share/cacti/install/0_8_7b_to_0_8_7c.php
311share/cacti/install/0_8_7c_to_0_8_7d.php 360share/cacti/install/0_8_7c_to_0_8_7d.php
312share/cacti/install/0_8_7d_to_0_8_7e.php 361share/cacti/install/0_8_7d_to_0_8_7e.php
313share/cacti/install/0_8_7e_to_0_8_7f.php 362share/cacti/install/0_8_7e_to_0_8_7f.php
314share/cacti/install/0_8_7f_to_0_8_7g.php 363share/cacti/install/0_8_7f_to_0_8_7g.php
315share/cacti/install/0_8_7g_to_0_8_7h.php 364share/cacti/install/0_8_7g_to_0_8_7h.php
316share/cacti/install/0_8_7h_to_0_8_7i.php 365share/cacti/install/0_8_7h_to_0_8_7i.php
317share/cacti/install/0_8_7i_to_0_8_8.php 366share/cacti/install/0_8_7i_to_0_8_8.php
318share/cacti/install/0_8_8_to_0_8_8a.php 367share/cacti/install/0_8_8_to_0_8_8a.php
319share/cacti/install/0_8_8_to_0_8_8b.php 368share/cacti/install/0_8_8a_to_0_8_8b.php
 369share/cacti/install/0_8_8b_to_0_8_8c.php
320share/cacti/install/0_8_to_0_8_1.php 370share/cacti/install/0_8_to_0_8_1.php
321share/cacti/install/index.php 371share/cacti/install/index.php
322share/cacti/install/install_finish.gif 372share/cacti/install/install_finish.gif
323share/cacti/install/install_next.gif 373share/cacti/install/install_next.gif
324share/cacti/lib/adodb/adodb-csvlib.inc.php 374share/cacti/lib/adodb/adodb-csvlib.inc.php
325share/cacti/lib/adodb/adodb-datadict.inc.php 375share/cacti/lib/adodb/adodb-datadict.inc.php
326share/cacti/lib/adodb/adodb-error.inc.php 376share/cacti/lib/adodb/adodb-error.inc.php
327share/cacti/lib/adodb/adodb-errorhandler.inc.php 377share/cacti/lib/adodb/adodb-errorhandler.inc.php
328share/cacti/lib/adodb/adodb-errorpear.inc.php 378share/cacti/lib/adodb/adodb-errorpear.inc.php
329share/cacti/lib/adodb/adodb-exceptions.inc.php 379share/cacti/lib/adodb/adodb-exceptions.inc.php
330share/cacti/lib/adodb/adodb-iterator.inc.php 380share/cacti/lib/adodb/adodb-iterator.inc.php
331share/cacti/lib/adodb/adodb-lib.inc.php 381share/cacti/lib/adodb/adodb-lib.inc.php
332share/cacti/lib/adodb/adodb-pear.inc.php 382share/cacti/lib/adodb/adodb-pear.inc.php
cvs diff -r1.5 -r1.6 pkgsrc/net/cacti/distinfo (expand / switch to unified diff)

--- pkgsrc/net/cacti/distinfo 2014/08/23 12:50:25 1.5
+++ pkgsrc/net/cacti/distinfo 2015/03/11 13:56:46 1.6
@@ -1,15 +1,9 @@ @@ -1,15 +1,9 @@
1$NetBSD: distinfo,v 1.5 2014/08/23 12:50:25 adam Exp $ 1$NetBSD: distinfo,v 1.6 2015/03/11 13:56:46 adam Exp $
2 2
3SHA1 (cacti-0.8.8b.tar.gz) = 84979416ae08d586064328d6451a3108b74a3b06 3SHA1 (cacti-0.8.8c.tar.gz) = 6fdcaf59a7467ac593d4940e5a65338bdea5475b
4RMD160 (cacti-0.8.8b.tar.gz) = a2c88961565c6b5d593b4f2603514139800c9145 4RMD160 (cacti-0.8.8c.tar.gz) = 591d08d27824444b68e4f517eb52be8bd08fc5f4
5Size (cacti-0.8.8b.tar.gz) = 2272130 bytes 5Size (cacti-0.8.8c.tar.gz) = 2908451 bytes
6SHA1 (patch-cacti.sql) = 37e18026c4136630d939ab5a7a4d6336bf166282 6SHA1 (patch-cacti.sql) = 37e18026c4136630d939ab5a7a4d6336bf166282
7SHA1 (patch-cdef.php) = ee898fcbb0da5db1a1127ba54fbf72c308df47eb 
8SHA1 (patch-graph_xport.php) = 275717883721c674ab149e163be0ba780b86b11b 
9SHA1 (patch-host.php) = 679fd76c81a719d949e023cecc4cc0c47ac6acf4 
10SHA1 (patch-include_global.php) = fb0d2f15596b051c60ed6032ecb9038315b7c663 7SHA1 (patch-include_global.php) = fb0d2f15596b051c60ed6032ecb9038315b7c663
11SHA1 (patch-include_global__settings.php) = 54ffd0c3fc9d927595b1568a874c45a4a6033f7b 8SHA1 (patch-include_global__settings.php) = 54ffd0c3fc9d927595b1568a874c45a4a6033f7b
12SHA1 (patch-install_index.php) = e5ee36159968e1ca160aba953e02b9e80a2eb5d9 9SHA1 (patch-install_index.php) = bc4737d8521d0cff37e18511687be9d258216b6e
13SHA1 (patch-lib_api_device.php) = 0a2d495a0245c8957bfd5214a5e79dbb31f135c4 
14SHA1 (patch-lib_graph_export.php) = ef91e864bc830653fbcf490419d39511aa7a258e 
15SHA1 (patch-lib_rrd.php) = cf7483d9a67f9f146d130de7da86a0f37f1041c9 
File Deleted: pkgsrc/net/cacti/patches/Attic/patch-cdef.php
File Deleted: pkgsrc/net/cacti/patches/Attic/patch-graph_xport.php
File Deleted: pkgsrc/net/cacti/patches/Attic/patch-host.php
File Deleted: pkgsrc/net/cacti/patches/Attic/patch-lib_api_device.php
File Deleted: pkgsrc/net/cacti/patches/Attic/patch-lib_graph_export.php
File Deleted: pkgsrc/net/cacti/patches/patch-lib_rrd.php
cvs diff -r1.2 -r1.3 pkgsrc/net/cacti/patches/Attic/patch-install_index.php (expand / switch to unified diff)

--- pkgsrc/net/cacti/patches/Attic/patch-install_index.php 2014/01/08 20:51:28 1.2
+++ pkgsrc/net/cacti/patches/Attic/patch-install_index.php 2015/03/11 13:56:46 1.3
@@ -1,155 +1,35 @@ @@ -1,155 +1,35 @@
1$NetBSD: patch-install_index.php,v 1.2 2014/01/08 20:51:28 tron Exp $ 1$NetBSD: patch-install_index.php,v 1.3 2015/03/11 13:56:46 adam Exp $
2 2
3- Find utilites in PREFIX first. 3- Find utilites in PREFIX first.
4- Fix-up hard coded user and path (documentaion only). 4- Fix-up hard coded user and path (documentaion only).
5- Make log directory configurable by package variable 5- Make log directory configurable by package variable
6- Fix vulnerability reported in SA54531. Patch taken from here: 
7 6
8 http://svn.cacti.net/viewvc?view=rev&revision=7420 7--- install/index.php.orig 2014-11-23 20:18:57.000000000 +0000
9 8+++ install/index.php
10--- install/index.php.orig 2013-08-07 03:31:19.000000000 +0100 9@@ -96,7 +96,7 @@ function find_best_path($binary_name) {
11+++ install/index.php 2014-01-08 20:26:33.000000000 +0000 
12@@ -96,7 +96,7 @@ 
13 if ($config["cacti_server_os"] == "win32") { 10 if ($config["cacti_server_os"] == "win32") {
14 $search_paths = array("c:/usr/bin", "c:/cacti", "c:/rrdtool", "c:/spine", "c:/php", "c:/progra~1/php", "c:/net-snmp/bin", "c:/progra~1/net-snmp/bin", "d:/usr/bin", "d:/net-snmp/bin", "d:/progra~1/net-snmp/bin", "d:/cacti", "d:/rrdtool", "d:/spine", "d:/php", "d:/progra~1/php"); 11 $search_paths = array("c:/usr/bin", "c:/cacti", "c:/rrdtool", "c:/spine", "c:/php", "c:/progra~1/php", "c:/net-snmp/bin", "c:/progra~1/net-snmp/bin", "d:/usr/bin", "d:/net-snmp/bin", "d:/progra~1/net-snmp/bin", "d:/cacti", "d:/rrdtool", "d:/spine", "d:/php", "d:/progra~1/php");
15 }else{ 12 }else{
16- $search_paths = array("/bin", "/sbin", "/usr/bin", "/usr/sbin", "/usr/local/bin", "/usr/local/sbin"); 13- $search_paths = array("/bin", "/sbin", "/usr/bin", "/usr/sbin", "/usr/local/bin", "/usr/local/sbin");
17+ $search_paths = array("@PREFIX@/bin", "@PREFIX@/sbin", "/bin", "/sbin", "/usr/bin", "/usr/sbin", "/usr/local/bin", "/usr/local/sbin"); 14+ $search_paths = array("@PREFIX@/bin", "@PREFIX@/sbin", "/bin", "/sbin", "/usr/bin", "/usr/sbin", "/usr/local/bin", "/usr/local/sbin");
18 } 15 }
19  16
20 for ($i=0; $i<count($search_paths); $i++) { 17 for ($i=0; $i<count($search_paths); $i++) {
21@@ -267,7 +267,7 @@ 18@@ -267,7 +267,7 @@ $input["path_cactilog"]["description"] =
22 if (config_value_exists("path_cactilog")) { 19 if (config_value_exists("path_cactilog")) {
23 $input["path_cactilog"]["default"] = read_config_option("path_cactilog"); 20 $input["path_cactilog"]["default"] = read_config_option("path_cactilog");
24 } else { 21 } else {
25- $input["path_cactilog"]["default"] = $config["base_path"] . "/log/cacti.log"; 22- $input["path_cactilog"]["default"] = $config["base_path"] . "/log/cacti.log";
26+ $input["path_cactilog"]["default"] = "@CACTI_LOGDIR@" . "/cacti.log"; 23+ $input["path_cactilog"]["default"] = "@CACTI_LOGDIR@" . "/cacti.log";
27 } 24 }
28  25
29 /* SNMP Version */ 26 /* SNMP Version */
30@@ -310,27 +310,28 @@ 27@@ -670,7 +670,7 @@ if ($step == "4") {
31 } 
32  
33 /* pre-processing that needs to be done for each step */ 
34-if (empty($_REQUEST["step"])) { 
35- $_REQUEST["step"] = 1; 
36-}else{ 
37- if ($_REQUEST["step"] == "1") { 
38- $_REQUEST["step"] = "2"; 
39- }elseif (($_REQUEST["step"] == "2") && ($_REQUEST["install_type"] == "1")) { 
40- $_REQUEST["step"] = "3"; 
41- }elseif (($_REQUEST["step"] == "2") && ($_REQUEST["install_type"] == "3")) { 
42- $_REQUEST["step"] = "8"; 
43- }elseif (($_REQUEST["step"] == "8") && ($old_version_index <= array_search("0.8.5a", $cacti_versions))) { 
44- $_REQUEST["step"] = "9"; 
45- }elseif ($_REQUEST["step"] == "8") { 
46- $_REQUEST["step"] = "3"; 
47- }elseif ($_REQUEST["step"] == "9") { 
48- $_REQUEST["step"] = "3"; 
49- }elseif ($_REQUEST["step"] == "3") { 
50- $_REQUEST["step"] = "4"; 
51+if (isset($_REQUEST["step"]) && $_REQUEST["step"] > 0) { 
52+ $step = intval($_REQUEST["step"]); 
53+ if ($step == "1") { 
54+ $step = "2"; 
55+ } elseif (($step == "2") && ($_REQUEST["install_type"] == "1")) { 
56+ $step = "3"; 
57+ } elseif (($step == "2") && ($_REQUEST["install_type"] == "3")) { 
58+ $step = "8"; 
59+ } elseif (($step == "8") && ($old_version_index <= array_search("0.8.5a", $cacti_versions))) { 
60+ $step = "9"; 
61+ } elseif ($step == "8") { 
62+ $step = "3"; 
63+ } elseif ($step == "9") { 
64+ $step = "3"; 
65+ } elseif ($step == "3") { 
66+ $step = "4"; 
67 } 
68+} else { 
69+ $step = 1; 
70 } 
71  
72-if ($_REQUEST["step"] == "4") { 
73+if ($step == "4") { 
74 include_once("../lib/data_query.php"); 
75 include_once("../lib/utility.php"); 
76  
77@@ -366,7 +367,7 @@ 
78  
79 header ("Location: ../index.php"); 
80 exit; 
81-}elseif (($_REQUEST["step"] == "8") && ($_REQUEST["install_type"] == "3")) { 
82+}elseif (($step == "8") && ($_REQUEST["install_type"] == "3")) { 
83 /* if the version is not found, die */ 
84 if (!is_int($old_version_index)) { 
85 print " <p style='font-family: Verdana, Arial; font-size: 16px; font-weight: bold; color: red;'>Error</p> 
86@@ -505,7 +506,7 @@ 
87 </tr> 
88 <tr> 
89 <td width="100%" style="font-size: 12px;"> 
90- <?php if ($_REQUEST["step"] == "1") { ?> 
91+ <?php if ($step == "1") { ?> 
92  
93 <p>Thanks for taking the time to download and install cacti, the complete graphing 
94 solution for your network. Before you can start making cool graphs, there are a few 
95@@ -530,7 +531,7 @@ 
96 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
97 GNU General Public License for more details.</p> 
98  
99- <?php }elseif ($_REQUEST["step"] == "2") { ?> 
100+ <?php }elseif ($step == "2") { ?> 
101  
102 <p>Please select the type of installation</p> 
103  
104@@ -551,7 +552,7 @@ 
105 print "Server Operating System Type: " . $config["cacti_server_os"] . "<br>"; ?> 
106 </p> 
107  
108- <?php }elseif ($_REQUEST["step"] == "3") { ?> 
109+ <?php }elseif ($step == "3") { ?> 
110  
111 <p>Make sure all of these values are correct before continuing.</p> 
112 <?php 
113@@ -609,7 +610,7 @@ 
114 is an upgrade. You can change any of the settings on this screen at a later 
115 time by going to "Cacti Settings" from within Cacti.</p> 
116  
117- <?php }elseif ($_REQUEST["step"] == "8") { ?> 
118+ <?php }elseif ($step == "8") { ?> 
119  
120 <p>Upgrade results:</p> 
121  
122@@ -659,7 +660,7 @@ 
123 print $upgrade_results; 
124 ?> 
125  
126- <?php }elseif ($_REQUEST["step"] == "9") { ?> 
127+ <?php }elseif ($step == "9") { ?> 
128  
129 <p style='font-size: 16px; font-weight: bold; color: red;'>Important Upgrade Notice</p> 
130  
131@@ -667,13 +668,13 @@ 
132  28
133 <p>See the sample crontab entry below with the change made in red. Your crontab line will look slightly different based upon your setup.</p> 29 <p>See the sample crontab entry below with the change made in red. Your crontab line will look slightly different based upon your setup.</p>
134  30
135- <p><tt>*/5 * * * * cactiuser php /var/www/html/cacti/<span style='font-weight: bold; color: red;'>poller.php</span> &gt; /dev/null 2&gt;&amp;1</tt></p> 31- <p><tt>*/5 * * * * cactiuser php /var/www/html/cacti/<span style='font-weight: bold; color: red;'>poller.php</span> &gt; /dev/null 2&gt;&amp;1</tt></p>
136+ <p><tt>*/5 * * * * @CACTI_USER@ php @CACTIDIR@<span style='font-weight: bold; color: red;'>poller.php</span> &gt; /dev/null 2&gt;&amp;1</tt></p> 32+ <p><tt>*/5 * * * * @CACTI_USER@ php @CACTIDIR@<span style='font-weight: bold; color: red;'>poller.php</span> &gt; /dev/null 2&gt;&amp;1</tt></p>
137  33
138 <p>Once you have made this change, please click Next to continue.</p> 34 <p>Once you have made this change, please click Next to continue.</p>
139  35
140 <?php }?> 
141  
142- <p align="right"><input type="image" src="install_<?php if ($_REQUEST["step"] == "3") {?>finish<?php }else{?>next<?php }?>.gif" alt="<?php if ($_REQUEST["step"] == "3"){?>Finish<?php }else{?>Next<?php }?>"></p> 
143+ <p align="right"><input type="image" src="install_<?php if ($step == "3") {?>finish<?php }else{?>next<?php }?>.gif" alt="<?php if ($step == "3"){?>Finish<?php }else{?>Next<?php }?>"></p> 
144 </td> 
145 </tr> 
146 </table> 
147@@ -681,7 +682,7 @@ 
148 </tr> 
149 </table> 
150  
151-<input type="hidden" name="step" value="<?php print $_REQUEST["step"];?>"> 
152+<input type="hidden" name="step" value="<?php print $step;?>"> 
153  
154 </form> 
155