Date: Wed, 21 Aug 2019 07:47:44 +0000 (UTC) From: Kai Knoblich <kai@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r509495 - in branches/2019Q3/net-mgmt/cacti: . files Message-ID: <201908210747.x7L7liqr086752@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kai Date: Wed Aug 21 07:47:44 2019 New Revision: 509495 URL: https://svnweb.freebsd.org/changeset/ports/509495 Log: MFH: r509310 net-mgmt/cacti: Update to 1.2.5 * Remove the SNMPBIN option that was introduced with r490477 and which is no longer required since the 1.2.4 release. It was used as a workaround to override the internal PHP SNMP calls which led to graphs that didn't update within cacti. The PHP SNMP extension can now be enabled/disabled by a re-purposed variable in the configuration file. While I'm here: * Remove superfluous "+=" from PLIST_SUB and SUB_LIST because there are no previous definitions of those variables. * Remove CONFLICTS_INSTALL as net-mgmt/cacti88 is no longer present in the Ports tree since the end of 2018. Changes since 1.2.3: https://github.com/Cacti/cacti/blob/release/1.2.5/CHANGELOG * Merge the UCL convertions from r508903 while I'm here. PR: 238434 Submitted by: Michael Muenz <m.muenz@gmail.com> Reported by: Matthew Horan <matt@matthoran.com> Approved by: maintainer timeout (2+ months) Approved by: ports-secteam (joneum) Deleted: branches/2019Q3/net-mgmt/cacti/files/extra-patch-lib_snmp.php Modified: branches/2019Q3/net-mgmt/cacti/Makefile branches/2019Q3/net-mgmt/cacti/distinfo branches/2019Q3/net-mgmt/cacti/files/patch-install__functions.php branches/2019Q3/net-mgmt/cacti/files/patch-lib_installer.php branches/2019Q3/net-mgmt/cacti/files/pkg-message.in branches/2019Q3/net-mgmt/cacti/pkg-plist Directory Properties: branches/2019Q3/ (props changed) Modified: branches/2019Q3/net-mgmt/cacti/Makefile ============================================================================== --- branches/2019Q3/net-mgmt/cacti/Makefile Wed Aug 21 07:31:41 2019 (r509494) +++ branches/2019Q3/net-mgmt/cacti/Makefile Wed Aug 21 07:47:44 2019 (r509495) @@ -1,7 +1,7 @@ # $FreeBSD$ 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/ @@ -40,17 +40,10 @@ CACTIGROUP?= cacti USERS?= ${CACTIUSER} GROUPS?= ${CACTIGROUP} -PLIST_SUB+= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \ +PLIST_SUB= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \ CACTIGROUP=${CACTIGROUP} -SUB_LIST+= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \ +SUB_LIST= CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \ CACTIGROUP=${CACTIGROUP} - -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; \ Modified: branches/2019Q3/net-mgmt/cacti/distinfo ============================================================================== --- branches/2019Q3/net-mgmt/cacti/distinfo Wed Aug 21 07:31:41 2019 (r509494) +++ branches/2019Q3/net-mgmt/cacti/distinfo Wed Aug 21 07:47:44 2019 (r509495) @@ -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 Modified: branches/2019Q3/net-mgmt/cacti/files/patch-install__functions.php ============================================================================== --- branches/2019Q3/net-mgmt/cacti/files/patch-install__functions.php Wed Aug 21 07:31:41 2019 (r509494) +++ branches/2019Q3/net-mgmt/cacti/files/patch-install__functions.php Wed Aug 21 07:47:44 2019 (r509495) @@ -1,11 +1,11 @@ ---- install/functions.php.orig 2019-03-30 23:40:23 UTC +--- install/functions.php.orig 2019-07-15 19:23:30 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']; +@@ -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 */ Modified: branches/2019Q3/net-mgmt/cacti/files/patch-lib_installer.php ============================================================================== --- branches/2019Q3/net-mgmt/cacti/files/patch-lib_installer.php Wed Aug 21 07:31:41 2019 (r509494) +++ branches/2019Q3/net-mgmt/cacti/files/patch-lib_installer.php Wed Aug 21 07:47:44 2019 (r509495) @@ -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) { Modified: branches/2019Q3/net-mgmt/cacti/files/pkg-message.in ============================================================================== --- branches/2019Q3/net-mgmt/cacti/files/pkg-message.in Wed Aug 21 07:31:41 2019 (r509494) +++ branches/2019Q3/net-mgmt/cacti/files/pkg-message.in Wed Aug 21 07:47:44 2019 (r509495) @@ -1,4 +1,6 @@ -======================================================================= +[ +{ type: install + message: <<EOM Cacti is now installed. If you install it for the first time, you may have to follow this steps to make it work correctly: @@ -90,4 +92,16 @@ Other Erratas: 2) This package does not install a MySQL server in case you wish to use an external MySQL server. Install a package such as mysql57-server if you require a local server. -======================================================================= +EOM +} +{ type: upgrade + maximum_version: "1.2.4" + message: <<EOM +Starting with version 1.2.4 the option SNMPBIN is no longer required and has +therefore been removed. + +Now you can enable PHP integrated support via the "$php_snmp_support" variable +in config.php +EOM +} +] Modified: branches/2019Q3/net-mgmt/cacti/pkg-plist ============================================================================== --- branches/2019Q3/net-mgmt/cacti/pkg-plist Wed Aug 21 07:31:41 2019 (r509494) +++ branches/2019Q3/net-mgmt/cacti/pkg-plist Wed Aug 21 07:47:44 2019 (r509495) @@ -36,6 +36,7 @@ %%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 @@ -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 @@ -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 @@ -186,6 +194,20 @@ %%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/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 @@ -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 @@ -1788,6 +1828,7 @@ %%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 @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908210747.x7L7liqr086752>