FreeBSD Bugzilla – Attachment 206217 Details for
Bug 239578
net-mgmt/cacti: Update to 1.2.5
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
updated patch to make diff clearer
cacti-1.2.5_2.diff (text/plain), 23.47 KB, created by
Michael Muenz
on 2019-08-02 05:34:43 UTC
(
hide
)
Description:
updated patch to make diff clearer
Filename:
MIME Type:
Creator:
Michael Muenz
Created:
2019-08-02 05:34:43 UTC
Size:
23.47 KB
patch
obsolete
>diff -uNr cacti/Makefile cacti125/Makefile >--- cacti/Makefile 2019-04-10 23:10:00.000000000 +0200 >+++ cacti125/Makefile 2019-08-02 05:07:14.881921000 +0200 >@@ -1,7 +1,7 @@ > # $FreeBSD: head/net-mgmt/cacti/Makefile 498602 2019-04-10 21:10:00Z swills $ > > PORTNAME= cacti >-PORTVERSION= 1.2.3 >+PORTVERSION= 1.2.5 > CATEGORIES= net-mgmt www > MASTER_SITES= http://www.cacti.net/downloads/ \ > ftp://ftpmirror.uk/freebsd-ports/cacti/ >@@ -47,10 +47,8 @@ > > CONFLICTS_INSTALL= cacti88 > >-OPTIONS_DEFINE= SNMPBIN > OPTIONS_DEFAULT= SNMPBIN > SNMPBIN_DESC= Force use of SNMP binary instead of phpXX-snmp functions >-SNMPBIN_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-lib_snmp.php > > post-patch: > @${FIND} ${WRKSRC} -name \*.orig -delete; \ >diff -uNr cacti/distinfo cacti125/distinfo >--- cacti/distinfo 2019-04-10 23:10:00.000000000 +0200 >+++ cacti125/distinfo 2019-07-26 05:25:18.160412000 +0200 >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1554040180 >-SHA256 (cacti-1.2.3.tar.gz) = 3bd711cb425d51defbcc6d7f5761f886822fd3d004977bb74eca202431cdf51c >-SIZE (cacti-1.2.3.tar.gz) = 23977004 >+TIMESTAMP = 1563799623 >+SHA256 (cacti-1.2.5.tar.gz) = bba3342f9bf285340eaded3545bbfaecd435f60cc5eacd74300fc90113cc9dc9 >+SIZE (cacti-1.2.5.tar.gz) = 24677665 >diff -uNr cacti/files/extra-patch-lib_snmp.php cacti125/files/extra-patch-lib_snmp.php >--- cacti/files/extra-patch-lib_snmp.php 2019-01-16 13:59:37.000000000 +0100 >+++ cacti125/files/extra-patch-lib_snmp.php 1970-01-01 01:00:00.000000000 +0100 >@@ -1,12 +0,0 @@ >---- lib/snmp.php.orig 2019-01-14 19:28:50 UTC >-+++ lib/snmp.php >-@@ -870,6 +870,9 @@ function snmp_escape_string($string) { >- function snmp_get_method($type = 'walk', $version = 1, $context = '', $engineid = '', >- $value_output_format = SNMP_STRING_OUTPUT_GUESS) { >- >-+ /* override PHP SNMP calls and use the binary instead, fixes some broken graph issues */ >-+ return SNMP_METHOD_BINARY; >-+ >- if ($value_output_format == SNMP_STRING_OUTPUT_HEX) { >- return SNMP_METHOD_BINARY; >- } elseif ($version == 3 && $context != '') { >diff -uNr cacti/files/patch-install__functions.php cacti125/files/patch-install__functions.php >--- cacti/files/patch-install__functions.php 2019-04-10 23:10:00.000000000 +0200 >+++ cacti125/files/patch-install__functions.php 1970-01-01 01:00:00.000000000 +0100 >@@ -1,11 +0,0 @@ >---- install/functions.php.orig 2019-03-30 23:40:23 UTC >-+++ install/functions.php >-@@ -533,7 +533,7 @@ function install_file_paths() { >- if (!config_value_exists('path_cactilog')) { >- $input['path_cactilog'] = $settings['path']['path_cactilog']; >- if (empty($input['path_cactilog']['default'])) { >-- $input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log'; >-+ $input['path_cactilog']['default'] = '/var/log/cacti/log'; >- } >- } else { >- $input['path_cactilog'] = $settings['path']['path_cactilog']; >diff -uNr cacti/files/patch-install_functions.php cacti125/files/patch-install_functions.php >--- cacti/files/patch-install_functions.php 1970-01-01 01:00:00.000000000 +0100 >+++ cacti125/files/patch-install_functions.php 2019-07-26 05:24:51.922208000 +0200 >@@ -0,0 +1,11 @@ >+--- install/functions.php.orig 2019-07-26 03:03:53 UTC >++++ install/functions.php >+@@ -538,7 +538,7 @@ function install_file_paths() { >+ } >+ >+ if (empty($input['path_cactilog']['default'])) { >+- $input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log'; >++ $input['path_cactilog']['default'] = '/var/log/cacti/log'; >+ } >+ >+ /* stderr log file path */ >diff -uNr cacti/files/patch-lib_installer.php cacti125/files/patch-lib_installer.php >--- cacti/files/patch-lib_installer.php 2019-01-06 17:32:03.000000000 +0100 >+++ cacti125/files/patch-lib_installer.php 2019-08-01 12:58:36.053160000 +0200 >@@ -1,11 +1,11 @@ >---- lib/installer.php.orig 2019-01-06 07:22:22 UTC >+--- lib/installer.php.orig 2019-07-26 03:05:22 UTC > +++ lib/installer.php >-@@ -3222,7 +3222,7 @@ class Installer implements JsonSerializable { >- >- public static function getInstallLog() { >+@@ -3216,7 +3216,7 @@ class Installer implements JsonSerializable { > global $config; >-- $logcontents = tail_file($config['base_path'] . '/log/cacti.log', 100, -1, ' INSTALL:' , 1, $total_rows); >-+ $logcontents = tail_file('/var/log/cacti/log', 100, -1, ' INSTALL:' , 1, $total_rows); >+ >+ $page_nr = 1; >+- $logcontents = tail_file($config['base_path'] . '/log/cacti.log', 100, -1, ' INSTALL:' , $page_no, $total_rows); >++ $logcontents = tail_file('/var/log/cacti/log', 100, -1, ' INSTALL:' , $page_no, $total_rows); > > $output_log = ''; > foreach ($logcontents as $logline) { >diff -uNr cacti/pkg-plist cacti125/pkg-plist >--- cacti/pkg-plist 2019-04-10 23:10:00.000000000 +0200 >+++ cacti125/pkg-plist 2019-08-02 05:04:50.692553000 +0200 >@@ -24,10 +24,9 @@ > %%CACTIDIR%%/cache/realtime/index.php > %%CACTIDIR%%/cache/spikekill/.htaccess > %%CACTIDIR%%/cache/spikekill/index.php >-%%CACTIDIR%%/cacti.sql >+%%CACTIDIR%%/%%CACTIUSER%%.sql > %%CACTIDIR%%/cdef.php > %%CACTIDIR%%/cli/.htaccess >-%%CACTIDIR%%/cli/index.php > %%CACTIDIR%%/cli/add_data_query.php > %%CACTIDIR%%/cli/add_datasource.php > %%CACTIDIR%%/cli/add_device.php >@@ -36,15 +35,17 @@ > %%CACTIDIR%%/cli/add_perms.php > %%CACTIDIR%%/cli/add_tree.php > %%CACTIDIR%%/cli/analyze_database.php >+%%CACTIDIR%%/cli/apply_automation_rules.php > %%CACTIDIR%%/cli/audit_database.php > %%CACTIDIR%%/cli/convert_tables.php > %%CACTIDIR%%/cli/copy_user.php > %%CACTIDIR%%/cli/host_update_template.php > %%CACTIDIR%%/cli/import_package.php >+%%CACTIDIR%%/cli/import_template.php >+%%CACTIDIR%%/cli/index.php > %%CACTIDIR%%/cli/input_whitelist.php >-%%CACTIDIR%%/cli/install_cacti.php >+%%CACTIDIR%%/cli/install_%%CACTIUSER%%.php > %%CACTIDIR%%/cli/md5sum.php >-%%CACTIDIR%%/cli/import_template.php > %%CACTIDIR%%/cli/poller_data_sources_reapply_names.php > %%CACTIDIR%%/cli/poller_graphs_reapply_names.php > %%CACTIDIR%%/cli/poller_output_empty.php >@@ -58,7 +59,7 @@ > %%CACTIDIR%%/cli/repair_database.php > %%CACTIDIR%%/cli/repair_graphs.php > %%CACTIDIR%%/cli/repair_templates.php >-%%CACTIDIR%%/cli/splice_rra.php >+%%CACTIDIR%%/cli/splice_rrd.php > %%CACTIDIR%%/cli/sqltable_to_php.php > %%CACTIDIR%%/cli/structure_rra_paths.php > %%CACTIDIR%%/cli/upgrade_database.php >@@ -72,8 +73,8 @@ > %%CACTIDIR%%/data_debug.php > %%CACTIDIR%%/data_input.php > %%CACTIDIR%%/data_queries.php >-%%CACTIDIR%%/data_sources.php > %%CACTIDIR%%/data_source_profiles.php >+%%CACTIDIR%%/data_sources.php > %%CACTIDIR%%/data_templates.php > %%CACTIDIR%%/docs/Aggregate-Templates.html > %%CACTIDIR%%/docs/Aggregates.html >@@ -115,6 +116,7 @@ > %%CACTIDIR%%/docs/Import-Template.html > %%CACTIDIR%%/docs/Install-Under-CentOS_LAMP.html > %%CACTIDIR%%/docs/Install-Under-CentOS_LEMP.html >+%%CACTIDIR%%/docs/Installing-Under-Ubuntu-Debian.html > %%CACTIDIR%%/docs/Installing-Under-Windows.html > %%CACTIDIR%%/docs/Navigating-The-User-Interface.html > %%CACTIDIR%%/docs/PHP-Script-Server.html >@@ -145,6 +147,7 @@ > %%CACTIDIR%%/docs/Templates.html > %%CACTIDIR%%/docs/Tree-Rules.html > %%CACTIDIR%%/docs/Trees.html >+%%CACTIDIR%%/docs/Upgrading-Cacti-Under-FreeBSD.html > %%CACTIDIR%%/docs/Upgrading-Cacti-Under-Windows.html > %%CACTIDIR%%/docs/Upgrading-Cacti.html > %%CACTIDIR%%/docs/User-Domains.html >@@ -155,6 +158,9 @@ > %%CACTIDIR%%/docs/Version-Specific-Release-Notes.html > %%CACTIDIR%%/docs/Viewing-Graphs.html > %%CACTIDIR%%/docs/audit_schema.sql >+%%CACTIDIR%%/docs/images/Add_Device_screen.png >+%%CACTIDIR%%/docs/images/Device_console_windows.JPG >+%%CACTIDIR%%/docs/images/add_device_button.png > %%CACTIDIR%%/docs/images/aggregate-templates-edit1.png > %%CACTIDIR%%/docs/images/aggregate-templates-edit2.png > %%CACTIDIR%%/docs/images/aggregate-templates-edit3.png >@@ -172,9 +178,11 @@ > %%CACTIDIR%%/docs/images/automation-graph-rules-edit4.png > %%CACTIDIR%%/docs/images/automation-graph-rules-edit5.png > %%CACTIDIR%%/docs/images/automation-graph-rules.png >+%%CACTIDIR%%/docs/images/automation-network-main.png > %%CACTIDIR%%/docs/images/automation-networks-edit1.png > %%CACTIDIR%%/docs/images/automation-networks-edit2.png > %%CACTIDIR%%/docs/images/automation-networks.png >+%%CACTIDIR%%/docs/images/automation-reachability-settings.png > %%CACTIDIR%%/docs/images/automation-snmp-options-edit1.png > %%CACTIDIR%%/docs/images/automation-snmp-options-edit2.png > %%CACTIDIR%%/docs/images/automation-snmp-options-edit3.png >@@ -184,8 +192,22 @@ > %%CACTIDIR%%/docs/images/automation-tree-rules-edit3.png > %%CACTIDIR%%/docs/images/automation-tree-rules-edit4.png > %%CACTIDIR%%/docs/images/automation-tree-rules.png >-%%CACTIDIR%%/docs/images/cacti-page-layout.png >-%%CACTIDIR%%/docs/images/cacti-tree-view-page.png >+%%CACTIDIR%%/docs/images/%%CACTIUSER%%-page-layout.png >+%%CACTIDIR%%/docs/images/%%CACTIUSER%%-tree-view-page.png >+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_add_device_site.JPG >+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_add_sites.JPG >+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_default_tree.png >+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_device_datasource.JPG >+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_graph_managment.JPG >+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_graph_managment_graph.JPG >+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_graph_template_options.JPG >+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_remote_poller_setup.JPG >+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_sites_automation.JPG >+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_sites_page.png >+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_system_utilities.JPG >+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_thold_enable.JPG >+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_thold_plugin_install.JPG >+%%CACTIDIR%%/docs/images/%%CACTIUSER%%_trees_screen.png > %%CACTIDIR%%/docs/images/cdef-01.preview.png > %%CACTIDIR%%/docs/images/cdefs-edit1.png > %%CACTIDIR%%/docs/images/cdefs-edit2.png >@@ -420,6 +442,7 @@ > %%CACTIDIR%%/docs/images/system-utilities-viewdqcache.png > %%CACTIDIR%%/docs/images/system-utilities-viewpcache.png > %%CACTIDIR%%/docs/images/system-utilities-viewulog.png >+%%CACTIDIR%%/docs/images/tree_options.png > %%CACTIDIR%%/docs/images/user-domains-edit1.png > %%CACTIDIR%%/docs/images/user-domains-edit2.png > %%CACTIDIR%%/docs/images/user-domains.png >@@ -455,9 +478,9 @@ > %%CACTIDIR%%/docs/images/vdefs-edit4.png > %%CACTIDIR%%/docs/images/vdefs.png > %%CACTIDIR%%/docs/index.php >-%%CACTIDIR%%/formats/cacti_group.format >-%%CACTIDIR%%/formats/cacti_group_dark.format >-%%CACTIDIR%%/formats/cacti_monitor.format >+%%CACTIDIR%%/formats/%%CACTIUSER%%_group.format >+%%CACTIDIR%%/formats/%%CACTIUSER%%_group_dark.format >+%%CACTIDIR%%/formats/%%CACTIUSER%%_monitor.format > %%CACTIDIR%%/formats/default.format > %%CACTIDIR%%/formats/index.php > %%CACTIDIR%%/formats/lotus_notes.format >@@ -482,13 +505,13 @@ > %%CACTIDIR%%/images/auth_background.gif > %%CACTIDIR%%/images/bullet_arrow_down.png > %%CACTIDIR%%/images/bullet_arrow_up.png >-%%CACTIDIR%%/images/cacti_about_logo.gif >-%%CACTIDIR%%/images/cacti_backdrop.gif >-%%CACTIDIR%%/images/cacti_backdrop2.gif >-%%CACTIDIR%%/images/cacti_error_image.png >-%%CACTIDIR%%/images/cacti_logo.gif >-%%CACTIDIR%%/images/cacti_logo_new.gif >-%%CACTIDIR%%/images/cacti_logo.svg >+%%CACTIDIR%%/images/%%CACTIUSER%%_about_logo.gif >+%%CACTIDIR%%/images/%%CACTIUSER%%_backdrop.gif >+%%CACTIDIR%%/images/%%CACTIUSER%%_backdrop2.gif >+%%CACTIDIR%%/images/%%CACTIUSER%%_error_image.png >+%%CACTIDIR%%/images/%%CACTIUSER%%_logo.gif >+%%CACTIDIR%%/images/%%CACTIUSER%%_logo.svg >+%%CACTIDIR%%/images/%%CACTIUSER%%_logo_new.gif > %%CACTIDIR%%/images/calendar.gif > %%CACTIDIR%%/images/chart_curve_go.png > %%CACTIDIR%%/images/cog.png >@@ -530,7 +553,7 @@ > %%CACTIDIR%%/images/site.png > %%CACTIDIR%%/images/spikekill.gif > %%CACTIDIR%%/images/stop.png >-%%CACTIDIR%%/images/tab_cacti.gif >+%%CACTIDIR%%/images/tab_%%CACTIUSER%%.gif > %%CACTIDIR%%/images/tab_clog.png > %%CACTIDIR%%/images/tab_clog_down.png > %%CACTIDIR%%/images/tab_console.gif >@@ -563,7 +586,7 @@ > %%CACTIDIR%%/images/view_page.png > %%CACTIDIR%%/include/auth.php > %%CACTIDIR%%/include/bottom_footer.php >-%%CACTIDIR%%/include/cacti_version >+%%CACTIDIR%%/include/%%CACTIUSER%%_version > %%CACTIDIR%%/include/cli_check.php > %%CACTIDIR%%/include/config.php.sample > %%CACTIDIR%%/include/content/README >@@ -759,6 +782,7 @@ > %%CACTIDIR%%/include/js/d3.js > %%CACTIDIR%%/include/js/dygraph-combined.js > %%CACTIDIR%%/include/js/index.php >+%%CACTIDIR%%/include/js/jquery-ui.js > %%CACTIDIR%%/include/js/jquery.colorpicker.js > %%CACTIDIR%%/include/js/jquery.cookie.js > %%CACTIDIR%%/include/js/jquery.dropdown.js >@@ -775,7 +799,6 @@ > %%CACTIDIR%%/include/js/jquery.timepicker.js > %%CACTIDIR%%/include/js/jquery.ui.touch.punch.js > %%CACTIDIR%%/include/js/jquery.zoom.js >-%%CACTIDIR%%/include/js/jquery-ui.js > %%CACTIDIR%%/include/js/js.storage.js > %%CACTIDIR%%/include/js/jstree.js > %%CACTIDIR%%/include/js/pace.js >@@ -798,8 +821,8 @@ > %%CACTIDIR%%/include/themes/classic/images/bar-opacity.png > %%CACTIDIR%%/include/themes/classic/images/bar-pointer.png > %%CACTIDIR%%/include/themes/classic/images/bar.png >-%%CACTIDIR%%/include/themes/classic/images/cacti_logo.gif >-%%CACTIDIR%%/include/themes/classic/images/cacti_logo.svg >+%%CACTIDIR%%/include/themes/classic/images/%%CACTIUSER%%_logo.gif >+%%CACTIDIR%%/include/themes/classic/images/%%CACTIUSER%%_logo.svg > %%CACTIDIR%%/include/themes/classic/images/favicon.ico > %%CACTIDIR%%/include/themes/classic/images/favicon.png > %%CACTIDIR%%/include/themes/classic/images/index.php >@@ -847,10 +870,10 @@ > %%CACTIDIR%%/include/themes/dark/images/bar-opacity.png > %%CACTIDIR%%/include/themes/dark/images/bar-pointer.png > %%CACTIDIR%%/include/themes/dark/images/bar.png >-%%CACTIDIR%%/include/themes/dark/images/cacti_backdrop.gif >-%%CACTIDIR%%/include/themes/dark/images/cacti_backdrop2.gif >-%%CACTIDIR%%/include/themes/dark/images/cacti_logo.gif >-%%CACTIDIR%%/include/themes/dark/images/cacti_logo.svg >+%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_backdrop.gif >+%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_backdrop2.gif >+%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_logo.gif >+%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_logo.svg > %%CACTIDIR%%/include/themes/dark/images/favicon.ico > %%CACTIDIR%%/include/themes/dark/images/favicon.png > %%CACTIDIR%%/include/themes/dark/images/index.php >@@ -901,8 +924,8 @@ > %%CACTIDIR%%/include/themes/modern/images/bar-opacity.png > %%CACTIDIR%%/include/themes/modern/images/bar-pointer.png > %%CACTIDIR%%/include/themes/modern/images/bar.png >-%%CACTIDIR%%/include/themes/modern/images/cacti_logo.gif >-%%CACTIDIR%%/include/themes/modern/images/cacti_logo.svg >+%%CACTIDIR%%/include/themes/modern/images/%%CACTIUSER%%_logo.gif >+%%CACTIDIR%%/include/themes/modern/images/%%CACTIUSER%%_logo.svg > %%CACTIDIR%%/include/themes/modern/images/favicon.ico > %%CACTIDIR%%/include/themes/modern/images/favicon.png > %%CACTIDIR%%/include/themes/modern/images/index.php >@@ -951,8 +974,8 @@ > %%CACTIDIR%%/include/themes/paper-plane/images/bar-opacity.png > %%CACTIDIR%%/include/themes/paper-plane/images/bar-pointer.png > %%CACTIDIR%%/include/themes/paper-plane/images/bar.png >-%%CACTIDIR%%/include/themes/paper-plane/images/cacti_logo.gif >-%%CACTIDIR%%/include/themes/paper-plane/images/cacti_logo.svg >+%%CACTIDIR%%/include/themes/paper-plane/images/%%CACTIUSER%%_logo.gif >+%%CACTIDIR%%/include/themes/paper-plane/images/%%CACTIUSER%%_logo.svg > %%CACTIDIR%%/include/themes/paper-plane/images/favicon.ico > %%CACTIDIR%%/include/themes/paper-plane/images/favicon.png > %%CACTIDIR%%/include/themes/paper-plane/images/index.php >@@ -1001,8 +1024,8 @@ > %%CACTIDIR%%/include/themes/paw/images/bar-opacity.png > %%CACTIDIR%%/include/themes/paw/images/bar-pointer.png > %%CACTIDIR%%/include/themes/paw/images/bar.png >-%%CACTIDIR%%/include/themes/paw/images/cacti_logo.gif >-%%CACTIDIR%%/include/themes/paw/images/cacti_logo.svg >+%%CACTIDIR%%/include/themes/paw/images/%%CACTIUSER%%_logo.gif >+%%CACTIDIR%%/include/themes/paw/images/%%CACTIUSER%%_logo.svg > %%CACTIDIR%%/include/themes/paw/images/favicon.ico > %%CACTIDIR%%/include/themes/paw/images/favicon.png > %%CACTIDIR%%/include/themes/paw/images/index.php >@@ -1051,8 +1074,8 @@ > %%CACTIDIR%%/include/themes/sunrise/images/bar-opacity.png > %%CACTIDIR%%/include/themes/sunrise/images/bar-pointer.png > %%CACTIDIR%%/include/themes/sunrise/images/bar.png >-%%CACTIDIR%%/include/themes/sunrise/images/cacti_logo.gif >-%%CACTIDIR%%/include/themes/sunrise/images/cacti_logo.svg >+%%CACTIDIR%%/include/themes/sunrise/images/%%CACTIUSER%%_logo.gif >+%%CACTIDIR%%/include/themes/sunrise/images/%%CACTIUSER%%_logo.svg > %%CACTIDIR%%/include/themes/sunrise/images/favicon.ico > %%CACTIDIR%%/include/themes/sunrise/images/favicon.png > %%CACTIDIR%%/include/themes/sunrise/images/index.php >@@ -1102,10 +1125,12 @@ > %%CACTIDIR%%/include/vendor/flag-icon-css/assets/docs.css > %%CACTIDIR%%/include/vendor/flag-icon-css/assets/docs.js > %%CACTIDIR%%/include/vendor/flag-icon-css/assets/docs.less >+%%CACTIDIR%%/include/vendor/flag-icon-css/assets/index.php > %%CACTIDIR%%/include/vendor/flag-icon-css/bower.json > %%CACTIDIR%%/include/vendor/flag-icon-css/composer.json > %%CACTIDIR%%/include/vendor/flag-icon-css/css/flag-icon.css > %%CACTIDIR%%/include/vendor/flag-icon-css/css/flag-icon.min.css >+%%CACTIDIR%%/include/vendor/flag-icon-css/css/index.php > %%CACTIDIR%%/include/vendor/flag-icon-css/flags/1x1/ad.svg > %%CACTIDIR%%/include/vendor/flag-icon-css/flags/1x1/ae.svg > %%CACTIDIR%%/include/vendor/flag-icon-css/flags/1x1/af.svg >@@ -1619,6 +1644,7 @@ > %%CACTIDIR%%/include/vendor/flag-icon-css/flags/4x3/zm.svg > %%CACTIDIR%%/include/vendor/flag-icon-css/flags/4x3/zw.svg > %%CACTIDIR%%/include/vendor/flag-icon-css/index.html >+%%CACTIDIR%%/include/vendor/flag-icon-css/index.php > %%CACTIDIR%%/include/vendor/flag-icon-css/less/flag-icon-base.less > %%CACTIDIR%%/include/vendor/flag-icon-css/less/flag-icon-list.less > %%CACTIDIR%%/include/vendor/flag-icon-css/less/flag-icon-more.less >@@ -1630,10 +1656,12 @@ > %%CACTIDIR%%/include/vendor/flag-icon-css/sass/_flag-icon-more.scss > %%CACTIDIR%%/include/vendor/flag-icon-css/sass/_variables.scss > %%CACTIDIR%%/include/vendor/flag-icon-css/sass/flag-icon.scss >+%%CACTIDIR%%/include/vendor/flag-icon-css/sass/index.php > %%CACTIDIR%%/include/vendor/flag-icon-css/svgo.yaml > %%CACTIDIR%%/include/vendor/flag-icon-css/yarn.lock > %%CACTIDIR%%/include/vendor/index.php > %%CACTIDIR%%/include/vendor/phpgettext/gettext.php >+%%CACTIDIR%%/include/vendor/phpgettext/index.php > %%CACTIDIR%%/include/vendor/phpgettext/streams.php > %%CACTIDIR%%/include/vendor/phpmailer/COMMITMENT > %%CACTIDIR%%/include/vendor/phpmailer/LICENSE >@@ -1712,22 +1740,34 @@ > %%CACTIDIR%%/include/vendor/phpseclib/Crypt/Rijndael.php > %%CACTIDIR%%/include/vendor/phpseclib/Crypt/TripleDES.php > %%CACTIDIR%%/include/vendor/phpseclib/Crypt/Twofish.php >+%%CACTIDIR%%/include/vendor/phpseclib/Crypt/index.php > %%CACTIDIR%%/include/vendor/phpseclib/File/ANSI.php > %%CACTIDIR%%/include/vendor/phpseclib/File/ASN1.php > %%CACTIDIR%%/include/vendor/phpseclib/File/ASN1/Element.php >+%%CACTIDIR%%/include/vendor/phpseclib/File/ASN1/index.php > %%CACTIDIR%%/include/vendor/phpseclib/File/X509.php >+%%CACTIDIR%%/include/vendor/phpseclib/File/index.php > %%CACTIDIR%%/include/vendor/phpseclib/Math/BigInteger.php >+%%CACTIDIR%%/include/vendor/phpseclib/Math/index.php > %%CACTIDIR%%/include/vendor/phpseclib/Net/SCP.php > %%CACTIDIR%%/include/vendor/phpseclib/Net/SFTP.php > %%CACTIDIR%%/include/vendor/phpseclib/Net/SFTP/Stream.php >+%%CACTIDIR%%/include/vendor/phpseclib/Net/SFTP/index.php > %%CACTIDIR%%/include/vendor/phpseclib/Net/SSH1.php > %%CACTIDIR%%/include/vendor/phpseclib/Net/SSH2.php >+%%CACTIDIR%%/include/vendor/phpseclib/Net/index.php > %%CACTIDIR%%/include/vendor/phpseclib/System/SSH/Agent.php > %%CACTIDIR%%/include/vendor/phpseclib/System/SSH/Agent/Identity.php >+%%CACTIDIR%%/include/vendor/phpseclib/System/SSH/Agent/index.php >+%%CACTIDIR%%/include/vendor/phpseclib/System/SSH/index.php > %%CACTIDIR%%/include/vendor/phpseclib/System/SSH_Agent.php >+%%CACTIDIR%%/include/vendor/phpseclib/System/index.php > %%CACTIDIR%%/include/vendor/phpseclib/bootstrap.php >+%%CACTIDIR%%/include/vendor/phpseclib/index.php > %%CACTIDIR%%/include/vendor/phpseclib/openssl.cnf > %%CACTIDIR%%/include/vendor/phpsnmp/classSNMP.php >+%%CACTIDIR%%/include/vendor/phpsnmp/extension.php >+%%CACTIDIR%%/include/vendor/phpsnmp/index.php > %%CACTIDIR%%/include/vendor/phpsnmp/mib_parser.php > %%CACTIDIR%%/index.php > %%CACTIDIR%%/install/background.php >@@ -1736,12 +1776,12 @@ > %%CACTIDIR%%/install/colors.csv > %%CACTIDIR%%/install/functions.php > %%CACTIDIR%%/install/index.php >-%%CACTIDIR%%/install/templates/Cisco_Router.xml.gz > %%CACTIDIR%%/install/install.css > %%CACTIDIR%%/install/install.js > %%CACTIDIR%%/install/install.php > %%CACTIDIR%%/install/step_json.php > %%CACTIDIR%%/install/templates/Cacti_Stats.xml.gz >+%%CACTIDIR%%/install/templates/Cisco_Router.xml.gz > %%CACTIDIR%%/install/templates/Generic_SNMP_Device.xml.gz > %%CACTIDIR%%/install/templates/Local_Linux_Machine.xml.gz > %%CACTIDIR%%/install/templates/NetSNMP_Device.xml.gz >@@ -1768,14 +1808,10 @@ > %%CACTIDIR%%/install/upgrades/1_0_0.php > %%CACTIDIR%%/install/upgrades/1_0_4.php > %%CACTIDIR%%/install/upgrades/1_0_5.php >-%%CACTIDIR%%/install/upgrades/1_1_2.php >-%%CACTIDIR%%/install/upgrades/1_1_4.php >-%%CACTIDIR%%/install/upgrades/1_1_6.php >-%%CACTIDIR%%/install/upgrades/1_1_7.php >-%%CACTIDIR%%/install/upgrades/1_1_8.php > %%CACTIDIR%%/install/upgrades/1_1_11.php > %%CACTIDIR%%/install/upgrades/1_1_14.php > %%CACTIDIR%%/install/upgrades/1_1_17.php >+%%CACTIDIR%%/install/upgrades/1_1_2.php > %%CACTIDIR%%/install/upgrades/1_1_20.php > %%CACTIDIR%%/install/upgrades/1_1_26.php > %%CACTIDIR%%/install/upgrades/1_1_28.php >@@ -1784,10 +1820,15 @@ > %%CACTIDIR%%/install/upgrades/1_1_35.php > %%CACTIDIR%%/install/upgrades/1_1_36.php > %%CACTIDIR%%/install/upgrades/1_1_37.php >+%%CACTIDIR%%/install/upgrades/1_1_4.php >+%%CACTIDIR%%/install/upgrades/1_1_6.php >+%%CACTIDIR%%/install/upgrades/1_1_7.php >+%%CACTIDIR%%/install/upgrades/1_1_8.php > %%CACTIDIR%%/install/upgrades/1_2_0.php > %%CACTIDIR%%/install/upgrades/1_2_1.php > %%CACTIDIR%%/install/upgrades/1_2_2.php > %%CACTIDIR%%/install/upgrades/1_2_3.php >+%%CACTIDIR%%/install/upgrades/1_2_5.php > %%CACTIDIR%%/install/upgrades/index.php > %%CACTIDIR%%/lib/aggregate.php > %%CACTIDIR%%/lib/api_aggregate.php >@@ -1868,7 +1909,7 @@ > %%CACTIDIR%%/locales/index.php > %%CACTIDIR%%/locales/po/ar-SA.po > %%CACTIDIR%%/locales/po/bg-BG.po >-%%CACTIDIR%%/locales/po/cacti.pot >+%%CACTIDIR%%/locales/po/%%CACTIUSER%%.pot > %%CACTIDIR%%/locales/po/de-DE.po > %%CACTIDIR%%/locales/po/el-GR.po > %%CACTIDIR%%/locales/po/es-ES.po >@@ -1918,9 +1959,12 @@ > %%CACTIDIR%%/resource/script_queries/host_disk.xml > %%CACTIDIR%%/resource/script_queries/index.php > %%CACTIDIR%%/resource/script_queries/unix_disk.xml >+%%CACTIDIR%%/resource/script_server/cpoller.xml >+%%CACTIDIR%%/resource/script_server/gexport.xml > %%CACTIDIR%%/resource/script_server/host_cpu.xml > %%CACTIDIR%%/resource/script_server/host_disk.xml > %%CACTIDIR%%/resource/script_server/index.php >+%%CACTIDIR%%/resource/script_server/webseer.xml > %%CACTIDIR%%/resource/snmp_queries/host_disk.xml > %%CACTIDIR%%/resource/snmp_queries/index.php > %%CACTIDIR%%/resource/snmp_queries/interface.xml >@@ -1941,13 +1985,17 @@ > %%CACTIDIR%%/scripts/query_unix_partitions.pl > %%CACTIDIR%%/scripts/sql.php > %%CACTIDIR%%/scripts/ss_count_oids.php >+%%CACTIDIR%%/scripts/ss_cpoller.php > %%CACTIDIR%%/scripts/ss_fping.php >+%%CACTIDIR%%/scripts/ss_gexport.php > %%CACTIDIR%%/scripts/ss_host_cpu.php > %%CACTIDIR%%/scripts/ss_host_disk.php > %%CACTIDIR%%/scripts/ss_hstats.php > %%CACTIDIR%%/scripts/ss_net_snmp_disk_bytes.php > %%CACTIDIR%%/scripts/ss_net_snmp_disk_io.php >+%%CACTIDIR%%/scripts/ss_poller.php > %%CACTIDIR%%/scripts/ss_sql.php >+%%CACTIDIR%%/scripts/ss_webseer.php > %%CACTIDIR%%/scripts/unix_processes.pl > %%CACTIDIR%%/scripts/unix_tcp_connections.pl > %%CACTIDIR%%/scripts/unix_users.pl >@@ -1972,9 +2020,9 @@ > @comment > @owner %%CACTIUSER%% > @group %%CACTIGROUP%% >-@dir /var/log/cacti >-@dir /var/db/cacti/rra >-@dir /var/db/cacti/scripts >-@dir /var/db/cacti >+@dir /var/db/%%CACTIUSER%%/rra >+@dir /var/db/%%CACTIUSER%%/scripts >+@dir /var/db/%%CACTIUSER%% >+@dir /var/log/%%CACTIUSER%% > @group wheel > @owner root
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 239578
:
206199
|
206217
|
206271