[PATCH] snort: Update to 2.9.7.6

[PATCH] snort: Update to 2.9.7.6

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 4186 bytes --]

Hi,

On 01.11.2015 01:58, Michael Tremer wrote:
> Shouldn't the version of the rules and snort be the same?

No necessarily, IMHO one can use all current rule files on https://snort.org/downloads/#rule-downloads (2975 / 2976 / 2962), but newest should be better, right.
 
> This is a diff which only changes what is shown there. The configure
> flags won't get touched it I would merge this patch.

This is right, because in this (older) commit I hadn't changed the configure options yet.

Sequence was:

2015-01-06 - snort (Update to 2.9.76):
http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=2a67ace74a8aed9bd2d5b3f4542a2aab36577c57

2015-10-26 - snort 2.9.76 (removed unrecognized configure options in lfs file) -> this contains ONLY the changed lfs-file:
http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=da8d8d0af8d6a9a27d68f7be08c0eb2d3b109a3e

Finally I thought the easiest way could be if I would send a new patch containing both.
Hope this helps... ;-)

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 html/cgi-bin/ids.cgi | 6 +++---
 lfs/snort            | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 5ada911..f17b16a 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2015  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -263,9 +263,9 @@ if (-e "/etc/snort/snort.conf") {
 #######################  End added for snort rules control  #################################
 
 if ($snortsettings{'RULES'} eq 'subscripted') {
-	$url=" https://www.snort.org/rules/snortrules-snapshot-2970.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
+	$url=" https://www.snort.org/rules/snortrules-snapshot-2976.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
 } elsif ($snortsettings{'RULES'} eq 'registered') {
-	$url=" https://www.snort.org/rules/snortrules-snapshot-2970.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
+	$url=" https://www.snort.org/rules/snortrules-snapshot-2976.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
 } elsif ($snortsettings{'RULES'} eq 'community') {
 	$url=" https://www.snort.org/rules/community";
 } else {
diff --git a/lfs/snort b/lfs/snort
index 373e53c..148f539 100644
--- a/lfs/snort
+++ b/lfs/snort
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2015  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.9.7.0
+VER        = 2.9.7.6
 
 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -36,11 +36,11 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) 
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c2a45bc56441ee9456478f219dd8d1e2
+$(DL_FILE)_MD5 = 65349f3272c4de5b3210f77f1f7ab0e6
 
 install : $(TARGET)
 
-- 
2.6.2

[PATCH] snort: Update to 2.9.7.6

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 1646 bytes --]

