From 1ae1ce18ae2b6da33d177037bdf16d38026b3fa6 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@git.ipfire.org>
Date: Tue, 9 Oct 2012 17:40:39 +0200
Subject: [PATCH] lcr: update to 20121008.

---
 config/backup/includes/lcr    |  1 +
 config/rootfiles/packages/lcr |  1 +
 lfs/lcr                       | 22 +++++++++++++---------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/config/backup/includes/lcr b/config/backup/includes/lcr
index 71f4cacc08..618f4c784e 100644
--- a/config/backup/includes/lcr
+++ b/config/backup/includes/lcr
@@ -3,3 +3,4 @@
 /var/ipfire/lcr/interface.conf
 /var/ipfire/lcr/options.conf
 /var/ipfire/lcr/routing.conf
+/var/log/lcr
diff --git a/config/rootfiles/packages/lcr b/config/rootfiles/packages/lcr
index 2633518b29..0739db4451 100644
--- a/config/rootfiles/packages/lcr
+++ b/config/rootfiles/packages/lcr
@@ -385,6 +385,7 @@ var/ipfire/lcr/vbox_german/record_play.isdn
 var/ipfire/lcr/vbox_german/record_record.isdn
 var/ipfire/lcr/vbox_german/store_ask.isdn
 var/ipfire/lcr/vbox_german/store_done.isdn
+var/log/lcr
 usr/sbin/genextension
 usr/sbin/genrc
 usr/sbin/lcr
diff --git a/lfs/lcr b/lfs/lcr
index d6734ed9d5..061cde9ce4 100644
--- a/lfs/lcr
+++ b/lfs/lcr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  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        = 1.10
+VER        = 20121008
 
 THISAPP    = lcr-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = lcr
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ccde843ee92f4d75f697d8a9e9fa3ba9
+$(DL_FILE)_MD5 = 6c5e25329be107e30436b716bafc786f
 
 install : $(TARGET)
 
@@ -76,10 +76,14 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_SRC)/lcr && cd $(DIR_SRC) && tar jxf $(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
+	@rm -rf $(DIR_SRC)/lcr && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_SRC)/lcr && sed -i -e "s|^EXTENSIONdir=.*|EXTENSIONdir=/var/ipfire/lcr/extensions|g" \
+					Makefile.am
+	cd $(DIR_SRC)/lcr && ./autogen.sh
+	cd $(DIR_SRC)/lcr && ./configure --prefix=/usr \
+					 --sysconfdir=/var/ipfire \
+					 --localstatedir=/var \
+					 --datarootdir=/var/ipfire
 	cd $(DIR_SRC)/lcr && make $(MAKETUNING)
 	cd $(DIR_SRC)/lcr && make install
 	mv /var/ipfire/lcr/routing.conf /var/ipfire/lcr/routing.conf.org
-- 
2.39.5