Attachment 212884 Details for Bug 245198 – Cacti 1.2.10

[patch] Cacti 1.2.10

cacti-1.2.10.diff (text/plain), 11.36 KB, created by Michael Muenz on 2020-03-31 06:52:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Muenz

Created: 2020-03-31 06:52:42 UTC

Size: 11.36 KB

patch

obsolete

>diff -Naur cacti/Makefile cacti1210/Makefile
>--- cacti/Makefile	2020-01-06 20:02:41.000000000 +0100
>+++ cacti1210/Makefile	2020-03-31 08:02:38.637303000 +0200
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/net-mgmt/cacti/Makefile 522267 2020-01-06 19:02:41Z kai $
> 
> PORTNAME=	cacti
>-PORTVERSION=	1.2.8
>+PORTVERSION=	1.2.10
> CATEGORIES=	net-mgmt www
> MASTER_SITES=	http://www.cacti.net/downloads/ \
> 		ftp://ftpmirror.uk/freebsd-ports/cacti/
>diff -Naur cacti/distinfo cacti1210/distinfo
>--- cacti/distinfo	2020-01-06 20:02:41.000000000 +0100
>+++ cacti1210/distinfo	2020-03-31 08:03:11.708735000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1577112723
>-SHA256 (cacti-1.2.8.tar.gz) = ca4b83d1963a358c9ab60276becc46553fa0125d1ad906c2d26278a485615a29
>-SIZE (cacti-1.2.8.tar.gz) = 24881361
>+TIMESTAMP = 1585634591
>+SHA256 (cacti-1.2.10.tar.gz) = ca3535c0c52cb5dcb6327eed79373c10eb620a9ebfb9b100b0a60ce228558fa6
>+SIZE (cacti-1.2.10.tar.gz) = 24907181
>diff -Naur cacti/pkg-plist cacti1210/pkg-plist
>--- cacti/pkg-plist	2020-01-06 20:02:41.000000000 +0100
>+++ cacti1210/pkg-plist	2020-03-31 09:47:11.994482000 +0200
>@@ -24,7 +24,7 @@
> %%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/add_data_query.php
>@@ -44,7 +44,7 @@
> %%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/poller_data_sources_reapply_names.php
> %%CACTIDIR%%/cli/poller_graphs_reapply_names.php
>@@ -194,22 +194,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/cacti_add_device_site.JPG
>-%%CACTIDIR%%/docs/images/cacti_add_sites.JPG
>-%%CACTIDIR%%/docs/images/cacti_default_tree.png
>-%%CACTIDIR%%/docs/images/cacti_device_datasource.JPG
>-%%CACTIDIR%%/docs/images/cacti_graph_managment.JPG
>-%%CACTIDIR%%/docs/images/cacti_graph_managment_graph.JPG
>-%%CACTIDIR%%/docs/images/cacti_graph_template_options.JPG
>-%%CACTIDIR%%/docs/images/cacti_remote_poller_setup.JPG
>-%%CACTIDIR%%/docs/images/cacti_sites_automation.JPG
>-%%CACTIDIR%%/docs/images/cacti_sites_page.png
>-%%CACTIDIR%%/docs/images/cacti_system_utilities.JPG
>-%%CACTIDIR%%/docs/images/cacti_thold_enable.JPG
>-%%CACTIDIR%%/docs/images/cacti_thold_plugin_install.JPG
>-%%CACTIDIR%%/docs/images/cacti_trees_screen.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
>@@ -480,9 +480,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
>@@ -507,13 +507,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.svg
>-%%CACTIDIR%%/images/cacti_logo_new.gif
>+%%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
>@@ -555,7 +555,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
>@@ -588,7 +588,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
>@@ -596,6 +596,7 @@
> %%CACTIDIR%%/include/content/iframe-example.html
> %%CACTIDIR%%/include/content/index.php
> %%CACTIDIR%%/include/content/php-example.html
>+%%CACTIDIR%%/include/csrf.php
> %%CACTIDIR%%/include/fa/css/fontawesome.css
> %%CACTIDIR%%/include/fa/css/index.php
> %%CACTIDIR%%/include/fa/index.php
>@@ -790,7 +791,6 @@
> %%CACTIDIR%%/include/js/jquery.dropdown.js
> %%CACTIDIR%%/include/js/jquery.hotkeys.js
> %%CACTIDIR%%/include/js/jquery.js
>-%%CACTIDIR%%/include/js/jquery.metadata.js
> %%CACTIDIR%%/include/js/jquery.multiselect.filter.js
> %%CACTIDIR%%/include/js/jquery.multiselect.js
> %%CACTIDIR%%/include/js/jquery.sparkline.js
>@@ -823,8 +823,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
>@@ -873,10 +873,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
>@@ -928,8 +928,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
>@@ -979,8 +979,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
>@@ -1030,8 +1030,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
>@@ -1081,8 +1081,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
>@@ -1149,9 +1149,10 @@
> %%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/tests/Get/GetTest.php
> %%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/tests/Rules/RulesTest.php
> %%CACTIDIR%%/include/vendor/cldr-to-gettext-plural-rules/tests/bootstrap.php
>-%%CACTIDIR%%/include/vendor/csrf/LICENSE
>-%%CACTIDIR%%/include/vendor/csrf/NEWS
>-%%CACTIDIR%%/include/vendor/csrf/README
>+%%CACTIDIR%%/include/vendor/csrf/LICENSE.txt
>+%%CACTIDIR%%/include/vendor/csrf/NEWS.md
>+%%CACTIDIR%%/include/vendor/csrf/README.md
>+%%CACTIDIR%%/include/vendor/csrf/csrf-conf.php
> %%CACTIDIR%%/include/vendor/csrf/csrf-magic.js
> %%CACTIDIR%%/include/vendor/csrf/csrf-magic.php
> %%CACTIDIR%%/include/vendor/csrf/index.php
>@@ -2175,7 +2176,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
>@@ -2239,6 +2240,7 @@
> %%CACTIDIR%%/rrdcleaner.php
> %%CACTIDIR%%/script_server.php
> %%CACTIDIR%%/scripts/3com_cable_modem.pl
>+%%CACTIDIR%%/scripts/%%CACTIUSER%%_user_stats.php
> %%CACTIDIR%%/scripts/diskfree.pl
> %%CACTIDIR%%/scripts/diskfree.sh
> %%CACTIDIR%%/scripts/index.php

Actions: View | Diff

Attachments on bug 245198: 212884 | 213117