From ccac1a0b71c156d410e377511af3c21d537d1d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nagy=20K=C3=A1roly=20G=C3=A1briel?= Date: Mon, 9 Nov 2020 16:02:17 +0200 Subject: [PATCH] tzdata: Updated (2017b -> 2020d) We need to consider the modofication of the conf file most probably if we build tzdata with the new tzdata the modifiaction of the conf file is not needed anymore CHECK!!! --- base/tzdata/no-update-localtime.patch | 20 ++++++++++---------- base/tzdata/tzdata.conf | 4 ++-- base/tzdata/tzdata.desc | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/base/tzdata/no-update-localtime.patch b/base/tzdata/no-update-localtime.patch index 38e11e9e9..0f15c14a1 100644 --- a/base/tzdata/no-update-localtime.patch +++ b/base/tzdata/no-update-localtime.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../tzdata/no-update-localtime.patch -# Copyright (C) 2015 The OpenSDE Project +# Copyright (C) 2015 - 2020 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -18,13 +18,13 @@ don't touch /etc/localtime --- ./Makefile.orig 2016-05-10 13:30:29.795286175 +0300 +++ ./Makefile 2016-05-10 13:41:17.395286175 +0300 -@@ -394,7 +394,7 @@ - $(DESTDIR)$(LIBDIR) \ - $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ - $(DESTDIR)$(MANDIR)/man8 -- $(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES) -+ $(ZIC_INSTALL) -p $(POSIXRULES) - cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. - cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. - cp libtz.a $(DESTDIR)$(LIBDIR)/. +@@ -564,7 +564,7 @@ + '$(DESTDIR)$(LIBDIR)' \ + '$(DESTDIR)$(MANDIR)/man3' '$(DESTDIR)$(MANDIR)/man5' \ + '$(DESTDIR)$(MANDIR)/man8' +- $(ZIC_INSTALL) -l $(LOCALTIME) \ ++ $(ZIC_INSTALL) \ + `case '$(POSIXRULES)' in ?*) echo '-p';; esac \ + ` $(POSIXRULES) \ + -t '$(DESTDIR)$(TZDEFAULT)' diff --git a/base/tzdata/tzdata.conf b/base/tzdata/tzdata.conf index bcc818ff2..f19bc5b77 100644 --- a/base/tzdata/tzdata.conf +++ b/base/tzdata/tzdata.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../tzdata/tzdata.conf -# Copyright (C) 2008 - 2013 The OpenSDE Project +# Copyright (C) 2008 - 2020 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -31,7 +31,7 @@ tzdata_extract() { # they add some options when setting CC in the Makefile, we have to override $(cc) makeopt="cc=$CC CFLAGS="-std=gnu99" AWK=$AWK RANLIB=$RANLIB" # use `zic` from the PATH, instead of the just compiled one -var_append makeopt ' ' 'zic=zic' +#var_append makeopt ' ' 'zic=zic' var_append makeopt ' ' "TOPDIR=/$prefix" var_append makeopt ' ' "ETCDIR=$sbindir" # no, this is not a typo diff --git a/base/tzdata/tzdata.desc b/base/tzdata/tzdata.desc index b6053ef2e..50878310b 100644 --- a/base/tzdata/tzdata.desc +++ b/base/tzdata/tzdata.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../tzdata/tzdata.desc -[COPY] Copyright (C) 2008 - 2017 The OpenSDE Project +[COPY] Copyright (C) 2008 - 2020 The OpenSDE Project [COPY] [COPY] More information can be found in the files COPYING and README. [COPY] @@ -29,10 +29,10 @@ [L] PublicDomain [S] Stable -[V] 2017b +[V] 2020d [P] X -1---5---9 120.000 [CV-URL] http://www.iana.org/time-zones -[D] 3490653150 tzcode2017b.tar.gz http://www.iana.org/time-zones/repository/releases/ -[D] 3941765786 tzdata2017b.tar.gz http://www.iana.org/time-zones/repository/releases/ +[D] 1354026632 tzcode2020d.tar.gz http://www.iana.org/time-zones/repository/releases/ +[D] 1003229140 tzdata2020d.tar.gz http://www.iana.org/time-zones/repository/releases/