From patchwork Tue Nov 3 11:26:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 3628 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4CQSD84SkPz3why for ; Tue, 3 Nov 2020 11:26:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4CQSD72qL1zj7; Tue, 3 Nov 2020 11:26:47 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4CQSD71rk4z2yXQ; Tue, 3 Nov 2020 11:26:47 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4CQSD62wS4z2xl3 for ; Tue, 3 Nov 2020 11:26:46 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4CQSD519ywzTf for ; Tue, 3 Nov 2020 11:26:44 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1604402806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t3z9e6ntPrSVW6KPan3Ob+zNfKtZ9FAonE/UDHdQliU=; b=5Nuxp2RkvxxEUXQuUv3g6O7uI33SvZSnBT1VswA756f8yNNPyg0UvP6VWcEtX+iy4+FF5S n+MmzUO6C5pGc+Cw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1604402806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t3z9e6ntPrSVW6KPan3Ob+zNfKtZ9FAonE/UDHdQliU=; b=po+hiB4ktKQEL72OI+TUGEzjqSK0uGR4yDok9PkrR4w/HfEdMb9nNZhxPRkvJhXlxvWbHn Tcxie5k4ge2G6IQ2fvz5R61PCdWNoA71e+R2YTgLVv8B3dnKOPsEQK/GUX1FVv4suXeUWP zdrPrZ0WkclgJ6t9bbe3W/EcovZ2P1l1kKix5v0BfA7WR07x9FO7oKsvzBwpAH6/hGPO1D qTj35ewl1V9+0qXgwIFgN62tipDuE8amau8JydiE4zNOuPHXYVOTVIppdRqGLACq7O+c+Z 613lWukcKvjV0eMq/3sVceqldEOL8P29y6ReVyac7jgDM1yoKGKbkC6lk8mJGw== To: "IPFire: Development-List" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] tzdata: update to 2020d Message-ID: <3186249e-43a4-edb9-7191-52a49b371757@ipfire.org> Date: Tue, 3 Nov 2020 12:26:42 +0100 MIME-Version: 1.0 Content-Language: en-US X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- 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 # +# Copyright (C) 2007-2020 IPFire Team # # # # 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)