aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jim@pingle.org>2009-10-14 17:03:50 -0400
committerjim-p <jim@pingle.org>2009-10-14 17:11:33 -0400
commita0275915f127d728e5088920bd8da9a944a7d6b4 (patch)
tree26c3c75d88fe0ded24979c29fbf4f43f8971efac
parent8e4d710a0d8b47bb6ceabe5a640a9097c19223f5 (diff)
downloadpfsense-packages-a0275915f127d728e5088920bd8da9a944a7d6b4.tar.gz
pfsense-packages-a0275915f127d728e5088920bd8da9a944a7d6b4.tar.bz2
pfsense-packages-a0275915f127d728e5088920bd8da9a944a7d6b4.zip
Dashboard 0.8.6: Prevent install on 2.0 (just in case) and remove snort/havp widgets so they can be in their own packages.
-rw-r--r--config/dashboard/dashboard.inc31
-rw-r--r--config/dashboard/dashboard.xml26
-rwxr-xr-xpkg_config.7.xml2
-rw-r--r--pkg_config.xml2
4 files changed, 34 insertions, 27 deletions
diff --git a/config/dashboard/dashboard.inc b/config/dashboard/dashboard.inc
index 9f5d6e8c..61b5c501 100644
--- a/config/dashboard/dashboard.inc
+++ b/config/dashboard/dashboard.inc
@@ -2,19 +2,26 @@
function dashboard_install() {
global $g, $config;
- assign_privs();
- /* Copy files for backup. For some odd reason, mv alone does
- * not always result in the proper file being used. */
- mwexec("cp /usr/local/www/index.php /usr/local/www/index.php.before_dashboard");
- unlink("/usr/local/www/index.php");
- mwexec("cp /usr/local/www/diag_logs_filter.php /usr/local/www/diag_logs_filter.php.before_dashboard");
- mwexec("cp /usr/local/www/diag_logs_filter_dynamic.php /usr/local/www/diag_logs_filter_dynamic.php.before_dashboard");
- mwexec("tar xzvpUf /usr/local/pkg/widgets.tgz -C /");
- assign_privs();
- /* Clear the APC cache so that the updates to installed files will work. */
- sleep(5);
- apc_clear_cache();
+ $version = file_get_contents("/etc/version");
+ if ($version[0] == "2") {
+ echo "Skipping install on 2.0, package is redundant.";
+ exit(1);
+ } else {
+ assign_privs();
+
+ /* Copy files for backup. For some odd reason, mv alone does
+ * not always result in the proper file being used. */
+ mwexec("cp /usr/local/www/index.php /usr/local/www/index.php.before_dashboard");
+ unlink("/usr/local/www/index.php");
+ mwexec("cp /usr/local/www/diag_logs_filter.php /usr/local/www/diag_logs_filter.php.before_dashboard");
+ mwexec("cp /usr/local/www/diag_logs_filter_dynamic.php /usr/local/www/diag_logs_filter_dynamic.php.before_dashboard");
+ mwexec("tar xzvpUf /usr/local/pkg/widgets.tgz -C /");
+ assign_privs();
+ /* Clear the APC cache so that the updates to installed files will work. */
+ sleep(5);
+ apc_clear_cache();
+ }
}
function assign_privs() {
diff --git a/config/dashboard/dashboard.xml b/config/dashboard/dashboard.xml
index 1707f6d4..cae0205d 100644
--- a/config/dashboard/dashboard.xml
+++ b/config/dashboard/dashboard.xml
@@ -2,8 +2,8 @@
<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
<packagegui>
- <copyright>
- <![CDATA[
+ <copyright>
+ <![CDATA[
/* $Id$ */
/* ========================================================================== */
/*
@@ -15,18 +15,18 @@
Based on m0n0wall (http://m0n0.ch/wall)
Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
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.
+ 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.
+ 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
@@ -38,15 +38,15 @@
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>
- <description>Dashboard package</description>
- <requirements>Describe your package requirements here</requirements>
- <faq>Currently there are no FAQ items provided.</faq>
+ ]]>
+ </copyright>
+ <description>Dashboard package</description>
+ <requirements>Describe your package requirements here</requirements>
+ <faq>Currently there are no FAQ items provided.</faq>
<name>dashboard</name>
- <version>0.8.5</version>
+ <version>0.8.6</version>
<title>Dashboard</title>
<include_file>/usr/local/pkg/dashboard.inc</include_file>
<additional_files_needed>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index b19eb0da..677847a7 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -109,7 +109,7 @@
<descr>Adds pfSense dashboard that will be included with 2.0. WARNING! Cannot be deinstalled.</descr>
<category>System</category>
<config_file>http://www.pfsense.com/packages/config/dashboard/dashboard.xml</config_file>
- <version>0.8.5</version>
+ <version>0.8.6</version>
<status>BETA</status>
<required_version>1.2</required_version>
<maximum_version>1.9</maximum_version>
diff --git a/pkg_config.xml b/pkg_config.xml
index 3a77258d..63f9df92 100644
--- a/pkg_config.xml
+++ b/pkg_config.xml
@@ -88,7 +88,7 @@
<descr>Adds pfSense dashboard that will be included with 2.0. This requires 1.2 or newer. WARNING! Cannot be deinstalled.</descr>
<category>System</category>
<config_file>http://www.pfsense.com/packages/config/dashboard/dashboard.xml</config_file>
- <version>0.8.5</version>
+ <version>0.8.6</version>
<status>BETA</status>
<required_version>1.2</required_version>
<maximum_version>1.9</maximum_version>