Merge pull request #1099 from doktornotor/patch-3

5 files changed, 103 insertions, 19 deletions

diff --git a/config/squidGuard-devel/squidguard.priv.inc b/config/squidGuard-devel/squidguard.priv.inc
new file mode 100644
index 00000000..a80c798b
--- /dev/null
+++ b/config/squidGuard-devel/squidguard.priv.inc
@@ -0,0 +1,55 @@
+<?php
+/*
+	squidguard.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-squidguard'] = array();
+$priv_list['page-services-squidguard']['name'] = "WebCfg - Services: SquidGuard package";
+$priv_list['page-services-squidguard']['descr'] = "Allow access to SquidGuard package GUI";
+$priv_list['page-services-squidguard']['match'] = array();
+
+$priv_list['page-services-squidguard']['match'][] = "pkg.php?xml=squidguard.xml*";
+$priv_list['page-services-squidguard']['match'][] = "pkg.php?xml=squidguard_acl.xml*";
+$priv_list['page-services-squidguard']['match'][] = "pkg.php?xml=squidguard_default.xml*";
+$priv_list['page-services-squidguard']['match'][] = "pkg.php?xml=squidguard_dest.xml*";
+$priv_list['page-services-squidguard']['match'][] = "pkg.php?xml=squidguard_sync.xml*";
+$priv_list['page-services-squidguard']['match'][] = "pkg.php?xml=squidguard_time.xml*";
+$priv_list['page-services-squidguard']['match'][] = "pkg.php?xml=squidguard_rewr.xml*";
+
+$priv_list['page-services-squidguard']['match'][] = "pkg_edit.php?xml=squidguard.xml*";
+$priv_list['page-services-squidguard']['match'][] = "pkg_edit.php?xml=squidguard_acl.xml*";
+$priv_list['page-services-squidguard']['match'][] = "pkg_edit.php?xml=squidguard_default.xml*";
+$priv_list['page-services-squidguard']['match'][] = "pkg_edit.php?xml=squidguard_dest.xml*";
+$priv_list['page-services-squidguard']['match'][] = "pkg_edit.php?xml=squidguard_sync.xml*";
+$priv_list['page-services-squidguard']['match'][] = "pkg_edit.php?xml=squidguard_time.xml*";
+$priv_list['page-services-squidguard']['match'][] = "pkg_edit.php?xml=squidguard_rewr.xml*";
+
+$priv_list['page-services-squidguard']['match'][] = "squidguard_blacklist.php*";
+$priv_list['page-services-squidguard']['match'][] = "squidguard_log.php*";
+
+?>
diff --git a/config/squidGuard-devel/squidguard.xml b/config/squidGuard-devel/squidguard.xml
index 3c91402a..b7874f82 100644
--- a/config/squidGuard-devel/squidguard.xml
+++ b/config/squidGuard-devel/squidguard.xml
@@ -2,16 +2,52 @@
 <!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-	<description>[<![CDATA[Describe your package here]]></description>
-	<requirements>Describe your package requirements here</requirements>
-	<faq>Currently there are no FAQ items provided.</faq>
+	<copyright>
+<![CDATA[
+/* $Id$ */
+/* ====================================================================================== */
+/*
+	squidguard.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2006-2013 Sergey Dvoriancev <dv_serg@mail.ru>
+	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.
+*/
+/* ====================================================================================== */
+	]]>
+	</copyright>
 	<name>squidguardgeneral</name>
-	<version>1.5_1</version>
+	<version>1.5.8</version>
 	<title>Proxy filter SquidGuard: General settings</title>
 	<include_file>/usr/local/pkg/squidguard.inc</include_file>
 	<!-- Installation -->
 	<menu>
-		<name>Proxy filter</name>
+		<name>SquidGuard Proxy Filter</name>
 		<tooltiptext>Modify the proxy server's filter settings</tooltiptext>
 		<section>Services</section>
 		<url>/pkg_edit.php?xml=squidguard.xml&amp;id=0</url>
