From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] snort: Update to 2.9.7.6 Date: Sun, 01 Nov 2015 15:30:01 +0100 Message-ID: <1446388201-2082-1-git-send-email-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5755844378965937158==" List-Id: --===============5755844378965937158== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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. =20 > 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=3Dpeople/mfischer/ipfire-2.x.git;a=3Dcommit;h=3D2a67= ace74a8aed9bd2d5b3f4542a2aab36577c57 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=3Dpeople/mfischer/ipfire-2.x.git;a=3Dcommit;h=3Dda8d= 8d0af8d6a9a27d68f7be08c0eb2d3b109a3e Finally I thought the easiest way could be if I would send a new patch contai= ning both. Hope this helps... ;-) Best, Matthias Signed-off-by: Matthias Fischer --- 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 = # +# Copyright (C) 2007-2015 IPFire Team = # # = # # 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 ################= ################# =20 if ($snortsettings{'RULES'} eq 'subscripted') { - $url=3D" https://www.snort.org/rules/snortrules-snapshot-2970.tar.gz?oinkco= de=3D$snortsettings{'OINKCODE'}"; + $url=3D" https://www.snort.org/rules/snortrules-snapshot-2976.tar.gz?oinkco= de=3D$snortsettings{'OINKCODE'}"; } elsif ($snortsettings{'RULES'} eq 'registered') { - $url=3D" https://www.snort.org/rules/snortrules-snapshot-2970.tar.gz?oinkco= de=3D$snortsettings{'OINKCODE'}"; + $url=3D" https://www.snort.org/rules/snortrules-snapshot-2976.tar.gz?oinkco= de=3D$snortsettings{'OINKCODE'}"; } elsif ($snortsettings{'RULES'} eq 'community') { $url=3D" 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 = # +# Copyright (C) 2007-2015 IPFire Team = # # = # # 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 @@ =20 include Config =20 -VER =3D 2.9.7.0 +VER =3D 2.9.7.6 =20 THISAPP =3D snort-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -36,11 +36,11 @@ TARGET =3D $(DIR_INFO)/$(THISAPP) # Top-level Rules ############################################################################= ### =20 -objects =3D $(DL_FILE)=20 +objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D c2a45bc56441ee9456478f219dd8d1e2 +$(DL_FILE)_MD5 =3D 65349f3272c4de5b3210f77f1f7ab0e6 =20 install : $(TARGET) =20 --=20 2.6.2 --===============5755844378965937158==--