summaryrefslogtreecommitdiffstats
path: root/source/a/glibc-zoneinfo
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/glibc-zoneinfo')
-rw-r--r--source/a/glibc-zoneinfo/doinst.sh56
-rwxr-xr-xsource/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild55
-rw-r--r--source/a/glibc-zoneinfo/slack-desc10
-rw-r--r--source/a/glibc-zoneinfo/timezone-scripts/parts/0014
-rw-r--r--source/a/glibc-zoneinfo/timezone-scripts/parts/042
-rw-r--r--source/a/glibc-zoneinfo/timezone-scripts/timeconfig40
6 files changed, 124 insertions, 53 deletions
diff --git a/source/a/glibc-zoneinfo/doinst.sh b/source/a/glibc-zoneinfo/doinst.sh
index 816e86e0e..3c86f65e4 100644
--- a/source/a/glibc-zoneinfo/doinst.sh
+++ b/source/a/glibc-zoneinfo/doinst.sh
@@ -1,15 +1,57 @@
-# Fix existing old style /etc/localtime symlink:
-if [ -L etc/localtime -a ! -r etc/localtime-copied-from ]; then
- mv etc/localtime etc/localtime-copied-from
+# In order to properly handle time before /usr is mounted (in
+# the event that /usr is a separate partition, which for a number
+# of reasons isn't really a great idea), the /etc/localtime file
+# should be a copy of the desired zoneinfo file and not a symlink
+# to a file in /usr/share/zoneinfo. But if we find a symlink here
+# we should defer to the admin's wishes and leave it alone.
+#
+# Note that setting the timezone with timeconfig will wipe both
+# /etc/localtime and /etc/localtime-copied from.
+# /etc/localtime-copied-from will be a symlink to a file under
+# /usr/share/zoneinfo, and /etc/localtime will be a copy of that file.
+
+# In a special case, we will handle the removal of the US/Pacific-New
+# timezone. A bit of background information on this:
+#
+# "US/Pacific-New' stands for 'Pacific Presidential Election Time',
+# which was passed by the House in April 1989 but never signed into law.
+# In presidential election years, this rule would have delayed the
+# PDT-to-PST switchover until after the election, to lessen the effect
+# of broadcast news election projections on last-minute west-coast
+# voters. "
+#
+# In nearly all cases, a machine that uses the US/Pacific-New timezone
+# has chosen it by mistake. In 2016, having this as the system timezone
+# actually led to clock errors, and after that it was decided that the
+# timezone (only of historical interest anyway) should be removed from
+# the timezone database.
+#
+# If we see that the machine's localtime-copied-from symlink is pointing
+# to US/Pacific-New, change it to point to US/Pacific instead.
+if [ "$(/bin/ls -l etc/localtime-copied-from | rev | cut -f 1,2 -d / | rev)" = "US/Pacific-New" ]; then
+ ( cd etc ; rm -rf localtime-copied-from )
+ ( cd etc ; ln -sf /usr/share/zoneinfo/US/Pacific localtime-copied-from )
fi
+
+# If we have no /etc/localtime, but we do have a localtime-copied-from
+# symlink to locate what we would want there, then add a copy now:
+if [ ! -r etc/localtime -a -L etc/localtime-copied-from ]; then
+ chroot . /bin/cp etc/localtime-copied-from etc/localtime
+fi
+
# Add the default timezone in /etc, if none exists:
-if [ ! -r etc/localtime ]; then
+if [ ! -r etc/localtime -a ! -L etc/localtime-copied-from ]; then
( cd etc ; rm -rf localtime localtime-copied-from )
( cd etc ; ln -sf /usr/share/zoneinfo/Factory localtime-copied-from )
fi
-# Make sure /etc/localtime is updated:
-chroot . /bin/cp etc/localtime-copied-from etc/localtime
-# Add the default link in /usr/share/zoneinfo:
+
+# Make sure /etc/localtime is updated, unless it is a symlink (in which
+# case leave it alone):
+if [ ! -L etc/localtime ]; then
+ chroot . /bin/cp etc/localtime-copied-from etc/localtime
+fi
+
+# Add a link to the timeconfig script in /usr/share/zoneinfo:
( cd usr/share/zoneinfo ; rm -rf timeconfig )
( cd usr/share/zoneinfo ; ln -sf /usr/sbin/timeconfig timeconfig )
### Make the rest of the symbolic links in the zoneinfo database:
diff --git a/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild b/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild
index 6aff64595..fc83ee608 100755
--- a/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild
+++ b/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2015, 2016 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2015, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,11 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=glibc-zoneinfo
ZONE_VERSIONS="$(echo tzdata* | cut -f1 -d . | cut -b7-11)"
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -36,35 +37,42 @@ if [ -z "$ARCH" ]; then
export ARCH
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$ZONE_VERSIONS-noarch-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:-" -j7 "}
if [ "$ARCH" = "i386" ]; then
- SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+ SLKCFLAGS="-DHAVE_SNPRINTF=1 -O2 -march=i386 -mcpu=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ SLKCFLAGS="-DHAVE_SNPRINTF=1 -O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ SLKCFLAGS="-DHAVE_SNPRINTF=1 -O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686"
+ SLKCFLAGS="-DHAVE_SNPRINTF=1 -O2 -march=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2"
+ SLKCFLAGS="-DHAVE_SNPRINTF=1 -O2"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
+ SLKCFLAGS="-DHAVE_SNPRINTF=1 -O2 -fPIC"
LIBDIRSUFFIX="64"
elif [ "$ARCH" = "armv7hl" ]; then
- SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+ SLKCFLAGS="-DHAVE_SNPRINTF=1 -O3 -march=armv7-a -mfpu=vfpv3-d16"
LIBDIRSUFFIX=""
else
- SLKCFLAGS="-O2"
+ SLKCFLAGS="-DHAVE_SNPRINTF=1 -O2"
LIBDIRSUFFIX=""
fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -76,8 +84,8 @@ cd $TMP
rm -rf tzcodedata-build
mkdir tzcodedata-build
cd tzcodedata-build
-tar xzf $CWD/tzdata?????.tar.gz
-tar xzf $CWD/tzcode?????.tar.gz
+tar xzf $CWD/tzdata?????.tar.gz || exit 1
+tar xzf $CWD/tzcode?????.tar.gz || exit 1
chown -R root:root .
find . \
@@ -88,19 +96,25 @@ find . \
sed -i "s,/usr/local,$(pwd),g" Makefile
sed -i "s,/etc/zoneinfo,/zoneinfo,g" Makefile
-make
-make install
-mkdir -p $PKG/usr/share/zoneinfo
-cd etc
-cp -a zoneinfo/* $PKG/usr/share/zoneinfo
+sed -i "s,^CFLAGS=,CFLAGS= $SLKCFLAGS,g" Makefile
+make || exit 1
+make install DESTDIR=$PKG/stage || exit 1
+
+# Install the primary zone files:
+mkdir -p $PKG/usr/share
+mv $PKG/stage/usr/share/zoneinfo $PKG/usr/share
# These are all identical to the normal zoneinfo files, so let's hard link
# them to save space:
cp -al $PKG/usr/share/zoneinfo $PKG/usr/share/posix
mv $PKG/usr/share/posix $PKG/usr/share/zoneinfo
+# Install the "right" files:
mkdir -p $PKG/usr/share/zoneinfo/right
-cp -a zoneinfo-leaps/* $PKG/usr/share/zoneinfo/right
+cp -a $PKG/stage/usr/share/zoneinfo-leaps/* $PKG/usr/share/zoneinfo/right
+
+# Clean up staged file residue:
+rm -rf $PKG/stage
# Remove $PKG/usr/share/zoneinfo/localtime -- the install script will
# create it as a link to /etc/localtime.
@@ -127,7 +141,6 @@ if [ ! -r $PKG/usr/share/zoneinfo/localtime ]; then
( cd $PKG/usr/share/zoneinfo ; ln -sf /etc/localtime . )
fi
-cd ..
mkdir -p $PKG/usr/doc/glibc-zoneinfo-$ZONE_VERSIONS
cp -a \
CONTRIBUTING NEWS README Theory \
diff --git a/source/a/glibc-zoneinfo/slack-desc b/source/a/glibc-zoneinfo/slack-desc
index 69420f78d..d1b8173bf 100644
--- a/source/a/glibc-zoneinfo/slack-desc
+++ b/source/a/glibc-zoneinfo/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
# leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
@@ -11,8 +11,8 @@ glibc-zoneinfo:
glibc-zoneinfo: This package allows you to configure your time zone.
glibc-zoneinfo:
glibc-zoneinfo: This timezone database comes from the tzdata and tzcode packages by
-glibc-zoneinfo: Arthur David Olson et.al. The latest version and more information
-glibc-zoneinfo: may be found at: http://www.iana.org/time-zones
+glibc-zoneinfo: Arthur David Olson et.al. The latest version and more information
+glibc-zoneinfo: may be found at: http://www.iana.org/time-zones
glibc-zoneinfo:
glibc-zoneinfo: Use the timeconfig utility to set your local time zone.
glibc-zoneinfo:
diff --git a/source/a/glibc-zoneinfo/timezone-scripts/parts/00 b/source/a/glibc-zoneinfo/timezone-scripts/parts/00
index 678094e16..d904a334e 100644
--- a/source/a/glibc-zoneinfo/timezone-scripts/parts/00
+++ b/source/a/glibc-zoneinfo/timezone-scripts/parts/00
@@ -16,10 +16,10 @@
# 2006-08-13: Updated timezones from tzdata2006g.
# 2006-03-13: Updated timezones from tzdata2006c.
# 19-Feb-2001 Add new timezones from glibc-2.2.2.
-# 06-Oct-2000 Fixed a problem with selecting UTC time. It was writing
+# 06-Oct-2000 Fixed a problem with selecting UTC time. It was writing
# the hardwareclock file to the root disk and not your dest
# partition. Changed the HWCLOCK_CONF variable to be
-# $T_PX/etc/hardwareclock to fix this. Thanks to David L.
+# $T_PX/etc/hardwareclock to fix this. Thanks to David L.
# Dickman <softbear@optonline.net> for finding this and
# submitting a patch.
#
@@ -27,7 +27,7 @@
# /etc/hardwareclock file which tells what the hardware clock
# is set to (UTC or localtime).
#
-# 03-Mar-2000 Reorganized script. Made one timezone set block, added
+# 03-Mar-2000 Reorganized script. Made one timezone set block, added
# stage that asks the user if the hardware clock is set to
# UTC.
@@ -85,9 +85,9 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
### use color menus here
###
dialog --title "HARDWARE CLOCK SET TO UTC?" --menu "Is the hardware clock set \
-to Coordinated Universal Time (UTC/GMT)? If it is, select YES here. If the \
+to Coordinated Universal Time (UTC/GMT)? If it is, select YES here. If the \
hardware clock is set to the current local time (this is how most PCs are set \
-up), then say NO here. If you are not sure what this is, you should answer NO \
+up), then say NO here. If you are not sure what this is, you should answer NO \
here." 13 60 2 \
"NO" "Hardware clock is set to local time" \
"YES" "Hardware clock is set to UTC" \
@@ -108,9 +108,9 @@ else
### use text prompts
###
echo "Is the hardware clock set to Coordinated Universal Time (UTC/GMT)?"
- echo "If it is, select 'y' here. If the hardware clock is set to the"
+ echo "If it is, select 'y' here. If the hardware clock is set to the"
echo "current local time (this is how most PCs are set up), then say 'n'"
- echo "here. If you are not sure what this is, you should answer 'n' here."
+ echo "here. If you are not sure what this is, you should answer 'n' here."
echo
echo -n "Is your hardware clock set to UTC ([y]es, [n]o)? "
read HEJAZ
diff --git a/source/a/glibc-zoneinfo/timezone-scripts/parts/04 b/source/a/glibc-zoneinfo/timezone-scripts/parts/04
index 5b0da0e83..f30e64c12 100644
--- a/source/a/glibc-zoneinfo/timezone-scripts/parts/04
+++ b/source/a/glibc-zoneinfo/timezone-scripts/parts/04
@@ -1,5 +1,5 @@
-Type it at the prompt below exactly as it appears above. (NOTE: If you don't
+Type it at the prompt below exactly as it appears above. (NOTE: If you don't
see your timezone, use "timeconfig" again after booting for the verbose list)
EOF
diff --git a/source/a/glibc-zoneinfo/timezone-scripts/timeconfig b/source/a/glibc-zoneinfo/timezone-scripts/timeconfig
index 0fa59ac02..5e9b1e906 100644
--- a/source/a/glibc-zoneinfo/timezone-scripts/timeconfig
+++ b/source/a/glibc-zoneinfo/timezone-scripts/timeconfig
@@ -16,10 +16,10 @@
# 2006-08-13: Updated timezones from tzdata2006g.
# 2006-03-13: Updated timezones from tzdata2006c.
# 19-Feb-2001 Add new timezones from glibc-2.2.2.
-# 06-Oct-2000 Fixed a problem with selecting UTC time. It was writing
+# 06-Oct-2000 Fixed a problem with selecting UTC time. It was writing
# the hardwareclock file to the root disk and not your dest
# partition. Changed the HWCLOCK_CONF variable to be
-# $T_PX/etc/hardwareclock to fix this. Thanks to David L.
+# $T_PX/etc/hardwareclock to fix this. Thanks to David L.
# Dickman <softbear@optonline.net> for finding this and
# submitting a patch.
#
@@ -27,7 +27,7 @@
# /etc/hardwareclock file which tells what the hardware clock
# is set to (UTC or localtime).
#
-# 03-Mar-2000 Reorganized script. Made one timezone set block, added
+# 03-Mar-2000 Reorganized script. Made one timezone set block, added
# stage that asks the user if the hardware clock is set to
# UTC.
@@ -85,9 +85,9 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
### use color menus here
###
dialog --title "HARDWARE CLOCK SET TO UTC?" --menu "Is the hardware clock set \
-to Coordinated Universal Time (UTC/GMT)? If it is, select YES here. If the \
+to Coordinated Universal Time (UTC/GMT)? If it is, select YES here. If the \
hardware clock is set to the current local time (this is how most PCs are set \
-up), then say NO here. If you are not sure what this is, you should answer NO \
+up), then say NO here. If you are not sure what this is, you should answer NO \
here." 13 60 2 \
"NO" "Hardware clock is set to local time" \
"YES" "Hardware clock is set to UTC" \
@@ -108,9 +108,9 @@ else
### use text prompts
###
echo "Is the hardware clock set to Coordinated Universal Time (UTC/GMT)?"
- echo "If it is, select 'y' here. If the hardware clock is set to the"
+ echo "If it is, select 'y' here. If the hardware clock is set to the"
echo "current local time (this is how most PCs are set up), then say 'n'"
- echo "here. If you are not sure what this is, you should answer 'n' here."
+ echo "here. If you are not sure what this is, you should answer 'n' here."
echo
echo -n "Is your hardware clock set to UTC ([y]es, [n]o)? "
read HEJAZ
@@ -141,7 +141,6 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
"US/Michigan" " " \
"US/Mountain" " " \
"US/Pacific" " " \
-"US/Pacific-New" " " \
"US/Samoa" " " \
"Africa/Abidjan" " " \
"Africa/Accra" " " \
@@ -328,6 +327,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
"America/Porto_Acre" " " \
"America/Porto_Velho" " " \
"America/Puerto_Rico" " " \
+"America/Punta_Arenas" " " \
"America/Rainy_River" " " \
"America/Rankin_Inlet" " " \
"America/Recife" " " \
@@ -383,10 +383,12 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
"Asia/Aqtobe" " " \
"Asia/Ashgabat" " " \
"Asia/Ashkhabad" " " \
+"Asia/Atyrau" " " \
"Asia/Baghdad" " " \
"Asia/Bahrain" " " \
"Asia/Baku" " " \
"Asia/Bangkok" " " \
+"Asia/Barnaul" " " \
"Asia/Beirut" " " \
"Asia/Bishkek" " " \
"Asia/Brunei" " " \
@@ -402,6 +404,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
"Asia/Dili" " " \
"Asia/Dubai" " " \
"Asia/Dushanbe" " " \
+"Asia/Famagusta" " " \
"Asia/Gaza" " " \
"Asia/Harbin" " " \
"Asia/Hebron" " " \
@@ -458,6 +461,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
"Asia/Thimbu" " " \
"Asia/Thimphu" " " \
"Asia/Tokyo" " " \
+"Asia/Tomsk" " " \
"Asia/Ujung_Pandang" " " \
"Asia/Ulaanbaatar" " " \
"Asia/Ulan_Bator" " " \
@@ -466,6 +470,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
"Asia/Vientiane" " " \
"Asia/Vladivostok" " " \
"Asia/Yakutsk" " " \
+"Asia/Yangon" " " \
"Asia/Yekaterinburg" " " \
"Asia/Yerevan" " " \
"Atlantic/Azores" " " \
@@ -511,7 +516,6 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
"CST6CDT" " " \
"Canada/Atlantic" " " \
"Canada/Central" " " \
-"Canada/East-Saskatchewan" " " \
"Canada/Eastern" " " \
"Canada/Mountain" " " \
"Canada/Newfoundland" " " \
@@ -563,6 +567,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
"Etc/Zulu" " " \
"Europe/Amsterdam" " " \
"Europe/Andorra" " " \
+"Europe/Astrakhan" " " \
"Europe/Athens" " " \
"Europe/Belfast" " " \
"Europe/Belgrade" " " \
@@ -583,6 +588,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
"Europe/Jersey" " " \
"Europe/Kaliningrad" " " \
"Europe/Kiev" " " \
+"Europe/Kirov" " " \
"Europe/Lisbon" " " \
"Europe/Ljubljana" " " \
"Europe/London" " " \
@@ -603,6 +609,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
"Europe/Samara" " " \
"Europe/San_Marino" " " \
"Europe/Sarajevo" " " \
+"Europe/Saratov" " " \
"Europe/Simferopol" " " \
"Europe/Skopje" " " \
"Europe/Sofia" " " \
@@ -610,6 +617,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then
"Europe/Tallinn" " " \
"Europe/Tirane" " " \
"Europe/Tiraspol" " " \
+"Europe/Ulyanovsk" " " \
"Europe/Uzhgorod" " " \
"Europe/Vaduz" " " \
"Europe/Vatican" " " \
@@ -754,7 +762,6 @@ US/Indiana-Starke
US/Michigan
US/Mountain
US/Pacific
-US/Pacific-New
US/Samoa
Africa/Abidjan
Africa/Accra
@@ -941,6 +948,7 @@ America/Port_of_Spain
America/Porto_Acre
America/Porto_Velho
America/Puerto_Rico
+America/Punta_Arenas
America/Rainy_River
America/Rankin_Inlet
America/Recife
@@ -996,10 +1004,12 @@ Asia/Aqtau
Asia/Aqtobe
Asia/Ashgabat
Asia/Ashkhabad
+Asia/Atyrau
Asia/Baghdad
Asia/Bahrain
Asia/Baku
Asia/Bangkok
+Asia/Barnaul
Asia/Beirut
Asia/Bishkek
Asia/Brunei
@@ -1015,6 +1025,7 @@ Asia/Dhaka
Asia/Dili
Asia/Dubai
Asia/Dushanbe
+Asia/Famagusta
Asia/Gaza
Asia/Harbin
Asia/Hebron
@@ -1071,6 +1082,7 @@ Asia/Tel_Aviv
Asia/Thimbu
Asia/Thimphu
Asia/Tokyo
+Asia/Tomsk
Asia/Ujung_Pandang
Asia/Ulaanbaatar
Asia/Ulan_Bator
@@ -1079,6 +1091,7 @@ Asia/Ust-Nera
Asia/Vientiane
Asia/Vladivostok
Asia/Yakutsk
+Asia/Yangon
Asia/Yekaterinburg
Asia/Yerevan
Atlantic/Azores
@@ -1124,7 +1137,6 @@ CET
CST6CDT
Canada/Atlantic
Canada/Central
-Canada/East-Saskatchewan
Canada/Eastern
Canada/Mountain
Canada/Newfoundland
@@ -1176,6 +1188,7 @@ Etc/Universal
Etc/Zulu
Europe/Amsterdam
Europe/Andorra
+Europe/Astrakhan
Europe/Athens
Europe/Belfast
Europe/Belgrade
@@ -1196,6 +1209,7 @@ Europe/Istanbul
Europe/Jersey
Europe/Kaliningrad
Europe/Kiev
+Europe/Kirov
Europe/Lisbon
Europe/Ljubljana
Europe/London
@@ -1216,6 +1230,7 @@ Europe/Rome
Europe/Samara
Europe/San_Marino
Europe/Sarajevo
+Europe/Saratov
Europe/Simferopol
Europe/Skopje
Europe/Sofia
@@ -1223,6 +1238,7 @@ Europe/Stockholm
Europe/Tallinn
Europe/Tirane
Europe/Tiraspol
+Europe/Ulyanovsk
Europe/Uzhgorod
Europe/Vaduz
Europe/Vatican
@@ -1329,7 +1345,7 @@ WET
Zulu
posixrules
-Type it at the prompt below exactly as it appears above. (NOTE: If you don't
+Type it at the prompt below exactly as it appears above. (NOTE: If you don't
see your timezone, use "timeconfig" again after booting for the verbose list)
EOF