Merge pull request #1164 from doktornotor/patch-21

5 files changed, 50 insertions, 9 deletions

diff --git a/config/rrd-summary/rrd-summary.priv.inc b/config/rrd-summary/rrd-summary.priv.inc
new file mode 100644
index 00000000..f75315e8
--- /dev/null
+++ b/config/rrd-summary/rrd-summary.priv.inc
@@ -0,0 +1,37 @@
+<?php
+/*
+	rrd-summary.priv.inc
+	part of pfSense (http://www.pfSense.org/)
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+global $priv_list;
+
+$priv_list['page-status-rrd-summary'] = array();
+$priv_list['page-status-rrd-summary']['name'] = "WebCfg - Status: RRD Summary";
+$priv_list['page-status-rrd-summary']['descr'] = "Allow access to RRD Summary package GUI";
+$priv_list['page-status-rrd-summary']['match'] = array();
+$priv_list['page-status-rrd-summary']['match'][] = "status_rrd_summary.php*";
+
+?>
diff --git a/config/rrd-summary/rrd-summary.xml b/config/rrd-summary/rrd-summary.xml
index 67c20937..309f23d1 100644
--- a/config/rrd-summary/rrd-summary.xml
+++ b/config/rrd-summary/rrd-summary.xml
@@ -43,7 +43,7 @@
 	</copyright>
 	<description>RRD Summary Page</description>
 	<name>RRD Summary</name>
-	<version>1.2</version>
+	<version>1.2.1</version>
 	<title>Status: RRD Summary</title>
 	<menu>
 		<name>RRD Summary</name>
@@ -52,6 +52,10 @@
 		<url>/status_rrd_summary.php</url>
 	</menu>
 	<additional_files_needed>
+		<prefix>/etc/inc/priv/</prefix>
+		<item>https://packages.pfsense.org/packages/config/rrd-summary/rrd-summary.priv.inc</item>
+	</additional_files_needed>
+	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<item>https://packages.pfsense.org/packages/config/rrd-summary/status_rrd_summary.php</item>
 	</additional_files_needed>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index cd5e25ea..a71fa8c7 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1323,8 +1323,8 @@
 		<internal_name>RRD_Summary</internal_name>
 		<descr>RRD Summary Page, which will give a total amount of traffic passed In/Out during this and the previous month.</descr>
 		<category>Network Management</category>
-		<version>1.2</version>
-		<status>BETA</status>
+		<version>1.2.1</version>
+		<status>RC</status>
 		<maintainer>jimp@pfsense.org</maintainer>
 		<port_category>sysutils</port_category>
 		<required_version>2.2</required_version>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 37f061f0..cc3c99c1 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1387,10 +1387,10 @@
 		<name>RRD Summary</name>
 		<descr>RRD Summary Page, which will give a total amount of traffic passed In/Out during this and the previous month.</descr>
 		<category>System</category>
-		<version>1.1</version>
-		<status>Beta</status>
+		<version>1.2.1</version>
+		<status>RC</status>
 		<maintainer>jimp@pfsense.org</maintainer>
-		<required_version>1.2.3</required_version>
+		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/rrd-summary/rrd-summary.xml</config_file>
 		<configurationfile>rrd-summary.xml</configurationfile>
 	</package>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 86958cd0..23101aaf 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1374,10 +1374,10 @@
 		<name>RRD Summary</name>
 		<descr>RRD Summary Page, which will give a total amount of traffic passed In/Out during this and the previous month.</descr>
 		<category>System</category>
-		<version>1.1</version>
-		<status>Beta</status>
+		<version>1.2.1</version>
+		<status>RC</status>
 		<maintainer>jimp@pfsense.org</maintainer>
-		<required_version>1.2.3</required_version>
+		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/rrd-summary/rrd-summary.xml</config_file>
 		<configurationfile>rrd-summary.xml</configurationfile>
 	</package>