X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcrda;h=e87b7adbd3fdf73c8afbdf0e3bf2444cb0dc13c6;hp=f97fdcb81ec685058c4bc66f38e34661c10ed022;hb=f942937c29ca76a7f153fc16ea13157eb4cf05cc;hpb=ff305ff7c276789edda0e606dceaa9fd5d715ec6

diff --git a/lfs/crda b/lfs/crda
index f97fdcb81..e87b7adbd 100644
--- a/lfs/crda
+++ b/lfs/crda
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2013  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,12 +24,10 @@
 
 include Config
 
-VER        = 20110202-git
-
-REGDB      = regulatory-20110202
+VER        = 1.1.3
 
 THISAPP    = crda-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
@@ -39,13 +37,11 @@ TARGET = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(REGDB).tar.xz
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(REGDB).tar.xz = $(DL_FROM)/$(REGDB).tar.xz
 
-$(DL_FILE)_MD5 = 1da048b854cca1f1087c1250df335ca8
-$(REGDB).tar.xz_MD5 = 620621172d18d6f8cdc2db423dcb6381
+$(DL_FILE)_MD5 = 29579185e06a75675507527243d28e5c
 
 install : $(TARGET)
 
@@ -74,9 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	-mkdir /usr/lib/crda
-	tar Jxf $(DIR_DL)/$(REGDB).tar.xz -C /usr/lib/crda/
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && USE_OPENSSL=1 make $(MAKETUNING)
 	cd $(DIR_APP) && USE_OPENSSL=1 make install
 	@rm -rf $(DIR_APP)