X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Flcr;h=b743fddd9397c2de741502cd1cc19d279d012d4e;hp=287d9014a836c9918a6c5dc424d2883f3df97638;hb=b27961e905bdf8d7d67a6a30b51b31f1ddabdf91;hpb=6070a03e630b194f23e545e7e88ec318290265dc

diff --git a/lfs/lcr b/lfs/lcr
index 287d9014a8..b743fddd93 100644
--- a/lfs/lcr
+++ b/lfs/lcr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team  <info@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,15 +24,15 @@
 
 include Config
 
-VER        = 64143650bc9c04fadc99694c499cf34750bc2804
+VER        = 20100601
 
-THISAPP    = lcr.git-$(VER)
+THISAPP    = lcr-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = lcr
-PAK_VER    = 1
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 972af4b1f72874700e247db4c12992af
+$(DL_FILE)_MD5 = 68ccdcbe741df38c0f79d14c1b5473f5
 
 install : $(TARGET)
 
@@ -76,11 +76,16 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_SRC)/lcr.git && sed -i 's|usr/local/lcr|var/ipfire/lcr|g' Makefile.in
-	cd $(DIR_SRC)/lcr.git && sed -i 's|usr/local/lcr|var/ipfire/lcr|g' Makefile.am
-	cd $(DIR_SRC)/lcr.git && ./configure --prefix=/usr
-	cd $(DIR_SRC)/lcr.git && make $(MAKETUNING)
-	cd $(DIR_SRC)/lcr.git && make install
-	@rm -rf $(DIR_APP)
+	@rm -rf $(DIR_SRC)/lcr && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_SRC)/lcr && sed -i 's|usr/local/lcr|var/ipfire/lcr|g' Makefile.in
+	cd $(DIR_SRC)/lcr && sed -i 's|usr/local/lcr|var/ipfire/lcr|g' Makefile.am
+	cd $(DIR_SRC)/lcr && ./configure --prefix=/usr
+	cd $(DIR_SRC)/lcr && make $(MAKETUNING)
+	cd $(DIR_SRC)/lcr && make install
+	mv /var/ipfire/lcr/routing.conf /var/ipfire/lcr/routing.conf.org
+	install -v -m 644 $(DIR_SRC)/config/lcr/routing.conf \
+	                        /var/ipfire/lcr/routing.conf
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/lcr \
+	                 /var/ipfire/backup/addons/includes/lcr
+	@rm -rf $(DIR_SRC)/lcr
 	@$(POSTBUILD)