Date: Sun, 29 May 2016 19:12:21 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r416121 - in branches/2016Q2/net-mgmt/cacti: . files Message-ID: <201605291912.u4TJCLnl091333@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Sun May 29 19:12:21 2016 New Revision: 416121 URL: https://svnweb.freebsd.org/changeset/ports/416121 Log: MFH: r416066 net-mgmt/cacti: 0.8.8g -> 0.8.8h This is a security update for cacti to resolve SQL exploits. - upgrade to 0.8.8h codebase from vendor - fix SQL vulnerabilities including CVE-2016-3659 - fix USE_MYSQL -> USES:mysql - fix deprecated mysql php module requirement (use mysqli instead) - fix overwriting of failure/recovery dates after outages PR: 209809 Submitted by: Daniel Austin <freebsd-ports@dan.me.uk> (maintainer) Security: CVE-2016-3659 Approved by: ports-secteam (junovitch) Added: branches/2016Q2/net-mgmt/cacti/files/patch-lib__functions.php - copied unchanged from r416066, head/net-mgmt/cacti/files/patch-lib__functions.php Modified: branches/2016Q2/net-mgmt/cacti/Makefile branches/2016Q2/net-mgmt/cacti/distinfo branches/2016Q2/net-mgmt/cacti/files/patch-install__index.php branches/2016Q2/net-mgmt/cacti/pkg-plist Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/net-mgmt/cacti/Makefile ============================================================================== --- branches/2016Q2/net-mgmt/cacti/Makefile Sun May 29 19:01:23 2016 (r416120) +++ branches/2016Q2/net-mgmt/cacti/Makefile Sun May 29 19:12:21 2016 (r416121) @@ -15,8 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rrdtool:databases/rrdtool -USES= cpe shebangfix -USE_MYSQL= yes +USES= cpe mysql shebangfix USE_PHP= mysqli pcre session sockets snmp xml WANT_PHP_WEB= yes NO_ARCH= yes Modified: branches/2016Q2/net-mgmt/cacti/distinfo ============================================================================== --- branches/2016Q2/net-mgmt/cacti/distinfo Sun May 29 19:01:23 2016 (r416120) +++ branches/2016Q2/net-mgmt/cacti/distinfo Sun May 29 19:12:21 2016 (r416121) @@ -1,2 +1,2 @@ -SHA256 (cacti-0.8.8g.tar.gz) = 3187bd5054ae4e54496bb23187f14c79a441fedcfd397a2d27cd60179f0dee33 -SIZE (cacti-0.8.8g.tar.gz) = 2584879 +SHA256 (cacti-0.8.8h.tar.gz) = 0673bd9513dad381c8bbb9133c721a32bc6422dc91c5a81de16e3cd32e4d0600 +SIZE (cacti-0.8.8h.tar.gz) = 2585226 Modified: branches/2016Q2/net-mgmt/cacti/files/patch-install__index.php ============================================================================== --- branches/2016Q2/net-mgmt/cacti/files/patch-install__index.php Sun May 29 19:01:23 2016 (r416120) +++ branches/2016Q2/net-mgmt/cacti/files/patch-install__index.php Sun May 29 19:12:21 2016 (r416121) @@ -1,5 +1,14 @@ ---- install/index.php.bak 2015-03-12 03:12:05.409276443 -0700 -+++ install/index.php 2015-03-12 03:14:17.596295374 -0700 +--- install/index.php.orig 2016-05-28 10:54:08.124059773 +0100 ++++ install/index.php 2016-05-28 10:54:34.252057818 +0100 +@@ -63,7 +63,7 @@ + } + + function verify_php_extensions() { +- $extensions = array("session", "sockets", "mysql", "xml"); ++ $extensions = array("session", "sockets", "mysqli", "xml"); + $ok = true; + $missing_extension = " <p style='font-family: Verdana, Arial; font-size: 16px; font-weight: bold; color: red;'>Error</p> + <p style='font-family: Verdana, Arial; font-size: 12px;'>The following PHP extensions are missing:</p><ul>"; @@ -267,7 +267,7 @@ if (config_value_exists("path_cactilog")) { $input["path_cactilog"]["default"] = read_config_option("path_cactilog"); Copied: branches/2016Q2/net-mgmt/cacti/files/patch-lib__functions.php (from r416066, head/net-mgmt/cacti/files/patch-lib__functions.php) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/net-mgmt/cacti/files/patch-lib__functions.php Sun May 29 19:12:21 2016 (r416121, copy of r416066, head/net-mgmt/cacti/files/patch-lib__functions.php) @@ -0,0 +1,15 @@ +--- lib/functions.php.orig 2016-05-28 10:58:17.522042409 +0100 ++++ lib/functions.php 2016-05-28 11:00:31.399032747 +0100 +@@ -670,8 +670,10 @@ + $issue_log_message = false; + $ping_failure_count = read_config_option("ping_failure_count"); + $ping_recovery_count = read_config_option("ping_recovery_count"); +- $hosts[$host_id]["status_fail_date"] = '0000-00-00 00:00:00'; +- $hosts[$host_id]["status_rec_date"] = '0000-00-00 00:00:00'; ++ if ((!isset($hosts[$host_id]["status_fail_date"])) || ($hosts[$host_id]["status_fail_date"] == "")) ++ $hosts[$host_id]["status_fail_date"] = '0000-00-00 00:00:00'; ++ if ((!isset($hosts[$host_id]["status_rec_date"])) || ($hosts[$host_id]["status_rec_date"] == "")) ++ $hosts[$host_id]["status_rec_date"] = '0000-00-00 00:00:00'; + + if ($status == HOST_DOWN) { + /* update total polls, failed polls and availability */ Modified: branches/2016Q2/net-mgmt/cacti/pkg-plist ============================================================================== --- branches/2016Q2/net-mgmt/cacti/pkg-plist Sun May 29 19:01:23 2016 (r416120) +++ branches/2016Q2/net-mgmt/cacti/pkg-plist Sun May 29 19:12:21 2016 (r416121) @@ -348,6 +348,7 @@ %%CACTIDIR%%/install/0_8_8d_to_0_8_8e.php %%CACTIDIR%%/install/0_8_8e_to_0_8_8f.php %%CACTIDIR%%/install/0_8_8f_to_0_8_8g.php +%%CACTIDIR%%/install/0_8_8g_to_0_8_8h.php %%CACTIDIR%%/install/0_8_to_0_8_1.php %%CACTIDIR%%/install/index.php %%CACTIDIR%%/install/install_finish.gif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605291912.u4TJCLnl091333>