[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 57f1afd4728fc070c4d2736362767d6d2adffab5 - IPFire-SCM

27 May 2010

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
       via  57f1afd4728fc070c4d2736362767d6d2adffab5 (commit)
       via  f805321a33ab5d98e6127ac079d272746cb65ef6 (commit)
      from  3959e2d3fba0957ec4d50a6d4457fd9339ba3d8e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 57f1afd4728fc070c4d2736362767d6d2adffab5
Merge: f805321a33ab5d98e6127ac079d272746cb65ef6 3959e2d3fba0957ec4d50a6d4457fd9339ba3d8e
Author: Christian Schmidt christian.schmidt@ipfire.org
Date:   Thu May 27 18:51:10 2010 +0200
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
commit f805321a33ab5d98e6127ac079d272746cb65ef6
Author: Christian Schmidt christian.schmidt@ipfire.org
Date:   Thu May 27 18:50:25 2010 +0200
Changed download link for snort registered rules, and min space requirements.
-----------------------------------------------------------------------
Summary of changes:
 html/cgi-bin/ids.cgi |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Difference in files:

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index dc31c48..02e0adf 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -265,7 +265,7 @@ if ($snortsettings{'RULES'} eq 'subscripted') {
    #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings%7B%27OINKCODE%27%...";
 } elsif ($snortsettings{'RULES'} eq 'registered') {
    #$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz?oink_code=$snor...";
-	$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2860_s.tar.gz?oink_code=$s...";
+	$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2860.tar.gz?oink_code=$sno...";
    #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings%7B%27OINKCODE%27%...";
 } else {
    $url="http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rul...";
@@ -353,8 +353,8 @@ if ($snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'}) {
    	if ($line =~ m/dev/ ) {
    	$line =~ m/^.* (\d+)M.*$/;
    	my @temp = split(/ +/,$line);
-			if ($1<600) {
-				$errormessage = "$Lang::tr{'not enough disk space'} < 600MB, /var $1MB";
+			if ($1<300) {
+				$errormessage = "$Lang::tr{'not enough disk space'} < 300MB, /var $1MB";
    		} else {
    			my $filename = &downloadrulesfile();
    			if (defined $filename) {
hooks/post-receive
--
IPFire 2.x development tree

    