From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Korsgaard Date: Thu, 29 Aug 2019 22:14:48 +0200 Subject: [Buildroot] [PATCH 1/2] package/tzdata: bump to version 2019b In-Reply-To: <20190828222851.11429-1-chrismcc@gmail.com> (Christopher McCrory's message of "Wed, 28 Aug 2019 15:28:51 -0700") References: <20190828222851.11429-1-chrismcc@gmail.com> Message-ID: <87ef13loef.fsf@dell.be.48ers.dk> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net >>>>> "Christopher" == Christopher McCrory writes: > Changed _SITE to https. > Add hash for license file. > Signed-off-by: Christopher McCrory > --- > package/tzdata/tzdata.hash | 6 ++++-- > package/tzdata/tzdata.mk | 5 +++-- > 2 files changed, 7 insertions(+), 4 deletions(-) > diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash > index 6a0ea17ce9..166d94ada2 100644 > --- a/package/tzdata/tzdata.hash > +++ b/package/tzdata/tzdata.hash > @@ -1,2 +1,4 @@ > -# From https://mm.icann.org/pipermail/tz-announce/2018-May/000050.html > -sha512 > d059fcd381b2f6ecdafcd68fdd2a00451d1bf9b1affeb164ae7cabca2e022d499e77f0706ec3f3091b8e84c2211aa66da6c90937108771f1bf070cfebc105cae > tzdata2018e.tar.gz > +# From https://mm.icann.org/pipermail/tz-announce/2019-July/000056.html > +sha512 c0104078d994e501d80a41bea31364b1390a75c2fbf42968a8343a090e2ac2eddbc58770ca470b192ea19dec89fcc634141a1de703ea2ffa0325176a64afe1fc tzdata2019b.tar.gz > +# Locally computed: > +sha512 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE This looks like a sha256sum rather than 512, and it indeed matches that. > diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk > index e20c946208..f8e6625e32 100644 > --- a/package/tzdata/tzdata.mk > +++ b/package/tzdata/tzdata.mk > @@ -4,13 +4,14 @@ > # > ################################################################################ > -TZDATA_VERSION = 2018e > +TZDATA_VERSION = 2019b > TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz > -TZDATA_SITE = http://www.iana.org/time-zones/repository/releases > +TZDATA_SITE = https://www.iana.org/time-zones/repository/releases > TZDATA_STRIP_COMPONENTS = 0 > TZDATA_DEPENDENCIES = host-tzdata > HOST_TZDATA_DEPENDENCIES = host-zic > TZDATA_LICENSE = Public domain > +TZDATA_LICENSE_FILES = LICENSE tzdata is a bit special as we explicitly do not extract the target version source code, so LICENSE will not be available: >>> tzdata 2019b Collecting legal info sha256sum: /home/peko/source/buildroot/output-test/build/tzdata-2019b/LICENSE: No such file or directory ERROR: LICENSE has wrong sha256 hash: ERROR: expected: 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf ERROR: got : ERROR: Incomplete download, or man-in-the-middle (MITM) attack So as a workaround I made it HOST_TZDATA_LICENSE_FILES so it only gets used for the host package and committed to next. -- Bye, Peter Korsgaard