X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2FGeoIP;h=882d1a078d4ea3c3c15d1a21d07842c4efb97857;hp=fe30b430150f0722bddaf856817ea359771e887f;hb=c8ab87f16b30bbc86d6beedb73e512f8ec4d7d1b;hpb=fcc535236fe6178d68007ece7793746320549b61

diff --git a/lfs/GeoIP b/lfs/GeoIP
index fe30b43015..882d1a078d 100644
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2014  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        #
@@ -25,6 +25,7 @@
 include Config
 
 VER        = 1.17
+DATVER     = 15022015
 
 THISAPP    = Geo-IP-PurePerl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -36,13 +37,13 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) GeoIP.dat
+objects = $(DL_FILE) GeoIP.dat-$(DATVER).gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-GeoIP.dat = $(DL_FROM)/GeoIP.dat
+GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
 
 $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat_MD5 = 55aa4d51f7920241296f2fc215d9e559
+GeoIP.dat-$(DATVER).gz_MD5 = 508e3c10da15f2722774cf4014863976
 
 install : $(TARGET)
 
@@ -76,7 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && mkdir -p /usr/local/share/GeoIP && \
-		cp -f $(DIR_DL)/GeoIP.dat /usr/local/share/GeoIP/GeoIP.dat
+		zcat $(DIR_DL)/GeoIP.dat-$(DATVER).gz > /usr/local/share/GeoIP/GeoIP.dat
 	cd $(DIR_APP) && chmod 777 /srv/web/ipfire/html/images/flags
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)