aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/shellcmd/shellcmd.priv.inc38
-rw-r--r--config/shellcmd/shellcmd.xml8
-rw-r--r--pkg_config.10.xml5
-rw-r--r--pkg_config.8.xml7
-rw-r--r--pkg_config.8.xml.amd647
5 files changed, 52 insertions, 13 deletions
diff --git a/config/shellcmd/shellcmd.priv.inc b/config/shellcmd/shellcmd.priv.inc
new file mode 100644
index 00000000..ae64514d
--- /dev/null
+++ b/config/shellcmd/shellcmd.priv.inc
@@ -0,0 +1,38 @@
+<?php
+/*
+ shellcmd.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-shellcmd'] = array();
+$priv_list['page-services-shellcmd']['name'] = "WebCfg - Services: shellcmd";
+$priv_list['page-services-shellcmd']['descr'] = "Allow access to shellcmd package GUI";
+$priv_list['page-services-shellcmd']['match'] = array();
+$priv_list['page-services-shellcmd']['match'][] = "pkg.php?xml=shellcmd.xml*";
+$priv_list['page-services-shellcmd']['match'][] = "pkg_edit.php?xml=shellcmd.xml*";
+
+?>
diff --git a/config/shellcmd/shellcmd.xml b/config/shellcmd/shellcmd.xml
index ea3144ff..78b876ff 100644
--- a/config/shellcmd/shellcmd.xml
+++ b/config/shellcmd/shellcmd.xml
@@ -42,8 +42,8 @@
]]>
</copyright>
<name>Shellcmd Settings</name>
- <version>1.0</version>
- <title>Shellcmd Settings</title>
+ <version>1.0.1</version>
+ <title>Services: Shellcmd Settings</title>
<include_file>/usr/local/pkg/shellcmd.inc</include_file>
<aftersaveredirect>/pkg.php?xml=shellcmd.xml</aftersaveredirect>
<addedit_string>[shellcmd] Successfully created/modified custom (early)shellcmd.</addedit_string>
@@ -66,6 +66,10 @@
<prefix>/usr/local/pkg/</prefix>
<item>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.inc</item>
</additional_files_needed>
+ <additional_files_needed>
+ <prefix>/etc/inc/priv/</prefix>
+ <item>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.priv.inc</item>
+ </additional_files_needed>
<adddeleteeditpagefields>
<columnitem>
<fielddescr>Command</fielddescr>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 9647ced7..c564997c 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1335,10 +1335,9 @@
<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</version>
- <status>BETA</status>
+ <version>1.0.1</version>
+ <status>RC</status>
<required_version>2.2</required_version>
- <maintainer>markjcrane@gmail.com</maintainer>
<configurationfile>shellcmd.xml</configurationfile>
</package>
<package>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index e503df0b..915e86a3 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1434,10 +1434,9 @@
<category>Services</category>
<pkginfolink></pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.xml</config_file>
- <version>0.6</version>
- <status>Beta</status>
- <required_version>1.2</required_version>
- <maintainer>markjcrane@gmail.com</maintainer>
+ <version>1.0.1</version>
+ <status>RC</status>
+ <required_version>2.1</required_version>
<configurationfile>shellcmd.xml</configurationfile>
</package>
<package>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index bc385e28..bcd3e02f 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1421,10 +1421,9 @@
<category>Services</category>
<pkginfolink></pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.xml</config_file>
- <version>0.6</version>
- <status>Beta</status>
- <required_version>1.2</required_version>
- <maintainer>markjcrane@gmail.com</maintainer>
+ <version>1.0.1</version>
+ <status>RC</status>
+ <required_version>2.1</required_version>
<configurationfile>shellcmd.xml</configurationfile>
</package>
<package>