Merge pull request #1153 from doktornotor/patch-9

6 files changed, 63 insertions, 14 deletions

diff --git a/config/iperf/iperf.priv.inc b/config/iperf/iperf.priv.inc
new file mode 100644
index 00000000..794810a2
--- /dev/null
+++ b/config/iperf/iperf.priv.inc
@@ -0,0 +1,43 @@
+<?php
+/*
+	iperf.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-diagnostics-iperf-client'] = array();
+$priv_list['page-diagnostics-iperf-client']['name'] = "WebCfg - Diagnostics: iperf client";
+$priv_list['page-diagnostics-iperf-client']['descr'] = "Allow access to iperf client GUI";
+$priv_list['page-diagnostics-iperf-client']['match'] = array();
+$priv_list['page-diagnostics-iperf-client']['match'][] = "pkg_edit.php?xml=iperf.xml*";
+
+$priv_list['page-diagnostics-iperf-server'] = array();
+$priv_list['page-diagnostics-iperf-server']['name'] = "WebCfg - Diagnostics: iperf server";
+$priv_list['page-diagnostics-iperf-server']['descr'] = "Allow access to iperf server GUI";
+$priv_list['page-diagnostics-iperf-server']['match'] = array();
+$priv_list['page-diagnostics-iperf-server']['match'][] = "pkg_edit.php?xml=iperfserver.xml*";
+
+?>
diff --git a/config/iperf/iperf.xml b/config/iperf/iperf.xml
index 182d866b..b7e27871 100644
--- a/config/iperf/iperf.xml
+++ b/config/iperf/iperf.xml
@@ -42,35 +42,40 @@
 	]]>
 	</copyright>
 	<name>iperf</name>
-	<version>2.0.5.2</version>
+	<version>2.0.5.3</version>
 	<title>iperf: Client</title>
+	<savetext>Run iperf client</savetext>
 	<preoutput>yes</preoutput>
 	<donotsave>true</donotsave>
 	<menu>
 		<name>iperf</name>
-		<tooltiptext>Run iperf in client or server mode.</tooltiptext>
 		<section>Diagnostics</section>
 		<configfile>iperf.xml</configfile>
 	</menu>
 	<service>
 		<name>iperf</name>
 		<executable>iperf</executable>
-		<description>iperf network performance testing daemon/client</description>
+		<description>iperf Network Performance Testing Daemon/Client</description>
 	</service>
 	<tabs>
 		<tab>
 			<text>Client</text>
-			<url>/pkg_edit.php?xml=iperf.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=iperf.xml</url>
 			<active/>
 		</tab>
 		<tab>
 			<text>Server</text>
-			<url>/pkg_edit.php?xml=iperfserver.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=iperfserver.xml</url>
 		</tab>
 	</tabs>
 	<additional_files_needed>
+		<prefix>/usr/local/pkg/</prefix>
 		<item>https://packages.pfsense.org/packages/config/iperf/iperfserver.xml</item>
 	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/etc/inc/priv/</prefix>
+		<item>https://packages.pfsense.org/packages/config/iperf/iperf.priv.inc</item>
+	</additional_files_needed>
 	<fields>
 		<field>
 			<fielddescr>Server</fielddescr>
diff --git a/config/iperf/iperfserver.xml b/config/iperf/iperfserver.xml
index 524e8366..6cd0e5ec 100644
--- a/config/iperf/iperfserver.xml
+++ b/config/iperf/iperfserver.xml
@@ -42,8 +42,9 @@
 	]]>
 	</copyright>
 	<name>iperf</name>
-	<version>2.0.5.2</version>
+	<version>2.0.5.3</version>
 	<title>iperf: Server</title>
+	<savetext>Run iperf server</savetext>
 	<preoutput>yes</preoutput>
 	<donotsave>true</donotsave>
 	<menu>
@@ -55,11 +56,11 @@
 	<tabs>
 		<tab>
 			<text>Client</text>
-			<url>/pkg_edit.php?xml=iperf.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=iperf.xml</url>
 		</tab>
 		<tab>
 			<text>Server</text>
-			<url>/pkg_edit.php?xml=iperfserver.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=iperfserver.xml</url>
 			<active/>
 		</tab>
 	</tabs>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index fdd616c3..718c32d3 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1010,8 +1010,8 @@
 		<category>Network Management</category>
 		<config_file>https://packages.pfsense.org/packages/config/iperf/iperf.xml</config_file>
 		<depends_on_package_pbi>iperf-2.0.5-##ARCH##.pbi</depends_on_package_pbi>
-		<version>2.0.5.2</version>
-		<status>BETA</status>
+		<version>2.0.5.3</version>
+		<status>RC</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Iperf_package</pkginfolink>
 		<required_version>2.2</required_version>
 		<configurationfile>iperf.xml</configurationfile>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 24e56810..3b7ed623 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1050,8 +1050,8 @@
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>iperf-2.0.5.tbz</depends_on_package>
 		<depends_on_package_pbi>iperf-2.0.5-i386.pbi</depends_on_package_pbi>
-		<version>2.0.5_1</version>
-		<status>Beta</status>
+		<version>2.0.5_3</version>
+		<status>RC</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Iperf_package</pkginfolink>
 		<required_version>1.2.1</required_version>
 		<configurationfile>iperf.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index bbd35975..c66c4eb9 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1037,8 +1037,8 @@
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>iperf-2.0.5.tbz</depends_on_package>
 		<depends_on_package_pbi>iperf-2.0.5-amd64.pbi</depends_on_package_pbi>
-		<version>2.0.5_1</version>
-		<status>Beta</status>
+		<version>2.0.5_3</version>
+		<status>RC</status>
 		<pkginfolink>https://doc.pfsense.org/index.php/Iperf_package</pkginfolink>
 		<required_version>1.2.1</required_version>
 		<configurationfile>iperf.xml</configurationfile>