Merge pull request #1161 from doktornotor/patch-18

5 files changed, 55 insertions, 5 deletions

diff --git a/config/spamd/spamd.priv.inc b/config/spamd/spamd.priv.inc
new file mode 100644
index 00000000..5a9c622b
--- /dev/null
+++ b/config/spamd/spamd.priv.inc
@@ -0,0 +1,46 @@
+<?php
+/*
+	spamd.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-spamd'] = array();
+$priv_list['page-services-spamd']['name'] = "WebCfg - Services: spamd";
+$priv_list['page-services-spamd']['descr'] = "Allow access to spamd package GUI";
+
+$priv_list['page-services-spamd']['match'] = array();
+$priv_list['page-services-spamd']['match'][] = "pkg.php?xml=spamd.xml*";
+$priv_list['page-services-spamd']['match'][] = "pkg.php?xml=spamd_whitelist.xml*";
+$priv_list['page-services-spamd']['match'][] = "pkg.php?xml=spamd_settings.xml*";
+
+$priv_list['page-services-spamd']['match'][] = "pkg_edit.php?xml=spamd.xml*";
+$priv_list['page-services-spamd']['match'][] = "pkg_edit.php?xml=spamd_whitelist.xml*";
+$priv_list['page-services-spamd']['match'][] = "pkg_edit.php?xml=spamd_settings.xml*";
+
+$priv_list['page-services-spamd']['match'][] = "spamd_db.php*";
+
+?>
diff --git a/config/spamd/spamd.xml b/config/spamd/spamd.xml
index 337aad00..7e11b9a9 100644
--- a/config/spamd/spamd.xml
+++ b/config/spamd/spamd.xml
@@ -42,7 +42,7 @@
 	]]>
 	</copyright>
 	<name>spamdsources</name>
-	<version>1.1.6</version>
+	<version>1.1.7</version>
 	<title>SpamD: External Sources</title>
 	<include_file>/usr/local/pkg/spamd.inc</include_file>
 	<backup_file>/var/db/spamd</backup_file>
@@ -100,6 +100,10 @@
 		<item>https://packages.pfsense.org/packages/config/spamd/spamd.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
+		<prefix>/etc/inc/priv/</prefix>
+		<item>https://packages.pfsense.org/packages/config/spamd/spamd.priv.inc</item>
+	</additional_files_needed>
+	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<item>https://packages.pfsense.org/packages/config/spamd/spamd_settings.xml</item>
 	</additional_files_needed>
@@ -180,6 +184,6 @@
 		custom_php_deinstall_command();
 	</custom_php_deinstall_command>
 	<filter_rules_needed>
-		spamd_generate_rules();
+		spamd_generate_rules
 	</filter_rules_needed>
 </packagegui>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index d1a63ff2..9647ced7 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -460,7 +460,7 @@
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/spamd/spamd.xml</config_file>
 		<depends_on_package_pbi>spamd-4.9.1_2-##ARCH##.pbi</depends_on_package_pbi>
-		<version>1.1.6</version>
+		<version>1.1.7</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<port_category>mail</port_category>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 779d8252..e503df0b 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -492,7 +492,7 @@
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>spamd-4.9.1.tbz</depends_on_package>
 		<depends_on_package_pbi>spamd-4.9.1-i386.pbi</depends_on_package_pbi>
-		<version>4.9.1 v1.1.6</version>
+		<version>4.9.1 v1.1.7</version>
 		<status>Beta</status>
 		<required_version>1.2.1</required_version>
 		<configurationfile>spamd.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 9e4d83d9..bc385e28 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -479,7 +479,7 @@
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>spamd-4.9.1.tbz</depends_on_package>
 		<depends_on_package_pbi>spamd-4.9.1-amd64.pbi</depends_on_package_pbi>
-		<version>4.9.1 v1.1.6</version>
+		<version>4.9.1 v1.1.7</version>
 		<status>Beta</status>
 		<required_version>1.2.1</required_version>
 		<configurationfile>spamd.xml</configurationfile>