Merge pull request #1166 from doktornotor/patch-23

6 files changed, 58 insertions, 14 deletions

diff --git a/config/lcdproc/lcdproc.priv.inc b/config/lcdproc/lcdproc.priv.inc
new file mode 100644
index 00000000..6b2c061f
--- /dev/null
+++ b/config/lcdproc/lcdproc.priv.inc
@@ -0,0 +1,40 @@
+<?php
+/*
+	lcdproc.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-services-lcdproc'] = array();
+$priv_list['page-services-lcdproc']['name'] = "WebCfg - Services: LCDproc package";
+$priv_list['page-services-lcdproc']['descr'] = "Allow access to LCDproc package GUI";
+$priv_list['page-services-lcdproc']['match'] = array();
+$priv_list['page-services-lcdproc']['match'][] = "pkg.php?xml=lcdproc.xml*";
+$priv_list['page-services-lcdproc']['match'][] = "pkg.php?xml=lcdproc_screens.xml*";
+$priv_list['page-services-lcdproc']['match'][] = "pkg_edit.php?xml=lcdproc.xml*";
+$priv_list['page-services-lcdproc']['match'][] = "pkg_edit.php?xml=lcdproc_screens.xml*";
+
+?>
diff --git a/config/lcdproc/lcdproc.xml b/config/lcdproc/lcdproc.xml
index 4f109e47..33e61288 100644
--- a/config/lcdproc/lcdproc.xml
+++ b/config/lcdproc/lcdproc.xml
@@ -45,31 +45,35 @@
 	</copyright>
 	<title>Services: LCDproc</title>
 	<name>lcdproc</name>
-	<version>1.0.3</version>
+	<version>1.0.5</version>
 	<savetext>Save</savetext>
 	<include_file>/usr/local/pkg/lcdproc.inc</include_file>
 	<tabs>
 		<tab>
 			<text>Server</text>
-			<url>/pkg_edit.php?xml=lcdproc.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=lcdproc.xml</url>
 			<active/>
 		</tab>
 		<tab>
 			<text>Screens</text>
-			<url>/pkg_edit.php?xml=lcdproc_screens.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=lcdproc_screens.xml</url>
 		</tab>
 	</tabs>
 	<menu>
 		<name>LCDproc</name>
 		<tooltiptext>Set LCDproc settings such as display driver and COM port.</tooltiptext>
 		<section>Services</section>
-		<url>/pkg_edit.php?xml=lcdproc.xml&amp;id=0</url>
+		<url>/pkg_edit.php?xml=lcdproc.xml</url>
 	</menu>
 	<additional_files_needed>
 		<item>https://packages.pfsense.org/packages/config/lcdproc/lcdproc.inc</item>
 		<prefix>/usr/local/pkg/</prefix>
 	</additional_files_needed>
 	<additional_files_needed>
+		<item>https://packages.pfsense.org/packages/config/lcdproc/lcdproc.priv.inc</item>
+		<prefix>/etc/inc/priv/</prefix>
+	</additional_files_needed>
+	<additional_files_needed>
 		<item>https://packages.pfsense.org/packages/config/lcdproc/lcdproc_screens.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 	</additional_files_needed>
diff --git a/config/lcdproc/lcdproc_screens.xml b/config/lcdproc/lcdproc_screens.xml
index def770e6..6b6e283b 100644
--- a/config/lcdproc/lcdproc_screens.xml
+++ b/config/lcdproc/lcdproc_screens.xml
@@ -44,18 +44,18 @@
 	]]>
 	</copyright>
 	<title>Services: LCDproc: Screens</title>
-	<name>lcdproc_screens</name>
-	<version>1.0.3</version>
+	<name>lcdprocscreens</name>
+	<version>1.0.5</version>
 	<savetext>Save</savetext>
 	<include_file>/usr/local/pkg/lcdproc.inc</include_file>
 	<tabs>
 		<tab>
 			<text>Server</text>
-			<url>/pkg_edit.php?xml=lcdproc.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=lcdproc.xml</url>
 		</tab>
 		<tab>
 			<text>Screens</text>
-			<url>/pkg_edit.php?xml=lcdproc_screens.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=lcdproc_screens.xml</url>
 			<active/>
 		</tab>
 	</tabs>
@@ -63,7 +63,7 @@
 		<name>LCDproc</name>
 		<tooltiptext>Set LCDproc settings such as display driver and COM port.</tooltiptext>
 		<section>Services</section>
-		<url>/pkg_edit.php?xml=lcdproc.xml&amp;id=0</url>
+		<url>/pkg_edit.php?xml=lcdproc.xml</url>
 	</menu>
 	<fields>
 		<field>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index e74f4a3b..2a2f0339 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1113,7 +1113,7 @@
 		<descr>LCD display driver.</descr>
 		<website>http://www.lcdproc.org/</website>
 		<category>System</category>
-		<version>1.0.4</version>
+		<version>1.0.5</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<maintainer>seth.mos@dds.nl</maintainer>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index d4eed1e3..d5a33680 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1179,9 +1179,9 @@
 		<descr>LCD display driver</descr>
 		<website>http://www.lcdproc.org/</website>
 		<category>Utility</category>
-		<version>lcdproc-0.5.5 pkg.v.1.0.2</version>
+		<version>0.5.5 pkg v1.0.5</version>
 		<status>BETA</status>
-		<required_version>1.2.1</required_version>
+		<required_version>2.1</required_version>
 		<maintainer>seth.mos@dds.nl</maintainer>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>lcdproc-0.5.5.tbz</depends_on_package>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 2faf3e07..42b2b136 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1166,9 +1166,9 @@
 		<descr>LCD display driver</descr>
 		<website>http://www.lcdproc.org/</website>
 		<category>Utility</category>
-		<version>lcdproc-0.5.5 pkg.v.1.0.2</version>
+		<version>0.5.5 pkg v1.0.5</version>
 		<status>BETA</status>
-		<required_version>1.2.1</required_version>
+		<required_version>2.1</required_version>
 		<maintainer>seth.mos@dds.nl</maintainer>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>lcdproc-0.5.5.tbz</depends_on_package>