Attachment #170749 for bug #209809

View | Details | Raw Unified | Return to bug 209809
Collapse All | Expand All




# $FreeBSD: head/net-mgmt/cacti/Makefile 414458 2016-05-02 16:08:56Z zeising $

PORTNAME=	cacti
PORTVERSION=	0.8.8h${PATCHLEVEL}
PORTREVISION=	2
CATEGORIES=	net-mgmt www
MASTER_SITES=	http://www.cacti.net/downloads/ \
		ftp://ftpmirror.uk/freebsd-ports/cacti/


RUN_DEPENDS=	rrdtool:databases/rrdtool

USES=		cpe mysql shebangfix
USE_MYSQL=	yes
USE_PHP=	mysqli pcre session sockets snmp xml
WANT_PHP_WEB=	yes
NO_ARCH=	yes

Lines 1-2 Link Here

(-)net-mgmt/cacti/distinfo (-2 / +2 lines)
1	SHA256 (cacti-0.8.8g.tar.gz) = 3187bd5054ae4e54496bb23187f14c79a441fedcfd397a2d27cd60179f0dee33	1	SHA256 (cacti-0.8.8h.tar.gz) = 0673bd9513dad381c8bbb9133c721a32bc6422dc91c5a81de16e3cd32e4d0600
2	SIZE (cacti-0.8.8g.tar.gz) = 2584879	2	SIZE (cacti-0.8.8h.tar.gz) = 2585226

Lines 1-5 Link Here

(-)net-mgmt/cacti/files/patch-install__index.php (-2 / +11 lines)
1	--- install/index.php.bak 2015-03-12 03:12:05.409276443 -0700	1	--- install/index.php.orig 2016-05-28 10:54:08.124059773 +0100
2	+++ install/index.php 2015-03-12 03:14:17.596295374 -0700	2	+++ install/index.php 2016-05-28 10:54:34.252057818 +0100
		3	@@ -63,7 +63,7 @@
		4	}
		5
		6	function verify_php_extensions() {
		7	- $extensions = array("session", "sockets", "mysql", "xml");
		8	+ $extensions = array("session", "sockets", "mysqli", "xml");
		9	$ok = true;
		10	$missing_extension = " <p style='font-family: Verdana, Arial; font-size: 16px; font-weight: bold; color: red;'>Error</p>
		11	<p style='font-family: Verdana, Arial; font-size: 12px;'>The following PHP extensions are missing:</p><ul>";
3	@@ -267,7 +267,7 @@	12	@@ -267,7 +267,7 @@
4	if (config_value_exists("path_cactilog")) {	13	if (config_value_exists("path_cactilog")) {
5	$input["path_cactilog"]["default"] = read_config_option("path_cactilog");	14	$input["path_cactilog"]["default"] = read_config_option("path_cactilog");




--- 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 */

Lines 348-353 Link Here

(-)net-mgmt/cacti/pkg-plist (+1 lines)
348	%%CACTIDIR%%/install/0_8_8d_to_0_8_8e.php	348	%%CACTIDIR%%/install/0_8_8d_to_0_8_8e.php
349	%%CACTIDIR%%/install/0_8_8e_to_0_8_8f.php	349	%%CACTIDIR%%/install/0_8_8e_to_0_8_8f.php
350	%%CACTIDIR%%/install/0_8_8f_to_0_8_8g.php	350	%%CACTIDIR%%/install/0_8_8f_to_0_8_8g.php
		351	%%CACTIDIR%%/install/0_8_8g_to_0_8_8h.php
351	%%CACTIDIR%%/install/0_8_to_0_8_1.php	352	%%CACTIDIR%%/install/0_8_to_0_8_1.php
352	%%CACTIDIR%%/install/index.php	353	%%CACTIDIR%%/install/index.php
353	%%CACTIDIR%%/install/install_finish.gif	354	%%CACTIDIR%%/install/install_finish.gif

Return to bug 209809

Lines 1-8 Link Here

(-)net-mgmt/cacti/Makefile (-4 / +2 lines)
1	# $FreeBSD: head/net-mgmt/cacti/Makefile 414458 2016-05-02 16:08:56Z zeising $	1	# $FreeBSD: head/net-mgmt/cacti/Makefile 414458 2016-05-02 16:08:56Z zeising $
2		2
3	PORTNAME= cacti	3	PORTNAME= cacti
4	PORTVERSION= 0.8.8g${PATCHLEVEL}	4	PORTVERSION= 0.8.8h${PATCHLEVEL}
5	PORTREVISION= 2
6	CATEGORIES= net-mgmt www	5	CATEGORIES= net-mgmt www
7	MASTER_SITES= http://www.cacti.net/downloads/ \	6	MASTER_SITES= http://www.cacti.net/downloads/ \
8	ftp://ftpmirror.uk/freebsd-ports/cacti/	7	ftp://ftpmirror.uk/freebsd-ports/cacti/
Lines 15-22 Link Here
15		14
16	RUN_DEPENDS= rrdtool:databases/rrdtool	15	RUN_DEPENDS= rrdtool:databases/rrdtool
17		16
18	USES= cpe shebangfix	17	USES= cpe mysql shebangfix
19	USE_MYSQL= yes
20	USE_PHP= mysqli pcre session sockets snmp xml	18	USE_PHP= mysqli pcre session sockets snmp xml
21	WANT_PHP_WEB= yes	19	WANT_PHP_WEB= yes
22	NO_ARCH= yes	20	NO_ARCH= yes

Line 0 Link Here

(-)net-mgmt/cacti/files/patch-lib__functions.php (+15 lines)
	1	--- lib/functions.php.orig 2016-05-28 10:58:17.522042409 +0100
	2	+++ lib/functions.php 2016-05-28 11:00:31.399032747 +0100
	3	@@ -670,8 +670,10 @@
	4	$issue_log_message = false;
	5	$ping_failure_count = read_config_option("ping_failure_count");
	6	$ping_recovery_count = read_config_option("ping_recovery_count");
	7	- $hosts[$host_id]["status_fail_date"] = '0000-00-00 00:00:00';
	8	- $hosts[$host_id]["status_rec_date"] = '0000-00-00 00:00:00';
	9	+ if ((!isset($hosts[$host_id]["status_fail_date"])) \|\| ($hosts[$host_id]["status_fail_date"] == ""))
	10	+ $hosts[$host_id]["status_fail_date"] = '0000-00-00 00:00:00';
	11	+ if ((!isset($hosts[$host_id]["status_rec_date"])) \|\| ($hosts[$host_id]["status_rec_date"] == ""))
	12	+ $hosts[$host_id]["status_rec_date"] = '0000-00-00 00:00:00';
	13
	14	if ($status == HOST_DOWN) {
	15	/* update total polls, failed polls and availability */