Attachment 170749 Details for Bug 209809 – update to 0.8.8h

[patch] update to 0.8.8h

cacti-20160528.diff (text/plain), 3.92 KB, created by Daniel Austin on 2016-05-28 13:00:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Austin

Created: 2016-05-28 13:00:26 UTC

Size: 3.92 KB

patch

obsolete

>diff -ruN net-mgmt/cacti.orig/Makefile net-mgmt/cacti/Makefile
>--- net-mgmt/cacti.orig/Makefile	2016-05-02 17:08:56.000000000 +0100
>+++ net-mgmt/cacti/Makefile	2016-05-28 13:32:55.509925010 +0100
>@@ -1,8 +1,7 @@
> # $FreeBSD: head/net-mgmt/cacti/Makefile 414458 2016-05-02 16:08:56Z zeising $
> 
> 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 @@
> 
> 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
>diff -ruN net-mgmt/cacti.orig/distinfo net-mgmt/cacti/distinfo
>--- net-mgmt/cacti.orig/distinfo	2016-02-24 18:08:04.000000000 +0000
>+++ net-mgmt/cacti/distinfo	2016-05-28 10:49:38.305598667 +0100
>@@ -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
>diff -ruN net-mgmt/cacti.orig/files/patch-install__index.php net-mgmt/cacti/files/patch-install__index.php
>--- net-mgmt/cacti.orig/files/patch-install__index.php	2015-04-24 04:07:55.000000000 +0100
>+++ net-mgmt/cacti/files/patch-install__index.php	2016-05-28 10:55:22.000000000 +0100
>@@ -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");
>diff -ruN net-mgmt/cacti.orig/files/patch-lib__functions.php net-mgmt/cacti/files/patch-lib__functions.php
>--- net-mgmt/cacti.orig/files/patch-lib__functions.php	1970-01-01 01:00:00.000000000 +0100
>+++ net-mgmt/cacti/files/patch-lib__functions.php	2016-05-28 11:01:19.000000000 +0100
>@@ -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 */
>diff -ruN net-mgmt/cacti.orig/pkg-plist net-mgmt/cacti/pkg-plist
>--- net-mgmt/cacti.orig/pkg-plist	2016-02-24 18:08:04.000000000 +0000
>+++ net-mgmt/cacti/pkg-plist	2016-05-28 11:04:41.909537365 +0100
>@@ -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

Flags:

freebsd-ports: maintainer-approval+

Actions: View | Diff

Attachments on bug 209809: 170749 | 170762