The pacificnew file has been dropped by IANA. Adding the "factory" file makes sense to have a reasonable default in case the time zone is unknown, which, however, should not happen in case of IPFire 2.x - just trying to be consistent here.
Signed-off-by: Peter Müller peter.mueller@ipfire.org --- config/rootfiles/common/tzdata | 9 ++++++--- lfs/tzdata | 12 ++++++------ 2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/config/rootfiles/common/tzdata b/config/rootfiles/common/tzdata index f560ca5e6..7531cfb64 100644 --- a/config/rootfiles/common/tzdata +++ b/config/rootfiles/common/tzdata @@ -181,6 +181,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/America/North_Dakota/Beulah #usr/share/zoneinfo/America/North_Dakota/Center #usr/share/zoneinfo/America/North_Dakota/New_Salem +#usr/share/zoneinfo/America/Nuuk #usr/share/zoneinfo/America/Ojinaga #usr/share/zoneinfo/America/Panama #usr/share/zoneinfo/America/Pangnirtung @@ -503,6 +504,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/Europe/Zagreb #usr/share/zoneinfo/Europe/Zaporozhye #usr/share/zoneinfo/Europe/Zurich +#usr/share/zoneinfo/Factory #usr/share/zoneinfo/GB #usr/share/zoneinfo/GB-Eire #usr/share/zoneinfo/GMT @@ -606,7 +608,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/US/Michigan #usr/share/zoneinfo/US/Mountain #usr/share/zoneinfo/US/Pacific -#usr/share/zoneinfo/US/Pacific-New #usr/share/zoneinfo/US/Samoa #usr/share/zoneinfo/UTC #usr/share/zoneinfo/Universal @@ -796,6 +797,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/America/North_Dakota/Beulah #usr/share/zoneinfo/posix/America/North_Dakota/Center #usr/share/zoneinfo/posix/America/North_Dakota/New_Salem +#usr/share/zoneinfo/posix/America/Nuuk #usr/share/zoneinfo/posix/America/Ojinaga #usr/share/zoneinfo/posix/America/Panama #usr/share/zoneinfo/posix/America/Pangnirtung @@ -1118,6 +1120,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Europe/Zagreb #usr/share/zoneinfo/posix/Europe/Zaporozhye #usr/share/zoneinfo/posix/Europe/Zurich +#usr/share/zoneinfo/posix/Factory #usr/share/zoneinfo/posix/GB #usr/share/zoneinfo/posix/GB-Eire #usr/share/zoneinfo/posix/GMT @@ -1221,7 +1224,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/US/Michigan #usr/share/zoneinfo/posix/US/Mountain #usr/share/zoneinfo/posix/US/Pacific -#usr/share/zoneinfo/posix/US/Pacific-New #usr/share/zoneinfo/posix/US/Samoa #usr/share/zoneinfo/posix/UTC #usr/share/zoneinfo/posix/Universal @@ -1411,6 +1413,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/America/North_Dakota/Beulah #usr/share/zoneinfo/right/America/North_Dakota/Center #usr/share/zoneinfo/right/America/North_Dakota/New_Salem +#usr/share/zoneinfo/right/America/Nuuk #usr/share/zoneinfo/right/America/Ojinaga #usr/share/zoneinfo/right/America/Panama #usr/share/zoneinfo/right/America/Pangnirtung @@ -1733,6 +1736,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Europe/Zagreb #usr/share/zoneinfo/right/Europe/Zaporozhye #usr/share/zoneinfo/right/Europe/Zurich +#usr/share/zoneinfo/right/Factory #usr/share/zoneinfo/right/GB #usr/share/zoneinfo/right/GB-Eire #usr/share/zoneinfo/right/GMT @@ -1836,7 +1840,6 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/US/Michigan #usr/share/zoneinfo/right/US/Mountain #usr/share/zoneinfo/right/US/Pacific -#usr/share/zoneinfo/right/US/Pacific-New #usr/share/zoneinfo/right/US/Samoa #usr/share/zoneinfo/right/UTC #usr/share/zoneinfo/right/Universal diff --git a/lfs/tzdata b/lfs/tzdata index a65136b6d..50457dbe9 100644 --- a/lfs/tzdata +++ b/lfs/tzdata @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 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,7 +24,7 @@
include Config
-VER = 2019c +VER = 2020d TZDATA_VER = $(VER) TZCODE_VER = $(VER)
@@ -33,8 +33,8 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
-FILES = africa antarctica asia australasia europe \ - northamerica southamerica pacificnew etcetera backward +FILES = africa antarctica asia australasia backward etcetera europe \ + factory northamerica southamerica
############################################################################### # Top-level Rules @@ -45,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz
-tzdata$(TZDATA_VER).tar.gz_MD5 = f6987e6dfdb2eb83a1b5076a50b80894 -tzcode$(TZCODE_VER).tar.gz_MD5 = 195a17454c5db05cab96595380650391 +tzdata$(TZDATA_VER).tar.gz_MD5 = 2f58d72e31cf073f5076c2cbf182cba3 +tzcode$(TZCODE_VER).tar.gz_MD5 = b4c46a69e5894aac713e8365a9be9411
install : $(TARGET)
-
Peter Müller