Date: Thu, 27 Oct 2011 00:56:34 +0100 (BST) From: moggie <moggie@elasticmind.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/162044: [patch] net-mgmt/cacti: Update to 0.8.7h Message-ID: <20111026235634.2E6AD26D285@mail.elasticmind.net> Resent-Message-ID: <201110270020.p9R0K7vp010194@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 162044
>Category: ports
>Synopsis: [patch] net-mgmt/cacti: Update to 0.8.7h
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 27 00:20:06 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: moggie
>Release: FreeBSD 7.3-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD 7.3-RELEASE-p4 FreeBSD 7.3-RELEASE-p4 #0: Sun Dec 12 22:33:25 GMT 2010 amd64
Patched by zi-at-freebsd.org and tested on Tinderbox.
>Description:
Update Cacti from version 0.8.7g to 0.8.7h.
Software changes include:
- Fix SQL injection issue with user login
- Fix Cross-site scripting issues
- Make one minute polling work properly
>How-To-Repeat:
>Fix:
--- ports-cacti-0.8.7h.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/cacti/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- Makefile 16 Jul 2010 11:48:56 -0000 1.50
+++ Makefile 26 Oct 2011 11:34:27 -0000
@@ -6,21 +6,23 @@
#
PORTNAME= cacti
-PORTVERSION= 0.8.7g${PATCHLEVEL}
+PORTVERSION= 0.8.7h${PATCHLEVEL}
CATEGORIES= net-mgmt www
MASTER_SITES= http://www.cacti.net/downloads/
DISTFILES= ${PORTNAME}-${SITEDISTVERSION}${EXTRACT_SUFX}
# Vendor's patches
PATCH_SITES= http://www.cacti.net/downloads/patches/${SITEDISTVERSION}/
-PATCHFILES=
-PATCHLEVEL=
-
+#PATCHFILES=
PATCH_DIST_STRIP= -p1
+#PATCHLEVEL=
MAINTAINER= sem@FreeBSD.org
COMMENT= Web-driven graphing interface for RRDTool
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool
PATCH_STRIP= -p1
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/cacti/distinfo,v
retrieving revision 1.37
diff -u -r1.37 distinfo
--- distinfo 20 Mar 2011 12:53:44 -0000 1.37
+++ distinfo 26 Oct 2011 11:25:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (cacti-0.8.7g.tar.gz) = d09b3bf54f51bd42b2db0a62521cf6e408716978f75d6509ec56027c49c44585
-SIZE (cacti-0.8.7g.tar.gz) = 2236916
+SHA256 (cacti-0.8.7h.tar.gz) = 2e3dc330b5b3ee374b2e553650d032441c25831b39ddcf123ef102492f20603c
+SIZE (cacti-0.8.7h.tar.gz) = 2249323
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/cacti/pkg-plist,v
retrieving revision 1.25
diff -u -r1.25 pkg-plist
--- pkg-plist 16 Jul 2010 11:48:56 -0000 1.25
+++ pkg-plist 26 Oct 2011 13:46:26 -0000
@@ -12,8 +12,10 @@
%%CACTIDIR%%/cli/add_graphs.php
%%CACTIDIR%%/cli/add_perms.php
%%CACTIDIR%%/cli/add_tree.php
+%%CACTIDIR%%/cli/analyze_database.php
%%CACTIDIR%%/cli/convert_innodb.php
%%CACTIDIR%%/cli/copy_user.php
+%%CACTIDIR%%/cli/data_template_associate_rra.php
%%CACTIDIR%%/cli/host_update_template.php
%%CACTIDIR%%/cli/import_template.php
%%CACTIDIR%%/cli/poller_data_sources_reapply_names.php
@@ -302,6 +304,7 @@
%%CACTIDIR%%/install/0_8_7d_to_0_8_7e.php
%%CACTIDIR%%/install/0_8_7e_to_0_8_7f.php
%%CACTIDIR%%/install/0_8_7f_to_0_8_7g.php
+%%CACTIDIR%%/install/0_8_7g_to_0_8_7h.php
%%CACTIDIR%%/install/0_8_to_0_8_1.php
%%CACTIDIR%%/install/index.php
%%CACTIDIR%%/install/install_finish.gif
Index: files/patch-scripts-ping.pl
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/cacti/files/patch-scripts-ping.pl,v
retrieving revision 1.3
diff -u -r1.3 patch-scripts-ping.pl
--- files/patch-scripts-ping.pl 16 Feb 2009 16:43:39 -0000 1.3
+++ files/patch-scripts-ping.pl 26 Oct 2011 13:32:22 -0000
@@ -1,11 +1,11 @@
---- cacti-0.8.7d/scripts/ping.pl.orig 2009-02-12 05:55:50.000000000 +0300
-+++ cacti-0.8.7d/scripts/ping.pl 2009-02-16 17:01:59.000000000 +0300
-@@ -4,7 +4,7 @@
- $host = $ARGV[0];
- $host =~ s/tcp:/$1/gis;
+--- ./scripts/ping.pl.orig 2011-10-26 09:31:56.000000000 -0400
++++ ./scripts/ping.pl 2011-10-26 09:32:02.000000000 -0400
+@@ -6,7 +6,7 @@
--open(PROCESS, "ping -c 1 $host | grep icmp_seq | grep time |");
-+open(PROCESS, "/sbin/ping -c 1 $host | grep icmp_seq | grep time |");
+ # old linux version use "icmp_seq"
+ # newer use "icmp_req" instead
+-open(PROCESS, "ping -c 1 $host | grep 'icmp_[s|r]eq' | grep time |");
++open(PROCESS, "/sbin/ping -c 1 $host | grep 'icmp_[s|r]eq' | grep time |");
$ping = <PROCESS>;
close(PROCESS);
$ping =~ m/(.*time=)(.*) (ms|usec)/;
--- ports-cacti-0.8.7h.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111026235634.2E6AD26D285>