@@ -62,57 +98,50 @@
 	</service>
 	<additional_files_needed>
             <prefix>/usr/local/pkg/</prefix>
-            <chmod>0755</chmod>
             <item>https://packages.pfsense.org/packages/config/squidGuard-devel/squidguard.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
+            <prefix>/etc/inc/priv/</prefix>
+            <item>https://packages.pfsense.org/packages/config/squidGuard-devel/squidguard.priv.inc</item>
+	</additional_files_needed>
+	<additional_files_needed>
                 <prefix>/usr/local/pkg/</prefix>
-            <chmod>0755</chmod>
                 <item>https://packages.pfsense.org/packages/config/squidGuard-devel/squidguard_configurator.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
             <prefix>/usr/local/pkg/</prefix>
-            <chmod>0755</chmod>
             <item>https://packages.pfsense.org/packages/config/squidGuard-devel/squidguard_acl.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
             <prefix>/usr/local/pkg/</prefix>
-            <chmod>0755</chmod>
             <item>https://packages.pfsense.org/packages/config/squidGuard-devel/squidguard_default.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
             <prefix>/usr/local/pkg/</prefix>
-            <chmod>0755</chmod>
             <item>https://packages.pfsense.org/packages/config/squidGuard-devel/squidguard_dest.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
             <prefix>/usr/local/pkg/</prefix>
-            <chmod>0755</chmod>
             <item>https://packages.pfsense.org/packages/config/squidGuard-devel/squidguard_rewr.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
             <prefix>/usr/local/pkg/</prefix>
-            <chmod>0755</chmod>
             <item>https://packages.pfsense.org/packages/config/squidGuard-devel/squidguard_time.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
             <prefix>/usr/local/pkg/</prefix>
-            <chmod>0755</chmod>
             <item>https://packages.pfsense.org/packages/config/squidGuard-devel/squidguard_sync.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
             <prefix>/usr/local/www/squidGuard/</prefix>
-            <chmod>0755</chmod>
             <item>https://packages.pfsense.org/packages/config/squidGuard-devel/squidguard_log.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
             <prefix>/usr/local/www/squidGuard/</prefix>
-            <chmod>0755</chmod>
             <item>https://packages.pfsense.org/packages/config/squidGuard-devel/squidguard_blacklist.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
             <prefix>/usr/local/www/</prefix>
-            <chmod>0755</chmod>
             <item>https://packages.pfsense.org/packages/config/squidGuard-devel/sgerror.php</item>
 	</additional_files_needed>
 	<fields>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 2ed6336d..f0a832ae 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1160,7 +1160,7 @@
 		<website>http://www.squidGuard.org/</website>
 		<maintainer>gugabsd@mundounix.com.br</maintainer>
 		<category>Network Management</category>
-		<version>1.5.7</version>
+		<version>1.5.8</version>
 		<status>Beta</status>
 		<required_version>2.2</required_version>
 		<depends_on_package_pbi>squidguard-devel-1.5_1-##ARCH##.pbi</depends_on_package_pbi>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index b5dfe9ec..1ad19c55 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1276,7 +1276,7 @@
 		<website>http://www.squidGuard.org/</website>
 		<maintainer>gugabsd@mundounix.com.br</maintainer>
 		<category>Network Management</category>
-		<version>1.5_1beta pkg v.1.5.6</version>
+		<version>1.5_1beta pkg v1.5.8</version>
 		<status>Beta</status>
 		<required_version>2.1</required_version>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 4a479f28..760838a6 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1263,7 +1263,7 @@
 		<website>http://www.squidGuard.org/</website>
 		<maintainer>gugabsd@mundounix.com.br</maintainer>
 		<category>Network Management</category>
-		<version>1.5_1beta pkg v.1.5.6</version>
+		<version>1.5_1beta pkg v1.5.8</version>
 		<status>Beta</status>
 		<required_version>2.1</required_version>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>