diff options
| author | Jim P <jim@pingle.org> | 2013-04-24 15:42:08 -0700 |
|---|---|---|
| committer | Jim P <jim@pingle.org> | 2013-04-24 15:42:08 -0700 |
| commit | 64671ccfc12ac87839540de3cb011d7cfcf03401 (patch) | |
| tree | 306ec0da429aebc3d2bd5599dc3f303a8bab1d94 | |
| parent | b38188a3a7a3eeef3d9614c82dd91db7d3a3af5a (diff) | |
| parent | 4bec483970c9e3af3dcdd3fa952e701945dba792 (diff) | |
| download | pfsense-packages-64671ccfc12ac87839540de3cb011d7cfcf03401.tar.gz pfsense-packages-64671ccfc12ac87839540de3cb011d7cfcf03401.tar.bz2 pfsense-packages-64671ccfc12ac87839540de3cb011d7cfcf03401.zip | |
Merge pull request #432 from bmeeks8/master
Fix bad include reference in Snort Widget -- caused pkg start crash with Snort
| -rw-r--r-- | config/widget-snort/widget-snort.inc | 6 | ||||
| -rw-r--r-- | config/widget-snort/widget-snort.xml | 16 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
4 files changed, 18 insertions, 8 deletions
diff --git a/config/widget-snort/widget-snort.inc b/config/widget-snort/widget-snort.inc index b33059e4..105dd1e7 100644 --- a/config/widget-snort/widget-snort.inc +++ b/config/widget-snort/widget-snort.inc @@ -1,8 +1,5 @@ <?php - -require_once("guiconfig.inc"); require_once("config.inc"); - function widget_snort_uninstall() { global $config; @@ -19,10 +16,9 @@ function widget_snort_uninstall() { write_config(); } - /* Remove our associated file */ + /* Remove our associated files */ unlink("/usr/local/www/widgets/include/widget-snort.inc"); unlink("/usr/local/www/widgets/widgets/snort_alerts.widget.php"); unlink("/usr/local/www/widgets/javascript/snort_alerts.js"); } - ?> diff --git a/config/widget-snort/widget-snort.xml b/config/widget-snort/widget-snort.xml index ef89c1bb..b415bd12 100644 --- a/config/widget-snort/widget-snort.xml +++ b/config/widget-snort/widget-snort.xml @@ -46,9 +46,15 @@ <requirements>Dashboard package and Snort</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>widget-snort</name> - <version>0.3.3</version> + <version>0.3.4</version> <title>Widget - Snort</title> <include_file>/usr/local/www/widgets/include/widget-snort.inc</include_file> + <menu> + </menu> + <service> + </service> + <tabs> + </tabs> <additional_files_needed> <prefix>/usr/local/www/widgets/javascript/</prefix> <chmod>0644</chmod> @@ -64,6 +70,14 @@ <chmod>0644</chmod> <item>http://www.pfsense.com/packages/config/widget-snort/widget-snort.inc</item> </additional_files_needed> + <fields> + </fields> + <custom_add_php_command> + </custom_add_php_command> + <custom_php_resync_config_command> + </custom_php_resync_config_command> + <custom_php_install_command> + </custom_php_install_command> <custom_php_deinstall_command> widget_snort_uninstall(); </custom_php_deinstall_command> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 23ba7eba..ff455b5b 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1481,7 +1481,7 @@ <descr>Dashboard widget for Snort.</descr> <category>System</category> <config_file>http://www.pfsense.com/packages/config/widget-snort/widget-snort.xml</config_file> - <version>0.3.3</version> + <version>0.3.4</version> <status>BETA</status> <required_version>1.2</required_version> <configurationfile>widget-snort.xml</configurationfile> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 12951ca8..066cc24c 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1468,7 +1468,7 @@ <descr>Dashboard widget for Snort.</descr> <category>System</category> <config_file>http://www.pfsense.com/packages/config/widget-snort/widget-snort.xml</config_file> - <version>0.3.3</version> + <version>0.3.4</version> <status>BETA</status> <required_version>1.2</required_version> <configurationfile>widget-snort.xml</configurationfile> |