From 14a3f255b1bbbd75b35e47a941501a17920d4c8e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Mar 2018 11:39:20 +0100 Subject: [PATCH 1/8] tzdata: Strip trailing spaces --- tzdata-2014f-1.bee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tzdata-2014f-1.bee b/tzdata-2014f-1.bee index 2a773ddac..b0c3e4037 100755 --- a/tzdata-2014f-1.bee +++ b/tzdata-2014f-1.bee @@ -23,7 +23,7 @@ mee_build() { australasia \ backward \ pacificnew \ - systemv ; do + systemv ; do zic -L /dev/null \ -d zoneinfo \ -y "/bin/bash ${S}/yearistype.sh" \ @@ -42,7 +42,7 @@ mee_build() { mee_install() { mkdir -pv ${D}/${DATADIR} cp -vax zoneinfo ${D}/${DATADIR} - + mkdir -pv ${D}${SYSCONFDIR} cp ${D}${DATADIR}/zoneinfo/${MYTIMEZONE} ${D}${SYSCONFDIR}/localtime } From 7a950b06d04564ad33a4e82b08c6ff7fadbd64b3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Mar 2018 11:40:27 +0100 Subject: [PATCH 2/8] tzdata: Convert to versionless bee file --- tzdata-2014f-1.bee => tzdata.be0 | 2 ++ 1 file changed, 2 insertions(+) rename tzdata-2014f-1.bee => tzdata.be0 (97%) diff --git a/tzdata-2014f-1.bee b/tzdata.be0 similarity index 97% rename from tzdata-2014f-1.bee rename to tzdata.be0 index b0c3e4037..ebd95f75c 100755 --- a/tzdata-2014f-1.bee +++ b/tzdata.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION tzdata-2014f-1 + # homepage http://www.iana.org/time-zones/ SRCURL[0]="http://www.iana.org/time-zones/repository/releases/tzdata${PKGVERSION}.tar.gz" From 2cdaebc973f775c4d4d7c57a2d66507bd057c969 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Mar 2018 15:12:55 +0100 Subject: [PATCH 3/8] tzdata: Fix creation of directories Fix syntax typo. --- tzdata.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tzdata.be0 b/tzdata.be0 index ebd95f75c..31b8c6a20 100755 --- a/tzdata.be0 +++ b/tzdata.be0 @@ -14,7 +14,7 @@ BEE_EXTRACT_STRIP=0 build_in_sourcedir mee_build() { - mkdir -p zoneinfo/{posix/right} + mkdir -p zoneinfo/{posix,right} for tz in etcetera \ southamerica \ northamerica \ From d3cab57cc6d448c485b5a2ea2459f5002dfad1f7 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Mar 2018 11:42:06 +0100 Subject: [PATCH 4/8] tzdata: Update version from 2014f to 2018c --- tzdata.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tzdata.be0 b/tzdata.be0 index 31b8c6a20..4b74076c9 100755 --- a/tzdata.be0 +++ b/tzdata.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION tzdata-2014f-1 +# BEE_VERSION tzdata-2018c-0 # homepage http://www.iana.org/time-zones/ SRCURL[0]="http://www.iana.org/time-zones/repository/releases/tzdata${PKGVERSION}.tar.gz" From e679626ba7d881b197d769de7d85c293954b7139 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Mar 2018 11:48:26 +0100 Subject: [PATCH 5/8] tzdata: Securely download source archive Use HTTPS to securely download the source archive. --- tzdata.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tzdata.be0 b/tzdata.be0 index 4b74076c9..6cd794505 100755 --- a/tzdata.be0 +++ b/tzdata.be0 @@ -2,8 +2,8 @@ # BEE_VERSION tzdata-2018c-0 -# homepage http://www.iana.org/time-zones/ -SRCURL[0]="http://www.iana.org/time-zones/repository/releases/tzdata${PKGVERSION}.tar.gz" +# homepage https://www.iana.org/time-zones/ +SRCURL[0]="https://www.iana.org/time-zones/repository/releases/tzdata${PKGVERSION}.tar.gz" PATCHURL[0]="" From a02621a82b90e8f211768034feff89e577218d89 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Mar 2018 11:56:04 +0100 Subject: [PATCH 6/8] tzdata: Get `tzselect` to work ``` $ tzselect /usr/bin/tzselect: line 180: /usr/share/zoneinfo/iso3166.tab: No such file or directory /usr/bin/tzselect: time zone files are not set up correctly ``` So install all files as described in the Linux From Scratch chapter [1]. [1]: http://www.linuxfromscratch.org/lfs/downloads/8.2/LFS-BOOK-8.2-NOCHUNKS.html --- tzdata.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/tzdata.be0 b/tzdata.be0 index 6cd794505..4f5bb4a27 100755 --- a/tzdata.be0 +++ b/tzdata.be0 @@ -44,6 +44,7 @@ mee_build() { mee_install() { mkdir -pv ${D}/${DATADIR} cp -vax zoneinfo ${D}/${DATADIR} + cp -v zone.tab zone1970.tab iso3166.tab ${D}/${DATADIR}/zoneinfo mkdir -pv ${D}${SYSCONFDIR} cp ${D}${DATADIR}/zoneinfo/${MYTIMEZONE} ${D}${SYSCONFDIR}/localtime From 2235e467781e14e104dd804647a6dfc9b332018e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Mar 2018 11:56:43 +0100 Subject: [PATCH 7/8] tzdata: Make installation POSIX conformant From the Linux From Scratch book [1]: > This creates the posixrules file. We use New York because POSIX > requires the daylight savings time rules to be in accordance with US > rules. [1]: http://www.linuxfromscratch.org/lfs/downloads/8.2/LFS-BOOK-8.2-NOCHUNKS.html --- tzdata.be0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tzdata.be0 b/tzdata.be0 index 4f5bb4a27..d9d19ee8a 100755 --- a/tzdata.be0 +++ b/tzdata.be0 @@ -46,6 +46,8 @@ mee_install() { cp -vax zoneinfo ${D}/${DATADIR} cp -v zone.tab zone1970.tab iso3166.tab ${D}/${DATADIR}/zoneinfo + zic -d ${D}/${DATADIR}/zoneinfo -p America/New_York + mkdir -pv ${D}${SYSCONFDIR} cp ${D}${DATADIR}/zoneinfo/${MYTIMEZONE} ${D}${SYSCONFDIR}/localtime } From 74e63f0ecb4e6a504bb8fc111024065aa4ba8d30 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Mar 2018 12:03:04 +0100 Subject: [PATCH 8/8] tzdata: Make `/etc/localtime` a symbolic link systemd-timedated wants this to be a symbolic link, cf. man 5 localtime. > The /etc/localtime file configures the system-wide timezone of the > local system that is used by applications for presentation to the > user. It should be an absolute or relative symbolic link pointing to > /usr/share/zoneinfo/, followed by a timezone identifier such as > "Europe/Berlin" or "Etc/UTC". The resulting link should lead to the > corresponding binary tzfile(5) timezone data for the configured > timezone. > > Because the timezone identifier is extracted from the symlink target > name of /etc/localtime, this file may not be a normal file or > hardlink. --- tzdata.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tzdata.be0 b/tzdata.be0 index d9d19ee8a..d8d8e9757 100755 --- a/tzdata.be0 +++ b/tzdata.be0 @@ -49,5 +49,5 @@ mee_install() { zic -d ${D}/${DATADIR}/zoneinfo -p America/New_York mkdir -pv ${D}${SYSCONFDIR} - cp ${D}${DATADIR}/zoneinfo/${MYTIMEZONE} ${D}${SYSCONFDIR}/localtime + ln -s ${D}${DATADIR}/zoneinfo/${MYTIMEZONE} ${D}${SYSCONFDIR}/localtime }