From owner-svn-ports-head@freebsd.org Sat May 28 20:09:27 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE010B4E0FD; Sat, 28 May 2016 20:09:27 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7F22C1CD7; Sat, 28 May 2016 20:09:27 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4SK9QiP072292; Sat, 28 May 2016 20:09:26 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4SK9QNt072286; Sat, 28 May 2016 20:09:26 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201605282009.u4SK9QNt072286@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 28 May 2016 20:09:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416066 - in head/net-mgmt/cacti: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 May 2016 20:09:27 -0000 Author: pi Date: Sat May 28 20:09:26 2016 New Revision: 416066 URL: https://svnweb.freebsd.org/changeset/ports/416066 Log: 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 (maintainer) Security: CVE-2016-3659 MFH: 2016Q2 Added: head/net-mgmt/cacti/files/patch-lib__functions.php (contents, props changed) Modified: head/net-mgmt/cacti/Makefile head/net-mgmt/cacti/distinfo head/net-mgmt/cacti/files/patch-install__index.php head/net-mgmt/cacti/pkg-plist Modified: head/net-mgmt/cacti/Makefile ============================================================================== --- head/net-mgmt/cacti/Makefile Sat May 28 20:06:46 2016 (r416065) +++ head/net-mgmt/cacti/Makefile Sat May 28 20:09:26 2016 (r416066) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cacti -PORTVERSION= 0.8.8g${PATCHLEVEL} -PORTREVISION= 2 +PORTVERSION= 0.8.8h${PATCHLEVEL} CATEGORIES= net-mgmt www MASTER_SITES= http://www.cacti.net/downloads/ \ ftp://ftpmirror.uk/freebsd-ports/cacti/ @@ -15,8 +14,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: head/net-mgmt/cacti/distinfo ============================================================================== --- head/net-mgmt/cacti/distinfo Sat May 28 20:06:46 2016 (r416065) +++ head/net-mgmt/cacti/distinfo Sat May 28 20:09:26 2016 (r416066) @@ -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: head/net-mgmt/cacti/files/patch-install__index.php ============================================================================== --- head/net-mgmt/cacti/files/patch-install__index.php Sat May 28 20:06:46 2016 (r416065) +++ head/net-mgmt/cacti/files/patch-install__index.php Sat May 28 20:09:26 2016 (r416066) @@ -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 = "

Error

+

The following PHP extensions are missing:

    "; @@ -267,7 +267,7 @@ if (config_value_exists("path_cactilog")) { $input["path_cactilog"]["default"] = read_config_option("path_cactilog"); Added: head/net-mgmt/cacti/files/patch-lib__functions.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/cacti/files/patch-lib__functions.php Sat May 28 20:09:26 2016 (r416066) @@ -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: head/net-mgmt/cacti/pkg-plist ============================================================================== --- head/net-mgmt/cacti/pkg-plist Sat May 28 20:06:46 2016 (r416065) +++ head/net-mgmt/cacti/pkg-plist Sat May 28 20:09:26 2016 (r416066) @@ -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