aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/bind/bind.priv.inc50
-rw-r--r--config/bind/bind.xml6
-rw-r--r--config/bind/bind_acls.xml3
-rw-r--r--config/bind/bind_views.xml3
-rw-r--r--config/bind/bind_zones.xml3
-rw-r--r--config/shellcmd/shellcmd.xml12
-rw-r--r--pkg_config.10.xml4
-rw-r--r--pkg_config.8.xml4
-rw-r--r--pkg_config.8.xml.amd644
9 files changed, 66 insertions, 23 deletions
diff --git a/config/bind/bind.priv.inc b/config/bind/bind.priv.inc
new file mode 100644
index 00000000..1e8d4eb7
--- /dev/null
+++ b/config/bind/bind.priv.inc
@@ -0,0 +1,50 @@
+<?php
+/*
+ bind.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-binddns'] = array();
+$priv_list['page-services-binddns']['name'] = "WebCfg - Services: BIND package";
+$priv_list['page-services-binddns']['descr'] = "Allow access to BIND package GUI";
+
+$priv_list['page-services-binddns']['match'] = array();
+$priv_list['page-services-binddns']['match'][] = "pkg.php?xml=bind.xml*";
+$priv_list['page-services-binddns']['match'][] = "pkg.php?xml=bind_acls.xml*";
+$priv_list['page-services-binddns']['match'][] = "pkg.php?xml=bind_sync.xml*";
+$priv_list['page-services-binddns']['match'][] = "pkg.php?xml=bind_views.xml*";
+$priv_list['page-services-binddns']['match'][] = "pkg.php?xml=bind_zones.xml*";
+
+$priv_list['page-services-binddns']['match'][] = "pkg_edit.php?xml=bind.xml*";
+$priv_list['page-services-binddns']['match'][] = "pkg_edit.php?xml=bind_acls.xml*";
+$priv_list['page-services-binddns']['match'][] = "pkg_edit.php?xml=bind_sync.xml*";
+$priv_list['page-services-binddns']['match'][] = "pkg_edit.php?xml=bind_views.xml*";
+$priv_list['page-services-binddns']['match'][] = "pkg_edit.php?xml=bind_zones.xml*";
+
+$priv_list['page-services-binddns']['match'][] = "widgets/widgets/bind.widget.php*";
+
+?>
diff --git a/config/bind/bind.xml b/config/bind/bind.xml
index 0f6861fc..2d6c6b88 100644
--- a/config/bind/bind.xml
+++ b/config/bind/bind.xml
@@ -42,7 +42,7 @@
]]>
</copyright>
<name>bind</name>
- <version>0.4.0</version>
+ <version>0.4.3</version>
<title>BIND: DNS Settings</title>
<include_file>/usr/local/pkg/bind.inc</include_file>
<menu>
@@ -102,6 +102,10 @@
<item>https://packages.pfsense.org/packages/config/bind/bind.inc</item>
</additional_files_needed>
<additional_files_needed>
+ <prefix>/etc/inc/priv/</prefix>
+ <item>https://packages.pfsense.org/packages/config/bind/bind.priv.inc</item>
+ </additional_files_needed>
+ <additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<item>https://packages.pfsense.org/packages/config/bind/bind_sync.xml</item>
</additional_files_needed>
diff --git a/config/bind/bind_acls.xml b/config/bind/bind_acls.xml
index 49ca1631..d3cd3789 100644
--- a/config/bind/bind_acls.xml
+++ b/config/bind/bind_acls.xml
@@ -42,7 +42,7 @@
]]>
</copyright>
<name>bindacls</name>
- <version>0.4.0</version>
+ <version>0.4.3</version>
<title>BIND: ACLs Settings</title>
<include_file>/usr/local/pkg/bind.inc</include_file>
<tabs>
@@ -68,7 +68,6 @@
<url>/pkg_edit.php?xml=bind_sync.xml</url>
</tab>
</tabs>
- <configpath>['installedpackages']['bindacls']['config']</configpath>
<adddeleteeditpagefields>
<columnitem>
<fielddescr>ACL</fielddescr>
diff --git a/config/bind/bind_views.xml b/config/bind/bind_views.xml
index 29bf9bb3..f2c59a50 100644
--- a/config/bind/bind_views.xml
+++ b/config/bind/bind_views.xml
@@ -42,7 +42,7 @@
]]>
</copyright>
<name>bindviews</name>
- <version>0.4.0</version>
+ <version>0.4.3</version>
<title>BIND: Views Settings</title>
<include_file>/usr/local/pkg/bind.inc</include_file>
<tabs>
@@ -68,7 +68,6 @@
<url>/pkg_edit.php?xml=bind_sync.xml</url>
</tab>
</tabs>
- <configpath>['installedpackages']['bindviews']['config']</configpath>
<adddeleteeditpagefields>
<columnitem>
<fielddescr>View</fielddescr>
diff --git a/config/bind/bind_zones.xml b/config/bind/bind_zones.xml
index e923cbb4..0d0ee418 100644
--- a/config/bind/bind_zones.xml
+++ b/config/bind/bind_zones.xml
@@ -42,7 +42,7 @@
]]>
</copyright>
<name>bindzone</name>
- <version>none</version>
+ <version>0.4.3</version>
<title>BIND: Zones Settings</title>
<include_file>/usr/local/pkg/bind.inc</include_file>
<tabs>
@@ -68,7 +68,6 @@
<url>/pkg_edit.php?xml=bind_sync.xml</url>
</tab>
</tabs>
- <configpath>['installedpackages']['bindzone']['config']</configpath>
<adddeleteeditpagefields>
<columnitem>
<fielddescr>Status</fielddescr>
diff --git a/config/shellcmd/shellcmd.xml b/config/shellcmd/shellcmd.xml
index 78b876ff..854632da 100644
--- a/config/shellcmd/shellcmd.xml
+++ b/config/shellcmd/shellcmd.xml
@@ -41,8 +41,8 @@
/* ====================================================================================== */
]]>
</copyright>
- <name>Shellcmd Settings</name>
- <version>1.0.1</version>
+ <name>shellcmdsettings</name>
+ <version>1.0.2</version>
<title>Services: Shellcmd Settings</title>
<include_file>/usr/local/pkg/shellcmd.inc</include_file>
<aftersaveredirect>/pkg.php?xml=shellcmd.xml</aftersaveredirect>
@@ -54,14 +54,6 @@
<configfile>shellcmd.xml</configfile>
<url>/pkg.php?xml=shellcmd.xml</url>
</menu>
- <tabs>
- <tab>
- <text>Settings</text>
- <url>/pkg.php?xml=shellcmd.xml</url>
- <active/>
- </tab>
- </tabs>
- <configpath>['installedpackages']['shellcmdsettings']['config']</configpath>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<item>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.inc</item>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 700233c2..a17d2466 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -61,7 +61,7 @@
<descr>The most widely used name server software.</descr>
<website>http://www.isc.org/downloads/BIND/</website>
<category>Services</category>
- <version>0.4.2</version>
+ <version>0.4.3</version>
<status>RC</status>
<required_version>2.2</required_version>
<config_file>https://packages.pfsense.org/packages/config/bind/bind.xml</config_file>
@@ -1338,7 +1338,7 @@
<descr>The shellcmd utility is used to manage commands on system startup.</descr>
<category>System</category>
<config_file>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.xml</config_file>
- <version>1.0.1</version>
+ <version>1.0.2</version>
<status>RC</status>
<required_version>2.2</required_version>
<configurationfile>shellcmd.xml</configurationfile>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index cf6a9383..6d8b27d6 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -53,7 +53,7 @@
<descr><![CDATA[The most widely used name server software]]></descr>
<website>http://www.isc.org/downloads/BIND/</website>
<category>Services</category>
- <version>9.9.5P1_5 pkg v0.4.1</version>
+ <version>9.9.5P1_5 pkg v0.4.3</version>
<status>RC</status>
<required_version>2.1</required_version>
<config_file>https://packages.pfsense.org/packages/config/bind/bind.xml</config_file>
@@ -1419,7 +1419,7 @@
<category>Services</category>
<pkginfolink></pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.xml</config_file>
- <version>1.0.1</version>
+ <version>1.0.2</version>
<status>RC</status>
<required_version>2.1</required_version>
<configurationfile>shellcmd.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index ea325eeb..7302dfd1 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -53,7 +53,7 @@
<descr><![CDATA[The most widely used name server software]]></descr>
<website>http://www.isc.org/downloads/BIND/</website>
<category>Services</category>
- <version>9.9.5P1_5 pkg v0.4.1</version>
+ <version>9.9.5P1_5 pkg v0.4.3</version>
<status>RC</status>
<required_version>2.1</required_version>
<config_file>https://packages.pfsense.org/packages/config/bind/bind.xml</config_file>
@@ -1419,7 +1419,7 @@
<category>Services</category>
<pkginfolink></pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.xml</config_file>
- <version>1.0.1</version>
+ <version>1.0.2</version>
<status>RC</status>
<required_version>2.1</required_version>
<configurationfile>shellcmd.xml</configurationfile>