X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ftzdata;h=7d13c9596993651bd1df62fe8db91e9016eb9dad;hp=3b0198f0c271bddd5d83b664e2cbef32eb3eaaf7;hb=8b48e20bb3ecf9f4c56d040f9e91fccb5e859313;hpb=ff1580d89dbe3916fdcd8523d33eb422b2907341

diff --git a/lfs/tzdata b/lfs/tzdata
index 3b0198f0c2..7d13c95969 100644
--- a/lfs/tzdata
+++ b/lfs/tzdata
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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,29 +24,29 @@
 
 include Config
 
-TZDATA_VER = 2011j
-TZCODE_VER = 2011i
+VER        = 2014j
+TZDATA_VER = $(VER)
+TZCODE_VER = $(VER)
 
-THISAPP    = tzdata
-DL_FILE    = tzdata-base-0.tar.bz2
+THISAPP    = tzdata-$(VER)
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = armv5tel
+
+FILES      = africa antarctica asia australasia europe \
+	northamerica southamerica pacificnew etcetera backward
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz
+objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz
 
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz
 tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz
 
-$(DL_FILE)_MD5 = e36d2f742c22f8c8dbf0686ac9769b55
-tzdata$(TZDATA_VER).tar.gz_MD5 = 30a6bebdbdd03c5bd29241c15f569d50
-tzcode$(TZCODE_VER).tar.gz_MD5 = cf7f4335b7c8682899fa2814e711c1b2
+tzdata$(TZDATA_VER).tar.gz_MD5 = 2d7ea9c309f0d4e162e426e568290ca3
+tzcode$(TZCODE_VER).tar.gz_MD5 = 970119e9765bc5a9320368851c91ecb6
 
 install : $(TARGET)
 
@@ -75,19 +75,27 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && mkdir -pv $(DIR_APP)
 	mkdir -pv $(DIR_APP)/tzdata$(TZDATA_VER) $(DIR_APP)/tzcode$(TZCODE_VER)
-	tar axf $(DIR_DL)/tzdata$(TZDATA_VER).tar.gz -C $(DIR_APP)/tzdata$(TZDATA_VER)
-	tar axf $(DIR_DL)/tzcode$(TZCODE_VER).tar.gz -C $(DIR_APP)/tzcode$(TZCODE_VER)
-
-	cd $(DIR_APP) && sed -e 's|@objpfx@|$(DIR_APP)/obj/|' \
-		-e 's|@datadir@|/usr/share|' \
-		Makeconfig.in > Makeconfig
-	cd $(DIR_APP) && make $(MAKETUNING)
-
-	cd $(DIR_APP) && sed -i 's|@install_root@||' Makeconfig
-	cd $(DIR_APP) && make install
+	tar axf $(DIR_DL)/tzdata$(TZDATA_VER).tar.gz -C $(DIR_APP)
+	tar axf $(DIR_DL)/tzcode$(TZCODE_VER).tar.gz -C $(DIR_APP)
+
+	cd $(DIR_APP) && mkdir -pv zoneinfo/{,posix,right}
+	cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo \
+		-L /dev/null -p GMT $(FILES)
+	cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo/posix \
+		-L /dev/null $(FILES)
+	cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo/right \
+		-L /dev/null $(FILES)
+
+	rm -rf /usr/share/zoneinfo
+	cd $(DIR_APP) && cp -prd zoneinfo /usr/share
+	cd $(DIR_APP) && install -p -m 644 zone.tab iso3166.tab \
+		/usr/share/zoneinfo
+
+	rm -vf /usr/share/zoneinfo/localtime
+	rm -vf /etc/localtime
+	cp -vf /usr/share/zoneinfo/GMT /etc/localtime
 
-	cp -f /usr/share/zoneinfo/GMT /etc/localtime
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)