snort: Update to 2.9.7.6

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 html/cgi-bin/ids.cgi | 4 ++--
 lfs/snort            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index c7fc6c9..f17b16a 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -263,9 +263,9 @@ if (-e "/etc/snort/snort.conf") {
 #######################  End added for snort rules control  #################################
 
 if ($snortsettings{'RULES'} eq 'subscripted') {
-	$url=" https://www.snort.org/rules/snortrules-snapshot-2975.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
+	$url=" https://www.snort.org/rules/snortrules-snapshot-2976.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
 } elsif ($snortsettings{'RULES'} eq 'registered') {
-	$url=" https://www.snort.org/rules/snortrules-snapshot-2975.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
+	$url=" https://www.snort.org/rules/snortrules-snapshot-2976.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
 } elsif ($snortsettings{'RULES'} eq 'community') {
 	$url=" https://www.snort.org/rules/community";
 } else {
diff --git a/lfs/snort b/lfs/snort
index e65cd63..a8318db 100644
--- a/lfs/snort
+++ b/lfs/snort
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.9.7.5
+VER        = 2.9.7.6
 
 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fd271788c0f8876be87a858a9142f202
+$(DL_FILE)_MD5 = 65349f3272c4de5b3210f77f1f7ab0e6
 
 install : $(TARGET)
 
-- 
2.6.0

Re: [PATCH] snort: Update to 2.9.7.6

[Timo Eissler]

[-- Attachment #1: Type: text/plain, Size: 2012 bytes --]

reviewed-by: Timo Eissler <timo.eissler(a)ipfire.org>

Am 06.10.2015 um 09:09 schrieb Matthias Fischer:
> snort: Update to 2.9.7.6
>
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
>  html/cgi-bin/ids.cgi | 4 ++--
>  lfs/snort            | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
> index c7fc6c9..f17b16a 100644
> --- a/html/cgi-bin/ids.cgi
> +++ b/html/cgi-bin/ids.cgi
> @@ -263,9 +263,9 @@ if (-e "/etc/snort/snort.conf") {
>  #######################  End added for snort rules control  #################################
>  
>  if ($snortsettings{'RULES'} eq 'subscripted') {
> -	$url=" https://www.snort.org/rules/snortrules-snapshot-2975.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
> +	$url=" https://www.snort.org/rules/snortrules-snapshot-2976.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
>  } elsif ($snortsettings{'RULES'} eq 'registered') {
> -	$url=" https://www.snort.org/rules/snortrules-snapshot-2975.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
> +	$url=" https://www.snort.org/rules/snortrules-snapshot-2976.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
>  } elsif ($snortsettings{'RULES'} eq 'community') {
>  	$url=" https://www.snort.org/rules/community";
>  } else {
> diff --git a/lfs/snort b/lfs/snort
> index e65cd63..a8318db 100644
> --- a/lfs/snort
> +++ b/lfs/snort
> @@ -24,7 +24,7 @@
>  
>  include Config
>  
> -VER        = 2.9.7.5
> +VER        = 2.9.7.6
>  
>  THISAPP    = snort-$(VER)
>  DL_FILE    = $(THISAPP).tar.gz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = fd271788c0f8876be87a858a9142f202
> +$(DL_FILE)_MD5 = 65349f3272c4de5b3210f77f1f7ab0e6
>  
>  install : $(TARGET)
>  

-- 
Timo Eissler
Senior Project Engineer / Consultant

Am Zuckerberg 54
D-71640 Ludwigsburg

Tel.: +49 7141 4094003
Mobil.: +49 151 20650311
Email: timo(a)teissler.de



[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] snort: Update to 2.9.7.6

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2014 bytes --]

This patch won't apply. Don't know why.

-Michael

On Sat, 2015-10-10 at 19:30 +0200, Timo Eissler wrote:
> reviewed-by: Timo Eissler <timo.eissler(a)ipfire.org>
> 
> Am 06.10.2015 um 09:09 schrieb Matthias Fischer:
> > snort: Update to 2.9.7.6
> > 
> > Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> > ---
> >  html/cgi-bin/ids.cgi | 4 ++--
> >  lfs/snort            | 4 ++--
> >  2 files changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
> > index c7fc6c9..f17b16a 100644
> > --- a/html/cgi-bin/ids.cgi
> > +++ b/html/cgi-bin/ids.cgi
> > @@ -263,9 +263,9 @@ if (-e "/etc/snort/snort.conf") {
> >  #######################  End added for snort rules control 
> >  #################################
> >  
> >  if ($snortsettings{'RULES'} eq 'subscripted') {
> > -	$url=" https://www.snort.org/rules/snortrules-snapshot-297
> > 5.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
> > +	$url=" https://www.snort.org/rules/snortrules-snapshot-297
> > 6.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
> >  } elsif ($snortsettings{'RULES'} eq 'registered') {
> > -	$url=" https://www.snort.org/rules/snortrules-snapshot-297
> > 5.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
> > +	$url=" https://www.snort.org/rules/snortrules-snapshot-297
> > 6.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
> >  } elsif ($snortsettings{'RULES'} eq 'community') {
> >  	$url=" https://www.snort.org/rules/community";
> >  } else {
> > diff --git a/lfs/snort b/lfs/snort
> > index e65cd63..a8318db 100644
> > --- a/lfs/snort
> > +++ b/lfs/snort
> > @@ -24,7 +24,7 @@
> >  
> >  include Config
> >  
> > -VER        = 2.9.7.5
> > +VER        = 2.9.7.6
> >  
> >  THISAPP    = snort-$(VER)
> >  DL_FILE    = $(THISAPP).tar.gz
> > @@ -40,7 +40,7 @@ objects = $(DL_FILE)
> >  
> >  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> >  
> > -$(DL_FILE)_MD5 = fd271788c0f8876be87a858a9142f202
> > +$(DL_FILE)_MD5 = 65349f3272c4de5b3210f77f1f7ab0e6
> >  
> >  install : $(TARGET)
> >  
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]