Merge pull request #1123 from doktornotor/patch-7

5 files changed, 55 insertions, 7 deletions

diff --git a/config/syslog-ng/syslog-ng.priv.inc b/config/syslog-ng/syslog-ng.priv.inc
new file mode 100644
index 00000000..96722a7b
--- /dev/null
+++ b/config/syslog-ng/syslog-ng.priv.inc
@@ -0,0 +1,44 @@
+<?php
+/*
+	syslog-ng.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-syslogng'] = array();
+$priv_list['page-services-syslogng']['name'] = "WebCfg - Services: syslog-ng package";
+$priv_list['page-services-syslogng']['descr'] = "Allow access to syslog-ng package GUI";
+$priv_list['page-services-syslogng']['match'] = array();
+
+$priv_list['page-services-syslogng']['match'][] = "pkg.php?xml=syslog-ng.xml*";
+$priv_list['page-services-syslogng']['match'][] = "pkg.php?xml=syslog-ng_advanced.xml*";
+
+$priv_list['page-services-syslogng']['match'][] = "pkg_edit.php?xml=syslog-ng.xml*";
+$priv_list['page-services-syslogng']['match'][] = "pkg_edit.php?xml=syslog-ng_advanced.xml*";
+
+$priv_list['page-services-syslogng']['match'][] = "syslog-ng_log_viewer.php*";
+
+?>
diff --git a/config/syslog-ng/syslog-ng.xml b/config/syslog-ng/syslog-ng.xml
index 9b0ccffc..81942926 100644
--- a/config/syslog-ng/syslog-ng.xml
+++ b/config/syslog-ng/syslog-ng.xml
@@ -42,7 +42,7 @@
 	]]>
 	</copyright>
 	<name>Syslog-ng</name>
-	<version>1.0.8</version>
+	<version>1.1.1</version>
 	<title>Services: Syslog-ng</title>
 	<include_file>/usr/local/pkg/syslog-ng.inc</include_file>
 	<menu>
@@ -76,6 +76,10 @@
 		<item>https://packages.pfsense.org/packages/config/syslog-ng/syslog-ng.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
+		<prefix>/etc/inc/priv/</prefix>
+		<item>https://packages.pfsense.org/packages/config/syslog-ng/syslog-ng.priv.inc</item>
+	</additional_files_needed>
+	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<item>https://packages.pfsense.org/packages/config/syslog-ng/syslog-ng_advanced.xml</item>
 		</additional_files_needed>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 7a5ac21a..b281e9d8 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1498,8 +1498,8 @@
 		<website>http://www.balabit.com/network-security/syslog-ng/</website>
 		<descr>Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.</descr>
 		<category>Services</category>
-		<version>1.1</version>
-		<status>ALPHA</status>
+		<version>1.1.1</version>
+		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<depends_on_package_pbi>syslog-ng-3.6.2_3-##ARCH##.pbi</depends_on_package_pbi>
 		<port_category>sysutils</port_category>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index b1304606..75740448 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1657,8 +1657,8 @@
 		<website>http://www.balabit.com/network-security/syslog-ng/</website>
 		<descr>Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.</descr>
 		<category>Services</category>
-		<version>3.5.4.1 pkg.v.1.0.2</version>
-		<status>ALPHA</status>
+		<version>3.5.4.1 pkg v1.1.1</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>
 		<depends_on_package_pbi>syslog-ng-3.5.4.1-i386.pbi</depends_on_package_pbi>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 34b3f7a2..7610235a 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1644,8 +1644,8 @@
 		<website>http://www.balabit.com/network-security/syslog-ng/</website>
 		<descr>Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.</descr>
 		<category>Services</category>
-		<version>3.5.4.1 pkg.v.1.0.2</version>
-		<status>ALPHA</status>
+		<version>3.5.4.1 pkg v1.1.1</version>
+		<status>BETA</status>
 		<required_version>2.1</required_version>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package_pbi>syslog-ng-3.5.4.1-amd64.pbi</depends_on_package_pbi>