X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ftripwire;h=9942441e908017c99b4f52e60e15ebc1a40f0259;hp=859ba5808b4343958d725e61dcf38a638c997913;hb=9e51058b39f054c1e0803704c2fea4ac6aeb5094;hpb=92004c612683f0e5b75684a4d284ed6880a0f0f7

diff --git a/lfs/tripwire b/lfs/tripwire
index 859ba5808b..9942441e90 100644
--- a/lfs/tripwire
+++ b/lfs/tripwire
@@ -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.4.0.1
+VER        = 2.4.1.2
 
 THISAPP    = tripwire-$(VER)
 DL_FILE    = $(THISAPP)-src.tar.bz2
@@ -35,6 +33,10 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tripwire
 PAK_VER    = 1
+CFLAGS     =
+CXXFLAGS   = 
+
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b371f79ac23cacc9ad40b1da76b4a0c4
+$(DL_FILE)_MD5 = 8a1147c278b528ed593023912c4b649a
 
 install : $(TARGET)
 
@@ -55,7 +57,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-	@$(PAK)
+	$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -76,22 +78,21 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ln -s contrib install
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/tripwire-2.4.0.1-gcc4_build_fixes-1.patch
-	cd $(DIR_APP) && sed -i -e 's@TWDB="$${prefix}@TWDB="/var@' \
+	@rm -rf $(DIR_APP)* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP)-src && ln -fs contrib install
+	cd $(DIR_APP)-src && sed -i -e 's@TWDB="$${prefix}@TWDB="/var@' \
 													-e 's@^CLOBBER="false"@CLOBBER="true"@' install/install.cfg
-	cd $(DIR_APP) && sed -i -e 's@^PROMPT="true"@PROMPT="false"@' \
+	cd $(DIR_APP)-src && sed -i -e 's@^PROMPT="true"@PROMPT="false"@' \
 													-e 's@^TW_SITE_PASS=""@TW_SITE_PASS="ipfire"@' \
 													-e 's@^TW_LOCAL_PASS=""@TW_LOCAL_PASS="ipfire"@' \
 													install/install.sh
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/tripwire
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && for i in siggen tripwire twadmin twprint; do \
-											cp -vf $(DIR_APP)/bin/$$i /usr/sbin; \
-										done 
-	@rm -rf $(DIR_APP)
+	cd $(DIR_APP)-src && ./configure --prefix=/usr --sysconfdir=/var/ipfire/tripwire
+	cd $(DIR_APP)-src && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP)-src && for i in siggen tripwire twadmin twprint; do \
+													cp -vf $(DIR_APP)-src/bin/$$i /usr/sbin; \
+											 done
 	cp -vrf $(DIR_SRC)/config/tripwire/* /var/ipfire/tripwire/
 	cp -vfp /var/ipfire/tripwire/twcfg.txt /var/ipfire/tripwire/twcfg.default
 	cp -vfp /var/ipfire/tripwire/twpol.txt /var/ipfire/tripwire/twpol.default
+	@rm -rf $(DIR_APP)*
 	@$(POSTBUILD)