X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2FGeoIP;h=295598c45591568ae418f3a7fd819e030dabbcf7;hp=7ab828cdd310e72cceec6fcaa0f1d17f7c615a62;hb=ad5338015f68bca7bb5987c7e44218fe21377dad;hpb=90350ff3f3d03b9f6889013a3c8de993cb984789

diff --git a/lfs/GeoIP b/lfs/GeoIP
index 7ab828cdd..295598c45 100644
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -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-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        #
-# 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/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -27,6 +25,7 @@
 include Config
 
 VER        = 1.17
+DATVER     = 02072013
 
 THISAPP    = Geo-IP-PurePerl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -38,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 = 757ef6d020a81dae0db2926c48f4a931
+GeoIP.dat-$(DATVER).gz_MD5 = 25d59395b43d676fcbab05e7610a7b58
 
 install : $(TARGET)
 
@@ -54,9 +53,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-#dist: 
-#	make-packages.sh GeoIP $(THISAPP)-ipfire-beta-1
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -78,9 +74,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && perl Makefile.PL
-	cd $(DIR_APP) && make
+	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
-	cd $(DIR_APP) && chmod 777 /home/httpd/html/images/flags
+	cd $(DIR_APP) && mkdir -p /usr/local/share/GeoIP && \
+		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)