aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #655 from bmeeks8/suricata-fix-licenseRELENG_2_1_5RELENG_2_1_3Renato Botelho2014-05-0430-228/+561
|\
| * Update license to include proper attribution for previous work.bmeeks82014-05-0430-228/+561
|/
* Merge pull request #654 from bmeeks8/suricata-1.0.1Ermal2014-05-0210-13/+37
|\
| * Allow disabling of 'Delayed Detect' feature when required.bmeeks82014-04-303-2/+18
| * No need to call suricata_reload_config() here.bmeeks82014-04-301-3/+2
| * Bump Suricata package version to 1.0.1 for bug fix.bmeeks82014-04-303-3/+3
| * Fix bug in cron task edit for 'rm_blocked' hostsbmeeks82014-04-303-5/+14
* | Merge pull request #653 from bmeeks8/snort-3.0.8Ermal2014-05-025-8/+15
|\ \
| * | Bump Snort package version to 3.0.8 for bug fix.bmeeks82014-04-306-7/+7
| * | Better fix for preventing multiple rm_blocked cron entries.bmeeks82014-04-301-11/+2
| * | Fix multiple cron jobs bug when updating rm_blocked interval.bmeeks82014-04-301-3/+19
| |/
| * Merge branch 'master' of https://github.com/pfsense/pfsense-packagesbmeeks82014-04-297-12/+12
| |\
| * \ Merge branch 'suricata-1.0'bmeeks82014-04-2929-200/+1516
| |\ \
* | | | Bump version for all recently rebuilt packages, all of them are linked agains...Renato Botelho2014-05-012-74/+74
| |_|/ |/| |
* | | Fix call-time pass-by-reference in sudo, bumpjim-p2014-04-295-6/+6
* | | Fix a pass-by-reference error in nmap, bump.jim-p2014-04-295-6/+6
* | | Merge pull request #652 from bmeeks8/suricata-1.0Ermal2014-04-2929-200/+1516
|\ \ \ | |/ / |/| / | |/
| * Add auto-prune and retention params to File Store dirs.bmeeks82014-04-272-10/+40
| * Fix path to the magic.mgc file for file capture function.bmeeks82014-04-271-1/+1
| * Use block.log contents to populate BLOCKED HOSTS tab.bmeeks82014-04-271-26/+17
| * Enabled "rm_blocked" cron job to clear blocked hosts.bmeeks82014-04-272-9/+102
| * Bump Suricata GUI pkg to v1.0 and flag as Stable.bmeeks82014-04-254-7/+7
| * Add support for new block.log file from alert-pf plugin.bmeeks82014-04-252-1/+31
| * Implement blocking function support in Suricata pkg GUI.bmeeks82014-04-2425-172/+1344
* | Merge pull request #646 from PiBa-NL/spamd_db_content_extra_expiration_infoErmal2014-04-281-1/+18
|\ \
| * | spamd, use local timezone settings for new time columnsPiBa-NL2014-04-221-3/+3
| * | spamd, smtp host/from/to table entry expiration information shownPiBa-NL2014-04-131-1/+18
* | | Merge pull request #647 from dbaio/masterErmal2014-04-286-5/+19
|\ \ \
| * | | apcupsd - add lockfile optionDanilo G. Baio (dbaio)2014-04-213-3/+14
| * | | apcupsd - fix lock file when using usb devicesDanilo G. Baio (dbaio)2014-04-145-4/+7
* | | | Remove the -o basic hereErmal2014-04-281-1/+1
* | | | Include new parameter control in JavaScript function.bmeeks82014-04-281-0/+1
* | | | Change order of DB login info and other MySQL output parameters.bmeeks82014-04-281-4/+5
* | | | Add reminder to apply IP REP blocklist changes.bmeeks82014-04-281-2/+14
* | | | Add param to disable sig_reference table updates and fix root login bug.bmeeks82014-04-282-1/+13
* | | | Need a flag to indicate latest snort.inc version has been loaded.bmeeks82014-04-281-1/+4
* | | | Add missing ']' to variable name.bmeeks82014-04-281-2/+2
* | | | Bump Snort pkg version to 3.0.7bmeeks82014-04-284-5/+5
* | | | Add history tag text to write_config() calls and bump pkg version.bmeeks82014-04-282-6/+5
* | | | Add "@" to silence errors and history tag text to write_config() calls.bmeeks82014-04-282-12/+11
* | | | Add history tag text to all write_config() calls.bmeeks82014-04-282-2/+2
* | | | Add history tag text to all write_config() calls.bmeeks82014-04-2819-36/+38
* | | | Can't use constant for safemkdir() and add history tag to config write.bmeeks82014-04-281-2/+3
* | | | Add check to prevent duplicate IP list files on an interface.bmeeks82014-04-281-11/+31
* | | | Fix logic error preventing save of a new Suppress List.bmeeks82014-04-281-7/+5
* | | | Add option to send e-mail notifications when Service Watchdog restarts a serv...jim-p2014-04-256-13/+51
* | | | Don't add a second tls-auth line when exporting for Viscosity.jim-p2014-04-245-5/+5
* | | | Bump here toojim-p2014-04-241-1/+1
* | | | Fix various OpenVPN Client Export protocol issues that prevented the export f...jim-p2014-04-244-8/+21
* | | | Avoid a PHP error in OpenVPN client export if the user chooses one of the aut...jim-p2014-04-245-4/+7