X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fsnort;h=3955ab62916d31eee3a1524f5fa7bb1d18566eb5;hp=88f0c2d35b7e409c16e514c1a3fb084d89b59ef8;hb=98a5af50fff364c64d03be34eb821e153081190d;hpb=cd1a2927226c734d96478e12bb768256fb64a06a

diff --git a/lfs/snort b/lfs/snort
index 88f0c2d35b..3955ab6291 100644
--- a/lfs/snort
+++ b/lfs/snort
@@ -1,28 +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>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: snort,v 1.6.2.11 2005/11/05 19:53:45 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,11 +24,11 @@
 
 include Config
 
-VER        = 2.3.3
+VER        = 2.8.4
 
 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.snort.org/dl/old
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -44,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 = 06bf140893e7cb120aaa9372d10a0100
+$(DL_FILE)_MD5 = 193179da8db8aac5ee6b0a751ce7b76d
 
 install : $(TARGET)
 
@@ -77,19 +69,21 @@ $(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
-	cd $(DIR_APP) && make -j 3
+	    --enable-linux-smp-stats --enable-smb-alerts
+	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
 	mv /usr/bin/snort /usr/sbin/
-	-mkdir /etc/snort
-	cd $(DIR_APP) && install -m 0644 rules/*.rules \
-	    etc/unicode.map etc/reference.config etc/classification.config /etc/snort
+	-mkdir -p /etc/snort/rules
+
+	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)