Attachment 154305 Details for Bug 198586 – patch

patch

patch-cacti.txt (text/plain), 16.88 KB, created by Anonymous on 2015-03-14 22:58:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anonymous

Created: 2015-03-14 22:58:31 UTC

Size: 16.88 KB

patch

obsolete

>Index: cacti/Makefile
>===================================================================
>--- cacti/Makefile	(revision 380773)
>+++ cacti/Makefile	(working copy)
>@@ -1,17 +1,16 @@
> # $FreeBSD$
> 
> PORTNAME=	cacti
>-PORTVERSION=	0.8.8b${PATCHLEVEL}
>-PORTREVISION=	3
>+PORTVERSION=	0.8.8c${PATCHLEVEL}
> CATEGORIES=	net-mgmt www
> MASTER_SITES=	http://www.cacti.net/downloads/
> 
> # Vendor's patches
>-PATCH_SITES=	http://www.cacti.net/downloads/patches/${SITEDISTVERSION}/
>-PATCHFILES=	security.patch
>-PATCH_DIST_STRIP=	-p1
>+#PATCH_SITES=	http://www.cacti.net/downloads/patches/${SITEDISTVERSION}/
>+#PATCHFILES=	security.patch
>+#PATCH_DIST_STRIP=	-p1
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	chris@bsdjunk.com	
> COMMENT=	Web-driven graphing interface for RRDTool
> 
> LICENSE=	GPLv2
>@@ -19,7 +18,7 @@
> 
> RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
> 
>-PATCH_STRIP=	-p1
>+#PATCH_STRIP=	-p1
> USES=		shebangfix
> USE_MYSQL=	yes
> USE_PHP=	mysql pcre session sockets snmp xml
>Index: cacti/distinfo
>===================================================================
>--- cacti/distinfo	(revision 380773)
>+++ cacti/distinfo	(working copy)
>@@ -1,4 +1,4 @@
>-SHA256 (cacti-0.8.8b.tar.gz) = ef0e2a813139e0b4c2e066f0fdae1f4ad086bef0aa23446055df6331cb1af98c
>-SIZE (cacti-0.8.8b.tar.gz) = 2272130
>+SHA256 (cacti-0.8.8c.tar.gz) = f9b17ed37eac1cdd9ea43d04a09592773216682c5fe7754f9dfcbd5727e70c79
>+SIZE (cacti-0.8.8c.tar.gz) = 2908451
> SHA256 (security.patch) = 73758bdf3f7846875f1620c35d1d982fa27366b053d8bd87363c618e7747c163
> SIZE (security.patch) = 6909
>Index: cacti/files/patch-include__global.php
>===================================================================
>--- cacti/files/patch-include__global.php	(revision 380773)
>+++ cacti/files/patch-include__global.php	(working copy)
>@@ -1,5 +1,5 @@
>---- ./include/global.php.orig	2013-08-06 19:31:19.000000000 -0700
>-+++ ./include/global.php	2014-08-11 18:37:08.000000000 -0700
>+--- include/global.php.bak	2015-03-12 03:07:05.768314249 -0700
>++++ include/global.php	2015-03-12 03:08:04.171320391 -0700
> @@ -113,7 +113,7 @@
>  	$config["library_path"] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__));
>  }
>Index: cacti/files/patch-include__global_settings.php
>===================================================================
>--- cacti/files/patch-include__global_settings.php	(revision 380773)
>+++ cacti/files/patch-include__global_settings.php	(working copy)
>@@ -1,6 +1,6 @@
>---- ./include/global_settings.php.orig	2013-08-06 19:31:19.000000000 -0700
>-+++ ./include/global_settings.php	2014-08-11 18:37:08.000000000 -0700
>-@@ -96,9 +96,9 @@
>+--- include/global_settings.php.bak	2015-03-12 03:08:59.333297709 -0700
>++++ include/global_settings.php	2015-03-12 03:10:47.532302704 -0700
>+@@ -96,7 +96,7 @@
>  			),
>  		"path_cactilog" => array(
>  			"friendly_name" => "Cacti Log File Path",
>@@ -7,8 +7,5 @@
> -			"description" => "The path to your Cacti log file (if blank, defaults to <path_cacti>/log/cacti.log)",
> +			"description" => "The path to your Cacti log file (if blank, defaults to /var/log/cacti/log)",
>  			"method" => "filepath",
>--			"default" => $config["base_path"] . "/log/cacti.log",
>-+			"default" => "/var/log/cacti/log",
>+ 			"default" => $config["base_path"] . "/log/cacti.log",
>  			"max_length" => "255"
>- 			),
>- 		"pollerpaths_header" => array(
>Index: cacti/files/patch-install__index.php
>===================================================================
>--- cacti/files/patch-install__index.php	(revision 380773)
>+++ cacti/files/patch-install__index.php	(working copy)
>@@ -1,5 +1,5 @@
>---- ./install/index.php.orig	2013-08-06 19:31:19.000000000 -0700
>-+++ ./install/index.php	2014-08-11 18:45:19.000000000 -0700
>+--- install/index.php.bak	2015-03-12 03:12:05.409276443 -0700
>++++ install/index.php	2015-03-12 03:14:17.596295374 -0700
> @@ -267,7 +267,7 @@
>  if (config_value_exists("path_cactilog")) {
>  	$input["path_cactilog"]["default"] = read_config_option("path_cactilog");
>Index: cacti/files/patch-lib__rrd.php
>===================================================================
>--- cacti/files/patch-lib__rrd.php	(revision 380773)
>+++ cacti/files/patch-lib__rrd.php	(working copy)
>@@ -1,35 +0,0 @@
>---- ./lib/rrd.php.orig	2014-08-11 17:34:23.000000000 -0700
>-+++ ./lib/rrd.php	2014-08-11 17:34:23.000000000 -0700
>-@@ -1343,20 +1343,20 @@
>- 		$need_rrd_nl = TRUE;
>- 
>- 		if ($graph_item_types{$graph_item["graph_type_id"]} == "COMMENT") {
>-+			# perform variable substitution first (in case this will yield an empty results or brings command injection problems)
>-+			$comment_arg = rrd_substitute_host_query_data($graph_variables["text_format"][$graph_item_id], $graph, $graph_item);
>-+			# next, compute the argument of the COMMENT statement and perform injection counter measures
>-+			if (trim($comment_arg) == '') { # an empty COMMENT must be treated with care
>-+				$comment_arg = cacti_escapeshellarg(' ' . $hardreturn[$graph_item_id]);
>-+			} else {
>-+				$comment_arg = cacti_escapeshellarg($comment_arg . $hardreturn[$graph_item_id]);
>-+			}
>-+
>-+			# create rrdtool specific command line
>- 			if (read_config_option("rrdtool_version") != "rrd-1.0.x") {
>--				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":" . str_replace(":", "\:", cacti_escapeshellarg($graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id])) . " ";
>--				if (trim($comment_string) == 'COMMENT:"\n"') {
>--					$txt_graph_items .= 'COMMENT:" \n"'; # rrdtool will skip a COMMENT that holds a NL only; so add a blank to make NL work
>--				} else if (trim($comment_string) != "COMMENT:\"\"") {
>--					$txt_graph_items .= rrd_substitute_host_query_data($comment_string, $graph, $graph_item);
>--				}
>-+				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":" . str_replace(":", "\:", $comment_arg) . " ";
>- 			}else {
>--				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":" . cacti_escapeshellarg($graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id]) . " ";
>--				if (trim($comment_string) == 'COMMENT:"\n"') {
>--					$txt_graph_items .= 'COMMENT:" \n"'; # rrdtool will skip a COMMENT that holds a NL only; so add a blank to make NL work
>--				} else if (trim($comment_string) != "COMMENT:\"\"") {
>--					$txt_graph_items .= rrd_substitute_host_query_data($comment_string, $graph, $graph_item);
>--				}
>-+				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":" . $comment_arg . " ";
>- 			}
>- 		}elseif (($graph_item_types{$graph_item["graph_type_id"]} == "GPRINT") && (!isset($graph_data_array["graph_nolegend"]))) {
>- 			$graph_variables["text_format"][$graph_item_id] = str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]); /* escape colons */
>Index: cacti/files/patch-scripts-linux_memory.pl
>===================================================================
>--- cacti/files/patch-scripts-linux_memory.pl	(revision 0)
>+++ cacti/files/patch-scripts-linux_memory.pl	(working copy)
>@@ -0,0 +1,10 @@
>+--- scripts/linux_memory.pl.bak	2015-03-14 15:28:49.522351509 -0700
>++++ scripts/linux_memory.pl	2015-03-14 15:29:06.505326669 -0700
>+@@ -1,6 +1,6 @@
>+ #!/usr/bin/perl
>+ 
>+-open(PROCESS, "cat /proc/meminfo | grep -w $ARGV[0] |");
>++open(PROCESS, "cat /compat/linux/proc/meminfo | grep -w $ARGV[0] |");
>+ foreach (<PROCESS>) {
>+ 	if ($_ =~ /($ARGV[0].*\s)(.*[0-9])( kB)/) {
>+ 		print $2;
>
>Property changes on: cacti/files/patch-scripts-linux_memory.pl
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: cacti/files/pkg-message.in
>===================================================================
>--- cacti/files/pkg-message.in	(revision 380773)
>+++ cacti/files/pkg-message.in	(working copy)
>@@ -81,4 +81,7 @@
> 2) The PERL paths in the Cacti PERL scripts have been updated to
>    /usr/local/bin.
> 
>+Other Erratas:
>+Mount linprocfs in /compat/linux/proc will alow most scripts to work.
>+
> =======================================================================
>Index: cacti/pkg-plist
>===================================================================
>--- cacti/pkg-plist	(revision 380773)
>+++ cacti/pkg-plist	(working copy)
>@@ -3,7 +3,7 @@
> %%CACTIDIR%%/about.php
> %%CACTIDIR%%/auth_changepassword.php
> %%CACTIDIR%%/auth_login.php
>-%%CACTIDIR%%/cacti.sql
>+%%CACTIDIR%%/%%CACTIUSER%%.sql
> %%CACTIDIR%%/cdef.php
> %%CACTIDIR%%/cli/.htaccess
> %%CACTIDIR%%/cli/add_data_query.php
>@@ -23,10 +23,10 @@
> %%CACTIDIR%%/cli/poller_output_empty.php
> %%CACTIDIR%%/cli/poller_reindex_hosts.php
> %%CACTIDIR%%/cli/rebuild_poller_cache.php
>+%%CACTIDIR%%/cli/reorder_data_query.php
> %%CACTIDIR%%/cli/repair_database.php
>+%%CACTIDIR%%/cli/repair_templates.php
> %%CACTIDIR%%/cli/structure_rra_paths.php
>-%%CACTIDIR%%/cli/reorder_data_query.php
>-%%CACTIDIR%%/cli/repair_templates.php
> %%CACTIDIR%%/cli/upgrade_database.php
> %%CACTIDIR%%/cmd.php
> %%CACTIDIR%%/color.php
>@@ -42,9 +42,9 @@
> %%CACTIDIR%%/docs/html/basics.html
> %%CACTIDIR%%/docs/html/batch_copy_users.html
> %%CACTIDIR%%/docs/html/bsd_ports.html
>-%%CACTIDIR%%/docs/html/cacti_help.html
>+%%CACTIDIR%%/docs/html/%%CACTIUSER%%_help.html
> %%CACTIDIR%%/docs/html/cdefs.html
>-%%CACTIDIR%%/docs/html/check_cacti_poller.html
>+%%CACTIDIR%%/docs/html/check_%%CACTIUSER%%_poller.html
> %%CACTIDIR%%/docs/html/check_data_gathering.html
> %%CACTIDIR%%/docs/html/check_mysql_updating.html
> %%CACTIDIR%%/docs/html/check_rrd_graph.html
>@@ -110,7 +110,7 @@
> %%CACTIDIR%%/docs/html/install_unix.html
> %%CACTIDIR%%/docs/html/install_windows.html
> %%CACTIDIR%%/docs/html/installation.html
>-%%CACTIDIR%%/docs/html/making_scripts_work_with_cacti.html
>+%%CACTIDIR%%/docs/html/making_scripts_work_with_%%CACTIUSER%%.html
> %%CACTIDIR%%/docs/html/migration_php_scripts_to_script_server.html
> %%CACTIDIR%%/docs/html/new_graphs.html
> %%CACTIDIR%%/docs/html/operating_principles.html
>@@ -126,7 +126,7 @@
> %%CACTIDIR%%/docs/html/templates.html
> %%CACTIDIR%%/docs/html/testing_script_in_script_server.html
> %%CACTIDIR%%/docs/html/unix_apply_patches.html
>-%%CACTIDIR%%/docs/html/unix_configure_cacti.html
>+%%CACTIDIR%%/docs/html/unix_configure_%%CACTIUSER%%.html
> %%CACTIDIR%%/docs/html/unix_configure_httpd.html
> %%CACTIDIR%%/docs/html/unix_configure_mysql.html
> %%CACTIDIR%%/docs/html/unix_configure_php.html
>@@ -175,10 +175,10 @@
> %%CACTIDIR%%/images/button_save.gif
> %%CACTIDIR%%/images/button_view.gif
> %%CACTIDIR%%/images/button_yes.gif
>-%%CACTIDIR%%/images/cacti_about_logo.gif
>-%%CACTIDIR%%/images/cacti_backdrop.gif
>-%%CACTIDIR%%/images/cacti_backdrop2.gif
>-%%CACTIDIR%%/images/cacti_logo.gif
>+%%CACTIDIR%%/images/%%CACTIUSER%%_about_logo.gif
>+%%CACTIDIR%%/images/%%CACTIUSER%%_backdrop.gif
>+%%CACTIDIR%%/images/%%CACTIUSER%%_backdrop2.gif
>+%%CACTIDIR%%/images/%%CACTIUSER%%_logo.gif
> %%CACTIDIR%%/images/calendar.gif
> %%CACTIDIR%%/images/delete_icon.gif
> %%CACTIDIR%%/images/delete_icon_large.gif
>@@ -201,10 +201,14 @@
> %%CACTIDIR%%/images/move_right.gif
> %%CACTIDIR%%/images/move_up.gif
> %%CACTIDIR%%/images/reload_icon_small.gif
>+%%CACTIDIR%%/images/server.png
>+%%CACTIDIR%%/images/server_chart.png
>+%%CACTIDIR%%/images/server_chart_curve.png
>+%%CACTIDIR%%/images/server_dataquery.png
> %%CACTIDIR%%/images/shadow.gif
> %%CACTIDIR%%/images/shadow_gray.gif
> %%CACTIDIR%%/images/show.gif
>-%%CACTIDIR%%/images/tab_cacti.gif
>+%%CACTIDIR%%/images/tab_%%CACTIUSER%%.gif
> %%CACTIDIR%%/images/tab_console.gif
> %%CACTIDIR%%/images/tab_console_down.gif
> %%CACTIDIR%%/images/tab_graphs.gif
>@@ -222,12 +226,69 @@
> %%CACTIDIR%%/images/view_none.gif
> %%CACTIDIR%%/include/auth.php
> %%CACTIDIR%%/include/bottom_footer.php
>-@sample %%CACTIDIR%%/include/config.php.sample
>-%%CACTIDIR%%/include/global_form.php
>+%%CACTIDIR%%/include/config.php.sample
>+%%CACTIDIR%%/include/csrf/csrf-magic.js
>+%%CACTIDIR%%/include/csrf/csrf-magic.php
>+%%CACTIDIR%%/include/csrf/index.php
> %%CACTIDIR%%/include/global.php
> %%CACTIDIR%%/include/global_arrays.php
>+%%CACTIDIR%%/include/global_constants.php
>+%%CACTIDIR%%/include/global_form.php
> %%CACTIDIR%%/include/global_settings.php
>-%%CACTIDIR%%/include/global_constants.php
>+%%CACTIDIR%%/include/js/colorpicker.js
>+%%CACTIDIR%%/include/js/images/ui-bg_diagonals-thick_18_b81900_40x40.png
>+%%CACTIDIR%%/include/js/images/ui-bg_diagonals-thick_20_666666_40x40.png
>+%%CACTIDIR%%/include/js/images/ui-bg_flat_10_000000_40x100.png
>+%%CACTIDIR%%/include/js/images/ui-bg_glass_100_f6f6f6_1x400.png
>+%%CACTIDIR%%/include/js/images/ui-bg_glass_100_fdf5ce_1x400.png
>+%%CACTIDIR%%/include/js/images/ui-bg_glass_65_ffffff_1x400.png
>+%%CACTIDIR%%/include/js/images/ui-bg_gloss-wave_35_f6a828_500x100.png
>+%%CACTIDIR%%/include/js/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
>+%%CACTIDIR%%/include/js/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
>+%%CACTIDIR%%/include/js/images/ui-icons_222222_256x240.png
>+%%CACTIDIR%%/include/js/images/ui-icons_228ef1_256x240.png
>+%%CACTIDIR%%/include/js/images/ui-icons_ef8c08_256x240.png
>+%%CACTIDIR%%/include/js/images/ui-icons_ffd27a_256x240.png
>+%%CACTIDIR%%/include/js/images/ui-icons_ffffff_256x240.png
>+%%CACTIDIR%%/include/js/jquery-ui.css
>+%%CACTIDIR%%/include/js/jquery-ui.js
>+%%CACTIDIR%%/include/js/jquery.cookie.js
>+%%CACTIDIR%%/include/js/jquery.dd.js
>+%%CACTIDIR%%/include/js/jquery.dropdown.js
>+%%CACTIDIR%%/include/js/jquery.easytabs.js
>+%%CACTIDIR%%/include/js/jquery.js
>+%%CACTIDIR%%/include/js/jquery.tablednd.js
>+%%CACTIDIR%%/include/js/jquery.timepicker.js
>+%%CACTIDIR%%/include/js/jquery.zoom.css
>+%%CACTIDIR%%/include/js/jquery.zoom.js
>+%%CACTIDIR%%/include/js/jstree.js
>+%%CACTIDIR%%/include/js/themes/default-dark/32px.png
>+%%CACTIDIR%%/include/js/themes/default-dark/40px.png
>+%%CACTIDIR%%/include/js/themes/default-dark/style.css
>+%%CACTIDIR%%/include/js/themes/default-dark/style.min.css
>+%%CACTIDIR%%/include/js/themes/default-dark/throbber.gif
>+%%CACTIDIR%%/include/js/themes/default/32px.png
>+%%CACTIDIR%%/include/js/themes/default/40px.png
>+%%CACTIDIR%%/include/js/themes/default/style.css
>+%%CACTIDIR%%/include/js/themes/default/style.min.css
>+%%CACTIDIR%%/include/js/themes/default/throbber.gif
>+%%CACTIDIR%%/include/js/themes/proton/30px.png
>+%%CACTIDIR%%/include/js/themes/proton/32px.png
>+%%CACTIDIR%%/include/js/themes/proton/fonts/titillium/titilliumweb-bold-webfont.eot
>+%%CACTIDIR%%/include/js/themes/proton/fonts/titillium/titilliumweb-bold-webfont.svg
>+%%CACTIDIR%%/include/js/themes/proton/fonts/titillium/titilliumweb-bold-webfont.ttf
>+%%CACTIDIR%%/include/js/themes/proton/fonts/titillium/titilliumweb-bold-webfont.woff
>+%%CACTIDIR%%/include/js/themes/proton/fonts/titillium/titilliumweb-extralight-webfont.eot
>+%%CACTIDIR%%/include/js/themes/proton/fonts/titillium/titilliumweb-extralight-webfont.svg
>+%%CACTIDIR%%/include/js/themes/proton/fonts/titillium/titilliumweb-extralight-webfont.ttf
>+%%CACTIDIR%%/include/js/themes/proton/fonts/titillium/titilliumweb-extralight-webfont.woff
>+%%CACTIDIR%%/include/js/themes/proton/fonts/titillium/titilliumweb-regular-webfont.eot
>+%%CACTIDIR%%/include/js/themes/proton/fonts/titillium/titilliumweb-regular-webfont.svg
>+%%CACTIDIR%%/include/js/themes/proton/fonts/titillium/titilliumweb-regular-webfont.ttf
>+%%CACTIDIR%%/include/js/themes/proton/fonts/titillium/titilliumweb-regular-webfont.woff
>+%%CACTIDIR%%/include/js/themes/proton/style.css
>+%%CACTIDIR%%/include/js/themes/proton/style.min.css
>+%%CACTIDIR%%/include/js/themes/proton/throbber.gif
> %%CACTIDIR%%/include/jscalendar/calendar-setup.js
> %%CACTIDIR%%/include/jscalendar/calendar.js
> %%CACTIDIR%%/include/jscalendar/lang/calendar-af.js
>@@ -278,18 +339,6 @@
> %%CACTIDIR%%/include/plugins.php
> %%CACTIDIR%%/include/top_graph_header.php
> %%CACTIDIR%%/include/top_header.php
>-%%CACTIDIR%%/include/treeview/ftiens4.js
>-%%CACTIDIR%%/include/treeview/ftiens4_export.js
>-%%CACTIDIR%%/include/treeview/ftv2blank.gif
>-%%CACTIDIR%%/include/treeview/ftv2lastnode.gif
>-%%CACTIDIR%%/include/treeview/ftv2mlastnode.gif
>-%%CACTIDIR%%/include/treeview/ftv2mnode.gif
>-%%CACTIDIR%%/include/treeview/ftv2node.gif
>-%%CACTIDIR%%/include/treeview/ftv2plastnode.gif
>-%%CACTIDIR%%/include/treeview/ftv2pnode.gif
>-%%CACTIDIR%%/include/treeview/ftv2vertline.gif
>-%%CACTIDIR%%/include/treeview/ua.js
>-%%CACTIDIR%%/include/zoom.js
> %%CACTIDIR%%/index.php
> %%CACTIDIR%%/install/0_8_1_to_0_8_2.php
> %%CACTIDIR%%/install/0_8_2_to_0_8_2a.php
>@@ -315,7 +364,8 @@
> %%CACTIDIR%%/install/0_8_7h_to_0_8_7i.php
> %%CACTIDIR%%/install/0_8_7i_to_0_8_8.php
> %%CACTIDIR%%/install/0_8_8_to_0_8_8a.php
>-%%CACTIDIR%%/install/0_8_8_to_0_8_8b.php
>+%%CACTIDIR%%/install/0_8_8a_to_0_8_8b.php
>+%%CACTIDIR%%/install/0_8_8b_to_0_8_8c.php
> %%CACTIDIR%%/install/0_8_to_0_8_1.php
> %%CACTIDIR%%/install/index.php
> %%CACTIDIR%%/install/install_finish.gif
>@@ -444,10 +494,10 @@
> %%CACTIDIR%%/lib/xml.php
> %%CACTIDIR%%/logout.php
> %%CACTIDIR%%/plugins.php
>+%%CACTIDIR%%/plugins/index.php
> %%CACTIDIR%%/poller.php
> %%CACTIDIR%%/poller_commands.php
> %%CACTIDIR%%/poller_export.php
>-%%CACTIDIR%%/plugins/index.php
> %%CACTIDIR%%/resource/script_queries/host_cpu.xml
> %%CACTIDIR%%/resource/script_queries/host_disk.xml
> %%CACTIDIR%%/resource/script_queries/unix_disk.xml

Flags:

koobs: maintainer-approval+

Actions: View

Attachments on bug 198586: 154305