X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsnort;h=3955ab62916d31eee3a1524f5fa7bb1d18566eb5;hp=7168c10ec7391af189bd8d2662e0782d542e0723;hb=9e1084b2754caa4cab4e0386b25d4d71e4395057;hpb=5a3e0dca58c1efebdd0c4f8d8c3e9c3146d35f3e

diff --git a/lfs/snort b/lfs/snort
index 7168c10ec7..3955ab6291 100644
--- a/lfs/snort
+++ b/lfs/snort
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.1.4
+VER        = 2.8.4
 
 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -38,17 +36,11 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) \
-	Community-Rules-20070503.tar.gz \
-	bleeding.rules-20070503.tar.gz
+objects = $(DL_FILE) 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-Community-Rules-20070503.tar.gz = $(DL_FROM)/Community-Rules-20070503.tar.gz
-bleeding.rules-20070503.tar.gz = $(DL_FROM)/bleeding.rules-20070503.tar.gz
 
-$(DL_FILE)_MD5 = 70e7f297c9fcf1f46d6fa3e1bb4aae49
-Community-Rules-20070503.tar.gz_MD5 = f236b8a4ac12e99d3e7bd81bf3b5a482
-bleeding.rules-20070503.tar.gz_MD5 = f18f0a08c139b8205270b41a534f15d7
+$(DL_FILE)_MD5 = 193179da8db8aac5ee6b0a751ce7b76d
 
 install : $(TARGET)
 
@@ -77,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) $(DIR_SRC)/snort* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \
 	    --sysconfdir=/etc/snort \
 	    --enable-linux-smp-stats --enable-smb-alerts
@@ -86,13 +78,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	mv /usr/bin/snort /usr/sbin/
 	-mkdir -p /etc/snort/rules
 
-	tar xvfz $(DIR_DL)/Community-Rules-20070503.tar.gz -C /etc/snort/
-	tar xvfz $(DIR_DL)/bleeding.rules-20070503.tar.gz -C /etc/snort/
-	cd $(DIR_APP) && install -m 0644 etc/unicode.map \
-		etc/reference.config etc/classification.config /etc/snort
+	cd $(DIR_APP) && install -m 0644  \
+		etc/reference.config etc/classification.config /etc/snort/rules
+	cd $(DIR_APP) && install -m 0644 etc/unicode.map /etc/snort
 	install -m 0644 $(DIR_SRC)/config/snort/snort.conf /etc/snort
 	chown -R nobody:nobody /etc/snort
 	-mkdir -p /var/log/snort
 	chown -R snort:snort /var/log/snort
-	@rm -rf $(DIR_APP)
+	@rm -rf $(DIR_APP) $(DIR_SRC)/snort*
 	@$(POSTBUILD)