diff options
| author | Perry Mason <crazypark2@yahoo.dk> | 2009-02-09 20:33:01 +0100 |
|---|---|---|
| committer | Perry Mason <crazypark2@yahoo.dk> | 2009-02-09 20:33:01 +0100 |
| commit | 38563692dc156a16ef59027ef322a5fbb4085a82 (patch) | |
| tree | 1a1d7eff65561c4fa0a0af6f3a0f34fc364ce203 | |
| parent | 6dcf7659b156d598d960d440fa80a5de1756b187 (diff) | |
| parent | 914898c0ff3c522e81e744bcc46fc27da7d4927a (diff) | |
| download | pfsense-packages-38563692dc156a16ef59027ef322a5fbb4085a82.tar.gz pfsense-packages-38563692dc156a16ef59027ef322a5fbb4085a82.tar.bz2 pfsense-packages-38563692dc156a16ef59027ef322a5fbb4085a82.zip | |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense-packages/mainline
| -rw-r--r-- | config/snort/snort_download_rules.php | 27 | ||||
| -rw-r--r-- | pkg_config.7.xml | 2 |
2 files changed, 23 insertions, 6 deletions
diff --git a/config/snort/snort_download_rules.php b/config/snort/snort_download_rules.php index 6326a5fe..bc37f5d8 100644 --- a/config/snort/snort_download_rules.php +++ b/config/snort/snort_download_rules.php @@ -178,13 +178,30 @@ ob_flush(); /* setup some variables */ $premium_subscriber = ""; -if($config['installedpackages']['snortadvanced']['config'][0]['subscriber']) + +/* Snort version */ +$snort_version = "2.8"; + +/* Are we using the premium subscriber subscription? */ +if($config['installedpackages']['snortadvanced']['config'][0]['subscriber']) { + // http://www.snort.org/pub-bin/downloads.cgi/Download/sub_rules/snortrules-snapshot-CURRENT_s.tar.gz.md5 $premium_subscriber = "_s"; -$snort_filename = "snortrules-snapshot-CURRENT{$premium_subscriber}.tar.gz"; -$snort_filename_md5 = "snortrules-snapshot-CURRENT.tar.gz.md5"; + $snort_download_prefix = "http://www.snort.org/pub-bin/oinkmaster.cgi"; +} else { + // http://www.snort.org/pub-bin/downloads.cgi/Download/vrt_os/snortrules-snapshot-CURRENT.tar.gz.md5 + $snort_download_prefix = "http://www.snort.org/pub-bin/oinkmaster.cgi"; +} + +/* Set snort rules download filename */ +$snort_filename = "snortrules-snapshot-{$snort_version}{$premium_subscriber}.tar.gz"; +$snort_filename_md5 = "snortrules-snapshot-{$snort_version}{$premium_subscriber}.tar.gz.md5"; + +/* Set user agent to Mozilla */ ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)'); -$dl = "http://www.snort.org/pub-bin/oinkmaster.cgi/{$oinkid}/{$snort_filename}"; -$dl_md5 = "http://www.snort.org/pub-bin/oinkmaster.cgi/{$oinkid}/{$snort_filename_md5}"; + +/* Set download URL */ +$dl = "{$snort_download_prefix}/{$oinkid}/{$snort_filename}"; +$dl_md5 = "{$snort_download_prefix}/{$oinkid}/{$snort_filename_md5}"; /* multi user system, request new filename and create directory */ $tmpfname = tempnam("/tmp", "snortRules"); diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 490127e4..9965bf0f 100644 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -143,7 +143,7 @@ <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> <depends_on_package>snort-2.8.2.1.tbz</depends_on_package> <config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file> - <version>2.8.2.2</version> + <version>2.8.2.3</version> <required_version>1.2</required_version> <status>Stable</status> <configurationfile>snort.xml</configurationfile> |