Architecture specific change in rpms/java-1.8.0-openjdk-aarch32.git
by githook-noreply＠fedoraproject.org
The package rpms/java-1.8.0-openjdk-aarch32.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk-aarch32.git/co....
Change:
+%ifarch %{ssbd_arches}
Thanks.
Full change:
============
commit 2b9575bc375ba8d6b125dd36b8ba7f90333c826b
Author: Alex Kashchenko <akashche(a)redhat.com>
Date: Sun Feb 28 16:50:08 2021 -0500
8u282 update
diff --git a/.gitignore b/.gitignore
index 5901268..11e3daa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/tapsets-icedtea-3.15.0.tar.xz
/aarch32-port-jdk8u-jdk8u265-ga-aarch32-20200729.tar.xz
/aarch32-port-jdk8u-jdk8u275-ga-aarch32-20201109-4curve.tar.xz
+/aarch32-port-jdk8u-jdk8u282-ga-aarch32-20210125-4curve.tar.xz
diff --git a/java-1.8.0-openjdk-aarch32.spec b/java-1.8.0-openjdk-aarch32.spec
index a1a9edc..d8fa7dc 100644
--- a/java-1.8.0-openjdk-aarch32.spec
+++ b/java-1.8.0-openjdk-aarch32.spec
@@ -4,18 +4,20 @@
#
# Examples:
#
-# Produce release *and* slowdebug builds on x86_64 (default):
+# Produce release, fastdebug *and* slowdebug builds on x86_64 (default):
# $ rpmbuild -ba java-1.8.0-openjdk.spec
#
# Produce only release builds (no slowdebug builds) on x86_64:
-# $ rpmbuild -ba java-1.8.0-openjdk.spec --without slowdebug
+# $ rpmbuild -ba java-1.8.0-openjdk.spec --without slowdebug --without fastdebug
#
# Only produce a release build on x86_64:
-# $ fedpkg mockbuild --without slowdebug
+# $ fedpkg mockbuild --without slowdebug --without fastdebug
#
# Only produce a debug build on x86_64:
# $ fedpkg local --without release
#
+# Enable fastdebug builds by default on relevant arches.
+%bcond_without fastdebug
# Enable slowdebug builds by default on relevant arches.
%bcond_without slowdebug
# Enable release builds by default on relevant arches.
@@ -32,13 +34,16 @@
# See https://github.com/rpm-software-management/rpm/issues/127 to comments at "pmatilai commented on Aug 18, 2017"
# (initiated in https://bugzilla.redhat.com/show_bug.cgi?id=1482192)
%global debug_suffix_unquoted -slowdebug
+%global fastdebug_suffix_unquoted -fastdebug
# quoted one for shell operations
%global debug_suffix "%{debug_suffix_unquoted}"
+%global fastdebug_suffix "%{fastdebug_suffix_unquoted}"
%global normal_suffix ""
-# if you want only debug build but providing java build only normal build but set normalbuild_parameter
-%global debug_warning This package has full debug on. Install only in need and remove asap.
+%global debug_warning This package is unoptimised with full debugging. Install only as needed and remove ASAP.
%global debug_on with full debug on
+%global fastdebug_warning This package is optimised with full debugging. Install only as needed and remove ASAP.
+%global for_fastdebug with minimal debug on
%global for_debug for packages with debug on
%if %{with release}
@@ -48,9 +53,9 @@
%endif
%if %{include_normal_build}
-%global build_loop1 %{normal_suffix}
+%global normal_build %{normal_suffix}
%else
-%global build_loop1 %{nil}
+%global normal_build %{nil}
%endif
# We have hardcoded list of files, which is appearing in alternatives, and in files
@@ -59,14 +64,14 @@
# the ghosts are here to allow installation via query like `dnf install /usr/bin/java`
# you can list those files, with appropriate sections: cat *.spec | grep -e --install -e --slave -e post_
# TODO - fix those hardcoded lists via single list
-# those files ,must *NOT* be ghosted for *slowdebug* packages
-# FIXME - if you are moving jshell or jlink or simialr, always modify all three sections
+# Those files must *NOT* be ghosted for *slowdebug* packages
+# FIXME - if you are moving jshell or jlink or similar, always modify all three sections
# you can check via headless and devels:
# rpm -ql --noghost java-11-openjdk-headless-11.0.1.13-8.fc29.x86_64.rpm | grep bin
# == rpm -ql java-11-openjdk-headless-slowdebug-11.0.1.13-8.fc29.x86_64.rpm | grep bin
# != rpm -ql java-11-openjdk-headless-11.0.1.13-8.fc29.x86_64.rpm | grep bin
# similarly for other %%{_jvmdir}/{jre,java} and %%{_javadocdir}/{java,java-zip}
-%define is_release_build() %( if [ "%{?1}" == "%{debug_suffix_unquoted}" ]; then echo "0" ; else echo "1"; fi )
+%define is_release_build() %( if [ "%{?1}" == "%{debug_suffix_unquoted}" -o "%{?1}" == "%{fastdebug_suffix_unquoted}" ]; then echo "0" ; else echo "1"; fi )
# while JDK is a techpreview(is_system_jdk=0), some provides are turned off. Once jdk stops to be an techpreview, move it to 1
# as sytem JDK, we mean any JDK which can run whole system java stack without issues (like bytecode issues, module issues, dependencies...)
@@ -76,58 +81,78 @@
# we need to distinguish between big and little endian PPC64
%global ppc64le ppc64le
%global ppc64be ppc64 ppc64p7
+# Set of architectures which support multiple ABIs
%global multilib_arches %{power64} sparc64 x86_64
-%global jit_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
+# Set of architectures for which we build debug builds
+%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64}
+# Set of architectures with a Just-In-Time (JIT) compiler
+%global jit_arches %{debug_arches}
+# Set of architectures which support SystemTap tapsets
+%global systemtap_arches %{jit_arches}
+%global fastdebug_arches x86_64 ppc64le aarch64
+# Set of architectures which support the serviceability agent
%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64}
-%global jfr_arches x86_64 sparcv9 sparc64 %{aarch64} %{power64}
+# Set of architectures which support class data sharing
+# See https://bugzilla.redhat.com/show_bug.cgi?id=513605
+# MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT
+%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64}
+%global jfr_arches %{jit_arches}
+
+# Set of architectures for which alt-java has SSB mitigation
+%global ssbd_arches x86_64
# By default, we build a debug build during main build on JIT architectures
%if %{with slowdebug}
-%ifarch %{jit_arches}
-%ifnarch %{arm}
+%ifarch %{debug_arches}
%global include_debug_build 1
%else
-%global include_debug_build 1
+%global include_debug_build 0
%endif
%else
%global include_debug_build 0
%endif
+
+# By default, we build a fastdebug build during main build only on fastdebug architectures
+%if %{with fastdebug}
+%ifarch %{fastdebug_arches}
+%global include_fastdebug_build 1
%else
-%global include_debug_build 0
+%global include_fastdebug_build 0
+%endif
+%else
+%global include_fastdebug_build 0
%endif
%if %{include_debug_build}
-%global build_loop2 %{debug_suffix}
+%global slowdebug_build %{debug_suffix}
%else
-%global build_loop2 %{nil}
+%global slowdebug_build %{nil}
%endif
-# if you disable both builds, then the build fails
-%global build_loop %{build_loop1} %{build_loop2}
-# note: that order: normal_suffix debug_suffix, in case of both enabled
-# is expected in one single case at the end of the build
-%global rev_build_loop %{build_loop2} %{build_loop1}
-
-%ifarch %{jit_arches}
-%global bootstrap_build 1
+%if %{include_fastdebug_build}
+%global fastdebug_build %{fastdebug_suffix}
%else
-%global bootstrap_build 1
+%global fastdebug_build %{nil}
%endif
+%global bootstrap_build 1
+
+# If you disable both builds, then the build fails
+# Note that the debug build requires the normal build for docs
+%global build_loop %{normal_build} %{fastdebug_build} %{slowdebug_build}
+# Test slowdebug first as it provides the best diagnostics
+%global rev_build_loop %{slowdebug_build} %{fastdebug_build} %{normal_build}
%global bootstrap_targets images
%global release_targets images docs-zip
-# No docs nor bootcycle for debug builds
%global debug_targets images
-# This package fails to build with LTO due to undefined symbols. LTO
-# was disabled in OpenSuSE as well, but with no real explanation why
-# beyond the undefined symbols. It really should be investigated further.
-# Disable LTO
+# Disable LTO as this causes build failures at the moment.
+# See RHBZ#1861401
%define _lto_cflags %{nil}
# Filter out flags from the optflags macro that cause problems with the OpenJDK build
-# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
# We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
+# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
# We replace it with -Wformat (required by -Werror=format-security) and -Wno-cpp to avoid FORTIFY_SOURCE warnings
# We filter out -fexceptions as the HotSpot build explicitly does -fno-exceptions and it's otherwise the default for C++
%global ourflags %(echo %optflags | sed -e 's|-Wall|-Wformat -Wno-cpp|' | sed -r -e 's|-O[0-9]*||')
@@ -208,7 +233,9 @@
%global stapinstall %{nil}
%endif
-%ifarch %{jit_arches}
+
+
+%ifarch %{systemtap_arches}
%global with_systemtap 0
%else
%global with_systemtap 0
@@ -237,20 +264,22 @@
%global with_openjfx_binding 0
%endif
-# Standard JPackage naming and versioning defines.
+# Define IcedTea version used for SystemTap tapsets and desktop file
+%global icedteaver 3.15.0
+
+# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
%global shenandoah_project aarch64-port
%global shenandoah_repo jdk8u-shenandoah
-%global shenandoah_revision aarch64-shenandoah-jdk8u275-b01
+%global shenandoah_revision aarch64-shenandoah-jdk8u282-b08
# Define old aarch64/jdk8u tree variables for compatibility
%global project aarch32-port
%global repo jdk8u
-%global revision jdk8u275-ga-aarch32-20201109
-# Define IcedTea version used for SystemTap tapsets and desktop files
-%global icedteaver 3.15.0
+%global revision jdk8u282-ga-aarch32-20210125
+
# e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 -> aarch64-shenandoah-jdk8u212-b04
%global version_tag %(VERSION=%{shenandoah_revision}; echo ${VERSION%%-shenandoah-merge*})
@@ -307,7 +336,7 @@
# parametrized macros are order-sensitive
%global compatiblename %{name}
%global fullversion %{compatiblename}-%{version}-%{release}
-# images stub
+# images directories from upstream build
%global jdkimage j2sdk-image
# output dir stub
%define buildoutputdir() %{expand:build/jdk8.build%{?1}}
@@ -316,6 +345,7 @@
# main id and dir of this jdk
%define uniquesuffix() %{expand:%{fullversion}.%{_arch}%{?1}}
+#################################################################
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
# https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14
# https://bugzilla.redhat.com/show_bug.cgi?id=1655938
@@ -327,6 +357,8 @@
# Never generate lib-style provides/requires for slowdebug packages
%global __provides_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$
%global __requires_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$
+%global __provides_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_suffix_unquoted}}/.*$
+%global __requires_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_suffix_unquoted}}/.*$
%else
# Don't generate provides/requires for JDK provided shared libraries at all.
%global __provides_exclude ^(%{_privatelibs}|%{_publiclibs})$
@@ -343,6 +375,7 @@
%define jredir() %{expand:%{sdkdir -- %{?1}}/jre}
%define sdkbindir() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/bin}
%define jrebindir() %{expand:%{_jvmdir}/%{jredir -- %{?1}}/bin}
+%global alt_java_name alt-java
%global rpm_state_dir %{_localstatedir}/lib/rpm-state/
@@ -372,15 +405,9 @@ exit 0
%define post_headless() %{expand:
-%ifarch %{jit_arches}
-# MetaspaceShared::generate_vtable_methods not implemented for PPC JIT
-%ifnarch %{power64}
-%ifnarch %{arm}
-# see https://bugzilla.redhat.com/show_bug.cgi?id=513605
+%ifarch %{share_arches}
%{jrebindir -- %{?1}}/java -Xshare:dump >/dev/null 2>/dev/null
%endif
-%endif
-%endif
PRIORITY=%{priority}
if [ "%{?1}" == %{debug_suffix} ]; then
@@ -391,6 +418,7 @@ ext=.gz
alternatives \\
--install %{_bindir}/java java %{jrebindir -- %{?1}}/java $PRIORITY --family %{name}.%{_arch} \\
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{jredir -- %{?1}} \\
+ --slave %{_bindir}/%{alt_java_name} %{alt_java_name} %{jrebindir -- %{?1}}/%{alt_java_name} \\
--slave %{_bindir}/jjs jjs %{jrebindir -- %{?1}}/jjs \\
--slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
--slave %{_bindir}/orbd orbd %{jrebindir -- %{?1}}/orbd \\
@@ -403,6 +431,8 @@ alternatives \\
--slave %{_bindir}/unpack200 unpack200 %{jrebindir -- %{?1}}/unpack200 \\
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
+ --slave %{_mandir}/man1/%{alt_java_name}.1$ext %{alt_java_name}.1$ext \\
+ %{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jjs.1$ext jjs.1$ext \\
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
@@ -673,6 +703,7 @@ exit 0
%dir %{_jvmdir}/%{jredir -- %{?1}}/bin
%dir %{_jvmdir}/%{jredir -- %{?1}}/lib
%{_jvmdir}/%{jredir -- %{?1}}/bin/java
+%{_jvmdir}/%{jredir -- %{?1}}/bin/%{alt_java_name}
%{_jvmdir}/%{jredir -- %{?1}}/bin/jjs
%{_jvmdir}/%{jredir -- %{?1}}/bin/keytool
%{_jvmdir}/%{jredir -- %{?1}}/bin/orbd
@@ -704,6 +735,7 @@ exit 0
%{_jvmdir}/%{jredir -- %{?1}}/lib/logging.properties
%{_jvmdir}/%{jredir -- %{?1}}/lib/calendars.properties
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
+%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/orbd-%{uniquesuffix -- %{?1}}.1*
@@ -716,12 +748,10 @@ exit 0
%{_mandir}/man1/policytool-%{uniquesuffix -- %{?1}}.1*
%{_jvmdir}/%{jredir -- %{?1}}/lib/security/nss.cfg
%config(noreplace) %{etcjavadir -- %{?1}}/lib/security/nss.cfg
-%ifarch %{jit_arches}
-%ifnarch %{power64}
+%ifarch %{share_arches}
%attr(444, root, root) %ghost %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/server/classes.jsa
%attr(444, root, root) %ghost %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/client/classes.jsa
%endif
-%endif
%dir %{etcjavasubdir}
%dir %{etcjavadir -- %{?1}}
%dir %{etcjavadir -- %{?1}}/lib
@@ -886,6 +916,7 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jar
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jarsigner
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/java
+%{_jvmdir}/%{sdkdir -- %{?1}}/bin/%{alt_java_name}
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javac
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javadoc
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javah
@@ -1026,13 +1057,10 @@ exit 0
%endif
}
-%define files_jmods() %{expand:
-%{_jvmdir}/%{sdkdir -- %{?1}}/jmods
-}
%define files_demo() %{expand:
%defattr(-,root,root,-)
-%license %{buildoutputdir -- %{?1}}/images/%{jdkimage}/jre/LICENSE
+%license %{_jvmdir}/%{jredir -- %{?1}}/LICENSE
}
%define files_src() %{expand:
@@ -1044,6 +1072,7 @@ exit 0
%define files_javadoc() %{expand:
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}
+#javadoc is in jdk8 noarch, so also licnese file must be treated like it
%license %{buildoutputdir -- %{?1}}/images/%{jdkimage}/jre/LICENSE
%if %is_system_jdk
%if %{is_release_build -- %{?1}}
@@ -1055,6 +1084,7 @@ exit 0
%define files_javadoc_zip() %{expand:
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip
+#javadoc is in jdk8 noarch, so also licnese file must be treated like it
%license %{buildoutputdir -- %{?1}}/images/%{jdkimage}/jre/LICENSE
%if %is_system_jdk
%if %{is_release_build -- %{?1}}
@@ -1085,7 +1115,7 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release
Recommends: gtk2%{?_isa}
%endif
-#Provides: java-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
+#Provides: java-%{javaver}-%{origin}%{?1} = %{epoch}:%{version}-%{release}
# Standard JPackage base provides
#Provides: jre-%{javaver}%{?1} = %{epoch}:%{version}-%{release}
@@ -1102,11 +1132,12 @@ Recommends: gtk2%{?_isa}
%define java_headless_rpo() %{expand:
# Require /etc/pki/java/cacerts
Requires: ca-certificates
-# Require javapackages-filesystem for ownership of /usr/lib/jvm/
+# Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros
Requires: javapackages-filesystem
# Require zoneinfo data provided by tzdata-java subpackage.
# 2020b required as of JDK-8254177 in October CPU
Requires: tzdata-java >= 2020b
+# for support of kernel stream control
# libsctp.so.1 is being `dlopen`ed on demand
Requires: lksctp-tools%{?_isa}
# tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it,
@@ -1216,7 +1247,7 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release
Name: java-%{javaver}-%{origin}-aarch32
Version: %{javaver}.%{updatever}.%{buildver}
-Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.1
+Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -1251,7 +1282,7 @@ URL: http://openjdk.java.net/
# FILE_NAME_ROOT=%%{shenandoah_project}-%%{shenandoah_repo}-${VERSION}
# REPO_ROOT=<path to checked-out repository> generate_source_tarball.sh
# where the source is obtained from http://hg.openjdk.java.net/%%{project}/%%{repo}
-Source0: %{project}-%{repo}-jdk8u275-ga-aarch32-20201109-4curve.tar.xz
+Source0: %{project}-%{repo}-jdk8u282-ga-aarch32-20210125-4curve.tar.xz
# Custom README for -src subpackage
Source2: README.md
@@ -1324,11 +1355,6 @@ Patch512: rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
Patch523: pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch
# PR3083, RH1346460: Regression in SSL debug output without an ECC provider
Patch528: pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
-# RH1566890: CVE-2018-3639
-Patch529: rh1566890-CVE_2018_3639-speculative_store_bypass.patch
-Patch531: rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch
-# PR3601: Fix additional -Wreturn-type issues introduced by 8061651
-Patch530: pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
# PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
# PR3575, RH1567204: System cacerts database handling should not affect jssecacerts
Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
@@ -1336,6 +1362,8 @@ Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_jav
Patch400: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
# PR3655: Allow use of system crypto policy to be disabled by the user
Patch401: pr3655-toggle_system_crypto_policy.patch
+# enable build of speculative store bypass hardened alt-java
+Patch600: rh1750419-redhat_alt_java.patch
# JDK-8218811: replace open by os::open in hotspot coding
# This fixes a GCC 10 build issue
Patch111: jdk8218811-perfMemory_linux.patch
@@ -1357,8 +1385,6 @@ Patch112: java-1.8.0-openjdk-gcc11.patch
Patch103: pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch
# x86: S8199936, PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations (-mstackrealign workaround)
Patch105: jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
-# AArch64: PR3519: Fix further functions with a missing return value (AArch64)
-Patch106: pr3519-fix_further_functions_with_a_missing_return_value.patch
# S390 ambiguous log2_intptr calls
Patch107: s390-8214206_fix.patch
@@ -1378,10 +1404,6 @@ Patch502: pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binar
Patch571: jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
# 8143245, PR3548: Zero build requires disabled warnings
Patch574: jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
-# 8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Patch575: jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
-# 8062808, PR3548: Turn on the -Wreturn-type warning
-Patch577: jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
# s390: JDK-8203030, Type fixing for s390
Patch102: jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch
# 8035341: Allow using a system installed libpng
@@ -1399,8 +1421,6 @@ Patch204: jdk8042159-allow_using_system_installed_lcms2-jdk.patch
# able to be removed once that release is out
# and used by this RPM.
#############################################
-# JDK-8254177: (tz) Upgrade time-zone data to tzdata2020b
-Patch13: jdk8254177-tzdata2020b.patch
#############################################
#
@@ -1436,6 +1456,7 @@ Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
# Dependencies
#
#############################################
+BuildRequires: make
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: alsa-lib-devel
@@ -1478,15 +1499,14 @@ BuildRequires: java-1.8.0-openjdk-aarch32-devel
%ifnarch %{jit_arches}
BuildRequires: libffi-devel
%endif
-# 2020a required as of JDK-8243541
-BuildRequires: tzdata-java >= 2020a
+# 2020b required as of JDK-8254177 in October CPU
+BuildRequires: tzdata-java >= 2020b
# Earlier versions have a bug in tree vectorization on PPC
BuildRequires: gcc >= 4.8.3-8
%if %{with_systemtap}
BuildRequires: systemtap-sdt-devel
%endif
-BuildRequires: make
# this is always built, also during debug-only build
# when it is built in debug-only this package is just placeholder
@@ -1508,6 +1528,17 @@ The %{origin_nice} runtime environment %{majorver}.
%{debug_warning}
%endif
+%if %{include_fastdebug_build}
+%package fastdebug
+Summary: %{origin_nice} Runtime Environment %{majorver} %{fastdebug_on}
+Group: Development/Languages
+
+%{java_rpo -- %{fastdebug_suffix_unquoted}}
+%description fastdebug
+The %{origin_nice} runtime environment.
+%{fastdebug_warning}
+%endif
+
%if %{include_normal_build}
%package headless
Summary: %{origin_nice} Headless Runtime Environment %{majorver}
@@ -1529,6 +1560,18 @@ The %{origin_nice} runtime environment %{majorver} without audio and video suppo
%{debug_warning}
%endif
+%if %{include_fastdebug_build}
+%package headless-fastdebug
+Summary: %{origin_nice} Runtime Environment %{fastdebug_on}
+Group: Development/Languages
+
+%{java_headless_rpo -- %{fastdebug_suffix_unquoted}}
+
+%description headless-fastdebug
+The %{origin_nice} runtime environment %{majorver} without audio and video support.
+%{fastdebug_warning}
+%endif
+
%if %{include_normal_build}
%package devel
Summary: %{origin_nice} Development Environment %{majorver}
@@ -1550,6 +1593,18 @@ The %{origin_nice} development tools %{majorver}.
%{debug_warning}
%endif
+%if %{include_fastdebug_build}
+%package devel-fastdebug
+Summary: %{origin_nice} Development Environment %{majorver} %{fastdebug_on}
+Group: Development/Tools
+
+%{java_devel_rpo -- %{fastdebug_suffix_unquoted}}
+
+%description devel-fastdebug
+The %{origin_nice} development tools %{majorver}.
+%{fastdebug_warning}
+%endif
+
%if %{include_normal_build}
%package demo
Summary: %{origin_nice} Demos %{majorver}
@@ -1571,6 +1626,18 @@ The %{origin_nice} demos %{majorver}.
%{debug_warning}
%endif
+%if %{include_fastdebug_build}
+%package demo-fastdebug
+Summary: %{origin_nice} Demos %{majorver} %{fastdebug_on}
+Group: Development/Languages
+
+%{java_demo_rpo -- %{fastdebug_suffix_unquoted}}
+
+%description demo-fastdebug
+The %{origin_nice} demos %{majorver}.
+%{fastdebug_warning}
+%endif
+
%if %{include_normal_build}
%package src
Summary: %{origin_nice} Source Bundle %{majorver}
@@ -1593,6 +1660,19 @@ The java-%{origin}-src-slowdebug sub-package contains the complete %{origin_nice
class library source code for use by IDE indexers and debuggers. Debugging %{for_debug}.
%endif
+%if %{include_fastdebug_build}
+%package src-fastdebug
+Summary: %{origin_nice} Source Bundle %{majorver} %{for_fastdebug}
+Group: Development/Languages
+
+%{java_src_rpo -- %{fastdebug_suffix_unquoted}}
+
+%description src-fastdebug
+The java-%{origin}-src-fastdebug sub-package contains the complete %{origin_nice} %{majorver}
+ class library source code for use by IDE indexers and debuggers. Debugging %{for_fastdebug}.
+%endif
+
+
%if %{include_normal_build}
%package javadoc
Summary: %{origin_nice} %{majorver} API documentation
@@ -1646,6 +1726,16 @@ Summary: %{origin_nice} %{majorver} accessibility connector %{for_debug}
See normal java-%{version}-openjdk-accessibility description.
%endif
+%if %{include_fastdebug_build}
+%package accessibility-fastdebug
+Summary: %{origin_nice} %{majorver} accessibility connector %{for_fastdebug}
+
+%{java_accessibility_rpo -- %{fastdebug_suffix_unquoted}}
+
+%description accessibility-fastdebug
+See normal java-%{version}-openjdk-accessibility description.
+%endif
+
%if %{with_openjfx_binding}
%package openjfx
@@ -1681,6 +1771,24 @@ Provides: javafx-devel-slowdebug = %{epoch}:%{version}-%{release}
%description openjfx-devel-slowdebug
Set of links from OpenJDK-slowdebug (sdk) to normal OpenJFX. OpenJFX do not support debug buuilds of itself
%endif
+
+%if %{include_fastdebug_build}
+%package openjfx-fastdebug
+Summary: OpenJDK x OpenJFX connector %{for_fastdebug}. his package adds symliks finishing Java FX integration to %{name}-fastdebug
+Requires: %{name}-fastdebug%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: openjfx8%{?_isa}
+Provides: javafx-fastdebug = %{epoch}:%{version}-%{release}
+%description openjfx-fastdebug
+Set of links from OpenJDK-fastdebug (jre) to normal OpenJFX. OpenJFX do not support debug buuilds of itself
+
+%package openjfx-devel-fastdebug
+Summary: OpenJDK x OpenJFX connector for FX developers %{for_fastdebug}. This package adds symliks finishing Java FX integration to %{name}-devel-slowdebug
+Requires: %{name}-devel-fastdebug%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: openjfx8-devel%{?_isa}
+Provides: javafx-devel-fastdebug = %{epoch}:%{version}-%{release}
+%description openjfx-devel-fastdebug
+Set of links from OpenJDK-fastdebug (sdk) to normal OpenJFX. OpenJFX do not support debug buuilds of itself
+%endif
%endif
%prep
@@ -1695,19 +1803,25 @@ Set of links from OpenJDK-slowdebug (sdk) to normal OpenJFX. OpenJFX do not supp
if [ %{include_normal_build} -eq 0 -o %{include_normal_build} -eq 1 ] ; then
echo "include_normal_build is %{include_normal_build}"
else
- echo "include_normal_build is %{include_normal_build}, thats invalid. Use 1 for yes or 0 for no"
+ echo "include_normal_build is %{include_normal_build}, that is invalid. Use 1 for yes or 0 for no"
exit 11
fi
if [ %{include_debug_build} -eq 0 -o %{include_debug_build} -eq 1 ] ; then
echo "include_debug_build is %{include_debug_build}"
else
- echo "include_debug_build is %{include_debug_build}, thats invalid. Use 1 for yes or 0 for no"
+ echo "include_debug_build is %{include_debug_build}, that is invalid. Use 1 for yes or 0 for no"
exit 12
fi
-if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 ] ; then
- echo "You have disabled both include_debug_build and include_normal_build. That is a no go."
+if [ %{include_fastdebug_build} -eq 0 -o %{include_fastdebug_build} -eq 1 ] ; then
+ echo "include_fastdebug_build is %{include_fastdebug_build}"
+else
+ echo "include_fastdebug_build is %{include_fastdebug_build}, that is invalid. Use 1 for yes or 0 for no"
exit 13
fi
+if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{include_fastdebug_build} -eq 0 ] ; then
+ echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go."
+ exit 14
+fi
echo "Update version: %{updatever}"
echo "Build number: %{buildver}"
@@ -1756,7 +1870,6 @@ sh %{SOURCE12}
#%patch107
# AArch64 fixes
-#%patch106
# x86 fixes
#%patch105
@@ -1767,19 +1880,14 @@ sh %{SOURCE12}
%patch512
#%patch523
#%patch528
-%patch529
-%patch531
-%patch530
#%patch571
#%patch574
-%patch575
-%patch577
%patch111
%patch112
-%patch13
# RPM-only fixes
%patch539
+%patch600
%patch1000
# RHEL-only patches
@@ -1795,6 +1903,9 @@ tar --strip-components=1 -x -I xz -f %{SOURCE8}
%if %{include_debug_build}
cp -r tapset tapset%{debug_suffix}
%endif
+%if %{include_fastdebug_build}
+cp -r tapset tapset%{fastdebug_suffix}
+%endif
for suffix in %{build_loop} ; do
@@ -1981,6 +2092,12 @@ install -m 644 nss.cfg $JAVA_HOME/jre/lib/security/
rm $JAVA_HOME/jre/lib/tzdb.dat
ln -s %{_datadir}/javazi-1.8/tzdb.dat $JAVA_HOME/jre/lib/tzdb.dat
+# add alt-java man page
+pushd ${JAVA_HOME}
+echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
+cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
+popd
+
# build cycles
done
@@ -1999,10 +2116,21 @@ $JAVA_HOME/bin/java TestCryptoLevel
$JAVA_HOME/bin/javac -d . %{SOURCE14}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
-# Verify system crypto (policy) can be disabled
+# Check system crypto (policy) can be disabled
$JAVA_HOME/bin/javac -d . %{SOURCE15}
$JAVA_HOME/bin/java -Djava.security.disableSystemPropertiesFile=true $(echo $(basename %{SOURCE15})|sed "s|\.java||")
+# Check java launcher has no SSB mitigation
+if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
+
+# Check alt-java launcher has SSB mitigation on supported architectures
+%ifarch %{ssbd_arches}
+nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
+%else
+if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
+%endif
+
+
# Check debug symbols are present and can identify code
find "$JAVA_HOME" -iname '*.so' -print0 | while read -d $'\0' lib
do
@@ -2064,6 +2192,7 @@ quit
end
run -version
EOF
+
grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
# Check src.zip has all sources. See RHBZ#1130490
@@ -2442,6 +2571,32 @@ require "copy_jdk_configs.lua"
%posttrans devel-slowdebug
%{posttrans_devel -- %{debug_suffix_unquoted}}
+%endif
+
+%if %{include_fastdebug_build}
+%post fastdebug
+%{post_script -- %{fastdebug_suffix_unquoted}}
+
+%post headless-fastdebug
+%{post_headless -- %{fastdebug_suffix_unquoted}}
+
+%postun fastdebug
+%{postun_script -- %{fastdebug_suffix_unquoted}}
+
+%postun headless-fastdebug
+%{postun_headless -- %{fastdebug_suffix_unquoted}}
+
+%posttrans fastdebug
+%{posttrans_script -- %{fastdebug_suffix_unquoted}}
+
+%post devel-fastdebug
+%{post_devel -- %{fastdebug_suffix_unquoted}}
+
+%postun devel-fastdebug
+%{postun_devel -- %{fastdebug_suffix_unquoted}}
+
+%posttrans devel-fastdebug
+%{posttrans_devel -- %{fastdebug_suffix_unquoted}}
%endif
@@ -2473,9 +2628,7 @@ require "copy_jdk_configs.lua"
%files javadoc
%{files_javadoc %{nil}}
-# this puts huge file to /usr/share
-# unluckily ti is really a documentation file
-# and unluckily it really is architecture-dependent, as eg. aot and grail are now x86_64 only
+# This puts a huge documentation file in /usr/share
# same for debug variant
%files javadoc-zip
%{files_javadoc_zip %{nil}}
@@ -2516,7 +2669,38 @@ require "copy_jdk_configs.lua"
%endif
%endif
+%if %{include_fastdebug_build}
+%files fastdebug
+%{files_jre -- %{fastdebug_suffix_unquoted}}
+
+%files headless-fastdebug
+%{files_jre_headless -- %{fastdebug_suffix_unquoted}}
+
+%files devel-fastdebug
+%{files_devel -- %{fastdebug_suffix_unquoted}}
+
+
+%files demo-fastdebug -f %{name}-demo.files-fastdebug
+%{files_demo -- %{fastdebug_suffix_unquoted}}
+
+%files src-fastdebug
+%{files_src -- %{fastdebug_suffix_unquoted}}
+
+%files accessibility-fastdebug
+%{files_accessibility -- %{fastdebug_suffix_unquoted}}
+
+%if %{with_openjfx_binding}
+%files openjfx-fastdebug -f %{name}-openjfx.files-fastdebug
+
+%files openjfx-devel-fastdebug -f %{name}-openjfx-devel.files-fastdebug
+%endif
+%endif
+
%changelog
+* Sun Feb 28 2021 Alex Kashchenko <akashche(a)redhat.com> - 1:1.8.0.282.b08-1
+- update sources to 8u282
+- sync with mainline package
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.0.275.b01-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch b/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
deleted file mode 100644
index 1010b73..0000000
--- a/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-# HG changeset patch
-# User stefank
-# Date 1525453613 -3600
-# Fri May 04 18:06:53 2018 +0100
-# Node ID 07a1135a327362f157955d470fad5df07cc35164
-# Parent de79964656fc652f2085dac4fe99bcc128b5a3b1
-8062808, PR3548: Turn on the -Wreturn-type warning
-Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make
-@@ -210,7 +210,7 @@
- WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body
- endif
-
--WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value
-+WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wreturn-type
-
- ifeq ($(USE_CLANG),)
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
-diff --git openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
---- openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad
-+++ openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
-@@ -1250,6 +1250,7 @@
-
-
- Unimplemented();
-+ return 0; // Mute compiler
- }
-
- #ifndef PRODUCT
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
-@@ -541,6 +541,7 @@
- err.report_and_die();
-
- ShouldNotReachHere();
-+ return true; // Mute compiler
- }
-
- void os::Linux::init_thread_fpu_state(void) {
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
-@@ -506,7 +506,7 @@
- ss.write((const char*)name->bytes(), name->utf8_length());
- ss.write((const char*)signature->bytes(), signature->utf8_length());
- ss.print(" is abstract");
-- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
-+ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
- }
-
- Symbol* MethodFamily::generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const {
-@@ -521,7 +521,7 @@
- ss.print(".");
- ss.write((const char*)name->bytes(), name->utf8_length());
- }
-- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
-+ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
- }
-
-
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
-@@ -249,7 +249,7 @@
- MutexLocker ml(SymbolTable_lock, THREAD);
-
- // Otherwise, add to symbol to table
-- return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL);
-+ return the_table()->basic_add(index, (u1*)name, len, hashValue, true, THREAD);
- }
-
- Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) {
-@@ -288,7 +288,7 @@
- // Grab SymbolTable_lock first.
- MutexLocker ml(SymbolTable_lock, THREAD);
-
-- return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL);
-+ return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, THREAD);
- }
-
- Symbol* SymbolTable::lookup_only(const char* name, int len,
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
-@@ -229,15 +229,15 @@
- class_name->as_C_string(),
- class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string()));
- if (FieldType::is_array(class_name)) {
-- return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_array_class_or_null(class_name, class_loader, protection_domain, THREAD);
- } else if (FieldType::is_obj(class_name)) {
- ResourceMark rm(THREAD);
- // Ignore wrapping L and ;.
- TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1,
- class_name->utf8_length() - 2, CHECK_NULL);
-- return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_instance_class_or_null(name, class_loader, protection_domain, THREAD);
- } else {
-- return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_instance_class_or_null(class_name, class_loader, protection_domain, THREAD);
- }
- }
-
-diff --git openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
---- openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp
-+++ openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
-@@ -367,7 +367,7 @@
- _csv_format(csv_format), _print_help(print_help),
- _print_class_stats(print_class_stats), _columns(columns) {}
- void heap_inspection(outputStream* st) NOT_SERVICES_RETURN;
-- size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN;
-+ size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN_(0);
- static void find_instances_at_safepoint(Klass* k, GrowableArray<oop>* result) NOT_SERVICES_RETURN;
- private:
- void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL);
-diff --git openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
---- openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp
-+++ openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
-@@ -93,7 +93,7 @@
- static void preload_and_dump(TRAPS) NOT_CDS_RETURN;
- static int preload_and_dump(const char * class_list_path,
- GrowableArray<Klass*>* class_promote_order,
-- TRAPS) NOT_CDS_RETURN;
-+ TRAPS) NOT_CDS_RETURN_(0);
-
- static ReservedSpace* shared_rs() {
- CDS_ONLY(return _shared_rs);
-diff --git openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp openjdk/hotspot/src/share/vm/oops/constantPool.hpp
---- openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp
-+++ openjdk/hotspot/src/share/vm/oops/constantPool.hpp
-@@ -353,7 +353,7 @@
-
- Klass* klass_at(int which, TRAPS) {
- constantPoolHandle h_this(THREAD, this);
-- return klass_at_impl(h_this, which, CHECK_NULL);
-+ return klass_at_impl(h_this, which, THREAD);
- }
-
- Symbol* klass_name_at(int which) const; // Returns the name, w/o resolving.
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
-@@ -4244,7 +4244,7 @@
- JVM_DTraceProvider* providers))
- JVMWrapper("JVM_DTraceActivate");
- return DTraceJSDT::activate(
-- version, module_name, providers_count, providers, CHECK_0);
-+ version, module_name, providers_count, providers, THREAD);
- JVM_END
-
- JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method))
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp openjdk/hotspot/src/share/vm/runtime/reflection.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/reflection.cpp
-@@ -1093,7 +1093,7 @@
- } else {
- if (rtype == T_BOOLEAN || rtype == T_BYTE || rtype == T_CHAR || rtype == T_SHORT)
- narrow((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
-- return box((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
-+ return box((jvalue*) result.get_value_addr(), rtype, THREAD);
- }
- }
-
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
-@@ -1046,7 +1046,7 @@
- // last java frame on stack (which includes native call frames)
- vframeStream vfst(thread, true); // Do not skip and javaCalls
-
-- return find_callee_info_helper(thread, vfst, bc, callinfo, CHECK_(Handle()));
-+ return find_callee_info_helper(thread, vfst, bc, callinfo, THREAD);
- }
-
-
-diff --git openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp openjdk/hotspot/src/share/vm/services/memTracker.hpp
---- openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp
-+++ openjdk/hotspot/src/share/vm/services/memTracker.hpp
-@@ -64,7 +64,7 @@
- const NativeCallStack& stack, MEMFLAGS flag = mtNone) { }
- static inline void record_virtual_memory_commit(void* addr, size_t size, const NativeCallStack& stack) { }
- static inline Tracker get_virtual_memory_uncommit_tracker() { return Tracker(); }
-- static inline Tracker get_virtual_memory_release_tracker() { }
-+ static inline Tracker get_virtual_memory_release_tracker() { return Tracker(); }
- static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { }
- static inline void record_thread_stack(void* addr, size_t size) { }
- static inline void release_thread_stack(void* addr, size_t size) { }
diff --git a/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch b/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
deleted file mode 100644
index 5f6d9ce..0000000
--- a/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1518667645 0
-# Thu Feb 15 04:07:25 2018 +0000
-# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041
-# Parent 999983606f5c61b093c6f6316a7b26c4cd4ca79e
-8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
-Reviewed-by: aph
-
-diff --git openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-@@ -457,6 +457,7 @@
- long long unsigned int oldval,
- long long unsigned int newval) {
- ShouldNotCallThis();
-+ return 0;
- }
- };
- #endif // !_LP64
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-@@ -498,6 +498,7 @@
- long long unsigned int oldval,
- long long unsigned int newval) {
- ShouldNotCallThis();
-+ return 0;
- }
- };
- #endif // !_LP64
diff --git a/jdk8254177-tzdata2020b.patch b/jdk8254177-tzdata2020b.patch
deleted file mode 100644
index abd9131..0000000
--- a/jdk8254177-tzdata2020b.patch
+++ /dev/null
@@ -1,3849 +0,0 @@
-diff --git openjdk.orig/jdk/make/data/tzdata/VERSION openjdk/jdk/make/data/tzdata/VERSION
---- openjdk.orig/jdk/make/data/tzdata/VERSION
-+++ openjdk/jdk/make/data/tzdata/VERSION
-@@ -21,4 +21,4 @@
- # or visit www.oracle.com if you need additional information or have any
- # questions.
- #
--tzdata2020a
-+tzdata2020b
-diff --git openjdk.orig/jdk/make/data/tzdata/africa openjdk/jdk/make/data/tzdata/africa
---- openjdk.orig/jdk/make/data/tzdata/africa
-+++ openjdk/jdk/make/data/tzdata/africa
-@@ -87,7 +87,7 @@
- # Corrections are welcome.
-
- # Algeria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Algeria 1916 only - Jun 14 23:00s 1:00 S
- Rule Algeria 1916 1919 - Oct Sun>=1 23:00s 0 -
- Rule Algeria 1917 only - Mar 24 23:00s 1:00 S
-@@ -110,10 +110,9 @@
- Rule Algeria 1978 only - Sep 22 3:00 0 -
- Rule Algeria 1980 only - Apr 25 0:00 1:00 S
- Rule Algeria 1980 only - Oct 31 2:00 0 -
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
-+# See Europe/Paris for PMT-related transitions.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01
-+Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 16
- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
- 0:00 Algeria WE%sT 1940 Feb 25 2:00
- 1:00 Algeria CE%sT 1946 Oct 7
-@@ -199,7 +198,7 @@
- # Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this
- # did not apply to Cairo, Alexandria, or Port Said.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Egypt 1940 only - Jul 15 0:00 1:00 S
- Rule Egypt 1940 only - Oct 1 0:00 0 -
- Rule Egypt 1941 only - Apr 15 0:00 1:00 S
-@@ -434,7 +433,7 @@
- # now Ghana observed different DST regimes in different years. For
- # lack of better info, use Shanks except treat the minus sign as a
- # typo, and assume DST started in 1920 not 1936.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Ghana 1920 1942 - Sep 1 0:00 0:20 -
- Rule Ghana 1920 1942 - Dec 31 0:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -524,7 +523,7 @@
- # From Paul Eggert (2013-10-25):
- # For now, assume they're reverting to the pre-2012 rules of permanent UT +02.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Libya 1951 only - Oct 14 2:00 1:00 S
- Rule Libya 1952 only - Jan 1 0:00 0 -
- Rule Libya 1953 only - Oct 9 2:00 1:00 S
-@@ -647,7 +646,7 @@
- # "The trial ended on March 29, 2009, when the clocks moved back by one hour
- # at 2am (or 02:00) local time..."
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mauritius 1982 only - Oct 10 0:00 1:00 -
- Rule Mauritius 1983 only - Mar 21 0:00 0 -
- Rule Mauritius 2008 only - Oct lastSun 2:00 1:00 -
-@@ -898,17 +897,30 @@
- # https://maroc-diplomatique.net/maroc-le-retour-a-lheure-gmt-est-prevu-dim...
- # http://aujourdhui.ma/actualite/gmt1-retour-a-lheure-normale-dimanche-proc...
- #
--# From Paul Eggert (2020-04-14):
-+# From Milamber (2020-05-31)
-+# In Morocco (where I live), the end of Ramadan (Arabic month) is followed by
-+# the Eid al-Fitr, and concretely it's 1 or 2 day offs for the people (with
-+# traditional visiting of family, big lunches/dinners, etc.). So for this
-+# year the astronomical calculations don't include the following 2 days off in
-+# the calc. These 2 days fall in a Sunday/Monday, so it's not acceptable by
-+# people to have a time shift during these 2 days off. Perhaps you can modify
-+# the (predicted) rules for next years: if the end of Ramadan is a (probable)
-+# Friday or Saturday (and so the 2 days off are on a weekend), the next time
-+# shift will be the next weekend.
-+#
-+# From Paul Eggert (2020-05-31):
- # For now, guess that in the future Morocco will fall back at 03:00
- # the last Sunday before Ramadan, and spring forward at 02:00 the
--# first Sunday after the day after Ramadan. To implement this,
--# transition dates for 2021 through 2087 were determined by running
--# the following program under GNU Emacs 26.3.
--# (let ((islamic-year 1442))
-+# first Sunday after two days after Ramadan. To implement this,
-+# transition dates and times for 2019 through 2087 were determined by
-+# running the following program under GNU Emacs 26.3. (This algorithm
-+# also produces the correct transition dates for 2016 through 2018,
-+# though the times differ due to Morocco's time zone change in 2018.)
-+# (let ((islamic-year 1440))
- # (require 'cal-islam)
- # (while (< islamic-year 1511)
- # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
--# (b (1+ (calendar-islamic-to-absolute (list 10 1 islamic-year))))
-+# (b (+ 2 (calendar-islamic-to-absolute (list 10 1 islamic-year))))
- # (sunday 0))
- # (while (/= sunday (mod (setq a (1- a)) 7)))
- # (while (/= sunday (mod b 7))
-@@ -923,7 +935,7 @@
- # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
- # (setq islamic-year (+ 1 islamic-year))))
-
--# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Morocco 1939 only - Sep 12 0:00 1:00 -
- Rule Morocco 1939 only - Nov 19 0:00 0 -
- Rule Morocco 1940 only - Feb 25 0:00 1:00 -
-@@ -974,7 +986,7 @@
- Rule Morocco 2022 only - Mar 27 3:00 0 -
- Rule Morocco 2022 only - May 8 2:00 1:00 -
- Rule Morocco 2023 only - Mar 19 3:00 0 -
--Rule Morocco 2023 only - Apr 23 2:00 1:00 -
-+Rule Morocco 2023 only - Apr 30 2:00 1:00 -
- Rule Morocco 2024 only - Mar 10 3:00 0 -
- Rule Morocco 2024 only - Apr 14 2:00 1:00 -
- Rule Morocco 2025 only - Feb 23 3:00 0 -
-@@ -990,7 +1002,7 @@
- Rule Morocco 2029 only - Dec 30 3:00 0 -
- Rule Morocco 2030 only - Feb 10 2:00 1:00 -
- Rule Morocco 2030 only - Dec 22 3:00 0 -
--Rule Morocco 2031 only - Jan 26 2:00 1:00 -
-+Rule Morocco 2031 only - Feb 2 2:00 1:00 -
- Rule Morocco 2031 only - Dec 14 3:00 0 -
- Rule Morocco 2032 only - Jan 18 2:00 1:00 -
- Rule Morocco 2032 only - Nov 28 3:00 0 -
-@@ -1006,7 +1018,7 @@
- Rule Morocco 2037 only - Oct 4 3:00 0 -
- Rule Morocco 2037 only - Nov 15 2:00 1:00 -
- Rule Morocco 2038 only - Sep 26 3:00 0 -
--Rule Morocco 2038 only - Oct 31 2:00 1:00 -
-+Rule Morocco 2038 only - Nov 7 2:00 1:00 -
- Rule Morocco 2039 only - Sep 18 3:00 0 -
- Rule Morocco 2039 only - Oct 23 2:00 1:00 -
- Rule Morocco 2040 only - Sep 2 3:00 0 -
-@@ -1022,7 +1034,7 @@
- Rule Morocco 2045 only - Jul 9 3:00 0 -
- Rule Morocco 2045 only - Aug 20 2:00 1:00 -
- Rule Morocco 2046 only - Jul 1 3:00 0 -
--Rule Morocco 2046 only - Aug 5 2:00 1:00 -
-+Rule Morocco 2046 only - Aug 12 2:00 1:00 -
- Rule Morocco 2047 only - Jun 23 3:00 0 -
- Rule Morocco 2047 only - Jul 28 2:00 1:00 -
- Rule Morocco 2048 only - Jun 7 3:00 0 -
-@@ -1038,7 +1050,7 @@
- Rule Morocco 2053 only - Apr 13 3:00 0 -
- Rule Morocco 2053 only - May 25 2:00 1:00 -
- Rule Morocco 2054 only - Apr 5 3:00 0 -
--Rule Morocco 2054 only - May 10 2:00 1:00 -
-+Rule Morocco 2054 only - May 17 2:00 1:00 -
- Rule Morocco 2055 only - Mar 28 3:00 0 -
- Rule Morocco 2055 only - May 2 2:00 1:00 -
- Rule Morocco 2056 only - Mar 12 3:00 0 -
-@@ -1054,7 +1066,7 @@
- Rule Morocco 2061 only - Jan 16 3:00 0 -
- Rule Morocco 2061 only - Feb 27 2:00 1:00 -
- Rule Morocco 2062 only - Jan 8 3:00 0 -
--Rule Morocco 2062 only - Feb 12 2:00 1:00 -
-+Rule Morocco 2062 only - Feb 19 2:00 1:00 -
- Rule Morocco 2062 only - Dec 31 3:00 0 -
- Rule Morocco 2063 only - Feb 4 2:00 1:00 -
- Rule Morocco 2063 only - Dec 16 3:00 0 -
-@@ -1070,7 +1082,7 @@
- Rule Morocco 2068 only - Oct 21 3:00 0 -
- Rule Morocco 2068 only - Dec 2 2:00 1:00 -
- Rule Morocco 2069 only - Oct 13 3:00 0 -
--Rule Morocco 2069 only - Nov 17 2:00 1:00 -
-+Rule Morocco 2069 only - Nov 24 2:00 1:00 -
- Rule Morocco 2070 only - Oct 5 3:00 0 -
- Rule Morocco 2070 only - Nov 9 2:00 1:00 -
- Rule Morocco 2071 only - Sep 20 3:00 0 -
-@@ -1086,7 +1098,7 @@
- Rule Morocco 2076 only - Jul 26 3:00 0 -
- Rule Morocco 2076 only - Sep 6 2:00 1:00 -
- Rule Morocco 2077 only - Jul 18 3:00 0 -
--Rule Morocco 2077 only - Aug 22 2:00 1:00 -
-+Rule Morocco 2077 only - Aug 29 2:00 1:00 -
- Rule Morocco 2078 only - Jul 10 3:00 0 -
- Rule Morocco 2078 only - Aug 14 2:00 1:00 -
- Rule Morocco 2079 only - Jun 25 3:00 0 -
-@@ -1096,13 +1108,13 @@
- Rule Morocco 2081 only - Jun 1 3:00 0 -
- Rule Morocco 2081 only - Jul 13 2:00 1:00 -
- Rule Morocco 2082 only - May 24 3:00 0 -
--Rule Morocco 2082 only - Jun 28 2:00 1:00 -
-+Rule Morocco 2082 only - Jul 5 2:00 1:00 -
- Rule Morocco 2083 only - May 16 3:00 0 -
- Rule Morocco 2083 only - Jun 20 2:00 1:00 -
- Rule Morocco 2084 only - Apr 30 3:00 0 -
- Rule Morocco 2084 only - Jun 11 2:00 1:00 -
- Rule Morocco 2085 only - Apr 22 3:00 0 -
--Rule Morocco 2085 only - May 27 2:00 1:00 -
-+Rule Morocco 2085 only - Jun 3 2:00 1:00 -
- Rule Morocco 2086 only - Apr 14 3:00 0 -
- Rule Morocco 2086 only - May 19 2:00 1:00 -
- Rule Morocco 2087 only - Mar 30 3:00 0 -
-@@ -1203,7 +1215,7 @@
- # Use plain "WAT" and "CAT" for the time zone abbreviations, to be compatible
- # with Namibia's neighbors.
-
--# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Vanguard section, for zic and other parsers that support negative DST.
- #Rule Namibia 1994 only - Mar 21 0:00 -1:00 WAT
- #Rule Namibia 1994 2017 - Sep Sun>=1 2:00 0 CAT
-@@ -1326,7 +1338,7 @@
- # See Africa/Nairobi.
-
- # South Africa
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule SA 1942 1943 - Sep Sun>=15 2:00 1:00 -
- Rule SA 1943 1944 - Mar Sun>=15 2:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1359,7 +1371,7 @@
- # Abdalla of NTC, archived at:
- # https://mm.icann.org/pipermail/tz/2017-October/025333.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Sudan 1970 only - May 1 0:00 1:00 S
- Rule Sudan 1970 1985 - Oct 15 0:00 0 -
- Rule Sudan 1971 only - Apr 30 0:00 1:00 S
-@@ -1447,7 +1459,7 @@
- # http://www.almadenahnews.com/newss/news.php?c=118&id=38036
- # http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Tunisia 1939 only - Apr 15 23:00s 1:00 S
- Rule Tunisia 1939 only - Nov 18 23:00s 0 -
- Rule Tunisia 1940 only - Feb 25 23:00s 1:00 S
-@@ -1474,9 +1486,7 @@
- Rule Tunisia 2006 2008 - Mar lastSun 2:00s 1:00 S
- Rule Tunisia 2006 2008 - Oct lastSun 2:00s 0 -
-
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
--# Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
-+# See Europe/Paris for PMT-related transitions.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
- Zone Africa/Tunis 0:40:44 - LMT 1881 May 12
- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
-diff --git openjdk.orig/jdk/make/data/tzdata/antarctica openjdk/jdk/make/data/tzdata/antarctica
---- openjdk.orig/jdk/make/data/tzdata/antarctica
-+++ openjdk/jdk/make/data/tzdata/antarctica
-@@ -93,15 +93,30 @@
- # Australian Antarctica Division informed us that Casey changed time
- # zone to UTC+11 in "the morning of 22nd October 2016".
-
-+# From Steffen Thorsen (2020-10-02, as corrected):
-+# Based on information we have received from the Australian Antarctic
-+# Division, Casey station and Macquarie Island station will move to Tasmanian
-+# daylight savings time on Sunday 4 October. This will take effect from 0001
-+# hrs on Sunday 4 October 2020 and will mean Casey and Macquarie Island will
-+# be on the same time zone as Hobart. Some past dates too for this 3 hour
-+# time change back and forth between UTC+8 and UTC+11 for Casey:
-+# - 2018 Oct 7 4:00 - 2019 Mar 17 3:00 - 2019 Oct 4 3:00 - 2020 Mar 8 3:00
-+# and now - 2020 Oct 4 0:01
-+
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Antarctica/Casey 0 - -00 1969
-- 8:00 - +08 2009 Oct 18 2:00
-+Zone Antarctica/Casey 0 - -00 1969
-+ 8:00 - +08 2009 Oct 18 2:00
- 11:00 - +11 2010 Mar 5 2:00
-- 8:00 - +08 2011 Oct 28 2:00
-+ 8:00 - +08 2011 Oct 28 2:00
- 11:00 - +11 2012 Feb 21 17:00u
-- 8:00 - +08 2016 Oct 22
-+ 8:00 - +08 2016 Oct 22
- 11:00 - +11 2018 Mar 11 4:00
-- 8:00 - +08
-+ 8:00 - +08 2018 Oct 7 4:00
-+ 11:00 - +11 2019 Mar 17 3:00
-+ 8:00 - +08 2019 Oct 4 3:00
-+ 11:00 - +11 2020 Mar 8 3:00
-+ 8:00 - +08 2020 Oct 4 0:01
-+ 11:00 - +11
- Zone Antarctica/Davis 0 - -00 1957 Jan 13
- 7:00 - +07 1964 Nov
- 0 - -00 1969 Feb
-@@ -247,7 +262,7 @@
- # suggested by Bengt-Inge Larsson comment them out for now, and approximate
- # with only UTC and CEST. Uncomment them when 2014b is more prevalent.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- #Rule Troll 2005 max - Mar 1 1:00u 1:00 +01
- Rule Troll 2005 max - Mar lastSun 1:00u 2:00 +02
- #Rule Troll 2005 max - Oct lastSun 1:00u 1:00 +01
-diff --git openjdk.orig/jdk/make/data/tzdata/asia openjdk/jdk/make/data/tzdata/asia
---- openjdk.orig/jdk/make/data/tzdata/asia
-+++ openjdk/jdk/make/data/tzdata/asia
-@@ -93,7 +93,7 @@
- ###############################################################################
-
- # These rules are stolen from the 'europe' file.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EUAsia 1981 max - Mar lastSun 1:00u 1:00 S
- Rule EUAsia 1979 1995 - Sep lastSun 1:00u 0 -
- Rule EUAsia 1996 max - Oct lastSun 1:00u 0 -
-@@ -137,7 +137,7 @@
- # or
- # (brief)
- # http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Armenia 2011 only - Mar lastSun 2:00s 1:00 -
- Rule Armenia 2011 only - Oct lastSun 2:00s 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -163,7 +163,7 @@
- # http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-d...
- # http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Azer 1997 2015 - Mar lastSun 4:00 1:00 -
- Rule Azer 1997 2015 - Oct lastSun 5:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -250,7 +250,7 @@
- # http://www.thedailystar.net/newDesign/latest_news.php?nid=22817
- # http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Dhaka 2009 only - Jun 19 23:00 1:00 -
- Rule Dhaka 2009 only - Dec 31 24:00 0 -
-
-@@ -326,7 +326,7 @@
- # generally esteemed a success, it was announced early in 1920 that it would
- # not be repeated."
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Shang 1919 only - Apr 12 24:00 1:00 D
- Rule Shang 1919 only - Sep 30 24:00 0 S
-
-@@ -422,7 +422,7 @@
- # the Yangtze river delta area during that period of time although the scope
- # of such use will need to be investigated to determine.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Shang 1940 only - Jun 1 0:00 1:00 D
- Rule Shang 1940 only - Oct 12 24:00 0 S
- Rule Shang 1941 only - Mar 15 0:00 1:00 D
-@@ -485,7 +485,7 @@
- # to begin on 17 April.
- # http://data.people.com.cn/pic/101p/1988/04/1988041201.jpg
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule PRC 1986 only - May 4 2:00 1:00 D
- Rule PRC 1986 1991 - Sep Sun>=11 2:00 0 S
- Rule PRC 1987 1991 - Apr Sun>=11 2:00 1:00 D
-@@ -869,7 +869,7 @@
- # or dates for the 1942 and 1945 transitions.
- # The Japanese occupation of Hong Kong began 1941-12-25.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule HK 1946 only - Apr 21 0:00 1:00 S
- Rule HK 1946 only - Dec 1 3:30s 0 -
- Rule HK 1947 only - Apr 13 3:30s 1:00 S
-@@ -996,7 +996,7 @@
- # until 1945-09-21 at 01:00, overriding Shanks & Pottenger.
- # Likewise, use Yu-Cheng Chuang's data for DST in Taiwan.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Taiwan 1946 only - May 15 0:00 1:00 D
- Rule Taiwan 1946 only - Oct 1 0:00 0 S
- Rule Taiwan 1947 only - Apr 15 0:00 1:00 D
-@@ -1122,7 +1122,7 @@
- # The 1904 decree says that Macau changed from the meridian of
- # Fortaleza do Monte, presumably the basis for the 7:34:10 for LMT.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Macau 1942 1943 - Apr 30 23:00 1:00 -
- Rule Macau 1942 only - Nov 17 23:00 0 -
- Rule Macau 1943 only - Sep 30 23:00 0 S
-@@ -1180,7 +1180,7 @@
- # Cyprus to remain united in time. Cyprus Mail 2017-10-17.
- # https://cyprus-mail.com/2017/10/17/cyprus-remain-united-time/
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cyprus 1975 only - Apr 13 0:00 1:00 S
- Rule Cyprus 1975 only - Oct 12 0:00 0 -
- Rule Cyprus 1976 only - May 15 0:00 1:00 S
-@@ -1557,7 +1557,7 @@
- # be changed back to its previous state on the 24 hours of the
- # thirtieth day of Shahrivar.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iran 1978 1980 - Mar 20 24:00 1:00 -
- Rule Iran 1978 only - Oct 20 24:00 0 -
- Rule Iran 1979 only - Sep 18 24:00 0 -
-@@ -1699,7 +1699,7 @@
- # We have published a short article in English about the change:
- # https://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iraq 1982 only - May 1 0:00 1:00 -
- Rule Iraq 1982 1984 - Oct 1 0:00 0 -
- Rule Iraq 1983 only - Mar 31 0:00 1:00 -
-@@ -1722,6 +1722,10 @@
-
- # Israel
-
-+# For more info about the motivation for DST in Israel, see:
-+# Barak Y. Israel's Daylight Saving Time controversy. Israel Affairs.
-+# 2020-08-11. https://doi.org/10.1080/13537121.2020.1806564
-+
- # From Ephraim Silverberg (2001-01-11):
- #
- # I coined "IST/IDT" circa 1988. Until then there were three
-@@ -1743,7 +1747,7 @@
- # family is from India).
-
- # From Shanks & Pottenger:
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1940 only - Jun 1 0:00 1:00 D
- Rule Zion 1942 1944 - Nov 1 0:00 0 S
- Rule Zion 1943 only - Apr 1 2:00 1:00 D
-@@ -1835,7 +1839,7 @@
- # (except in 2002) is three nights before Yom Kippur [Day of Atonement]
- # (the eve of the 7th of Tishrei in the lunar Hebrew calendar).
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1989 only - Apr 30 0:00 1:00 D
- Rule Zion 1989 only - Sep 3 0:00 0 S
- Rule Zion 1990 only - Mar 25 0:00 1:00 D
-@@ -1851,7 +1855,7 @@
- # Ministry of Interior, Jerusalem, Israel. The spokeswoman can be reached by
- # calling the office directly at 972-2-6701447 or 972-2-6701448.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1994 only - Apr 1 0:00 1:00 D
- Rule Zion 1994 only - Aug 28 0:00 0 S
- Rule Zion 1995 only - Mar 31 0:00 1:00 D
-@@ -1871,7 +1875,7 @@
- #
- # where YYYY is the relevant year.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1996 only - Mar 15 0:00 1:00 D
- Rule Zion 1996 only - Sep 16 0:00 0 S
- Rule Zion 1997 only - Mar 21 0:00 1:00 D
-@@ -1894,7 +1898,7 @@
- #
- # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2000-2004.ps.gz
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2000 only - Apr 14 2:00 1:00 D
- Rule Zion 2000 only - Oct 6 1:00 0 S
- Rule Zion 2001 only - Apr 9 1:00 1:00 D
-@@ -1916,7 +1920,7 @@
- #
- # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2005 2012 - Apr Fri<=1 2:00 1:00 D
- Rule Zion 2005 only - Oct 9 2:00 0 S
- Rule Zion 2006 only - Oct 1 2:00 0 S
-@@ -1936,7 +1940,7 @@
- # As of 2013, DST starts at 02:00 on the Friday before the last Sunday
- # in March. DST ends at 02:00 on the last Sunday of October.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D
- Rule Zion 2013 max - Oct lastSun 2:00 0 S
-
-@@ -2036,7 +2040,7 @@
- # do in any POSIX or C platform. The "25:00" assumes zic from 2007 or later,
- # which should be safe now.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Japan 1948 only - May Sat>=1 24:00 1:00 D
- Rule Japan 1948 1951 - Sep Sun>=9 1:00 0 S
- Rule Japan 1949 only - Apr Sat>=1 24:00 1:00 D
-@@ -2113,7 +2117,7 @@
- # From Paul Eggert (2013-12-11):
- # As Steffen suggested, consider the past 21-month experiment to be DST.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Jordan 1973 only - Jun 6 0:00 1:00 S
- Rule Jordan 1973 1975 - Oct 1 0:00 0 -
- Rule Jordan 1974 1977 - May 1 0:00 1:00 S
-@@ -2439,7 +2443,7 @@
- # Our government cancels daylight saving time 6th of August 2005.
- # From 2005-08-12 our GMT-offset is +6, w/o any daylight saving.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Kyrgyz 1992 1996 - Apr Sun>=7 0:00s 1:00 -
- Rule Kyrgyz 1992 1996 - Sep lastSun 0:00 0 -
- Rule Kyrgyz 1997 2005 - Mar lastSun 2:30 1:00 -
-@@ -2495,7 +2499,7 @@
- # follow and continued to use GMT+9:00 for interoperability.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule ROK 1948 only - Jun 1 0:00 1:00 D
- Rule ROK 1948 only - Sep 12 24:00 0 S
- Rule ROK 1949 only - Apr 3 0:00 1:00 D
-@@ -2583,7 +2587,7 @@
-
-
- # Lebanon
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Lebanon 1920 only - Mar 28 0:00 1:00 S
- Rule Lebanon 1920 only - Oct 25 0:00 0 -
- Rule Lebanon 1921 only - Apr 3 0:00 1:00 S
-@@ -2613,7 +2617,7 @@
- 2:00 Lebanon EE%sT
-
- # Malaysia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NBorneo 1935 1941 - Sep 14 0:00 0:20 -
- Rule NBorneo 1935 1941 - Dec 14 0:00 0 -
- #
-@@ -2758,7 +2762,7 @@
- # September daylight saving time ends. Source:
- # http://zasag.mn/news/view/8969
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mongol 1983 1984 - Apr 1 0:00 1:00 -
- Rule Mongol 1983 only - Oct 1 0:00 0 -
- # Shanks & Pottenger and IATA SSIM say 1990s switches occurred at 00:00,
-@@ -2946,7 +2950,7 @@
- # "People laud PM's announcement to end DST"
- # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Pakistan 2002 only - Apr Sun>=2 0:00 1:00 S
- Rule Pakistan 2002 only - Oct Sun>=2 0:00 0 -
- Rule Pakistan 2008 only - Jun 1 0:00 1:00 S
-@@ -3248,7 +3252,7 @@
- # From Tim Parenti (2016-10-19):
- # Predict fall transitions on October's last Saturday at 01:00 from now on.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
- Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
- Rule EgyptAsia 1958 only - May 1 0:00 1:00 S
-@@ -3348,7 +3352,7 @@
- # influence of the sources. There is no current abbreviation for DST,
- # so use "PDT", the usual American style.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Phil 1936 only - Nov 1 0:00 1:00 D
- Rule Phil 1937 only - Feb 1 0:00 0 S
- Rule Phil 1954 only - Apr 12 0:00 1:00 D
-@@ -3496,7 +3500,7 @@
- 5:30 - +0530
-
- # Syria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Syria 1920 1923 - Apr Sun>=15 2:00 1:00 S
- Rule Syria 1920 1923 - Oct Sun>=1 2:00 0 -
- Rule Syria 1962 only - Apr 29 2:00 1:00 S
-diff --git openjdk.orig/jdk/make/data/tzdata/australasia openjdk/jdk/make/data/tzdata/australasia
---- openjdk.orig/jdk/make/data/tzdata/australasia
-+++ openjdk/jdk/make/data/tzdata/australasia
-@@ -36,7 +36,7 @@
-
- # Please see the notes below for the controversy about "EST" versus "AEST" etc.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Aus 1917 only - Jan 1 0:01 1:00 D
- Rule Aus 1917 only - Mar 25 2:00 0 S
- Rule Aus 1942 only - Jan 1 2:00 1:00 D
-@@ -55,7 +55,7 @@
- 9:30 Aus AC%sT
- # Western Australia
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AW 1974 only - Oct lastSun 2:00s 1:00 D
- Rule AW 1975 only - Mar Sun>=1 2:00s 0 S
- Rule AW 1983 only - Oct lastSun 2:00s 1:00 D
-@@ -93,7 +93,7 @@
- # applies to all of the Whitsundays.
- # http://www.australia.gov.au/about-australia/australian-story/austn-islands
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AQ 1971 only - Oct lastSun 2:00s 1:00 D
- Rule AQ 1972 only - Feb lastSun 2:00s 0 S
- Rule AQ 1989 1991 - Oct lastSun 2:00s 1:00 D
-@@ -109,7 +109,7 @@
- 10:00 Holiday AE%sT
-
- # South Australia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AS 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AS 1986 only - Oct 19 2:00s 1:00 D
- Rule AS 1987 2007 - Oct lastSun 2:00s 1:00 D
-@@ -137,7 +137,7 @@
- # http://www.bom.gov.au/climate/averages/tables/dst_times.shtml
- # says King Island didn't observe DST from WWII until late 1971.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AT 1967 only - Oct Sun>=1 2:00s 1:00 D
- Rule AT 1968 only - Mar lastSun 2:00s 0 S
- Rule AT 1968 1985 - Oct lastSun 2:00s 1:00 D
-@@ -170,7 +170,7 @@
- 10:00 AT AE%sT
-
- # Victoria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AV 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AV 1972 only - Feb lastSun 2:00s 0 S
- Rule AV 1973 1985 - Mar Sun>=1 2:00s 0 S
-@@ -191,7 +191,7 @@
- 10:00 AV AE%sT
-
- # New South Wales
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AN 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AN 1972 only - Feb 27 2:00s 0 S
- Rule AN 1973 1981 - Mar Sun>=1 2:00s 0 S
-@@ -220,7 +220,7 @@
- 9:30 AS AC%sT
-
- # Lord Howe Island
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule LH 1981 1984 - Oct lastSun 2:00 1:00 -
- Rule LH 1982 1985 - Mar Sun>=1 2:00 0 -
- Rule LH 1985 only - Oct lastSun 2:00 0:30 -
-@@ -275,8 +275,9 @@
- 10:00 Aus AE%sT 1919 Apr 1 0:00s
- 0 - -00 1948 Mar 25
- 10:00 Aus AE%sT 1967
-- 10:00 AT AE%sT 2010 Apr 4 3:00
-- 11:00 - +11
-+ 10:00 AT AE%sT 2010
-+ 10:00 1:00 AEDT 2011
-+ 10:00 AT AE%sT
-
- # Christmas
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -403,7 +404,7 @@
- # From Michael Deckers (2019-08-06):
- # https://www.laws.gov.fj/LawsAsMade/downloadfile/848
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 -
- Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
- Rule Fiji 2009 only - Nov 29 2:00 1:00 -
-@@ -432,7 +433,7 @@
-
- # Guam
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # http://guamlegislature.com/Public_Laws_5th/PL05-025.pdf
- # http://documents.guam.gov/wp-content/uploads/E.O.-59-7-Guam-Daylight-Savi...
- Rule Guam 1959 only - Jun 27 2:00 1:00 D
-@@ -543,7 +544,7 @@
- 12:00 - +12
-
- # New Caledonia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NC 1977 1978 - Dec Sun>=1 0:00 1:00 -
- Rule NC 1978 1979 - Feb 27 0:00 0 -
- Rule NC 1996 only - Dec 1 2:00s 1:00 -
-@@ -558,7 +559,7 @@
-
- # New Zealand
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NZ 1927 only - Nov 6 2:00 1:00 S
- Rule NZ 1928 only - Mar 4 2:00 0 M
- Rule NZ 1928 1933 - Oct Sun>=8 2:00 0:30 S
-@@ -610,7 +611,7 @@
-
- # Cook Is
- # From Shanks & Pottenger:
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cook 1978 only - Nov 12 0:00 0:30 -
- Rule Cook 1979 1991 - Mar Sun>=1 0:00 0 -
- Rule Cook 1979 1990 - Oct lastSun 0:00 0:30 -
-@@ -755,7 +756,7 @@
- # That web page currently lists transitions for 2012/3 and 2013/4.
- # Assume the pattern instituted in 2012 will continue indefinitely.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule WS 2010 only - Sep lastSun 0:00 1 -
- Rule WS 2011 only - Apr Sat>=1 4:00 0 -
- Rule WS 2011 only - Sep lastSat 3:00 1 -
-@@ -799,7 +800,7 @@
- 13:00 - +13
-
- # Tonga
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Tonga 1999 only - Oct 7 2:00s 1:00 -
- Rule Tonga 2000 only - Mar 19 2:00s 0 -
- Rule Tonga 2000 2001 - Nov Sun>=1 2:00 1:00 -
-@@ -880,7 +881,7 @@
-
-
- # Vanuatu
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Vanuatu 1983 only - Sep 25 0:00 1:00 -
- Rule Vanuatu 1984 1991 - Mar Sun>=23 0:00 0 -
- Rule Vanuatu 1984 only - Oct 23 0:00 1:00 -
-diff --git openjdk.orig/jdk/make/data/tzdata/europe openjdk/jdk/make/data/tzdata/europe
---- openjdk.orig/jdk/make/data/tzdata/europe
-+++ openjdk/jdk/make/data/tzdata/europe
-@@ -411,7 +411,7 @@
- # http://www.irishstatutebook.ie/eli/1926/sro/919/made/en/print
- # http://www.irishstatutebook.ie/eli/1947/sro/71/made/en/print
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Summer Time Act, 1916
- Rule GB-Eire 1916 only - May 21 2:00s 1:00 BST
- Rule GB-Eire 1916 only - Oct 1 2:00s 0 GMT
-@@ -552,7 +552,7 @@
- # The following is like GB-Eire and EU, except with standard time in
- # summer and negative daylight saving time in winter. It is for when
- # negative SAVE values are used.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- #Rule Eire 1971 only - Oct 31 2:00u -1:00 -
- #Rule Eire 1972 1980 - Mar Sun>=16 2:00u 0 -
- #Rule Eire 1972 1980 - Oct Sun>=23 2:00u -1:00 -
-@@ -589,7 +589,7 @@
- # predecessor organization, the European Communities.
- # For brevity they are called "EU rules" elsewhere in this file.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EU 1977 1980 - Apr Sun>=1 1:00u 1:00 S
- Rule EU 1977 only - Sep lastSun 1:00u 0 -
- Rule EU 1978 only - Oct 1 1:00u 0 -
-@@ -629,13 +629,13 @@
- # corrected in version 2008d). The circumstantial evidence is simply the
- # tz database itself, as seen below:
- #
--# Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
-+# Zone Europe/Paris ...
- # 0:00 France WE%sT 1945 Sep 16 3:00
- #
--# Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
-+# Zone Europe/Monaco ...
- # 0:00 France WE%sT 1945 Sep 16 3:00
- #
--# Zone Europe/Belgrade 1:22:00 - LMT 1884
-+# Zone Europe/Belgrade ...
- # 1:00 1:00 CEST 1945 Sep 16 2:00s
- #
- # Rule France 1945 only - Sep 16 3:00 0 -
-@@ -681,7 +681,7 @@
- #
- # The 1917-1921 decree URLs are from Alexander Belopolsky (2016-08-23).
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Russia 1917 only - Jul 1 23:00 1:00 MST # Moscow Summer Time
- #
- # Decree No. 142 (1917-12-22) http://istmat.info/node/28137
-@@ -795,7 +795,7 @@
-
-
- # Albania
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Albania 1940 only - Jun 16 0:00 1:00 S
- Rule Albania 1942 only - Nov 2 3:00 0 -
- Rule Albania 1943 only - Mar 29 2:00 1:00 S
-@@ -849,7 +849,7 @@
- # In 1946 the end of DST was on Monday, 7 October 1946, at 3:00 am.
- # Shanks had this right. Source: Die Weltpresse, 5. Oktober 1946, page 5.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Austria 1920 only - Apr 5 2:00s 1:00 S
- Rule Austria 1920 only - Sep 13 2:00s 0 -
- Rule Austria 1946 only - Apr 14 2:00s 1:00 S
-@@ -936,7 +936,7 @@
- # The 1918 rules are listed for completeness; they apply to unoccupied Belgium.
- # Assume Brussels switched to WET in 1918 when the armistice took effect.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Belgium 1918 only - Mar 9 0:00s 1:00 S
- Rule Belgium 1918 1919 - Oct Sat>=1 23:00s 0 -
- Rule Belgium 1919 only - Mar 1 23:00s 1:00 S
-@@ -996,7 +996,7 @@
- # EET -> EETDST is in 03:00 Local time in last Sunday of March ...
- # EETDST -> EET is in 04:00 Local time in last Sunday of October
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Bulg 1979 only - Mar 31 23:00 1:00 S
- Rule Bulg 1979 only - Oct 1 1:00 0 -
- Rule Bulg 1980 1982 - Apr Sat>=1 23:00 1:00 S
-@@ -1028,7 +1028,7 @@
- # We know of no English-language name for historical Czech winter time;
- # abbreviate it as "GMT", as it happened to be GMT.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Czech 1945 only - Apr Mon>=1 2:00s 1:00 S
- Rule Czech 1945 only - Oct 1 2:00s 0 -
- Rule Czech 1946 only - May 6 2:00s 1:00 S
-@@ -1084,7 +1084,7 @@
- # Hence the "02:00" of the 1980 law refers to standard time, not
- # wall-clock time, and so the EU rules were in effect in 1980.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Denmark 1916 only - May 14 23:00 1:00 S
- Rule Denmark 1916 only - Sep 30 23:00 0 -
- Rule Denmark 1940 only - May 15 0:00 1:00 S
-@@ -1186,7 +1186,7 @@
- # http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-t...
- # It is their only National Park.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D
- Rule Thule 1991 1992 - Sep lastSun 2:00 0 S
- Rule Thule 1993 2006 - Apr Sun>=1 2:00 1:00 D
-@@ -1317,7 +1317,7 @@
- # From Paul Eggert (2014-06-14):
- # Go with Oja over Shanks.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Finland 1942 only - Apr 2 24:00 1:00 S
- Rule Finland 1942 only - Oct 4 1:00 0 -
- Rule Finland 1981 1982 - Mar lastSun 2:00 1:00 S
-@@ -1349,10 +1349,58 @@
- # Françoise Gauquelin, Problèmes de l'heure résolus en astrologie,
- # Guy Trédaniel, Paris 1987
-
-+# From Michael Deckers (2020-06-11):
-+# the law of 1891 <https://gallica.bnf.fr/ark:/12148/bpt6k64415343.texteImage>
-+# was published on 1891-03-15, so it could only take force on 1891-03-16.
-+
-+# From Michael Deckers (2020-06-10):
-+# Le Gaulois, 1911-03-11, page 1/6, online at
-+# https://www.retronews.fr/societe/echo-de-presse/2018/01/29/1911-change-lh...
-+# ... [ Instantly, all pressure driven clock dials halted... Nine minutes and
-+# twenty-one seconds later the hands resumed their circular motion. ]
-+# There are also precise reports about how the change was prepared in train
-+# stations: all the publicly visible clocks stopped at midnight railway time
-+# (or were covered), only the chief of service had a watch, labeled
-+# "Heure ancienne", that he kept running until it reached 00:04:21, when
-+# he announced "Heure nouvelle". See the "Le Petit Journal 1911-03-11".
-+# https://gallica.bnf.fr/ark:/12148/bpt6k6192911/f1.item.zoom
-+#
-+# From Michael Deckers (2020-06-12):
-+# That "all French clocks stopped" for 00:09:21 is a misreading of French
-+# newspapers; this sort of adjustment applies only to certain
-+# remote-controlled clocks ("pendules pneumatiques", of which there existed
-+# perhaps a dozen in Paris, and which simply could not be set back remotely),
-+# but not to all the clocks in all French towns and villages. For instance,
-+# the following story in the "Courrier de Saône-et-Loire" 1911-03-11, page 2:
-+# only works if legal time was stepped back (was not monotone): ...
-+# [One can observe that children who had been born at midnight less 5
-+# minutes and who had died at midnight of the old time, would turn out to
-+# be dead before being born, time having been set back and having
-+# suppressed 9 minutes and 25 seconds of their existence, that is, more
-+# than they could spend.]
-+#
-+# From Paul Eggert (2020-06-12):
-+# French time in railway stations was legally five minutes behind civil time,
-+# which explains why railway "old time" ran to 00:04:21 instead of to 00:09:21.
-+# The law's text (which Michael Deckers noted is at
-+# <https://gallica.bnf.fr/ark:/12148/bpt6k2022333z/f2>) says only that
-+# at 1911-03-11 00:00 legal time was that of Paris mean time delayed by
-+# nine minutes and twenty-one seconds, and does not say how the
-+# transition from Paris mean time was to occur.
-+#
-+# tzdb has no way to represent stopped clocks. As the railway practice
-+# was to keep a watch running on "old time" to decide when to restart
-+# the other clocks, this could be modeled as a transition for "old time" at
-+# 00:09:21. However, since the law was ambiguous and clocks outside railway
-+# stations were probably done haphazardly with the popular impression being
-+# that the transition was done at 00:00 "old time", simply leave the time
-+# blank; this causes zic to default to 00:00 "old time" which is good enough.
-+# Do something similar for the 1891-03-16 transition. There are similar
-+# problems in Algiers, Monaco and Tunis.
-
- #
- # Shank & Pottenger seem to use '24:00' ambiguously; resolve it with Whitman.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule France 1916 only - Jun 14 23:00s 1:00 S
- Rule France 1916 1919 - Oct Sun>=1 23:00s 0 -
- Rule France 1917 only - Mar 24 23:00s 1:00 S
-@@ -1412,13 +1460,11 @@
- # go with Excoffier's 28/3/76 0hUT and 25/9/76 23hUT.
- Rule France 1976 only - Mar 28 1:00 1:00 S
- Rule France 1976 only - Sep 26 1:00 0 -
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time, and Whitman 0:09:05,
--# but Howse quotes the actual French legislation as saying 0:09:21.
--# Go with Howse. Howse writes that the time in France was officially based
-+# Howse writes that the time in France was officially based
- # on PMT-0:09:21 until 1978-08-09, when the time base finally switched to UTC.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
-- 0:09:21 - PMT 1911 Mar 11 0:01 # Paris MT
-+Zone Europe/Paris 0:09:21 - LMT 1891 Mar 16
-+ 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
- # Shanks & Pottenger give 1940 Jun 14 0:00; go with Excoffier and Le Corre.
- 0:00 France WE%sT 1940 Jun 14 23:00
- # Le Corre says Paris stuck with occupied-France time after the liberation;
-@@ -1447,7 +1493,7 @@
- # this was equivalent to UT +03, not +04.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Germany 1946 only - Apr 14 2:00s 1:00 S
- Rule Germany 1946 only - Oct 7 2:00s 0 -
- Rule Germany 1947 1949 - Oct Sun>=1 2:00s 0 -
-@@ -1499,7 +1545,7 @@
- 1:00 EU CE%sT
-
- # Greece
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Whitman gives 1932 Jul 5 - Nov 1; go with Shanks & Pottenger.
- Rule Greece 1932 only - Jul 7 0:00 1:00 S
- Rule Greece 1932 only - Sep 1 0:00 0 -
-@@ -1534,38 +1580,69 @@
- 2:00 EU EE%sT
-
- # Hungary
--# From Paul Eggert (2014-07-15):
--# Dates for 1916-1945 are taken from:
--# Oross A. Jelen a múlt jövője: a nyári időszámítás Magyarországon 1916-1945.
--# National Archives of Hungary (2012-10-29).
--# http://mnl.gov.hu/a_het_dokumentuma/a_nyari_idoszamitas_magyarorszagon_19...
--# This source does not always give times, which are taken from Shanks
--# & Pottenger (which disagree about the dates).
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule Hungary 1918 only - Apr 1 3:00 1:00 S
--Rule Hungary 1918 only - Sep 16 3:00 0 -
--Rule Hungary 1919 only - Apr 15 3:00 1:00 S
--Rule Hungary 1919 only - Nov 24 3:00 0 -
-+
-+# From Michael Deckers (2020-06-09):
-+# an Austrian encyclopedia of railroads of 1913, online at
-+# http://www.zeno.org/Roell-1912/A/Eisenbahnzeit
-+# says that the switch [to CET] happened on 1890-11-01.
-+
-+# From Géza Nyáry (2020-06-07):
-+# Data for 1918-1983 are based on the archive database of Library Hungaricana.
-+# The dates are collected from original, scanned governmental orders,
-+# bulletins, instructions and public press.
-+# [See URLs below.]
-+
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1918/?pg=238
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1919/?pg=808
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1920/?pg=201
-+Rule Hungary 1918 1919 - Apr 15 2:00 1:00 S
-+Rule Hungary 1918 1920 - Sep Mon>=15 3:00 0 -
-+Rule Hungary 1920 only - Apr 5 2:00 1:00 S
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1945/?pg=882
- Rule Hungary 1945 only - May 1 23:00 1:00 S
--Rule Hungary 1945 only - Nov 1 0:00 0 -
-+Rule Hungary 1945 only - Nov 1 1:00 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1946_03/?pg=49
- Rule Hungary 1946 only - Mar 31 2:00s 1:00 S
--Rule Hungary 1946 1949 - Oct Sun>=1 2:00s 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1946_09/?pg=54
-+Rule Hungary 1946 only - Oct 7 2:00 0 -
-+# https://library.hungaricana.hu/hu/view/KulfBelfHirek_1947_04_1__001-123/?...
-+# https://library.hungaricana.hu/hu/view/DunantuliNaplo_1947_09/?pg=128
-+# https://library.hungaricana.hu/hu/view/KulfBelfHirek_1948_03_3__001-123/?...
-+# https://library.hungaricana.hu/hu/view/Zala_1948_09/?pg=64
-+# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniN...
-+# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniN...
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1949_09/?pg=94
- Rule Hungary 1947 1949 - Apr Sun>=4 2:00s 1:00 S
--Rule Hungary 1950 only - Apr 17 2:00s 1:00 S
--Rule Hungary 1950 only - Oct 23 2:00s 0 -
--Rule Hungary 1954 1955 - May 23 0:00 1:00 S
--Rule Hungary 1954 1955 - Oct 3 0:00 0 -
--Rule Hungary 1956 only - Jun Sun>=1 0:00 1:00 S
--Rule Hungary 1956 only - Sep lastSun 0:00 0 -
--Rule Hungary 1957 only - Jun Sun>=1 1:00 1:00 S
--Rule Hungary 1957 only - Sep lastSun 3:00 0 -
--Rule Hungary 1980 only - Apr 6 1:00 1:00 S
-+Rule Hungary 1947 1949 - Oct Sun>=1 2:00s 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1954/?pg...
-+Rule Hungary 1954 only - May 23 0:00 1:00 S
-+Rule Hungary 1954 only - Oct 3 0:00 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1955/?pg...
-+Rule Hungary 1955 only - May 22 2:00 1:00 S
-+Rule Hungary 1955 only - Oct 2 3:00 0 -
-+# https://library.hungaricana.hu/hu/view/HevesMegyeiNepujsag_1956_06/?pg=0
-+# https://library.hungaricana.hu/hu/view/EszakMagyarorszag_1956_06/?pg=6
-+# https://library.hungaricana.hu/hu/view/SzolnokMegyeiNeplap_1957_04/?pg=120
-+# https://library.hungaricana.hu/hu/view/PestMegyeiHirlap_1957_09/?pg=143
-+Rule Hungary 1956 1957 - Jun Sun>=1 2:00 1:00 S
-+Rule Hungary 1956 1957 - Sep lastSun 3:00 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1980/?pg...
-+Rule Hungary 1980 only - Apr 6 0:00 1:00 S
-+Rule Hungary 1980 only - Sep 28 1:00 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1981_01/?pg=79
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1982/?pg...
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1983/?pg=85
-+Rule Hungary 1981 1983 - Mar lastSun 0:00 1:00 S
-+Rule Hungary 1981 1983 - Sep lastSun 1:00 0 -
-+#
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Budapest 1:16:20 - LMT 1890 Oct
-+Zone Europe/Budapest 1:16:20 - LMT 1890 Nov 1
- 1:00 C-Eur CE%sT 1918
-- 1:00 Hungary CE%sT 1941 Apr 8
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1941/?pg=1204
-+ 1:00 Hungary CE%sT 1941 Apr 7 23:00
- 1:00 C-Eur CE%sT 1945
-- 1:00 Hungary CE%sT 1980 Sep 28 2:00s
-+ 1:00 Hungary CE%sT 1984
- 1:00 EU CE%sT
-
- # Iceland
-@@ -1601,7 +1678,7 @@
- # The information below is taken from the 1988 Almanak; see
- # http://www.almanak.hi.is/klukkan.html
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iceland 1917 1919 - Feb 19 23:00 1:00 -
- Rule Iceland 1917 only - Oct 21 1:00 0 -
- Rule Iceland 1918 1919 - Nov 16 1:00 0 -
-@@ -1693,7 +1770,7 @@
- # to 1944-06-04; although Rome was an open city during this period, it
- # was effectively controlled by Germany.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Italy 1916 only - Jun 3 24:00 1:00 S
- Rule Italy 1916 1917 - Sep 30 24:00 0 -
- Rule Italy 1917 only - Mar 31 24:00 1:00 S
-@@ -1803,7 +1880,7 @@
- # urged Lithuania and Estonia to adopt a similar time policy, but it
- # appears that they will not do so....
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Latvia 1989 1996 - Mar lastSun 2:00s 1:00 S
- Rule Latvia 1989 1996 - Sep lastSun 2:00s 0 -
-
-@@ -1896,7 +1973,7 @@
- # Luxembourg
- # Whitman disagrees with most of these dates in minor ways;
- # go with Shanks & Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Lux 1916 only - May 14 23:00 1:00 S
- Rule Lux 1916 only - Oct 1 1:00 0 -
- Rule Lux 1917 only - Apr 28 23:00 1:00 S
-@@ -1937,7 +2014,7 @@
- # From Paul Eggert (2016-10-21):
- # Assume 1900-1972 was like Rome, overriding Shanks.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Malta 1973 only - Mar 31 0:00s 1:00 S
- Rule Malta 1973 only - Sep 29 0:00s 0 -
- Rule Malta 1974 only - Apr 21 0:00s 1:00 S
-@@ -2010,7 +2087,7 @@
- # says the 2014-03-30 spring-forward transition was at 02:00 local time.
- # Guess that since 1997 Moldova has switched one hour before the EU.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Moldova 1997 max - Mar lastSun 2:00 1:00 S
- Rule Moldova 1997 max - Oct lastSun 3:00 0 -
-
-@@ -2028,11 +2105,24 @@
- 2:00 Moldova EE%sT
-
- # Monaco
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
-+#
-+# From Michael Deckers (2020-06-12):
-+# In the "Journal de Monaco" of 1892-05-24, online at
-+# https://journaldemonaco.gouv.mc/var/jdm/storage/original/application/b1c6...
-+# we read: ...
-+# [In virtue of a Sovereign Ordinance of the May 13 of the current [year],
-+# legal time in the Principality will be set to, from the date of June 1,
-+# 1892 onwards, to the meridian of Paris, as in France.]
-+# In the "Journal de Monaco" of 1911-03-28, online at
-+# https://journaldemonaco.gouv.mc/var/jdm/storage/original/application/de74...
-+# we read an ordinance of 1911-03-16: ...
-+# [Legal time in the Principality will be set, from the date of promulgation
-+# of the present ordinance, to legal time in France.... Consequently, legal
-+# time will be retarded by 9 minutes and 21 seconds.]
-+#
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
-- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
-+Zone Europe/Monaco 0:29:32 - LMT 1892 Jun 1
-+ 0:09:21 - PMT 1911 Mar 29 # Paris Mean Time
- 0:00 France WE%sT 1945 Sep 16 3:00
- 1:00 France CE%sT 1977
- 1:00 EU CE%sT
-@@ -2080,7 +2170,7 @@
- # The data entries before 1945 are taken from
- # https://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Neth 1916 only - May 1 0:00 1:00 NST # Netherlands Summer Time
- Rule Neth 1916 only - Oct 1 0:00 0 AMT # Amsterdam Mean Time
- Rule Neth 1917 only - Apr 16 2:00s 1:00 NST
-@@ -2117,7 +2207,7 @@
- # Norway
- # http://met.no/met/met_lex/q_u/sommertid.html (2004-01) agrees with Shanks &
- # Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Norway 1916 only - May 22 1:00 1:00 S
- Rule Norway 1916 only - Sep 30 0:00 0 -
- Rule Norway 1945 only - Apr 2 2:00s 1:00 S
-@@ -2186,7 +2276,7 @@
- # The 1919 dates and times can be found in Tygodnik Urzędowy nr 1 (1919-03-20),
- # <http://www.wbc.poznan.pl/publication/32156> pp 1-2.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Poland 1918 1919 - Sep 16 2:00s 0 -
- Rule Poland 1919 only - Apr 15 2:00s 1:00 S
- Rule Poland 1944 only - Apr 3 2:00s 1:00 S
-@@ -2257,7 +2347,7 @@
- # Guess that the Azores changed to EU rules in 1992 (since that's when Portugal
- # harmonized with EU rules), and that they stayed +0:00 that winter.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # DSH writes that despite Decree 1,469 (1915), the change to the clocks was not
- # done every year, depending on what Spain did, because of railroad schedules.
- # Go with Shanks & Pottenger.
-@@ -2370,7 +2460,7 @@
- # assume that Romania and Moldova switched to EU rules in 1997,
- # the same year as Bulgaria.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Romania 1932 only - May 21 0:00s 1:00 S
- Rule Romania 1932 1939 - Oct Sun>=1 0:00s 0 -
- Rule Romania 1933 1939 - Apr Sun>=2 0:00s 1:00 S
-@@ -3468,14 +3558,14 @@
- # fallback transition from the next day's 00:59... to 00:00.
-
- # From Michael Deckers (2016-12-15):
--# The Royal Decree of 1900-06-26 quoted by Planesas, online at
-+# The Royal Decree of 1900-07-26 quoted by Planesas, online at
- # https://www.boe.es/datos/pdfs/BOE//1900/209/A00383-00384.pdf
- # says in its article 5 (my translation):
- # These dispositions will enter into force beginning with the
- # instant at which, according to the time indicated in article 1,
- # the 1st day of January of 1901 will begin.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Spain 1918 only - Apr 15 23:00 1:00 S
- Rule Spain 1918 1919 - Oct 6 24:00s 0 -
- Rule Spain 1919 only - Apr 6 23:00 1:00 S
-@@ -3612,7 +3702,7 @@
- # By the end of the 18th century clocks and watches became commonplace
- # and their performance improved enormously. Communities began to keep
- # mean time in preference to apparent time - Geneva from 1780 ....
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # From Whitman (who writes "Midnight?"):
- # Rule Swiss 1940 only - Nov 2 0:00 1:00 S
- # Rule Swiss 1940 only - Dec 31 0:00 0 -
-@@ -3699,7 +3789,7 @@
- # 1853-07-16, though it probably occurred at some other date in Zurich, and
- # legal civil time probably changed at still some other transition date.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Swiss 1941 1942 - May Mon>=1 1:00 1:00 S
- Rule Swiss 1941 1942 - Oct Mon>=1 2:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -3848,7 +3938,7 @@
- # Although Google Translate misfires on that source, it looks like
- # Turkey reversed last month's decision, and so will stay at +03.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Turkey 1916 only - May 1 0:00 1:00 S
- Rule Turkey 1916 only - Oct 1 0:00 0 -
- Rule Turkey 1920 only - Mar 28 0:00 1:00 S
-@@ -4006,7 +4096,7 @@
- 2:00 1:00 EEST 1991 Sep 29 3:00
- 2:00 E-Eur EE%sT 1995
- 2:00 EU EE%sT
--# Ruthenia used CET 1990/1991.
-+# Transcarpathia used CET 1990/1991.
- # "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but
- # "Uzhgorod" is more common in English.
- Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct
-diff --git openjdk.orig/jdk/make/data/tzdata/leapseconds openjdk/jdk/make/data/tzdata/leapseconds
---- openjdk.orig/jdk/make/data/tzdata/leapseconds
-+++ openjdk/jdk/make/data/tzdata/leapseconds
-@@ -91,11 +91,11 @@
- # Any additional leap seconds will come after this.
- # This Expires line is commented out for now,
- # so that pre-2020a zic implementations do not reject this file.
--#Expires 2020 Dec 28 00:00:00
-+#Expires 2021 Jun 28 00:00:00
-
- # POSIX timestamps for the data in this file:
- #updated 1467936000 (2016-07-08 00:00:00 UTC)
--#expires 1609113600 (2020-12-28 00:00:00 UTC)
-+#expires 1624838400 (2021-06-28 00:00:00 UTC)
-
--# Updated through IERS Bulletin C59
--# File expires on: 28 December 2020
-+# Updated through IERS Bulletin C60
-+# File expires on: 28 June 2021
-diff --git openjdk.orig/jdk/make/data/tzdata/northamerica openjdk/jdk/make/data/tzdata/northamerica
---- openjdk.orig/jdk/make/data/tzdata/northamerica
-+++ openjdk/jdk/make/data/tzdata/northamerica
-@@ -193,7 +193,7 @@
- # U.S. government action. So even though the "US" rules have changed
- # in the latest release, other countries won't be affected.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule US 1918 1919 - Mar lastSun 2:00 1:00 D
- Rule US 1918 1919 - Oct lastSun 2:00 0 S
- Rule US 1942 only - Feb 9 2:00 1:00 W # War
-@@ -370,7 +370,7 @@
- # Eastern time (i.e., -4:56:01.6) just before the 1883 switch. Round to the
- # nearest second.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule NYC 1920 only - Mar lastSun 2:00 1:00 D
- Rule NYC 1920 only - Oct lastSun 2:00 0 S
- Rule NYC 1921 1966 - Apr lastSun 2:00 1:00 D
-@@ -454,7 +454,7 @@
- # The Tennessean 2007-05-11, republished 2015-04-06.
- # https://www.tennessean.com/story/insider/extras/2015/04/06/archives-seige...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Chicago 1920 only - Jun 13 2:00 1:00 D
- Rule Chicago 1920 1921 - Oct lastSun 2:00 0 S
- Rule Chicago 1921 only - Mar lastSun 2:00 1:00 D
-@@ -523,7 +523,7 @@
- # El Paso Times. 2018-10-24 06:40 -06.
- # https://www.elpasotimes.com/story/news/local/el-paso/2018/10/24/el-pasoan...
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Denver 1920 1921 - Mar lastSun 2:00 1:00 D
- Rule Denver 1920 only - Oct lastSun 2:00 0 S
- Rule Denver 1921 only - May 22 2:00 0 S
-@@ -576,7 +576,7 @@
- # https://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&contex...
- # https://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&contex...
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule CA 1948 only - Mar 14 2:01 1:00 D
- Rule CA 1949 only - Jan 1 2:00 0 S
- Rule CA 1950 1966 - Apr lastSun 1:00 1:00 D
-@@ -934,7 +934,7 @@
- # going to switch from Central to Eastern Time on March 11, 2007....
- # http://www.indystar.com/apps/pbcs.dll/article?AID=/20070207/LOCAL190108/7...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Indianapolis 1941 only - Jun 22 2:00 1:00 D
- Rule Indianapolis 1941 1954 - Sep lastSun 2:00 0 S
- Rule Indianapolis 1946 1954 - Apr lastSun 2:00 1:00 D
-@@ -953,7 +953,7 @@
- #
- # Eastern Crawford County, Indiana, left its clocks alone in 1974,
- # as well as from 1976 through 2005.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Marengo 1951 only - Apr lastSun 2:00 1:00 D
- Rule Marengo 1951 only - Sep lastSun 2:00 0 S
- Rule Marengo 1954 1960 - Apr lastSun 2:00 1:00 D
-@@ -972,7 +972,7 @@
- # Daviess, Dubois, Knox, and Martin Counties, Indiana,
- # switched from eastern to central time in April 2006, then switched back
- # in November 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Vincennes 1946 only - Apr lastSun 2:00 1:00 D
- Rule Vincennes 1946 only - Sep lastSun 2:00 0 S
- Rule Vincennes 1953 1954 - Apr lastSun 2:00 1:00 D
-@@ -997,7 +997,7 @@
- # The Indianapolis News, Friday 27 October 1967 states that Perry County
- # returned to CST. It went again to EST on 27 April 1969, as documented by the
- # Indianapolis star of Saturday 26 April.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Perry 1955 only - May 1 0:00 1:00 D
- Rule Perry 1955 1960 - Sep lastSun 2:00 0 S
- Rule Perry 1956 1963 - Apr lastSun 2:00 1:00 D
-@@ -1014,7 +1014,7 @@
- #
- # Pike County, Indiana moved from central to eastern time in 1977,
- # then switched back in 2006, then switched back again in 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Pike 1955 only - May 1 0:00 1:00 D
- Rule Pike 1955 1960 - Sep lastSun 2:00 0 S
- Rule Pike 1956 1964 - Apr lastSun 2:00 1:00 D
-@@ -1035,7 +1035,7 @@
- # An article on page A3 of the Sunday, 1991-10-27 Washington Post
- # notes that Starke County switched from Central time to Eastern time as of
- # 1991-10-27.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Starke 1947 1961 - Apr lastSun 2:00 1:00 D
- Rule Starke 1947 1954 - Sep lastSun 2:00 0 S
- Rule Starke 1955 1956 - Oct lastSun 2:00 0 S
-@@ -1052,7 +1052,7 @@
- #
- # Pulaski County, Indiana, switched from eastern to central time in
- # April 2006 and then switched back in March 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Pulaski 1946 1960 - Apr lastSun 2:00 1:00 D
- Rule Pulaski 1946 1954 - Sep lastSun 2:00 0 S
- Rule Pulaski 1955 1956 - Oct lastSun 2:00 0 S
-@@ -1094,7 +1094,7 @@
- #
- # Part of Kentucky left its clocks alone in 1974.
- # This also includes Clark, Floyd, and Harrison counties in Indiana.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Louisville 1921 only - May 1 2:00 1:00 D
- Rule Louisville 1921 only - Sep 1 2:00 0 S
- Rule Louisville 1941 only - Apr lastSun 2:00 1:00 D
-@@ -1208,7 +1208,7 @@
- # election Michigan voters narrowly repealed DST, effective 1969.
- #
- # Most of Michigan observed DST from 1973 on, but was a bit late in 1975.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Detroit 1948 only - Apr lastSun 2:00 1:00 D
- Rule Detroit 1948 only - Sep lastSun 2:00 0 S
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1225,7 +1225,7 @@
- #
- # Dickinson, Gogebic, Iron, and Menominee Counties, Michigan,
- # switched from EST to CST/CDT in 1973.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Menominee 1946 only - Apr lastSun 2:00 1:00 D
- Rule Menominee 1946 only - Sep lastSun 2:00 0 S
- Rule Menominee 1966 only - Apr lastSun 2:00 1:00 D
-@@ -1395,7 +1395,7 @@
- # Oct 31, to Oct 27, 1918 (and Sunday is a more likely transition day
- # than Thursday) in all Canadian rulesets.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Canada 1918 only - Apr 14 2:00 1:00 D
- Rule Canada 1918 only - Oct 27 2:00 0 S
- Rule Canada 1942 only - Feb 9 2:00 1:00 W # War
-@@ -1418,7 +1418,7 @@
- # that follows the rules is the southeast corner, including Port Hope
- # Simpson and Mary's Harbour, but excluding, say, Black Tickle.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule StJohns 1917 only - Apr 8 2:00 1:00 D
- Rule StJohns 1917 only - Sep 17 2:00 0 S
- # Whitman gives 1919 Apr 5 and 1920 Apr 5; go with Shanks & Pottenger.
-@@ -1520,7 +1520,7 @@
- # bill say that it is "accommodating the customs and practices" of those
- # regions, which suggests that they have always been in-line with Halifax.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Halifax 1916 only - Apr 1 0:00 1:00 D
- Rule Halifax 1916 only - Oct 1 0:00 0 S
- Rule Halifax 1920 only - May 9 0:00 1:00 D
-@@ -1586,7 +1586,7 @@
- # clear that this was the case since at least 1993.
- # For now, assume it started in 1993.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Moncton 1933 1935 - Jun Sun>=8 1:00 1:00 D
- Rule Moncton 1933 1935 - Sep Sun>=8 1:00 0 S
- Rule Moncton 1936 1938 - Jun Sun>=1 1:00 1:00 D
-@@ -1795,7 +1795,7 @@
- # With some exceptions, the use of daylight saving may be said to be limited
- # to those cities and towns lying between Quebec city and Windsor, Ont.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Toronto 1919 only - Mar 30 23:30 1:00 D
- Rule Toronto 1919 only - Oct 26 0:00 0 S
- Rule Toronto 1920 only - May 2 2:00 1:00 D
-@@ -1893,7 +1893,7 @@
- # starting 1966. Since 02:00s is clearly correct for 1967 on, assume
- # it was also 02:00s in 1966.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Winn 1916 only - Apr 23 0:00 1:00 D
- Rule Winn 1916 only - Sep 17 0:00 0 S
- Rule Winn 1918 only - Apr 14 2:00 1:00 D
-@@ -1984,7 +1984,7 @@
- # long and rather painful to read.
- # http://www.qp.gov.sk.ca/documents/English/Statutes/Statutes/T14.pdf
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Regina 1918 only - Apr 14 2:00 1:00 D
- Rule Regina 1918 only - Oct 27 2:00 0 S
- Rule Regina 1930 1934 - May Sun>=1 0:00 1:00 D
-@@ -2034,7 +2034,7 @@
- # Boyer JP. Forcing Choice: The Risky Reward of Referendums. Dundum. 2017.
- # ISBN 978-1459739123.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Edm 1918 1919 - Apr Sun>=8 2:00 1:00 D
- Rule Edm 1918 only - Oct 27 2:00 0 S
- Rule Edm 1919 only - May 27 2:00 0 S
-@@ -2143,7 +2143,7 @@
- # https://searcharchives.vancouver.ca/daylight-saving-1918-starts-again-jul...
- # We have no further details, so omit them for now.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Vanc 1918 only - Apr 14 2:00 1:00 D
- Rule Vanc 1918 only - Oct 27 2:00 0 S
- Rule Vanc 1942 only - Feb 9 2:00 1:00 W # War
-@@ -2472,7 +2472,19 @@
- # consistency with nearby Dawson Creek, Creston, and Fort Nelson.
- # https://yukon.ca/en/news/yukon-end-seasonal-time-change
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# From Andrew G. Smith (2020-09-24):
-+# Yukon has completed its regulatory change to be on UTC -7 year-round....
-+# http://www.gov.yk.ca/legislation/regs/oic2020_125.pdf
-+# What we have done is re-defined Yukon Standard Time, as we are
-+# authorized to do under section 33 of our Interpretation Act:
-+# http://www.gov.yk.ca/legislation/acts/interpretation_c.pdf
-+#
-+# From Paul Eggert (2020-09-24):
-+# tzdb uses the obsolete YST abbreviation for standard time in Yukon through
-+# about 1970, and uses PST for standard time in Yukon since then. Consistent
-+# with that, use MST for -07, the new standard time in Yukon effective Nov. 1.
-+
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NT_YK 1918 only - Apr 14 2:00 1:00 D
- Rule NT_YK 1918 only - Oct 27 2:00 0 S
- Rule NT_YK 1919 only - May 25 2:00 1:00 D
-@@ -2526,12 +2538,12 @@
- Zone America/Whitehorse -9:00:12 - LMT 1900 Aug 20
- -9:00 NT_YK Y%sT 1967 May 28 0:00
- -8:00 NT_YK P%sT 1980
-- -8:00 Canada P%sT 2020 Mar 8 2:00
-+ -8:00 Canada P%sT 2020 Nov 1
- -7:00 - MST
- Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
- -9:00 NT_YK Y%sT 1973 Oct 28 0:00
- -8:00 NT_YK P%sT 1980
-- -8:00 Canada P%sT 2020 Mar 8 2:00
-+ -8:00 Canada P%sT 2020 Nov 1
- -7:00 - MST
-
-
-@@ -2746,7 +2758,7 @@
- # 5- The islands, reefs and keys shall take their timezone from the
- # longitude they are located at.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mexico 1939 only - Feb 5 0:00 1:00 D
- Rule Mexico 1939 only - Jun 25 0:00 0 S
- Rule Mexico 1940 only - Dec 9 0:00 1:00 D
-@@ -2951,7 +2963,7 @@
- # rules to sync with the U.S. starting in 2007....
- # http://www.jonesbahamas.com/?c=45&a=10412
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Bahamas 1964 1975 - Oct lastSun 2:00 0 S
- Rule Bahamas 1964 1975 - Apr lastSun 2:00 1:00 D
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -2963,7 +2975,7 @@
-
- # For 1899 Milne gives -3:58:29.2; round that.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Barb 1977 only - Jun 12 2:00 1:00 D
- Rule Barb 1977 1978 - Oct Sun>=1 2:00 0 S
- Rule Barb 1978 1980 - Apr Sun>=15 2:00 1:00 D
-@@ -2976,7 +2988,7 @@
-
- # Belize
- # Whitman entirely disagrees with Shanks; go with Shanks & Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Belize 1918 1942 - Oct Sun>=2 0:00 0:30 -0530
- Rule Belize 1919 1943 - Feb Sun>=9 0:00 0 CST
- Rule Belize 1973 only - Dec 5 0:00 1:00 CDT
-@@ -3013,7 +3025,7 @@
-
- # Milne gives -5:36:13.3 as San José mean time; round to nearest.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule CR 1979 1980 - Feb lastSun 0:00 1:00 D
- Rule CR 1979 1980 - Jun Sun>=1 0:00 0 S
- Rule CR 1991 1992 - Jan Sat>=15 0:00 1:00 D
-@@ -3187,7 +3199,7 @@
- # From Paul Eggert (2012-11-03):
- # For now, assume the future rule is first Sunday in November.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cuba 1928 only - Jun 10 0:00 1:00 D
- Rule Cuba 1928 only - Oct 10 0:00 0 S
- Rule Cuba 1940 1942 - Jun Sun>=1 0:00 1:00 D
-@@ -3256,7 +3268,7 @@
- # decided to revert.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule DR 1966 only - Oct 30 0:00 1:00 EDT
- Rule DR 1967 only - Feb 28 0:00 0 EST
- Rule DR 1969 1973 - Oct lastSun 0:00 0:30 -0430
-@@ -3273,7 +3285,7 @@
-
- # El Salvador
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Salv 1987 1988 - May Sun>=1 0:00 1:00 D
- Rule Salv 1987 1988 - Sep lastSun 0:00 0 S
- # There are too many San Salvadors elsewhere, so use America/El_Salvador
-@@ -3302,7 +3314,7 @@
- # (2006-04-19), says DST ends at 24:00. See
- # http://www.sieca.org.gt/Sitio_publico/Energeticos/Doc/Medidas/Cambio_Hora...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Guat 1973 only - Nov 25 0:00 1:00 D
- Rule Guat 1974 only - Feb 24 0:00 0 S
- Rule Guat 1983 only - May 21 0:00 1:00 D
-@@ -3383,7 +3395,7 @@
- # I have not been able to find a more authoritative source:
- # https://www.haitilibre.com/en/news-20319-haiti-notices-time-change-in-hai...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Haiti 1983 only - May 8 0:00 1:00 D
- Rule Haiti 1984 1987 - Apr lastSun 0:00 1:00 D
- Rule Haiti 1983 1987 - Oct lastSun 0:00 0 S
-@@ -3431,7 +3443,7 @@
- # http://www.laprensahn.com/pais_nota.php?id04962=7386
- # So it seems that Honduras will not enter DST this year....
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Hond 1987 1988 - May Sun>=1 0:00 1:00 D
- Rule Hond 1987 1988 - Sep lastSun 0:00 0 S
- Rule Hond 2006 only - May Sun>=1 0:00 1:00 D
-@@ -3522,7 +3534,7 @@
- # The natural sun time is restored in all the national territory, in that the
- # time is returned one hour at 01:00 am of October 1 of 2006.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Nic 1979 1980 - Mar Sun>=16 0:00 1:00 D
- Rule Nic 1979 1980 - Jun Mon>=23 0:00 0 S
- Rule Nic 2005 only - Apr 10 0:00 1:00 D
-diff --git openjdk.orig/jdk/make/data/tzdata/pacificnew openjdk/jdk/make/data/tzdata/pacificnew
-deleted file mode 100644
---- openjdk/jdk/make/data/tzdata/pacificnew
-+++ /dev/null
-@@ -1,52 +0,0 @@
--#
--# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--#
--# This code is free software; you can redistribute it and/or modify it
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation. Oracle designates this
--# particular file as subject to the "Classpath" exception as provided
--# by Oracle in the LICENSE file that accompanied this code.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--# tzdb data for proposed US election time (this file is obsolete)
--
--# This file is in the public domain, so clarified as of
--# 2009-05-17 by Arthur David Olson.
--
--# From Arthur David Olson (1989-04-05):
--# On 1989-04-05, the U. S. House of Representatives passed (238-154) a bill
--# establishing "Pacific Presidential Election Time"; it was not acted on
--# by the Senate or signed into law by the President.
--# You might want to change the "PE" (Presidential Election) below to
--# "Q" (Quadrennial) to maintain three-character zone abbreviations.
--# If you're really conservative, you might want to change it to "D".
--# Avoid "L" (Leap Year), which won't be true in 2100.
--
--# If Presidential Election Time is ever established, replace "XXXX" below
--# with the year the law takes effect and uncomment the "##" lines.
--
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--## Rule Twilite XXXX max - Apr Sun>=1 2:00 1:00 D
--## Rule Twilite XXXX max uspres Oct lastSun 2:00 1:00 PE
--## Rule Twilite XXXX max uspres Nov Sun>=7 2:00 0 S
--## Rule Twilite XXXX max nonpres Oct lastSun 2:00 0 S
--
--# Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL]
--## Zone America/Los_Angeles-PET -8:00 US P%sT XXXX
--## -8:00 Twilite P%sT
--
--# For now...
--Link America/Los_Angeles US/Pacific-New ##
-diff --git openjdk.orig/jdk/make/data/tzdata/southamerica openjdk/jdk/make/data/tzdata/southamerica
---- openjdk.orig/jdk/make/data/tzdata/southamerica
-+++ openjdk/jdk/make/data/tzdata/southamerica
-@@ -71,7 +71,7 @@
- # I am sending modifications to the Argentine time zone table...
- # AR was chosen because they are the ISO letters that represent Argentina.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Arg 1930 only - Dec 1 0:00 1:00 -
- Rule Arg 1931 only - Apr 1 0:00 0 -
- Rule Arg 1931 only - Oct 15 0:00 1:00 -
-@@ -792,7 +792,7 @@
- # From Paul Eggert (2013-10-17):
- # For now, assume western Amazonas will change as well.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Decree 20,466 <http://pcdsh01.on.br/HV20466.htm> (1931-10-01)
- # Decree 21,896 <http://pcdsh01.on.br/HV21896.htm> (1932-01-10)
- Rule Brazil 1931 only - Oct 3 11:00 1:00 -
-@@ -1281,7 +1281,7 @@
- # For now, assume that they will not revert,
- # since they have extended the expiration date once already.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Chile 1927 1931 - Sep 1 0:00 1:00 -
- Rule Chile 1928 1932 - Apr 1 0:00 0 -
- Rule Chile 1968 only - Nov 3 4:00u 1:00 -
-@@ -1381,7 +1381,7 @@
- # Milne gives 4:56:16.4 for Bogotá time in 1899; round to nearest. He writes,
- # "A variation of fifteen minutes in the public clocks of Bogota is not rare."
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule CO 1992 only - May 3 0:00 1:00 -
- Rule CO 1993 only - Apr 4 0:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1441,7 +1441,7 @@
- # (Not one step back), the clocks went back in 1993 and the experiment was not
- # repeated. For now, assume transitions were at 00:00 local time country-wide.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Ecuador 1992 only - Nov 28 0:00 1:00 -
- Rule Ecuador 1993 only - Feb 5 0:00 0 -
- #
-@@ -1535,7 +1535,7 @@
- # For now we will assume permanent -03 for the Falklands
- # until advised differently (to apply for 2012 and beyond, after the 2011
- # experiment was apparently successful.)
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 -
- Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 -
- Rule Falk 1939 only - Oct 1 0:00 1:00 -
-@@ -1581,7 +1581,7 @@
- # No time of the day is established for the adjustment, so people normally
- # adjust their clocks at 0 hour of the given dates.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Para 1975 1988 - Oct 1 0:00 1:00 -
- Rule Para 1975 1978 - Mar 1 0:00 0 -
- Rule Para 1979 1991 - Apr 1 0:00 0 -
-@@ -1674,7 +1674,7 @@
- # From Paul Eggert (2006-03-22):
- # Shanks & Pottenger don't have this transition. Assume 1986 was like 1987.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Peru 1938 only - Jan 1 0:00 1:00 -
- Rule Peru 1938 only - Apr 1 0:00 0 -
- Rule Peru 1938 1939 - Sep lastSun 0:00 1:00 -
-@@ -1770,7 +1770,7 @@
- # https://www.impo.com.uy/diariooficial/1926/03/10/2
- # https://www.impo.com.uy/diariooficial/1926/03/18/2
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Uruguay 1923 1925 - Oct 1 0:00 0:30 -
- Rule Uruguay 1924 1926 - Apr 1 0:00 0 -
- # From Tim Parenti (2018-02-15):
-diff --git openjdk.orig/jdk/make/data/tzdata/systemv openjdk/jdk/make/data/tzdata/systemv
-deleted file mode 100644
---- openjdk/jdk/make/data/tzdata/systemv
-+++ /dev/null
-@@ -1,62 +0,0 @@
--#
--# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--#
--# This code is free software; you can redistribute it and/or modify it
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation. Oracle designates this
--# particular file as subject to the "Classpath" exception as provided
--# by Oracle in the LICENSE file that accompanied this code.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--# tzdb data for System V rules (this file is obsolete)
--
--# This file is in the public domain, so clarified as of
--# 2009-05-17 by Arthur David Olson.
--
--# Old rules, should the need arise.
--# No attempt is made to handle Newfoundland, since it cannot be expressed
--# using the System V "TZ" scheme (half-hour offset), or anything outside
--# North America (no support for non-standard DST start/end dates), nor
--# the changes in the DST rules in the US after 1976 (which occurred after
--# the old rules were written).
--#
--# If you need the old rules, uncomment ## lines.
--# Compile this *without* leap second correction for true conformance.
--
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule SystemV min 1973 - Apr lastSun 2:00 1:00 D
--Rule SystemV min 1973 - Oct lastSun 2:00 0 S
--Rule SystemV 1974 only - Jan 6 2:00 1:00 D
--Rule SystemV 1974 only - Nov lastSun 2:00 0 S
--Rule SystemV 1975 only - Feb 23 2:00 1:00 D
--Rule SystemV 1975 only - Oct lastSun 2:00 0 S
--Rule SystemV 1976 max - Apr lastSun 2:00 1:00 D
--Rule SystemV 1976 max - Oct lastSun 2:00 0 S
--
--# Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL]
--## Zone SystemV/AST4ADT -4:00 SystemV A%sT
--## Zone SystemV/EST5EDT -5:00 SystemV E%sT
--## Zone SystemV/CST6CDT -6:00 SystemV C%sT
--## Zone SystemV/MST7MDT -7:00 SystemV M%sT
--## Zone SystemV/PST8PDT -8:00 SystemV P%sT
--## Zone SystemV/YST9YDT -9:00 SystemV Y%sT
--## Zone SystemV/AST4 -4:00 - AST
--## Zone SystemV/EST5 -5:00 - EST
--## Zone SystemV/CST6 -6:00 - CST
--## Zone SystemV/MST7 -7:00 - MST
--## Zone SystemV/PST8 -8:00 - PST
--## Zone SystemV/YST9 -9:00 - YST
--## Zone SystemV/HST10 -10:00 - HST
-diff --git openjdk.orig/jdk/make/gendata/GendataTZDB.gmk openjdk/jdk/make/gendata/GendataTZDB.gmk
---- openjdk.orig/jdk/make/gendata/GendataTZDB.gmk
-+++ openjdk/jdk/make/gendata/GendataTZDB.gmk
-@@ -29,7 +29,7 @@
- # Time zone data file creation
- #
- TZDATA_DIR := $(JDK_TOPDIR)/make/data/tzdata
--TZDATA_TZFILE := africa antarctica asia australasia europe northamerica pacificnew southamerica backward etcetera gmt jdk11_backward
-+TZDATA_TZFILE := africa antarctica asia australasia europe northamerica southamerica backward etcetera gmt jdk11_backward
- TZDATA_TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZDATA_TZFILE))
-
- GENDATA_TZDB_DAT := $(JDK_OUTPUTDIR)/lib/tzdb.dat
-diff --git openjdk.orig/jdk/src/aix/lib/tzmappings openjdk/jdk/src/aix/lib/tzmappings
---- openjdk.orig/jdk/src/aix/lib/tzmappings
-+++ openjdk/jdk/src/aix/lib/tzmappings
-@@ -568,7 +568,6 @@
- US/Michigan America/New_York
- US/Mountain America/Denver
- US/Pacific America/Los_Angeles
--US/Pacific-New America/Los_Angeles
- US/Samoa Pacific/Pago_Pago
- USAST-2 Africa/Johannesburg
- USAST-2USADT Europe/Istanbul
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
-@@ -1040,7 +1040,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java openjdk/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java openjdk/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java openjdk/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java openjdk/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java openjdk/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java openjdk/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java openjdk/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java openjdk/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java openjdk/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git a/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java b/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
-@@ -1037,7 +1037,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java openjdk/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
---- openjdk.orig/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
-+++ openjdk/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
-@@ -47,7 +47,7 @@
- String TESTDIR = System.getProperty("test.dir", ".");
- String SRCDIR = System.getProperty("test.src", ".");
- String tzdir = SRCDIR + File.separator + "tzdata";
-- String tzfiles = "africa antarctica asia australasia europe northamerica pacificnew southamerica backward etcetera systemv";
-+ String tzfiles = "africa antarctica asia australasia europe northamerica southamerica backward etcetera";
- String jdk_tzdir = SRCDIR + File.separator + "tzdata_jdk";
- String jdk_tzfiles = "gmt jdk11_backward";
- String zidir = TESTDIR + File.separator + "zi";
-@@ -194,8 +194,9 @@
-
- // test getAvailableIDs(raw);
- zids_new = TimeZone.getAvailableIDs(-8 * 60 * 60 * 1000);
-- //Arrays.sort(zids_new);
-+ Arrays.sort(zids_new);
- zids_old = ZoneInfoOld.getAvailableIDs(-8 * 60 * 60 * 1000);
-+ Arrays.sort(zids_old);
- if (!Arrays.equals(zids_new, zids_old)) {
- System.out.println("------------------------");
- System.out.println("NEW.getAvailableIDs(-8:00)");
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/VERSION openjdk/jdk/test/sun/util/calendar/zi/tzdata/VERSION
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/VERSION
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/VERSION
-@@ -21,4 +21,4 @@
- # or visit www.oracle.com if you need additional information or have any
- # questions.
- #
--tzdata2020a
-+tzdata2020b
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/africa openjdk/jdk/test/sun/util/calendar/zi/tzdata/africa
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/africa
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/africa
-@@ -87,7 +87,7 @@
- # Corrections are welcome.
-
- # Algeria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Algeria 1916 only - Jun 14 23:00s 1:00 S
- Rule Algeria 1916 1919 - Oct Sun>=1 23:00s 0 -
- Rule Algeria 1917 only - Mar 24 23:00s 1:00 S
-@@ -110,10 +110,9 @@
- Rule Algeria 1978 only - Sep 22 3:00 0 -
- Rule Algeria 1980 only - Apr 25 0:00 1:00 S
- Rule Algeria 1980 only - Oct 31 2:00 0 -
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
-+# See Europe/Paris for PMT-related transitions.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01
-+Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 16
- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
- 0:00 Algeria WE%sT 1940 Feb 25 2:00
- 1:00 Algeria CE%sT 1946 Oct 7
-@@ -199,7 +198,7 @@
- # Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this
- # did not apply to Cairo, Alexandria, or Port Said.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Egypt 1940 only - Jul 15 0:00 1:00 S
- Rule Egypt 1940 only - Oct 1 0:00 0 -
- Rule Egypt 1941 only - Apr 15 0:00 1:00 S
-@@ -434,7 +433,7 @@
- # now Ghana observed different DST regimes in different years. For
- # lack of better info, use Shanks except treat the minus sign as a
- # typo, and assume DST started in 1920 not 1936.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Ghana 1920 1942 - Sep 1 0:00 0:20 -
- Rule Ghana 1920 1942 - Dec 31 0:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -524,7 +523,7 @@
- # From Paul Eggert (2013-10-25):
- # For now, assume they're reverting to the pre-2012 rules of permanent UT +02.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Libya 1951 only - Oct 14 2:00 1:00 S
- Rule Libya 1952 only - Jan 1 0:00 0 -
- Rule Libya 1953 only - Oct 9 2:00 1:00 S
-@@ -647,7 +646,7 @@
- # "The trial ended on March 29, 2009, when the clocks moved back by one hour
- # at 2am (or 02:00) local time..."
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mauritius 1982 only - Oct 10 0:00 1:00 -
- Rule Mauritius 1983 only - Mar 21 0:00 0 -
- Rule Mauritius 2008 only - Oct lastSun 2:00 1:00 -
-@@ -898,17 +897,30 @@
- # https://maroc-diplomatique.net/maroc-le-retour-a-lheure-gmt-est-prevu-dim...
- # http://aujourdhui.ma/actualite/gmt1-retour-a-lheure-normale-dimanche-proc...
- #
--# From Paul Eggert (2020-04-14):
-+# From Milamber (2020-05-31)
-+# In Morocco (where I live), the end of Ramadan (Arabic month) is followed by
-+# the Eid al-Fitr, and concretely it's 1 or 2 day offs for the people (with
-+# traditional visiting of family, big lunches/dinners, etc.). So for this
-+# year the astronomical calculations don't include the following 2 days off in
-+# the calc. These 2 days fall in a Sunday/Monday, so it's not acceptable by
-+# people to have a time shift during these 2 days off. Perhaps you can modify
-+# the (predicted) rules for next years: if the end of Ramadan is a (probable)
-+# Friday or Saturday (and so the 2 days off are on a weekend), the next time
-+# shift will be the next weekend.
-+#
-+# From Paul Eggert (2020-05-31):
- # For now, guess that in the future Morocco will fall back at 03:00
- # the last Sunday before Ramadan, and spring forward at 02:00 the
--# first Sunday after the day after Ramadan. To implement this,
--# transition dates for 2021 through 2087 were determined by running
--# the following program under GNU Emacs 26.3.
--# (let ((islamic-year 1442))
-+# first Sunday after two days after Ramadan. To implement this,
-+# transition dates and times for 2019 through 2087 were determined by
-+# running the following program under GNU Emacs 26.3. (This algorithm
-+# also produces the correct transition dates for 2016 through 2018,
-+# though the times differ due to Morocco's time zone change in 2018.)
-+# (let ((islamic-year 1440))
- # (require 'cal-islam)
- # (while (< islamic-year 1511)
- # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
--# (b (1+ (calendar-islamic-to-absolute (list 10 1 islamic-year))))
-+# (b (+ 2 (calendar-islamic-to-absolute (list 10 1 islamic-year))))
- # (sunday 0))
- # (while (/= sunday (mod (setq a (1- a)) 7)))
- # (while (/= sunday (mod b 7))
-@@ -923,7 +935,7 @@
- # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
- # (setq islamic-year (+ 1 islamic-year))))
-
--# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Morocco 1939 only - Sep 12 0:00 1:00 -
- Rule Morocco 1939 only - Nov 19 0:00 0 -
- Rule Morocco 1940 only - Feb 25 0:00 1:00 -
-@@ -974,7 +986,7 @@
- Rule Morocco 2022 only - Mar 27 3:00 0 -
- Rule Morocco 2022 only - May 8 2:00 1:00 -
- Rule Morocco 2023 only - Mar 19 3:00 0 -
--Rule Morocco 2023 only - Apr 23 2:00 1:00 -
-+Rule Morocco 2023 only - Apr 30 2:00 1:00 -
- Rule Morocco 2024 only - Mar 10 3:00 0 -
- Rule Morocco 2024 only - Apr 14 2:00 1:00 -
- Rule Morocco 2025 only - Feb 23 3:00 0 -
-@@ -990,7 +1002,7 @@
- Rule Morocco 2029 only - Dec 30 3:00 0 -
- Rule Morocco 2030 only - Feb 10 2:00 1:00 -
- Rule Morocco 2030 only - Dec 22 3:00 0 -
--Rule Morocco 2031 only - Jan 26 2:00 1:00 -
-+Rule Morocco 2031 only - Feb 2 2:00 1:00 -
- Rule Morocco 2031 only - Dec 14 3:00 0 -
- Rule Morocco 2032 only - Jan 18 2:00 1:00 -
- Rule Morocco 2032 only - Nov 28 3:00 0 -
-@@ -1006,7 +1018,7 @@
- Rule Morocco 2037 only - Oct 4 3:00 0 -
- Rule Morocco 2037 only - Nov 15 2:00 1:00 -
- Rule Morocco 2038 only - Sep 26 3:00 0 -
--Rule Morocco 2038 only - Oct 31 2:00 1:00 -
-+Rule Morocco 2038 only - Nov 7 2:00 1:00 -
- Rule Morocco 2039 only - Sep 18 3:00 0 -
- Rule Morocco 2039 only - Oct 23 2:00 1:00 -
- Rule Morocco 2040 only - Sep 2 3:00 0 -
-@@ -1022,7 +1034,7 @@
- Rule Morocco 2045 only - Jul 9 3:00 0 -
- Rule Morocco 2045 only - Aug 20 2:00 1:00 -
- Rule Morocco 2046 only - Jul 1 3:00 0 -
--Rule Morocco 2046 only - Aug 5 2:00 1:00 -
-+Rule Morocco 2046 only - Aug 12 2:00 1:00 -
- Rule Morocco 2047 only - Jun 23 3:00 0 -
- Rule Morocco 2047 only - Jul 28 2:00 1:00 -
- Rule Morocco 2048 only - Jun 7 3:00 0 -
-@@ -1038,7 +1050,7 @@
- Rule Morocco 2053 only - Apr 13 3:00 0 -
- Rule Morocco 2053 only - May 25 2:00 1:00 -
- Rule Morocco 2054 only - Apr 5 3:00 0 -
--Rule Morocco 2054 only - May 10 2:00 1:00 -
-+Rule Morocco 2054 only - May 17 2:00 1:00 -
- Rule Morocco 2055 only - Mar 28 3:00 0 -
- Rule Morocco 2055 only - May 2 2:00 1:00 -
- Rule Morocco 2056 only - Mar 12 3:00 0 -
-@@ -1054,7 +1066,7 @@
- Rule Morocco 2061 only - Jan 16 3:00 0 -
- Rule Morocco 2061 only - Feb 27 2:00 1:00 -
- Rule Morocco 2062 only - Jan 8 3:00 0 -
--Rule Morocco 2062 only - Feb 12 2:00 1:00 -
-+Rule Morocco 2062 only - Feb 19 2:00 1:00 -
- Rule Morocco 2062 only - Dec 31 3:00 0 -
- Rule Morocco 2063 only - Feb 4 2:00 1:00 -
- Rule Morocco 2063 only - Dec 16 3:00 0 -
-@@ -1070,7 +1082,7 @@
- Rule Morocco 2068 only - Oct 21 3:00 0 -
- Rule Morocco 2068 only - Dec 2 2:00 1:00 -
- Rule Morocco 2069 only - Oct 13 3:00 0 -
--Rule Morocco 2069 only - Nov 17 2:00 1:00 -
-+Rule Morocco 2069 only - Nov 24 2:00 1:00 -
- Rule Morocco 2070 only - Oct 5 3:00 0 -
- Rule Morocco 2070 only - Nov 9 2:00 1:00 -
- Rule Morocco 2071 only - Sep 20 3:00 0 -
-@@ -1086,7 +1098,7 @@
- Rule Morocco 2076 only - Jul 26 3:00 0 -
- Rule Morocco 2076 only - Sep 6 2:00 1:00 -
- Rule Morocco 2077 only - Jul 18 3:00 0 -
--Rule Morocco 2077 only - Aug 22 2:00 1:00 -
-+Rule Morocco 2077 only - Aug 29 2:00 1:00 -
- Rule Morocco 2078 only - Jul 10 3:00 0 -
- Rule Morocco 2078 only - Aug 14 2:00 1:00 -
- Rule Morocco 2079 only - Jun 25 3:00 0 -
-@@ -1096,13 +1108,13 @@
- Rule Morocco 2081 only - Jun 1 3:00 0 -
- Rule Morocco 2081 only - Jul 13 2:00 1:00 -
- Rule Morocco 2082 only - May 24 3:00 0 -
--Rule Morocco 2082 only - Jun 28 2:00 1:00 -
-+Rule Morocco 2082 only - Jul 5 2:00 1:00 -
- Rule Morocco 2083 only - May 16 3:00 0 -
- Rule Morocco 2083 only - Jun 20 2:00 1:00 -
- Rule Morocco 2084 only - Apr 30 3:00 0 -
- Rule Morocco 2084 only - Jun 11 2:00 1:00 -
- Rule Morocco 2085 only - Apr 22 3:00 0 -
--Rule Morocco 2085 only - May 27 2:00 1:00 -
-+Rule Morocco 2085 only - Jun 3 2:00 1:00 -
- Rule Morocco 2086 only - Apr 14 3:00 0 -
- Rule Morocco 2086 only - May 19 2:00 1:00 -
- Rule Morocco 2087 only - Mar 30 3:00 0 -
-@@ -1203,7 +1215,7 @@
- # Use plain "WAT" and "CAT" for the time zone abbreviations, to be compatible
- # with Namibia's neighbors.
-
--# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Vanguard section, for zic and other parsers that support negative DST.
- #Rule Namibia 1994 only - Mar 21 0:00 -1:00 WAT
- #Rule Namibia 1994 2017 - Sep Sun>=1 2:00 0 CAT
-@@ -1326,7 +1338,7 @@
- # See Africa/Nairobi.
-
- # South Africa
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule SA 1942 1943 - Sep Sun>=15 2:00 1:00 -
- Rule SA 1943 1944 - Mar Sun>=15 2:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1359,7 +1371,7 @@
- # Abdalla of NTC, archived at:
- # https://mm.icann.org/pipermail/tz/2017-October/025333.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Sudan 1970 only - May 1 0:00 1:00 S
- Rule Sudan 1970 1985 - Oct 15 0:00 0 -
- Rule Sudan 1971 only - Apr 30 0:00 1:00 S
-@@ -1447,7 +1459,7 @@
- # http://www.almadenahnews.com/newss/news.php?c=118&id=38036
- # http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Tunisia 1939 only - Apr 15 23:00s 1:00 S
- Rule Tunisia 1939 only - Nov 18 23:00s 0 -
- Rule Tunisia 1940 only - Feb 25 23:00s 1:00 S
-@@ -1474,9 +1486,7 @@
- Rule Tunisia 2006 2008 - Mar lastSun 2:00s 1:00 S
- Rule Tunisia 2006 2008 - Oct lastSun 2:00s 0 -
-
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
--# Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
-+# See Europe/Paris for PMT-related transitions.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
- Zone Africa/Tunis 0:40:44 - LMT 1881 May 12
- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/antarctica openjdk/jdk/test/sun/util/calendar/zi/tzdata/antarctica
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/antarctica
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/antarctica
-@@ -93,15 +93,30 @@
- # Australian Antarctica Division informed us that Casey changed time
- # zone to UTC+11 in "the morning of 22nd October 2016".
-
-+# From Steffen Thorsen (2020-10-02, as corrected):
-+# Based on information we have received from the Australian Antarctic
-+# Division, Casey station and Macquarie Island station will move to Tasmanian
-+# daylight savings time on Sunday 4 October. This will take effect from 0001
-+# hrs on Sunday 4 October 2020 and will mean Casey and Macquarie Island will
-+# be on the same time zone as Hobart. Some past dates too for this 3 hour
-+# time change back and forth between UTC+8 and UTC+11 for Casey:
-+# - 2018 Oct 7 4:00 - 2019 Mar 17 3:00 - 2019 Oct 4 3:00 - 2020 Mar 8 3:00
-+# and now - 2020 Oct 4 0:01
-+
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Antarctica/Casey 0 - -00 1969
-- 8:00 - +08 2009 Oct 18 2:00
-+Zone Antarctica/Casey 0 - -00 1969
-+ 8:00 - +08 2009 Oct 18 2:00
- 11:00 - +11 2010 Mar 5 2:00
-- 8:00 - +08 2011 Oct 28 2:00
-+ 8:00 - +08 2011 Oct 28 2:00
- 11:00 - +11 2012 Feb 21 17:00u
-- 8:00 - +08 2016 Oct 22
-+ 8:00 - +08 2016 Oct 22
- 11:00 - +11 2018 Mar 11 4:00
-- 8:00 - +08
-+ 8:00 - +08 2018 Oct 7 4:00
-+ 11:00 - +11 2019 Mar 17 3:00
-+ 8:00 - +08 2019 Oct 4 3:00
-+ 11:00 - +11 2020 Mar 8 3:00
-+ 8:00 - +08 2020 Oct 4 0:01
-+ 11:00 - +11
- Zone Antarctica/Davis 0 - -00 1957 Jan 13
- 7:00 - +07 1964 Nov
- 0 - -00 1969 Feb
-@@ -247,7 +262,7 @@
- # suggested by Bengt-Inge Larsson comment them out for now, and approximate
- # with only UTC and CEST. Uncomment them when 2014b is more prevalent.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- #Rule Troll 2005 max - Mar 1 1:00u 1:00 +01
- Rule Troll 2005 max - Mar lastSun 1:00u 2:00 +02
- #Rule Troll 2005 max - Oct lastSun 1:00u 1:00 +01
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/asia openjdk/jdk/test/sun/util/calendar/zi/tzdata/asia
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/asia
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/asia
-@@ -93,7 +93,7 @@
- ###############################################################################
-
- # These rules are stolen from the 'europe' file.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EUAsia 1981 max - Mar lastSun 1:00u 1:00 S
- Rule EUAsia 1979 1995 - Sep lastSun 1:00u 0 -
- Rule EUAsia 1996 max - Oct lastSun 1:00u 0 -
-@@ -137,7 +137,7 @@
- # or
- # (brief)
- # http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Armenia 2011 only - Mar lastSun 2:00s 1:00 -
- Rule Armenia 2011 only - Oct lastSun 2:00s 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -163,7 +163,7 @@
- # http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-d...
- # http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Azer 1997 2015 - Mar lastSun 4:00 1:00 -
- Rule Azer 1997 2015 - Oct lastSun 5:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -250,7 +250,7 @@
- # http://www.thedailystar.net/newDesign/latest_news.php?nid=22817
- # http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Dhaka 2009 only - Jun 19 23:00 1:00 -
- Rule Dhaka 2009 only - Dec 31 24:00 0 -
-
-@@ -326,7 +326,7 @@
- # generally esteemed a success, it was announced early in 1920 that it would
- # not be repeated."
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Shang 1919 only - Apr 12 24:00 1:00 D
- Rule Shang 1919 only - Sep 30 24:00 0 S
-
-@@ -422,7 +422,7 @@
- # the Yangtze river delta area during that period of time although the scope
- # of such use will need to be investigated to determine.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Shang 1940 only - Jun 1 0:00 1:00 D
- Rule Shang 1940 only - Oct 12 24:00 0 S
- Rule Shang 1941 only - Mar 15 0:00 1:00 D
-@@ -485,7 +485,7 @@
- # to begin on 17 April.
- # http://data.people.com.cn/pic/101p/1988/04/1988041201.jpg
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule PRC 1986 only - May 4 2:00 1:00 D
- Rule PRC 1986 1991 - Sep Sun>=11 2:00 0 S
- Rule PRC 1987 1991 - Apr Sun>=11 2:00 1:00 D
-@@ -869,7 +869,7 @@
- # or dates for the 1942 and 1945 transitions.
- # The Japanese occupation of Hong Kong began 1941-12-25.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule HK 1946 only - Apr 21 0:00 1:00 S
- Rule HK 1946 only - Dec 1 3:30s 0 -
- Rule HK 1947 only - Apr 13 3:30s 1:00 S
-@@ -996,7 +996,7 @@
- # until 1945-09-21 at 01:00, overriding Shanks & Pottenger.
- # Likewise, use Yu-Cheng Chuang's data for DST in Taiwan.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Taiwan 1946 only - May 15 0:00 1:00 D
- Rule Taiwan 1946 only - Oct 1 0:00 0 S
- Rule Taiwan 1947 only - Apr 15 0:00 1:00 D
-@@ -1122,7 +1122,7 @@
- # The 1904 decree says that Macau changed from the meridian of
- # Fortaleza do Monte, presumably the basis for the 7:34:10 for LMT.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Macau 1942 1943 - Apr 30 23:00 1:00 -
- Rule Macau 1942 only - Nov 17 23:00 0 -
- Rule Macau 1943 only - Sep 30 23:00 0 S
-@@ -1180,7 +1180,7 @@
- # Cyprus to remain united in time. Cyprus Mail 2017-10-17.
- # https://cyprus-mail.com/2017/10/17/cyprus-remain-united-time/
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cyprus 1975 only - Apr 13 0:00 1:00 S
- Rule Cyprus 1975 only - Oct 12 0:00 0 -
- Rule Cyprus 1976 only - May 15 0:00 1:00 S
-@@ -1557,7 +1557,7 @@
- # be changed back to its previous state on the 24 hours of the
- # thirtieth day of Shahrivar.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iran 1978 1980 - Mar 20 24:00 1:00 -
- Rule Iran 1978 only - Oct 20 24:00 0 -
- Rule Iran 1979 only - Sep 18 24:00 0 -
-@@ -1699,7 +1699,7 @@
- # We have published a short article in English about the change:
- # https://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iraq 1982 only - May 1 0:00 1:00 -
- Rule Iraq 1982 1984 - Oct 1 0:00 0 -
- Rule Iraq 1983 only - Mar 31 0:00 1:00 -
-@@ -1722,6 +1722,10 @@
-
- # Israel
-
-+# For more info about the motivation for DST in Israel, see:
-+# Barak Y. Israel's Daylight Saving Time controversy. Israel Affairs.
-+# 2020-08-11. https://doi.org/10.1080/13537121.2020.1806564
-+
- # From Ephraim Silverberg (2001-01-11):
- #
- # I coined "IST/IDT" circa 1988. Until then there were three
-@@ -1743,7 +1747,7 @@
- # family is from India).
-
- # From Shanks & Pottenger:
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1940 only - Jun 1 0:00 1:00 D
- Rule Zion 1942 1944 - Nov 1 0:00 0 S
- Rule Zion 1943 only - Apr 1 2:00 1:00 D
-@@ -1835,7 +1839,7 @@
- # (except in 2002) is three nights before Yom Kippur [Day of Atonement]
- # (the eve of the 7th of Tishrei in the lunar Hebrew calendar).
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1989 only - Apr 30 0:00 1:00 D
- Rule Zion 1989 only - Sep 3 0:00 0 S
- Rule Zion 1990 only - Mar 25 0:00 1:00 D
-@@ -1851,7 +1855,7 @@
- # Ministry of Interior, Jerusalem, Israel. The spokeswoman can be reached by
- # calling the office directly at 972-2-6701447 or 972-2-6701448.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1994 only - Apr 1 0:00 1:00 D
- Rule Zion 1994 only - Aug 28 0:00 0 S
- Rule Zion 1995 only - Mar 31 0:00 1:00 D
-@@ -1871,7 +1875,7 @@
- #
- # where YYYY is the relevant year.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1996 only - Mar 15 0:00 1:00 D
- Rule Zion 1996 only - Sep 16 0:00 0 S
- Rule Zion 1997 only - Mar 21 0:00 1:00 D
-@@ -1894,7 +1898,7 @@
- #
- # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2000-2004.ps.gz
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2000 only - Apr 14 2:00 1:00 D
- Rule Zion 2000 only - Oct 6 1:00 0 S
- Rule Zion 2001 only - Apr 9 1:00 1:00 D
-@@ -1916,7 +1920,7 @@
- #
- # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2005 2012 - Apr Fri<=1 2:00 1:00 D
- Rule Zion 2005 only - Oct 9 2:00 0 S
- Rule Zion 2006 only - Oct 1 2:00 0 S
-@@ -1936,7 +1940,7 @@
- # As of 2013, DST starts at 02:00 on the Friday before the last Sunday
- # in March. DST ends at 02:00 on the last Sunday of October.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D
- Rule Zion 2013 max - Oct lastSun 2:00 0 S
-
-@@ -2036,7 +2040,7 @@
- # do in any POSIX or C platform. The "25:00" assumes zic from 2007 or later,
- # which should be safe now.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Japan 1948 only - May Sat>=1 24:00 1:00 D
- Rule Japan 1948 1951 - Sep Sun>=9 1:00 0 S
- Rule Japan 1949 only - Apr Sat>=1 24:00 1:00 D
-@@ -2113,7 +2117,7 @@
- # From Paul Eggert (2013-12-11):
- # As Steffen suggested, consider the past 21-month experiment to be DST.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Jordan 1973 only - Jun 6 0:00 1:00 S
- Rule Jordan 1973 1975 - Oct 1 0:00 0 -
- Rule Jordan 1974 1977 - May 1 0:00 1:00 S
-@@ -2439,7 +2443,7 @@
- # Our government cancels daylight saving time 6th of August 2005.
- # From 2005-08-12 our GMT-offset is +6, w/o any daylight saving.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Kyrgyz 1992 1996 - Apr Sun>=7 0:00s 1:00 -
- Rule Kyrgyz 1992 1996 - Sep lastSun 0:00 0 -
- Rule Kyrgyz 1997 2005 - Mar lastSun 2:30 1:00 -
-@@ -2495,7 +2499,7 @@
- # follow and continued to use GMT+9:00 for interoperability.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule ROK 1948 only - Jun 1 0:00 1:00 D
- Rule ROK 1948 only - Sep 12 24:00 0 S
- Rule ROK 1949 only - Apr 3 0:00 1:00 D
-@@ -2583,7 +2587,7 @@
-
-
- # Lebanon
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Lebanon 1920 only - Mar 28 0:00 1:00 S
- Rule Lebanon 1920 only - Oct 25 0:00 0 -
- Rule Lebanon 1921 only - Apr 3 0:00 1:00 S
-@@ -2613,7 +2617,7 @@
- 2:00 Lebanon EE%sT
-
- # Malaysia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NBorneo 1935 1941 - Sep 14 0:00 0:20 -
- Rule NBorneo 1935 1941 - Dec 14 0:00 0 -
- #
-@@ -2758,7 +2762,7 @@
- # September daylight saving time ends. Source:
- # http://zasag.mn/news/view/8969
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mongol 1983 1984 - Apr 1 0:00 1:00 -
- Rule Mongol 1983 only - Oct 1 0:00 0 -
- # Shanks & Pottenger and IATA SSIM say 1990s switches occurred at 00:00,
-@@ -2946,7 +2950,7 @@
- # "People laud PM's announcement to end DST"
- # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Pakistan 2002 only - Apr Sun>=2 0:00 1:00 S
- Rule Pakistan 2002 only - Oct Sun>=2 0:00 0 -
- Rule Pakistan 2008 only - Jun 1 0:00 1:00 S
-@@ -3248,7 +3252,7 @@
- # From Tim Parenti (2016-10-19):
- # Predict fall transitions on October's last Saturday at 01:00 from now on.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
- Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
- Rule EgyptAsia 1958 only - May 1 0:00 1:00 S
-@@ -3348,7 +3352,7 @@
- # influence of the sources. There is no current abbreviation for DST,
- # so use "PDT", the usual American style.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Phil 1936 only - Nov 1 0:00 1:00 D
- Rule Phil 1937 only - Feb 1 0:00 0 S
- Rule Phil 1954 only - Apr 12 0:00 1:00 D
-@@ -3496,7 +3500,7 @@
- 5:30 - +0530
-
- # Syria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Syria 1920 1923 - Apr Sun>=15 2:00 1:00 S
- Rule Syria 1920 1923 - Oct Sun>=1 2:00 0 -
- Rule Syria 1962 only - Apr 29 2:00 1:00 S
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/australasia openjdk/jdk/test/sun/util/calendar/zi/tzdata/australasia
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/australasia
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/australasia
-@@ -36,7 +36,7 @@
-
- # Please see the notes below for the controversy about "EST" versus "AEST" etc.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Aus 1917 only - Jan 1 0:01 1:00 D
- Rule Aus 1917 only - Mar 25 2:00 0 S
- Rule Aus 1942 only - Jan 1 2:00 1:00 D
-@@ -55,7 +55,7 @@
- 9:30 Aus AC%sT
- # Western Australia
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AW 1974 only - Oct lastSun 2:00s 1:00 D
- Rule AW 1975 only - Mar Sun>=1 2:00s 0 S
- Rule AW 1983 only - Oct lastSun 2:00s 1:00 D
-@@ -93,7 +93,7 @@
- # applies to all of the Whitsundays.
- # http://www.australia.gov.au/about-australia/australian-story/austn-islands
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AQ 1971 only - Oct lastSun 2:00s 1:00 D
- Rule AQ 1972 only - Feb lastSun 2:00s 0 S
- Rule AQ 1989 1991 - Oct lastSun 2:00s 1:00 D
-@@ -109,7 +109,7 @@
- 10:00 Holiday AE%sT
-
- # South Australia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AS 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AS 1986 only - Oct 19 2:00s 1:00 D
- Rule AS 1987 2007 - Oct lastSun 2:00s 1:00 D
-@@ -137,7 +137,7 @@
- # http://www.bom.gov.au/climate/averages/tables/dst_times.shtml
- # says King Island didn't observe DST from WWII until late 1971.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AT 1967 only - Oct Sun>=1 2:00s 1:00 D
- Rule AT 1968 only - Mar lastSun 2:00s 0 S
- Rule AT 1968 1985 - Oct lastSun 2:00s 1:00 D
-@@ -170,7 +170,7 @@
- 10:00 AT AE%sT
-
- # Victoria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AV 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AV 1972 only - Feb lastSun 2:00s 0 S
- Rule AV 1973 1985 - Mar Sun>=1 2:00s 0 S
-@@ -191,7 +191,7 @@
- 10:00 AV AE%sT
-
- # New South Wales
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AN 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AN 1972 only - Feb 27 2:00s 0 S
- Rule AN 1973 1981 - Mar Sun>=1 2:00s 0 S
-@@ -220,7 +220,7 @@
- 9:30 AS AC%sT
-
- # Lord Howe Island
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule LH 1981 1984 - Oct lastSun 2:00 1:00 -
- Rule LH 1982 1985 - Mar Sun>=1 2:00 0 -
- Rule LH 1985 only - Oct lastSun 2:00 0:30 -
-@@ -275,8 +275,9 @@
- 10:00 Aus AE%sT 1919 Apr 1 0:00s
- 0 - -00 1948 Mar 25
- 10:00 Aus AE%sT 1967
-- 10:00 AT AE%sT 2010 Apr 4 3:00
-- 11:00 - +11
-+ 10:00 AT AE%sT 2010
-+ 10:00 1:00 AEDT 2011
-+ 10:00 AT AE%sT
-
- # Christmas
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -403,7 +404,7 @@
- # From Michael Deckers (2019-08-06):
- # https://www.laws.gov.fj/LawsAsMade/downloadfile/848
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 -
- Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
- Rule Fiji 2009 only - Nov 29 2:00 1:00 -
-@@ -432,7 +433,7 @@
-
- # Guam
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # http://guamlegislature.com/Public_Laws_5th/PL05-025.pdf
- # http://documents.guam.gov/wp-content/uploads/E.O.-59-7-Guam-Daylight-Savi...
- Rule Guam 1959 only - Jun 27 2:00 1:00 D
-@@ -543,7 +544,7 @@
- 12:00 - +12
-
- # New Caledonia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NC 1977 1978 - Dec Sun>=1 0:00 1:00 -
- Rule NC 1978 1979 - Feb 27 0:00 0 -
- Rule NC 1996 only - Dec 1 2:00s 1:00 -
-@@ -558,7 +559,7 @@
-
- # New Zealand
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NZ 1927 only - Nov 6 2:00 1:00 S
- Rule NZ 1928 only - Mar 4 2:00 0 M
- Rule NZ 1928 1933 - Oct Sun>=8 2:00 0:30 S
-@@ -610,7 +611,7 @@
-
- # Cook Is
- # From Shanks & Pottenger:
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cook 1978 only - Nov 12 0:00 0:30 -
- Rule Cook 1979 1991 - Mar Sun>=1 0:00 0 -
- Rule Cook 1979 1990 - Oct lastSun 0:00 0:30 -
-@@ -755,7 +756,7 @@
- # That web page currently lists transitions for 2012/3 and 2013/4.
- # Assume the pattern instituted in 2012 will continue indefinitely.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule WS 2010 only - Sep lastSun 0:00 1 -
- Rule WS 2011 only - Apr Sat>=1 4:00 0 -
- Rule WS 2011 only - Sep lastSat 3:00 1 -
-@@ -799,7 +800,7 @@
- 13:00 - +13
-
- # Tonga
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Tonga 1999 only - Oct 7 2:00s 1:00 -
- Rule Tonga 2000 only - Mar 19 2:00s 0 -
- Rule Tonga 2000 2001 - Nov Sun>=1 2:00 1:00 -
-@@ -880,7 +881,7 @@
-
-
- # Vanuatu
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Vanuatu 1983 only - Sep 25 0:00 1:00 -
- Rule Vanuatu 1984 1991 - Mar Sun>=23 0:00 0 -
- Rule Vanuatu 1984 only - Oct 23 0:00 1:00 -
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/europe openjdk/jdk/test/sun/util/calendar/zi/tzdata/europe
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/europe
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/europe
-@@ -411,7 +411,7 @@
- # http://www.irishstatutebook.ie/eli/1926/sro/919/made/en/print
- # http://www.irishstatutebook.ie/eli/1947/sro/71/made/en/print
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Summer Time Act, 1916
- Rule GB-Eire 1916 only - May 21 2:00s 1:00 BST
- Rule GB-Eire 1916 only - Oct 1 2:00s 0 GMT
-@@ -552,7 +552,7 @@
- # The following is like GB-Eire and EU, except with standard time in
- # summer and negative daylight saving time in winter. It is for when
- # negative SAVE values are used.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- #Rule Eire 1971 only - Oct 31 2:00u -1:00 -
- #Rule Eire 1972 1980 - Mar Sun>=16 2:00u 0 -
- #Rule Eire 1972 1980 - Oct Sun>=23 2:00u -1:00 -
-@@ -589,7 +589,7 @@
- # predecessor organization, the European Communities.
- # For brevity they are called "EU rules" elsewhere in this file.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EU 1977 1980 - Apr Sun>=1 1:00u 1:00 S
- Rule EU 1977 only - Sep lastSun 1:00u 0 -
- Rule EU 1978 only - Oct 1 1:00u 0 -
-@@ -629,13 +629,13 @@
- # corrected in version 2008d). The circumstantial evidence is simply the
- # tz database itself, as seen below:
- #
--# Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
-+# Zone Europe/Paris ...
- # 0:00 France WE%sT 1945 Sep 16 3:00
- #
--# Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
-+# Zone Europe/Monaco ...
- # 0:00 France WE%sT 1945 Sep 16 3:00
- #
--# Zone Europe/Belgrade 1:22:00 - LMT 1884
-+# Zone Europe/Belgrade ...
- # 1:00 1:00 CEST 1945 Sep 16 2:00s
- #
- # Rule France 1945 only - Sep 16 3:00 0 -
-@@ -681,7 +681,7 @@
- #
- # The 1917-1921 decree URLs are from Alexander Belopolsky (2016-08-23).
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Russia 1917 only - Jul 1 23:00 1:00 MST # Moscow Summer Time
- #
- # Decree No. 142 (1917-12-22) http://istmat.info/node/28137
-@@ -795,7 +795,7 @@
-
-
- # Albania
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Albania 1940 only - Jun 16 0:00 1:00 S
- Rule Albania 1942 only - Nov 2 3:00 0 -
- Rule Albania 1943 only - Mar 29 2:00 1:00 S
-@@ -849,7 +849,7 @@
- # In 1946 the end of DST was on Monday, 7 October 1946, at 3:00 am.
- # Shanks had this right. Source: Die Weltpresse, 5. Oktober 1946, page 5.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Austria 1920 only - Apr 5 2:00s 1:00 S
- Rule Austria 1920 only - Sep 13 2:00s 0 -
- Rule Austria 1946 only - Apr 14 2:00s 1:00 S
-@@ -936,7 +936,7 @@
- # The 1918 rules are listed for completeness; they apply to unoccupied Belgium.
- # Assume Brussels switched to WET in 1918 when the armistice took effect.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Belgium 1918 only - Mar 9 0:00s 1:00 S
- Rule Belgium 1918 1919 - Oct Sat>=1 23:00s 0 -
- Rule Belgium 1919 only - Mar 1 23:00s 1:00 S
-@@ -996,7 +996,7 @@
- # EET -> EETDST is in 03:00 Local time in last Sunday of March ...
- # EETDST -> EET is in 04:00 Local time in last Sunday of October
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Bulg 1979 only - Mar 31 23:00 1:00 S
- Rule Bulg 1979 only - Oct 1 1:00 0 -
- Rule Bulg 1980 1982 - Apr Sat>=1 23:00 1:00 S
-@@ -1028,7 +1028,7 @@
- # We know of no English-language name for historical Czech winter time;
- # abbreviate it as "GMT", as it happened to be GMT.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Czech 1945 only - Apr Mon>=1 2:00s 1:00 S
- Rule Czech 1945 only - Oct 1 2:00s 0 -
- Rule Czech 1946 only - May 6 2:00s 1:00 S
-@@ -1084,7 +1084,7 @@
- # Hence the "02:00" of the 1980 law refers to standard time, not
- # wall-clock time, and so the EU rules were in effect in 1980.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Denmark 1916 only - May 14 23:00 1:00 S
- Rule Denmark 1916 only - Sep 30 23:00 0 -
- Rule Denmark 1940 only - May 15 0:00 1:00 S
-@@ -1186,7 +1186,7 @@
- # http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-t...
- # It is their only National Park.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D
- Rule Thule 1991 1992 - Sep lastSun 2:00 0 S
- Rule Thule 1993 2006 - Apr Sun>=1 2:00 1:00 D
-@@ -1317,7 +1317,7 @@
- # From Paul Eggert (2014-06-14):
- # Go with Oja over Shanks.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Finland 1942 only - Apr 2 24:00 1:00 S
- Rule Finland 1942 only - Oct 4 1:00 0 -
- Rule Finland 1981 1982 - Mar lastSun 2:00 1:00 S
-@@ -1349,10 +1349,58 @@
- # Françoise Gauquelin, Problèmes de l'heure résolus en astrologie,
- # Guy Trédaniel, Paris 1987
-
-+# From Michael Deckers (2020-06-11):
-+# the law of 1891 <https://gallica.bnf.fr/ark:/12148/bpt6k64415343.texteImage>
-+# was published on 1891-03-15, so it could only take force on 1891-03-16.
-+
-+# From Michael Deckers (2020-06-10):
-+# Le Gaulois, 1911-03-11, page 1/6, online at
-+# https://www.retronews.fr/societe/echo-de-presse/2018/01/29/1911-change-lh...
-+# ... [ Instantly, all pressure driven clock dials halted... Nine minutes and
-+# twenty-one seconds later the hands resumed their circular motion. ]
-+# There are also precise reports about how the change was prepared in train
-+# stations: all the publicly visible clocks stopped at midnight railway time
-+# (or were covered), only the chief of service had a watch, labeled
-+# "Heure ancienne", that he kept running until it reached 00:04:21, when
-+# he announced "Heure nouvelle". See the "Le Petit Journal 1911-03-11".
-+# https://gallica.bnf.fr/ark:/12148/bpt6k6192911/f1.item.zoom
-+#
-+# From Michael Deckers (2020-06-12):
-+# That "all French clocks stopped" for 00:09:21 is a misreading of French
-+# newspapers; this sort of adjustment applies only to certain
-+# remote-controlled clocks ("pendules pneumatiques", of which there existed
-+# perhaps a dozen in Paris, and which simply could not be set back remotely),
-+# but not to all the clocks in all French towns and villages. For instance,
-+# the following story in the "Courrier de Saône-et-Loire" 1911-03-11, page 2:
-+# only works if legal time was stepped back (was not monotone): ...
-+# [One can observe that children who had been born at midnight less 5
-+# minutes and who had died at midnight of the old time, would turn out to
-+# be dead before being born, time having been set back and having
-+# suppressed 9 minutes and 25 seconds of their existence, that is, more
-+# than they could spend.]
-+#
-+# From Paul Eggert (2020-06-12):
-+# French time in railway stations was legally five minutes behind civil time,
-+# which explains why railway "old time" ran to 00:04:21 instead of to 00:09:21.
-+# The law's text (which Michael Deckers noted is at
-+# <https://gallica.bnf.fr/ark:/12148/bpt6k2022333z/f2>) says only that
-+# at 1911-03-11 00:00 legal time was that of Paris mean time delayed by
-+# nine minutes and twenty-one seconds, and does not say how the
-+# transition from Paris mean time was to occur.
-+#
-+# tzdb has no way to represent stopped clocks. As the railway practice
-+# was to keep a watch running on "old time" to decide when to restart
-+# the other clocks, this could be modeled as a transition for "old time" at
-+# 00:09:21. However, since the law was ambiguous and clocks outside railway
-+# stations were probably done haphazardly with the popular impression being
-+# that the transition was done at 00:00 "old time", simply leave the time
-+# blank; this causes zic to default to 00:00 "old time" which is good enough.
-+# Do something similar for the 1891-03-16 transition. There are similar
-+# problems in Algiers, Monaco and Tunis.
-
- #
- # Shank & Pottenger seem to use '24:00' ambiguously; resolve it with Whitman.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule France 1916 only - Jun 14 23:00s 1:00 S
- Rule France 1916 1919 - Oct Sun>=1 23:00s 0 -
- Rule France 1917 only - Mar 24 23:00s 1:00 S
-@@ -1412,13 +1460,11 @@
- # go with Excoffier's 28/3/76 0hUT and 25/9/76 23hUT.
- Rule France 1976 only - Mar 28 1:00 1:00 S
- Rule France 1976 only - Sep 26 1:00 0 -
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time, and Whitman 0:09:05,
--# but Howse quotes the actual French legislation as saying 0:09:21.
--# Go with Howse. Howse writes that the time in France was officially based
-+# Howse writes that the time in France was officially based
- # on PMT-0:09:21 until 1978-08-09, when the time base finally switched to UTC.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
-- 0:09:21 - PMT 1911 Mar 11 0:01 # Paris MT
-+Zone Europe/Paris 0:09:21 - LMT 1891 Mar 16
-+ 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
- # Shanks & Pottenger give 1940 Jun 14 0:00; go with Excoffier and Le Corre.
- 0:00 France WE%sT 1940 Jun 14 23:00
- # Le Corre says Paris stuck with occupied-France time after the liberation;
-@@ -1447,7 +1493,7 @@
- # this was equivalent to UT +03, not +04.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Germany 1946 only - Apr 14 2:00s 1:00 S
- Rule Germany 1946 only - Oct 7 2:00s 0 -
- Rule Germany 1947 1949 - Oct Sun>=1 2:00s 0 -
-@@ -1499,7 +1545,7 @@
- 1:00 EU CE%sT
-
- # Greece
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Whitman gives 1932 Jul 5 - Nov 1; go with Shanks & Pottenger.
- Rule Greece 1932 only - Jul 7 0:00 1:00 S
- Rule Greece 1932 only - Sep 1 0:00 0 -
-@@ -1534,38 +1580,69 @@
- 2:00 EU EE%sT
-
- # Hungary
--# From Paul Eggert (2014-07-15):
--# Dates for 1916-1945 are taken from:
--# Oross A. Jelen a múlt jövője: a nyári időszámítás Magyarországon 1916-1945.
--# National Archives of Hungary (2012-10-29).
--# http://mnl.gov.hu/a_het_dokumentuma/a_nyari_idoszamitas_magyarorszagon_19...
--# This source does not always give times, which are taken from Shanks
--# & Pottenger (which disagree about the dates).
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule Hungary 1918 only - Apr 1 3:00 1:00 S
--Rule Hungary 1918 only - Sep 16 3:00 0 -
--Rule Hungary 1919 only - Apr 15 3:00 1:00 S
--Rule Hungary 1919 only - Nov 24 3:00 0 -
-+
-+# From Michael Deckers (2020-06-09):
-+# an Austrian encyclopedia of railroads of 1913, online at
-+# http://www.zeno.org/Roell-1912/A/Eisenbahnzeit
-+# says that the switch [to CET] happened on 1890-11-01.
-+
-+# From Géza Nyáry (2020-06-07):
-+# Data for 1918-1983 are based on the archive database of Library Hungaricana.
-+# The dates are collected from original, scanned governmental orders,
-+# bulletins, instructions and public press.
-+# [See URLs below.]
-+
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1918/?pg=238
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1919/?pg=808
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1920/?pg=201
-+Rule Hungary 1918 1919 - Apr 15 2:00 1:00 S
-+Rule Hungary 1918 1920 - Sep Mon>=15 3:00 0 -
-+Rule Hungary 1920 only - Apr 5 2:00 1:00 S
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1945/?pg=882
- Rule Hungary 1945 only - May 1 23:00 1:00 S
--Rule Hungary 1945 only - Nov 1 0:00 0 -
-+Rule Hungary 1945 only - Nov 1 1:00 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1946_03/?pg=49
- Rule Hungary 1946 only - Mar 31 2:00s 1:00 S
--Rule Hungary 1946 1949 - Oct Sun>=1 2:00s 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1946_09/?pg=54
-+Rule Hungary 1946 only - Oct 7 2:00 0 -
-+# https://library.hungaricana.hu/hu/view/KulfBelfHirek_1947_04_1__001-123/?...
-+# https://library.hungaricana.hu/hu/view/DunantuliNaplo_1947_09/?pg=128
-+# https://library.hungaricana.hu/hu/view/KulfBelfHirek_1948_03_3__001-123/?...
-+# https://library.hungaricana.hu/hu/view/Zala_1948_09/?pg=64
-+# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniN...
-+# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniN...
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1949_09/?pg=94
- Rule Hungary 1947 1949 - Apr Sun>=4 2:00s 1:00 S
--Rule Hungary 1950 only - Apr 17 2:00s 1:00 S
--Rule Hungary 1950 only - Oct 23 2:00s 0 -
--Rule Hungary 1954 1955 - May 23 0:00 1:00 S
--Rule Hungary 1954 1955 - Oct 3 0:00 0 -
--Rule Hungary 1956 only - Jun Sun>=1 0:00 1:00 S
--Rule Hungary 1956 only - Sep lastSun 0:00 0 -
--Rule Hungary 1957 only - Jun Sun>=1 1:00 1:00 S
--Rule Hungary 1957 only - Sep lastSun 3:00 0 -
--Rule Hungary 1980 only - Apr 6 1:00 1:00 S
-+Rule Hungary 1947 1949 - Oct Sun>=1 2:00s 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1954/?pg...
-+Rule Hungary 1954 only - May 23 0:00 1:00 S
-+Rule Hungary 1954 only - Oct 3 0:00 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1955/?pg...
-+Rule Hungary 1955 only - May 22 2:00 1:00 S
-+Rule Hungary 1955 only - Oct 2 3:00 0 -
-+# https://library.hungaricana.hu/hu/view/HevesMegyeiNepujsag_1956_06/?pg=0
-+# https://library.hungaricana.hu/hu/view/EszakMagyarorszag_1956_06/?pg=6
-+# https://library.hungaricana.hu/hu/view/SzolnokMegyeiNeplap_1957_04/?pg=120
-+# https://library.hungaricana.hu/hu/view/PestMegyeiHirlap_1957_09/?pg=143
-+Rule Hungary 1956 1957 - Jun Sun>=1 2:00 1:00 S
-+Rule Hungary 1956 1957 - Sep lastSun 3:00 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1980/?pg...
-+Rule Hungary 1980 only - Apr 6 0:00 1:00 S
-+Rule Hungary 1980 only - Sep 28 1:00 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1981_01/?pg=79
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1982/?pg...
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1983/?pg=85
-+Rule Hungary 1981 1983 - Mar lastSun 0:00 1:00 S
-+Rule Hungary 1981 1983 - Sep lastSun 1:00 0 -
-+#
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Budapest 1:16:20 - LMT 1890 Oct
-+Zone Europe/Budapest 1:16:20 - LMT 1890 Nov 1
- 1:00 C-Eur CE%sT 1918
-- 1:00 Hungary CE%sT 1941 Apr 8
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1941/?pg=1204
-+ 1:00 Hungary CE%sT 1941 Apr 7 23:00
- 1:00 C-Eur CE%sT 1945
-- 1:00 Hungary CE%sT 1980 Sep 28 2:00s
-+ 1:00 Hungary CE%sT 1984
- 1:00 EU CE%sT
-
- # Iceland
-@@ -1601,7 +1678,7 @@
- # The information below is taken from the 1988 Almanak; see
- # http://www.almanak.hi.is/klukkan.html
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iceland 1917 1919 - Feb 19 23:00 1:00 -
- Rule Iceland 1917 only - Oct 21 1:00 0 -
- Rule Iceland 1918 1919 - Nov 16 1:00 0 -
-@@ -1693,7 +1770,7 @@
- # to 1944-06-04; although Rome was an open city during this period, it
- # was effectively controlled by Germany.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Italy 1916 only - Jun 3 24:00 1:00 S
- Rule Italy 1916 1917 - Sep 30 24:00 0 -
- Rule Italy 1917 only - Mar 31 24:00 1:00 S
-@@ -1803,7 +1880,7 @@
- # urged Lithuania and Estonia to adopt a similar time policy, but it
- # appears that they will not do so....
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Latvia 1989 1996 - Mar lastSun 2:00s 1:00 S
- Rule Latvia 1989 1996 - Sep lastSun 2:00s 0 -
-
-@@ -1896,7 +1973,7 @@
- # Luxembourg
- # Whitman disagrees with most of these dates in minor ways;
- # go with Shanks & Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Lux 1916 only - May 14 23:00 1:00 S
- Rule Lux 1916 only - Oct 1 1:00 0 -
- Rule Lux 1917 only - Apr 28 23:00 1:00 S
-@@ -1937,7 +2014,7 @@
- # From Paul Eggert (2016-10-21):
- # Assume 1900-1972 was like Rome, overriding Shanks.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Malta 1973 only - Mar 31 0:00s 1:00 S
- Rule Malta 1973 only - Sep 29 0:00s 0 -
- Rule Malta 1974 only - Apr 21 0:00s 1:00 S
-@@ -2010,7 +2087,7 @@
- # says the 2014-03-30 spring-forward transition was at 02:00 local time.
- # Guess that since 1997 Moldova has switched one hour before the EU.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Moldova 1997 max - Mar lastSun 2:00 1:00 S
- Rule Moldova 1997 max - Oct lastSun 3:00 0 -
-
-@@ -2028,11 +2105,24 @@
- 2:00 Moldova EE%sT
-
- # Monaco
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
-+#
-+# From Michael Deckers (2020-06-12):
-+# In the "Journal de Monaco" of 1892-05-24, online at
-+# https://journaldemonaco.gouv.mc/var/jdm/storage/original/application/b1c6...
-+# we read: ...
-+# [In virtue of a Sovereign Ordinance of the May 13 of the current [year],
-+# legal time in the Principality will be set to, from the date of June 1,
-+# 1892 onwards, to the meridian of Paris, as in France.]
-+# In the "Journal de Monaco" of 1911-03-28, online at
-+# https://journaldemonaco.gouv.mc/var/jdm/storage/original/application/de74...
-+# we read an ordinance of 1911-03-16: ...
-+# [Legal time in the Principality will be set, from the date of promulgation
-+# of the present ordinance, to legal time in France.... Consequently, legal
-+# time will be retarded by 9 minutes and 21 seconds.]
-+#
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
-- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
-+Zone Europe/Monaco 0:29:32 - LMT 1892 Jun 1
-+ 0:09:21 - PMT 1911 Mar 29 # Paris Mean Time
- 0:00 France WE%sT 1945 Sep 16 3:00
- 1:00 France CE%sT 1977
- 1:00 EU CE%sT
-@@ -2080,7 +2170,7 @@
- # The data entries before 1945 are taken from
- # https://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Neth 1916 only - May 1 0:00 1:00 NST # Netherlands Summer Time
- Rule Neth 1916 only - Oct 1 0:00 0 AMT # Amsterdam Mean Time
- Rule Neth 1917 only - Apr 16 2:00s 1:00 NST
-@@ -2117,7 +2207,7 @@
- # Norway
- # http://met.no/met/met_lex/q_u/sommertid.html (2004-01) agrees with Shanks &
- # Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Norway 1916 only - May 22 1:00 1:00 S
- Rule Norway 1916 only - Sep 30 0:00 0 -
- Rule Norway 1945 only - Apr 2 2:00s 1:00 S
-@@ -2186,7 +2276,7 @@
- # The 1919 dates and times can be found in Tygodnik Urzędowy nr 1 (1919-03-20),
- # <http://www.wbc.poznan.pl/publication/32156> pp 1-2.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Poland 1918 1919 - Sep 16 2:00s 0 -
- Rule Poland 1919 only - Apr 15 2:00s 1:00 S
- Rule Poland 1944 only - Apr 3 2:00s 1:00 S
-@@ -2257,7 +2347,7 @@
- # Guess that the Azores changed to EU rules in 1992 (since that's when Portugal
- # harmonized with EU rules), and that they stayed +0:00 that winter.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # DSH writes that despite Decree 1,469 (1915), the change to the clocks was not
- # done every year, depending on what Spain did, because of railroad schedules.
- # Go with Shanks & Pottenger.
-@@ -2370,7 +2460,7 @@
- # assume that Romania and Moldova switched to EU rules in 1997,
- # the same year as Bulgaria.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Romania 1932 only - May 21 0:00s 1:00 S
- Rule Romania 1932 1939 - Oct Sun>=1 0:00s 0 -
- Rule Romania 1933 1939 - Apr Sun>=2 0:00s 1:00 S
-@@ -3468,14 +3558,14 @@
- # fallback transition from the next day's 00:59... to 00:00.
-
- # From Michael Deckers (2016-12-15):
--# The Royal Decree of 1900-06-26 quoted by Planesas, online at
-+# The Royal Decree of 1900-07-26 quoted by Planesas, online at
- # https://www.boe.es/datos/pdfs/BOE//1900/209/A00383-00384.pdf
- # says in its article 5 (my translation):
- # These dispositions will enter into force beginning with the
- # instant at which, according to the time indicated in article 1,
- # the 1st day of January of 1901 will begin.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Spain 1918 only - Apr 15 23:00 1:00 S
- Rule Spain 1918 1919 - Oct 6 24:00s 0 -
- Rule Spain 1919 only - Apr 6 23:00 1:00 S
-@@ -3612,7 +3702,7 @@
- # By the end of the 18th century clocks and watches became commonplace
- # and their performance improved enormously. Communities began to keep
- # mean time in preference to apparent time - Geneva from 1780 ....
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # From Whitman (who writes "Midnight?"):
- # Rule Swiss 1940 only - Nov 2 0:00 1:00 S
- # Rule Swiss 1940 only - Dec 31 0:00 0 -
-@@ -3699,7 +3789,7 @@
- # 1853-07-16, though it probably occurred at some other date in Zurich, and
- # legal civil time probably changed at still some other transition date.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Swiss 1941 1942 - May Mon>=1 1:00 1:00 S
- Rule Swiss 1941 1942 - Oct Mon>=1 2:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -3848,7 +3938,7 @@
- # Although Google Translate misfires on that source, it looks like
- # Turkey reversed last month's decision, and so will stay at +03.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Turkey 1916 only - May 1 0:00 1:00 S
- Rule Turkey 1916 only - Oct 1 0:00 0 -
- Rule Turkey 1920 only - Mar 28 0:00 1:00 S
-@@ -4006,7 +4096,7 @@
- 2:00 1:00 EEST 1991 Sep 29 3:00
- 2:00 E-Eur EE%sT 1995
- 2:00 EU EE%sT
--# Ruthenia used CET 1990/1991.
-+# Transcarpathia used CET 1990/1991.
- # "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but
- # "Uzhgorod" is more common in English.
- Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/leapseconds openjdk/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
-@@ -91,11 +91,11 @@
- # Any additional leap seconds will come after this.
- # This Expires line is commented out for now,
- # so that pre-2020a zic implementations do not reject this file.
--#Expires 2020 Dec 28 00:00:00
-+#Expires 2021 Jun 28 00:00:00
-
- # POSIX timestamps for the data in this file:
- #updated 1467936000 (2016-07-08 00:00:00 UTC)
--#expires 1609113600 (2020-12-28 00:00:00 UTC)
-+#expires 1624838400 (2021-06-28 00:00:00 UTC)
-
--# Updated through IERS Bulletin C59
--# File expires on: 28 December 2020
-+# Updated through IERS Bulletin C60
-+# File expires on: 28 June 2021
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/northamerica openjdk/jdk/test/sun/util/calendar/zi/tzdata/northamerica
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/northamerica
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/northamerica
-@@ -193,7 +193,7 @@
- # U.S. government action. So even though the "US" rules have changed
- # in the latest release, other countries won't be affected.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule US 1918 1919 - Mar lastSun 2:00 1:00 D
- Rule US 1918 1919 - Oct lastSun 2:00 0 S
- Rule US 1942 only - Feb 9 2:00 1:00 W # War
-@@ -370,7 +370,7 @@
- # Eastern time (i.e., -4:56:01.6) just before the 1883 switch. Round to the
- # nearest second.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule NYC 1920 only - Mar lastSun 2:00 1:00 D
- Rule NYC 1920 only - Oct lastSun 2:00 0 S
- Rule NYC 1921 1966 - Apr lastSun 2:00 1:00 D
-@@ -454,7 +454,7 @@
- # The Tennessean 2007-05-11, republished 2015-04-06.
- # https://www.tennessean.com/story/insider/extras/2015/04/06/archives-seige...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Chicago 1920 only - Jun 13 2:00 1:00 D
- Rule Chicago 1920 1921 - Oct lastSun 2:00 0 S
- Rule Chicago 1921 only - Mar lastSun 2:00 1:00 D
-@@ -523,7 +523,7 @@
- # El Paso Times. 2018-10-24 06:40 -06.
- # https://www.elpasotimes.com/story/news/local/el-paso/2018/10/24/el-pasoan...
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Denver 1920 1921 - Mar lastSun 2:00 1:00 D
- Rule Denver 1920 only - Oct lastSun 2:00 0 S
- Rule Denver 1921 only - May 22 2:00 0 S
-@@ -576,7 +576,7 @@
- # https://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&contex...
- # https://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&contex...
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule CA 1948 only - Mar 14 2:01 1:00 D
- Rule CA 1949 only - Jan 1 2:00 0 S
- Rule CA 1950 1966 - Apr lastSun 1:00 1:00 D
-@@ -934,7 +934,7 @@
- # going to switch from Central to Eastern Time on March 11, 2007....
- # http://www.indystar.com/apps/pbcs.dll/article?AID=/20070207/LOCAL190108/7...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Indianapolis 1941 only - Jun 22 2:00 1:00 D
- Rule Indianapolis 1941 1954 - Sep lastSun 2:00 0 S
- Rule Indianapolis 1946 1954 - Apr lastSun 2:00 1:00 D
-@@ -953,7 +953,7 @@
- #
- # Eastern Crawford County, Indiana, left its clocks alone in 1974,
- # as well as from 1976 through 2005.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Marengo 1951 only - Apr lastSun 2:00 1:00 D
- Rule Marengo 1951 only - Sep lastSun 2:00 0 S
- Rule Marengo 1954 1960 - Apr lastSun 2:00 1:00 D
-@@ -972,7 +972,7 @@
- # Daviess, Dubois, Knox, and Martin Counties, Indiana,
- # switched from eastern to central time in April 2006, then switched back
- # in November 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Vincennes 1946 only - Apr lastSun 2:00 1:00 D
- Rule Vincennes 1946 only - Sep lastSun 2:00 0 S
- Rule Vincennes 1953 1954 - Apr lastSun 2:00 1:00 D
-@@ -997,7 +997,7 @@
- # The Indianapolis News, Friday 27 October 1967 states that Perry County
- # returned to CST. It went again to EST on 27 April 1969, as documented by the
- # Indianapolis star of Saturday 26 April.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Perry 1955 only - May 1 0:00 1:00 D
- Rule Perry 1955 1960 - Sep lastSun 2:00 0 S
- Rule Perry 1956 1963 - Apr lastSun 2:00 1:00 D
-@@ -1014,7 +1014,7 @@
- #
- # Pike County, Indiana moved from central to eastern time in 1977,
- # then switched back in 2006, then switched back again in 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Pike 1955 only - May 1 0:00 1:00 D
- Rule Pike 1955 1960 - Sep lastSun 2:00 0 S
- Rule Pike 1956 1964 - Apr lastSun 2:00 1:00 D
-@@ -1035,7 +1035,7 @@
- # An article on page A3 of the Sunday, 1991-10-27 Washington Post
- # notes that Starke County switched from Central time to Eastern time as of
- # 1991-10-27.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Starke 1947 1961 - Apr lastSun 2:00 1:00 D
- Rule Starke 1947 1954 - Sep lastSun 2:00 0 S
- Rule Starke 1955 1956 - Oct lastSun 2:00 0 S
-@@ -1052,7 +1052,7 @@
- #
- # Pulaski County, Indiana, switched from eastern to central time in
- # April 2006 and then switched back in March 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Pulaski 1946 1960 - Apr lastSun 2:00 1:00 D
- Rule Pulaski 1946 1954 - Sep lastSun 2:00 0 S
- Rule Pulaski 1955 1956 - Oct lastSun 2:00 0 S
-@@ -1094,7 +1094,7 @@
- #
- # Part of Kentucky left its clocks alone in 1974.
- # This also includes Clark, Floyd, and Harrison counties in Indiana.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Louisville 1921 only - May 1 2:00 1:00 D
- Rule Louisville 1921 only - Sep 1 2:00 0 S
- Rule Louisville 1941 only - Apr lastSun 2:00 1:00 D
-@@ -1208,7 +1208,7 @@
- # election Michigan voters narrowly repealed DST, effective 1969.
- #
- # Most of Michigan observed DST from 1973 on, but was a bit late in 1975.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Detroit 1948 only - Apr lastSun 2:00 1:00 D
- Rule Detroit 1948 only - Sep lastSun 2:00 0 S
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1225,7 +1225,7 @@
- #
- # Dickinson, Gogebic, Iron, and Menominee Counties, Michigan,
- # switched from EST to CST/CDT in 1973.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Menominee 1946 only - Apr lastSun 2:00 1:00 D
- Rule Menominee 1946 only - Sep lastSun 2:00 0 S
- Rule Menominee 1966 only - Apr lastSun 2:00 1:00 D
-@@ -1395,7 +1395,7 @@
- # Oct 31, to Oct 27, 1918 (and Sunday is a more likely transition day
- # than Thursday) in all Canadian rulesets.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Canada 1918 only - Apr 14 2:00 1:00 D
- Rule Canada 1918 only - Oct 27 2:00 0 S
- Rule Canada 1942 only - Feb 9 2:00 1:00 W # War
-@@ -1418,7 +1418,7 @@
- # that follows the rules is the southeast corner, including Port Hope
- # Simpson and Mary's Harbour, but excluding, say, Black Tickle.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule StJohns 1917 only - Apr 8 2:00 1:00 D
- Rule StJohns 1917 only - Sep 17 2:00 0 S
- # Whitman gives 1919 Apr 5 and 1920 Apr 5; go with Shanks & Pottenger.
-@@ -1520,7 +1520,7 @@
- # bill say that it is "accommodating the customs and practices" of those
- # regions, which suggests that they have always been in-line with Halifax.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Halifax 1916 only - Apr 1 0:00 1:00 D
- Rule Halifax 1916 only - Oct 1 0:00 0 S
- Rule Halifax 1920 only - May 9 0:00 1:00 D
-@@ -1586,7 +1586,7 @@
- # clear that this was the case since at least 1993.
- # For now, assume it started in 1993.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Moncton 1933 1935 - Jun Sun>=8 1:00 1:00 D
- Rule Moncton 1933 1935 - Sep Sun>=8 1:00 0 S
- Rule Moncton 1936 1938 - Jun Sun>=1 1:00 1:00 D
-@@ -1795,7 +1795,7 @@
- # With some exceptions, the use of daylight saving may be said to be limited
- # to those cities and towns lying between Quebec city and Windsor, Ont.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Toronto 1919 only - Mar 30 23:30 1:00 D
- Rule Toronto 1919 only - Oct 26 0:00 0 S
- Rule Toronto 1920 only - May 2 2:00 1:00 D
-@@ -1893,7 +1893,7 @@
- # starting 1966. Since 02:00s is clearly correct for 1967 on, assume
- # it was also 02:00s in 1966.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Winn 1916 only - Apr 23 0:00 1:00 D
- Rule Winn 1916 only - Sep 17 0:00 0 S
- Rule Winn 1918 only - Apr 14 2:00 1:00 D
-@@ -1984,7 +1984,7 @@
- # long and rather painful to read.
- # http://www.qp.gov.sk.ca/documents/English/Statutes/Statutes/T14.pdf
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Regina 1918 only - Apr 14 2:00 1:00 D
- Rule Regina 1918 only - Oct 27 2:00 0 S
- Rule Regina 1930 1934 - May Sun>=1 0:00 1:00 D
-@@ -2034,7 +2034,7 @@
- # Boyer JP. Forcing Choice: The Risky Reward of Referendums. Dundum. 2017.
- # ISBN 978-1459739123.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Edm 1918 1919 - Apr Sun>=8 2:00 1:00 D
- Rule Edm 1918 only - Oct 27 2:00 0 S
- Rule Edm 1919 only - May 27 2:00 0 S
-@@ -2143,7 +2143,7 @@
- # https://searcharchives.vancouver.ca/daylight-saving-1918-starts-again-jul...
- # We have no further details, so omit them for now.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Vanc 1918 only - Apr 14 2:00 1:00 D
- Rule Vanc 1918 only - Oct 27 2:00 0 S
- Rule Vanc 1942 only - Feb 9 2:00 1:00 W # War
-@@ -2472,7 +2472,19 @@
- # consistency with nearby Dawson Creek, Creston, and Fort Nelson.
- # https://yukon.ca/en/news/yukon-end-seasonal-time-change
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# From Andrew G. Smith (2020-09-24):
-+# Yukon has completed its regulatory change to be on UTC -7 year-round....
-+# http://www.gov.yk.ca/legislation/regs/oic2020_125.pdf
-+# What we have done is re-defined Yukon Standard Time, as we are
-+# authorized to do under section 33 of our Interpretation Act:
-+# http://www.gov.yk.ca/legislation/acts/interpretation_c.pdf
-+#
-+# From Paul Eggert (2020-09-24):
-+# tzdb uses the obsolete YST abbreviation for standard time in Yukon through
-+# about 1970, and uses PST for standard time in Yukon since then. Consistent
-+# with that, use MST for -07, the new standard time in Yukon effective Nov. 1.
-+
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NT_YK 1918 only - Apr 14 2:00 1:00 D
- Rule NT_YK 1918 only - Oct 27 2:00 0 S
- Rule NT_YK 1919 only - May 25 2:00 1:00 D
-@@ -2526,12 +2538,12 @@
- Zone America/Whitehorse -9:00:12 - LMT 1900 Aug 20
- -9:00 NT_YK Y%sT 1967 May 28 0:00
- -8:00 NT_YK P%sT 1980
-- -8:00 Canada P%sT 2020 Mar 8 2:00
-+ -8:00 Canada P%sT 2020 Nov 1
- -7:00 - MST
- Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
- -9:00 NT_YK Y%sT 1973 Oct 28 0:00
- -8:00 NT_YK P%sT 1980
-- -8:00 Canada P%sT 2020 Mar 8 2:00
-+ -8:00 Canada P%sT 2020 Nov 1
- -7:00 - MST
-
-
-@@ -2746,7 +2758,7 @@
- # 5- The islands, reefs and keys shall take their timezone from the
- # longitude they are located at.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mexico 1939 only - Feb 5 0:00 1:00 D
- Rule Mexico 1939 only - Jun 25 0:00 0 S
- Rule Mexico 1940 only - Dec 9 0:00 1:00 D
-@@ -2951,7 +2963,7 @@
- # rules to sync with the U.S. starting in 2007....
- # http://www.jonesbahamas.com/?c=45&a=10412
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Bahamas 1964 1975 - Oct lastSun 2:00 0 S
- Rule Bahamas 1964 1975 - Apr lastSun 2:00 1:00 D
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -2963,7 +2975,7 @@
-
- # For 1899 Milne gives -3:58:29.2; round that.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Barb 1977 only - Jun 12 2:00 1:00 D
- Rule Barb 1977 1978 - Oct Sun>=1 2:00 0 S
- Rule Barb 1978 1980 - Apr Sun>=15 2:00 1:00 D
-@@ -2976,7 +2988,7 @@
-
- # Belize
- # Whitman entirely disagrees with Shanks; go with Shanks & Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Belize 1918 1942 - Oct Sun>=2 0:00 0:30 -0530
- Rule Belize 1919 1943 - Feb Sun>=9 0:00 0 CST
- Rule Belize 1973 only - Dec 5 0:00 1:00 CDT
-@@ -3013,7 +3025,7 @@
-
- # Milne gives -5:36:13.3 as San José mean time; round to nearest.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule CR 1979 1980 - Feb lastSun 0:00 1:00 D
- Rule CR 1979 1980 - Jun Sun>=1 0:00 0 S
- Rule CR 1991 1992 - Jan Sat>=15 0:00 1:00 D
-@@ -3187,7 +3199,7 @@
- # From Paul Eggert (2012-11-03):
- # For now, assume the future rule is first Sunday in November.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cuba 1928 only - Jun 10 0:00 1:00 D
- Rule Cuba 1928 only - Oct 10 0:00 0 S
- Rule Cuba 1940 1942 - Jun Sun>=1 0:00 1:00 D
-@@ -3256,7 +3268,7 @@
- # decided to revert.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule DR 1966 only - Oct 30 0:00 1:00 EDT
- Rule DR 1967 only - Feb 28 0:00 0 EST
- Rule DR 1969 1973 - Oct lastSun 0:00 0:30 -0430
-@@ -3273,7 +3285,7 @@
-
- # El Salvador
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Salv 1987 1988 - May Sun>=1 0:00 1:00 D
- Rule Salv 1987 1988 - Sep lastSun 0:00 0 S
- # There are too many San Salvadors elsewhere, so use America/El_Salvador
-@@ -3302,7 +3314,7 @@
- # (2006-04-19), says DST ends at 24:00. See
- # http://www.sieca.org.gt/Sitio_publico/Energeticos/Doc/Medidas/Cambio_Hora...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Guat 1973 only - Nov 25 0:00 1:00 D
- Rule Guat 1974 only - Feb 24 0:00 0 S
- Rule Guat 1983 only - May 21 0:00 1:00 D
-@@ -3383,7 +3395,7 @@
- # I have not been able to find a more authoritative source:
- # https://www.haitilibre.com/en/news-20319-haiti-notices-time-change-in-hai...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Haiti 1983 only - May 8 0:00 1:00 D
- Rule Haiti 1984 1987 - Apr lastSun 0:00 1:00 D
- Rule Haiti 1983 1987 - Oct lastSun 0:00 0 S
-@@ -3431,7 +3443,7 @@
- # http://www.laprensahn.com/pais_nota.php?id04962=7386
- # So it seems that Honduras will not enter DST this year....
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Hond 1987 1988 - May Sun>=1 0:00 1:00 D
- Rule Hond 1987 1988 - Sep lastSun 0:00 0 S
- Rule Hond 2006 only - May Sun>=1 0:00 1:00 D
-@@ -3522,7 +3534,7 @@
- # The natural sun time is restored in all the national territory, in that the
- # time is returned one hour at 01:00 am of October 1 of 2006.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Nic 1979 1980 - Mar Sun>=16 0:00 1:00 D
- Rule Nic 1979 1980 - Jun Mon>=23 0:00 0 S
- Rule Nic 2005 only - Apr 10 0:00 1:00 D
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/pacificnew openjdk/jdk/test/sun/util/calendar/zi/tzdata/pacificnew
-deleted file mode 100644
---- openjdk/jdk/test/sun/util/calendar/zi/tzdata/pacificnew
-+++ /dev/null
-@@ -1,52 +0,0 @@
--#
--# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--#
--# This code is free software; you can redistribute it and/or modify it
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation. Oracle designates this
--# particular file as subject to the "Classpath" exception as provided
--# by Oracle in the LICENSE file that accompanied this code.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--# tzdb data for proposed US election time (this file is obsolete)
--
--# This file is in the public domain, so clarified as of
--# 2009-05-17 by Arthur David Olson.
--
--# From Arthur David Olson (1989-04-05):
--# On 1989-04-05, the U. S. House of Representatives passed (238-154) a bill
--# establishing "Pacific Presidential Election Time"; it was not acted on
--# by the Senate or signed into law by the President.
--# You might want to change the "PE" (Presidential Election) below to
--# "Q" (Quadrennial) to maintain three-character zone abbreviations.
--# If you're really conservative, you might want to change it to "D".
--# Avoid "L" (Leap Year), which won't be true in 2100.
--
--# If Presidential Election Time is ever established, replace "XXXX" below
--# with the year the law takes effect and uncomment the "##" lines.
--
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--## Rule Twilite XXXX max - Apr Sun>=1 2:00 1:00 D
--## Rule Twilite XXXX max uspres Oct lastSun 2:00 1:00 PE
--## Rule Twilite XXXX max uspres Nov Sun>=7 2:00 0 S
--## Rule Twilite XXXX max nonpres Oct lastSun 2:00 0 S
--
--# Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL]
--## Zone America/Los_Angeles-PET -8:00 US P%sT XXXX
--## -8:00 Twilite P%sT
--
--# For now...
--Link America/Los_Angeles US/Pacific-New ##
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/southamerica openjdk/jdk/test/sun/util/calendar/zi/tzdata/southamerica
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/southamerica
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/southamerica
-@@ -71,7 +71,7 @@
- # I am sending modifications to the Argentine time zone table...
- # AR was chosen because they are the ISO letters that represent Argentina.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Arg 1930 only - Dec 1 0:00 1:00 -
- Rule Arg 1931 only - Apr 1 0:00 0 -
- Rule Arg 1931 only - Oct 15 0:00 1:00 -
-@@ -792,7 +792,7 @@
- # From Paul Eggert (2013-10-17):
- # For now, assume western Amazonas will change as well.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Decree 20,466 <http://pcdsh01.on.br/HV20466.htm> (1931-10-01)
- # Decree 21,896 <http://pcdsh01.on.br/HV21896.htm> (1932-01-10)
- Rule Brazil 1931 only - Oct 3 11:00 1:00 -
-@@ -1281,7 +1281,7 @@
- # For now, assume that they will not revert,
- # since they have extended the expiration date once already.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Chile 1927 1931 - Sep 1 0:00 1:00 -
- Rule Chile 1928 1932 - Apr 1 0:00 0 -
- Rule Chile 1968 only - Nov 3 4:00u 1:00 -
-@@ -1381,7 +1381,7 @@
- # Milne gives 4:56:16.4 for Bogotá time in 1899; round to nearest. He writes,
- # "A variation of fifteen minutes in the public clocks of Bogota is not rare."
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule CO 1992 only - May 3 0:00 1:00 -
- Rule CO 1993 only - Apr 4 0:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1441,7 +1441,7 @@
- # (Not one step back), the clocks went back in 1993 and the experiment was not
- # repeated. For now, assume transitions were at 00:00 local time country-wide.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Ecuador 1992 only - Nov 28 0:00 1:00 -
- Rule Ecuador 1993 only - Feb 5 0:00 0 -
- #
-@@ -1535,7 +1535,7 @@
- # For now we will assume permanent -03 for the Falklands
- # until advised differently (to apply for 2012 and beyond, after the 2011
- # experiment was apparently successful.)
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 -
- Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 -
- Rule Falk 1939 only - Oct 1 0:00 1:00 -
-@@ -1581,7 +1581,7 @@
- # No time of the day is established for the adjustment, so people normally
- # adjust their clocks at 0 hour of the given dates.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Para 1975 1988 - Oct 1 0:00 1:00 -
- Rule Para 1975 1978 - Mar 1 0:00 0 -
- Rule Para 1979 1991 - Apr 1 0:00 0 -
-@@ -1674,7 +1674,7 @@
- # From Paul Eggert (2006-03-22):
- # Shanks & Pottenger don't have this transition. Assume 1986 was like 1987.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Peru 1938 only - Jan 1 0:00 1:00 -
- Rule Peru 1938 only - Apr 1 0:00 0 -
- Rule Peru 1938 1939 - Sep lastSun 0:00 1:00 -
-@@ -1770,7 +1770,7 @@
- # https://www.impo.com.uy/diariooficial/1926/03/10/2
- # https://www.impo.com.uy/diariooficial/1926/03/18/2
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Uruguay 1923 1925 - Oct 1 0:00 0:30 -
- Rule Uruguay 1924 1926 - Apr 1 0:00 0 -
- # From Tim Parenti (2018-02-15):
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/systemv openjdk/jdk/test/sun/util/calendar/zi/tzdata/systemv
-deleted file mode 100644
---- openjdk/jdk/test/sun/util/calendar/zi/tzdata/systemv
-+++ /dev/null
-@@ -1,62 +0,0 @@
--#
--# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--#
--# This code is free software; you can redistribute it and/or modify it
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation. Oracle designates this
--# particular file as subject to the "Classpath" exception as provided
--# by Oracle in the LICENSE file that accompanied this code.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--# tzdb data for System V rules (this file is obsolete)
--
--# This file is in the public domain, so clarified as of
--# 2009-05-17 by Arthur David Olson.
--
--# Old rules, should the need arise.
--# No attempt is made to handle Newfoundland, since it cannot be expressed
--# using the System V "TZ" scheme (half-hour offset), or anything outside
--# North America (no support for non-standard DST start/end dates), nor
--# the changes in the DST rules in the US after 1976 (which occurred after
--# the old rules were written).
--#
--# If you need the old rules, uncomment ## lines.
--# Compile this *without* leap second correction for true conformance.
--
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule SystemV min 1973 - Apr lastSun 2:00 1:00 D
--Rule SystemV min 1973 - Oct lastSun 2:00 0 S
--Rule SystemV 1974 only - Jan 6 2:00 1:00 D
--Rule SystemV 1974 only - Nov lastSun 2:00 0 S
--Rule SystemV 1975 only - Feb 23 2:00 1:00 D
--Rule SystemV 1975 only - Oct lastSun 2:00 0 S
--Rule SystemV 1976 max - Apr lastSun 2:00 1:00 D
--Rule SystemV 1976 max - Oct lastSun 2:00 0 S
--
--# Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL]
--## Zone SystemV/AST4ADT -4:00 SystemV A%sT
--## Zone SystemV/EST5EDT -5:00 SystemV E%sT
--## Zone SystemV/CST6CDT -6:00 SystemV C%sT
--## Zone SystemV/MST7MDT -7:00 SystemV M%sT
--## Zone SystemV/PST8PDT -8:00 SystemV P%sT
--## Zone SystemV/YST9YDT -9:00 SystemV Y%sT
--## Zone SystemV/AST4 -4:00 - AST
--## Zone SystemV/EST5 -5:00 - EST
--## Zone SystemV/CST6 -6:00 - CST
--## Zone SystemV/MST7 -7:00 - MST
--## Zone SystemV/PST8 -8:00 - PST
--## Zone SystemV/YST9 -9:00 - YST
--## Zone SystemV/HST10 -10:00 - HST
diff --git a/pr3519-fix_further_functions_with_a_missing_return_value.patch b/pr3519-fix_further_functions_with_a_missing_return_value.patch
deleted file mode 100644
index 51ca7f1..0000000
--- a/pr3519-fix_further_functions_with_a_missing_return_value.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1518669922 0
-# Thu Feb 15 04:45:22 2018 +0000
-# Node ID adaf109718c10888cce5b6e73af7f3e15a7ab0db
-# Parent 3ade0115344b77e6d00462044e0cf68722685bfe
-PR3519: Fix further functions with a missing return value.
-
-diff --git openjdk.orig/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
---- openjdk.orig/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
-+++ openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
-@@ -205,6 +205,7 @@
- return Address(base, tmp, Address::lsl(addr->scale()));
- }
- }
-+ return Address();
- }
-
- Address LIR_Assembler::as_Address_hi(LIR_Address* addr) {
diff --git a/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch b/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
deleted file mode 100644
index d1e9576..0000000
--- a/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1529475043 -3600
-# Wed Jun 20 07:10:43 2018 +0100
-# Node ID f6341f4635dacb56678264d29a88cd052b74036b
-# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de
-PR3601: Fix additional -Wreturn-type issues introduced by 8061651
-
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
-@@ -835,7 +835,7 @@
- JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname))
- JVMWrapper("JVM_KnownToNotExist");
- #if INCLUDE_CDS
-- return ClassLoaderExt::known_to_not_exist(env, loader, classname, CHECK_(false));
-+ return ClassLoaderExt::known_to_not_exist(env, loader, classname, THREAD);
- #else
- return false;
- #endif
-@@ -845,7 +845,7 @@
- JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader))
- JVMWrapper("JVM_GetResourceLookupCacheURLs");
- #if INCLUDE_CDS
-- return ClassLoaderExt::get_lookup_cache_urls(env, loader, CHECK_NULL);
-+ return ClassLoaderExt::get_lookup_cache_urls(env, loader, THREAD);
- #else
- return NULL;
- #endif
-@@ -855,7 +855,7 @@
- JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name))
- JVMWrapper("JVM_GetResourceLookupCache");
- #if INCLUDE_CDS
-- return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, CHECK_NULL);
-+ return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, THREAD);
- #else
- return NULL;
- #endif
diff --git a/rh1566890-CVE_2018_3639-speculative_store_bypass.patch b/rh1566890-CVE_2018_3639-speculative_store_bypass.patch
deleted file mode 100644
index d8f3a5a..0000000
--- a/rh1566890-CVE_2018_3639-speculative_store_bypass.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -103,6 +103,8 @@
- # include <inttypes.h>
- # include <sys/ioctl.h>
-
-+#include <sys/prctl.h>
-+
- PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
- #ifndef _GNU_SOURCE
-@@ -4997,6 +4999,31 @@
- }
- }
-
-+/* Per task speculation control */
-+#ifndef PR_GET_SPECULATION_CTRL
-+#define PR_GET_SPECULATION_CTRL 52
-+#endif
-+#ifndef PR_SET_SPECULATION_CTRL
-+#define PR_SET_SPECULATION_CTRL 53
-+#endif
-+/* Speculation control variants */
-+# undef PR_SPEC_STORE_BYPASS
-+# define PR_SPEC_STORE_BYPASS 0
-+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
-+# undef PR_SPEC_NOT_AFFECTED
-+# undef PR_SPEC_PRCTL
-+# undef PR_SPEC_ENABLE
-+# undef PR_SPEC_DISABLE
-+# define PR_SPEC_NOT_AFFECTED 0
-+# define PR_SPEC_PRCTL (1UL << 0)
-+# define PR_SPEC_ENABLE (1UL << 1)
-+# define PR_SPEC_DISABLE (1UL << 2)
-+
-+static void set_speculation() __attribute__((constructor));
-+static void set_speculation() {
-+ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
-+}
-+
- // this is called _before_ most of the global arguments have been parsed
- void os::init(void) {
- char dummy; /* used to get a guess on initial stack address */
diff --git a/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch b/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch
deleted file mode 100644
index 94ef9d4..0000000
--- a/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -5001,26 +5001,43 @@
-
- /* Per task speculation control */
- #ifndef PR_GET_SPECULATION_CTRL
--#define PR_GET_SPECULATION_CTRL 52
-+# define PR_GET_SPECULATION_CTRL 52
- #endif
- #ifndef PR_SET_SPECULATION_CTRL
--#define PR_SET_SPECULATION_CTRL 53
-+# define PR_SET_SPECULATION_CTRL 53
- #endif
- /* Speculation control variants */
--# undef PR_SPEC_STORE_BYPASS
-+#ifndef PR_SPEC_STORE_BYPASS
- # define PR_SPEC_STORE_BYPASS 0
-+#endif
- /* Return and control values for PR_SET/GET_SPECULATION_CTRL */
--# undef PR_SPEC_NOT_AFFECTED
--# undef PR_SPEC_PRCTL
--# undef PR_SPEC_ENABLE
--# undef PR_SPEC_DISABLE
-+
-+#ifndef PR_SPEC_NOT_AFFECTED
- # define PR_SPEC_NOT_AFFECTED 0
-+#endif
-+#ifndef PR_SPEC_PRCTL
- # define PR_SPEC_PRCTL (1UL << 0)
-+#endif
-+#ifndef PR_SPEC_ENABLE
- # define PR_SPEC_ENABLE (1UL << 1)
-+#endif
-+#ifndef PR_SPEC_DISABLE
- # define PR_SPEC_DISABLE (1UL << 2)
-+#endif
-+#ifndef PR_SPEC_FORCE_DISABLE
-+# define PR_SPEC_FORCE_DISABLE (1UL << 3)
-+#endif
-+#ifndef PR_SPEC_DISABLE_NOEXEC
-+# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
-+#endif
-
- static void set_speculation() __attribute__((constructor));
- static void set_speculation() {
-+ if ( prctl(PR_SET_SPECULATION_CTRL,
-+ PR_SPEC_STORE_BYPASS,
-+ PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
-+ return;
-+ }
- prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
- }
-
diff --git a/rh1750419-redhat_alt_java.patch b/rh1750419-redhat_alt_java.patch
new file mode 100644
index 0000000..4789f0b
--- /dev/null
+++ b/rh1750419-redhat_alt_java.patch
@@ -0,0 +1,133 @@
+diff --git openjdk.orig/jdk/make/CompileLaunchers.gmk openjdk/jdk/make/CompileLaunchers.gmk
+--- openjdk.orig/jdk/make/CompileLaunchers.gmk
++++ openjdk/jdk/make/CompileLaunchers.gmk
+@@ -255,6 +255,33 @@
+ endif
+ endif
+
++# -Wno-error=cpp is present to allow commented warning in ifdef part of main.c
++$(eval $(call SetupLauncher,alt-java, \
++ -DEXPAND_CLASSPATH_WILDCARDS -DREDHAT_ALT_JAVA -Wno-error=cpp,,,user32.lib comctl32.lib, \
++ $(JDK_OUTPUTDIR)/objs/jli_static.lib, $(JAVA_RC_FLAGS), \
++ $(JDK_TOPDIR)/src/windows/resource/java.rc, $(JDK_OUTPUTDIR)/objs/java_objs,true))
++
++$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/alt-java$(EXE_SUFFIX): $(BUILD_LAUNCHER_alt-java)
++ $(MKDIR) -p $(@D)
++ $(RM) $@
++ $(CP) $(JDK_OUTPUTDIR)/objs/java_objs$(OUTPUT_SUBDIR)/alt-java$(EXE_SUFFIX) $@
++
++$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/alt-java$(DEBUGINFO_EXT): $(BUILD_LAUNCHER_alt-java)
++ $(MKDIR) -p $(@D)
++ $(RM) $@
++ $(CP) $(JDK_OUTPUTDIR)/objs/java_objs$(OUTPUT_SUBDIR)/alt-java$(DEBUGINFO_EXT) $@
++
++ifeq ($(OPENJDK_TARGET_OS), linux)
++ BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/alt-java$(EXE_SUFFIX)
++ ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
++ ifneq ($(POST_STRIP_CMD), )
++ ifneq ($(STRIP_POLICY), no_strip)
++ BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/alt-java$(DEBUGINFO_EXT)
++ endif
++ endif
++ endif
++endif
++
+ ifeq ($(OPENJDK_TARGET_OS), windows)
+ $(eval $(call SetupLauncher,javaw, \
+ -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \
+diff --git openjdk.orig/jdk/src/share/bin/alt_main.h openjdk/jdk/src/share/bin/alt_main.h
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/src/share/bin/alt_main.h
+@@ -0,0 +1,73 @@
++/*
++ * Copyright (c) 2019, Red Hat, Inc. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++#ifdef REDHAT_ALT_JAVA
++
++#include <sys/prctl.h>
++
++
++/* Per task speculation control */
++#ifndef PR_GET_SPECULATION_CTRL
++# define PR_GET_SPECULATION_CTRL 52
++#endif
++#ifndef PR_SET_SPECULATION_CTRL
++# define PR_SET_SPECULATION_CTRL 53
++#endif
++/* Speculation control variants */
++#ifndef PR_SPEC_STORE_BYPASS
++# define PR_SPEC_STORE_BYPASS 0
++#endif
++/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
++
++#ifndef PR_SPEC_NOT_AFFECTED
++# define PR_SPEC_NOT_AFFECTED 0
++#endif
++#ifndef PR_SPEC_PRCTL
++# define PR_SPEC_PRCTL (1UL << 0)
++#endif
++#ifndef PR_SPEC_ENABLE
++# define PR_SPEC_ENABLE (1UL << 1)
++#endif
++#ifndef PR_SPEC_DISABLE
++# define PR_SPEC_DISABLE (1UL << 2)
++#endif
++#ifndef PR_SPEC_FORCE_DISABLE
++# define PR_SPEC_FORCE_DISABLE (1UL << 3)
++#endif
++#ifndef PR_SPEC_DISABLE_NOEXEC
++# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
++#endif
++
++static void set_speculation() __attribute__((constructor));
++static void set_speculation() {
++ if ( prctl(PR_SET_SPECULATION_CTRL,
++ PR_SPEC_STORE_BYPASS,
++ PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
++ return;
++ }
++ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
++}
++
++#endif // REDHAT_ALT_JAVA
+diff --git openjdk.orig/jdk/src/share/bin/main.c openjdk/jdk/src/share/bin/main.c
+--- openjdk.orig/jdk/src/share/bin/main.c
++++ openjdk/jdk/src/share/bin/main.c
+@@ -32,6 +32,14 @@
+
+ #include "defines.h"
+
++#ifdef REDHAT_ALT_JAVA
++#if defined(__linux__) && defined(__x86_64__)
++#include "alt_main.h"
++#else
++#warning alt-java requested but SSB mitigation not available on this platform.
++#endif
++#endif
++
+ #ifdef _MSC_VER
+ #if _MSC_VER > 1400 && _MSC_VER < 1600
+
diff --git a/sources b/sources
index 70e7e49..8de2960 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (aarch32-port-jdk8u-jdk8u275-ga-aarch32-20201109-4curve.tar.xz) = 648b6149eb7010f51ba60bf86ffe56c0f4780fcf87f3f853b71b951123257d6c3e0ab7983559ea8115f320e0de4bb79b01f2497529774be0c6dd01fcf4598c41
+SHA512 (aarch32-port-jdk8u-jdk8u282-ga-aarch32-20210125-4curve.tar.xz) = b83541f5c5b3e274b17e4ebd034990ae99685e85263b9d1a399f3b5c70b35670e7efa714d0d209c04e05100dda5c08a3f411cbec7aa829092967df008031a428
SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
commit 8155ab27e59b28b3dee13be5fd631d2e0a950894
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 14:42:22 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/java-1.8.0-openjdk-aarch32.spec b/java-1.8.0-openjdk-aarch32.spec
index 5287292..a1a9edc 100644
--- a/java-1.8.0-openjdk-aarch32.spec
+++ b/java-1.8.0-openjdk-aarch32.spec
@@ -1216,7 +1216,7 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release
Name: java-%{javaver}-%{origin}-aarch32
Version: %{javaver}.%{updatever}.%{buildver}
-Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
+Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.1
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -2517,6 +2517,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.0.275.b01-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Tue Nov 17 2020 Alex Kashchenko <akashche(a)redhat.com> - 1:1.8.0.275.b01-1
- update sources to 8u275
- sync with mainline package
commit dcce46a33ed44f6a9a7f0c920a4ded3048d6f2da
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Tue Jan 5 15:33:50 2021 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/java-1.8.0-openjdk-aarch32.spec b/java-1.8.0-openjdk-aarch32.spec
index 78e89ac..5287292 100644
--- a/java-1.8.0-openjdk-aarch32.spec
+++ b/java-1.8.0-openjdk-aarch32.spec
@@ -1486,6 +1486,7 @@ BuildRequires: gcc >= 4.8.3-8
%if %{with_systemtap}
BuildRequires: systemtap-sdt-devel
%endif
+BuildRequires: make
# this is always built, also during debug-only build
# when it is built in debug-only this package is just placeholder
2 years, 3 months
- 1
- 0
Architecture specific change in rpms/java-1.8.0-openjdk-aarch32.git
by githook-noreply＠fedoraproject.org
The package rpms/java-1.8.0-openjdk-aarch32.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk-aarch32.git/co....
Change:
+%ifarch %{ssbd_arches}
Thanks.
Full change:
============
commit 2b9575bc375ba8d6b125dd36b8ba7f90333c826b
Author: Alex Kashchenko <akashche(a)redhat.com>
Date: Sun Feb 28 16:50:08 2021 -0500
8u282 update
diff --git a/.gitignore b/.gitignore
index 5901268..11e3daa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/tapsets-icedtea-3.15.0.tar.xz
/aarch32-port-jdk8u-jdk8u265-ga-aarch32-20200729.tar.xz
/aarch32-port-jdk8u-jdk8u275-ga-aarch32-20201109-4curve.tar.xz
+/aarch32-port-jdk8u-jdk8u282-ga-aarch32-20210125-4curve.tar.xz
diff --git a/java-1.8.0-openjdk-aarch32.spec b/java-1.8.0-openjdk-aarch32.spec
index a1a9edc..d8fa7dc 100644
--- a/java-1.8.0-openjdk-aarch32.spec
+++ b/java-1.8.0-openjdk-aarch32.spec
@@ -4,18 +4,20 @@
#
# Examples:
#
-# Produce release *and* slowdebug builds on x86_64 (default):
+# Produce release, fastdebug *and* slowdebug builds on x86_64 (default):
# $ rpmbuild -ba java-1.8.0-openjdk.spec
#
# Produce only release builds (no slowdebug builds) on x86_64:
-# $ rpmbuild -ba java-1.8.0-openjdk.spec --without slowdebug
+# $ rpmbuild -ba java-1.8.0-openjdk.spec --without slowdebug --without fastdebug
#
# Only produce a release build on x86_64:
-# $ fedpkg mockbuild --without slowdebug
+# $ fedpkg mockbuild --without slowdebug --without fastdebug
#
# Only produce a debug build on x86_64:
# $ fedpkg local --without release
#
+# Enable fastdebug builds by default on relevant arches.
+%bcond_without fastdebug
# Enable slowdebug builds by default on relevant arches.
%bcond_without slowdebug
# Enable release builds by default on relevant arches.
@@ -32,13 +34,16 @@
# See https://github.com/rpm-software-management/rpm/issues/127 to comments at "pmatilai commented on Aug 18, 2017"
# (initiated in https://bugzilla.redhat.com/show_bug.cgi?id=1482192)
%global debug_suffix_unquoted -slowdebug
+%global fastdebug_suffix_unquoted -fastdebug
# quoted one for shell operations
%global debug_suffix "%{debug_suffix_unquoted}"
+%global fastdebug_suffix "%{fastdebug_suffix_unquoted}"
%global normal_suffix ""
-# if you want only debug build but providing java build only normal build but set normalbuild_parameter
-%global debug_warning This package has full debug on. Install only in need and remove asap.
+%global debug_warning This package is unoptimised with full debugging. Install only as needed and remove ASAP.
%global debug_on with full debug on
+%global fastdebug_warning This package is optimised with full debugging. Install only as needed and remove ASAP.
+%global for_fastdebug with minimal debug on
%global for_debug for packages with debug on
%if %{with release}
@@ -48,9 +53,9 @@
%endif
%if %{include_normal_build}
-%global build_loop1 %{normal_suffix}
+%global normal_build %{normal_suffix}
%else
-%global build_loop1 %{nil}
+%global normal_build %{nil}
%endif
# We have hardcoded list of files, which is appearing in alternatives, and in files
@@ -59,14 +64,14 @@
# the ghosts are here to allow installation via query like `dnf install /usr/bin/java`
# you can list those files, with appropriate sections: cat *.spec | grep -e --install -e --slave -e post_
# TODO - fix those hardcoded lists via single list
-# those files ,must *NOT* be ghosted for *slowdebug* packages
-# FIXME - if you are moving jshell or jlink or simialr, always modify all three sections
+# Those files must *NOT* be ghosted for *slowdebug* packages
+# FIXME - if you are moving jshell or jlink or similar, always modify all three sections
# you can check via headless and devels:
# rpm -ql --noghost java-11-openjdk-headless-11.0.1.13-8.fc29.x86_64.rpm | grep bin
# == rpm -ql java-11-openjdk-headless-slowdebug-11.0.1.13-8.fc29.x86_64.rpm | grep bin
# != rpm -ql java-11-openjdk-headless-11.0.1.13-8.fc29.x86_64.rpm | grep bin
# similarly for other %%{_jvmdir}/{jre,java} and %%{_javadocdir}/{java,java-zip}
-%define is_release_build() %( if [ "%{?1}" == "%{debug_suffix_unquoted}" ]; then echo "0" ; else echo "1"; fi )
+%define is_release_build() %( if [ "%{?1}" == "%{debug_suffix_unquoted}" -o "%{?1}" == "%{fastdebug_suffix_unquoted}" ]; then echo "0" ; else echo "1"; fi )
# while JDK is a techpreview(is_system_jdk=0), some provides are turned off. Once jdk stops to be an techpreview, move it to 1
# as sytem JDK, we mean any JDK which can run whole system java stack without issues (like bytecode issues, module issues, dependencies...)
@@ -76,58 +81,78 @@
# we need to distinguish between big and little endian PPC64
%global ppc64le ppc64le
%global ppc64be ppc64 ppc64p7
+# Set of architectures which support multiple ABIs
%global multilib_arches %{power64} sparc64 x86_64
-%global jit_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
+# Set of architectures for which we build debug builds
+%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64}
+# Set of architectures with a Just-In-Time (JIT) compiler
+%global jit_arches %{debug_arches}
+# Set of architectures which support SystemTap tapsets
+%global systemtap_arches %{jit_arches}
+%global fastdebug_arches x86_64 ppc64le aarch64
+# Set of architectures which support the serviceability agent
%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64}
-%global jfr_arches x86_64 sparcv9 sparc64 %{aarch64} %{power64}
+# Set of architectures which support class data sharing
+# See https://bugzilla.redhat.com/show_bug.cgi?id=513605
+# MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT
+%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64}
+%global jfr_arches %{jit_arches}
+
+# Set of architectures for which alt-java has SSB mitigation
+%global ssbd_arches x86_64
# By default, we build a debug build during main build on JIT architectures
%if %{with slowdebug}
-%ifarch %{jit_arches}
-%ifnarch %{arm}
+%ifarch %{debug_arches}
%global include_debug_build 1
%else
-%global include_debug_build 1
+%global include_debug_build 0
%endif
%else
%global include_debug_build 0
%endif
+
+# By default, we build a fastdebug build during main build only on fastdebug architectures
+%if %{with fastdebug}
+%ifarch %{fastdebug_arches}
+%global include_fastdebug_build 1
%else
-%global include_debug_build 0
+%global include_fastdebug_build 0
+%endif
+%else
+%global include_fastdebug_build 0
%endif
%if %{include_debug_build}
-%global build_loop2 %{debug_suffix}
+%global slowdebug_build %{debug_suffix}
%else
-%global build_loop2 %{nil}
+%global slowdebug_build %{nil}
%endif
-# if you disable both builds, then the build fails
-%global build_loop %{build_loop1} %{build_loop2}
-# note: that order: normal_suffix debug_suffix, in case of both enabled
-# is expected in one single case at the end of the build
-%global rev_build_loop %{build_loop2} %{build_loop1}
-
-%ifarch %{jit_arches}
-%global bootstrap_build 1
+%if %{include_fastdebug_build}
+%global fastdebug_build %{fastdebug_suffix}
%else
-%global bootstrap_build 1
+%global fastdebug_build %{nil}
%endif
+%global bootstrap_build 1
+
+# If you disable both builds, then the build fails
+# Note that the debug build requires the normal build for docs
+%global build_loop %{normal_build} %{fastdebug_build} %{slowdebug_build}
+# Test slowdebug first as it provides the best diagnostics
+%global rev_build_loop %{slowdebug_build} %{fastdebug_build} %{normal_build}
%global bootstrap_targets images
%global release_targets images docs-zip
-# No docs nor bootcycle for debug builds
%global debug_targets images
-# This package fails to build with LTO due to undefined symbols. LTO
-# was disabled in OpenSuSE as well, but with no real explanation why
-# beyond the undefined symbols. It really should be investigated further.
-# Disable LTO
+# Disable LTO as this causes build failures at the moment.
+# See RHBZ#1861401
%define _lto_cflags %{nil}
# Filter out flags from the optflags macro that cause problems with the OpenJDK build
-# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
# We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
+# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
# We replace it with -Wformat (required by -Werror=format-security) and -Wno-cpp to avoid FORTIFY_SOURCE warnings
# We filter out -fexceptions as the HotSpot build explicitly does -fno-exceptions and it's otherwise the default for C++
%global ourflags %(echo %optflags | sed -e 's|-Wall|-Wformat -Wno-cpp|' | sed -r -e 's|-O[0-9]*||')
@@ -208,7 +233,9 @@
%global stapinstall %{nil}
%endif
-%ifarch %{jit_arches}
+
+
+%ifarch %{systemtap_arches}
%global with_systemtap 0
%else
%global with_systemtap 0
@@ -237,20 +264,22 @@
%global with_openjfx_binding 0
%endif
-# Standard JPackage naming and versioning defines.
+# Define IcedTea version used for SystemTap tapsets and desktop file
+%global icedteaver 3.15.0
+
+# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
%global shenandoah_project aarch64-port
%global shenandoah_repo jdk8u-shenandoah
-%global shenandoah_revision aarch64-shenandoah-jdk8u275-b01
+%global shenandoah_revision aarch64-shenandoah-jdk8u282-b08
# Define old aarch64/jdk8u tree variables for compatibility
%global project aarch32-port
%global repo jdk8u
-%global revision jdk8u275-ga-aarch32-20201109
-# Define IcedTea version used for SystemTap tapsets and desktop files
-%global icedteaver 3.15.0
+%global revision jdk8u282-ga-aarch32-20210125
+
# e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 -> aarch64-shenandoah-jdk8u212-b04
%global version_tag %(VERSION=%{shenandoah_revision}; echo ${VERSION%%-shenandoah-merge*})
@@ -307,7 +336,7 @@
# parametrized macros are order-sensitive
%global compatiblename %{name}
%global fullversion %{compatiblename}-%{version}-%{release}
-# images stub
+# images directories from upstream build
%global jdkimage j2sdk-image
# output dir stub
%define buildoutputdir() %{expand:build/jdk8.build%{?1}}
@@ -316,6 +345,7 @@
# main id and dir of this jdk
%define uniquesuffix() %{expand:%{fullversion}.%{_arch}%{?1}}
+#################################################################
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
# https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14
# https://bugzilla.redhat.com/show_bug.cgi?id=1655938
@@ -327,6 +357,8 @@
# Never generate lib-style provides/requires for slowdebug packages
%global __provides_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$
%global __requires_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$
+%global __provides_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_suffix_unquoted}}/.*$
+%global __requires_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_suffix_unquoted}}/.*$
%else
# Don't generate provides/requires for JDK provided shared libraries at all.
%global __provides_exclude ^(%{_privatelibs}|%{_publiclibs})$
@@ -343,6 +375,7 @@
%define jredir() %{expand:%{sdkdir -- %{?1}}/jre}
%define sdkbindir() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/bin}
%define jrebindir() %{expand:%{_jvmdir}/%{jredir -- %{?1}}/bin}
+%global alt_java_name alt-java
%global rpm_state_dir %{_localstatedir}/lib/rpm-state/
@@ -372,15 +405,9 @@ exit 0
%define post_headless() %{expand:
-%ifarch %{jit_arches}
-# MetaspaceShared::generate_vtable_methods not implemented for PPC JIT
-%ifnarch %{power64}
-%ifnarch %{arm}
-# see https://bugzilla.redhat.com/show_bug.cgi?id=513605
+%ifarch %{share_arches}
%{jrebindir -- %{?1}}/java -Xshare:dump >/dev/null 2>/dev/null
%endif
-%endif
-%endif
PRIORITY=%{priority}
if [ "%{?1}" == %{debug_suffix} ]; then
@@ -391,6 +418,7 @@ ext=.gz
alternatives \\
--install %{_bindir}/java java %{jrebindir -- %{?1}}/java $PRIORITY --family %{name}.%{_arch} \\
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{jredir -- %{?1}} \\
+ --slave %{_bindir}/%{alt_java_name} %{alt_java_name} %{jrebindir -- %{?1}}/%{alt_java_name} \\
--slave %{_bindir}/jjs jjs %{jrebindir -- %{?1}}/jjs \\
--slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
--slave %{_bindir}/orbd orbd %{jrebindir -- %{?1}}/orbd \\
@@ -403,6 +431,8 @@ alternatives \\
--slave %{_bindir}/unpack200 unpack200 %{jrebindir -- %{?1}}/unpack200 \\
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
+ --slave %{_mandir}/man1/%{alt_java_name}.1$ext %{alt_java_name}.1$ext \\
+ %{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jjs.1$ext jjs.1$ext \\
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
@@ -673,6 +703,7 @@ exit 0
%dir %{_jvmdir}/%{jredir -- %{?1}}/bin
%dir %{_jvmdir}/%{jredir -- %{?1}}/lib
%{_jvmdir}/%{jredir -- %{?1}}/bin/java
+%{_jvmdir}/%{jredir -- %{?1}}/bin/%{alt_java_name}
%{_jvmdir}/%{jredir -- %{?1}}/bin/jjs
%{_jvmdir}/%{jredir -- %{?1}}/bin/keytool
%{_jvmdir}/%{jredir -- %{?1}}/bin/orbd
@@ -704,6 +735,7 @@ exit 0
%{_jvmdir}/%{jredir -- %{?1}}/lib/logging.properties
%{_jvmdir}/%{jredir -- %{?1}}/lib/calendars.properties
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
+%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/orbd-%{uniquesuffix -- %{?1}}.1*
@@ -716,12 +748,10 @@ exit 0
%{_mandir}/man1/policytool-%{uniquesuffix -- %{?1}}.1*
%{_jvmdir}/%{jredir -- %{?1}}/lib/security/nss.cfg
%config(noreplace) %{etcjavadir -- %{?1}}/lib/security/nss.cfg
-%ifarch %{jit_arches}
-%ifnarch %{power64}
+%ifarch %{share_arches}
%attr(444, root, root) %ghost %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/server/classes.jsa
%attr(444, root, root) %ghost %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/client/classes.jsa
%endif
-%endif
%dir %{etcjavasubdir}
%dir %{etcjavadir -- %{?1}}
%dir %{etcjavadir -- %{?1}}/lib
@@ -886,6 +916,7 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jar
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jarsigner
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/java
+%{_jvmdir}/%{sdkdir -- %{?1}}/bin/%{alt_java_name}
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javac
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javadoc
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javah
@@ -1026,13 +1057,10 @@ exit 0
%endif
}
-%define files_jmods() %{expand:
-%{_jvmdir}/%{sdkdir -- %{?1}}/jmods
-}
%define files_demo() %{expand:
%defattr(-,root,root,-)
-%license %{buildoutputdir -- %{?1}}/images/%{jdkimage}/jre/LICENSE
+%license %{_jvmdir}/%{jredir -- %{?1}}/LICENSE
}
%define files_src() %{expand:
@@ -1044,6 +1072,7 @@ exit 0
%define files_javadoc() %{expand:
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}
+#javadoc is in jdk8 noarch, so also licnese file must be treated like it
%license %{buildoutputdir -- %{?1}}/images/%{jdkimage}/jre/LICENSE
%if %is_system_jdk
%if %{is_release_build -- %{?1}}
@@ -1055,6 +1084,7 @@ exit 0
%define files_javadoc_zip() %{expand:
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip
+#javadoc is in jdk8 noarch, so also licnese file must be treated like it
%license %{buildoutputdir -- %{?1}}/images/%{jdkimage}/jre/LICENSE
%if %is_system_jdk
%if %{is_release_build -- %{?1}}
@@ -1085,7 +1115,7 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release
Recommends: gtk2%{?_isa}
%endif
-#Provides: java-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
+#Provides: java-%{javaver}-%{origin}%{?1} = %{epoch}:%{version}-%{release}
# Standard JPackage base provides
#Provides: jre-%{javaver}%{?1} = %{epoch}:%{version}-%{release}
@@ -1102,11 +1132,12 @@ Recommends: gtk2%{?_isa}
%define java_headless_rpo() %{expand:
# Require /etc/pki/java/cacerts
Requires: ca-certificates
-# Require javapackages-filesystem for ownership of /usr/lib/jvm/
+# Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros
Requires: javapackages-filesystem
# Require zoneinfo data provided by tzdata-java subpackage.
# 2020b required as of JDK-8254177 in October CPU
Requires: tzdata-java >= 2020b
+# for support of kernel stream control
# libsctp.so.1 is being `dlopen`ed on demand
Requires: lksctp-tools%{?_isa}
# tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it,
@@ -1216,7 +1247,7 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release
Name: java-%{javaver}-%{origin}-aarch32
Version: %{javaver}.%{updatever}.%{buildver}
-Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.1
+Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -1251,7 +1282,7 @@ URL: http://openjdk.java.net/
# FILE_NAME_ROOT=%%{shenandoah_project}-%%{shenandoah_repo}-${VERSION}
# REPO_ROOT=<path to checked-out repository> generate_source_tarball.sh
# where the source is obtained from http://hg.openjdk.java.net/%%{project}/%%{repo}
-Source0: %{project}-%{repo}-jdk8u275-ga-aarch32-20201109-4curve.tar.xz
+Source0: %{project}-%{repo}-jdk8u282-ga-aarch32-20210125-4curve.tar.xz
# Custom README for -src subpackage
Source2: README.md
@@ -1324,11 +1355,6 @@ Patch512: rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
Patch523: pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch
# PR3083, RH1346460: Regression in SSL debug output without an ECC provider
Patch528: pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
-# RH1566890: CVE-2018-3639
-Patch529: rh1566890-CVE_2018_3639-speculative_store_bypass.patch
-Patch531: rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch
-# PR3601: Fix additional -Wreturn-type issues introduced by 8061651
-Patch530: pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
# PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
# PR3575, RH1567204: System cacerts database handling should not affect jssecacerts
Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
@@ -1336,6 +1362,8 @@ Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_jav
Patch400: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
# PR3655: Allow use of system crypto policy to be disabled by the user
Patch401: pr3655-toggle_system_crypto_policy.patch
+# enable build of speculative store bypass hardened alt-java
+Patch600: rh1750419-redhat_alt_java.patch
# JDK-8218811: replace open by os::open in hotspot coding
# This fixes a GCC 10 build issue
Patch111: jdk8218811-perfMemory_linux.patch
@@ -1357,8 +1385,6 @@ Patch112: java-1.8.0-openjdk-gcc11.patch
Patch103: pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch
# x86: S8199936, PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations (-mstackrealign workaround)
Patch105: jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
-# AArch64: PR3519: Fix further functions with a missing return value (AArch64)
-Patch106: pr3519-fix_further_functions_with_a_missing_return_value.patch
# S390 ambiguous log2_intptr calls
Patch107: s390-8214206_fix.patch
@@ -1378,10 +1404,6 @@ Patch502: pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binar
Patch571: jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
# 8143245, PR3548: Zero build requires disabled warnings
Patch574: jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
-# 8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Patch575: jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
-# 8062808, PR3548: Turn on the -Wreturn-type warning
-Patch577: jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
# s390: JDK-8203030, Type fixing for s390
Patch102: jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch
# 8035341: Allow using a system installed libpng
@@ -1399,8 +1421,6 @@ Patch204: jdk8042159-allow_using_system_installed_lcms2-jdk.patch
# able to be removed once that release is out
# and used by this RPM.
#############################################
-# JDK-8254177: (tz) Upgrade time-zone data to tzdata2020b
-Patch13: jdk8254177-tzdata2020b.patch
#############################################
#
@@ -1436,6 +1456,7 @@ Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
# Dependencies
#
#############################################
+BuildRequires: make
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: alsa-lib-devel
@@ -1478,15 +1499,14 @@ BuildRequires: java-1.8.0-openjdk-aarch32-devel
%ifnarch %{jit_arches}
BuildRequires: libffi-devel
%endif
-# 2020a required as of JDK-8243541
-BuildRequires: tzdata-java >= 2020a
+# 2020b required as of JDK-8254177 in October CPU
+BuildRequires: tzdata-java >= 2020b
# Earlier versions have a bug in tree vectorization on PPC
BuildRequires: gcc >= 4.8.3-8
%if %{with_systemtap}
BuildRequires: systemtap-sdt-devel
%endif
-BuildRequires: make
# this is always built, also during debug-only build
# when it is built in debug-only this package is just placeholder
@@ -1508,6 +1528,17 @@ The %{origin_nice} runtime environment %{majorver}.
%{debug_warning}
%endif
+%if %{include_fastdebug_build}
+%package fastdebug
+Summary: %{origin_nice} Runtime Environment %{majorver} %{fastdebug_on}
+Group: Development/Languages
+
+%{java_rpo -- %{fastdebug_suffix_unquoted}}
+%description fastdebug
+The %{origin_nice} runtime environment.
+%{fastdebug_warning}
+%endif
+
%if %{include_normal_build}
%package headless
Summary: %{origin_nice} Headless Runtime Environment %{majorver}
@@ -1529,6 +1560,18 @@ The %{origin_nice} runtime environment %{majorver} without audio and video suppo
%{debug_warning}
%endif
+%if %{include_fastdebug_build}
+%package headless-fastdebug
+Summary: %{origin_nice} Runtime Environment %{fastdebug_on}
+Group: Development/Languages
+
+%{java_headless_rpo -- %{fastdebug_suffix_unquoted}}
+
+%description headless-fastdebug
+The %{origin_nice} runtime environment %{majorver} without audio and video support.
+%{fastdebug_warning}
+%endif
+
%if %{include_normal_build}
%package devel
Summary: %{origin_nice} Development Environment %{majorver}
@@ -1550,6 +1593,18 @@ The %{origin_nice} development tools %{majorver}.
%{debug_warning}
%endif
+%if %{include_fastdebug_build}
+%package devel-fastdebug
+Summary: %{origin_nice} Development Environment %{majorver} %{fastdebug_on}
+Group: Development/Tools
+
+%{java_devel_rpo -- %{fastdebug_suffix_unquoted}}
+
+%description devel-fastdebug
+The %{origin_nice} development tools %{majorver}.
+%{fastdebug_warning}
+%endif
+
%if %{include_normal_build}
%package demo
Summary: %{origin_nice} Demos %{majorver}
@@ -1571,6 +1626,18 @@ The %{origin_nice} demos %{majorver}.
%{debug_warning}
%endif
+%if %{include_fastdebug_build}
+%package demo-fastdebug
+Summary: %{origin_nice} Demos %{majorver} %{fastdebug_on}
+Group: Development/Languages
+
+%{java_demo_rpo -- %{fastdebug_suffix_unquoted}}
+
+%description demo-fastdebug
+The %{origin_nice} demos %{majorver}.
+%{fastdebug_warning}
+%endif
+
%if %{include_normal_build}
%package src
Summary: %{origin_nice} Source Bundle %{majorver}
@@ -1593,6 +1660,19 @@ The java-%{origin}-src-slowdebug sub-package contains the complete %{origin_nice
class library source code for use by IDE indexers and debuggers. Debugging %{for_debug}.
%endif
+%if %{include_fastdebug_build}
+%package src-fastdebug
+Summary: %{origin_nice} Source Bundle %{majorver} %{for_fastdebug}
+Group: Development/Languages
+
+%{java_src_rpo -- %{fastdebug_suffix_unquoted}}
+
+%description src-fastdebug
+The java-%{origin}-src-fastdebug sub-package contains the complete %{origin_nice} %{majorver}
+ class library source code for use by IDE indexers and debuggers. Debugging %{for_fastdebug}.
+%endif
+
+
%if %{include_normal_build}
%package javadoc
Summary: %{origin_nice} %{majorver} API documentation
@@ -1646,6 +1726,16 @@ Summary: %{origin_nice} %{majorver} accessibility connector %{for_debug}
See normal java-%{version}-openjdk-accessibility description.
%endif
+%if %{include_fastdebug_build}
+%package accessibility-fastdebug
+Summary: %{origin_nice} %{majorver} accessibility connector %{for_fastdebug}
+
+%{java_accessibility_rpo -- %{fastdebug_suffix_unquoted}}
+
+%description accessibility-fastdebug
+See normal java-%{version}-openjdk-accessibility description.
+%endif
+
%if %{with_openjfx_binding}
%package openjfx
@@ -1681,6 +1771,24 @@ Provides: javafx-devel-slowdebug = %{epoch}:%{version}-%{release}
%description openjfx-devel-slowdebug
Set of links from OpenJDK-slowdebug (sdk) to normal OpenJFX. OpenJFX do not support debug buuilds of itself
%endif
+
+%if %{include_fastdebug_build}
+%package openjfx-fastdebug
+Summary: OpenJDK x OpenJFX connector %{for_fastdebug}. his package adds symliks finishing Java FX integration to %{name}-fastdebug
+Requires: %{name}-fastdebug%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: openjfx8%{?_isa}
+Provides: javafx-fastdebug = %{epoch}:%{version}-%{release}
+%description openjfx-fastdebug
+Set of links from OpenJDK-fastdebug (jre) to normal OpenJFX. OpenJFX do not support debug buuilds of itself
+
+%package openjfx-devel-fastdebug
+Summary: OpenJDK x OpenJFX connector for FX developers %{for_fastdebug}. This package adds symliks finishing Java FX integration to %{name}-devel-slowdebug
+Requires: %{name}-devel-fastdebug%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: openjfx8-devel%{?_isa}
+Provides: javafx-devel-fastdebug = %{epoch}:%{version}-%{release}
+%description openjfx-devel-fastdebug
+Set of links from OpenJDK-fastdebug (sdk) to normal OpenJFX. OpenJFX do not support debug buuilds of itself
+%endif
%endif
%prep
@@ -1695,19 +1803,25 @@ Set of links from OpenJDK-slowdebug (sdk) to normal OpenJFX. OpenJFX do not supp
if [ %{include_normal_build} -eq 0 -o %{include_normal_build} -eq 1 ] ; then
echo "include_normal_build is %{include_normal_build}"
else
- echo "include_normal_build is %{include_normal_build}, thats invalid. Use 1 for yes or 0 for no"
+ echo "include_normal_build is %{include_normal_build}, that is invalid. Use 1 for yes or 0 for no"
exit 11
fi
if [ %{include_debug_build} -eq 0 -o %{include_debug_build} -eq 1 ] ; then
echo "include_debug_build is %{include_debug_build}"
else
- echo "include_debug_build is %{include_debug_build}, thats invalid. Use 1 for yes or 0 for no"
+ echo "include_debug_build is %{include_debug_build}, that is invalid. Use 1 for yes or 0 for no"
exit 12
fi
-if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 ] ; then
- echo "You have disabled both include_debug_build and include_normal_build. That is a no go."
+if [ %{include_fastdebug_build} -eq 0 -o %{include_fastdebug_build} -eq 1 ] ; then
+ echo "include_fastdebug_build is %{include_fastdebug_build}"
+else
+ echo "include_fastdebug_build is %{include_fastdebug_build}, that is invalid. Use 1 for yes or 0 for no"
exit 13
fi
+if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{include_fastdebug_build} -eq 0 ] ; then
+ echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go."
+ exit 14
+fi
echo "Update version: %{updatever}"
echo "Build number: %{buildver}"
@@ -1756,7 +1870,6 @@ sh %{SOURCE12}
#%patch107
# AArch64 fixes
-#%patch106
# x86 fixes
#%patch105
@@ -1767,19 +1880,14 @@ sh %{SOURCE12}
%patch512
#%patch523
#%patch528
-%patch529
-%patch531
-%patch530
#%patch571
#%patch574
-%patch575
-%patch577
%patch111
%patch112
-%patch13
# RPM-only fixes
%patch539
+%patch600
%patch1000
# RHEL-only patches
@@ -1795,6 +1903,9 @@ tar --strip-components=1 -x -I xz -f %{SOURCE8}
%if %{include_debug_build}
cp -r tapset tapset%{debug_suffix}
%endif
+%if %{include_fastdebug_build}
+cp -r tapset tapset%{fastdebug_suffix}
+%endif
for suffix in %{build_loop} ; do
@@ -1981,6 +2092,12 @@ install -m 644 nss.cfg $JAVA_HOME/jre/lib/security/
rm $JAVA_HOME/jre/lib/tzdb.dat
ln -s %{_datadir}/javazi-1.8/tzdb.dat $JAVA_HOME/jre/lib/tzdb.dat
+# add alt-java man page
+pushd ${JAVA_HOME}
+echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
+cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
+popd
+
# build cycles
done
@@ -1999,10 +2116,21 @@ $JAVA_HOME/bin/java TestCryptoLevel
$JAVA_HOME/bin/javac -d . %{SOURCE14}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
-# Verify system crypto (policy) can be disabled
+# Check system crypto (policy) can be disabled
$JAVA_HOME/bin/javac -d . %{SOURCE15}
$JAVA_HOME/bin/java -Djava.security.disableSystemPropertiesFile=true $(echo $(basename %{SOURCE15})|sed "s|\.java||")
+# Check java launcher has no SSB mitigation
+if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
+
+# Check alt-java launcher has SSB mitigation on supported architectures
+%ifarch %{ssbd_arches}
+nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
+%else
+if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
+%endif
+
+
# Check debug symbols are present and can identify code
find "$JAVA_HOME" -iname '*.so' -print0 | while read -d $'\0' lib
do
@@ -2064,6 +2192,7 @@ quit
end
run -version
EOF
+
grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
# Check src.zip has all sources. See RHBZ#1130490
@@ -2442,6 +2571,32 @@ require "copy_jdk_configs.lua"
%posttrans devel-slowdebug
%{posttrans_devel -- %{debug_suffix_unquoted}}
+%endif
+
+%if %{include_fastdebug_build}
+%post fastdebug
+%{post_script -- %{fastdebug_suffix_unquoted}}
+
+%post headless-fastdebug
+%{post_headless -- %{fastdebug_suffix_unquoted}}
+
+%postun fastdebug
+%{postun_script -- %{fastdebug_suffix_unquoted}}
+
+%postun headless-fastdebug
+%{postun_headless -- %{fastdebug_suffix_unquoted}}
+
+%posttrans fastdebug
+%{posttrans_script -- %{fastdebug_suffix_unquoted}}
+
+%post devel-fastdebug
+%{post_devel -- %{fastdebug_suffix_unquoted}}
+
+%postun devel-fastdebug
+%{postun_devel -- %{fastdebug_suffix_unquoted}}
+
+%posttrans devel-fastdebug
+%{posttrans_devel -- %{fastdebug_suffix_unquoted}}
%endif
@@ -2473,9 +2628,7 @@ require "copy_jdk_configs.lua"
%files javadoc
%{files_javadoc %{nil}}
-# this puts huge file to /usr/share
-# unluckily ti is really a documentation file
-# and unluckily it really is architecture-dependent, as eg. aot and grail are now x86_64 only
+# This puts a huge documentation file in /usr/share
# same for debug variant
%files javadoc-zip
%{files_javadoc_zip %{nil}}
@@ -2516,7 +2669,38 @@ require "copy_jdk_configs.lua"
%endif
%endif
+%if %{include_fastdebug_build}
+%files fastdebug
+%{files_jre -- %{fastdebug_suffix_unquoted}}
+
+%files headless-fastdebug
+%{files_jre_headless -- %{fastdebug_suffix_unquoted}}
+
+%files devel-fastdebug
+%{files_devel -- %{fastdebug_suffix_unquoted}}
+
+
+%files demo-fastdebug -f %{name}-demo.files-fastdebug
+%{files_demo -- %{fastdebug_suffix_unquoted}}
+
+%files src-fastdebug
+%{files_src -- %{fastdebug_suffix_unquoted}}
+
+%files accessibility-fastdebug
+%{files_accessibility -- %{fastdebug_suffix_unquoted}}
+
+%if %{with_openjfx_binding}
+%files openjfx-fastdebug -f %{name}-openjfx.files-fastdebug
+
+%files openjfx-devel-fastdebug -f %{name}-openjfx-devel.files-fastdebug
+%endif
+%endif
+
%changelog
+* Sun Feb 28 2021 Alex Kashchenko <akashche(a)redhat.com> - 1:1.8.0.282.b08-1
+- update sources to 8u282
+- sync with mainline package
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.0.275.b01-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch b/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
deleted file mode 100644
index 1010b73..0000000
--- a/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-# HG changeset patch
-# User stefank
-# Date 1525453613 -3600
-# Fri May 04 18:06:53 2018 +0100
-# Node ID 07a1135a327362f157955d470fad5df07cc35164
-# Parent de79964656fc652f2085dac4fe99bcc128b5a3b1
-8062808, PR3548: Turn on the -Wreturn-type warning
-Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make
-@@ -210,7 +210,7 @@
- WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body
- endif
-
--WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value
-+WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wreturn-type
-
- ifeq ($(USE_CLANG),)
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
-diff --git openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
---- openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad
-+++ openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
-@@ -1250,6 +1250,7 @@
-
-
- Unimplemented();
-+ return 0; // Mute compiler
- }
-
- #ifndef PRODUCT
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
-@@ -541,6 +541,7 @@
- err.report_and_die();
-
- ShouldNotReachHere();
-+ return true; // Mute compiler
- }
-
- void os::Linux::init_thread_fpu_state(void) {
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
-@@ -506,7 +506,7 @@
- ss.write((const char*)name->bytes(), name->utf8_length());
- ss.write((const char*)signature->bytes(), signature->utf8_length());
- ss.print(" is abstract");
-- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
-+ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
- }
-
- Symbol* MethodFamily::generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const {
-@@ -521,7 +521,7 @@
- ss.print(".");
- ss.write((const char*)name->bytes(), name->utf8_length());
- }
-- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
-+ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
- }
-
-
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
-@@ -249,7 +249,7 @@
- MutexLocker ml(SymbolTable_lock, THREAD);
-
- // Otherwise, add to symbol to table
-- return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL);
-+ return the_table()->basic_add(index, (u1*)name, len, hashValue, true, THREAD);
- }
-
- Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) {
-@@ -288,7 +288,7 @@
- // Grab SymbolTable_lock first.
- MutexLocker ml(SymbolTable_lock, THREAD);
-
-- return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL);
-+ return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, THREAD);
- }
-
- Symbol* SymbolTable::lookup_only(const char* name, int len,
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
-@@ -229,15 +229,15 @@
- class_name->as_C_string(),
- class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string()));
- if (FieldType::is_array(class_name)) {
-- return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_array_class_or_null(class_name, class_loader, protection_domain, THREAD);
- } else if (FieldType::is_obj(class_name)) {
- ResourceMark rm(THREAD);
- // Ignore wrapping L and ;.
- TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1,
- class_name->utf8_length() - 2, CHECK_NULL);
-- return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_instance_class_or_null(name, class_loader, protection_domain, THREAD);
- } else {
-- return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_instance_class_or_null(class_name, class_loader, protection_domain, THREAD);
- }
- }
-
-diff --git openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
---- openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp
-+++ openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
-@@ -367,7 +367,7 @@
- _csv_format(csv_format), _print_help(print_help),
- _print_class_stats(print_class_stats), _columns(columns) {}
- void heap_inspection(outputStream* st) NOT_SERVICES_RETURN;
-- size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN;
-+ size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN_(0);
- static void find_instances_at_safepoint(Klass* k, GrowableArray<oop>* result) NOT_SERVICES_RETURN;
- private:
- void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL);
-diff --git openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
---- openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp
-+++ openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
-@@ -93,7 +93,7 @@
- static void preload_and_dump(TRAPS) NOT_CDS_RETURN;
- static int preload_and_dump(const char * class_list_path,
- GrowableArray<Klass*>* class_promote_order,
-- TRAPS) NOT_CDS_RETURN;
-+ TRAPS) NOT_CDS_RETURN_(0);
-
- static ReservedSpace* shared_rs() {
- CDS_ONLY(return _shared_rs);
-diff --git openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp openjdk/hotspot/src/share/vm/oops/constantPool.hpp
---- openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp
-+++ openjdk/hotspot/src/share/vm/oops/constantPool.hpp
-@@ -353,7 +353,7 @@
-
- Klass* klass_at(int which, TRAPS) {
- constantPoolHandle h_this(THREAD, this);
-- return klass_at_impl(h_this, which, CHECK_NULL);
-+ return klass_at_impl(h_this, which, THREAD);
- }
-
- Symbol* klass_name_at(int which) const; // Returns the name, w/o resolving.
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
-@@ -4244,7 +4244,7 @@
- JVM_DTraceProvider* providers))
- JVMWrapper("JVM_DTraceActivate");
- return DTraceJSDT::activate(
-- version, module_name, providers_count, providers, CHECK_0);
-+ version, module_name, providers_count, providers, THREAD);
- JVM_END
-
- JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method))
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp openjdk/hotspot/src/share/vm/runtime/reflection.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/reflection.cpp
-@@ -1093,7 +1093,7 @@
- } else {
- if (rtype == T_BOOLEAN || rtype == T_BYTE || rtype == T_CHAR || rtype == T_SHORT)
- narrow((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
-- return box((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
-+ return box((jvalue*) result.get_value_addr(), rtype, THREAD);
- }
- }
-
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
-@@ -1046,7 +1046,7 @@
- // last java frame on stack (which includes native call frames)
- vframeStream vfst(thread, true); // Do not skip and javaCalls
-
-- return find_callee_info_helper(thread, vfst, bc, callinfo, CHECK_(Handle()));
-+ return find_callee_info_helper(thread, vfst, bc, callinfo, THREAD);
- }
-
-
-diff --git openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp openjdk/hotspot/src/share/vm/services/memTracker.hpp
---- openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp
-+++ openjdk/hotspot/src/share/vm/services/memTracker.hpp
-@@ -64,7 +64,7 @@
- const NativeCallStack& stack, MEMFLAGS flag = mtNone) { }
- static inline void record_virtual_memory_commit(void* addr, size_t size, const NativeCallStack& stack) { }
- static inline Tracker get_virtual_memory_uncommit_tracker() { return Tracker(); }
-- static inline Tracker get_virtual_memory_release_tracker() { }
-+ static inline Tracker get_virtual_memory_release_tracker() { return Tracker(); }
- static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { }
- static inline void record_thread_stack(void* addr, size_t size) { }
- static inline void release_thread_stack(void* addr, size_t size) { }
diff --git a/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch b/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
deleted file mode 100644
index 5f6d9ce..0000000
--- a/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1518667645 0
-# Thu Feb 15 04:07:25 2018 +0000
-# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041
-# Parent 999983606f5c61b093c6f6316a7b26c4cd4ca79e
-8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
-Reviewed-by: aph
-
-diff --git openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-@@ -457,6 +457,7 @@
- long long unsigned int oldval,
- long long unsigned int newval) {
- ShouldNotCallThis();
-+ return 0;
- }
- };
- #endif // !_LP64
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-@@ -498,6 +498,7 @@
- long long unsigned int oldval,
- long long unsigned int newval) {
- ShouldNotCallThis();
-+ return 0;
- }
- };
- #endif // !_LP64
diff --git a/jdk8254177-tzdata2020b.patch b/jdk8254177-tzdata2020b.patch
deleted file mode 100644
index abd9131..0000000
--- a/jdk8254177-tzdata2020b.patch
+++ /dev/null
@@ -1,3849 +0,0 @@
-diff --git openjdk.orig/jdk/make/data/tzdata/VERSION openjdk/jdk/make/data/tzdata/VERSION
---- openjdk.orig/jdk/make/data/tzdata/VERSION
-+++ openjdk/jdk/make/data/tzdata/VERSION
-@@ -21,4 +21,4 @@
- # or visit www.oracle.com if you need additional information or have any
- # questions.
- #
--tzdata2020a
-+tzdata2020b
-diff --git openjdk.orig/jdk/make/data/tzdata/africa openjdk/jdk/make/data/tzdata/africa
---- openjdk.orig/jdk/make/data/tzdata/africa
-+++ openjdk/jdk/make/data/tzdata/africa
-@@ -87,7 +87,7 @@
- # Corrections are welcome.
-
- # Algeria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Algeria 1916 only - Jun 14 23:00s 1:00 S
- Rule Algeria 1916 1919 - Oct Sun>=1 23:00s 0 -
- Rule Algeria 1917 only - Mar 24 23:00s 1:00 S
-@@ -110,10 +110,9 @@
- Rule Algeria 1978 only - Sep 22 3:00 0 -
- Rule Algeria 1980 only - Apr 25 0:00 1:00 S
- Rule Algeria 1980 only - Oct 31 2:00 0 -
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
-+# See Europe/Paris for PMT-related transitions.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01
-+Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 16
- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
- 0:00 Algeria WE%sT 1940 Feb 25 2:00
- 1:00 Algeria CE%sT 1946 Oct 7
-@@ -199,7 +198,7 @@
- # Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this
- # did not apply to Cairo, Alexandria, or Port Said.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Egypt 1940 only - Jul 15 0:00 1:00 S
- Rule Egypt 1940 only - Oct 1 0:00 0 -
- Rule Egypt 1941 only - Apr 15 0:00 1:00 S
-@@ -434,7 +433,7 @@
- # now Ghana observed different DST regimes in different years. For
- # lack of better info, use Shanks except treat the minus sign as a
- # typo, and assume DST started in 1920 not 1936.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Ghana 1920 1942 - Sep 1 0:00 0:20 -
- Rule Ghana 1920 1942 - Dec 31 0:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -524,7 +523,7 @@
- # From Paul Eggert (2013-10-25):
- # For now, assume they're reverting to the pre-2012 rules of permanent UT +02.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Libya 1951 only - Oct 14 2:00 1:00 S
- Rule Libya 1952 only - Jan 1 0:00 0 -
- Rule Libya 1953 only - Oct 9 2:00 1:00 S
-@@ -647,7 +646,7 @@
- # "The trial ended on March 29, 2009, when the clocks moved back by one hour
- # at 2am (or 02:00) local time..."
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mauritius 1982 only - Oct 10 0:00 1:00 -
- Rule Mauritius 1983 only - Mar 21 0:00 0 -
- Rule Mauritius 2008 only - Oct lastSun 2:00 1:00 -
-@@ -898,17 +897,30 @@
- # https://maroc-diplomatique.net/maroc-le-retour-a-lheure-gmt-est-prevu-dim...
- # http://aujourdhui.ma/actualite/gmt1-retour-a-lheure-normale-dimanche-proc...
- #
--# From Paul Eggert (2020-04-14):
-+# From Milamber (2020-05-31)
-+# In Morocco (where I live), the end of Ramadan (Arabic month) is followed by
-+# the Eid al-Fitr, and concretely it's 1 or 2 day offs for the people (with
-+# traditional visiting of family, big lunches/dinners, etc.). So for this
-+# year the astronomical calculations don't include the following 2 days off in
-+# the calc. These 2 days fall in a Sunday/Monday, so it's not acceptable by
-+# people to have a time shift during these 2 days off. Perhaps you can modify
-+# the (predicted) rules for next years: if the end of Ramadan is a (probable)
-+# Friday or Saturday (and so the 2 days off are on a weekend), the next time
-+# shift will be the next weekend.
-+#
-+# From Paul Eggert (2020-05-31):
- # For now, guess that in the future Morocco will fall back at 03:00
- # the last Sunday before Ramadan, and spring forward at 02:00 the
--# first Sunday after the day after Ramadan. To implement this,
--# transition dates for 2021 through 2087 were determined by running
--# the following program under GNU Emacs 26.3.
--# (let ((islamic-year 1442))
-+# first Sunday after two days after Ramadan. To implement this,
-+# transition dates and times for 2019 through 2087 were determined by
-+# running the following program under GNU Emacs 26.3. (This algorithm
-+# also produces the correct transition dates for 2016 through 2018,
-+# though the times differ due to Morocco's time zone change in 2018.)
-+# (let ((islamic-year 1440))
- # (require 'cal-islam)
- # (while (< islamic-year 1511)
- # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
--# (b (1+ (calendar-islamic-to-absolute (list 10 1 islamic-year))))
-+# (b (+ 2 (calendar-islamic-to-absolute (list 10 1 islamic-year))))
- # (sunday 0))
- # (while (/= sunday (mod (setq a (1- a)) 7)))
- # (while (/= sunday (mod b 7))
-@@ -923,7 +935,7 @@
- # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
- # (setq islamic-year (+ 1 islamic-year))))
-
--# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Morocco 1939 only - Sep 12 0:00 1:00 -
- Rule Morocco 1939 only - Nov 19 0:00 0 -
- Rule Morocco 1940 only - Feb 25 0:00 1:00 -
-@@ -974,7 +986,7 @@
- Rule Morocco 2022 only - Mar 27 3:00 0 -
- Rule Morocco 2022 only - May 8 2:00 1:00 -
- Rule Morocco 2023 only - Mar 19 3:00 0 -
--Rule Morocco 2023 only - Apr 23 2:00 1:00 -
-+Rule Morocco 2023 only - Apr 30 2:00 1:00 -
- Rule Morocco 2024 only - Mar 10 3:00 0 -
- Rule Morocco 2024 only - Apr 14 2:00 1:00 -
- Rule Morocco 2025 only - Feb 23 3:00 0 -
-@@ -990,7 +1002,7 @@
- Rule Morocco 2029 only - Dec 30 3:00 0 -
- Rule Morocco 2030 only - Feb 10 2:00 1:00 -
- Rule Morocco 2030 only - Dec 22 3:00 0 -
--Rule Morocco 2031 only - Jan 26 2:00 1:00 -
-+Rule Morocco 2031 only - Feb 2 2:00 1:00 -
- Rule Morocco 2031 only - Dec 14 3:00 0 -
- Rule Morocco 2032 only - Jan 18 2:00 1:00 -
- Rule Morocco 2032 only - Nov 28 3:00 0 -
-@@ -1006,7 +1018,7 @@
- Rule Morocco 2037 only - Oct 4 3:00 0 -
- Rule Morocco 2037 only - Nov 15 2:00 1:00 -
- Rule Morocco 2038 only - Sep 26 3:00 0 -
--Rule Morocco 2038 only - Oct 31 2:00 1:00 -
-+Rule Morocco 2038 only - Nov 7 2:00 1:00 -
- Rule Morocco 2039 only - Sep 18 3:00 0 -
- Rule Morocco 2039 only - Oct 23 2:00 1:00 -
- Rule Morocco 2040 only - Sep 2 3:00 0 -
-@@ -1022,7 +1034,7 @@
- Rule Morocco 2045 only - Jul 9 3:00 0 -
- Rule Morocco 2045 only - Aug 20 2:00 1:00 -
- Rule Morocco 2046 only - Jul 1 3:00 0 -
--Rule Morocco 2046 only - Aug 5 2:00 1:00 -
-+Rule Morocco 2046 only - Aug 12 2:00 1:00 -
- Rule Morocco 2047 only - Jun 23 3:00 0 -
- Rule Morocco 2047 only - Jul 28 2:00 1:00 -
- Rule Morocco 2048 only - Jun 7 3:00 0 -
-@@ -1038,7 +1050,7 @@
- Rule Morocco 2053 only - Apr 13 3:00 0 -
- Rule Morocco 2053 only - May 25 2:00 1:00 -
- Rule Morocco 2054 only - Apr 5 3:00 0 -
--Rule Morocco 2054 only - May 10 2:00 1:00 -
-+Rule Morocco 2054 only - May 17 2:00 1:00 -
- Rule Morocco 2055 only - Mar 28 3:00 0 -
- Rule Morocco 2055 only - May 2 2:00 1:00 -
- Rule Morocco 2056 only - Mar 12 3:00 0 -
-@@ -1054,7 +1066,7 @@
- Rule Morocco 2061 only - Jan 16 3:00 0 -
- Rule Morocco 2061 only - Feb 27 2:00 1:00 -
- Rule Morocco 2062 only - Jan 8 3:00 0 -
--Rule Morocco 2062 only - Feb 12 2:00 1:00 -
-+Rule Morocco 2062 only - Feb 19 2:00 1:00 -
- Rule Morocco 2062 only - Dec 31 3:00 0 -
- Rule Morocco 2063 only - Feb 4 2:00 1:00 -
- Rule Morocco 2063 only - Dec 16 3:00 0 -
-@@ -1070,7 +1082,7 @@
- Rule Morocco 2068 only - Oct 21 3:00 0 -
- Rule Morocco 2068 only - Dec 2 2:00 1:00 -
- Rule Morocco 2069 only - Oct 13 3:00 0 -
--Rule Morocco 2069 only - Nov 17 2:00 1:00 -
-+Rule Morocco 2069 only - Nov 24 2:00 1:00 -
- Rule Morocco 2070 only - Oct 5 3:00 0 -
- Rule Morocco 2070 only - Nov 9 2:00 1:00 -
- Rule Morocco 2071 only - Sep 20 3:00 0 -
-@@ -1086,7 +1098,7 @@
- Rule Morocco 2076 only - Jul 26 3:00 0 -
- Rule Morocco 2076 only - Sep 6 2:00 1:00 -
- Rule Morocco 2077 only - Jul 18 3:00 0 -
--Rule Morocco 2077 only - Aug 22 2:00 1:00 -
-+Rule Morocco 2077 only - Aug 29 2:00 1:00 -
- Rule Morocco 2078 only - Jul 10 3:00 0 -
- Rule Morocco 2078 only - Aug 14 2:00 1:00 -
- Rule Morocco 2079 only - Jun 25 3:00 0 -
-@@ -1096,13 +1108,13 @@
- Rule Morocco 2081 only - Jun 1 3:00 0 -
- Rule Morocco 2081 only - Jul 13 2:00 1:00 -
- Rule Morocco 2082 only - May 24 3:00 0 -
--Rule Morocco 2082 only - Jun 28 2:00 1:00 -
-+Rule Morocco 2082 only - Jul 5 2:00 1:00 -
- Rule Morocco 2083 only - May 16 3:00 0 -
- Rule Morocco 2083 only - Jun 20 2:00 1:00 -
- Rule Morocco 2084 only - Apr 30 3:00 0 -
- Rule Morocco 2084 only - Jun 11 2:00 1:00 -
- Rule Morocco 2085 only - Apr 22 3:00 0 -
--Rule Morocco 2085 only - May 27 2:00 1:00 -
-+Rule Morocco 2085 only - Jun 3 2:00 1:00 -
- Rule Morocco 2086 only - Apr 14 3:00 0 -
- Rule Morocco 2086 only - May 19 2:00 1:00 -
- Rule Morocco 2087 only - Mar 30 3:00 0 -
-@@ -1203,7 +1215,7 @@
- # Use plain "WAT" and "CAT" for the time zone abbreviations, to be compatible
- # with Namibia's neighbors.
-
--# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Vanguard section, for zic and other parsers that support negative DST.
- #Rule Namibia 1994 only - Mar 21 0:00 -1:00 WAT
- #Rule Namibia 1994 2017 - Sep Sun>=1 2:00 0 CAT
-@@ -1326,7 +1338,7 @@
- # See Africa/Nairobi.
-
- # South Africa
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule SA 1942 1943 - Sep Sun>=15 2:00 1:00 -
- Rule SA 1943 1944 - Mar Sun>=15 2:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1359,7 +1371,7 @@
- # Abdalla of NTC, archived at:
- # https://mm.icann.org/pipermail/tz/2017-October/025333.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Sudan 1970 only - May 1 0:00 1:00 S
- Rule Sudan 1970 1985 - Oct 15 0:00 0 -
- Rule Sudan 1971 only - Apr 30 0:00 1:00 S
-@@ -1447,7 +1459,7 @@
- # http://www.almadenahnews.com/newss/news.php?c=118&id=38036
- # http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Tunisia 1939 only - Apr 15 23:00s 1:00 S
- Rule Tunisia 1939 only - Nov 18 23:00s 0 -
- Rule Tunisia 1940 only - Feb 25 23:00s 1:00 S
-@@ -1474,9 +1486,7 @@
- Rule Tunisia 2006 2008 - Mar lastSun 2:00s 1:00 S
- Rule Tunisia 2006 2008 - Oct lastSun 2:00s 0 -
-
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
--# Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
-+# See Europe/Paris for PMT-related transitions.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
- Zone Africa/Tunis 0:40:44 - LMT 1881 May 12
- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
-diff --git openjdk.orig/jdk/make/data/tzdata/antarctica openjdk/jdk/make/data/tzdata/antarctica
---- openjdk.orig/jdk/make/data/tzdata/antarctica
-+++ openjdk/jdk/make/data/tzdata/antarctica
-@@ -93,15 +93,30 @@
- # Australian Antarctica Division informed us that Casey changed time
- # zone to UTC+11 in "the morning of 22nd October 2016".
-
-+# From Steffen Thorsen (2020-10-02, as corrected):
-+# Based on information we have received from the Australian Antarctic
-+# Division, Casey station and Macquarie Island station will move to Tasmanian
-+# daylight savings time on Sunday 4 October. This will take effect from 0001
-+# hrs on Sunday 4 October 2020 and will mean Casey and Macquarie Island will
-+# be on the same time zone as Hobart. Some past dates too for this 3 hour
-+# time change back and forth between UTC+8 and UTC+11 for Casey:
-+# - 2018 Oct 7 4:00 - 2019 Mar 17 3:00 - 2019 Oct 4 3:00 - 2020 Mar 8 3:00
-+# and now - 2020 Oct 4 0:01
-+
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Antarctica/Casey 0 - -00 1969
-- 8:00 - +08 2009 Oct 18 2:00
-+Zone Antarctica/Casey 0 - -00 1969
-+ 8:00 - +08 2009 Oct 18 2:00
- 11:00 - +11 2010 Mar 5 2:00
-- 8:00 - +08 2011 Oct 28 2:00
-+ 8:00 - +08 2011 Oct 28 2:00
- 11:00 - +11 2012 Feb 21 17:00u
-- 8:00 - +08 2016 Oct 22
-+ 8:00 - +08 2016 Oct 22
- 11:00 - +11 2018 Mar 11 4:00
-- 8:00 - +08
-+ 8:00 - +08 2018 Oct 7 4:00
-+ 11:00 - +11 2019 Mar 17 3:00
-+ 8:00 - +08 2019 Oct 4 3:00
-+ 11:00 - +11 2020 Mar 8 3:00
-+ 8:00 - +08 2020 Oct 4 0:01
-+ 11:00 - +11
- Zone Antarctica/Davis 0 - -00 1957 Jan 13
- 7:00 - +07 1964 Nov
- 0 - -00 1969 Feb
-@@ -247,7 +262,7 @@
- # suggested by Bengt-Inge Larsson comment them out for now, and approximate
- # with only UTC and CEST. Uncomment them when 2014b is more prevalent.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- #Rule Troll 2005 max - Mar 1 1:00u 1:00 +01
- Rule Troll 2005 max - Mar lastSun 1:00u 2:00 +02
- #Rule Troll 2005 max - Oct lastSun 1:00u 1:00 +01
-diff --git openjdk.orig/jdk/make/data/tzdata/asia openjdk/jdk/make/data/tzdata/asia
---- openjdk.orig/jdk/make/data/tzdata/asia
-+++ openjdk/jdk/make/data/tzdata/asia
-@@ -93,7 +93,7 @@
- ###############################################################################
-
- # These rules are stolen from the 'europe' file.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EUAsia 1981 max - Mar lastSun 1:00u 1:00 S
- Rule EUAsia 1979 1995 - Sep lastSun 1:00u 0 -
- Rule EUAsia 1996 max - Oct lastSun 1:00u 0 -
-@@ -137,7 +137,7 @@
- # or
- # (brief)
- # http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Armenia 2011 only - Mar lastSun 2:00s 1:00 -
- Rule Armenia 2011 only - Oct lastSun 2:00s 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -163,7 +163,7 @@
- # http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-d...
- # http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Azer 1997 2015 - Mar lastSun 4:00 1:00 -
- Rule Azer 1997 2015 - Oct lastSun 5:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -250,7 +250,7 @@
- # http://www.thedailystar.net/newDesign/latest_news.php?nid=22817
- # http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Dhaka 2009 only - Jun 19 23:00 1:00 -
- Rule Dhaka 2009 only - Dec 31 24:00 0 -
-
-@@ -326,7 +326,7 @@
- # generally esteemed a success, it was announced early in 1920 that it would
- # not be repeated."
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Shang 1919 only - Apr 12 24:00 1:00 D
- Rule Shang 1919 only - Sep 30 24:00 0 S
-
-@@ -422,7 +422,7 @@
- # the Yangtze river delta area during that period of time although the scope
- # of such use will need to be investigated to determine.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Shang 1940 only - Jun 1 0:00 1:00 D
- Rule Shang 1940 only - Oct 12 24:00 0 S
- Rule Shang 1941 only - Mar 15 0:00 1:00 D
-@@ -485,7 +485,7 @@
- # to begin on 17 April.
- # http://data.people.com.cn/pic/101p/1988/04/1988041201.jpg
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule PRC 1986 only - May 4 2:00 1:00 D
- Rule PRC 1986 1991 - Sep Sun>=11 2:00 0 S
- Rule PRC 1987 1991 - Apr Sun>=11 2:00 1:00 D
-@@ -869,7 +869,7 @@
- # or dates for the 1942 and 1945 transitions.
- # The Japanese occupation of Hong Kong began 1941-12-25.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule HK 1946 only - Apr 21 0:00 1:00 S
- Rule HK 1946 only - Dec 1 3:30s 0 -
- Rule HK 1947 only - Apr 13 3:30s 1:00 S
-@@ -996,7 +996,7 @@
- # until 1945-09-21 at 01:00, overriding Shanks & Pottenger.
- # Likewise, use Yu-Cheng Chuang's data for DST in Taiwan.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Taiwan 1946 only - May 15 0:00 1:00 D
- Rule Taiwan 1946 only - Oct 1 0:00 0 S
- Rule Taiwan 1947 only - Apr 15 0:00 1:00 D
-@@ -1122,7 +1122,7 @@
- # The 1904 decree says that Macau changed from the meridian of
- # Fortaleza do Monte, presumably the basis for the 7:34:10 for LMT.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Macau 1942 1943 - Apr 30 23:00 1:00 -
- Rule Macau 1942 only - Nov 17 23:00 0 -
- Rule Macau 1943 only - Sep 30 23:00 0 S
-@@ -1180,7 +1180,7 @@
- # Cyprus to remain united in time. Cyprus Mail 2017-10-17.
- # https://cyprus-mail.com/2017/10/17/cyprus-remain-united-time/
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cyprus 1975 only - Apr 13 0:00 1:00 S
- Rule Cyprus 1975 only - Oct 12 0:00 0 -
- Rule Cyprus 1976 only - May 15 0:00 1:00 S
-@@ -1557,7 +1557,7 @@
- # be changed back to its previous state on the 24 hours of the
- # thirtieth day of Shahrivar.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iran 1978 1980 - Mar 20 24:00 1:00 -
- Rule Iran 1978 only - Oct 20 24:00 0 -
- Rule Iran 1979 only - Sep 18 24:00 0 -
-@@ -1699,7 +1699,7 @@
- # We have published a short article in English about the change:
- # https://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iraq 1982 only - May 1 0:00 1:00 -
- Rule Iraq 1982 1984 - Oct 1 0:00 0 -
- Rule Iraq 1983 only - Mar 31 0:00 1:00 -
-@@ -1722,6 +1722,10 @@
-
- # Israel
-
-+# For more info about the motivation for DST in Israel, see:
-+# Barak Y. Israel's Daylight Saving Time controversy. Israel Affairs.
-+# 2020-08-11. https://doi.org/10.1080/13537121.2020.1806564
-+
- # From Ephraim Silverberg (2001-01-11):
- #
- # I coined "IST/IDT" circa 1988. Until then there were three
-@@ -1743,7 +1747,7 @@
- # family is from India).
-
- # From Shanks & Pottenger:
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1940 only - Jun 1 0:00 1:00 D
- Rule Zion 1942 1944 - Nov 1 0:00 0 S
- Rule Zion 1943 only - Apr 1 2:00 1:00 D
-@@ -1835,7 +1839,7 @@
- # (except in 2002) is three nights before Yom Kippur [Day of Atonement]
- # (the eve of the 7th of Tishrei in the lunar Hebrew calendar).
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1989 only - Apr 30 0:00 1:00 D
- Rule Zion 1989 only - Sep 3 0:00 0 S
- Rule Zion 1990 only - Mar 25 0:00 1:00 D
-@@ -1851,7 +1855,7 @@
- # Ministry of Interior, Jerusalem, Israel. The spokeswoman can be reached by
- # calling the office directly at 972-2-6701447 or 972-2-6701448.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1994 only - Apr 1 0:00 1:00 D
- Rule Zion 1994 only - Aug 28 0:00 0 S
- Rule Zion 1995 only - Mar 31 0:00 1:00 D
-@@ -1871,7 +1875,7 @@
- #
- # where YYYY is the relevant year.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1996 only - Mar 15 0:00 1:00 D
- Rule Zion 1996 only - Sep 16 0:00 0 S
- Rule Zion 1997 only - Mar 21 0:00 1:00 D
-@@ -1894,7 +1898,7 @@
- #
- # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2000-2004.ps.gz
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2000 only - Apr 14 2:00 1:00 D
- Rule Zion 2000 only - Oct 6 1:00 0 S
- Rule Zion 2001 only - Apr 9 1:00 1:00 D
-@@ -1916,7 +1920,7 @@
- #
- # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2005 2012 - Apr Fri<=1 2:00 1:00 D
- Rule Zion 2005 only - Oct 9 2:00 0 S
- Rule Zion 2006 only - Oct 1 2:00 0 S
-@@ -1936,7 +1940,7 @@
- # As of 2013, DST starts at 02:00 on the Friday before the last Sunday
- # in March. DST ends at 02:00 on the last Sunday of October.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D
- Rule Zion 2013 max - Oct lastSun 2:00 0 S
-
-@@ -2036,7 +2040,7 @@
- # do in any POSIX or C platform. The "25:00" assumes zic from 2007 or later,
- # which should be safe now.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Japan 1948 only - May Sat>=1 24:00 1:00 D
- Rule Japan 1948 1951 - Sep Sun>=9 1:00 0 S
- Rule Japan 1949 only - Apr Sat>=1 24:00 1:00 D
-@@ -2113,7 +2117,7 @@
- # From Paul Eggert (2013-12-11):
- # As Steffen suggested, consider the past 21-month experiment to be DST.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Jordan 1973 only - Jun 6 0:00 1:00 S
- Rule Jordan 1973 1975 - Oct 1 0:00 0 -
- Rule Jordan 1974 1977 - May 1 0:00 1:00 S
-@@ -2439,7 +2443,7 @@
- # Our government cancels daylight saving time 6th of August 2005.
- # From 2005-08-12 our GMT-offset is +6, w/o any daylight saving.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Kyrgyz 1992 1996 - Apr Sun>=7 0:00s 1:00 -
- Rule Kyrgyz 1992 1996 - Sep lastSun 0:00 0 -
- Rule Kyrgyz 1997 2005 - Mar lastSun 2:30 1:00 -
-@@ -2495,7 +2499,7 @@
- # follow and continued to use GMT+9:00 for interoperability.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule ROK 1948 only - Jun 1 0:00 1:00 D
- Rule ROK 1948 only - Sep 12 24:00 0 S
- Rule ROK 1949 only - Apr 3 0:00 1:00 D
-@@ -2583,7 +2587,7 @@
-
-
- # Lebanon
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Lebanon 1920 only - Mar 28 0:00 1:00 S
- Rule Lebanon 1920 only - Oct 25 0:00 0 -
- Rule Lebanon 1921 only - Apr 3 0:00 1:00 S
-@@ -2613,7 +2617,7 @@
- 2:00 Lebanon EE%sT
-
- # Malaysia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NBorneo 1935 1941 - Sep 14 0:00 0:20 -
- Rule NBorneo 1935 1941 - Dec 14 0:00 0 -
- #
-@@ -2758,7 +2762,7 @@
- # September daylight saving time ends. Source:
- # http://zasag.mn/news/view/8969
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mongol 1983 1984 - Apr 1 0:00 1:00 -
- Rule Mongol 1983 only - Oct 1 0:00 0 -
- # Shanks & Pottenger and IATA SSIM say 1990s switches occurred at 00:00,
-@@ -2946,7 +2950,7 @@
- # "People laud PM's announcement to end DST"
- # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Pakistan 2002 only - Apr Sun>=2 0:00 1:00 S
- Rule Pakistan 2002 only - Oct Sun>=2 0:00 0 -
- Rule Pakistan 2008 only - Jun 1 0:00 1:00 S
-@@ -3248,7 +3252,7 @@
- # From Tim Parenti (2016-10-19):
- # Predict fall transitions on October's last Saturday at 01:00 from now on.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
- Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
- Rule EgyptAsia 1958 only - May 1 0:00 1:00 S
-@@ -3348,7 +3352,7 @@
- # influence of the sources. There is no current abbreviation for DST,
- # so use "PDT", the usual American style.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Phil 1936 only - Nov 1 0:00 1:00 D
- Rule Phil 1937 only - Feb 1 0:00 0 S
- Rule Phil 1954 only - Apr 12 0:00 1:00 D
-@@ -3496,7 +3500,7 @@
- 5:30 - +0530
-
- # Syria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Syria 1920 1923 - Apr Sun>=15 2:00 1:00 S
- Rule Syria 1920 1923 - Oct Sun>=1 2:00 0 -
- Rule Syria 1962 only - Apr 29 2:00 1:00 S
-diff --git openjdk.orig/jdk/make/data/tzdata/australasia openjdk/jdk/make/data/tzdata/australasia
---- openjdk.orig/jdk/make/data/tzdata/australasia
-+++ openjdk/jdk/make/data/tzdata/australasia
-@@ -36,7 +36,7 @@
-
- # Please see the notes below for the controversy about "EST" versus "AEST" etc.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Aus 1917 only - Jan 1 0:01 1:00 D
- Rule Aus 1917 only - Mar 25 2:00 0 S
- Rule Aus 1942 only - Jan 1 2:00 1:00 D
-@@ -55,7 +55,7 @@
- 9:30 Aus AC%sT
- # Western Australia
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AW 1974 only - Oct lastSun 2:00s 1:00 D
- Rule AW 1975 only - Mar Sun>=1 2:00s 0 S
- Rule AW 1983 only - Oct lastSun 2:00s 1:00 D
-@@ -93,7 +93,7 @@
- # applies to all of the Whitsundays.
- # http://www.australia.gov.au/about-australia/australian-story/austn-islands
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AQ 1971 only - Oct lastSun 2:00s 1:00 D
- Rule AQ 1972 only - Feb lastSun 2:00s 0 S
- Rule AQ 1989 1991 - Oct lastSun 2:00s 1:00 D
-@@ -109,7 +109,7 @@
- 10:00 Holiday AE%sT
-
- # South Australia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AS 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AS 1986 only - Oct 19 2:00s 1:00 D
- Rule AS 1987 2007 - Oct lastSun 2:00s 1:00 D
-@@ -137,7 +137,7 @@
- # http://www.bom.gov.au/climate/averages/tables/dst_times.shtml
- # says King Island didn't observe DST from WWII until late 1971.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AT 1967 only - Oct Sun>=1 2:00s 1:00 D
- Rule AT 1968 only - Mar lastSun 2:00s 0 S
- Rule AT 1968 1985 - Oct lastSun 2:00s 1:00 D
-@@ -170,7 +170,7 @@
- 10:00 AT AE%sT
-
- # Victoria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AV 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AV 1972 only - Feb lastSun 2:00s 0 S
- Rule AV 1973 1985 - Mar Sun>=1 2:00s 0 S
-@@ -191,7 +191,7 @@
- 10:00 AV AE%sT
-
- # New South Wales
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AN 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AN 1972 only - Feb 27 2:00s 0 S
- Rule AN 1973 1981 - Mar Sun>=1 2:00s 0 S
-@@ -220,7 +220,7 @@
- 9:30 AS AC%sT
-
- # Lord Howe Island
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule LH 1981 1984 - Oct lastSun 2:00 1:00 -
- Rule LH 1982 1985 - Mar Sun>=1 2:00 0 -
- Rule LH 1985 only - Oct lastSun 2:00 0:30 -
-@@ -275,8 +275,9 @@
- 10:00 Aus AE%sT 1919 Apr 1 0:00s
- 0 - -00 1948 Mar 25
- 10:00 Aus AE%sT 1967
-- 10:00 AT AE%sT 2010 Apr 4 3:00
-- 11:00 - +11
-+ 10:00 AT AE%sT 2010
-+ 10:00 1:00 AEDT 2011
-+ 10:00 AT AE%sT
-
- # Christmas
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -403,7 +404,7 @@
- # From Michael Deckers (2019-08-06):
- # https://www.laws.gov.fj/LawsAsMade/downloadfile/848
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 -
- Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
- Rule Fiji 2009 only - Nov 29 2:00 1:00 -
-@@ -432,7 +433,7 @@
-
- # Guam
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # http://guamlegislature.com/Public_Laws_5th/PL05-025.pdf
- # http://documents.guam.gov/wp-content/uploads/E.O.-59-7-Guam-Daylight-Savi...
- Rule Guam 1959 only - Jun 27 2:00 1:00 D
-@@ -543,7 +544,7 @@
- 12:00 - +12
-
- # New Caledonia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NC 1977 1978 - Dec Sun>=1 0:00 1:00 -
- Rule NC 1978 1979 - Feb 27 0:00 0 -
- Rule NC 1996 only - Dec 1 2:00s 1:00 -
-@@ -558,7 +559,7 @@
-
- # New Zealand
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NZ 1927 only - Nov 6 2:00 1:00 S
- Rule NZ 1928 only - Mar 4 2:00 0 M
- Rule NZ 1928 1933 - Oct Sun>=8 2:00 0:30 S
-@@ -610,7 +611,7 @@
-
- # Cook Is
- # From Shanks & Pottenger:
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cook 1978 only - Nov 12 0:00 0:30 -
- Rule Cook 1979 1991 - Mar Sun>=1 0:00 0 -
- Rule Cook 1979 1990 - Oct lastSun 0:00 0:30 -
-@@ -755,7 +756,7 @@
- # That web page currently lists transitions for 2012/3 and 2013/4.
- # Assume the pattern instituted in 2012 will continue indefinitely.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule WS 2010 only - Sep lastSun 0:00 1 -
- Rule WS 2011 only - Apr Sat>=1 4:00 0 -
- Rule WS 2011 only - Sep lastSat 3:00 1 -
-@@ -799,7 +800,7 @@
- 13:00 - +13
-
- # Tonga
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Tonga 1999 only - Oct 7 2:00s 1:00 -
- Rule Tonga 2000 only - Mar 19 2:00s 0 -
- Rule Tonga 2000 2001 - Nov Sun>=1 2:00 1:00 -
-@@ -880,7 +881,7 @@
-
-
- # Vanuatu
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Vanuatu 1983 only - Sep 25 0:00 1:00 -
- Rule Vanuatu 1984 1991 - Mar Sun>=23 0:00 0 -
- Rule Vanuatu 1984 only - Oct 23 0:00 1:00 -
-diff --git openjdk.orig/jdk/make/data/tzdata/europe openjdk/jdk/make/data/tzdata/europe
---- openjdk.orig/jdk/make/data/tzdata/europe
-+++ openjdk/jdk/make/data/tzdata/europe
-@@ -411,7 +411,7 @@
- # http://www.irishstatutebook.ie/eli/1926/sro/919/made/en/print
- # http://www.irishstatutebook.ie/eli/1947/sro/71/made/en/print
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Summer Time Act, 1916
- Rule GB-Eire 1916 only - May 21 2:00s 1:00 BST
- Rule GB-Eire 1916 only - Oct 1 2:00s 0 GMT
-@@ -552,7 +552,7 @@
- # The following is like GB-Eire and EU, except with standard time in
- # summer and negative daylight saving time in winter. It is for when
- # negative SAVE values are used.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- #Rule Eire 1971 only - Oct 31 2:00u -1:00 -
- #Rule Eire 1972 1980 - Mar Sun>=16 2:00u 0 -
- #Rule Eire 1972 1980 - Oct Sun>=23 2:00u -1:00 -
-@@ -589,7 +589,7 @@
- # predecessor organization, the European Communities.
- # For brevity they are called "EU rules" elsewhere in this file.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EU 1977 1980 - Apr Sun>=1 1:00u 1:00 S
- Rule EU 1977 only - Sep lastSun 1:00u 0 -
- Rule EU 1978 only - Oct 1 1:00u 0 -
-@@ -629,13 +629,13 @@
- # corrected in version 2008d). The circumstantial evidence is simply the
- # tz database itself, as seen below:
- #
--# Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
-+# Zone Europe/Paris ...
- # 0:00 France WE%sT 1945 Sep 16 3:00
- #
--# Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
-+# Zone Europe/Monaco ...
- # 0:00 France WE%sT 1945 Sep 16 3:00
- #
--# Zone Europe/Belgrade 1:22:00 - LMT 1884
-+# Zone Europe/Belgrade ...
- # 1:00 1:00 CEST 1945 Sep 16 2:00s
- #
- # Rule France 1945 only - Sep 16 3:00 0 -
-@@ -681,7 +681,7 @@
- #
- # The 1917-1921 decree URLs are from Alexander Belopolsky (2016-08-23).
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Russia 1917 only - Jul 1 23:00 1:00 MST # Moscow Summer Time
- #
- # Decree No. 142 (1917-12-22) http://istmat.info/node/28137
-@@ -795,7 +795,7 @@
-
-
- # Albania
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Albania 1940 only - Jun 16 0:00 1:00 S
- Rule Albania 1942 only - Nov 2 3:00 0 -
- Rule Albania 1943 only - Mar 29 2:00 1:00 S
-@@ -849,7 +849,7 @@
- # In 1946 the end of DST was on Monday, 7 October 1946, at 3:00 am.
- # Shanks had this right. Source: Die Weltpresse, 5. Oktober 1946, page 5.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Austria 1920 only - Apr 5 2:00s 1:00 S
- Rule Austria 1920 only - Sep 13 2:00s 0 -
- Rule Austria 1946 only - Apr 14 2:00s 1:00 S
-@@ -936,7 +936,7 @@
- # The 1918 rules are listed for completeness; they apply to unoccupied Belgium.
- # Assume Brussels switched to WET in 1918 when the armistice took effect.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Belgium 1918 only - Mar 9 0:00s 1:00 S
- Rule Belgium 1918 1919 - Oct Sat>=1 23:00s 0 -
- Rule Belgium 1919 only - Mar 1 23:00s 1:00 S
-@@ -996,7 +996,7 @@
- # EET -> EETDST is in 03:00 Local time in last Sunday of March ...
- # EETDST -> EET is in 04:00 Local time in last Sunday of October
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Bulg 1979 only - Mar 31 23:00 1:00 S
- Rule Bulg 1979 only - Oct 1 1:00 0 -
- Rule Bulg 1980 1982 - Apr Sat>=1 23:00 1:00 S
-@@ -1028,7 +1028,7 @@
- # We know of no English-language name for historical Czech winter time;
- # abbreviate it as "GMT", as it happened to be GMT.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Czech 1945 only - Apr Mon>=1 2:00s 1:00 S
- Rule Czech 1945 only - Oct 1 2:00s 0 -
- Rule Czech 1946 only - May 6 2:00s 1:00 S
-@@ -1084,7 +1084,7 @@
- # Hence the "02:00" of the 1980 law refers to standard time, not
- # wall-clock time, and so the EU rules were in effect in 1980.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Denmark 1916 only - May 14 23:00 1:00 S
- Rule Denmark 1916 only - Sep 30 23:00 0 -
- Rule Denmark 1940 only - May 15 0:00 1:00 S
-@@ -1186,7 +1186,7 @@
- # http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-t...
- # It is their only National Park.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D
- Rule Thule 1991 1992 - Sep lastSun 2:00 0 S
- Rule Thule 1993 2006 - Apr Sun>=1 2:00 1:00 D
-@@ -1317,7 +1317,7 @@
- # From Paul Eggert (2014-06-14):
- # Go with Oja over Shanks.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Finland 1942 only - Apr 2 24:00 1:00 S
- Rule Finland 1942 only - Oct 4 1:00 0 -
- Rule Finland 1981 1982 - Mar lastSun 2:00 1:00 S
-@@ -1349,10 +1349,58 @@
- # Françoise Gauquelin, Problèmes de l'heure résolus en astrologie,
- # Guy Trédaniel, Paris 1987
-
-+# From Michael Deckers (2020-06-11):
-+# the law of 1891 <https://gallica.bnf.fr/ark:/12148/bpt6k64415343.texteImage>
-+# was published on 1891-03-15, so it could only take force on 1891-03-16.
-+
-+# From Michael Deckers (2020-06-10):
-+# Le Gaulois, 1911-03-11, page 1/6, online at
-+# https://www.retronews.fr/societe/echo-de-presse/2018/01/29/1911-change-lh...
-+# ... [ Instantly, all pressure driven clock dials halted... Nine minutes and
-+# twenty-one seconds later the hands resumed their circular motion. ]
-+# There are also precise reports about how the change was prepared in train
-+# stations: all the publicly visible clocks stopped at midnight railway time
-+# (or were covered), only the chief of service had a watch, labeled
-+# "Heure ancienne", that he kept running until it reached 00:04:21, when
-+# he announced "Heure nouvelle". See the "Le Petit Journal 1911-03-11".
-+# https://gallica.bnf.fr/ark:/12148/bpt6k6192911/f1.item.zoom
-+#
-+# From Michael Deckers (2020-06-12):
-+# That "all French clocks stopped" for 00:09:21 is a misreading of French
-+# newspapers; this sort of adjustment applies only to certain
-+# remote-controlled clocks ("pendules pneumatiques", of which there existed
-+# perhaps a dozen in Paris, and which simply could not be set back remotely),
-+# but not to all the clocks in all French towns and villages. For instance,
-+# the following story in the "Courrier de Saône-et-Loire" 1911-03-11, page 2:
-+# only works if legal time was stepped back (was not monotone): ...
-+# [One can observe that children who had been born at midnight less 5
-+# minutes and who had died at midnight of the old time, would turn out to
-+# be dead before being born, time having been set back and having
-+# suppressed 9 minutes and 25 seconds of their existence, that is, more
-+# than they could spend.]
-+#
-+# From Paul Eggert (2020-06-12):
-+# French time in railway stations was legally five minutes behind civil time,
-+# which explains why railway "old time" ran to 00:04:21 instead of to 00:09:21.
-+# The law's text (which Michael Deckers noted is at
-+# <https://gallica.bnf.fr/ark:/12148/bpt6k2022333z/f2>) says only that
-+# at 1911-03-11 00:00 legal time was that of Paris mean time delayed by
-+# nine minutes and twenty-one seconds, and does not say how the
-+# transition from Paris mean time was to occur.
-+#
-+# tzdb has no way to represent stopped clocks. As the railway practice
-+# was to keep a watch running on "old time" to decide when to restart
-+# the other clocks, this could be modeled as a transition for "old time" at
-+# 00:09:21. However, since the law was ambiguous and clocks outside railway
-+# stations were probably done haphazardly with the popular impression being
-+# that the transition was done at 00:00 "old time", simply leave the time
-+# blank; this causes zic to default to 00:00 "old time" which is good enough.
-+# Do something similar for the 1891-03-16 transition. There are similar
-+# problems in Algiers, Monaco and Tunis.
-
- #
- # Shank & Pottenger seem to use '24:00' ambiguously; resolve it with Whitman.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule France 1916 only - Jun 14 23:00s 1:00 S
- Rule France 1916 1919 - Oct Sun>=1 23:00s 0 -
- Rule France 1917 only - Mar 24 23:00s 1:00 S
-@@ -1412,13 +1460,11 @@
- # go with Excoffier's 28/3/76 0hUT and 25/9/76 23hUT.
- Rule France 1976 only - Mar 28 1:00 1:00 S
- Rule France 1976 only - Sep 26 1:00 0 -
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time, and Whitman 0:09:05,
--# but Howse quotes the actual French legislation as saying 0:09:21.
--# Go with Howse. Howse writes that the time in France was officially based
-+# Howse writes that the time in France was officially based
- # on PMT-0:09:21 until 1978-08-09, when the time base finally switched to UTC.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
-- 0:09:21 - PMT 1911 Mar 11 0:01 # Paris MT
-+Zone Europe/Paris 0:09:21 - LMT 1891 Mar 16
-+ 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
- # Shanks & Pottenger give 1940 Jun 14 0:00; go with Excoffier and Le Corre.
- 0:00 France WE%sT 1940 Jun 14 23:00
- # Le Corre says Paris stuck with occupied-France time after the liberation;
-@@ -1447,7 +1493,7 @@
- # this was equivalent to UT +03, not +04.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Germany 1946 only - Apr 14 2:00s 1:00 S
- Rule Germany 1946 only - Oct 7 2:00s 0 -
- Rule Germany 1947 1949 - Oct Sun>=1 2:00s 0 -
-@@ -1499,7 +1545,7 @@
- 1:00 EU CE%sT
-
- # Greece
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Whitman gives 1932 Jul 5 - Nov 1; go with Shanks & Pottenger.
- Rule Greece 1932 only - Jul 7 0:00 1:00 S
- Rule Greece 1932 only - Sep 1 0:00 0 -
-@@ -1534,38 +1580,69 @@
- 2:00 EU EE%sT
-
- # Hungary
--# From Paul Eggert (2014-07-15):
--# Dates for 1916-1945 are taken from:
--# Oross A. Jelen a múlt jövője: a nyári időszámítás Magyarországon 1916-1945.
--# National Archives of Hungary (2012-10-29).
--# http://mnl.gov.hu/a_het_dokumentuma/a_nyari_idoszamitas_magyarorszagon_19...
--# This source does not always give times, which are taken from Shanks
--# & Pottenger (which disagree about the dates).
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule Hungary 1918 only - Apr 1 3:00 1:00 S
--Rule Hungary 1918 only - Sep 16 3:00 0 -
--Rule Hungary 1919 only - Apr 15 3:00 1:00 S
--Rule Hungary 1919 only - Nov 24 3:00 0 -
-+
-+# From Michael Deckers (2020-06-09):
-+# an Austrian encyclopedia of railroads of 1913, online at
-+# http://www.zeno.org/Roell-1912/A/Eisenbahnzeit
-+# says that the switch [to CET] happened on 1890-11-01.
-+
-+# From Géza Nyáry (2020-06-07):
-+# Data for 1918-1983 are based on the archive database of Library Hungaricana.
-+# The dates are collected from original, scanned governmental orders,
-+# bulletins, instructions and public press.
-+# [See URLs below.]
-+
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1918/?pg=238
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1919/?pg=808
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1920/?pg=201
-+Rule Hungary 1918 1919 - Apr 15 2:00 1:00 S
-+Rule Hungary 1918 1920 - Sep Mon>=15 3:00 0 -
-+Rule Hungary 1920 only - Apr 5 2:00 1:00 S
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1945/?pg=882
- Rule Hungary 1945 only - May 1 23:00 1:00 S
--Rule Hungary 1945 only - Nov 1 0:00 0 -
-+Rule Hungary 1945 only - Nov 1 1:00 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1946_03/?pg=49
- Rule Hungary 1946 only - Mar 31 2:00s 1:00 S
--Rule Hungary 1946 1949 - Oct Sun>=1 2:00s 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1946_09/?pg=54
-+Rule Hungary 1946 only - Oct 7 2:00 0 -
-+# https://library.hungaricana.hu/hu/view/KulfBelfHirek_1947_04_1__001-123/?...
-+# https://library.hungaricana.hu/hu/view/DunantuliNaplo_1947_09/?pg=128
-+# https://library.hungaricana.hu/hu/view/KulfBelfHirek_1948_03_3__001-123/?...
-+# https://library.hungaricana.hu/hu/view/Zala_1948_09/?pg=64
-+# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniN...
-+# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniN...
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1949_09/?pg=94
- Rule Hungary 1947 1949 - Apr Sun>=4 2:00s 1:00 S
--Rule Hungary 1950 only - Apr 17 2:00s 1:00 S
--Rule Hungary 1950 only - Oct 23 2:00s 0 -
--Rule Hungary 1954 1955 - May 23 0:00 1:00 S
--Rule Hungary 1954 1955 - Oct 3 0:00 0 -
--Rule Hungary 1956 only - Jun Sun>=1 0:00 1:00 S
--Rule Hungary 1956 only - Sep lastSun 0:00 0 -
--Rule Hungary 1957 only - Jun Sun>=1 1:00 1:00 S
--Rule Hungary 1957 only - Sep lastSun 3:00 0 -
--Rule Hungary 1980 only - Apr 6 1:00 1:00 S
-+Rule Hungary 1947 1949 - Oct Sun>=1 2:00s 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1954/?pg...
-+Rule Hungary 1954 only - May 23 0:00 1:00 S
-+Rule Hungary 1954 only - Oct 3 0:00 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1955/?pg...
-+Rule Hungary 1955 only - May 22 2:00 1:00 S
-+Rule Hungary 1955 only - Oct 2 3:00 0 -
-+# https://library.hungaricana.hu/hu/view/HevesMegyeiNepujsag_1956_06/?pg=0
-+# https://library.hungaricana.hu/hu/view/EszakMagyarorszag_1956_06/?pg=6
-+# https://library.hungaricana.hu/hu/view/SzolnokMegyeiNeplap_1957_04/?pg=120
-+# https://library.hungaricana.hu/hu/view/PestMegyeiHirlap_1957_09/?pg=143
-+Rule Hungary 1956 1957 - Jun Sun>=1 2:00 1:00 S
-+Rule Hungary 1956 1957 - Sep lastSun 3:00 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1980/?pg...
-+Rule Hungary 1980 only - Apr 6 0:00 1:00 S
-+Rule Hungary 1980 only - Sep 28 1:00 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1981_01/?pg=79
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1982/?pg...
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1983/?pg=85
-+Rule Hungary 1981 1983 - Mar lastSun 0:00 1:00 S
-+Rule Hungary 1981 1983 - Sep lastSun 1:00 0 -
-+#
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Budapest 1:16:20 - LMT 1890 Oct
-+Zone Europe/Budapest 1:16:20 - LMT 1890 Nov 1
- 1:00 C-Eur CE%sT 1918
-- 1:00 Hungary CE%sT 1941 Apr 8
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1941/?pg=1204
-+ 1:00 Hungary CE%sT 1941 Apr 7 23:00
- 1:00 C-Eur CE%sT 1945
-- 1:00 Hungary CE%sT 1980 Sep 28 2:00s
-+ 1:00 Hungary CE%sT 1984
- 1:00 EU CE%sT
-
- # Iceland
-@@ -1601,7 +1678,7 @@
- # The information below is taken from the 1988 Almanak; see
- # http://www.almanak.hi.is/klukkan.html
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iceland 1917 1919 - Feb 19 23:00 1:00 -
- Rule Iceland 1917 only - Oct 21 1:00 0 -
- Rule Iceland 1918 1919 - Nov 16 1:00 0 -
-@@ -1693,7 +1770,7 @@
- # to 1944-06-04; although Rome was an open city during this period, it
- # was effectively controlled by Germany.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Italy 1916 only - Jun 3 24:00 1:00 S
- Rule Italy 1916 1917 - Sep 30 24:00 0 -
- Rule Italy 1917 only - Mar 31 24:00 1:00 S
-@@ -1803,7 +1880,7 @@
- # urged Lithuania and Estonia to adopt a similar time policy, but it
- # appears that they will not do so....
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Latvia 1989 1996 - Mar lastSun 2:00s 1:00 S
- Rule Latvia 1989 1996 - Sep lastSun 2:00s 0 -
-
-@@ -1896,7 +1973,7 @@
- # Luxembourg
- # Whitman disagrees with most of these dates in minor ways;
- # go with Shanks & Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Lux 1916 only - May 14 23:00 1:00 S
- Rule Lux 1916 only - Oct 1 1:00 0 -
- Rule Lux 1917 only - Apr 28 23:00 1:00 S
-@@ -1937,7 +2014,7 @@
- # From Paul Eggert (2016-10-21):
- # Assume 1900-1972 was like Rome, overriding Shanks.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Malta 1973 only - Mar 31 0:00s 1:00 S
- Rule Malta 1973 only - Sep 29 0:00s 0 -
- Rule Malta 1974 only - Apr 21 0:00s 1:00 S
-@@ -2010,7 +2087,7 @@
- # says the 2014-03-30 spring-forward transition was at 02:00 local time.
- # Guess that since 1997 Moldova has switched one hour before the EU.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Moldova 1997 max - Mar lastSun 2:00 1:00 S
- Rule Moldova 1997 max - Oct lastSun 3:00 0 -
-
-@@ -2028,11 +2105,24 @@
- 2:00 Moldova EE%sT
-
- # Monaco
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
-+#
-+# From Michael Deckers (2020-06-12):
-+# In the "Journal de Monaco" of 1892-05-24, online at
-+# https://journaldemonaco.gouv.mc/var/jdm/storage/original/application/b1c6...
-+# we read: ...
-+# [In virtue of a Sovereign Ordinance of the May 13 of the current [year],
-+# legal time in the Principality will be set to, from the date of June 1,
-+# 1892 onwards, to the meridian of Paris, as in France.]
-+# In the "Journal de Monaco" of 1911-03-28, online at
-+# https://journaldemonaco.gouv.mc/var/jdm/storage/original/application/de74...
-+# we read an ordinance of 1911-03-16: ...
-+# [Legal time in the Principality will be set, from the date of promulgation
-+# of the present ordinance, to legal time in France.... Consequently, legal
-+# time will be retarded by 9 minutes and 21 seconds.]
-+#
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
-- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
-+Zone Europe/Monaco 0:29:32 - LMT 1892 Jun 1
-+ 0:09:21 - PMT 1911 Mar 29 # Paris Mean Time
- 0:00 France WE%sT 1945 Sep 16 3:00
- 1:00 France CE%sT 1977
- 1:00 EU CE%sT
-@@ -2080,7 +2170,7 @@
- # The data entries before 1945 are taken from
- # https://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Neth 1916 only - May 1 0:00 1:00 NST # Netherlands Summer Time
- Rule Neth 1916 only - Oct 1 0:00 0 AMT # Amsterdam Mean Time
- Rule Neth 1917 only - Apr 16 2:00s 1:00 NST
-@@ -2117,7 +2207,7 @@
- # Norway
- # http://met.no/met/met_lex/q_u/sommertid.html (2004-01) agrees with Shanks &
- # Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Norway 1916 only - May 22 1:00 1:00 S
- Rule Norway 1916 only - Sep 30 0:00 0 -
- Rule Norway 1945 only - Apr 2 2:00s 1:00 S
-@@ -2186,7 +2276,7 @@
- # The 1919 dates and times can be found in Tygodnik Urzędowy nr 1 (1919-03-20),
- # <http://www.wbc.poznan.pl/publication/32156> pp 1-2.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Poland 1918 1919 - Sep 16 2:00s 0 -
- Rule Poland 1919 only - Apr 15 2:00s 1:00 S
- Rule Poland 1944 only - Apr 3 2:00s 1:00 S
-@@ -2257,7 +2347,7 @@
- # Guess that the Azores changed to EU rules in 1992 (since that's when Portugal
- # harmonized with EU rules), and that they stayed +0:00 that winter.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # DSH writes that despite Decree 1,469 (1915), the change to the clocks was not
- # done every year, depending on what Spain did, because of railroad schedules.
- # Go with Shanks & Pottenger.
-@@ -2370,7 +2460,7 @@
- # assume that Romania and Moldova switched to EU rules in 1997,
- # the same year as Bulgaria.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Romania 1932 only - May 21 0:00s 1:00 S
- Rule Romania 1932 1939 - Oct Sun>=1 0:00s 0 -
- Rule Romania 1933 1939 - Apr Sun>=2 0:00s 1:00 S
-@@ -3468,14 +3558,14 @@
- # fallback transition from the next day's 00:59... to 00:00.
-
- # From Michael Deckers (2016-12-15):
--# The Royal Decree of 1900-06-26 quoted by Planesas, online at
-+# The Royal Decree of 1900-07-26 quoted by Planesas, online at
- # https://www.boe.es/datos/pdfs/BOE//1900/209/A00383-00384.pdf
- # says in its article 5 (my translation):
- # These dispositions will enter into force beginning with the
- # instant at which, according to the time indicated in article 1,
- # the 1st day of January of 1901 will begin.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Spain 1918 only - Apr 15 23:00 1:00 S
- Rule Spain 1918 1919 - Oct 6 24:00s 0 -
- Rule Spain 1919 only - Apr 6 23:00 1:00 S
-@@ -3612,7 +3702,7 @@
- # By the end of the 18th century clocks and watches became commonplace
- # and their performance improved enormously. Communities began to keep
- # mean time in preference to apparent time - Geneva from 1780 ....
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # From Whitman (who writes "Midnight?"):
- # Rule Swiss 1940 only - Nov 2 0:00 1:00 S
- # Rule Swiss 1940 only - Dec 31 0:00 0 -
-@@ -3699,7 +3789,7 @@
- # 1853-07-16, though it probably occurred at some other date in Zurich, and
- # legal civil time probably changed at still some other transition date.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Swiss 1941 1942 - May Mon>=1 1:00 1:00 S
- Rule Swiss 1941 1942 - Oct Mon>=1 2:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -3848,7 +3938,7 @@
- # Although Google Translate misfires on that source, it looks like
- # Turkey reversed last month's decision, and so will stay at +03.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Turkey 1916 only - May 1 0:00 1:00 S
- Rule Turkey 1916 only - Oct 1 0:00 0 -
- Rule Turkey 1920 only - Mar 28 0:00 1:00 S
-@@ -4006,7 +4096,7 @@
- 2:00 1:00 EEST 1991 Sep 29 3:00
- 2:00 E-Eur EE%sT 1995
- 2:00 EU EE%sT
--# Ruthenia used CET 1990/1991.
-+# Transcarpathia used CET 1990/1991.
- # "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but
- # "Uzhgorod" is more common in English.
- Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct
-diff --git openjdk.orig/jdk/make/data/tzdata/leapseconds openjdk/jdk/make/data/tzdata/leapseconds
---- openjdk.orig/jdk/make/data/tzdata/leapseconds
-+++ openjdk/jdk/make/data/tzdata/leapseconds
-@@ -91,11 +91,11 @@
- # Any additional leap seconds will come after this.
- # This Expires line is commented out for now,
- # so that pre-2020a zic implementations do not reject this file.
--#Expires 2020 Dec 28 00:00:00
-+#Expires 2021 Jun 28 00:00:00
-
- # POSIX timestamps for the data in this file:
- #updated 1467936000 (2016-07-08 00:00:00 UTC)
--#expires 1609113600 (2020-12-28 00:00:00 UTC)
-+#expires 1624838400 (2021-06-28 00:00:00 UTC)
-
--# Updated through IERS Bulletin C59
--# File expires on: 28 December 2020
-+# Updated through IERS Bulletin C60
-+# File expires on: 28 June 2021
-diff --git openjdk.orig/jdk/make/data/tzdata/northamerica openjdk/jdk/make/data/tzdata/northamerica
---- openjdk.orig/jdk/make/data/tzdata/northamerica
-+++ openjdk/jdk/make/data/tzdata/northamerica
-@@ -193,7 +193,7 @@
- # U.S. government action. So even though the "US" rules have changed
- # in the latest release, other countries won't be affected.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule US 1918 1919 - Mar lastSun 2:00 1:00 D
- Rule US 1918 1919 - Oct lastSun 2:00 0 S
- Rule US 1942 only - Feb 9 2:00 1:00 W # War
-@@ -370,7 +370,7 @@
- # Eastern time (i.e., -4:56:01.6) just before the 1883 switch. Round to the
- # nearest second.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule NYC 1920 only - Mar lastSun 2:00 1:00 D
- Rule NYC 1920 only - Oct lastSun 2:00 0 S
- Rule NYC 1921 1966 - Apr lastSun 2:00 1:00 D
-@@ -454,7 +454,7 @@
- # The Tennessean 2007-05-11, republished 2015-04-06.
- # https://www.tennessean.com/story/insider/extras/2015/04/06/archives-seige...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Chicago 1920 only - Jun 13 2:00 1:00 D
- Rule Chicago 1920 1921 - Oct lastSun 2:00 0 S
- Rule Chicago 1921 only - Mar lastSun 2:00 1:00 D
-@@ -523,7 +523,7 @@
- # El Paso Times. 2018-10-24 06:40 -06.
- # https://www.elpasotimes.com/story/news/local/el-paso/2018/10/24/el-pasoan...
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Denver 1920 1921 - Mar lastSun 2:00 1:00 D
- Rule Denver 1920 only - Oct lastSun 2:00 0 S
- Rule Denver 1921 only - May 22 2:00 0 S
-@@ -576,7 +576,7 @@
- # https://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&contex...
- # https://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&contex...
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule CA 1948 only - Mar 14 2:01 1:00 D
- Rule CA 1949 only - Jan 1 2:00 0 S
- Rule CA 1950 1966 - Apr lastSun 1:00 1:00 D
-@@ -934,7 +934,7 @@
- # going to switch from Central to Eastern Time on March 11, 2007....
- # http://www.indystar.com/apps/pbcs.dll/article?AID=/20070207/LOCAL190108/7...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Indianapolis 1941 only - Jun 22 2:00 1:00 D
- Rule Indianapolis 1941 1954 - Sep lastSun 2:00 0 S
- Rule Indianapolis 1946 1954 - Apr lastSun 2:00 1:00 D
-@@ -953,7 +953,7 @@
- #
- # Eastern Crawford County, Indiana, left its clocks alone in 1974,
- # as well as from 1976 through 2005.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Marengo 1951 only - Apr lastSun 2:00 1:00 D
- Rule Marengo 1951 only - Sep lastSun 2:00 0 S
- Rule Marengo 1954 1960 - Apr lastSun 2:00 1:00 D
-@@ -972,7 +972,7 @@
- # Daviess, Dubois, Knox, and Martin Counties, Indiana,
- # switched from eastern to central time in April 2006, then switched back
- # in November 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Vincennes 1946 only - Apr lastSun 2:00 1:00 D
- Rule Vincennes 1946 only - Sep lastSun 2:00 0 S
- Rule Vincennes 1953 1954 - Apr lastSun 2:00 1:00 D
-@@ -997,7 +997,7 @@
- # The Indianapolis News, Friday 27 October 1967 states that Perry County
- # returned to CST. It went again to EST on 27 April 1969, as documented by the
- # Indianapolis star of Saturday 26 April.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Perry 1955 only - May 1 0:00 1:00 D
- Rule Perry 1955 1960 - Sep lastSun 2:00 0 S
- Rule Perry 1956 1963 - Apr lastSun 2:00 1:00 D
-@@ -1014,7 +1014,7 @@
- #
- # Pike County, Indiana moved from central to eastern time in 1977,
- # then switched back in 2006, then switched back again in 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Pike 1955 only - May 1 0:00 1:00 D
- Rule Pike 1955 1960 - Sep lastSun 2:00 0 S
- Rule Pike 1956 1964 - Apr lastSun 2:00 1:00 D
-@@ -1035,7 +1035,7 @@
- # An article on page A3 of the Sunday, 1991-10-27 Washington Post
- # notes that Starke County switched from Central time to Eastern time as of
- # 1991-10-27.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Starke 1947 1961 - Apr lastSun 2:00 1:00 D
- Rule Starke 1947 1954 - Sep lastSun 2:00 0 S
- Rule Starke 1955 1956 - Oct lastSun 2:00 0 S
-@@ -1052,7 +1052,7 @@
- #
- # Pulaski County, Indiana, switched from eastern to central time in
- # April 2006 and then switched back in March 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Pulaski 1946 1960 - Apr lastSun 2:00 1:00 D
- Rule Pulaski 1946 1954 - Sep lastSun 2:00 0 S
- Rule Pulaski 1955 1956 - Oct lastSun 2:00 0 S
-@@ -1094,7 +1094,7 @@
- #
- # Part of Kentucky left its clocks alone in 1974.
- # This also includes Clark, Floyd, and Harrison counties in Indiana.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Louisville 1921 only - May 1 2:00 1:00 D
- Rule Louisville 1921 only - Sep 1 2:00 0 S
- Rule Louisville 1941 only - Apr lastSun 2:00 1:00 D
-@@ -1208,7 +1208,7 @@
- # election Michigan voters narrowly repealed DST, effective 1969.
- #
- # Most of Michigan observed DST from 1973 on, but was a bit late in 1975.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Detroit 1948 only - Apr lastSun 2:00 1:00 D
- Rule Detroit 1948 only - Sep lastSun 2:00 0 S
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1225,7 +1225,7 @@
- #
- # Dickinson, Gogebic, Iron, and Menominee Counties, Michigan,
- # switched from EST to CST/CDT in 1973.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Menominee 1946 only - Apr lastSun 2:00 1:00 D
- Rule Menominee 1946 only - Sep lastSun 2:00 0 S
- Rule Menominee 1966 only - Apr lastSun 2:00 1:00 D
-@@ -1395,7 +1395,7 @@
- # Oct 31, to Oct 27, 1918 (and Sunday is a more likely transition day
- # than Thursday) in all Canadian rulesets.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Canada 1918 only - Apr 14 2:00 1:00 D
- Rule Canada 1918 only - Oct 27 2:00 0 S
- Rule Canada 1942 only - Feb 9 2:00 1:00 W # War
-@@ -1418,7 +1418,7 @@
- # that follows the rules is the southeast corner, including Port Hope
- # Simpson and Mary's Harbour, but excluding, say, Black Tickle.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule StJohns 1917 only - Apr 8 2:00 1:00 D
- Rule StJohns 1917 only - Sep 17 2:00 0 S
- # Whitman gives 1919 Apr 5 and 1920 Apr 5; go with Shanks & Pottenger.
-@@ -1520,7 +1520,7 @@
- # bill say that it is "accommodating the customs and practices" of those
- # regions, which suggests that they have always been in-line with Halifax.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Halifax 1916 only - Apr 1 0:00 1:00 D
- Rule Halifax 1916 only - Oct 1 0:00 0 S
- Rule Halifax 1920 only - May 9 0:00 1:00 D
-@@ -1586,7 +1586,7 @@
- # clear that this was the case since at least 1993.
- # For now, assume it started in 1993.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Moncton 1933 1935 - Jun Sun>=8 1:00 1:00 D
- Rule Moncton 1933 1935 - Sep Sun>=8 1:00 0 S
- Rule Moncton 1936 1938 - Jun Sun>=1 1:00 1:00 D
-@@ -1795,7 +1795,7 @@
- # With some exceptions, the use of daylight saving may be said to be limited
- # to those cities and towns lying between Quebec city and Windsor, Ont.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Toronto 1919 only - Mar 30 23:30 1:00 D
- Rule Toronto 1919 only - Oct 26 0:00 0 S
- Rule Toronto 1920 only - May 2 2:00 1:00 D
-@@ -1893,7 +1893,7 @@
- # starting 1966. Since 02:00s is clearly correct for 1967 on, assume
- # it was also 02:00s in 1966.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Winn 1916 only - Apr 23 0:00 1:00 D
- Rule Winn 1916 only - Sep 17 0:00 0 S
- Rule Winn 1918 only - Apr 14 2:00 1:00 D
-@@ -1984,7 +1984,7 @@
- # long and rather painful to read.
- # http://www.qp.gov.sk.ca/documents/English/Statutes/Statutes/T14.pdf
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Regina 1918 only - Apr 14 2:00 1:00 D
- Rule Regina 1918 only - Oct 27 2:00 0 S
- Rule Regina 1930 1934 - May Sun>=1 0:00 1:00 D
-@@ -2034,7 +2034,7 @@
- # Boyer JP. Forcing Choice: The Risky Reward of Referendums. Dundum. 2017.
- # ISBN 978-1459739123.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Edm 1918 1919 - Apr Sun>=8 2:00 1:00 D
- Rule Edm 1918 only - Oct 27 2:00 0 S
- Rule Edm 1919 only - May 27 2:00 0 S
-@@ -2143,7 +2143,7 @@
- # https://searcharchives.vancouver.ca/daylight-saving-1918-starts-again-jul...
- # We have no further details, so omit them for now.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Vanc 1918 only - Apr 14 2:00 1:00 D
- Rule Vanc 1918 only - Oct 27 2:00 0 S
- Rule Vanc 1942 only - Feb 9 2:00 1:00 W # War
-@@ -2472,7 +2472,19 @@
- # consistency with nearby Dawson Creek, Creston, and Fort Nelson.
- # https://yukon.ca/en/news/yukon-end-seasonal-time-change
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# From Andrew G. Smith (2020-09-24):
-+# Yukon has completed its regulatory change to be on UTC -7 year-round....
-+# http://www.gov.yk.ca/legislation/regs/oic2020_125.pdf
-+# What we have done is re-defined Yukon Standard Time, as we are
-+# authorized to do under section 33 of our Interpretation Act:
-+# http://www.gov.yk.ca/legislation/acts/interpretation_c.pdf
-+#
-+# From Paul Eggert (2020-09-24):
-+# tzdb uses the obsolete YST abbreviation for standard time in Yukon through
-+# about 1970, and uses PST for standard time in Yukon since then. Consistent
-+# with that, use MST for -07, the new standard time in Yukon effective Nov. 1.
-+
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NT_YK 1918 only - Apr 14 2:00 1:00 D
- Rule NT_YK 1918 only - Oct 27 2:00 0 S
- Rule NT_YK 1919 only - May 25 2:00 1:00 D
-@@ -2526,12 +2538,12 @@
- Zone America/Whitehorse -9:00:12 - LMT 1900 Aug 20
- -9:00 NT_YK Y%sT 1967 May 28 0:00
- -8:00 NT_YK P%sT 1980
-- -8:00 Canada P%sT 2020 Mar 8 2:00
-+ -8:00 Canada P%sT 2020 Nov 1
- -7:00 - MST
- Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
- -9:00 NT_YK Y%sT 1973 Oct 28 0:00
- -8:00 NT_YK P%sT 1980
-- -8:00 Canada P%sT 2020 Mar 8 2:00
-+ -8:00 Canada P%sT 2020 Nov 1
- -7:00 - MST
-
-
-@@ -2746,7 +2758,7 @@
- # 5- The islands, reefs and keys shall take their timezone from the
- # longitude they are located at.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mexico 1939 only - Feb 5 0:00 1:00 D
- Rule Mexico 1939 only - Jun 25 0:00 0 S
- Rule Mexico 1940 only - Dec 9 0:00 1:00 D
-@@ -2951,7 +2963,7 @@
- # rules to sync with the U.S. starting in 2007....
- # http://www.jonesbahamas.com/?c=45&a=10412
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Bahamas 1964 1975 - Oct lastSun 2:00 0 S
- Rule Bahamas 1964 1975 - Apr lastSun 2:00 1:00 D
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -2963,7 +2975,7 @@
-
- # For 1899 Milne gives -3:58:29.2; round that.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Barb 1977 only - Jun 12 2:00 1:00 D
- Rule Barb 1977 1978 - Oct Sun>=1 2:00 0 S
- Rule Barb 1978 1980 - Apr Sun>=15 2:00 1:00 D
-@@ -2976,7 +2988,7 @@
-
- # Belize
- # Whitman entirely disagrees with Shanks; go with Shanks & Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Belize 1918 1942 - Oct Sun>=2 0:00 0:30 -0530
- Rule Belize 1919 1943 - Feb Sun>=9 0:00 0 CST
- Rule Belize 1973 only - Dec 5 0:00 1:00 CDT
-@@ -3013,7 +3025,7 @@
-
- # Milne gives -5:36:13.3 as San José mean time; round to nearest.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule CR 1979 1980 - Feb lastSun 0:00 1:00 D
- Rule CR 1979 1980 - Jun Sun>=1 0:00 0 S
- Rule CR 1991 1992 - Jan Sat>=15 0:00 1:00 D
-@@ -3187,7 +3199,7 @@
- # From Paul Eggert (2012-11-03):
- # For now, assume the future rule is first Sunday in November.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cuba 1928 only - Jun 10 0:00 1:00 D
- Rule Cuba 1928 only - Oct 10 0:00 0 S
- Rule Cuba 1940 1942 - Jun Sun>=1 0:00 1:00 D
-@@ -3256,7 +3268,7 @@
- # decided to revert.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule DR 1966 only - Oct 30 0:00 1:00 EDT
- Rule DR 1967 only - Feb 28 0:00 0 EST
- Rule DR 1969 1973 - Oct lastSun 0:00 0:30 -0430
-@@ -3273,7 +3285,7 @@
-
- # El Salvador
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Salv 1987 1988 - May Sun>=1 0:00 1:00 D
- Rule Salv 1987 1988 - Sep lastSun 0:00 0 S
- # There are too many San Salvadors elsewhere, so use America/El_Salvador
-@@ -3302,7 +3314,7 @@
- # (2006-04-19), says DST ends at 24:00. See
- # http://www.sieca.org.gt/Sitio_publico/Energeticos/Doc/Medidas/Cambio_Hora...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Guat 1973 only - Nov 25 0:00 1:00 D
- Rule Guat 1974 only - Feb 24 0:00 0 S
- Rule Guat 1983 only - May 21 0:00 1:00 D
-@@ -3383,7 +3395,7 @@
- # I have not been able to find a more authoritative source:
- # https://www.haitilibre.com/en/news-20319-haiti-notices-time-change-in-hai...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Haiti 1983 only - May 8 0:00 1:00 D
- Rule Haiti 1984 1987 - Apr lastSun 0:00 1:00 D
- Rule Haiti 1983 1987 - Oct lastSun 0:00 0 S
-@@ -3431,7 +3443,7 @@
- # http://www.laprensahn.com/pais_nota.php?id04962=7386
- # So it seems that Honduras will not enter DST this year....
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Hond 1987 1988 - May Sun>=1 0:00 1:00 D
- Rule Hond 1987 1988 - Sep lastSun 0:00 0 S
- Rule Hond 2006 only - May Sun>=1 0:00 1:00 D
-@@ -3522,7 +3534,7 @@
- # The natural sun time is restored in all the national territory, in that the
- # time is returned one hour at 01:00 am of October 1 of 2006.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Nic 1979 1980 - Mar Sun>=16 0:00 1:00 D
- Rule Nic 1979 1980 - Jun Mon>=23 0:00 0 S
- Rule Nic 2005 only - Apr 10 0:00 1:00 D
-diff --git openjdk.orig/jdk/make/data/tzdata/pacificnew openjdk/jdk/make/data/tzdata/pacificnew
-deleted file mode 100644
---- openjdk/jdk/make/data/tzdata/pacificnew
-+++ /dev/null
-@@ -1,52 +0,0 @@
--#
--# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--#
--# This code is free software; you can redistribute it and/or modify it
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation. Oracle designates this
--# particular file as subject to the "Classpath" exception as provided
--# by Oracle in the LICENSE file that accompanied this code.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--# tzdb data for proposed US election time (this file is obsolete)
--
--# This file is in the public domain, so clarified as of
--# 2009-05-17 by Arthur David Olson.
--
--# From Arthur David Olson (1989-04-05):
--# On 1989-04-05, the U. S. House of Representatives passed (238-154) a bill
--# establishing "Pacific Presidential Election Time"; it was not acted on
--# by the Senate or signed into law by the President.
--# You might want to change the "PE" (Presidential Election) below to
--# "Q" (Quadrennial) to maintain three-character zone abbreviations.
--# If you're really conservative, you might want to change it to "D".
--# Avoid "L" (Leap Year), which won't be true in 2100.
--
--# If Presidential Election Time is ever established, replace "XXXX" below
--# with the year the law takes effect and uncomment the "##" lines.
--
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--## Rule Twilite XXXX max - Apr Sun>=1 2:00 1:00 D
--## Rule Twilite XXXX max uspres Oct lastSun 2:00 1:00 PE
--## Rule Twilite XXXX max uspres Nov Sun>=7 2:00 0 S
--## Rule Twilite XXXX max nonpres Oct lastSun 2:00 0 S
--
--# Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL]
--## Zone America/Los_Angeles-PET -8:00 US P%sT XXXX
--## -8:00 Twilite P%sT
--
--# For now...
--Link America/Los_Angeles US/Pacific-New ##
-diff --git openjdk.orig/jdk/make/data/tzdata/southamerica openjdk/jdk/make/data/tzdata/southamerica
---- openjdk.orig/jdk/make/data/tzdata/southamerica
-+++ openjdk/jdk/make/data/tzdata/southamerica
-@@ -71,7 +71,7 @@
- # I am sending modifications to the Argentine time zone table...
- # AR was chosen because they are the ISO letters that represent Argentina.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Arg 1930 only - Dec 1 0:00 1:00 -
- Rule Arg 1931 only - Apr 1 0:00 0 -
- Rule Arg 1931 only - Oct 15 0:00 1:00 -
-@@ -792,7 +792,7 @@
- # From Paul Eggert (2013-10-17):
- # For now, assume western Amazonas will change as well.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Decree 20,466 <http://pcdsh01.on.br/HV20466.htm> (1931-10-01)
- # Decree 21,896 <http://pcdsh01.on.br/HV21896.htm> (1932-01-10)
- Rule Brazil 1931 only - Oct 3 11:00 1:00 -
-@@ -1281,7 +1281,7 @@
- # For now, assume that they will not revert,
- # since they have extended the expiration date once already.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Chile 1927 1931 - Sep 1 0:00 1:00 -
- Rule Chile 1928 1932 - Apr 1 0:00 0 -
- Rule Chile 1968 only - Nov 3 4:00u 1:00 -
-@@ -1381,7 +1381,7 @@
- # Milne gives 4:56:16.4 for Bogotá time in 1899; round to nearest. He writes,
- # "A variation of fifteen minutes in the public clocks of Bogota is not rare."
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule CO 1992 only - May 3 0:00 1:00 -
- Rule CO 1993 only - Apr 4 0:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1441,7 +1441,7 @@
- # (Not one step back), the clocks went back in 1993 and the experiment was not
- # repeated. For now, assume transitions were at 00:00 local time country-wide.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Ecuador 1992 only - Nov 28 0:00 1:00 -
- Rule Ecuador 1993 only - Feb 5 0:00 0 -
- #
-@@ -1535,7 +1535,7 @@
- # For now we will assume permanent -03 for the Falklands
- # until advised differently (to apply for 2012 and beyond, after the 2011
- # experiment was apparently successful.)
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 -
- Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 -
- Rule Falk 1939 only - Oct 1 0:00 1:00 -
-@@ -1581,7 +1581,7 @@
- # No time of the day is established for the adjustment, so people normally
- # adjust their clocks at 0 hour of the given dates.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Para 1975 1988 - Oct 1 0:00 1:00 -
- Rule Para 1975 1978 - Mar 1 0:00 0 -
- Rule Para 1979 1991 - Apr 1 0:00 0 -
-@@ -1674,7 +1674,7 @@
- # From Paul Eggert (2006-03-22):
- # Shanks & Pottenger don't have this transition. Assume 1986 was like 1987.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Peru 1938 only - Jan 1 0:00 1:00 -
- Rule Peru 1938 only - Apr 1 0:00 0 -
- Rule Peru 1938 1939 - Sep lastSun 0:00 1:00 -
-@@ -1770,7 +1770,7 @@
- # https://www.impo.com.uy/diariooficial/1926/03/10/2
- # https://www.impo.com.uy/diariooficial/1926/03/18/2
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Uruguay 1923 1925 - Oct 1 0:00 0:30 -
- Rule Uruguay 1924 1926 - Apr 1 0:00 0 -
- # From Tim Parenti (2018-02-15):
-diff --git openjdk.orig/jdk/make/data/tzdata/systemv openjdk/jdk/make/data/tzdata/systemv
-deleted file mode 100644
---- openjdk/jdk/make/data/tzdata/systemv
-+++ /dev/null
-@@ -1,62 +0,0 @@
--#
--# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--#
--# This code is free software; you can redistribute it and/or modify it
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation. Oracle designates this
--# particular file as subject to the "Classpath" exception as provided
--# by Oracle in the LICENSE file that accompanied this code.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--# tzdb data for System V rules (this file is obsolete)
--
--# This file is in the public domain, so clarified as of
--# 2009-05-17 by Arthur David Olson.
--
--# Old rules, should the need arise.
--# No attempt is made to handle Newfoundland, since it cannot be expressed
--# using the System V "TZ" scheme (half-hour offset), or anything outside
--# North America (no support for non-standard DST start/end dates), nor
--# the changes in the DST rules in the US after 1976 (which occurred after
--# the old rules were written).
--#
--# If you need the old rules, uncomment ## lines.
--# Compile this *without* leap second correction for true conformance.
--
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule SystemV min 1973 - Apr lastSun 2:00 1:00 D
--Rule SystemV min 1973 - Oct lastSun 2:00 0 S
--Rule SystemV 1974 only - Jan 6 2:00 1:00 D
--Rule SystemV 1974 only - Nov lastSun 2:00 0 S
--Rule SystemV 1975 only - Feb 23 2:00 1:00 D
--Rule SystemV 1975 only - Oct lastSun 2:00 0 S
--Rule SystemV 1976 max - Apr lastSun 2:00 1:00 D
--Rule SystemV 1976 max - Oct lastSun 2:00 0 S
--
--# Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL]
--## Zone SystemV/AST4ADT -4:00 SystemV A%sT
--## Zone SystemV/EST5EDT -5:00 SystemV E%sT
--## Zone SystemV/CST6CDT -6:00 SystemV C%sT
--## Zone SystemV/MST7MDT -7:00 SystemV M%sT
--## Zone SystemV/PST8PDT -8:00 SystemV P%sT
--## Zone SystemV/YST9YDT -9:00 SystemV Y%sT
--## Zone SystemV/AST4 -4:00 - AST
--## Zone SystemV/EST5 -5:00 - EST
--## Zone SystemV/CST6 -6:00 - CST
--## Zone SystemV/MST7 -7:00 - MST
--## Zone SystemV/PST8 -8:00 - PST
--## Zone SystemV/YST9 -9:00 - YST
--## Zone SystemV/HST10 -10:00 - HST
-diff --git openjdk.orig/jdk/make/gendata/GendataTZDB.gmk openjdk/jdk/make/gendata/GendataTZDB.gmk
---- openjdk.orig/jdk/make/gendata/GendataTZDB.gmk
-+++ openjdk/jdk/make/gendata/GendataTZDB.gmk
-@@ -29,7 +29,7 @@
- # Time zone data file creation
- #
- TZDATA_DIR := $(JDK_TOPDIR)/make/data/tzdata
--TZDATA_TZFILE := africa antarctica asia australasia europe northamerica pacificnew southamerica backward etcetera gmt jdk11_backward
-+TZDATA_TZFILE := africa antarctica asia australasia europe northamerica southamerica backward etcetera gmt jdk11_backward
- TZDATA_TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZDATA_TZFILE))
-
- GENDATA_TZDB_DAT := $(JDK_OUTPUTDIR)/lib/tzdb.dat
-diff --git openjdk.orig/jdk/src/aix/lib/tzmappings openjdk/jdk/src/aix/lib/tzmappings
---- openjdk.orig/jdk/src/aix/lib/tzmappings
-+++ openjdk/jdk/src/aix/lib/tzmappings
-@@ -568,7 +568,6 @@
- US/Michigan America/New_York
- US/Mountain America/Denver
- US/Pacific America/Los_Angeles
--US/Pacific-New America/Los_Angeles
- US/Samoa Pacific/Pago_Pago
- USAST-2 Africa/Johannesburg
- USAST-2USADT Europe/Istanbul
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
-@@ -1040,7 +1040,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java openjdk/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java openjdk/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java openjdk/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java openjdk/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java openjdk/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java openjdk/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java openjdk/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java openjdk/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java openjdk/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git a/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java b/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
-@@ -1037,7 +1037,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java openjdk/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
---- openjdk.orig/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
-+++ openjdk/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
-@@ -47,7 +47,7 @@
- String TESTDIR = System.getProperty("test.dir", ".");
- String SRCDIR = System.getProperty("test.src", ".");
- String tzdir = SRCDIR + File.separator + "tzdata";
-- String tzfiles = "africa antarctica asia australasia europe northamerica pacificnew southamerica backward etcetera systemv";
-+ String tzfiles = "africa antarctica asia australasia europe northamerica southamerica backward etcetera";
- String jdk_tzdir = SRCDIR + File.separator + "tzdata_jdk";
- String jdk_tzfiles = "gmt jdk11_backward";
- String zidir = TESTDIR + File.separator + "zi";
-@@ -194,8 +194,9 @@
-
- // test getAvailableIDs(raw);
- zids_new = TimeZone.getAvailableIDs(-8 * 60 * 60 * 1000);
-- //Arrays.sort(zids_new);
-+ Arrays.sort(zids_new);
- zids_old = ZoneInfoOld.getAvailableIDs(-8 * 60 * 60 * 1000);
-+ Arrays.sort(zids_old);
- if (!Arrays.equals(zids_new, zids_old)) {
- System.out.println("------------------------");
- System.out.println("NEW.getAvailableIDs(-8:00)");
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/VERSION openjdk/jdk/test/sun/util/calendar/zi/tzdata/VERSION
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/VERSION
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/VERSION
-@@ -21,4 +21,4 @@
- # or visit www.oracle.com if you need additional information or have any
- # questions.
- #
--tzdata2020a
-+tzdata2020b
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/africa openjdk/jdk/test/sun/util/calendar/zi/tzdata/africa
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/africa
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/africa
-@@ -87,7 +87,7 @@
- # Corrections are welcome.
-
- # Algeria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Algeria 1916 only - Jun 14 23:00s 1:00 S
- Rule Algeria 1916 1919 - Oct Sun>=1 23:00s 0 -
- Rule Algeria 1917 only - Mar 24 23:00s 1:00 S
-@@ -110,10 +110,9 @@
- Rule Algeria 1978 only - Sep 22 3:00 0 -
- Rule Algeria 1980 only - Apr 25 0:00 1:00 S
- Rule Algeria 1980 only - Oct 31 2:00 0 -
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
-+# See Europe/Paris for PMT-related transitions.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01
-+Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 16
- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
- 0:00 Algeria WE%sT 1940 Feb 25 2:00
- 1:00 Algeria CE%sT 1946 Oct 7
-@@ -199,7 +198,7 @@
- # Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this
- # did not apply to Cairo, Alexandria, or Port Said.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Egypt 1940 only - Jul 15 0:00 1:00 S
- Rule Egypt 1940 only - Oct 1 0:00 0 -
- Rule Egypt 1941 only - Apr 15 0:00 1:00 S
-@@ -434,7 +433,7 @@
- # now Ghana observed different DST regimes in different years. For
- # lack of better info, use Shanks except treat the minus sign as a
- # typo, and assume DST started in 1920 not 1936.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Ghana 1920 1942 - Sep 1 0:00 0:20 -
- Rule Ghana 1920 1942 - Dec 31 0:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -524,7 +523,7 @@
- # From Paul Eggert (2013-10-25):
- # For now, assume they're reverting to the pre-2012 rules of permanent UT +02.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Libya 1951 only - Oct 14 2:00 1:00 S
- Rule Libya 1952 only - Jan 1 0:00 0 -
- Rule Libya 1953 only - Oct 9 2:00 1:00 S
-@@ -647,7 +646,7 @@
- # "The trial ended on March 29, 2009, when the clocks moved back by one hour
- # at 2am (or 02:00) local time..."
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mauritius 1982 only - Oct 10 0:00 1:00 -
- Rule Mauritius 1983 only - Mar 21 0:00 0 -
- Rule Mauritius 2008 only - Oct lastSun 2:00 1:00 -
-@@ -898,17 +897,30 @@
- # https://maroc-diplomatique.net/maroc-le-retour-a-lheure-gmt-est-prevu-dim...
- # http://aujourdhui.ma/actualite/gmt1-retour-a-lheure-normale-dimanche-proc...
- #
--# From Paul Eggert (2020-04-14):
-+# From Milamber (2020-05-31)
-+# In Morocco (where I live), the end of Ramadan (Arabic month) is followed by
-+# the Eid al-Fitr, and concretely it's 1 or 2 day offs for the people (with
-+# traditional visiting of family, big lunches/dinners, etc.). So for this
-+# year the astronomical calculations don't include the following 2 days off in
-+# the calc. These 2 days fall in a Sunday/Monday, so it's not acceptable by
-+# people to have a time shift during these 2 days off. Perhaps you can modify
-+# the (predicted) rules for next years: if the end of Ramadan is a (probable)
-+# Friday or Saturday (and so the 2 days off are on a weekend), the next time
-+# shift will be the next weekend.
-+#
-+# From Paul Eggert (2020-05-31):
- # For now, guess that in the future Morocco will fall back at 03:00
- # the last Sunday before Ramadan, and spring forward at 02:00 the
--# first Sunday after the day after Ramadan. To implement this,
--# transition dates for 2021 through 2087 were determined by running
--# the following program under GNU Emacs 26.3.
--# (let ((islamic-year 1442))
-+# first Sunday after two days after Ramadan. To implement this,
-+# transition dates and times for 2019 through 2087 were determined by
-+# running the following program under GNU Emacs 26.3. (This algorithm
-+# also produces the correct transition dates for 2016 through 2018,
-+# though the times differ due to Morocco's time zone change in 2018.)
-+# (let ((islamic-year 1440))
- # (require 'cal-islam)
- # (while (< islamic-year 1511)
- # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
--# (b (1+ (calendar-islamic-to-absolute (list 10 1 islamic-year))))
-+# (b (+ 2 (calendar-islamic-to-absolute (list 10 1 islamic-year))))
- # (sunday 0))
- # (while (/= sunday (mod (setq a (1- a)) 7)))
- # (while (/= sunday (mod b 7))
-@@ -923,7 +935,7 @@
- # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
- # (setq islamic-year (+ 1 islamic-year))))
-
--# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Morocco 1939 only - Sep 12 0:00 1:00 -
- Rule Morocco 1939 only - Nov 19 0:00 0 -
- Rule Morocco 1940 only - Feb 25 0:00 1:00 -
-@@ -974,7 +986,7 @@
- Rule Morocco 2022 only - Mar 27 3:00 0 -
- Rule Morocco 2022 only - May 8 2:00 1:00 -
- Rule Morocco 2023 only - Mar 19 3:00 0 -
--Rule Morocco 2023 only - Apr 23 2:00 1:00 -
-+Rule Morocco 2023 only - Apr 30 2:00 1:00 -
- Rule Morocco 2024 only - Mar 10 3:00 0 -
- Rule Morocco 2024 only - Apr 14 2:00 1:00 -
- Rule Morocco 2025 only - Feb 23 3:00 0 -
-@@ -990,7 +1002,7 @@
- Rule Morocco 2029 only - Dec 30 3:00 0 -
- Rule Morocco 2030 only - Feb 10 2:00 1:00 -
- Rule Morocco 2030 only - Dec 22 3:00 0 -
--Rule Morocco 2031 only - Jan 26 2:00 1:00 -
-+Rule Morocco 2031 only - Feb 2 2:00 1:00 -
- Rule Morocco 2031 only - Dec 14 3:00 0 -
- Rule Morocco 2032 only - Jan 18 2:00 1:00 -
- Rule Morocco 2032 only - Nov 28 3:00 0 -
-@@ -1006,7 +1018,7 @@
- Rule Morocco 2037 only - Oct 4 3:00 0 -
- Rule Morocco 2037 only - Nov 15 2:00 1:00 -
- Rule Morocco 2038 only - Sep 26 3:00 0 -
--Rule Morocco 2038 only - Oct 31 2:00 1:00 -
-+Rule Morocco 2038 only - Nov 7 2:00 1:00 -
- Rule Morocco 2039 only - Sep 18 3:00 0 -
- Rule Morocco 2039 only - Oct 23 2:00 1:00 -
- Rule Morocco 2040 only - Sep 2 3:00 0 -
-@@ -1022,7 +1034,7 @@
- Rule Morocco 2045 only - Jul 9 3:00 0 -
- Rule Morocco 2045 only - Aug 20 2:00 1:00 -
- Rule Morocco 2046 only - Jul 1 3:00 0 -
--Rule Morocco 2046 only - Aug 5 2:00 1:00 -
-+Rule Morocco 2046 only - Aug 12 2:00 1:00 -
- Rule Morocco 2047 only - Jun 23 3:00 0 -
- Rule Morocco 2047 only - Jul 28 2:00 1:00 -
- Rule Morocco 2048 only - Jun 7 3:00 0 -
-@@ -1038,7 +1050,7 @@
- Rule Morocco 2053 only - Apr 13 3:00 0 -
- Rule Morocco 2053 only - May 25 2:00 1:00 -
- Rule Morocco 2054 only - Apr 5 3:00 0 -
--Rule Morocco 2054 only - May 10 2:00 1:00 -
-+Rule Morocco 2054 only - May 17 2:00 1:00 -
- Rule Morocco 2055 only - Mar 28 3:00 0 -
- Rule Morocco 2055 only - May 2 2:00 1:00 -
- Rule Morocco 2056 only - Mar 12 3:00 0 -
-@@ -1054,7 +1066,7 @@
- Rule Morocco 2061 only - Jan 16 3:00 0 -
- Rule Morocco 2061 only - Feb 27 2:00 1:00 -
- Rule Morocco 2062 only - Jan 8 3:00 0 -
--Rule Morocco 2062 only - Feb 12 2:00 1:00 -
-+Rule Morocco 2062 only - Feb 19 2:00 1:00 -
- Rule Morocco 2062 only - Dec 31 3:00 0 -
- Rule Morocco 2063 only - Feb 4 2:00 1:00 -
- Rule Morocco 2063 only - Dec 16 3:00 0 -
-@@ -1070,7 +1082,7 @@
- Rule Morocco 2068 only - Oct 21 3:00 0 -
- Rule Morocco 2068 only - Dec 2 2:00 1:00 -
- Rule Morocco 2069 only - Oct 13 3:00 0 -
--Rule Morocco 2069 only - Nov 17 2:00 1:00 -
-+Rule Morocco 2069 only - Nov 24 2:00 1:00 -
- Rule Morocco 2070 only - Oct 5 3:00 0 -
- Rule Morocco 2070 only - Nov 9 2:00 1:00 -
- Rule Morocco 2071 only - Sep 20 3:00 0 -
-@@ -1086,7 +1098,7 @@
- Rule Morocco 2076 only - Jul 26 3:00 0 -
- Rule Morocco 2076 only - Sep 6 2:00 1:00 -
- Rule Morocco 2077 only - Jul 18 3:00 0 -
--Rule Morocco 2077 only - Aug 22 2:00 1:00 -
-+Rule Morocco 2077 only - Aug 29 2:00 1:00 -
- Rule Morocco 2078 only - Jul 10 3:00 0 -
- Rule Morocco 2078 only - Aug 14 2:00 1:00 -
- Rule Morocco 2079 only - Jun 25 3:00 0 -
-@@ -1096,13 +1108,13 @@
- Rule Morocco 2081 only - Jun 1 3:00 0 -
- Rule Morocco 2081 only - Jul 13 2:00 1:00 -
- Rule Morocco 2082 only - May 24 3:00 0 -
--Rule Morocco 2082 only - Jun 28 2:00 1:00 -
-+Rule Morocco 2082 only - Jul 5 2:00 1:00 -
- Rule Morocco 2083 only - May 16 3:00 0 -
- Rule Morocco 2083 only - Jun 20 2:00 1:00 -
- Rule Morocco 2084 only - Apr 30 3:00 0 -
- Rule Morocco 2084 only - Jun 11 2:00 1:00 -
- Rule Morocco 2085 only - Apr 22 3:00 0 -
--Rule Morocco 2085 only - May 27 2:00 1:00 -
-+Rule Morocco 2085 only - Jun 3 2:00 1:00 -
- Rule Morocco 2086 only - Apr 14 3:00 0 -
- Rule Morocco 2086 only - May 19 2:00 1:00 -
- Rule Morocco 2087 only - Mar 30 3:00 0 -
-@@ -1203,7 +1215,7 @@
- # Use plain "WAT" and "CAT" for the time zone abbreviations, to be compatible
- # with Namibia's neighbors.
-
--# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Vanguard section, for zic and other parsers that support negative DST.
- #Rule Namibia 1994 only - Mar 21 0:00 -1:00 WAT
- #Rule Namibia 1994 2017 - Sep Sun>=1 2:00 0 CAT
-@@ -1326,7 +1338,7 @@
- # See Africa/Nairobi.
-
- # South Africa
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule SA 1942 1943 - Sep Sun>=15 2:00 1:00 -
- Rule SA 1943 1944 - Mar Sun>=15 2:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1359,7 +1371,7 @@
- # Abdalla of NTC, archived at:
- # https://mm.icann.org/pipermail/tz/2017-October/025333.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Sudan 1970 only - May 1 0:00 1:00 S
- Rule Sudan 1970 1985 - Oct 15 0:00 0 -
- Rule Sudan 1971 only - Apr 30 0:00 1:00 S
-@@ -1447,7 +1459,7 @@
- # http://www.almadenahnews.com/newss/news.php?c=118&id=38036
- # http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Tunisia 1939 only - Apr 15 23:00s 1:00 S
- Rule Tunisia 1939 only - Nov 18 23:00s 0 -
- Rule Tunisia 1940 only - Feb 25 23:00s 1:00 S
-@@ -1474,9 +1486,7 @@
- Rule Tunisia 2006 2008 - Mar lastSun 2:00s 1:00 S
- Rule Tunisia 2006 2008 - Oct lastSun 2:00s 0 -
-
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
--# Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
-+# See Europe/Paris for PMT-related transitions.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
- Zone Africa/Tunis 0:40:44 - LMT 1881 May 12
- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/antarctica openjdk/jdk/test/sun/util/calendar/zi/tzdata/antarctica
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/antarctica
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/antarctica
-@@ -93,15 +93,30 @@
- # Australian Antarctica Division informed us that Casey changed time
- # zone to UTC+11 in "the morning of 22nd October 2016".
-
-+# From Steffen Thorsen (2020-10-02, as corrected):
-+# Based on information we have received from the Australian Antarctic
-+# Division, Casey station and Macquarie Island station will move to Tasmanian
-+# daylight savings time on Sunday 4 October. This will take effect from 0001
-+# hrs on Sunday 4 October 2020 and will mean Casey and Macquarie Island will
-+# be on the same time zone as Hobart. Some past dates too for this 3 hour
-+# time change back and forth between UTC+8 and UTC+11 for Casey:
-+# - 2018 Oct 7 4:00 - 2019 Mar 17 3:00 - 2019 Oct 4 3:00 - 2020 Mar 8 3:00
-+# and now - 2020 Oct 4 0:01
-+
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Antarctica/Casey 0 - -00 1969
-- 8:00 - +08 2009 Oct 18 2:00
-+Zone Antarctica/Casey 0 - -00 1969
-+ 8:00 - +08 2009 Oct 18 2:00
- 11:00 - +11 2010 Mar 5 2:00
-- 8:00 - +08 2011 Oct 28 2:00
-+ 8:00 - +08 2011 Oct 28 2:00
- 11:00 - +11 2012 Feb 21 17:00u
-- 8:00 - +08 2016 Oct 22
-+ 8:00 - +08 2016 Oct 22
- 11:00 - +11 2018 Mar 11 4:00
-- 8:00 - +08
-+ 8:00 - +08 2018 Oct 7 4:00
-+ 11:00 - +11 2019 Mar 17 3:00
-+ 8:00 - +08 2019 Oct 4 3:00
-+ 11:00 - +11 2020 Mar 8 3:00
-+ 8:00 - +08 2020 Oct 4 0:01
-+ 11:00 - +11
- Zone Antarctica/Davis 0 - -00 1957 Jan 13
- 7:00 - +07 1964 Nov
- 0 - -00 1969 Feb
-@@ -247,7 +262,7 @@
- # suggested by Bengt-Inge Larsson comment them out for now, and approximate
- # with only UTC and CEST. Uncomment them when 2014b is more prevalent.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- #Rule Troll 2005 max - Mar 1 1:00u 1:00 +01
- Rule Troll 2005 max - Mar lastSun 1:00u 2:00 +02
- #Rule Troll 2005 max - Oct lastSun 1:00u 1:00 +01
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/asia openjdk/jdk/test/sun/util/calendar/zi/tzdata/asia
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/asia
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/asia
-@@ -93,7 +93,7 @@
- ###############################################################################
-
- # These rules are stolen from the 'europe' file.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EUAsia 1981 max - Mar lastSun 1:00u 1:00 S
- Rule EUAsia 1979 1995 - Sep lastSun 1:00u 0 -
- Rule EUAsia 1996 max - Oct lastSun 1:00u 0 -
-@@ -137,7 +137,7 @@
- # or
- # (brief)
- # http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Armenia 2011 only - Mar lastSun 2:00s 1:00 -
- Rule Armenia 2011 only - Oct lastSun 2:00s 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -163,7 +163,7 @@
- # http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-d...
- # http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Azer 1997 2015 - Mar lastSun 4:00 1:00 -
- Rule Azer 1997 2015 - Oct lastSun 5:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -250,7 +250,7 @@
- # http://www.thedailystar.net/newDesign/latest_news.php?nid=22817
- # http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Dhaka 2009 only - Jun 19 23:00 1:00 -
- Rule Dhaka 2009 only - Dec 31 24:00 0 -
-
-@@ -326,7 +326,7 @@
- # generally esteemed a success, it was announced early in 1920 that it would
- # not be repeated."
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Shang 1919 only - Apr 12 24:00 1:00 D
- Rule Shang 1919 only - Sep 30 24:00 0 S
-
-@@ -422,7 +422,7 @@
- # the Yangtze river delta area during that period of time although the scope
- # of such use will need to be investigated to determine.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Shang 1940 only - Jun 1 0:00 1:00 D
- Rule Shang 1940 only - Oct 12 24:00 0 S
- Rule Shang 1941 only - Mar 15 0:00 1:00 D
-@@ -485,7 +485,7 @@
- # to begin on 17 April.
- # http://data.people.com.cn/pic/101p/1988/04/1988041201.jpg
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule PRC 1986 only - May 4 2:00 1:00 D
- Rule PRC 1986 1991 - Sep Sun>=11 2:00 0 S
- Rule PRC 1987 1991 - Apr Sun>=11 2:00 1:00 D
-@@ -869,7 +869,7 @@
- # or dates for the 1942 and 1945 transitions.
- # The Japanese occupation of Hong Kong began 1941-12-25.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule HK 1946 only - Apr 21 0:00 1:00 S
- Rule HK 1946 only - Dec 1 3:30s 0 -
- Rule HK 1947 only - Apr 13 3:30s 1:00 S
-@@ -996,7 +996,7 @@
- # until 1945-09-21 at 01:00, overriding Shanks & Pottenger.
- # Likewise, use Yu-Cheng Chuang's data for DST in Taiwan.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Taiwan 1946 only - May 15 0:00 1:00 D
- Rule Taiwan 1946 only - Oct 1 0:00 0 S
- Rule Taiwan 1947 only - Apr 15 0:00 1:00 D
-@@ -1122,7 +1122,7 @@
- # The 1904 decree says that Macau changed from the meridian of
- # Fortaleza do Monte, presumably the basis for the 7:34:10 for LMT.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Macau 1942 1943 - Apr 30 23:00 1:00 -
- Rule Macau 1942 only - Nov 17 23:00 0 -
- Rule Macau 1943 only - Sep 30 23:00 0 S
-@@ -1180,7 +1180,7 @@
- # Cyprus to remain united in time. Cyprus Mail 2017-10-17.
- # https://cyprus-mail.com/2017/10/17/cyprus-remain-united-time/
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cyprus 1975 only - Apr 13 0:00 1:00 S
- Rule Cyprus 1975 only - Oct 12 0:00 0 -
- Rule Cyprus 1976 only - May 15 0:00 1:00 S
-@@ -1557,7 +1557,7 @@
- # be changed back to its previous state on the 24 hours of the
- # thirtieth day of Shahrivar.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iran 1978 1980 - Mar 20 24:00 1:00 -
- Rule Iran 1978 only - Oct 20 24:00 0 -
- Rule Iran 1979 only - Sep 18 24:00 0 -
-@@ -1699,7 +1699,7 @@
- # We have published a short article in English about the change:
- # https://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iraq 1982 only - May 1 0:00 1:00 -
- Rule Iraq 1982 1984 - Oct 1 0:00 0 -
- Rule Iraq 1983 only - Mar 31 0:00 1:00 -
-@@ -1722,6 +1722,10 @@
-
- # Israel
-
-+# For more info about the motivation for DST in Israel, see:
-+# Barak Y. Israel's Daylight Saving Time controversy. Israel Affairs.
-+# 2020-08-11. https://doi.org/10.1080/13537121.2020.1806564
-+
- # From Ephraim Silverberg (2001-01-11):
- #
- # I coined "IST/IDT" circa 1988. Until then there were three
-@@ -1743,7 +1747,7 @@
- # family is from India).
-
- # From Shanks & Pottenger:
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1940 only - Jun 1 0:00 1:00 D
- Rule Zion 1942 1944 - Nov 1 0:00 0 S
- Rule Zion 1943 only - Apr 1 2:00 1:00 D
-@@ -1835,7 +1839,7 @@
- # (except in 2002) is three nights before Yom Kippur [Day of Atonement]
- # (the eve of the 7th of Tishrei in the lunar Hebrew calendar).
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1989 only - Apr 30 0:00 1:00 D
- Rule Zion 1989 only - Sep 3 0:00 0 S
- Rule Zion 1990 only - Mar 25 0:00 1:00 D
-@@ -1851,7 +1855,7 @@
- # Ministry of Interior, Jerusalem, Israel. The spokeswoman can be reached by
- # calling the office directly at 972-2-6701447 or 972-2-6701448.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1994 only - Apr 1 0:00 1:00 D
- Rule Zion 1994 only - Aug 28 0:00 0 S
- Rule Zion 1995 only - Mar 31 0:00 1:00 D
-@@ -1871,7 +1875,7 @@
- #
- # where YYYY is the relevant year.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1996 only - Mar 15 0:00 1:00 D
- Rule Zion 1996 only - Sep 16 0:00 0 S
- Rule Zion 1997 only - Mar 21 0:00 1:00 D
-@@ -1894,7 +1898,7 @@
- #
- # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2000-2004.ps.gz
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2000 only - Apr 14 2:00 1:00 D
- Rule Zion 2000 only - Oct 6 1:00 0 S
- Rule Zion 2001 only - Apr 9 1:00 1:00 D
-@@ -1916,7 +1920,7 @@
- #
- # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2005 2012 - Apr Fri<=1 2:00 1:00 D
- Rule Zion 2005 only - Oct 9 2:00 0 S
- Rule Zion 2006 only - Oct 1 2:00 0 S
-@@ -1936,7 +1940,7 @@
- # As of 2013, DST starts at 02:00 on the Friday before the last Sunday
- # in March. DST ends at 02:00 on the last Sunday of October.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D
- Rule Zion 2013 max - Oct lastSun 2:00 0 S
-
-@@ -2036,7 +2040,7 @@
- # do in any POSIX or C platform. The "25:00" assumes zic from 2007 or later,
- # which should be safe now.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Japan 1948 only - May Sat>=1 24:00 1:00 D
- Rule Japan 1948 1951 - Sep Sun>=9 1:00 0 S
- Rule Japan 1949 only - Apr Sat>=1 24:00 1:00 D
-@@ -2113,7 +2117,7 @@
- # From Paul Eggert (2013-12-11):
- # As Steffen suggested, consider the past 21-month experiment to be DST.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Jordan 1973 only - Jun 6 0:00 1:00 S
- Rule Jordan 1973 1975 - Oct 1 0:00 0 -
- Rule Jordan 1974 1977 - May 1 0:00 1:00 S
-@@ -2439,7 +2443,7 @@
- # Our government cancels daylight saving time 6th of August 2005.
- # From 2005-08-12 our GMT-offset is +6, w/o any daylight saving.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Kyrgyz 1992 1996 - Apr Sun>=7 0:00s 1:00 -
- Rule Kyrgyz 1992 1996 - Sep lastSun 0:00 0 -
- Rule Kyrgyz 1997 2005 - Mar lastSun 2:30 1:00 -
-@@ -2495,7 +2499,7 @@
- # follow and continued to use GMT+9:00 for interoperability.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule ROK 1948 only - Jun 1 0:00 1:00 D
- Rule ROK 1948 only - Sep 12 24:00 0 S
- Rule ROK 1949 only - Apr 3 0:00 1:00 D
-@@ -2583,7 +2587,7 @@
-
-
- # Lebanon
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Lebanon 1920 only - Mar 28 0:00 1:00 S
- Rule Lebanon 1920 only - Oct 25 0:00 0 -
- Rule Lebanon 1921 only - Apr 3 0:00 1:00 S
-@@ -2613,7 +2617,7 @@
- 2:00 Lebanon EE%sT
-
- # Malaysia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NBorneo 1935 1941 - Sep 14 0:00 0:20 -
- Rule NBorneo 1935 1941 - Dec 14 0:00 0 -
- #
-@@ -2758,7 +2762,7 @@
- # September daylight saving time ends. Source:
- # http://zasag.mn/news/view/8969
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mongol 1983 1984 - Apr 1 0:00 1:00 -
- Rule Mongol 1983 only - Oct 1 0:00 0 -
- # Shanks & Pottenger and IATA SSIM say 1990s switches occurred at 00:00,
-@@ -2946,7 +2950,7 @@
- # "People laud PM's announcement to end DST"
- # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Pakistan 2002 only - Apr Sun>=2 0:00 1:00 S
- Rule Pakistan 2002 only - Oct Sun>=2 0:00 0 -
- Rule Pakistan 2008 only - Jun 1 0:00 1:00 S
-@@ -3248,7 +3252,7 @@
- # From Tim Parenti (2016-10-19):
- # Predict fall transitions on October's last Saturday at 01:00 from now on.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
- Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
- Rule EgyptAsia 1958 only - May 1 0:00 1:00 S
-@@ -3348,7 +3352,7 @@
- # influence of the sources. There is no current abbreviation for DST,
- # so use "PDT", the usual American style.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Phil 1936 only - Nov 1 0:00 1:00 D
- Rule Phil 1937 only - Feb 1 0:00 0 S
- Rule Phil 1954 only - Apr 12 0:00 1:00 D
-@@ -3496,7 +3500,7 @@
- 5:30 - +0530
-
- # Syria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Syria 1920 1923 - Apr Sun>=15 2:00 1:00 S
- Rule Syria 1920 1923 - Oct Sun>=1 2:00 0 -
- Rule Syria 1962 only - Apr 29 2:00 1:00 S
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/australasia openjdk/jdk/test/sun/util/calendar/zi/tzdata/australasia
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/australasia
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/australasia
-@@ -36,7 +36,7 @@
-
- # Please see the notes below for the controversy about "EST" versus "AEST" etc.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Aus 1917 only - Jan 1 0:01 1:00 D
- Rule Aus 1917 only - Mar 25 2:00 0 S
- Rule Aus 1942 only - Jan 1 2:00 1:00 D
-@@ -55,7 +55,7 @@
- 9:30 Aus AC%sT
- # Western Australia
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AW 1974 only - Oct lastSun 2:00s 1:00 D
- Rule AW 1975 only - Mar Sun>=1 2:00s 0 S
- Rule AW 1983 only - Oct lastSun 2:00s 1:00 D
-@@ -93,7 +93,7 @@
- # applies to all of the Whitsundays.
- # http://www.australia.gov.au/about-australia/australian-story/austn-islands
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AQ 1971 only - Oct lastSun 2:00s 1:00 D
- Rule AQ 1972 only - Feb lastSun 2:00s 0 S
- Rule AQ 1989 1991 - Oct lastSun 2:00s 1:00 D
-@@ -109,7 +109,7 @@
- 10:00 Holiday AE%sT
-
- # South Australia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AS 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AS 1986 only - Oct 19 2:00s 1:00 D
- Rule AS 1987 2007 - Oct lastSun 2:00s 1:00 D
-@@ -137,7 +137,7 @@
- # http://www.bom.gov.au/climate/averages/tables/dst_times.shtml
- # says King Island didn't observe DST from WWII until late 1971.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AT 1967 only - Oct Sun>=1 2:00s 1:00 D
- Rule AT 1968 only - Mar lastSun 2:00s 0 S
- Rule AT 1968 1985 - Oct lastSun 2:00s 1:00 D
-@@ -170,7 +170,7 @@
- 10:00 AT AE%sT
-
- # Victoria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AV 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AV 1972 only - Feb lastSun 2:00s 0 S
- Rule AV 1973 1985 - Mar Sun>=1 2:00s 0 S
-@@ -191,7 +191,7 @@
- 10:00 AV AE%sT
-
- # New South Wales
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AN 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AN 1972 only - Feb 27 2:00s 0 S
- Rule AN 1973 1981 - Mar Sun>=1 2:00s 0 S
-@@ -220,7 +220,7 @@
- 9:30 AS AC%sT
-
- # Lord Howe Island
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule LH 1981 1984 - Oct lastSun 2:00 1:00 -
- Rule LH 1982 1985 - Mar Sun>=1 2:00 0 -
- Rule LH 1985 only - Oct lastSun 2:00 0:30 -
-@@ -275,8 +275,9 @@
- 10:00 Aus AE%sT 1919 Apr 1 0:00s
- 0 - -00 1948 Mar 25
- 10:00 Aus AE%sT 1967
-- 10:00 AT AE%sT 2010 Apr 4 3:00
-- 11:00 - +11
-+ 10:00 AT AE%sT 2010
-+ 10:00 1:00 AEDT 2011
-+ 10:00 AT AE%sT
-
- # Christmas
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -403,7 +404,7 @@
- # From Michael Deckers (2019-08-06):
- # https://www.laws.gov.fj/LawsAsMade/downloadfile/848
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 -
- Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
- Rule Fiji 2009 only - Nov 29 2:00 1:00 -
-@@ -432,7 +433,7 @@
-
- # Guam
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # http://guamlegislature.com/Public_Laws_5th/PL05-025.pdf
- # http://documents.guam.gov/wp-content/uploads/E.O.-59-7-Guam-Daylight-Savi...
- Rule Guam 1959 only - Jun 27 2:00 1:00 D
-@@ -543,7 +544,7 @@
- 12:00 - +12
-
- # New Caledonia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NC 1977 1978 - Dec Sun>=1 0:00 1:00 -
- Rule NC 1978 1979 - Feb 27 0:00 0 -
- Rule NC 1996 only - Dec 1 2:00s 1:00 -
-@@ -558,7 +559,7 @@
-
- # New Zealand
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NZ 1927 only - Nov 6 2:00 1:00 S
- Rule NZ 1928 only - Mar 4 2:00 0 M
- Rule NZ 1928 1933 - Oct Sun>=8 2:00 0:30 S
-@@ -610,7 +611,7 @@
-
- # Cook Is
- # From Shanks & Pottenger:
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cook 1978 only - Nov 12 0:00 0:30 -
- Rule Cook 1979 1991 - Mar Sun>=1 0:00 0 -
- Rule Cook 1979 1990 - Oct lastSun 0:00 0:30 -
-@@ -755,7 +756,7 @@
- # That web page currently lists transitions for 2012/3 and 2013/4.
- # Assume the pattern instituted in 2012 will continue indefinitely.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule WS 2010 only - Sep lastSun 0:00 1 -
- Rule WS 2011 only - Apr Sat>=1 4:00 0 -
- Rule WS 2011 only - Sep lastSat 3:00 1 -
-@@ -799,7 +800,7 @@
- 13:00 - +13
-
- # Tonga
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Tonga 1999 only - Oct 7 2:00s 1:00 -
- Rule Tonga 2000 only - Mar 19 2:00s 0 -
- Rule Tonga 2000 2001 - Nov Sun>=1 2:00 1:00 -
-@@ -880,7 +881,7 @@
-
-
- # Vanuatu
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Vanuatu 1983 only - Sep 25 0:00 1:00 -
- Rule Vanuatu 1984 1991 - Mar Sun>=23 0:00 0 -
- Rule Vanuatu 1984 only - Oct 23 0:00 1:00 -
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/europe openjdk/jdk/test/sun/util/calendar/zi/tzdata/europe
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/europe
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/europe
-@@ -411,7 +411,7 @@
- # http://www.irishstatutebook.ie/eli/1926/sro/919/made/en/print
- # http://www.irishstatutebook.ie/eli/1947/sro/71/made/en/print
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Summer Time Act, 1916
- Rule GB-Eire 1916 only - May 21 2:00s 1:00 BST
- Rule GB-Eire 1916 only - Oct 1 2:00s 0 GMT
-@@ -552,7 +552,7 @@
- # The following is like GB-Eire and EU, except with standard time in
- # summer and negative daylight saving time in winter. It is for when
- # negative SAVE values are used.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- #Rule Eire 1971 only - Oct 31 2:00u -1:00 -
- #Rule Eire 1972 1980 - Mar Sun>=16 2:00u 0 -
- #Rule Eire 1972 1980 - Oct Sun>=23 2:00u -1:00 -
-@@ -589,7 +589,7 @@
- # predecessor organization, the European Communities.
- # For brevity they are called "EU rules" elsewhere in this file.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EU 1977 1980 - Apr Sun>=1 1:00u 1:00 S
- Rule EU 1977 only - Sep lastSun 1:00u 0 -
- Rule EU 1978 only - Oct 1 1:00u 0 -
-@@ -629,13 +629,13 @@
- # corrected in version 2008d). The circumstantial evidence is simply the
- # tz database itself, as seen below:
- #
--# Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
-+# Zone Europe/Paris ...
- # 0:00 France WE%sT 1945 Sep 16 3:00
- #
--# Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
-+# Zone Europe/Monaco ...
- # 0:00 France WE%sT 1945 Sep 16 3:00
- #
--# Zone Europe/Belgrade 1:22:00 - LMT 1884
-+# Zone Europe/Belgrade ...
- # 1:00 1:00 CEST 1945 Sep 16 2:00s
- #
- # Rule France 1945 only - Sep 16 3:00 0 -
-@@ -681,7 +681,7 @@
- #
- # The 1917-1921 decree URLs are from Alexander Belopolsky (2016-08-23).
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Russia 1917 only - Jul 1 23:00 1:00 MST # Moscow Summer Time
- #
- # Decree No. 142 (1917-12-22) http://istmat.info/node/28137
-@@ -795,7 +795,7 @@
-
-
- # Albania
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Albania 1940 only - Jun 16 0:00 1:00 S
- Rule Albania 1942 only - Nov 2 3:00 0 -
- Rule Albania 1943 only - Mar 29 2:00 1:00 S
-@@ -849,7 +849,7 @@
- # In 1946 the end of DST was on Monday, 7 October 1946, at 3:00 am.
- # Shanks had this right. Source: Die Weltpresse, 5. Oktober 1946, page 5.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Austria 1920 only - Apr 5 2:00s 1:00 S
- Rule Austria 1920 only - Sep 13 2:00s 0 -
- Rule Austria 1946 only - Apr 14 2:00s 1:00 S
-@@ -936,7 +936,7 @@
- # The 1918 rules are listed for completeness; they apply to unoccupied Belgium.
- # Assume Brussels switched to WET in 1918 when the armistice took effect.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Belgium 1918 only - Mar 9 0:00s 1:00 S
- Rule Belgium 1918 1919 - Oct Sat>=1 23:00s 0 -
- Rule Belgium 1919 only - Mar 1 23:00s 1:00 S
-@@ -996,7 +996,7 @@
- # EET -> EETDST is in 03:00 Local time in last Sunday of March ...
- # EETDST -> EET is in 04:00 Local time in last Sunday of October
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Bulg 1979 only - Mar 31 23:00 1:00 S
- Rule Bulg 1979 only - Oct 1 1:00 0 -
- Rule Bulg 1980 1982 - Apr Sat>=1 23:00 1:00 S
-@@ -1028,7 +1028,7 @@
- # We know of no English-language name for historical Czech winter time;
- # abbreviate it as "GMT", as it happened to be GMT.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Czech 1945 only - Apr Mon>=1 2:00s 1:00 S
- Rule Czech 1945 only - Oct 1 2:00s 0 -
- Rule Czech 1946 only - May 6 2:00s 1:00 S
-@@ -1084,7 +1084,7 @@
- # Hence the "02:00" of the 1980 law refers to standard time, not
- # wall-clock time, and so the EU rules were in effect in 1980.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Denmark 1916 only - May 14 23:00 1:00 S
- Rule Denmark 1916 only - Sep 30 23:00 0 -
- Rule Denmark 1940 only - May 15 0:00 1:00 S
-@@ -1186,7 +1186,7 @@
- # http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-t...
- # It is their only National Park.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D
- Rule Thule 1991 1992 - Sep lastSun 2:00 0 S
- Rule Thule 1993 2006 - Apr Sun>=1 2:00 1:00 D
-@@ -1317,7 +1317,7 @@
- # From Paul Eggert (2014-06-14):
- # Go with Oja over Shanks.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Finland 1942 only - Apr 2 24:00 1:00 S
- Rule Finland 1942 only - Oct 4 1:00 0 -
- Rule Finland 1981 1982 - Mar lastSun 2:00 1:00 S
-@@ -1349,10 +1349,58 @@
- # Françoise Gauquelin, Problèmes de l'heure résolus en astrologie,
- # Guy Trédaniel, Paris 1987
-
-+# From Michael Deckers (2020-06-11):
-+# the law of 1891 <https://gallica.bnf.fr/ark:/12148/bpt6k64415343.texteImage>
-+# was published on 1891-03-15, so it could only take force on 1891-03-16.
-+
-+# From Michael Deckers (2020-06-10):
-+# Le Gaulois, 1911-03-11, page 1/6, online at
-+# https://www.retronews.fr/societe/echo-de-presse/2018/01/29/1911-change-lh...
-+# ... [ Instantly, all pressure driven clock dials halted... Nine minutes and
-+# twenty-one seconds later the hands resumed their circular motion. ]
-+# There are also precise reports about how the change was prepared in train
-+# stations: all the publicly visible clocks stopped at midnight railway time
-+# (or were covered), only the chief of service had a watch, labeled
-+# "Heure ancienne", that he kept running until it reached 00:04:21, when
-+# he announced "Heure nouvelle". See the "Le Petit Journal 1911-03-11".
-+# https://gallica.bnf.fr/ark:/12148/bpt6k6192911/f1.item.zoom
-+#
-+# From Michael Deckers (2020-06-12):
-+# That "all French clocks stopped" for 00:09:21 is a misreading of French
-+# newspapers; this sort of adjustment applies only to certain
-+# remote-controlled clocks ("pendules pneumatiques", of which there existed
-+# perhaps a dozen in Paris, and which simply could not be set back remotely),
-+# but not to all the clocks in all French towns and villages. For instance,
-+# the following story in the "Courrier de Saône-et-Loire" 1911-03-11, page 2:
-+# only works if legal time was stepped back (was not monotone): ...
-+# [One can observe that children who had been born at midnight less 5
-+# minutes and who had died at midnight of the old time, would turn out to
-+# be dead before being born, time having been set back and having
-+# suppressed 9 minutes and 25 seconds of their existence, that is, more
-+# than they could spend.]
-+#
-+# From Paul Eggert (2020-06-12):
-+# French time in railway stations was legally five minutes behind civil time,
-+# which explains why railway "old time" ran to 00:04:21 instead of to 00:09:21.
-+# The law's text (which Michael Deckers noted is at
-+# <https://gallica.bnf.fr/ark:/12148/bpt6k2022333z/f2>) says only that
-+# at 1911-03-11 00:00 legal time was that of Paris mean time delayed by
-+# nine minutes and twenty-one seconds, and does not say how the
-+# transition from Paris mean time was to occur.
-+#
-+# tzdb has no way to represent stopped clocks. As the railway practice
-+# was to keep a watch running on "old time" to decide when to restart
-+# the other clocks, this could be modeled as a transition for "old time" at
-+# 00:09:21. However, since the law was ambiguous and clocks outside railway
-+# stations were probably done haphazardly with the popular impression being
-+# that the transition was done at 00:00 "old time", simply leave the time
-+# blank; this causes zic to default to 00:00 "old time" which is good enough.
-+# Do something similar for the 1891-03-16 transition. There are similar
-+# problems in Algiers, Monaco and Tunis.
-
- #
- # Shank & Pottenger seem to use '24:00' ambiguously; resolve it with Whitman.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule France 1916 only - Jun 14 23:00s 1:00 S
- Rule France 1916 1919 - Oct Sun>=1 23:00s 0 -
- Rule France 1917 only - Mar 24 23:00s 1:00 S
-@@ -1412,13 +1460,11 @@
- # go with Excoffier's 28/3/76 0hUT and 25/9/76 23hUT.
- Rule France 1976 only - Mar 28 1:00 1:00 S
- Rule France 1976 only - Sep 26 1:00 0 -
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time, and Whitman 0:09:05,
--# but Howse quotes the actual French legislation as saying 0:09:21.
--# Go with Howse. Howse writes that the time in France was officially based
-+# Howse writes that the time in France was officially based
- # on PMT-0:09:21 until 1978-08-09, when the time base finally switched to UTC.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
-- 0:09:21 - PMT 1911 Mar 11 0:01 # Paris MT
-+Zone Europe/Paris 0:09:21 - LMT 1891 Mar 16
-+ 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
- # Shanks & Pottenger give 1940 Jun 14 0:00; go with Excoffier and Le Corre.
- 0:00 France WE%sT 1940 Jun 14 23:00
- # Le Corre says Paris stuck with occupied-France time after the liberation;
-@@ -1447,7 +1493,7 @@
- # this was equivalent to UT +03, not +04.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Germany 1946 only - Apr 14 2:00s 1:00 S
- Rule Germany 1946 only - Oct 7 2:00s 0 -
- Rule Germany 1947 1949 - Oct Sun>=1 2:00s 0 -
-@@ -1499,7 +1545,7 @@
- 1:00 EU CE%sT
-
- # Greece
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Whitman gives 1932 Jul 5 - Nov 1; go with Shanks & Pottenger.
- Rule Greece 1932 only - Jul 7 0:00 1:00 S
- Rule Greece 1932 only - Sep 1 0:00 0 -
-@@ -1534,38 +1580,69 @@
- 2:00 EU EE%sT
-
- # Hungary
--# From Paul Eggert (2014-07-15):
--# Dates for 1916-1945 are taken from:
--# Oross A. Jelen a múlt jövője: a nyári időszámítás Magyarországon 1916-1945.
--# National Archives of Hungary (2012-10-29).
--# http://mnl.gov.hu/a_het_dokumentuma/a_nyari_idoszamitas_magyarorszagon_19...
--# This source does not always give times, which are taken from Shanks
--# & Pottenger (which disagree about the dates).
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule Hungary 1918 only - Apr 1 3:00 1:00 S
--Rule Hungary 1918 only - Sep 16 3:00 0 -
--Rule Hungary 1919 only - Apr 15 3:00 1:00 S
--Rule Hungary 1919 only - Nov 24 3:00 0 -
-+
-+# From Michael Deckers (2020-06-09):
-+# an Austrian encyclopedia of railroads of 1913, online at
-+# http://www.zeno.org/Roell-1912/A/Eisenbahnzeit
-+# says that the switch [to CET] happened on 1890-11-01.
-+
-+# From Géza Nyáry (2020-06-07):
-+# Data for 1918-1983 are based on the archive database of Library Hungaricana.
-+# The dates are collected from original, scanned governmental orders,
-+# bulletins, instructions and public press.
-+# [See URLs below.]
-+
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1918/?pg=238
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1919/?pg=808
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1920/?pg=201
-+Rule Hungary 1918 1919 - Apr 15 2:00 1:00 S
-+Rule Hungary 1918 1920 - Sep Mon>=15 3:00 0 -
-+Rule Hungary 1920 only - Apr 5 2:00 1:00 S
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1945/?pg=882
- Rule Hungary 1945 only - May 1 23:00 1:00 S
--Rule Hungary 1945 only - Nov 1 0:00 0 -
-+Rule Hungary 1945 only - Nov 1 1:00 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1946_03/?pg=49
- Rule Hungary 1946 only - Mar 31 2:00s 1:00 S
--Rule Hungary 1946 1949 - Oct Sun>=1 2:00s 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1946_09/?pg=54
-+Rule Hungary 1946 only - Oct 7 2:00 0 -
-+# https://library.hungaricana.hu/hu/view/KulfBelfHirek_1947_04_1__001-123/?...
-+# https://library.hungaricana.hu/hu/view/DunantuliNaplo_1947_09/?pg=128
-+# https://library.hungaricana.hu/hu/view/KulfBelfHirek_1948_03_3__001-123/?...
-+# https://library.hungaricana.hu/hu/view/Zala_1948_09/?pg=64
-+# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniN...
-+# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniN...
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1949_09/?pg=94
- Rule Hungary 1947 1949 - Apr Sun>=4 2:00s 1:00 S
--Rule Hungary 1950 only - Apr 17 2:00s 1:00 S
--Rule Hungary 1950 only - Oct 23 2:00s 0 -
--Rule Hungary 1954 1955 - May 23 0:00 1:00 S
--Rule Hungary 1954 1955 - Oct 3 0:00 0 -
--Rule Hungary 1956 only - Jun Sun>=1 0:00 1:00 S
--Rule Hungary 1956 only - Sep lastSun 0:00 0 -
--Rule Hungary 1957 only - Jun Sun>=1 1:00 1:00 S
--Rule Hungary 1957 only - Sep lastSun 3:00 0 -
--Rule Hungary 1980 only - Apr 6 1:00 1:00 S
-+Rule Hungary 1947 1949 - Oct Sun>=1 2:00s 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1954/?pg...
-+Rule Hungary 1954 only - May 23 0:00 1:00 S
-+Rule Hungary 1954 only - Oct 3 0:00 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1955/?pg...
-+Rule Hungary 1955 only - May 22 2:00 1:00 S
-+Rule Hungary 1955 only - Oct 2 3:00 0 -
-+# https://library.hungaricana.hu/hu/view/HevesMegyeiNepujsag_1956_06/?pg=0
-+# https://library.hungaricana.hu/hu/view/EszakMagyarorszag_1956_06/?pg=6
-+# https://library.hungaricana.hu/hu/view/SzolnokMegyeiNeplap_1957_04/?pg=120
-+# https://library.hungaricana.hu/hu/view/PestMegyeiHirlap_1957_09/?pg=143
-+Rule Hungary 1956 1957 - Jun Sun>=1 2:00 1:00 S
-+Rule Hungary 1956 1957 - Sep lastSun 3:00 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1980/?pg...
-+Rule Hungary 1980 only - Apr 6 0:00 1:00 S
-+Rule Hungary 1980 only - Sep 28 1:00 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1981_01/?pg=79
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1982/?pg...
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1983/?pg=85
-+Rule Hungary 1981 1983 - Mar lastSun 0:00 1:00 S
-+Rule Hungary 1981 1983 - Sep lastSun 1:00 0 -
-+#
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Budapest 1:16:20 - LMT 1890 Oct
-+Zone Europe/Budapest 1:16:20 - LMT 1890 Nov 1
- 1:00 C-Eur CE%sT 1918
-- 1:00 Hungary CE%sT 1941 Apr 8
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1941/?pg=1204
-+ 1:00 Hungary CE%sT 1941 Apr 7 23:00
- 1:00 C-Eur CE%sT 1945
-- 1:00 Hungary CE%sT 1980 Sep 28 2:00s
-+ 1:00 Hungary CE%sT 1984
- 1:00 EU CE%sT
-
- # Iceland
-@@ -1601,7 +1678,7 @@
- # The information below is taken from the 1988 Almanak; see
- # http://www.almanak.hi.is/klukkan.html
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iceland 1917 1919 - Feb 19 23:00 1:00 -
- Rule Iceland 1917 only - Oct 21 1:00 0 -
- Rule Iceland 1918 1919 - Nov 16 1:00 0 -
-@@ -1693,7 +1770,7 @@
- # to 1944-06-04; although Rome was an open city during this period, it
- # was effectively controlled by Germany.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Italy 1916 only - Jun 3 24:00 1:00 S
- Rule Italy 1916 1917 - Sep 30 24:00 0 -
- Rule Italy 1917 only - Mar 31 24:00 1:00 S
-@@ -1803,7 +1880,7 @@
- # urged Lithuania and Estonia to adopt a similar time policy, but it
- # appears that they will not do so....
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Latvia 1989 1996 - Mar lastSun 2:00s 1:00 S
- Rule Latvia 1989 1996 - Sep lastSun 2:00s 0 -
-
-@@ -1896,7 +1973,7 @@
- # Luxembourg
- # Whitman disagrees with most of these dates in minor ways;
- # go with Shanks & Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Lux 1916 only - May 14 23:00 1:00 S
- Rule Lux 1916 only - Oct 1 1:00 0 -
- Rule Lux 1917 only - Apr 28 23:00 1:00 S
-@@ -1937,7 +2014,7 @@
- # From Paul Eggert (2016-10-21):
- # Assume 1900-1972 was like Rome, overriding Shanks.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Malta 1973 only - Mar 31 0:00s 1:00 S
- Rule Malta 1973 only - Sep 29 0:00s 0 -
- Rule Malta 1974 only - Apr 21 0:00s 1:00 S
-@@ -2010,7 +2087,7 @@
- # says the 2014-03-30 spring-forward transition was at 02:00 local time.
- # Guess that since 1997 Moldova has switched one hour before the EU.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Moldova 1997 max - Mar lastSun 2:00 1:00 S
- Rule Moldova 1997 max - Oct lastSun 3:00 0 -
-
-@@ -2028,11 +2105,24 @@
- 2:00 Moldova EE%sT
-
- # Monaco
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
-+#
-+# From Michael Deckers (2020-06-12):
-+# In the "Journal de Monaco" of 1892-05-24, online at
-+# https://journaldemonaco.gouv.mc/var/jdm/storage/original/application/b1c6...
-+# we read: ...
-+# [In virtue of a Sovereign Ordinance of the May 13 of the current [year],
-+# legal time in the Principality will be set to, from the date of June 1,
-+# 1892 onwards, to the meridian of Paris, as in France.]
-+# In the "Journal de Monaco" of 1911-03-28, online at
-+# https://journaldemonaco.gouv.mc/var/jdm/storage/original/application/de74...
-+# we read an ordinance of 1911-03-16: ...
-+# [Legal time in the Principality will be set, from the date of promulgation
-+# of the present ordinance, to legal time in France.... Consequently, legal
-+# time will be retarded by 9 minutes and 21 seconds.]
-+#
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
-- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
-+Zone Europe/Monaco 0:29:32 - LMT 1892 Jun 1
-+ 0:09:21 - PMT 1911 Mar 29 # Paris Mean Time
- 0:00 France WE%sT 1945 Sep 16 3:00
- 1:00 France CE%sT 1977
- 1:00 EU CE%sT
-@@ -2080,7 +2170,7 @@
- # The data entries before 1945 are taken from
- # https://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Neth 1916 only - May 1 0:00 1:00 NST # Netherlands Summer Time
- Rule Neth 1916 only - Oct 1 0:00 0 AMT # Amsterdam Mean Time
- Rule Neth 1917 only - Apr 16 2:00s 1:00 NST
-@@ -2117,7 +2207,7 @@
- # Norway
- # http://met.no/met/met_lex/q_u/sommertid.html (2004-01) agrees with Shanks &
- # Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Norway 1916 only - May 22 1:00 1:00 S
- Rule Norway 1916 only - Sep 30 0:00 0 -
- Rule Norway 1945 only - Apr 2 2:00s 1:00 S
-@@ -2186,7 +2276,7 @@
- # The 1919 dates and times can be found in Tygodnik Urzędowy nr 1 (1919-03-20),
- # <http://www.wbc.poznan.pl/publication/32156> pp 1-2.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Poland 1918 1919 - Sep 16 2:00s 0 -
- Rule Poland 1919 only - Apr 15 2:00s 1:00 S
- Rule Poland 1944 only - Apr 3 2:00s 1:00 S
-@@ -2257,7 +2347,7 @@
- # Guess that the Azores changed to EU rules in 1992 (since that's when Portugal
- # harmonized with EU rules), and that they stayed +0:00 that winter.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # DSH writes that despite Decree 1,469 (1915), the change to the clocks was not
- # done every year, depending on what Spain did, because of railroad schedules.
- # Go with Shanks & Pottenger.
-@@ -2370,7 +2460,7 @@
- # assume that Romania and Moldova switched to EU rules in 1997,
- # the same year as Bulgaria.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Romania 1932 only - May 21 0:00s 1:00 S
- Rule Romania 1932 1939 - Oct Sun>=1 0:00s 0 -
- Rule Romania 1933 1939 - Apr Sun>=2 0:00s 1:00 S
-@@ -3468,14 +3558,14 @@
- # fallback transition from the next day's 00:59... to 00:00.
-
- # From Michael Deckers (2016-12-15):
--# The Royal Decree of 1900-06-26 quoted by Planesas, online at
-+# The Royal Decree of 1900-07-26 quoted by Planesas, online at
- # https://www.boe.es/datos/pdfs/BOE//1900/209/A00383-00384.pdf
- # says in its article 5 (my translation):
- # These dispositions will enter into force beginning with the
- # instant at which, according to the time indicated in article 1,
- # the 1st day of January of 1901 will begin.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Spain 1918 only - Apr 15 23:00 1:00 S
- Rule Spain 1918 1919 - Oct 6 24:00s 0 -
- Rule Spain 1919 only - Apr 6 23:00 1:00 S
-@@ -3612,7 +3702,7 @@
- # By the end of the 18th century clocks and watches became commonplace
- # and their performance improved enormously. Communities began to keep
- # mean time in preference to apparent time - Geneva from 1780 ....
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # From Whitman (who writes "Midnight?"):
- # Rule Swiss 1940 only - Nov 2 0:00 1:00 S
- # Rule Swiss 1940 only - Dec 31 0:00 0 -
-@@ -3699,7 +3789,7 @@
- # 1853-07-16, though it probably occurred at some other date in Zurich, and
- # legal civil time probably changed at still some other transition date.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Swiss 1941 1942 - May Mon>=1 1:00 1:00 S
- Rule Swiss 1941 1942 - Oct Mon>=1 2:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -3848,7 +3938,7 @@
- # Although Google Translate misfires on that source, it looks like
- # Turkey reversed last month's decision, and so will stay at +03.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Turkey 1916 only - May 1 0:00 1:00 S
- Rule Turkey 1916 only - Oct 1 0:00 0 -
- Rule Turkey 1920 only - Mar 28 0:00 1:00 S
-@@ -4006,7 +4096,7 @@
- 2:00 1:00 EEST 1991 Sep 29 3:00
- 2:00 E-Eur EE%sT 1995
- 2:00 EU EE%sT
--# Ruthenia used CET 1990/1991.
-+# Transcarpathia used CET 1990/1991.
- # "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but
- # "Uzhgorod" is more common in English.
- Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/leapseconds openjdk/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
-@@ -91,11 +91,11 @@
- # Any additional leap seconds will come after this.
- # This Expires line is commented out for now,
- # so that pre-2020a zic implementations do not reject this file.
--#Expires 2020 Dec 28 00:00:00
-+#Expires 2021 Jun 28 00:00:00
-
- # POSIX timestamps for the data in this file:
- #updated 1467936000 (2016-07-08 00:00:00 UTC)
--#expires 1609113600 (2020-12-28 00:00:00 UTC)
-+#expires 1624838400 (2021-06-28 00:00:00 UTC)
-
--# Updated through IERS Bulletin C59
--# File expires on: 28 December 2020
-+# Updated through IERS Bulletin C60
-+# File expires on: 28 June 2021
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/northamerica openjdk/jdk/test/sun/util/calendar/zi/tzdata/northamerica
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/northamerica
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/northamerica
-@@ -193,7 +193,7 @@
- # U.S. government action. So even though the "US" rules have changed
- # in the latest release, other countries won't be affected.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule US 1918 1919 - Mar lastSun 2:00 1:00 D
- Rule US 1918 1919 - Oct lastSun 2:00 0 S
- Rule US 1942 only - Feb 9 2:00 1:00 W # War
-@@ -370,7 +370,7 @@
- # Eastern time (i.e., -4:56:01.6) just before the 1883 switch. Round to the
- # nearest second.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule NYC 1920 only - Mar lastSun 2:00 1:00 D
- Rule NYC 1920 only - Oct lastSun 2:00 0 S
- Rule NYC 1921 1966 - Apr lastSun 2:00 1:00 D
-@@ -454,7 +454,7 @@
- # The Tennessean 2007-05-11, republished 2015-04-06.
- # https://www.tennessean.com/story/insider/extras/2015/04/06/archives-seige...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Chicago 1920 only - Jun 13 2:00 1:00 D
- Rule Chicago 1920 1921 - Oct lastSun 2:00 0 S
- Rule Chicago 1921 only - Mar lastSun 2:00 1:00 D
-@@ -523,7 +523,7 @@
- # El Paso Times. 2018-10-24 06:40 -06.
- # https://www.elpasotimes.com/story/news/local/el-paso/2018/10/24/el-pasoan...
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Denver 1920 1921 - Mar lastSun 2:00 1:00 D
- Rule Denver 1920 only - Oct lastSun 2:00 0 S
- Rule Denver 1921 only - May 22 2:00 0 S
-@@ -576,7 +576,7 @@
- # https://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&contex...
- # https://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&contex...
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule CA 1948 only - Mar 14 2:01 1:00 D
- Rule CA 1949 only - Jan 1 2:00 0 S
- Rule CA 1950 1966 - Apr lastSun 1:00 1:00 D
-@@ -934,7 +934,7 @@
- # going to switch from Central to Eastern Time on March 11, 2007....
- # http://www.indystar.com/apps/pbcs.dll/article?AID=/20070207/LOCAL190108/7...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Indianapolis 1941 only - Jun 22 2:00 1:00 D
- Rule Indianapolis 1941 1954 - Sep lastSun 2:00 0 S
- Rule Indianapolis 1946 1954 - Apr lastSun 2:00 1:00 D
-@@ -953,7 +953,7 @@
- #
- # Eastern Crawford County, Indiana, left its clocks alone in 1974,
- # as well as from 1976 through 2005.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Marengo 1951 only - Apr lastSun 2:00 1:00 D
- Rule Marengo 1951 only - Sep lastSun 2:00 0 S
- Rule Marengo 1954 1960 - Apr lastSun 2:00 1:00 D
-@@ -972,7 +972,7 @@
- # Daviess, Dubois, Knox, and Martin Counties, Indiana,
- # switched from eastern to central time in April 2006, then switched back
- # in November 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Vincennes 1946 only - Apr lastSun 2:00 1:00 D
- Rule Vincennes 1946 only - Sep lastSun 2:00 0 S
- Rule Vincennes 1953 1954 - Apr lastSun 2:00 1:00 D
-@@ -997,7 +997,7 @@
- # The Indianapolis News, Friday 27 October 1967 states that Perry County
- # returned to CST. It went again to EST on 27 April 1969, as documented by the
- # Indianapolis star of Saturday 26 April.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Perry 1955 only - May 1 0:00 1:00 D
- Rule Perry 1955 1960 - Sep lastSun 2:00 0 S
- Rule Perry 1956 1963 - Apr lastSun 2:00 1:00 D
-@@ -1014,7 +1014,7 @@
- #
- # Pike County, Indiana moved from central to eastern time in 1977,
- # then switched back in 2006, then switched back again in 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Pike 1955 only - May 1 0:00 1:00 D
- Rule Pike 1955 1960 - Sep lastSun 2:00 0 S
- Rule Pike 1956 1964 - Apr lastSun 2:00 1:00 D
-@@ -1035,7 +1035,7 @@
- # An article on page A3 of the Sunday, 1991-10-27 Washington Post
- # notes that Starke County switched from Central time to Eastern time as of
- # 1991-10-27.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Starke 1947 1961 - Apr lastSun 2:00 1:00 D
- Rule Starke 1947 1954 - Sep lastSun 2:00 0 S
- Rule Starke 1955 1956 - Oct lastSun 2:00 0 S
-@@ -1052,7 +1052,7 @@
- #
- # Pulaski County, Indiana, switched from eastern to central time in
- # April 2006 and then switched back in March 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Pulaski 1946 1960 - Apr lastSun 2:00 1:00 D
- Rule Pulaski 1946 1954 - Sep lastSun 2:00 0 S
- Rule Pulaski 1955 1956 - Oct lastSun 2:00 0 S
-@@ -1094,7 +1094,7 @@
- #
- # Part of Kentucky left its clocks alone in 1974.
- # This also includes Clark, Floyd, and Harrison counties in Indiana.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Louisville 1921 only - May 1 2:00 1:00 D
- Rule Louisville 1921 only - Sep 1 2:00 0 S
- Rule Louisville 1941 only - Apr lastSun 2:00 1:00 D
-@@ -1208,7 +1208,7 @@
- # election Michigan voters narrowly repealed DST, effective 1969.
- #
- # Most of Michigan observed DST from 1973 on, but was a bit late in 1975.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Detroit 1948 only - Apr lastSun 2:00 1:00 D
- Rule Detroit 1948 only - Sep lastSun 2:00 0 S
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1225,7 +1225,7 @@
- #
- # Dickinson, Gogebic, Iron, and Menominee Counties, Michigan,
- # switched from EST to CST/CDT in 1973.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Menominee 1946 only - Apr lastSun 2:00 1:00 D
- Rule Menominee 1946 only - Sep lastSun 2:00 0 S
- Rule Menominee 1966 only - Apr lastSun 2:00 1:00 D
-@@ -1395,7 +1395,7 @@
- # Oct 31, to Oct 27, 1918 (and Sunday is a more likely transition day
- # than Thursday) in all Canadian rulesets.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Canada 1918 only - Apr 14 2:00 1:00 D
- Rule Canada 1918 only - Oct 27 2:00 0 S
- Rule Canada 1942 only - Feb 9 2:00 1:00 W # War
-@@ -1418,7 +1418,7 @@
- # that follows the rules is the southeast corner, including Port Hope
- # Simpson and Mary's Harbour, but excluding, say, Black Tickle.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule StJohns 1917 only - Apr 8 2:00 1:00 D
- Rule StJohns 1917 only - Sep 17 2:00 0 S
- # Whitman gives 1919 Apr 5 and 1920 Apr 5; go with Shanks & Pottenger.
-@@ -1520,7 +1520,7 @@
- # bill say that it is "accommodating the customs and practices" of those
- # regions, which suggests that they have always been in-line with Halifax.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Halifax 1916 only - Apr 1 0:00 1:00 D
- Rule Halifax 1916 only - Oct 1 0:00 0 S
- Rule Halifax 1920 only - May 9 0:00 1:00 D
-@@ -1586,7 +1586,7 @@
- # clear that this was the case since at least 1993.
- # For now, assume it started in 1993.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Moncton 1933 1935 - Jun Sun>=8 1:00 1:00 D
- Rule Moncton 1933 1935 - Sep Sun>=8 1:00 0 S
- Rule Moncton 1936 1938 - Jun Sun>=1 1:00 1:00 D
-@@ -1795,7 +1795,7 @@
- # With some exceptions, the use of daylight saving may be said to be limited
- # to those cities and towns lying between Quebec city and Windsor, Ont.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Toronto 1919 only - Mar 30 23:30 1:00 D
- Rule Toronto 1919 only - Oct 26 0:00 0 S
- Rule Toronto 1920 only - May 2 2:00 1:00 D
-@@ -1893,7 +1893,7 @@
- # starting 1966. Since 02:00s is clearly correct for 1967 on, assume
- # it was also 02:00s in 1966.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Winn 1916 only - Apr 23 0:00 1:00 D
- Rule Winn 1916 only - Sep 17 0:00 0 S
- Rule Winn 1918 only - Apr 14 2:00 1:00 D
-@@ -1984,7 +1984,7 @@
- # long and rather painful to read.
- # http://www.qp.gov.sk.ca/documents/English/Statutes/Statutes/T14.pdf
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Regina 1918 only - Apr 14 2:00 1:00 D
- Rule Regina 1918 only - Oct 27 2:00 0 S
- Rule Regina 1930 1934 - May Sun>=1 0:00 1:00 D
-@@ -2034,7 +2034,7 @@
- # Boyer JP. Forcing Choice: The Risky Reward of Referendums. Dundum. 2017.
- # ISBN 978-1459739123.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Edm 1918 1919 - Apr Sun>=8 2:00 1:00 D
- Rule Edm 1918 only - Oct 27 2:00 0 S
- Rule Edm 1919 only - May 27 2:00 0 S
-@@ -2143,7 +2143,7 @@
- # https://searcharchives.vancouver.ca/daylight-saving-1918-starts-again-jul...
- # We have no further details, so omit them for now.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Vanc 1918 only - Apr 14 2:00 1:00 D
- Rule Vanc 1918 only - Oct 27 2:00 0 S
- Rule Vanc 1942 only - Feb 9 2:00 1:00 W # War
-@@ -2472,7 +2472,19 @@
- # consistency with nearby Dawson Creek, Creston, and Fort Nelson.
- # https://yukon.ca/en/news/yukon-end-seasonal-time-change
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# From Andrew G. Smith (2020-09-24):
-+# Yukon has completed its regulatory change to be on UTC -7 year-round....
-+# http://www.gov.yk.ca/legislation/regs/oic2020_125.pdf
-+# What we have done is re-defined Yukon Standard Time, as we are
-+# authorized to do under section 33 of our Interpretation Act:
-+# http://www.gov.yk.ca/legislation/acts/interpretation_c.pdf
-+#
-+# From Paul Eggert (2020-09-24):
-+# tzdb uses the obsolete YST abbreviation for standard time in Yukon through
-+# about 1970, and uses PST for standard time in Yukon since then. Consistent
-+# with that, use MST for -07, the new standard time in Yukon effective Nov. 1.
-+
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NT_YK 1918 only - Apr 14 2:00 1:00 D
- Rule NT_YK 1918 only - Oct 27 2:00 0 S
- Rule NT_YK 1919 only - May 25 2:00 1:00 D
-@@ -2526,12 +2538,12 @@
- Zone America/Whitehorse -9:00:12 - LMT 1900 Aug 20
- -9:00 NT_YK Y%sT 1967 May 28 0:00
- -8:00 NT_YK P%sT 1980
-- -8:00 Canada P%sT 2020 Mar 8 2:00
-+ -8:00 Canada P%sT 2020 Nov 1
- -7:00 - MST
- Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
- -9:00 NT_YK Y%sT 1973 Oct 28 0:00
- -8:00 NT_YK P%sT 1980
-- -8:00 Canada P%sT 2020 Mar 8 2:00
-+ -8:00 Canada P%sT 2020 Nov 1
- -7:00 - MST
-
-
-@@ -2746,7 +2758,7 @@
- # 5- The islands, reefs and keys shall take their timezone from the
- # longitude they are located at.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mexico 1939 only - Feb 5 0:00 1:00 D
- Rule Mexico 1939 only - Jun 25 0:00 0 S
- Rule Mexico 1940 only - Dec 9 0:00 1:00 D
-@@ -2951,7 +2963,7 @@
- # rules to sync with the U.S. starting in 2007....
- # http://www.jonesbahamas.com/?c=45&a=10412
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Bahamas 1964 1975 - Oct lastSun 2:00 0 S
- Rule Bahamas 1964 1975 - Apr lastSun 2:00 1:00 D
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -2963,7 +2975,7 @@
-
- # For 1899 Milne gives -3:58:29.2; round that.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Barb 1977 only - Jun 12 2:00 1:00 D
- Rule Barb 1977 1978 - Oct Sun>=1 2:00 0 S
- Rule Barb 1978 1980 - Apr Sun>=15 2:00 1:00 D
-@@ -2976,7 +2988,7 @@
-
- # Belize
- # Whitman entirely disagrees with Shanks; go with Shanks & Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Belize 1918 1942 - Oct Sun>=2 0:00 0:30 -0530
- Rule Belize 1919 1943 - Feb Sun>=9 0:00 0 CST
- Rule Belize 1973 only - Dec 5 0:00 1:00 CDT
-@@ -3013,7 +3025,7 @@
-
- # Milne gives -5:36:13.3 as San José mean time; round to nearest.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule CR 1979 1980 - Feb lastSun 0:00 1:00 D
- Rule CR 1979 1980 - Jun Sun>=1 0:00 0 S
- Rule CR 1991 1992 - Jan Sat>=15 0:00 1:00 D
-@@ -3187,7 +3199,7 @@
- # From Paul Eggert (2012-11-03):
- # For now, assume the future rule is first Sunday in November.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cuba 1928 only - Jun 10 0:00 1:00 D
- Rule Cuba 1928 only - Oct 10 0:00 0 S
- Rule Cuba 1940 1942 - Jun Sun>=1 0:00 1:00 D
-@@ -3256,7 +3268,7 @@
- # decided to revert.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule DR 1966 only - Oct 30 0:00 1:00 EDT
- Rule DR 1967 only - Feb 28 0:00 0 EST
- Rule DR 1969 1973 - Oct lastSun 0:00 0:30 -0430
-@@ -3273,7 +3285,7 @@
-
- # El Salvador
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Salv 1987 1988 - May Sun>=1 0:00 1:00 D
- Rule Salv 1987 1988 - Sep lastSun 0:00 0 S
- # There are too many San Salvadors elsewhere, so use America/El_Salvador
-@@ -3302,7 +3314,7 @@
- # (2006-04-19), says DST ends at 24:00. See
- # http://www.sieca.org.gt/Sitio_publico/Energeticos/Doc/Medidas/Cambio_Hora...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Guat 1973 only - Nov 25 0:00 1:00 D
- Rule Guat 1974 only - Feb 24 0:00 0 S
- Rule Guat 1983 only - May 21 0:00 1:00 D
-@@ -3383,7 +3395,7 @@
- # I have not been able to find a more authoritative source:
- # https://www.haitilibre.com/en/news-20319-haiti-notices-time-change-in-hai...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Haiti 1983 only - May 8 0:00 1:00 D
- Rule Haiti 1984 1987 - Apr lastSun 0:00 1:00 D
- Rule Haiti 1983 1987 - Oct lastSun 0:00 0 S
-@@ -3431,7 +3443,7 @@
- # http://www.laprensahn.com/pais_nota.php?id04962=7386
- # So it seems that Honduras will not enter DST this year....
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Hond 1987 1988 - May Sun>=1 0:00 1:00 D
- Rule Hond 1987 1988 - Sep lastSun 0:00 0 S
- Rule Hond 2006 only - May Sun>=1 0:00 1:00 D
-@@ -3522,7 +3534,7 @@
- # The natural sun time is restored in all the national territory, in that the
- # time is returned one hour at 01:00 am of October 1 of 2006.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Nic 1979 1980 - Mar Sun>=16 0:00 1:00 D
- Rule Nic 1979 1980 - Jun Mon>=23 0:00 0 S
- Rule Nic 2005 only - Apr 10 0:00 1:00 D
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/pacificnew openjdk/jdk/test/sun/util/calendar/zi/tzdata/pacificnew
-deleted file mode 100644
---- openjdk/jdk/test/sun/util/calendar/zi/tzdata/pacificnew
-+++ /dev/null
-@@ -1,52 +0,0 @@
--#
--# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--#
--# This code is free software; you can redistribute it and/or modify it
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation. Oracle designates this
--# particular file as subject to the "Classpath" exception as provided
--# by Oracle in the LICENSE file that accompanied this code.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--# tzdb data for proposed US election time (this file is obsolete)
--
--# This file is in the public domain, so clarified as of
--# 2009-05-17 by Arthur David Olson.
--
--# From Arthur David Olson (1989-04-05):
--# On 1989-04-05, the U. S. House of Representatives passed (238-154) a bill
--# establishing "Pacific Presidential Election Time"; it was not acted on
--# by the Senate or signed into law by the President.
--# You might want to change the "PE" (Presidential Election) below to
--# "Q" (Quadrennial) to maintain three-character zone abbreviations.
--# If you're really conservative, you might want to change it to "D".
--# Avoid "L" (Leap Year), which won't be true in 2100.
--
--# If Presidential Election Time is ever established, replace "XXXX" below
--# with the year the law takes effect and uncomment the "##" lines.
--
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--## Rule Twilite XXXX max - Apr Sun>=1 2:00 1:00 D
--## Rule Twilite XXXX max uspres Oct lastSun 2:00 1:00 PE
--## Rule Twilite XXXX max uspres Nov Sun>=7 2:00 0 S
--## Rule Twilite XXXX max nonpres Oct lastSun 2:00 0 S
--
--# Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL]
--## Zone America/Los_Angeles-PET -8:00 US P%sT XXXX
--## -8:00 Twilite P%sT
--
--# For now...
--Link America/Los_Angeles US/Pacific-New ##
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/southamerica openjdk/jdk/test/sun/util/calendar/zi/tzdata/southamerica
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/southamerica
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/southamerica
-@@ -71,7 +71,7 @@
- # I am sending modifications to the Argentine time zone table...
- # AR was chosen because they are the ISO letters that represent Argentina.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Arg 1930 only - Dec 1 0:00 1:00 -
- Rule Arg 1931 only - Apr 1 0:00 0 -
- Rule Arg 1931 only - Oct 15 0:00 1:00 -
-@@ -792,7 +792,7 @@
- # From Paul Eggert (2013-10-17):
- # For now, assume western Amazonas will change as well.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Decree 20,466 <http://pcdsh01.on.br/HV20466.htm> (1931-10-01)
- # Decree 21,896 <http://pcdsh01.on.br/HV21896.htm> (1932-01-10)
- Rule Brazil 1931 only - Oct 3 11:00 1:00 -
-@@ -1281,7 +1281,7 @@
- # For now, assume that they will not revert,
- # since they have extended the expiration date once already.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Chile 1927 1931 - Sep 1 0:00 1:00 -
- Rule Chile 1928 1932 - Apr 1 0:00 0 -
- Rule Chile 1968 only - Nov 3 4:00u 1:00 -
-@@ -1381,7 +1381,7 @@
- # Milne gives 4:56:16.4 for Bogotá time in 1899; round to nearest. He writes,
- # "A variation of fifteen minutes in the public clocks of Bogota is not rare."
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule CO 1992 only - May 3 0:00 1:00 -
- Rule CO 1993 only - Apr 4 0:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1441,7 +1441,7 @@
- # (Not one step back), the clocks went back in 1993 and the experiment was not
- # repeated. For now, assume transitions were at 00:00 local time country-wide.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Ecuador 1992 only - Nov 28 0:00 1:00 -
- Rule Ecuador 1993 only - Feb 5 0:00 0 -
- #
-@@ -1535,7 +1535,7 @@
- # For now we will assume permanent -03 for the Falklands
- # until advised differently (to apply for 2012 and beyond, after the 2011
- # experiment was apparently successful.)
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 -
- Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 -
- Rule Falk 1939 only - Oct 1 0:00 1:00 -
-@@ -1581,7 +1581,7 @@
- # No time of the day is established for the adjustment, so people normally
- # adjust their clocks at 0 hour of the given dates.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Para 1975 1988 - Oct 1 0:00 1:00 -
- Rule Para 1975 1978 - Mar 1 0:00 0 -
- Rule Para 1979 1991 - Apr 1 0:00 0 -
-@@ -1674,7 +1674,7 @@
- # From Paul Eggert (2006-03-22):
- # Shanks & Pottenger don't have this transition. Assume 1986 was like 1987.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Peru 1938 only - Jan 1 0:00 1:00 -
- Rule Peru 1938 only - Apr 1 0:00 0 -
- Rule Peru 1938 1939 - Sep lastSun 0:00 1:00 -
-@@ -1770,7 +1770,7 @@
- # https://www.impo.com.uy/diariooficial/1926/03/10/2
- # https://www.impo.com.uy/diariooficial/1926/03/18/2
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Uruguay 1923 1925 - Oct 1 0:00 0:30 -
- Rule Uruguay 1924 1926 - Apr 1 0:00 0 -
- # From Tim Parenti (2018-02-15):
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/systemv openjdk/jdk/test/sun/util/calendar/zi/tzdata/systemv
-deleted file mode 100644
---- openjdk/jdk/test/sun/util/calendar/zi/tzdata/systemv
-+++ /dev/null
-@@ -1,62 +0,0 @@
--#
--# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--#
--# This code is free software; you can redistribute it and/or modify it
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation. Oracle designates this
--# particular file as subject to the "Classpath" exception as provided
--# by Oracle in the LICENSE file that accompanied this code.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--# tzdb data for System V rules (this file is obsolete)
--
--# This file is in the public domain, so clarified as of
--# 2009-05-17 by Arthur David Olson.
--
--# Old rules, should the need arise.
--# No attempt is made to handle Newfoundland, since it cannot be expressed
--# using the System V "TZ" scheme (half-hour offset), or anything outside
--# North America (no support for non-standard DST start/end dates), nor
--# the changes in the DST rules in the US after 1976 (which occurred after
--# the old rules were written).
--#
--# If you need the old rules, uncomment ## lines.
--# Compile this *without* leap second correction for true conformance.
--
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule SystemV min 1973 - Apr lastSun 2:00 1:00 D
--Rule SystemV min 1973 - Oct lastSun 2:00 0 S
--Rule SystemV 1974 only - Jan 6 2:00 1:00 D
--Rule SystemV 1974 only - Nov lastSun 2:00 0 S
--Rule SystemV 1975 only - Feb 23 2:00 1:00 D
--Rule SystemV 1975 only - Oct lastSun 2:00 0 S
--Rule SystemV 1976 max - Apr lastSun 2:00 1:00 D
--Rule SystemV 1976 max - Oct lastSun 2:00 0 S
--
--# Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL]
--## Zone SystemV/AST4ADT -4:00 SystemV A%sT
--## Zone SystemV/EST5EDT -5:00 SystemV E%sT
--## Zone SystemV/CST6CDT -6:00 SystemV C%sT
--## Zone SystemV/MST7MDT -7:00 SystemV M%sT
--## Zone SystemV/PST8PDT -8:00 SystemV P%sT
--## Zone SystemV/YST9YDT -9:00 SystemV Y%sT
--## Zone SystemV/AST4 -4:00 - AST
--## Zone SystemV/EST5 -5:00 - EST
--## Zone SystemV/CST6 -6:00 - CST
--## Zone SystemV/MST7 -7:00 - MST
--## Zone SystemV/PST8 -8:00 - PST
--## Zone SystemV/YST9 -9:00 - YST
--## Zone SystemV/HST10 -10:00 - HST
diff --git a/pr3519-fix_further_functions_with_a_missing_return_value.patch b/pr3519-fix_further_functions_with_a_missing_return_value.patch
deleted file mode 100644
index 51ca7f1..0000000
--- a/pr3519-fix_further_functions_with_a_missing_return_value.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1518669922 0
-# Thu Feb 15 04:45:22 2018 +0000
-# Node ID adaf109718c10888cce5b6e73af7f3e15a7ab0db
-# Parent 3ade0115344b77e6d00462044e0cf68722685bfe
-PR3519: Fix further functions with a missing return value.
-
-diff --git openjdk.orig/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
---- openjdk.orig/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
-+++ openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
-@@ -205,6 +205,7 @@
- return Address(base, tmp, Address::lsl(addr->scale()));
- }
- }
-+ return Address();
- }
-
- Address LIR_Assembler::as_Address_hi(LIR_Address* addr) {
diff --git a/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch b/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
deleted file mode 100644
index d1e9576..0000000
--- a/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1529475043 -3600
-# Wed Jun 20 07:10:43 2018 +0100
-# Node ID f6341f4635dacb56678264d29a88cd052b74036b
-# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de
-PR3601: Fix additional -Wreturn-type issues introduced by 8061651
-
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
-@@ -835,7 +835,7 @@
- JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname))
- JVMWrapper("JVM_KnownToNotExist");
- #if INCLUDE_CDS
-- return ClassLoaderExt::known_to_not_exist(env, loader, classname, CHECK_(false));
-+ return ClassLoaderExt::known_to_not_exist(env, loader, classname, THREAD);
- #else
- return false;
- #endif
-@@ -845,7 +845,7 @@
- JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader))
- JVMWrapper("JVM_GetResourceLookupCacheURLs");
- #if INCLUDE_CDS
-- return ClassLoaderExt::get_lookup_cache_urls(env, loader, CHECK_NULL);
-+ return ClassLoaderExt::get_lookup_cache_urls(env, loader, THREAD);
- #else
- return NULL;
- #endif
-@@ -855,7 +855,7 @@
- JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name))
- JVMWrapper("JVM_GetResourceLookupCache");
- #if INCLUDE_CDS
-- return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, CHECK_NULL);
-+ return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, THREAD);
- #else
- return NULL;
- #endif
diff --git a/rh1566890-CVE_2018_3639-speculative_store_bypass.patch b/rh1566890-CVE_2018_3639-speculative_store_bypass.patch
deleted file mode 100644
index d8f3a5a..0000000
--- a/rh1566890-CVE_2018_3639-speculative_store_bypass.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -103,6 +103,8 @@
- # include <inttypes.h>
- # include <sys/ioctl.h>
-
-+#include <sys/prctl.h>
-+
- PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
- #ifndef _GNU_SOURCE
-@@ -4997,6 +4999,31 @@
- }
- }
-
-+/* Per task speculation control */
-+#ifndef PR_GET_SPECULATION_CTRL
-+#define PR_GET_SPECULATION_CTRL 52
-+#endif
-+#ifndef PR_SET_SPECULATION_CTRL
-+#define PR_SET_SPECULATION_CTRL 53
-+#endif
-+/* Speculation control variants */
-+# undef PR_SPEC_STORE_BYPASS
-+# define PR_SPEC_STORE_BYPASS 0
-+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
-+# undef PR_SPEC_NOT_AFFECTED
-+# undef PR_SPEC_PRCTL
-+# undef PR_SPEC_ENABLE
-+# undef PR_SPEC_DISABLE
-+# define PR_SPEC_NOT_AFFECTED 0
-+# define PR_SPEC_PRCTL (1UL << 0)
-+# define PR_SPEC_ENABLE (1UL << 1)
-+# define PR_SPEC_DISABLE (1UL << 2)
-+
-+static void set_speculation() __attribute__((constructor));
-+static void set_speculation() {
-+ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
-+}
-+
- // this is called _before_ most of the global arguments have been parsed
- void os::init(void) {
- char dummy; /* used to get a guess on initial stack address */
diff --git a/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch b/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch
deleted file mode 100644
index 94ef9d4..0000000
--- a/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -5001,26 +5001,43 @@
-
- /* Per task speculation control */
- #ifndef PR_GET_SPECULATION_CTRL
--#define PR_GET_SPECULATION_CTRL 52
-+# define PR_GET_SPECULATION_CTRL 52
- #endif
- #ifndef PR_SET_SPECULATION_CTRL
--#define PR_SET_SPECULATION_CTRL 53
-+# define PR_SET_SPECULATION_CTRL 53
- #endif
- /* Speculation control variants */
--# undef PR_SPEC_STORE_BYPASS
-+#ifndef PR_SPEC_STORE_BYPASS
- # define PR_SPEC_STORE_BYPASS 0
-+#endif
- /* Return and control values for PR_SET/GET_SPECULATION_CTRL */
--# undef PR_SPEC_NOT_AFFECTED
--# undef PR_SPEC_PRCTL
--# undef PR_SPEC_ENABLE
--# undef PR_SPEC_DISABLE
-+
-+#ifndef PR_SPEC_NOT_AFFECTED
- # define PR_SPEC_NOT_AFFECTED 0
-+#endif
-+#ifndef PR_SPEC_PRCTL
- # define PR_SPEC_PRCTL (1UL << 0)
-+#endif
-+#ifndef PR_SPEC_ENABLE
- # define PR_SPEC_ENABLE (1UL << 1)
-+#endif
-+#ifndef PR_SPEC_DISABLE
- # define PR_SPEC_DISABLE (1UL << 2)
-+#endif
-+#ifndef PR_SPEC_FORCE_DISABLE
-+# define PR_SPEC_FORCE_DISABLE (1UL << 3)
-+#endif
-+#ifndef PR_SPEC_DISABLE_NOEXEC
-+# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
-+#endif
-
- static void set_speculation() __attribute__((constructor));
- static void set_speculation() {
-+ if ( prctl(PR_SET_SPECULATION_CTRL,
-+ PR_SPEC_STORE_BYPASS,
-+ PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
-+ return;
-+ }
- prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
- }
-
diff --git a/rh1750419-redhat_alt_java.patch b/rh1750419-redhat_alt_java.patch
new file mode 100644
index 0000000..4789f0b
--- /dev/null
+++ b/rh1750419-redhat_alt_java.patch
@@ -0,0 +1,133 @@
+diff --git openjdk.orig/jdk/make/CompileLaunchers.gmk openjdk/jdk/make/CompileLaunchers.gmk
+--- openjdk.orig/jdk/make/CompileLaunchers.gmk
++++ openjdk/jdk/make/CompileLaunchers.gmk
+@@ -255,6 +255,33 @@
+ endif
+ endif
+
++# -Wno-error=cpp is present to allow commented warning in ifdef part of main.c
++$(eval $(call SetupLauncher,alt-java, \
++ -DEXPAND_CLASSPATH_WILDCARDS -DREDHAT_ALT_JAVA -Wno-error=cpp,,,user32.lib comctl32.lib, \
++ $(JDK_OUTPUTDIR)/objs/jli_static.lib, $(JAVA_RC_FLAGS), \
++ $(JDK_TOPDIR)/src/windows/resource/java.rc, $(JDK_OUTPUTDIR)/objs/java_objs,true))
++
++$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/alt-java$(EXE_SUFFIX): $(BUILD_LAUNCHER_alt-java)
++ $(MKDIR) -p $(@D)
++ $(RM) $@
++ $(CP) $(JDK_OUTPUTDIR)/objs/java_objs$(OUTPUT_SUBDIR)/alt-java$(EXE_SUFFIX) $@
++
++$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/alt-java$(DEBUGINFO_EXT): $(BUILD_LAUNCHER_alt-java)
++ $(MKDIR) -p $(@D)
++ $(RM) $@
++ $(CP) $(JDK_OUTPUTDIR)/objs/java_objs$(OUTPUT_SUBDIR)/alt-java$(DEBUGINFO_EXT) $@
++
++ifeq ($(OPENJDK_TARGET_OS), linux)
++ BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/alt-java$(EXE_SUFFIX)
++ ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
++ ifneq ($(POST_STRIP_CMD), )
++ ifneq ($(STRIP_POLICY), no_strip)
++ BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/alt-java$(DEBUGINFO_EXT)
++ endif
++ endif
++ endif
++endif
++
+ ifeq ($(OPENJDK_TARGET_OS), windows)
+ $(eval $(call SetupLauncher,javaw, \
+ -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \
+diff --git openjdk.orig/jdk/src/share/bin/alt_main.h openjdk/jdk/src/share/bin/alt_main.h
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/src/share/bin/alt_main.h
+@@ -0,0 +1,73 @@
++/*
++ * Copyright (c) 2019, Red Hat, Inc. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++#ifdef REDHAT_ALT_JAVA
++
++#include <sys/prctl.h>
++
++
++/* Per task speculation control */
++#ifndef PR_GET_SPECULATION_CTRL
++# define PR_GET_SPECULATION_CTRL 52
++#endif
++#ifndef PR_SET_SPECULATION_CTRL
++# define PR_SET_SPECULATION_CTRL 53
++#endif
++/* Speculation control variants */
++#ifndef PR_SPEC_STORE_BYPASS
++# define PR_SPEC_STORE_BYPASS 0
++#endif
++/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
++
++#ifndef PR_SPEC_NOT_AFFECTED
++# define PR_SPEC_NOT_AFFECTED 0
++#endif
++#ifndef PR_SPEC_PRCTL
++# define PR_SPEC_PRCTL (1UL << 0)
++#endif
++#ifndef PR_SPEC_ENABLE
++# define PR_SPEC_ENABLE (1UL << 1)
++#endif
++#ifndef PR_SPEC_DISABLE
++# define PR_SPEC_DISABLE (1UL << 2)
++#endif
++#ifndef PR_SPEC_FORCE_DISABLE
++# define PR_SPEC_FORCE_DISABLE (1UL << 3)
++#endif
++#ifndef PR_SPEC_DISABLE_NOEXEC
++# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
++#endif
++
++static void set_speculation() __attribute__((constructor));
++static void set_speculation() {
++ if ( prctl(PR_SET_SPECULATION_CTRL,
++ PR_SPEC_STORE_BYPASS,
++ PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
++ return;
++ }
++ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
++}
++
++#endif // REDHAT_ALT_JAVA
+diff --git openjdk.orig/jdk/src/share/bin/main.c openjdk/jdk/src/share/bin/main.c
+--- openjdk.orig/jdk/src/share/bin/main.c
++++ openjdk/jdk/src/share/bin/main.c
+@@ -32,6 +32,14 @@
+
+ #include "defines.h"
+
++#ifdef REDHAT_ALT_JAVA
++#if defined(__linux__) && defined(__x86_64__)
++#include "alt_main.h"
++#else
++#warning alt-java requested but SSB mitigation not available on this platform.
++#endif
++#endif
++
+ #ifdef _MSC_VER
+ #if _MSC_VER > 1400 && _MSC_VER < 1600
+
diff --git a/sources b/sources
index 70e7e49..8de2960 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (aarch32-port-jdk8u-jdk8u275-ga-aarch32-20201109-4curve.tar.xz) = 648b6149eb7010f51ba60bf86ffe56c0f4780fcf87f3f853b71b951123257d6c3e0ab7983559ea8115f320e0de4bb79b01f2497529774be0c6dd01fcf4598c41
+SHA512 (aarch32-port-jdk8u-jdk8u282-ga-aarch32-20210125-4curve.tar.xz) = b83541f5c5b3e274b17e4ebd034990ae99685e85263b9d1a399f3b5c70b35670e7efa714d0d209c04e05100dda5c08a3f411cbec7aa829092967df008031a428
SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
commit 8155ab27e59b28b3dee13be5fd631d2e0a950894
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 14:42:22 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/java-1.8.0-openjdk-aarch32.spec b/java-1.8.0-openjdk-aarch32.spec
index 5287292..a1a9edc 100644
--- a/java-1.8.0-openjdk-aarch32.spec
+++ b/java-1.8.0-openjdk-aarch32.spec
@@ -1216,7 +1216,7 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release
Name: java-%{javaver}-%{origin}-aarch32
Version: %{javaver}.%{updatever}.%{buildver}
-Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
+Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.1
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -2517,6 +2517,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.0.275.b01-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Tue Nov 17 2020 Alex Kashchenko <akashche(a)redhat.com> - 1:1.8.0.275.b01-1
- update sources to 8u275
- sync with mainline package
commit dcce46a33ed44f6a9a7f0c920a4ded3048d6f2da
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Tue Jan 5 15:33:50 2021 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/java-1.8.0-openjdk-aarch32.spec b/java-1.8.0-openjdk-aarch32.spec
index 78e89ac..5287292 100644
--- a/java-1.8.0-openjdk-aarch32.spec
+++ b/java-1.8.0-openjdk-aarch32.spec
@@ -1486,6 +1486,7 @@ BuildRequires: gcc >= 4.8.3-8
%if %{with_systemtap}
BuildRequires: systemtap-sdt-devel
%endif
+BuildRequires: make
# this is always built, also during debug-only build
# when it is built in debug-only this package is just placeholder
2 years, 3 months
- 1
- 0
Architecture specific change in rpms/java-1.8.0-openjdk-aarch32.git
by githook-noreply＠fedoraproject.org
The package rpms/java-1.8.0-openjdk-aarch32.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk-aarch32.git/co....
Change:
+%ifarch %{ssbd_arches}
Thanks.
Full change:
============
commit 2b9575bc375ba8d6b125dd36b8ba7f90333c826b
Author: Alex Kashchenko <akashche(a)redhat.com>
Date: Sun Feb 28 16:50:08 2021 -0500
8u282 update
diff --git a/.gitignore b/.gitignore
index 5901268..11e3daa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/tapsets-icedtea-3.15.0.tar.xz
/aarch32-port-jdk8u-jdk8u265-ga-aarch32-20200729.tar.xz
/aarch32-port-jdk8u-jdk8u275-ga-aarch32-20201109-4curve.tar.xz
+/aarch32-port-jdk8u-jdk8u282-ga-aarch32-20210125-4curve.tar.xz
diff --git a/java-1.8.0-openjdk-aarch32.spec b/java-1.8.0-openjdk-aarch32.spec
index a1a9edc..d8fa7dc 100644
--- a/java-1.8.0-openjdk-aarch32.spec
+++ b/java-1.8.0-openjdk-aarch32.spec
@@ -4,18 +4,20 @@
#
# Examples:
#
-# Produce release *and* slowdebug builds on x86_64 (default):
+# Produce release, fastdebug *and* slowdebug builds on x86_64 (default):
# $ rpmbuild -ba java-1.8.0-openjdk.spec
#
# Produce only release builds (no slowdebug builds) on x86_64:
-# $ rpmbuild -ba java-1.8.0-openjdk.spec --without slowdebug
+# $ rpmbuild -ba java-1.8.0-openjdk.spec --without slowdebug --without fastdebug
#
# Only produce a release build on x86_64:
-# $ fedpkg mockbuild --without slowdebug
+# $ fedpkg mockbuild --without slowdebug --without fastdebug
#
# Only produce a debug build on x86_64:
# $ fedpkg local --without release
#
+# Enable fastdebug builds by default on relevant arches.
+%bcond_without fastdebug
# Enable slowdebug builds by default on relevant arches.
%bcond_without slowdebug
# Enable release builds by default on relevant arches.
@@ -32,13 +34,16 @@
# See https://github.com/rpm-software-management/rpm/issues/127 to comments at "pmatilai commented on Aug 18, 2017"
# (initiated in https://bugzilla.redhat.com/show_bug.cgi?id=1482192)
%global debug_suffix_unquoted -slowdebug
+%global fastdebug_suffix_unquoted -fastdebug
# quoted one for shell operations
%global debug_suffix "%{debug_suffix_unquoted}"
+%global fastdebug_suffix "%{fastdebug_suffix_unquoted}"
%global normal_suffix ""
-# if you want only debug build but providing java build only normal build but set normalbuild_parameter
-%global debug_warning This package has full debug on. Install only in need and remove asap.
+%global debug_warning This package is unoptimised with full debugging. Install only as needed and remove ASAP.
%global debug_on with full debug on
+%global fastdebug_warning This package is optimised with full debugging. Install only as needed and remove ASAP.
+%global for_fastdebug with minimal debug on
%global for_debug for packages with debug on
%if %{with release}
@@ -48,9 +53,9 @@
%endif
%if %{include_normal_build}
-%global build_loop1 %{normal_suffix}
+%global normal_build %{normal_suffix}
%else
-%global build_loop1 %{nil}
+%global normal_build %{nil}
%endif
# We have hardcoded list of files, which is appearing in alternatives, and in files
@@ -59,14 +64,14 @@
# the ghosts are here to allow installation via query like `dnf install /usr/bin/java`
# you can list those files, with appropriate sections: cat *.spec | grep -e --install -e --slave -e post_
# TODO - fix those hardcoded lists via single list
-# those files ,must *NOT* be ghosted for *slowdebug* packages
-# FIXME - if you are moving jshell or jlink or simialr, always modify all three sections
+# Those files must *NOT* be ghosted for *slowdebug* packages
+# FIXME - if you are moving jshell or jlink or similar, always modify all three sections
# you can check via headless and devels:
# rpm -ql --noghost java-11-openjdk-headless-11.0.1.13-8.fc29.x86_64.rpm | grep bin
# == rpm -ql java-11-openjdk-headless-slowdebug-11.0.1.13-8.fc29.x86_64.rpm | grep bin
# != rpm -ql java-11-openjdk-headless-11.0.1.13-8.fc29.x86_64.rpm | grep bin
# similarly for other %%{_jvmdir}/{jre,java} and %%{_javadocdir}/{java,java-zip}
-%define is_release_build() %( if [ "%{?1}" == "%{debug_suffix_unquoted}" ]; then echo "0" ; else echo "1"; fi )
+%define is_release_build() %( if [ "%{?1}" == "%{debug_suffix_unquoted}" -o "%{?1}" == "%{fastdebug_suffix_unquoted}" ]; then echo "0" ; else echo "1"; fi )
# while JDK is a techpreview(is_system_jdk=0), some provides are turned off. Once jdk stops to be an techpreview, move it to 1
# as sytem JDK, we mean any JDK which can run whole system java stack without issues (like bytecode issues, module issues, dependencies...)
@@ -76,58 +81,78 @@
# we need to distinguish between big and little endian PPC64
%global ppc64le ppc64le
%global ppc64be ppc64 ppc64p7
+# Set of architectures which support multiple ABIs
%global multilib_arches %{power64} sparc64 x86_64
-%global jit_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
+# Set of architectures for which we build debug builds
+%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64}
+# Set of architectures with a Just-In-Time (JIT) compiler
+%global jit_arches %{debug_arches}
+# Set of architectures which support SystemTap tapsets
+%global systemtap_arches %{jit_arches}
+%global fastdebug_arches x86_64 ppc64le aarch64
+# Set of architectures which support the serviceability agent
%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64}
-%global jfr_arches x86_64 sparcv9 sparc64 %{aarch64} %{power64}
+# Set of architectures which support class data sharing
+# See https://bugzilla.redhat.com/show_bug.cgi?id=513605
+# MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT
+%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64}
+%global jfr_arches %{jit_arches}
+
+# Set of architectures for which alt-java has SSB mitigation
+%global ssbd_arches x86_64
# By default, we build a debug build during main build on JIT architectures
%if %{with slowdebug}
-%ifarch %{jit_arches}
-%ifnarch %{arm}
+%ifarch %{debug_arches}
%global include_debug_build 1
%else
-%global include_debug_build 1
+%global include_debug_build 0
%endif
%else
%global include_debug_build 0
%endif
+
+# By default, we build a fastdebug build during main build only on fastdebug architectures
+%if %{with fastdebug}
+%ifarch %{fastdebug_arches}
+%global include_fastdebug_build 1
%else
-%global include_debug_build 0
+%global include_fastdebug_build 0
+%endif
+%else
+%global include_fastdebug_build 0
%endif
%if %{include_debug_build}
-%global build_loop2 %{debug_suffix}
+%global slowdebug_build %{debug_suffix}
%else
-%global build_loop2 %{nil}
+%global slowdebug_build %{nil}
%endif
-# if you disable both builds, then the build fails
-%global build_loop %{build_loop1} %{build_loop2}
-# note: that order: normal_suffix debug_suffix, in case of both enabled
-# is expected in one single case at the end of the build
-%global rev_build_loop %{build_loop2} %{build_loop1}
-
-%ifarch %{jit_arches}
-%global bootstrap_build 1
+%if %{include_fastdebug_build}
+%global fastdebug_build %{fastdebug_suffix}
%else
-%global bootstrap_build 1
+%global fastdebug_build %{nil}
%endif
+%global bootstrap_build 1
+
+# If you disable both builds, then the build fails
+# Note that the debug build requires the normal build for docs
+%global build_loop %{normal_build} %{fastdebug_build} %{slowdebug_build}
+# Test slowdebug first as it provides the best diagnostics
+%global rev_build_loop %{slowdebug_build} %{fastdebug_build} %{normal_build}
%global bootstrap_targets images
%global release_targets images docs-zip
-# No docs nor bootcycle for debug builds
%global debug_targets images
-# This package fails to build with LTO due to undefined symbols. LTO
-# was disabled in OpenSuSE as well, but with no real explanation why
-# beyond the undefined symbols. It really should be investigated further.
-# Disable LTO
+# Disable LTO as this causes build failures at the moment.
+# See RHBZ#1861401
%define _lto_cflags %{nil}
# Filter out flags from the optflags macro that cause problems with the OpenJDK build
-# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
# We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
+# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs)
# We replace it with -Wformat (required by -Werror=format-security) and -Wno-cpp to avoid FORTIFY_SOURCE warnings
# We filter out -fexceptions as the HotSpot build explicitly does -fno-exceptions and it's otherwise the default for C++
%global ourflags %(echo %optflags | sed -e 's|-Wall|-Wformat -Wno-cpp|' | sed -r -e 's|-O[0-9]*||')
@@ -208,7 +233,9 @@
%global stapinstall %{nil}
%endif
-%ifarch %{jit_arches}
+
+
+%ifarch %{systemtap_arches}
%global with_systemtap 0
%else
%global with_systemtap 0
@@ -237,20 +264,22 @@
%global with_openjfx_binding 0
%endif
-# Standard JPackage naming and versioning defines.
+# Define IcedTea version used for SystemTap tapsets and desktop file
+%global icedteaver 3.15.0
+
+# Standard JPackage naming and versioning defines
%global origin openjdk
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
%global shenandoah_project aarch64-port
%global shenandoah_repo jdk8u-shenandoah
-%global shenandoah_revision aarch64-shenandoah-jdk8u275-b01
+%global shenandoah_revision aarch64-shenandoah-jdk8u282-b08
# Define old aarch64/jdk8u tree variables for compatibility
%global project aarch32-port
%global repo jdk8u
-%global revision jdk8u275-ga-aarch32-20201109
-# Define IcedTea version used for SystemTap tapsets and desktop files
-%global icedteaver 3.15.0
+%global revision jdk8u282-ga-aarch32-20210125
+
# e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 -> aarch64-shenandoah-jdk8u212-b04
%global version_tag %(VERSION=%{shenandoah_revision}; echo ${VERSION%%-shenandoah-merge*})
@@ -307,7 +336,7 @@
# parametrized macros are order-sensitive
%global compatiblename %{name}
%global fullversion %{compatiblename}-%{version}-%{release}
-# images stub
+# images directories from upstream build
%global jdkimage j2sdk-image
# output dir stub
%define buildoutputdir() %{expand:build/jdk8.build%{?1}}
@@ -316,6 +345,7 @@
# main id and dir of this jdk
%define uniquesuffix() %{expand:%{fullversion}.%{_arch}%{?1}}
+#################################################################
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
# https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14
# https://bugzilla.redhat.com/show_bug.cgi?id=1655938
@@ -327,6 +357,8 @@
# Never generate lib-style provides/requires for slowdebug packages
%global __provides_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$
%global __requires_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$
+%global __provides_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_suffix_unquoted}}/.*$
+%global __requires_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_suffix_unquoted}}/.*$
%else
# Don't generate provides/requires for JDK provided shared libraries at all.
%global __provides_exclude ^(%{_privatelibs}|%{_publiclibs})$
@@ -343,6 +375,7 @@
%define jredir() %{expand:%{sdkdir -- %{?1}}/jre}
%define sdkbindir() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/bin}
%define jrebindir() %{expand:%{_jvmdir}/%{jredir -- %{?1}}/bin}
+%global alt_java_name alt-java
%global rpm_state_dir %{_localstatedir}/lib/rpm-state/
@@ -372,15 +405,9 @@ exit 0
%define post_headless() %{expand:
-%ifarch %{jit_arches}
-# MetaspaceShared::generate_vtable_methods not implemented for PPC JIT
-%ifnarch %{power64}
-%ifnarch %{arm}
-# see https://bugzilla.redhat.com/show_bug.cgi?id=513605
+%ifarch %{share_arches}
%{jrebindir -- %{?1}}/java -Xshare:dump >/dev/null 2>/dev/null
%endif
-%endif
-%endif
PRIORITY=%{priority}
if [ "%{?1}" == %{debug_suffix} ]; then
@@ -391,6 +418,7 @@ ext=.gz
alternatives \\
--install %{_bindir}/java java %{jrebindir -- %{?1}}/java $PRIORITY --family %{name}.%{_arch} \\
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{jredir -- %{?1}} \\
+ --slave %{_bindir}/%{alt_java_name} %{alt_java_name} %{jrebindir -- %{?1}}/%{alt_java_name} \\
--slave %{_bindir}/jjs jjs %{jrebindir -- %{?1}}/jjs \\
--slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
--slave %{_bindir}/orbd orbd %{jrebindir -- %{?1}}/orbd \\
@@ -403,6 +431,8 @@ alternatives \\
--slave %{_bindir}/unpack200 unpack200 %{jrebindir -- %{?1}}/unpack200 \\
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
+ --slave %{_mandir}/man1/%{alt_java_name}.1$ext %{alt_java_name}.1$ext \\
+ %{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jjs.1$ext jjs.1$ext \\
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
@@ -673,6 +703,7 @@ exit 0
%dir %{_jvmdir}/%{jredir -- %{?1}}/bin
%dir %{_jvmdir}/%{jredir -- %{?1}}/lib
%{_jvmdir}/%{jredir -- %{?1}}/bin/java
+%{_jvmdir}/%{jredir -- %{?1}}/bin/%{alt_java_name}
%{_jvmdir}/%{jredir -- %{?1}}/bin/jjs
%{_jvmdir}/%{jredir -- %{?1}}/bin/keytool
%{_jvmdir}/%{jredir -- %{?1}}/bin/orbd
@@ -704,6 +735,7 @@ exit 0
%{_jvmdir}/%{jredir -- %{?1}}/lib/logging.properties
%{_jvmdir}/%{jredir -- %{?1}}/lib/calendars.properties
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
+%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/orbd-%{uniquesuffix -- %{?1}}.1*
@@ -716,12 +748,10 @@ exit 0
%{_mandir}/man1/policytool-%{uniquesuffix -- %{?1}}.1*
%{_jvmdir}/%{jredir -- %{?1}}/lib/security/nss.cfg
%config(noreplace) %{etcjavadir -- %{?1}}/lib/security/nss.cfg
-%ifarch %{jit_arches}
-%ifnarch %{power64}
+%ifarch %{share_arches}
%attr(444, root, root) %ghost %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/server/classes.jsa
%attr(444, root, root) %ghost %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/client/classes.jsa
%endif
-%endif
%dir %{etcjavasubdir}
%dir %{etcjavadir -- %{?1}}
%dir %{etcjavadir -- %{?1}}/lib
@@ -886,6 +916,7 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jar
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jarsigner
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/java
+%{_jvmdir}/%{sdkdir -- %{?1}}/bin/%{alt_java_name}
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javac
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javadoc
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javah
@@ -1026,13 +1057,10 @@ exit 0
%endif
}
-%define files_jmods() %{expand:
-%{_jvmdir}/%{sdkdir -- %{?1}}/jmods
-}
%define files_demo() %{expand:
%defattr(-,root,root,-)
-%license %{buildoutputdir -- %{?1}}/images/%{jdkimage}/jre/LICENSE
+%license %{_jvmdir}/%{jredir -- %{?1}}/LICENSE
}
%define files_src() %{expand:
@@ -1044,6 +1072,7 @@ exit 0
%define files_javadoc() %{expand:
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}
+#javadoc is in jdk8 noarch, so also licnese file must be treated like it
%license %{buildoutputdir -- %{?1}}/images/%{jdkimage}/jre/LICENSE
%if %is_system_jdk
%if %{is_release_build -- %{?1}}
@@ -1055,6 +1084,7 @@ exit 0
%define files_javadoc_zip() %{expand:
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip
+#javadoc is in jdk8 noarch, so also licnese file must be treated like it
%license %{buildoutputdir -- %{?1}}/images/%{jdkimage}/jre/LICENSE
%if %is_system_jdk
%if %{is_release_build -- %{?1}}
@@ -1085,7 +1115,7 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release
Recommends: gtk2%{?_isa}
%endif
-#Provides: java-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
+#Provides: java-%{javaver}-%{origin}%{?1} = %{epoch}:%{version}-%{release}
# Standard JPackage base provides
#Provides: jre-%{javaver}%{?1} = %{epoch}:%{version}-%{release}
@@ -1102,11 +1132,12 @@ Recommends: gtk2%{?_isa}
%define java_headless_rpo() %{expand:
# Require /etc/pki/java/cacerts
Requires: ca-certificates
-# Require javapackages-filesystem for ownership of /usr/lib/jvm/
+# Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros
Requires: javapackages-filesystem
# Require zoneinfo data provided by tzdata-java subpackage.
# 2020b required as of JDK-8254177 in October CPU
Requires: tzdata-java >= 2020b
+# for support of kernel stream control
# libsctp.so.1 is being `dlopen`ed on demand
Requires: lksctp-tools%{?_isa}
# tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it,
@@ -1216,7 +1247,7 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release
Name: java-%{javaver}-%{origin}-aarch32
Version: %{javaver}.%{updatever}.%{buildver}
-Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.1
+Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -1251,7 +1282,7 @@ URL: http://openjdk.java.net/
# FILE_NAME_ROOT=%%{shenandoah_project}-%%{shenandoah_repo}-${VERSION}
# REPO_ROOT=<path to checked-out repository> generate_source_tarball.sh
# where the source is obtained from http://hg.openjdk.java.net/%%{project}/%%{repo}
-Source0: %{project}-%{repo}-jdk8u275-ga-aarch32-20201109-4curve.tar.xz
+Source0: %{project}-%{repo}-jdk8u282-ga-aarch32-20210125-4curve.tar.xz
# Custom README for -src subpackage
Source2: README.md
@@ -1324,11 +1355,6 @@ Patch512: rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
Patch523: pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch
# PR3083, RH1346460: Regression in SSL debug output without an ECC provider
Patch528: pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
-# RH1566890: CVE-2018-3639
-Patch529: rh1566890-CVE_2018_3639-speculative_store_bypass.patch
-Patch531: rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch
-# PR3601: Fix additional -Wreturn-type issues introduced by 8061651
-Patch530: pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
# PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
# PR3575, RH1567204: System cacerts database handling should not affect jssecacerts
Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
@@ -1336,6 +1362,8 @@ Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_jav
Patch400: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
# PR3655: Allow use of system crypto policy to be disabled by the user
Patch401: pr3655-toggle_system_crypto_policy.patch
+# enable build of speculative store bypass hardened alt-java
+Patch600: rh1750419-redhat_alt_java.patch
# JDK-8218811: replace open by os::open in hotspot coding
# This fixes a GCC 10 build issue
Patch111: jdk8218811-perfMemory_linux.patch
@@ -1357,8 +1385,6 @@ Patch112: java-1.8.0-openjdk-gcc11.patch
Patch103: pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch
# x86: S8199936, PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations (-mstackrealign workaround)
Patch105: jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
-# AArch64: PR3519: Fix further functions with a missing return value (AArch64)
-Patch106: pr3519-fix_further_functions_with_a_missing_return_value.patch
# S390 ambiguous log2_intptr calls
Patch107: s390-8214206_fix.patch
@@ -1378,10 +1404,6 @@ Patch502: pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binar
Patch571: jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
# 8143245, PR3548: Zero build requires disabled warnings
Patch574: jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
-# 8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Patch575: jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
-# 8062808, PR3548: Turn on the -Wreturn-type warning
-Patch577: jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
# s390: JDK-8203030, Type fixing for s390
Patch102: jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch
# 8035341: Allow using a system installed libpng
@@ -1399,8 +1421,6 @@ Patch204: jdk8042159-allow_using_system_installed_lcms2-jdk.patch
# able to be removed once that release is out
# and used by this RPM.
#############################################
-# JDK-8254177: (tz) Upgrade time-zone data to tzdata2020b
-Patch13: jdk8254177-tzdata2020b.patch
#############################################
#
@@ -1436,6 +1456,7 @@ Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
# Dependencies
#
#############################################
+BuildRequires: make
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: alsa-lib-devel
@@ -1478,15 +1499,14 @@ BuildRequires: java-1.8.0-openjdk-aarch32-devel
%ifnarch %{jit_arches}
BuildRequires: libffi-devel
%endif
-# 2020a required as of JDK-8243541
-BuildRequires: tzdata-java >= 2020a
+# 2020b required as of JDK-8254177 in October CPU
+BuildRequires: tzdata-java >= 2020b
# Earlier versions have a bug in tree vectorization on PPC
BuildRequires: gcc >= 4.8.3-8
%if %{with_systemtap}
BuildRequires: systemtap-sdt-devel
%endif
-BuildRequires: make
# this is always built, also during debug-only build
# when it is built in debug-only this package is just placeholder
@@ -1508,6 +1528,17 @@ The %{origin_nice} runtime environment %{majorver}.
%{debug_warning}
%endif
+%if %{include_fastdebug_build}
+%package fastdebug
+Summary: %{origin_nice} Runtime Environment %{majorver} %{fastdebug_on}
+Group: Development/Languages
+
+%{java_rpo -- %{fastdebug_suffix_unquoted}}
+%description fastdebug
+The %{origin_nice} runtime environment.
+%{fastdebug_warning}
+%endif
+
%if %{include_normal_build}
%package headless
Summary: %{origin_nice} Headless Runtime Environment %{majorver}
@@ -1529,6 +1560,18 @@ The %{origin_nice} runtime environment %{majorver} without audio and video suppo
%{debug_warning}
%endif
+%if %{include_fastdebug_build}
+%package headless-fastdebug
+Summary: %{origin_nice} Runtime Environment %{fastdebug_on}
+Group: Development/Languages
+
+%{java_headless_rpo -- %{fastdebug_suffix_unquoted}}
+
+%description headless-fastdebug
+The %{origin_nice} runtime environment %{majorver} without audio and video support.
+%{fastdebug_warning}
+%endif
+
%if %{include_normal_build}
%package devel
Summary: %{origin_nice} Development Environment %{majorver}
@@ -1550,6 +1593,18 @@ The %{origin_nice} development tools %{majorver}.
%{debug_warning}
%endif
+%if %{include_fastdebug_build}
+%package devel-fastdebug
+Summary: %{origin_nice} Development Environment %{majorver} %{fastdebug_on}
+Group: Development/Tools
+
+%{java_devel_rpo -- %{fastdebug_suffix_unquoted}}
+
+%description devel-fastdebug
+The %{origin_nice} development tools %{majorver}.
+%{fastdebug_warning}
+%endif
+
%if %{include_normal_build}
%package demo
Summary: %{origin_nice} Demos %{majorver}
@@ -1571,6 +1626,18 @@ The %{origin_nice} demos %{majorver}.
%{debug_warning}
%endif
+%if %{include_fastdebug_build}
+%package demo-fastdebug
+Summary: %{origin_nice} Demos %{majorver} %{fastdebug_on}
+Group: Development/Languages
+
+%{java_demo_rpo -- %{fastdebug_suffix_unquoted}}
+
+%description demo-fastdebug
+The %{origin_nice} demos %{majorver}.
+%{fastdebug_warning}
+%endif
+
%if %{include_normal_build}
%package src
Summary: %{origin_nice} Source Bundle %{majorver}
@@ -1593,6 +1660,19 @@ The java-%{origin}-src-slowdebug sub-package contains the complete %{origin_nice
class library source code for use by IDE indexers and debuggers. Debugging %{for_debug}.
%endif
+%if %{include_fastdebug_build}
+%package src-fastdebug
+Summary: %{origin_nice} Source Bundle %{majorver} %{for_fastdebug}
+Group: Development/Languages
+
+%{java_src_rpo -- %{fastdebug_suffix_unquoted}}
+
+%description src-fastdebug
+The java-%{origin}-src-fastdebug sub-package contains the complete %{origin_nice} %{majorver}
+ class library source code for use by IDE indexers and debuggers. Debugging %{for_fastdebug}.
+%endif
+
+
%if %{include_normal_build}
%package javadoc
Summary: %{origin_nice} %{majorver} API documentation
@@ -1646,6 +1726,16 @@ Summary: %{origin_nice} %{majorver} accessibility connector %{for_debug}
See normal java-%{version}-openjdk-accessibility description.
%endif
+%if %{include_fastdebug_build}
+%package accessibility-fastdebug
+Summary: %{origin_nice} %{majorver} accessibility connector %{for_fastdebug}
+
+%{java_accessibility_rpo -- %{fastdebug_suffix_unquoted}}
+
+%description accessibility-fastdebug
+See normal java-%{version}-openjdk-accessibility description.
+%endif
+
%if %{with_openjfx_binding}
%package openjfx
@@ -1681,6 +1771,24 @@ Provides: javafx-devel-slowdebug = %{epoch}:%{version}-%{release}
%description openjfx-devel-slowdebug
Set of links from OpenJDK-slowdebug (sdk) to normal OpenJFX. OpenJFX do not support debug buuilds of itself
%endif
+
+%if %{include_fastdebug_build}
+%package openjfx-fastdebug
+Summary: OpenJDK x OpenJFX connector %{for_fastdebug}. his package adds symliks finishing Java FX integration to %{name}-fastdebug
+Requires: %{name}-fastdebug%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: openjfx8%{?_isa}
+Provides: javafx-fastdebug = %{epoch}:%{version}-%{release}
+%description openjfx-fastdebug
+Set of links from OpenJDK-fastdebug (jre) to normal OpenJFX. OpenJFX do not support debug buuilds of itself
+
+%package openjfx-devel-fastdebug
+Summary: OpenJDK x OpenJFX connector for FX developers %{for_fastdebug}. This package adds symliks finishing Java FX integration to %{name}-devel-slowdebug
+Requires: %{name}-devel-fastdebug%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: openjfx8-devel%{?_isa}
+Provides: javafx-devel-fastdebug = %{epoch}:%{version}-%{release}
+%description openjfx-devel-fastdebug
+Set of links from OpenJDK-fastdebug (sdk) to normal OpenJFX. OpenJFX do not support debug buuilds of itself
+%endif
%endif
%prep
@@ -1695,19 +1803,25 @@ Set of links from OpenJDK-slowdebug (sdk) to normal OpenJFX. OpenJFX do not supp
if [ %{include_normal_build} -eq 0 -o %{include_normal_build} -eq 1 ] ; then
echo "include_normal_build is %{include_normal_build}"
else
- echo "include_normal_build is %{include_normal_build}, thats invalid. Use 1 for yes or 0 for no"
+ echo "include_normal_build is %{include_normal_build}, that is invalid. Use 1 for yes or 0 for no"
exit 11
fi
if [ %{include_debug_build} -eq 0 -o %{include_debug_build} -eq 1 ] ; then
echo "include_debug_build is %{include_debug_build}"
else
- echo "include_debug_build is %{include_debug_build}, thats invalid. Use 1 for yes or 0 for no"
+ echo "include_debug_build is %{include_debug_build}, that is invalid. Use 1 for yes or 0 for no"
exit 12
fi
-if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 ] ; then
- echo "You have disabled both include_debug_build and include_normal_build. That is a no go."
+if [ %{include_fastdebug_build} -eq 0 -o %{include_fastdebug_build} -eq 1 ] ; then
+ echo "include_fastdebug_build is %{include_fastdebug_build}"
+else
+ echo "include_fastdebug_build is %{include_fastdebug_build}, that is invalid. Use 1 for yes or 0 for no"
exit 13
fi
+if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{include_fastdebug_build} -eq 0 ] ; then
+ echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go."
+ exit 14
+fi
echo "Update version: %{updatever}"
echo "Build number: %{buildver}"
@@ -1756,7 +1870,6 @@ sh %{SOURCE12}
#%patch107
# AArch64 fixes
-#%patch106
# x86 fixes
#%patch105
@@ -1767,19 +1880,14 @@ sh %{SOURCE12}
%patch512
#%patch523
#%patch528
-%patch529
-%patch531
-%patch530
#%patch571
#%patch574
-%patch575
-%patch577
%patch111
%patch112
-%patch13
# RPM-only fixes
%patch539
+%patch600
%patch1000
# RHEL-only patches
@@ -1795,6 +1903,9 @@ tar --strip-components=1 -x -I xz -f %{SOURCE8}
%if %{include_debug_build}
cp -r tapset tapset%{debug_suffix}
%endif
+%if %{include_fastdebug_build}
+cp -r tapset tapset%{fastdebug_suffix}
+%endif
for suffix in %{build_loop} ; do
@@ -1981,6 +2092,12 @@ install -m 644 nss.cfg $JAVA_HOME/jre/lib/security/
rm $JAVA_HOME/jre/lib/tzdb.dat
ln -s %{_datadir}/javazi-1.8/tzdb.dat $JAVA_HOME/jre/lib/tzdb.dat
+# add alt-java man page
+pushd ${JAVA_HOME}
+echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
+cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
+popd
+
# build cycles
done
@@ -1999,10 +2116,21 @@ $JAVA_HOME/bin/java TestCryptoLevel
$JAVA_HOME/bin/javac -d . %{SOURCE14}
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
-# Verify system crypto (policy) can be disabled
+# Check system crypto (policy) can be disabled
$JAVA_HOME/bin/javac -d . %{SOURCE15}
$JAVA_HOME/bin/java -Djava.security.disableSystemPropertiesFile=true $(echo $(basename %{SOURCE15})|sed "s|\.java||")
+# Check java launcher has no SSB mitigation
+if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
+
+# Check alt-java launcher has SSB mitigation on supported architectures
+%ifarch %{ssbd_arches}
+nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
+%else
+if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
+%endif
+
+
# Check debug symbols are present and can identify code
find "$JAVA_HOME" -iname '*.so' -print0 | while read -d $'\0' lib
do
@@ -2064,6 +2192,7 @@ quit
end
run -version
EOF
+
grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
# Check src.zip has all sources. See RHBZ#1130490
@@ -2442,6 +2571,32 @@ require "copy_jdk_configs.lua"
%posttrans devel-slowdebug
%{posttrans_devel -- %{debug_suffix_unquoted}}
+%endif
+
+%if %{include_fastdebug_build}
+%post fastdebug
+%{post_script -- %{fastdebug_suffix_unquoted}}
+
+%post headless-fastdebug
+%{post_headless -- %{fastdebug_suffix_unquoted}}
+
+%postun fastdebug
+%{postun_script -- %{fastdebug_suffix_unquoted}}
+
+%postun headless-fastdebug
+%{postun_headless -- %{fastdebug_suffix_unquoted}}
+
+%posttrans fastdebug
+%{posttrans_script -- %{fastdebug_suffix_unquoted}}
+
+%post devel-fastdebug
+%{post_devel -- %{fastdebug_suffix_unquoted}}
+
+%postun devel-fastdebug
+%{postun_devel -- %{fastdebug_suffix_unquoted}}
+
+%posttrans devel-fastdebug
+%{posttrans_devel -- %{fastdebug_suffix_unquoted}}
%endif
@@ -2473,9 +2628,7 @@ require "copy_jdk_configs.lua"
%files javadoc
%{files_javadoc %{nil}}
-# this puts huge file to /usr/share
-# unluckily ti is really a documentation file
-# and unluckily it really is architecture-dependent, as eg. aot and grail are now x86_64 only
+# This puts a huge documentation file in /usr/share
# same for debug variant
%files javadoc-zip
%{files_javadoc_zip %{nil}}
@@ -2516,7 +2669,38 @@ require "copy_jdk_configs.lua"
%endif
%endif
+%if %{include_fastdebug_build}
+%files fastdebug
+%{files_jre -- %{fastdebug_suffix_unquoted}}
+
+%files headless-fastdebug
+%{files_jre_headless -- %{fastdebug_suffix_unquoted}}
+
+%files devel-fastdebug
+%{files_devel -- %{fastdebug_suffix_unquoted}}
+
+
+%files demo-fastdebug -f %{name}-demo.files-fastdebug
+%{files_demo -- %{fastdebug_suffix_unquoted}}
+
+%files src-fastdebug
+%{files_src -- %{fastdebug_suffix_unquoted}}
+
+%files accessibility-fastdebug
+%{files_accessibility -- %{fastdebug_suffix_unquoted}}
+
+%if %{with_openjfx_binding}
+%files openjfx-fastdebug -f %{name}-openjfx.files-fastdebug
+
+%files openjfx-devel-fastdebug -f %{name}-openjfx-devel.files-fastdebug
+%endif
+%endif
+
%changelog
+* Sun Feb 28 2021 Alex Kashchenko <akashche(a)redhat.com> - 1:1.8.0.282.b08-1
+- update sources to 8u282
+- sync with mainline package
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.8.0.275.b01-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch b/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
deleted file mode 100644
index 1010b73..0000000
--- a/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-# HG changeset patch
-# User stefank
-# Date 1525453613 -3600
-# Fri May 04 18:06:53 2018 +0100
-# Node ID 07a1135a327362f157955d470fad5df07cc35164
-# Parent de79964656fc652f2085dac4fe99bcc128b5a3b1
-8062808, PR3548: Turn on the -Wreturn-type warning
-Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make
-@@ -210,7 +210,7 @@
- WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body
- endif
-
--WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value
-+WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wreturn-type
-
- ifeq ($(USE_CLANG),)
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
-diff --git openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
---- openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad
-+++ openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
-@@ -1250,6 +1250,7 @@
-
-
- Unimplemented();
-+ return 0; // Mute compiler
- }
-
- #ifndef PRODUCT
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
-@@ -541,6 +541,7 @@
- err.report_and_die();
-
- ShouldNotReachHere();
-+ return true; // Mute compiler
- }
-
- void os::Linux::init_thread_fpu_state(void) {
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
-@@ -506,7 +506,7 @@
- ss.write((const char*)name->bytes(), name->utf8_length());
- ss.write((const char*)signature->bytes(), signature->utf8_length());
- ss.print(" is abstract");
-- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
-+ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
- }
-
- Symbol* MethodFamily::generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const {
-@@ -521,7 +521,7 @@
- ss.print(".");
- ss.write((const char*)name->bytes(), name->utf8_length());
- }
-- return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
-+ return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
- }
-
-
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
-@@ -249,7 +249,7 @@
- MutexLocker ml(SymbolTable_lock, THREAD);
-
- // Otherwise, add to symbol to table
-- return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL);
-+ return the_table()->basic_add(index, (u1*)name, len, hashValue, true, THREAD);
- }
-
- Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) {
-@@ -288,7 +288,7 @@
- // Grab SymbolTable_lock first.
- MutexLocker ml(SymbolTable_lock, THREAD);
-
-- return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL);
-+ return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, THREAD);
- }
-
- Symbol* SymbolTable::lookup_only(const char* name, int len,
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
-@@ -229,15 +229,15 @@
- class_name->as_C_string(),
- class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string()));
- if (FieldType::is_array(class_name)) {
-- return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_array_class_or_null(class_name, class_loader, protection_domain, THREAD);
- } else if (FieldType::is_obj(class_name)) {
- ResourceMark rm(THREAD);
- // Ignore wrapping L and ;.
- TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1,
- class_name->utf8_length() - 2, CHECK_NULL);
-- return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_instance_class_or_null(name, class_loader, protection_domain, THREAD);
- } else {
-- return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
-+ return resolve_instance_class_or_null(class_name, class_loader, protection_domain, THREAD);
- }
- }
-
-diff --git openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
---- openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp
-+++ openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
-@@ -367,7 +367,7 @@
- _csv_format(csv_format), _print_help(print_help),
- _print_class_stats(print_class_stats), _columns(columns) {}
- void heap_inspection(outputStream* st) NOT_SERVICES_RETURN;
-- size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN;
-+ size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN_(0);
- static void find_instances_at_safepoint(Klass* k, GrowableArray<oop>* result) NOT_SERVICES_RETURN;
- private:
- void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL);
-diff --git openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
---- openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp
-+++ openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
-@@ -93,7 +93,7 @@
- static void preload_and_dump(TRAPS) NOT_CDS_RETURN;
- static int preload_and_dump(const char * class_list_path,
- GrowableArray<Klass*>* class_promote_order,
-- TRAPS) NOT_CDS_RETURN;
-+ TRAPS) NOT_CDS_RETURN_(0);
-
- static ReservedSpace* shared_rs() {
- CDS_ONLY(return _shared_rs);
-diff --git openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp openjdk/hotspot/src/share/vm/oops/constantPool.hpp
---- openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp
-+++ openjdk/hotspot/src/share/vm/oops/constantPool.hpp
-@@ -353,7 +353,7 @@
-
- Klass* klass_at(int which, TRAPS) {
- constantPoolHandle h_this(THREAD, this);
-- return klass_at_impl(h_this, which, CHECK_NULL);
-+ return klass_at_impl(h_this, which, THREAD);
- }
-
- Symbol* klass_name_at(int which) const; // Returns the name, w/o resolving.
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
-@@ -4244,7 +4244,7 @@
- JVM_DTraceProvider* providers))
- JVMWrapper("JVM_DTraceActivate");
- return DTraceJSDT::activate(
-- version, module_name, providers_count, providers, CHECK_0);
-+ version, module_name, providers_count, providers, THREAD);
- JVM_END
-
- JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method))
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp openjdk/hotspot/src/share/vm/runtime/reflection.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/reflection.cpp
-@@ -1093,7 +1093,7 @@
- } else {
- if (rtype == T_BOOLEAN || rtype == T_BYTE || rtype == T_CHAR || rtype == T_SHORT)
- narrow((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
-- return box((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
-+ return box((jvalue*) result.get_value_addr(), rtype, THREAD);
- }
- }
-
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
-@@ -1046,7 +1046,7 @@
- // last java frame on stack (which includes native call frames)
- vframeStream vfst(thread, true); // Do not skip and javaCalls
-
-- return find_callee_info_helper(thread, vfst, bc, callinfo, CHECK_(Handle()));
-+ return find_callee_info_helper(thread, vfst, bc, callinfo, THREAD);
- }
-
-
-diff --git openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp openjdk/hotspot/src/share/vm/services/memTracker.hpp
---- openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp
-+++ openjdk/hotspot/src/share/vm/services/memTracker.hpp
-@@ -64,7 +64,7 @@
- const NativeCallStack& stack, MEMFLAGS flag = mtNone) { }
- static inline void record_virtual_memory_commit(void* addr, size_t size, const NativeCallStack& stack) { }
- static inline Tracker get_virtual_memory_uncommit_tracker() { return Tracker(); }
-- static inline Tracker get_virtual_memory_release_tracker() { }
-+ static inline Tracker get_virtual_memory_release_tracker() { return Tracker(); }
- static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { }
- static inline void record_thread_stack(void* addr, size_t size) { }
- static inline void release_thread_stack(void* addr, size_t size) { }
diff --git a/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch b/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
deleted file mode 100644
index 5f6d9ce..0000000
--- a/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1518667645 0
-# Thu Feb 15 04:07:25 2018 +0000
-# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041
-# Parent 999983606f5c61b093c6f6316a7b26c4cd4ca79e
-8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
-Reviewed-by: aph
-
-diff --git openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-@@ -457,6 +457,7 @@
- long long unsigned int oldval,
- long long unsigned int newval) {
- ShouldNotCallThis();
-+ return 0;
- }
- };
- #endif // !_LP64
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-@@ -498,6 +498,7 @@
- long long unsigned int oldval,
- long long unsigned int newval) {
- ShouldNotCallThis();
-+ return 0;
- }
- };
- #endif // !_LP64
diff --git a/jdk8254177-tzdata2020b.patch b/jdk8254177-tzdata2020b.patch
deleted file mode 100644
index abd9131..0000000
--- a/jdk8254177-tzdata2020b.patch
+++ /dev/null
@@ -1,3849 +0,0 @@
-diff --git openjdk.orig/jdk/make/data/tzdata/VERSION openjdk/jdk/make/data/tzdata/VERSION
---- openjdk.orig/jdk/make/data/tzdata/VERSION
-+++ openjdk/jdk/make/data/tzdata/VERSION
-@@ -21,4 +21,4 @@
- # or visit www.oracle.com if you need additional information or have any
- # questions.
- #
--tzdata2020a
-+tzdata2020b
-diff --git openjdk.orig/jdk/make/data/tzdata/africa openjdk/jdk/make/data/tzdata/africa
---- openjdk.orig/jdk/make/data/tzdata/africa
-+++ openjdk/jdk/make/data/tzdata/africa
-@@ -87,7 +87,7 @@
- # Corrections are welcome.
-
- # Algeria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Algeria 1916 only - Jun 14 23:00s 1:00 S
- Rule Algeria 1916 1919 - Oct Sun>=1 23:00s 0 -
- Rule Algeria 1917 only - Mar 24 23:00s 1:00 S
-@@ -110,10 +110,9 @@
- Rule Algeria 1978 only - Sep 22 3:00 0 -
- Rule Algeria 1980 only - Apr 25 0:00 1:00 S
- Rule Algeria 1980 only - Oct 31 2:00 0 -
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
-+# See Europe/Paris for PMT-related transitions.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01
-+Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 16
- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
- 0:00 Algeria WE%sT 1940 Feb 25 2:00
- 1:00 Algeria CE%sT 1946 Oct 7
-@@ -199,7 +198,7 @@
- # Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this
- # did not apply to Cairo, Alexandria, or Port Said.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Egypt 1940 only - Jul 15 0:00 1:00 S
- Rule Egypt 1940 only - Oct 1 0:00 0 -
- Rule Egypt 1941 only - Apr 15 0:00 1:00 S
-@@ -434,7 +433,7 @@
- # now Ghana observed different DST regimes in different years. For
- # lack of better info, use Shanks except treat the minus sign as a
- # typo, and assume DST started in 1920 not 1936.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Ghana 1920 1942 - Sep 1 0:00 0:20 -
- Rule Ghana 1920 1942 - Dec 31 0:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -524,7 +523,7 @@
- # From Paul Eggert (2013-10-25):
- # For now, assume they're reverting to the pre-2012 rules of permanent UT +02.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Libya 1951 only - Oct 14 2:00 1:00 S
- Rule Libya 1952 only - Jan 1 0:00 0 -
- Rule Libya 1953 only - Oct 9 2:00 1:00 S
-@@ -647,7 +646,7 @@
- # "The trial ended on March 29, 2009, when the clocks moved back by one hour
- # at 2am (or 02:00) local time..."
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mauritius 1982 only - Oct 10 0:00 1:00 -
- Rule Mauritius 1983 only - Mar 21 0:00 0 -
- Rule Mauritius 2008 only - Oct lastSun 2:00 1:00 -
-@@ -898,17 +897,30 @@
- # https://maroc-diplomatique.net/maroc-le-retour-a-lheure-gmt-est-prevu-dim...
- # http://aujourdhui.ma/actualite/gmt1-retour-a-lheure-normale-dimanche-proc...
- #
--# From Paul Eggert (2020-04-14):
-+# From Milamber (2020-05-31)
-+# In Morocco (where I live), the end of Ramadan (Arabic month) is followed by
-+# the Eid al-Fitr, and concretely it's 1 or 2 day offs for the people (with
-+# traditional visiting of family, big lunches/dinners, etc.). So for this
-+# year the astronomical calculations don't include the following 2 days off in
-+# the calc. These 2 days fall in a Sunday/Monday, so it's not acceptable by
-+# people to have a time shift during these 2 days off. Perhaps you can modify
-+# the (predicted) rules for next years: if the end of Ramadan is a (probable)
-+# Friday or Saturday (and so the 2 days off are on a weekend), the next time
-+# shift will be the next weekend.
-+#
-+# From Paul Eggert (2020-05-31):
- # For now, guess that in the future Morocco will fall back at 03:00
- # the last Sunday before Ramadan, and spring forward at 02:00 the
--# first Sunday after the day after Ramadan. To implement this,
--# transition dates for 2021 through 2087 were determined by running
--# the following program under GNU Emacs 26.3.
--# (let ((islamic-year 1442))
-+# first Sunday after two days after Ramadan. To implement this,
-+# transition dates and times for 2019 through 2087 were determined by
-+# running the following program under GNU Emacs 26.3. (This algorithm
-+# also produces the correct transition dates for 2016 through 2018,
-+# though the times differ due to Morocco's time zone change in 2018.)
-+# (let ((islamic-year 1440))
- # (require 'cal-islam)
- # (while (< islamic-year 1511)
- # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
--# (b (1+ (calendar-islamic-to-absolute (list 10 1 islamic-year))))
-+# (b (+ 2 (calendar-islamic-to-absolute (list 10 1 islamic-year))))
- # (sunday 0))
- # (while (/= sunday (mod (setq a (1- a)) 7)))
- # (while (/= sunday (mod b 7))
-@@ -923,7 +935,7 @@
- # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
- # (setq islamic-year (+ 1 islamic-year))))
-
--# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Morocco 1939 only - Sep 12 0:00 1:00 -
- Rule Morocco 1939 only - Nov 19 0:00 0 -
- Rule Morocco 1940 only - Feb 25 0:00 1:00 -
-@@ -974,7 +986,7 @@
- Rule Morocco 2022 only - Mar 27 3:00 0 -
- Rule Morocco 2022 only - May 8 2:00 1:00 -
- Rule Morocco 2023 only - Mar 19 3:00 0 -
--Rule Morocco 2023 only - Apr 23 2:00 1:00 -
-+Rule Morocco 2023 only - Apr 30 2:00 1:00 -
- Rule Morocco 2024 only - Mar 10 3:00 0 -
- Rule Morocco 2024 only - Apr 14 2:00 1:00 -
- Rule Morocco 2025 only - Feb 23 3:00 0 -
-@@ -990,7 +1002,7 @@
- Rule Morocco 2029 only - Dec 30 3:00 0 -
- Rule Morocco 2030 only - Feb 10 2:00 1:00 -
- Rule Morocco 2030 only - Dec 22 3:00 0 -
--Rule Morocco 2031 only - Jan 26 2:00 1:00 -
-+Rule Morocco 2031 only - Feb 2 2:00 1:00 -
- Rule Morocco 2031 only - Dec 14 3:00 0 -
- Rule Morocco 2032 only - Jan 18 2:00 1:00 -
- Rule Morocco 2032 only - Nov 28 3:00 0 -
-@@ -1006,7 +1018,7 @@
- Rule Morocco 2037 only - Oct 4 3:00 0 -
- Rule Morocco 2037 only - Nov 15 2:00 1:00 -
- Rule Morocco 2038 only - Sep 26 3:00 0 -
--Rule Morocco 2038 only - Oct 31 2:00 1:00 -
-+Rule Morocco 2038 only - Nov 7 2:00 1:00 -
- Rule Morocco 2039 only - Sep 18 3:00 0 -
- Rule Morocco 2039 only - Oct 23 2:00 1:00 -
- Rule Morocco 2040 only - Sep 2 3:00 0 -
-@@ -1022,7 +1034,7 @@
- Rule Morocco 2045 only - Jul 9 3:00 0 -
- Rule Morocco 2045 only - Aug 20 2:00 1:00 -
- Rule Morocco 2046 only - Jul 1 3:00 0 -
--Rule Morocco 2046 only - Aug 5 2:00 1:00 -
-+Rule Morocco 2046 only - Aug 12 2:00 1:00 -
- Rule Morocco 2047 only - Jun 23 3:00 0 -
- Rule Morocco 2047 only - Jul 28 2:00 1:00 -
- Rule Morocco 2048 only - Jun 7 3:00 0 -
-@@ -1038,7 +1050,7 @@
- Rule Morocco 2053 only - Apr 13 3:00 0 -
- Rule Morocco 2053 only - May 25 2:00 1:00 -
- Rule Morocco 2054 only - Apr 5 3:00 0 -
--Rule Morocco 2054 only - May 10 2:00 1:00 -
-+Rule Morocco 2054 only - May 17 2:00 1:00 -
- Rule Morocco 2055 only - Mar 28 3:00 0 -
- Rule Morocco 2055 only - May 2 2:00 1:00 -
- Rule Morocco 2056 only - Mar 12 3:00 0 -
-@@ -1054,7 +1066,7 @@
- Rule Morocco 2061 only - Jan 16 3:00 0 -
- Rule Morocco 2061 only - Feb 27 2:00 1:00 -
- Rule Morocco 2062 only - Jan 8 3:00 0 -
--Rule Morocco 2062 only - Feb 12 2:00 1:00 -
-+Rule Morocco 2062 only - Feb 19 2:00 1:00 -
- Rule Morocco 2062 only - Dec 31 3:00 0 -
- Rule Morocco 2063 only - Feb 4 2:00 1:00 -
- Rule Morocco 2063 only - Dec 16 3:00 0 -
-@@ -1070,7 +1082,7 @@
- Rule Morocco 2068 only - Oct 21 3:00 0 -
- Rule Morocco 2068 only - Dec 2 2:00 1:00 -
- Rule Morocco 2069 only - Oct 13 3:00 0 -
--Rule Morocco 2069 only - Nov 17 2:00 1:00 -
-+Rule Morocco 2069 only - Nov 24 2:00 1:00 -
- Rule Morocco 2070 only - Oct 5 3:00 0 -
- Rule Morocco 2070 only - Nov 9 2:00 1:00 -
- Rule Morocco 2071 only - Sep 20 3:00 0 -
-@@ -1086,7 +1098,7 @@
- Rule Morocco 2076 only - Jul 26 3:00 0 -
- Rule Morocco 2076 only - Sep 6 2:00 1:00 -
- Rule Morocco 2077 only - Jul 18 3:00 0 -
--Rule Morocco 2077 only - Aug 22 2:00 1:00 -
-+Rule Morocco 2077 only - Aug 29 2:00 1:00 -
- Rule Morocco 2078 only - Jul 10 3:00 0 -
- Rule Morocco 2078 only - Aug 14 2:00 1:00 -
- Rule Morocco 2079 only - Jun 25 3:00 0 -
-@@ -1096,13 +1108,13 @@
- Rule Morocco 2081 only - Jun 1 3:00 0 -
- Rule Morocco 2081 only - Jul 13 2:00 1:00 -
- Rule Morocco 2082 only - May 24 3:00 0 -
--Rule Morocco 2082 only - Jun 28 2:00 1:00 -
-+Rule Morocco 2082 only - Jul 5 2:00 1:00 -
- Rule Morocco 2083 only - May 16 3:00 0 -
- Rule Morocco 2083 only - Jun 20 2:00 1:00 -
- Rule Morocco 2084 only - Apr 30 3:00 0 -
- Rule Morocco 2084 only - Jun 11 2:00 1:00 -
- Rule Morocco 2085 only - Apr 22 3:00 0 -
--Rule Morocco 2085 only - May 27 2:00 1:00 -
-+Rule Morocco 2085 only - Jun 3 2:00 1:00 -
- Rule Morocco 2086 only - Apr 14 3:00 0 -
- Rule Morocco 2086 only - May 19 2:00 1:00 -
- Rule Morocco 2087 only - Mar 30 3:00 0 -
-@@ -1203,7 +1215,7 @@
- # Use plain "WAT" and "CAT" for the time zone abbreviations, to be compatible
- # with Namibia's neighbors.
-
--# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Vanguard section, for zic and other parsers that support negative DST.
- #Rule Namibia 1994 only - Mar 21 0:00 -1:00 WAT
- #Rule Namibia 1994 2017 - Sep Sun>=1 2:00 0 CAT
-@@ -1326,7 +1338,7 @@
- # See Africa/Nairobi.
-
- # South Africa
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule SA 1942 1943 - Sep Sun>=15 2:00 1:00 -
- Rule SA 1943 1944 - Mar Sun>=15 2:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1359,7 +1371,7 @@
- # Abdalla of NTC, archived at:
- # https://mm.icann.org/pipermail/tz/2017-October/025333.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Sudan 1970 only - May 1 0:00 1:00 S
- Rule Sudan 1970 1985 - Oct 15 0:00 0 -
- Rule Sudan 1971 only - Apr 30 0:00 1:00 S
-@@ -1447,7 +1459,7 @@
- # http://www.almadenahnews.com/newss/news.php?c=118&id=38036
- # http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Tunisia 1939 only - Apr 15 23:00s 1:00 S
- Rule Tunisia 1939 only - Nov 18 23:00s 0 -
- Rule Tunisia 1940 only - Feb 25 23:00s 1:00 S
-@@ -1474,9 +1486,7 @@
- Rule Tunisia 2006 2008 - Mar lastSun 2:00s 1:00 S
- Rule Tunisia 2006 2008 - Oct lastSun 2:00s 0 -
-
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
--# Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
-+# See Europe/Paris for PMT-related transitions.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
- Zone Africa/Tunis 0:40:44 - LMT 1881 May 12
- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
-diff --git openjdk.orig/jdk/make/data/tzdata/antarctica openjdk/jdk/make/data/tzdata/antarctica
---- openjdk.orig/jdk/make/data/tzdata/antarctica
-+++ openjdk/jdk/make/data/tzdata/antarctica
-@@ -93,15 +93,30 @@
- # Australian Antarctica Division informed us that Casey changed time
- # zone to UTC+11 in "the morning of 22nd October 2016".
-
-+# From Steffen Thorsen (2020-10-02, as corrected):
-+# Based on information we have received from the Australian Antarctic
-+# Division, Casey station and Macquarie Island station will move to Tasmanian
-+# daylight savings time on Sunday 4 October. This will take effect from 0001
-+# hrs on Sunday 4 October 2020 and will mean Casey and Macquarie Island will
-+# be on the same time zone as Hobart. Some past dates too for this 3 hour
-+# time change back and forth between UTC+8 and UTC+11 for Casey:
-+# - 2018 Oct 7 4:00 - 2019 Mar 17 3:00 - 2019 Oct 4 3:00 - 2020 Mar 8 3:00
-+# and now - 2020 Oct 4 0:01
-+
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Antarctica/Casey 0 - -00 1969
-- 8:00 - +08 2009 Oct 18 2:00
-+Zone Antarctica/Casey 0 - -00 1969
-+ 8:00 - +08 2009 Oct 18 2:00
- 11:00 - +11 2010 Mar 5 2:00
-- 8:00 - +08 2011 Oct 28 2:00
-+ 8:00 - +08 2011 Oct 28 2:00
- 11:00 - +11 2012 Feb 21 17:00u
-- 8:00 - +08 2016 Oct 22
-+ 8:00 - +08 2016 Oct 22
- 11:00 - +11 2018 Mar 11 4:00
-- 8:00 - +08
-+ 8:00 - +08 2018 Oct 7 4:00
-+ 11:00 - +11 2019 Mar 17 3:00
-+ 8:00 - +08 2019 Oct 4 3:00
-+ 11:00 - +11 2020 Mar 8 3:00
-+ 8:00 - +08 2020 Oct 4 0:01
-+ 11:00 - +11
- Zone Antarctica/Davis 0 - -00 1957 Jan 13
- 7:00 - +07 1964 Nov
- 0 - -00 1969 Feb
-@@ -247,7 +262,7 @@
- # suggested by Bengt-Inge Larsson comment them out for now, and approximate
- # with only UTC and CEST. Uncomment them when 2014b is more prevalent.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- #Rule Troll 2005 max - Mar 1 1:00u 1:00 +01
- Rule Troll 2005 max - Mar lastSun 1:00u 2:00 +02
- #Rule Troll 2005 max - Oct lastSun 1:00u 1:00 +01
-diff --git openjdk.orig/jdk/make/data/tzdata/asia openjdk/jdk/make/data/tzdata/asia
---- openjdk.orig/jdk/make/data/tzdata/asia
-+++ openjdk/jdk/make/data/tzdata/asia
-@@ -93,7 +93,7 @@
- ###############################################################################
-
- # These rules are stolen from the 'europe' file.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EUAsia 1981 max - Mar lastSun 1:00u 1:00 S
- Rule EUAsia 1979 1995 - Sep lastSun 1:00u 0 -
- Rule EUAsia 1996 max - Oct lastSun 1:00u 0 -
-@@ -137,7 +137,7 @@
- # or
- # (brief)
- # http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Armenia 2011 only - Mar lastSun 2:00s 1:00 -
- Rule Armenia 2011 only - Oct lastSun 2:00s 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -163,7 +163,7 @@
- # http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-d...
- # http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Azer 1997 2015 - Mar lastSun 4:00 1:00 -
- Rule Azer 1997 2015 - Oct lastSun 5:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -250,7 +250,7 @@
- # http://www.thedailystar.net/newDesign/latest_news.php?nid=22817
- # http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Dhaka 2009 only - Jun 19 23:00 1:00 -
- Rule Dhaka 2009 only - Dec 31 24:00 0 -
-
-@@ -326,7 +326,7 @@
- # generally esteemed a success, it was announced early in 1920 that it would
- # not be repeated."
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Shang 1919 only - Apr 12 24:00 1:00 D
- Rule Shang 1919 only - Sep 30 24:00 0 S
-
-@@ -422,7 +422,7 @@
- # the Yangtze river delta area during that period of time although the scope
- # of such use will need to be investigated to determine.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Shang 1940 only - Jun 1 0:00 1:00 D
- Rule Shang 1940 only - Oct 12 24:00 0 S
- Rule Shang 1941 only - Mar 15 0:00 1:00 D
-@@ -485,7 +485,7 @@
- # to begin on 17 April.
- # http://data.people.com.cn/pic/101p/1988/04/1988041201.jpg
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule PRC 1986 only - May 4 2:00 1:00 D
- Rule PRC 1986 1991 - Sep Sun>=11 2:00 0 S
- Rule PRC 1987 1991 - Apr Sun>=11 2:00 1:00 D
-@@ -869,7 +869,7 @@
- # or dates for the 1942 and 1945 transitions.
- # The Japanese occupation of Hong Kong began 1941-12-25.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule HK 1946 only - Apr 21 0:00 1:00 S
- Rule HK 1946 only - Dec 1 3:30s 0 -
- Rule HK 1947 only - Apr 13 3:30s 1:00 S
-@@ -996,7 +996,7 @@
- # until 1945-09-21 at 01:00, overriding Shanks & Pottenger.
- # Likewise, use Yu-Cheng Chuang's data for DST in Taiwan.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Taiwan 1946 only - May 15 0:00 1:00 D
- Rule Taiwan 1946 only - Oct 1 0:00 0 S
- Rule Taiwan 1947 only - Apr 15 0:00 1:00 D
-@@ -1122,7 +1122,7 @@
- # The 1904 decree says that Macau changed from the meridian of
- # Fortaleza do Monte, presumably the basis for the 7:34:10 for LMT.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Macau 1942 1943 - Apr 30 23:00 1:00 -
- Rule Macau 1942 only - Nov 17 23:00 0 -
- Rule Macau 1943 only - Sep 30 23:00 0 S
-@@ -1180,7 +1180,7 @@
- # Cyprus to remain united in time. Cyprus Mail 2017-10-17.
- # https://cyprus-mail.com/2017/10/17/cyprus-remain-united-time/
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cyprus 1975 only - Apr 13 0:00 1:00 S
- Rule Cyprus 1975 only - Oct 12 0:00 0 -
- Rule Cyprus 1976 only - May 15 0:00 1:00 S
-@@ -1557,7 +1557,7 @@
- # be changed back to its previous state on the 24 hours of the
- # thirtieth day of Shahrivar.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iran 1978 1980 - Mar 20 24:00 1:00 -
- Rule Iran 1978 only - Oct 20 24:00 0 -
- Rule Iran 1979 only - Sep 18 24:00 0 -
-@@ -1699,7 +1699,7 @@
- # We have published a short article in English about the change:
- # https://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iraq 1982 only - May 1 0:00 1:00 -
- Rule Iraq 1982 1984 - Oct 1 0:00 0 -
- Rule Iraq 1983 only - Mar 31 0:00 1:00 -
-@@ -1722,6 +1722,10 @@
-
- # Israel
-
-+# For more info about the motivation for DST in Israel, see:
-+# Barak Y. Israel's Daylight Saving Time controversy. Israel Affairs.
-+# 2020-08-11. https://doi.org/10.1080/13537121.2020.1806564
-+
- # From Ephraim Silverberg (2001-01-11):
- #
- # I coined "IST/IDT" circa 1988. Until then there were three
-@@ -1743,7 +1747,7 @@
- # family is from India).
-
- # From Shanks & Pottenger:
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1940 only - Jun 1 0:00 1:00 D
- Rule Zion 1942 1944 - Nov 1 0:00 0 S
- Rule Zion 1943 only - Apr 1 2:00 1:00 D
-@@ -1835,7 +1839,7 @@
- # (except in 2002) is three nights before Yom Kippur [Day of Atonement]
- # (the eve of the 7th of Tishrei in the lunar Hebrew calendar).
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1989 only - Apr 30 0:00 1:00 D
- Rule Zion 1989 only - Sep 3 0:00 0 S
- Rule Zion 1990 only - Mar 25 0:00 1:00 D
-@@ -1851,7 +1855,7 @@
- # Ministry of Interior, Jerusalem, Israel. The spokeswoman can be reached by
- # calling the office directly at 972-2-6701447 or 972-2-6701448.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1994 only - Apr 1 0:00 1:00 D
- Rule Zion 1994 only - Aug 28 0:00 0 S
- Rule Zion 1995 only - Mar 31 0:00 1:00 D
-@@ -1871,7 +1875,7 @@
- #
- # where YYYY is the relevant year.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1996 only - Mar 15 0:00 1:00 D
- Rule Zion 1996 only - Sep 16 0:00 0 S
- Rule Zion 1997 only - Mar 21 0:00 1:00 D
-@@ -1894,7 +1898,7 @@
- #
- # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2000-2004.ps.gz
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2000 only - Apr 14 2:00 1:00 D
- Rule Zion 2000 only - Oct 6 1:00 0 S
- Rule Zion 2001 only - Apr 9 1:00 1:00 D
-@@ -1916,7 +1920,7 @@
- #
- # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2005 2012 - Apr Fri<=1 2:00 1:00 D
- Rule Zion 2005 only - Oct 9 2:00 0 S
- Rule Zion 2006 only - Oct 1 2:00 0 S
-@@ -1936,7 +1940,7 @@
- # As of 2013, DST starts at 02:00 on the Friday before the last Sunday
- # in March. DST ends at 02:00 on the last Sunday of October.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D
- Rule Zion 2013 max - Oct lastSun 2:00 0 S
-
-@@ -2036,7 +2040,7 @@
- # do in any POSIX or C platform. The "25:00" assumes zic from 2007 or later,
- # which should be safe now.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Japan 1948 only - May Sat>=1 24:00 1:00 D
- Rule Japan 1948 1951 - Sep Sun>=9 1:00 0 S
- Rule Japan 1949 only - Apr Sat>=1 24:00 1:00 D
-@@ -2113,7 +2117,7 @@
- # From Paul Eggert (2013-12-11):
- # As Steffen suggested, consider the past 21-month experiment to be DST.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Jordan 1973 only - Jun 6 0:00 1:00 S
- Rule Jordan 1973 1975 - Oct 1 0:00 0 -
- Rule Jordan 1974 1977 - May 1 0:00 1:00 S
-@@ -2439,7 +2443,7 @@
- # Our government cancels daylight saving time 6th of August 2005.
- # From 2005-08-12 our GMT-offset is +6, w/o any daylight saving.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Kyrgyz 1992 1996 - Apr Sun>=7 0:00s 1:00 -
- Rule Kyrgyz 1992 1996 - Sep lastSun 0:00 0 -
- Rule Kyrgyz 1997 2005 - Mar lastSun 2:30 1:00 -
-@@ -2495,7 +2499,7 @@
- # follow and continued to use GMT+9:00 for interoperability.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule ROK 1948 only - Jun 1 0:00 1:00 D
- Rule ROK 1948 only - Sep 12 24:00 0 S
- Rule ROK 1949 only - Apr 3 0:00 1:00 D
-@@ -2583,7 +2587,7 @@
-
-
- # Lebanon
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Lebanon 1920 only - Mar 28 0:00 1:00 S
- Rule Lebanon 1920 only - Oct 25 0:00 0 -
- Rule Lebanon 1921 only - Apr 3 0:00 1:00 S
-@@ -2613,7 +2617,7 @@
- 2:00 Lebanon EE%sT
-
- # Malaysia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NBorneo 1935 1941 - Sep 14 0:00 0:20 -
- Rule NBorneo 1935 1941 - Dec 14 0:00 0 -
- #
-@@ -2758,7 +2762,7 @@
- # September daylight saving time ends. Source:
- # http://zasag.mn/news/view/8969
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mongol 1983 1984 - Apr 1 0:00 1:00 -
- Rule Mongol 1983 only - Oct 1 0:00 0 -
- # Shanks & Pottenger and IATA SSIM say 1990s switches occurred at 00:00,
-@@ -2946,7 +2950,7 @@
- # "People laud PM's announcement to end DST"
- # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Pakistan 2002 only - Apr Sun>=2 0:00 1:00 S
- Rule Pakistan 2002 only - Oct Sun>=2 0:00 0 -
- Rule Pakistan 2008 only - Jun 1 0:00 1:00 S
-@@ -3248,7 +3252,7 @@
- # From Tim Parenti (2016-10-19):
- # Predict fall transitions on October's last Saturday at 01:00 from now on.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
- Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
- Rule EgyptAsia 1958 only - May 1 0:00 1:00 S
-@@ -3348,7 +3352,7 @@
- # influence of the sources. There is no current abbreviation for DST,
- # so use "PDT", the usual American style.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Phil 1936 only - Nov 1 0:00 1:00 D
- Rule Phil 1937 only - Feb 1 0:00 0 S
- Rule Phil 1954 only - Apr 12 0:00 1:00 D
-@@ -3496,7 +3500,7 @@
- 5:30 - +0530
-
- # Syria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Syria 1920 1923 - Apr Sun>=15 2:00 1:00 S
- Rule Syria 1920 1923 - Oct Sun>=1 2:00 0 -
- Rule Syria 1962 only - Apr 29 2:00 1:00 S
-diff --git openjdk.orig/jdk/make/data/tzdata/australasia openjdk/jdk/make/data/tzdata/australasia
---- openjdk.orig/jdk/make/data/tzdata/australasia
-+++ openjdk/jdk/make/data/tzdata/australasia
-@@ -36,7 +36,7 @@
-
- # Please see the notes below for the controversy about "EST" versus "AEST" etc.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Aus 1917 only - Jan 1 0:01 1:00 D
- Rule Aus 1917 only - Mar 25 2:00 0 S
- Rule Aus 1942 only - Jan 1 2:00 1:00 D
-@@ -55,7 +55,7 @@
- 9:30 Aus AC%sT
- # Western Australia
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AW 1974 only - Oct lastSun 2:00s 1:00 D
- Rule AW 1975 only - Mar Sun>=1 2:00s 0 S
- Rule AW 1983 only - Oct lastSun 2:00s 1:00 D
-@@ -93,7 +93,7 @@
- # applies to all of the Whitsundays.
- # http://www.australia.gov.au/about-australia/australian-story/austn-islands
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AQ 1971 only - Oct lastSun 2:00s 1:00 D
- Rule AQ 1972 only - Feb lastSun 2:00s 0 S
- Rule AQ 1989 1991 - Oct lastSun 2:00s 1:00 D
-@@ -109,7 +109,7 @@
- 10:00 Holiday AE%sT
-
- # South Australia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AS 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AS 1986 only - Oct 19 2:00s 1:00 D
- Rule AS 1987 2007 - Oct lastSun 2:00s 1:00 D
-@@ -137,7 +137,7 @@
- # http://www.bom.gov.au/climate/averages/tables/dst_times.shtml
- # says King Island didn't observe DST from WWII until late 1971.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AT 1967 only - Oct Sun>=1 2:00s 1:00 D
- Rule AT 1968 only - Mar lastSun 2:00s 0 S
- Rule AT 1968 1985 - Oct lastSun 2:00s 1:00 D
-@@ -170,7 +170,7 @@
- 10:00 AT AE%sT
-
- # Victoria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AV 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AV 1972 only - Feb lastSun 2:00s 0 S
- Rule AV 1973 1985 - Mar Sun>=1 2:00s 0 S
-@@ -191,7 +191,7 @@
- 10:00 AV AE%sT
-
- # New South Wales
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AN 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AN 1972 only - Feb 27 2:00s 0 S
- Rule AN 1973 1981 - Mar Sun>=1 2:00s 0 S
-@@ -220,7 +220,7 @@
- 9:30 AS AC%sT
-
- # Lord Howe Island
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule LH 1981 1984 - Oct lastSun 2:00 1:00 -
- Rule LH 1982 1985 - Mar Sun>=1 2:00 0 -
- Rule LH 1985 only - Oct lastSun 2:00 0:30 -
-@@ -275,8 +275,9 @@
- 10:00 Aus AE%sT 1919 Apr 1 0:00s
- 0 - -00 1948 Mar 25
- 10:00 Aus AE%sT 1967
-- 10:00 AT AE%sT 2010 Apr 4 3:00
-- 11:00 - +11
-+ 10:00 AT AE%sT 2010
-+ 10:00 1:00 AEDT 2011
-+ 10:00 AT AE%sT
-
- # Christmas
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -403,7 +404,7 @@
- # From Michael Deckers (2019-08-06):
- # https://www.laws.gov.fj/LawsAsMade/downloadfile/848
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 -
- Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
- Rule Fiji 2009 only - Nov 29 2:00 1:00 -
-@@ -432,7 +433,7 @@
-
- # Guam
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # http://guamlegislature.com/Public_Laws_5th/PL05-025.pdf
- # http://documents.guam.gov/wp-content/uploads/E.O.-59-7-Guam-Daylight-Savi...
- Rule Guam 1959 only - Jun 27 2:00 1:00 D
-@@ -543,7 +544,7 @@
- 12:00 - +12
-
- # New Caledonia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NC 1977 1978 - Dec Sun>=1 0:00 1:00 -
- Rule NC 1978 1979 - Feb 27 0:00 0 -
- Rule NC 1996 only - Dec 1 2:00s 1:00 -
-@@ -558,7 +559,7 @@
-
- # New Zealand
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NZ 1927 only - Nov 6 2:00 1:00 S
- Rule NZ 1928 only - Mar 4 2:00 0 M
- Rule NZ 1928 1933 - Oct Sun>=8 2:00 0:30 S
-@@ -610,7 +611,7 @@
-
- # Cook Is
- # From Shanks & Pottenger:
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cook 1978 only - Nov 12 0:00 0:30 -
- Rule Cook 1979 1991 - Mar Sun>=1 0:00 0 -
- Rule Cook 1979 1990 - Oct lastSun 0:00 0:30 -
-@@ -755,7 +756,7 @@
- # That web page currently lists transitions for 2012/3 and 2013/4.
- # Assume the pattern instituted in 2012 will continue indefinitely.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule WS 2010 only - Sep lastSun 0:00 1 -
- Rule WS 2011 only - Apr Sat>=1 4:00 0 -
- Rule WS 2011 only - Sep lastSat 3:00 1 -
-@@ -799,7 +800,7 @@
- 13:00 - +13
-
- # Tonga
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Tonga 1999 only - Oct 7 2:00s 1:00 -
- Rule Tonga 2000 only - Mar 19 2:00s 0 -
- Rule Tonga 2000 2001 - Nov Sun>=1 2:00 1:00 -
-@@ -880,7 +881,7 @@
-
-
- # Vanuatu
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Vanuatu 1983 only - Sep 25 0:00 1:00 -
- Rule Vanuatu 1984 1991 - Mar Sun>=23 0:00 0 -
- Rule Vanuatu 1984 only - Oct 23 0:00 1:00 -
-diff --git openjdk.orig/jdk/make/data/tzdata/europe openjdk/jdk/make/data/tzdata/europe
---- openjdk.orig/jdk/make/data/tzdata/europe
-+++ openjdk/jdk/make/data/tzdata/europe
-@@ -411,7 +411,7 @@
- # http://www.irishstatutebook.ie/eli/1926/sro/919/made/en/print
- # http://www.irishstatutebook.ie/eli/1947/sro/71/made/en/print
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Summer Time Act, 1916
- Rule GB-Eire 1916 only - May 21 2:00s 1:00 BST
- Rule GB-Eire 1916 only - Oct 1 2:00s 0 GMT
-@@ -552,7 +552,7 @@
- # The following is like GB-Eire and EU, except with standard time in
- # summer and negative daylight saving time in winter. It is for when
- # negative SAVE values are used.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- #Rule Eire 1971 only - Oct 31 2:00u -1:00 -
- #Rule Eire 1972 1980 - Mar Sun>=16 2:00u 0 -
- #Rule Eire 1972 1980 - Oct Sun>=23 2:00u -1:00 -
-@@ -589,7 +589,7 @@
- # predecessor organization, the European Communities.
- # For brevity they are called "EU rules" elsewhere in this file.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EU 1977 1980 - Apr Sun>=1 1:00u 1:00 S
- Rule EU 1977 only - Sep lastSun 1:00u 0 -
- Rule EU 1978 only - Oct 1 1:00u 0 -
-@@ -629,13 +629,13 @@
- # corrected in version 2008d). The circumstantial evidence is simply the
- # tz database itself, as seen below:
- #
--# Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
-+# Zone Europe/Paris ...
- # 0:00 France WE%sT 1945 Sep 16 3:00
- #
--# Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
-+# Zone Europe/Monaco ...
- # 0:00 France WE%sT 1945 Sep 16 3:00
- #
--# Zone Europe/Belgrade 1:22:00 - LMT 1884
-+# Zone Europe/Belgrade ...
- # 1:00 1:00 CEST 1945 Sep 16 2:00s
- #
- # Rule France 1945 only - Sep 16 3:00 0 -
-@@ -681,7 +681,7 @@
- #
- # The 1917-1921 decree URLs are from Alexander Belopolsky (2016-08-23).
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Russia 1917 only - Jul 1 23:00 1:00 MST # Moscow Summer Time
- #
- # Decree No. 142 (1917-12-22) http://istmat.info/node/28137
-@@ -795,7 +795,7 @@
-
-
- # Albania
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Albania 1940 only - Jun 16 0:00 1:00 S
- Rule Albania 1942 only - Nov 2 3:00 0 -
- Rule Albania 1943 only - Mar 29 2:00 1:00 S
-@@ -849,7 +849,7 @@
- # In 1946 the end of DST was on Monday, 7 October 1946, at 3:00 am.
- # Shanks had this right. Source: Die Weltpresse, 5. Oktober 1946, page 5.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Austria 1920 only - Apr 5 2:00s 1:00 S
- Rule Austria 1920 only - Sep 13 2:00s 0 -
- Rule Austria 1946 only - Apr 14 2:00s 1:00 S
-@@ -936,7 +936,7 @@
- # The 1918 rules are listed for completeness; they apply to unoccupied Belgium.
- # Assume Brussels switched to WET in 1918 when the armistice took effect.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Belgium 1918 only - Mar 9 0:00s 1:00 S
- Rule Belgium 1918 1919 - Oct Sat>=1 23:00s 0 -
- Rule Belgium 1919 only - Mar 1 23:00s 1:00 S
-@@ -996,7 +996,7 @@
- # EET -> EETDST is in 03:00 Local time in last Sunday of March ...
- # EETDST -> EET is in 04:00 Local time in last Sunday of October
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Bulg 1979 only - Mar 31 23:00 1:00 S
- Rule Bulg 1979 only - Oct 1 1:00 0 -
- Rule Bulg 1980 1982 - Apr Sat>=1 23:00 1:00 S
-@@ -1028,7 +1028,7 @@
- # We know of no English-language name for historical Czech winter time;
- # abbreviate it as "GMT", as it happened to be GMT.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Czech 1945 only - Apr Mon>=1 2:00s 1:00 S
- Rule Czech 1945 only - Oct 1 2:00s 0 -
- Rule Czech 1946 only - May 6 2:00s 1:00 S
-@@ -1084,7 +1084,7 @@
- # Hence the "02:00" of the 1980 law refers to standard time, not
- # wall-clock time, and so the EU rules were in effect in 1980.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Denmark 1916 only - May 14 23:00 1:00 S
- Rule Denmark 1916 only - Sep 30 23:00 0 -
- Rule Denmark 1940 only - May 15 0:00 1:00 S
-@@ -1186,7 +1186,7 @@
- # http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-t...
- # It is their only National Park.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D
- Rule Thule 1991 1992 - Sep lastSun 2:00 0 S
- Rule Thule 1993 2006 - Apr Sun>=1 2:00 1:00 D
-@@ -1317,7 +1317,7 @@
- # From Paul Eggert (2014-06-14):
- # Go with Oja over Shanks.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Finland 1942 only - Apr 2 24:00 1:00 S
- Rule Finland 1942 only - Oct 4 1:00 0 -
- Rule Finland 1981 1982 - Mar lastSun 2:00 1:00 S
-@@ -1349,10 +1349,58 @@
- # Françoise Gauquelin, Problèmes de l'heure résolus en astrologie,
- # Guy Trédaniel, Paris 1987
-
-+# From Michael Deckers (2020-06-11):
-+# the law of 1891 <https://gallica.bnf.fr/ark:/12148/bpt6k64415343.texteImage>
-+# was published on 1891-03-15, so it could only take force on 1891-03-16.
-+
-+# From Michael Deckers (2020-06-10):
-+# Le Gaulois, 1911-03-11, page 1/6, online at
-+# https://www.retronews.fr/societe/echo-de-presse/2018/01/29/1911-change-lh...
-+# ... [ Instantly, all pressure driven clock dials halted... Nine minutes and
-+# twenty-one seconds later the hands resumed their circular motion. ]
-+# There are also precise reports about how the change was prepared in train
-+# stations: all the publicly visible clocks stopped at midnight railway time
-+# (or were covered), only the chief of service had a watch, labeled
-+# "Heure ancienne", that he kept running until it reached 00:04:21, when
-+# he announced "Heure nouvelle". See the "Le Petit Journal 1911-03-11".
-+# https://gallica.bnf.fr/ark:/12148/bpt6k6192911/f1.item.zoom
-+#
-+# From Michael Deckers (2020-06-12):
-+# That "all French clocks stopped" for 00:09:21 is a misreading of French
-+# newspapers; this sort of adjustment applies only to certain
-+# remote-controlled clocks ("pendules pneumatiques", of which there existed
-+# perhaps a dozen in Paris, and which simply could not be set back remotely),
-+# but not to all the clocks in all French towns and villages. For instance,
-+# the following story in the "Courrier de Saône-et-Loire" 1911-03-11, page 2:
-+# only works if legal time was stepped back (was not monotone): ...
-+# [One can observe that children who had been born at midnight less 5
-+# minutes and who had died at midnight of the old time, would turn out to
-+# be dead before being born, time having been set back and having
-+# suppressed 9 minutes and 25 seconds of their existence, that is, more
-+# than they could spend.]
-+#
-+# From Paul Eggert (2020-06-12):
-+# French time in railway stations was legally five minutes behind civil time,
-+# which explains why railway "old time" ran to 00:04:21 instead of to 00:09:21.
-+# The law's text (which Michael Deckers noted is at
-+# <https://gallica.bnf.fr/ark:/12148/bpt6k2022333z/f2>) says only that
-+# at 1911-03-11 00:00 legal time was that of Paris mean time delayed by
-+# nine minutes and twenty-one seconds, and does not say how the
-+# transition from Paris mean time was to occur.
-+#
-+# tzdb has no way to represent stopped clocks. As the railway practice
-+# was to keep a watch running on "old time" to decide when to restart
-+# the other clocks, this could be modeled as a transition for "old time" at
-+# 00:09:21. However, since the law was ambiguous and clocks outside railway
-+# stations were probably done haphazardly with the popular impression being
-+# that the transition was done at 00:00 "old time", simply leave the time
-+# blank; this causes zic to default to 00:00 "old time" which is good enough.
-+# Do something similar for the 1891-03-16 transition. There are similar
-+# problems in Algiers, Monaco and Tunis.
-
- #
- # Shank & Pottenger seem to use '24:00' ambiguously; resolve it with Whitman.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule France 1916 only - Jun 14 23:00s 1:00 S
- Rule France 1916 1919 - Oct Sun>=1 23:00s 0 -
- Rule France 1917 only - Mar 24 23:00s 1:00 S
-@@ -1412,13 +1460,11 @@
- # go with Excoffier's 28/3/76 0hUT and 25/9/76 23hUT.
- Rule France 1976 only - Mar 28 1:00 1:00 S
- Rule France 1976 only - Sep 26 1:00 0 -
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time, and Whitman 0:09:05,
--# but Howse quotes the actual French legislation as saying 0:09:21.
--# Go with Howse. Howse writes that the time in France was officially based
-+# Howse writes that the time in France was officially based
- # on PMT-0:09:21 until 1978-08-09, when the time base finally switched to UTC.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
-- 0:09:21 - PMT 1911 Mar 11 0:01 # Paris MT
-+Zone Europe/Paris 0:09:21 - LMT 1891 Mar 16
-+ 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
- # Shanks & Pottenger give 1940 Jun 14 0:00; go with Excoffier and Le Corre.
- 0:00 France WE%sT 1940 Jun 14 23:00
- # Le Corre says Paris stuck with occupied-France time after the liberation;
-@@ -1447,7 +1493,7 @@
- # this was equivalent to UT +03, not +04.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Germany 1946 only - Apr 14 2:00s 1:00 S
- Rule Germany 1946 only - Oct 7 2:00s 0 -
- Rule Germany 1947 1949 - Oct Sun>=1 2:00s 0 -
-@@ -1499,7 +1545,7 @@
- 1:00 EU CE%sT
-
- # Greece
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Whitman gives 1932 Jul 5 - Nov 1; go with Shanks & Pottenger.
- Rule Greece 1932 only - Jul 7 0:00 1:00 S
- Rule Greece 1932 only - Sep 1 0:00 0 -
-@@ -1534,38 +1580,69 @@
- 2:00 EU EE%sT
-
- # Hungary
--# From Paul Eggert (2014-07-15):
--# Dates for 1916-1945 are taken from:
--# Oross A. Jelen a múlt jövője: a nyári időszámítás Magyarországon 1916-1945.
--# National Archives of Hungary (2012-10-29).
--# http://mnl.gov.hu/a_het_dokumentuma/a_nyari_idoszamitas_magyarorszagon_19...
--# This source does not always give times, which are taken from Shanks
--# & Pottenger (which disagree about the dates).
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule Hungary 1918 only - Apr 1 3:00 1:00 S
--Rule Hungary 1918 only - Sep 16 3:00 0 -
--Rule Hungary 1919 only - Apr 15 3:00 1:00 S
--Rule Hungary 1919 only - Nov 24 3:00 0 -
-+
-+# From Michael Deckers (2020-06-09):
-+# an Austrian encyclopedia of railroads of 1913, online at
-+# http://www.zeno.org/Roell-1912/A/Eisenbahnzeit
-+# says that the switch [to CET] happened on 1890-11-01.
-+
-+# From Géza Nyáry (2020-06-07):
-+# Data for 1918-1983 are based on the archive database of Library Hungaricana.
-+# The dates are collected from original, scanned governmental orders,
-+# bulletins, instructions and public press.
-+# [See URLs below.]
-+
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1918/?pg=238
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1919/?pg=808
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1920/?pg=201
-+Rule Hungary 1918 1919 - Apr 15 2:00 1:00 S
-+Rule Hungary 1918 1920 - Sep Mon>=15 3:00 0 -
-+Rule Hungary 1920 only - Apr 5 2:00 1:00 S
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1945/?pg=882
- Rule Hungary 1945 only - May 1 23:00 1:00 S
--Rule Hungary 1945 only - Nov 1 0:00 0 -
-+Rule Hungary 1945 only - Nov 1 1:00 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1946_03/?pg=49
- Rule Hungary 1946 only - Mar 31 2:00s 1:00 S
--Rule Hungary 1946 1949 - Oct Sun>=1 2:00s 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1946_09/?pg=54
-+Rule Hungary 1946 only - Oct 7 2:00 0 -
-+# https://library.hungaricana.hu/hu/view/KulfBelfHirek_1947_04_1__001-123/?...
-+# https://library.hungaricana.hu/hu/view/DunantuliNaplo_1947_09/?pg=128
-+# https://library.hungaricana.hu/hu/view/KulfBelfHirek_1948_03_3__001-123/?...
-+# https://library.hungaricana.hu/hu/view/Zala_1948_09/?pg=64
-+# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniN...
-+# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniN...
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1949_09/?pg=94
- Rule Hungary 1947 1949 - Apr Sun>=4 2:00s 1:00 S
--Rule Hungary 1950 only - Apr 17 2:00s 1:00 S
--Rule Hungary 1950 only - Oct 23 2:00s 0 -
--Rule Hungary 1954 1955 - May 23 0:00 1:00 S
--Rule Hungary 1954 1955 - Oct 3 0:00 0 -
--Rule Hungary 1956 only - Jun Sun>=1 0:00 1:00 S
--Rule Hungary 1956 only - Sep lastSun 0:00 0 -
--Rule Hungary 1957 only - Jun Sun>=1 1:00 1:00 S
--Rule Hungary 1957 only - Sep lastSun 3:00 0 -
--Rule Hungary 1980 only - Apr 6 1:00 1:00 S
-+Rule Hungary 1947 1949 - Oct Sun>=1 2:00s 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1954/?pg...
-+Rule Hungary 1954 only - May 23 0:00 1:00 S
-+Rule Hungary 1954 only - Oct 3 0:00 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1955/?pg...
-+Rule Hungary 1955 only - May 22 2:00 1:00 S
-+Rule Hungary 1955 only - Oct 2 3:00 0 -
-+# https://library.hungaricana.hu/hu/view/HevesMegyeiNepujsag_1956_06/?pg=0
-+# https://library.hungaricana.hu/hu/view/EszakMagyarorszag_1956_06/?pg=6
-+# https://library.hungaricana.hu/hu/view/SzolnokMegyeiNeplap_1957_04/?pg=120
-+# https://library.hungaricana.hu/hu/view/PestMegyeiHirlap_1957_09/?pg=143
-+Rule Hungary 1956 1957 - Jun Sun>=1 2:00 1:00 S
-+Rule Hungary 1956 1957 - Sep lastSun 3:00 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1980/?pg...
-+Rule Hungary 1980 only - Apr 6 0:00 1:00 S
-+Rule Hungary 1980 only - Sep 28 1:00 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1981_01/?pg=79
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1982/?pg...
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1983/?pg=85
-+Rule Hungary 1981 1983 - Mar lastSun 0:00 1:00 S
-+Rule Hungary 1981 1983 - Sep lastSun 1:00 0 -
-+#
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Budapest 1:16:20 - LMT 1890 Oct
-+Zone Europe/Budapest 1:16:20 - LMT 1890 Nov 1
- 1:00 C-Eur CE%sT 1918
-- 1:00 Hungary CE%sT 1941 Apr 8
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1941/?pg=1204
-+ 1:00 Hungary CE%sT 1941 Apr 7 23:00
- 1:00 C-Eur CE%sT 1945
-- 1:00 Hungary CE%sT 1980 Sep 28 2:00s
-+ 1:00 Hungary CE%sT 1984
- 1:00 EU CE%sT
-
- # Iceland
-@@ -1601,7 +1678,7 @@
- # The information below is taken from the 1988 Almanak; see
- # http://www.almanak.hi.is/klukkan.html
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iceland 1917 1919 - Feb 19 23:00 1:00 -
- Rule Iceland 1917 only - Oct 21 1:00 0 -
- Rule Iceland 1918 1919 - Nov 16 1:00 0 -
-@@ -1693,7 +1770,7 @@
- # to 1944-06-04; although Rome was an open city during this period, it
- # was effectively controlled by Germany.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Italy 1916 only - Jun 3 24:00 1:00 S
- Rule Italy 1916 1917 - Sep 30 24:00 0 -
- Rule Italy 1917 only - Mar 31 24:00 1:00 S
-@@ -1803,7 +1880,7 @@
- # urged Lithuania and Estonia to adopt a similar time policy, but it
- # appears that they will not do so....
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Latvia 1989 1996 - Mar lastSun 2:00s 1:00 S
- Rule Latvia 1989 1996 - Sep lastSun 2:00s 0 -
-
-@@ -1896,7 +1973,7 @@
- # Luxembourg
- # Whitman disagrees with most of these dates in minor ways;
- # go with Shanks & Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Lux 1916 only - May 14 23:00 1:00 S
- Rule Lux 1916 only - Oct 1 1:00 0 -
- Rule Lux 1917 only - Apr 28 23:00 1:00 S
-@@ -1937,7 +2014,7 @@
- # From Paul Eggert (2016-10-21):
- # Assume 1900-1972 was like Rome, overriding Shanks.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Malta 1973 only - Mar 31 0:00s 1:00 S
- Rule Malta 1973 only - Sep 29 0:00s 0 -
- Rule Malta 1974 only - Apr 21 0:00s 1:00 S
-@@ -2010,7 +2087,7 @@
- # says the 2014-03-30 spring-forward transition was at 02:00 local time.
- # Guess that since 1997 Moldova has switched one hour before the EU.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Moldova 1997 max - Mar lastSun 2:00 1:00 S
- Rule Moldova 1997 max - Oct lastSun 3:00 0 -
-
-@@ -2028,11 +2105,24 @@
- 2:00 Moldova EE%sT
-
- # Monaco
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
-+#
-+# From Michael Deckers (2020-06-12):
-+# In the "Journal de Monaco" of 1892-05-24, online at
-+# https://journaldemonaco.gouv.mc/var/jdm/storage/original/application/b1c6...
-+# we read: ...
-+# [In virtue of a Sovereign Ordinance of the May 13 of the current [year],
-+# legal time in the Principality will be set to, from the date of June 1,
-+# 1892 onwards, to the meridian of Paris, as in France.]
-+# In the "Journal de Monaco" of 1911-03-28, online at
-+# https://journaldemonaco.gouv.mc/var/jdm/storage/original/application/de74...
-+# we read an ordinance of 1911-03-16: ...
-+# [Legal time in the Principality will be set, from the date of promulgation
-+# of the present ordinance, to legal time in France.... Consequently, legal
-+# time will be retarded by 9 minutes and 21 seconds.]
-+#
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
-- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
-+Zone Europe/Monaco 0:29:32 - LMT 1892 Jun 1
-+ 0:09:21 - PMT 1911 Mar 29 # Paris Mean Time
- 0:00 France WE%sT 1945 Sep 16 3:00
- 1:00 France CE%sT 1977
- 1:00 EU CE%sT
-@@ -2080,7 +2170,7 @@
- # The data entries before 1945 are taken from
- # https://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Neth 1916 only - May 1 0:00 1:00 NST # Netherlands Summer Time
- Rule Neth 1916 only - Oct 1 0:00 0 AMT # Amsterdam Mean Time
- Rule Neth 1917 only - Apr 16 2:00s 1:00 NST
-@@ -2117,7 +2207,7 @@
- # Norway
- # http://met.no/met/met_lex/q_u/sommertid.html (2004-01) agrees with Shanks &
- # Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Norway 1916 only - May 22 1:00 1:00 S
- Rule Norway 1916 only - Sep 30 0:00 0 -
- Rule Norway 1945 only - Apr 2 2:00s 1:00 S
-@@ -2186,7 +2276,7 @@
- # The 1919 dates and times can be found in Tygodnik Urzędowy nr 1 (1919-03-20),
- # <http://www.wbc.poznan.pl/publication/32156> pp 1-2.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Poland 1918 1919 - Sep 16 2:00s 0 -
- Rule Poland 1919 only - Apr 15 2:00s 1:00 S
- Rule Poland 1944 only - Apr 3 2:00s 1:00 S
-@@ -2257,7 +2347,7 @@
- # Guess that the Azores changed to EU rules in 1992 (since that's when Portugal
- # harmonized with EU rules), and that they stayed +0:00 that winter.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # DSH writes that despite Decree 1,469 (1915), the change to the clocks was not
- # done every year, depending on what Spain did, because of railroad schedules.
- # Go with Shanks & Pottenger.
-@@ -2370,7 +2460,7 @@
- # assume that Romania and Moldova switched to EU rules in 1997,
- # the same year as Bulgaria.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Romania 1932 only - May 21 0:00s 1:00 S
- Rule Romania 1932 1939 - Oct Sun>=1 0:00s 0 -
- Rule Romania 1933 1939 - Apr Sun>=2 0:00s 1:00 S
-@@ -3468,14 +3558,14 @@
- # fallback transition from the next day's 00:59... to 00:00.
-
- # From Michael Deckers (2016-12-15):
--# The Royal Decree of 1900-06-26 quoted by Planesas, online at
-+# The Royal Decree of 1900-07-26 quoted by Planesas, online at
- # https://www.boe.es/datos/pdfs/BOE//1900/209/A00383-00384.pdf
- # says in its article 5 (my translation):
- # These dispositions will enter into force beginning with the
- # instant at which, according to the time indicated in article 1,
- # the 1st day of January of 1901 will begin.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Spain 1918 only - Apr 15 23:00 1:00 S
- Rule Spain 1918 1919 - Oct 6 24:00s 0 -
- Rule Spain 1919 only - Apr 6 23:00 1:00 S
-@@ -3612,7 +3702,7 @@
- # By the end of the 18th century clocks and watches became commonplace
- # and their performance improved enormously. Communities began to keep
- # mean time in preference to apparent time - Geneva from 1780 ....
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # From Whitman (who writes "Midnight?"):
- # Rule Swiss 1940 only - Nov 2 0:00 1:00 S
- # Rule Swiss 1940 only - Dec 31 0:00 0 -
-@@ -3699,7 +3789,7 @@
- # 1853-07-16, though it probably occurred at some other date in Zurich, and
- # legal civil time probably changed at still some other transition date.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Swiss 1941 1942 - May Mon>=1 1:00 1:00 S
- Rule Swiss 1941 1942 - Oct Mon>=1 2:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -3848,7 +3938,7 @@
- # Although Google Translate misfires on that source, it looks like
- # Turkey reversed last month's decision, and so will stay at +03.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Turkey 1916 only - May 1 0:00 1:00 S
- Rule Turkey 1916 only - Oct 1 0:00 0 -
- Rule Turkey 1920 only - Mar 28 0:00 1:00 S
-@@ -4006,7 +4096,7 @@
- 2:00 1:00 EEST 1991 Sep 29 3:00
- 2:00 E-Eur EE%sT 1995
- 2:00 EU EE%sT
--# Ruthenia used CET 1990/1991.
-+# Transcarpathia used CET 1990/1991.
- # "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but
- # "Uzhgorod" is more common in English.
- Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct
-diff --git openjdk.orig/jdk/make/data/tzdata/leapseconds openjdk/jdk/make/data/tzdata/leapseconds
---- openjdk.orig/jdk/make/data/tzdata/leapseconds
-+++ openjdk/jdk/make/data/tzdata/leapseconds
-@@ -91,11 +91,11 @@
- # Any additional leap seconds will come after this.
- # This Expires line is commented out for now,
- # so that pre-2020a zic implementations do not reject this file.
--#Expires 2020 Dec 28 00:00:00
-+#Expires 2021 Jun 28 00:00:00
-
- # POSIX timestamps for the data in this file:
- #updated 1467936000 (2016-07-08 00:00:00 UTC)
--#expires 1609113600 (2020-12-28 00:00:00 UTC)
-+#expires 1624838400 (2021-06-28 00:00:00 UTC)
-
--# Updated through IERS Bulletin C59
--# File expires on: 28 December 2020
-+# Updated through IERS Bulletin C60
-+# File expires on: 28 June 2021
-diff --git openjdk.orig/jdk/make/data/tzdata/northamerica openjdk/jdk/make/data/tzdata/northamerica
---- openjdk.orig/jdk/make/data/tzdata/northamerica
-+++ openjdk/jdk/make/data/tzdata/northamerica
-@@ -193,7 +193,7 @@
- # U.S. government action. So even though the "US" rules have changed
- # in the latest release, other countries won't be affected.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule US 1918 1919 - Mar lastSun 2:00 1:00 D
- Rule US 1918 1919 - Oct lastSun 2:00 0 S
- Rule US 1942 only - Feb 9 2:00 1:00 W # War
-@@ -370,7 +370,7 @@
- # Eastern time (i.e., -4:56:01.6) just before the 1883 switch. Round to the
- # nearest second.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule NYC 1920 only - Mar lastSun 2:00 1:00 D
- Rule NYC 1920 only - Oct lastSun 2:00 0 S
- Rule NYC 1921 1966 - Apr lastSun 2:00 1:00 D
-@@ -454,7 +454,7 @@
- # The Tennessean 2007-05-11, republished 2015-04-06.
- # https://www.tennessean.com/story/insider/extras/2015/04/06/archives-seige...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Chicago 1920 only - Jun 13 2:00 1:00 D
- Rule Chicago 1920 1921 - Oct lastSun 2:00 0 S
- Rule Chicago 1921 only - Mar lastSun 2:00 1:00 D
-@@ -523,7 +523,7 @@
- # El Paso Times. 2018-10-24 06:40 -06.
- # https://www.elpasotimes.com/story/news/local/el-paso/2018/10/24/el-pasoan...
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Denver 1920 1921 - Mar lastSun 2:00 1:00 D
- Rule Denver 1920 only - Oct lastSun 2:00 0 S
- Rule Denver 1921 only - May 22 2:00 0 S
-@@ -576,7 +576,7 @@
- # https://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&contex...
- # https://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&contex...
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule CA 1948 only - Mar 14 2:01 1:00 D
- Rule CA 1949 only - Jan 1 2:00 0 S
- Rule CA 1950 1966 - Apr lastSun 1:00 1:00 D
-@@ -934,7 +934,7 @@
- # going to switch from Central to Eastern Time on March 11, 2007....
- # http://www.indystar.com/apps/pbcs.dll/article?AID=/20070207/LOCAL190108/7...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Indianapolis 1941 only - Jun 22 2:00 1:00 D
- Rule Indianapolis 1941 1954 - Sep lastSun 2:00 0 S
- Rule Indianapolis 1946 1954 - Apr lastSun 2:00 1:00 D
-@@ -953,7 +953,7 @@
- #
- # Eastern Crawford County, Indiana, left its clocks alone in 1974,
- # as well as from 1976 through 2005.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Marengo 1951 only - Apr lastSun 2:00 1:00 D
- Rule Marengo 1951 only - Sep lastSun 2:00 0 S
- Rule Marengo 1954 1960 - Apr lastSun 2:00 1:00 D
-@@ -972,7 +972,7 @@
- # Daviess, Dubois, Knox, and Martin Counties, Indiana,
- # switched from eastern to central time in April 2006, then switched back
- # in November 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Vincennes 1946 only - Apr lastSun 2:00 1:00 D
- Rule Vincennes 1946 only - Sep lastSun 2:00 0 S
- Rule Vincennes 1953 1954 - Apr lastSun 2:00 1:00 D
-@@ -997,7 +997,7 @@
- # The Indianapolis News, Friday 27 October 1967 states that Perry County
- # returned to CST. It went again to EST on 27 April 1969, as documented by the
- # Indianapolis star of Saturday 26 April.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Perry 1955 only - May 1 0:00 1:00 D
- Rule Perry 1955 1960 - Sep lastSun 2:00 0 S
- Rule Perry 1956 1963 - Apr lastSun 2:00 1:00 D
-@@ -1014,7 +1014,7 @@
- #
- # Pike County, Indiana moved from central to eastern time in 1977,
- # then switched back in 2006, then switched back again in 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Pike 1955 only - May 1 0:00 1:00 D
- Rule Pike 1955 1960 - Sep lastSun 2:00 0 S
- Rule Pike 1956 1964 - Apr lastSun 2:00 1:00 D
-@@ -1035,7 +1035,7 @@
- # An article on page A3 of the Sunday, 1991-10-27 Washington Post
- # notes that Starke County switched from Central time to Eastern time as of
- # 1991-10-27.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Starke 1947 1961 - Apr lastSun 2:00 1:00 D
- Rule Starke 1947 1954 - Sep lastSun 2:00 0 S
- Rule Starke 1955 1956 - Oct lastSun 2:00 0 S
-@@ -1052,7 +1052,7 @@
- #
- # Pulaski County, Indiana, switched from eastern to central time in
- # April 2006 and then switched back in March 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Pulaski 1946 1960 - Apr lastSun 2:00 1:00 D
- Rule Pulaski 1946 1954 - Sep lastSun 2:00 0 S
- Rule Pulaski 1955 1956 - Oct lastSun 2:00 0 S
-@@ -1094,7 +1094,7 @@
- #
- # Part of Kentucky left its clocks alone in 1974.
- # This also includes Clark, Floyd, and Harrison counties in Indiana.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Louisville 1921 only - May 1 2:00 1:00 D
- Rule Louisville 1921 only - Sep 1 2:00 0 S
- Rule Louisville 1941 only - Apr lastSun 2:00 1:00 D
-@@ -1208,7 +1208,7 @@
- # election Michigan voters narrowly repealed DST, effective 1969.
- #
- # Most of Michigan observed DST from 1973 on, but was a bit late in 1975.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Detroit 1948 only - Apr lastSun 2:00 1:00 D
- Rule Detroit 1948 only - Sep lastSun 2:00 0 S
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1225,7 +1225,7 @@
- #
- # Dickinson, Gogebic, Iron, and Menominee Counties, Michigan,
- # switched from EST to CST/CDT in 1973.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Menominee 1946 only - Apr lastSun 2:00 1:00 D
- Rule Menominee 1946 only - Sep lastSun 2:00 0 S
- Rule Menominee 1966 only - Apr lastSun 2:00 1:00 D
-@@ -1395,7 +1395,7 @@
- # Oct 31, to Oct 27, 1918 (and Sunday is a more likely transition day
- # than Thursday) in all Canadian rulesets.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Canada 1918 only - Apr 14 2:00 1:00 D
- Rule Canada 1918 only - Oct 27 2:00 0 S
- Rule Canada 1942 only - Feb 9 2:00 1:00 W # War
-@@ -1418,7 +1418,7 @@
- # that follows the rules is the southeast corner, including Port Hope
- # Simpson and Mary's Harbour, but excluding, say, Black Tickle.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule StJohns 1917 only - Apr 8 2:00 1:00 D
- Rule StJohns 1917 only - Sep 17 2:00 0 S
- # Whitman gives 1919 Apr 5 and 1920 Apr 5; go with Shanks & Pottenger.
-@@ -1520,7 +1520,7 @@
- # bill say that it is "accommodating the customs and practices" of those
- # regions, which suggests that they have always been in-line with Halifax.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Halifax 1916 only - Apr 1 0:00 1:00 D
- Rule Halifax 1916 only - Oct 1 0:00 0 S
- Rule Halifax 1920 only - May 9 0:00 1:00 D
-@@ -1586,7 +1586,7 @@
- # clear that this was the case since at least 1993.
- # For now, assume it started in 1993.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Moncton 1933 1935 - Jun Sun>=8 1:00 1:00 D
- Rule Moncton 1933 1935 - Sep Sun>=8 1:00 0 S
- Rule Moncton 1936 1938 - Jun Sun>=1 1:00 1:00 D
-@@ -1795,7 +1795,7 @@
- # With some exceptions, the use of daylight saving may be said to be limited
- # to those cities and towns lying between Quebec city and Windsor, Ont.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Toronto 1919 only - Mar 30 23:30 1:00 D
- Rule Toronto 1919 only - Oct 26 0:00 0 S
- Rule Toronto 1920 only - May 2 2:00 1:00 D
-@@ -1893,7 +1893,7 @@
- # starting 1966. Since 02:00s is clearly correct for 1967 on, assume
- # it was also 02:00s in 1966.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Winn 1916 only - Apr 23 0:00 1:00 D
- Rule Winn 1916 only - Sep 17 0:00 0 S
- Rule Winn 1918 only - Apr 14 2:00 1:00 D
-@@ -1984,7 +1984,7 @@
- # long and rather painful to read.
- # http://www.qp.gov.sk.ca/documents/English/Statutes/Statutes/T14.pdf
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Regina 1918 only - Apr 14 2:00 1:00 D
- Rule Regina 1918 only - Oct 27 2:00 0 S
- Rule Regina 1930 1934 - May Sun>=1 0:00 1:00 D
-@@ -2034,7 +2034,7 @@
- # Boyer JP. Forcing Choice: The Risky Reward of Referendums. Dundum. 2017.
- # ISBN 978-1459739123.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Edm 1918 1919 - Apr Sun>=8 2:00 1:00 D
- Rule Edm 1918 only - Oct 27 2:00 0 S
- Rule Edm 1919 only - May 27 2:00 0 S
-@@ -2143,7 +2143,7 @@
- # https://searcharchives.vancouver.ca/daylight-saving-1918-starts-again-jul...
- # We have no further details, so omit them for now.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Vanc 1918 only - Apr 14 2:00 1:00 D
- Rule Vanc 1918 only - Oct 27 2:00 0 S
- Rule Vanc 1942 only - Feb 9 2:00 1:00 W # War
-@@ -2472,7 +2472,19 @@
- # consistency with nearby Dawson Creek, Creston, and Fort Nelson.
- # https://yukon.ca/en/news/yukon-end-seasonal-time-change
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# From Andrew G. Smith (2020-09-24):
-+# Yukon has completed its regulatory change to be on UTC -7 year-round....
-+# http://www.gov.yk.ca/legislation/regs/oic2020_125.pdf
-+# What we have done is re-defined Yukon Standard Time, as we are
-+# authorized to do under section 33 of our Interpretation Act:
-+# http://www.gov.yk.ca/legislation/acts/interpretation_c.pdf
-+#
-+# From Paul Eggert (2020-09-24):
-+# tzdb uses the obsolete YST abbreviation for standard time in Yukon through
-+# about 1970, and uses PST for standard time in Yukon since then. Consistent
-+# with that, use MST for -07, the new standard time in Yukon effective Nov. 1.
-+
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NT_YK 1918 only - Apr 14 2:00 1:00 D
- Rule NT_YK 1918 only - Oct 27 2:00 0 S
- Rule NT_YK 1919 only - May 25 2:00 1:00 D
-@@ -2526,12 +2538,12 @@
- Zone America/Whitehorse -9:00:12 - LMT 1900 Aug 20
- -9:00 NT_YK Y%sT 1967 May 28 0:00
- -8:00 NT_YK P%sT 1980
-- -8:00 Canada P%sT 2020 Mar 8 2:00
-+ -8:00 Canada P%sT 2020 Nov 1
- -7:00 - MST
- Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
- -9:00 NT_YK Y%sT 1973 Oct 28 0:00
- -8:00 NT_YK P%sT 1980
-- -8:00 Canada P%sT 2020 Mar 8 2:00
-+ -8:00 Canada P%sT 2020 Nov 1
- -7:00 - MST
-
-
-@@ -2746,7 +2758,7 @@
- # 5- The islands, reefs and keys shall take their timezone from the
- # longitude they are located at.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mexico 1939 only - Feb 5 0:00 1:00 D
- Rule Mexico 1939 only - Jun 25 0:00 0 S
- Rule Mexico 1940 only - Dec 9 0:00 1:00 D
-@@ -2951,7 +2963,7 @@
- # rules to sync with the U.S. starting in 2007....
- # http://www.jonesbahamas.com/?c=45&a=10412
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Bahamas 1964 1975 - Oct lastSun 2:00 0 S
- Rule Bahamas 1964 1975 - Apr lastSun 2:00 1:00 D
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -2963,7 +2975,7 @@
-
- # For 1899 Milne gives -3:58:29.2; round that.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Barb 1977 only - Jun 12 2:00 1:00 D
- Rule Barb 1977 1978 - Oct Sun>=1 2:00 0 S
- Rule Barb 1978 1980 - Apr Sun>=15 2:00 1:00 D
-@@ -2976,7 +2988,7 @@
-
- # Belize
- # Whitman entirely disagrees with Shanks; go with Shanks & Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Belize 1918 1942 - Oct Sun>=2 0:00 0:30 -0530
- Rule Belize 1919 1943 - Feb Sun>=9 0:00 0 CST
- Rule Belize 1973 only - Dec 5 0:00 1:00 CDT
-@@ -3013,7 +3025,7 @@
-
- # Milne gives -5:36:13.3 as San José mean time; round to nearest.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule CR 1979 1980 - Feb lastSun 0:00 1:00 D
- Rule CR 1979 1980 - Jun Sun>=1 0:00 0 S
- Rule CR 1991 1992 - Jan Sat>=15 0:00 1:00 D
-@@ -3187,7 +3199,7 @@
- # From Paul Eggert (2012-11-03):
- # For now, assume the future rule is first Sunday in November.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cuba 1928 only - Jun 10 0:00 1:00 D
- Rule Cuba 1928 only - Oct 10 0:00 0 S
- Rule Cuba 1940 1942 - Jun Sun>=1 0:00 1:00 D
-@@ -3256,7 +3268,7 @@
- # decided to revert.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule DR 1966 only - Oct 30 0:00 1:00 EDT
- Rule DR 1967 only - Feb 28 0:00 0 EST
- Rule DR 1969 1973 - Oct lastSun 0:00 0:30 -0430
-@@ -3273,7 +3285,7 @@
-
- # El Salvador
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Salv 1987 1988 - May Sun>=1 0:00 1:00 D
- Rule Salv 1987 1988 - Sep lastSun 0:00 0 S
- # There are too many San Salvadors elsewhere, so use America/El_Salvador
-@@ -3302,7 +3314,7 @@
- # (2006-04-19), says DST ends at 24:00. See
- # http://www.sieca.org.gt/Sitio_publico/Energeticos/Doc/Medidas/Cambio_Hora...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Guat 1973 only - Nov 25 0:00 1:00 D
- Rule Guat 1974 only - Feb 24 0:00 0 S
- Rule Guat 1983 only - May 21 0:00 1:00 D
-@@ -3383,7 +3395,7 @@
- # I have not been able to find a more authoritative source:
- # https://www.haitilibre.com/en/news-20319-haiti-notices-time-change-in-hai...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Haiti 1983 only - May 8 0:00 1:00 D
- Rule Haiti 1984 1987 - Apr lastSun 0:00 1:00 D
- Rule Haiti 1983 1987 - Oct lastSun 0:00 0 S
-@@ -3431,7 +3443,7 @@
- # http://www.laprensahn.com/pais_nota.php?id04962=7386
- # So it seems that Honduras will not enter DST this year....
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Hond 1987 1988 - May Sun>=1 0:00 1:00 D
- Rule Hond 1987 1988 - Sep lastSun 0:00 0 S
- Rule Hond 2006 only - May Sun>=1 0:00 1:00 D
-@@ -3522,7 +3534,7 @@
- # The natural sun time is restored in all the national territory, in that the
- # time is returned one hour at 01:00 am of October 1 of 2006.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Nic 1979 1980 - Mar Sun>=16 0:00 1:00 D
- Rule Nic 1979 1980 - Jun Mon>=23 0:00 0 S
- Rule Nic 2005 only - Apr 10 0:00 1:00 D
-diff --git openjdk.orig/jdk/make/data/tzdata/pacificnew openjdk/jdk/make/data/tzdata/pacificnew
-deleted file mode 100644
---- openjdk/jdk/make/data/tzdata/pacificnew
-+++ /dev/null
-@@ -1,52 +0,0 @@
--#
--# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--#
--# This code is free software; you can redistribute it and/or modify it
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation. Oracle designates this
--# particular file as subject to the "Classpath" exception as provided
--# by Oracle in the LICENSE file that accompanied this code.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--# tzdb data for proposed US election time (this file is obsolete)
--
--# This file is in the public domain, so clarified as of
--# 2009-05-17 by Arthur David Olson.
--
--# From Arthur David Olson (1989-04-05):
--# On 1989-04-05, the U. S. House of Representatives passed (238-154) a bill
--# establishing "Pacific Presidential Election Time"; it was not acted on
--# by the Senate or signed into law by the President.
--# You might want to change the "PE" (Presidential Election) below to
--# "Q" (Quadrennial) to maintain three-character zone abbreviations.
--# If you're really conservative, you might want to change it to "D".
--# Avoid "L" (Leap Year), which won't be true in 2100.
--
--# If Presidential Election Time is ever established, replace "XXXX" below
--# with the year the law takes effect and uncomment the "##" lines.
--
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--## Rule Twilite XXXX max - Apr Sun>=1 2:00 1:00 D
--## Rule Twilite XXXX max uspres Oct lastSun 2:00 1:00 PE
--## Rule Twilite XXXX max uspres Nov Sun>=7 2:00 0 S
--## Rule Twilite XXXX max nonpres Oct lastSun 2:00 0 S
--
--# Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL]
--## Zone America/Los_Angeles-PET -8:00 US P%sT XXXX
--## -8:00 Twilite P%sT
--
--# For now...
--Link America/Los_Angeles US/Pacific-New ##
-diff --git openjdk.orig/jdk/make/data/tzdata/southamerica openjdk/jdk/make/data/tzdata/southamerica
---- openjdk.orig/jdk/make/data/tzdata/southamerica
-+++ openjdk/jdk/make/data/tzdata/southamerica
-@@ -71,7 +71,7 @@
- # I am sending modifications to the Argentine time zone table...
- # AR was chosen because they are the ISO letters that represent Argentina.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Arg 1930 only - Dec 1 0:00 1:00 -
- Rule Arg 1931 only - Apr 1 0:00 0 -
- Rule Arg 1931 only - Oct 15 0:00 1:00 -
-@@ -792,7 +792,7 @@
- # From Paul Eggert (2013-10-17):
- # For now, assume western Amazonas will change as well.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Decree 20,466 <http://pcdsh01.on.br/HV20466.htm> (1931-10-01)
- # Decree 21,896 <http://pcdsh01.on.br/HV21896.htm> (1932-01-10)
- Rule Brazil 1931 only - Oct 3 11:00 1:00 -
-@@ -1281,7 +1281,7 @@
- # For now, assume that they will not revert,
- # since they have extended the expiration date once already.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Chile 1927 1931 - Sep 1 0:00 1:00 -
- Rule Chile 1928 1932 - Apr 1 0:00 0 -
- Rule Chile 1968 only - Nov 3 4:00u 1:00 -
-@@ -1381,7 +1381,7 @@
- # Milne gives 4:56:16.4 for Bogotá time in 1899; round to nearest. He writes,
- # "A variation of fifteen minutes in the public clocks of Bogota is not rare."
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule CO 1992 only - May 3 0:00 1:00 -
- Rule CO 1993 only - Apr 4 0:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1441,7 +1441,7 @@
- # (Not one step back), the clocks went back in 1993 and the experiment was not
- # repeated. For now, assume transitions were at 00:00 local time country-wide.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Ecuador 1992 only - Nov 28 0:00 1:00 -
- Rule Ecuador 1993 only - Feb 5 0:00 0 -
- #
-@@ -1535,7 +1535,7 @@
- # For now we will assume permanent -03 for the Falklands
- # until advised differently (to apply for 2012 and beyond, after the 2011
- # experiment was apparently successful.)
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 -
- Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 -
- Rule Falk 1939 only - Oct 1 0:00 1:00 -
-@@ -1581,7 +1581,7 @@
- # No time of the day is established for the adjustment, so people normally
- # adjust their clocks at 0 hour of the given dates.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Para 1975 1988 - Oct 1 0:00 1:00 -
- Rule Para 1975 1978 - Mar 1 0:00 0 -
- Rule Para 1979 1991 - Apr 1 0:00 0 -
-@@ -1674,7 +1674,7 @@
- # From Paul Eggert (2006-03-22):
- # Shanks & Pottenger don't have this transition. Assume 1986 was like 1987.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Peru 1938 only - Jan 1 0:00 1:00 -
- Rule Peru 1938 only - Apr 1 0:00 0 -
- Rule Peru 1938 1939 - Sep lastSun 0:00 1:00 -
-@@ -1770,7 +1770,7 @@
- # https://www.impo.com.uy/diariooficial/1926/03/10/2
- # https://www.impo.com.uy/diariooficial/1926/03/18/2
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Uruguay 1923 1925 - Oct 1 0:00 0:30 -
- Rule Uruguay 1924 1926 - Apr 1 0:00 0 -
- # From Tim Parenti (2018-02-15):
-diff --git openjdk.orig/jdk/make/data/tzdata/systemv openjdk/jdk/make/data/tzdata/systemv
-deleted file mode 100644
---- openjdk/jdk/make/data/tzdata/systemv
-+++ /dev/null
-@@ -1,62 +0,0 @@
--#
--# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--#
--# This code is free software; you can redistribute it and/or modify it
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation. Oracle designates this
--# particular file as subject to the "Classpath" exception as provided
--# by Oracle in the LICENSE file that accompanied this code.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--# tzdb data for System V rules (this file is obsolete)
--
--# This file is in the public domain, so clarified as of
--# 2009-05-17 by Arthur David Olson.
--
--# Old rules, should the need arise.
--# No attempt is made to handle Newfoundland, since it cannot be expressed
--# using the System V "TZ" scheme (half-hour offset), or anything outside
--# North America (no support for non-standard DST start/end dates), nor
--# the changes in the DST rules in the US after 1976 (which occurred after
--# the old rules were written).
--#
--# If you need the old rules, uncomment ## lines.
--# Compile this *without* leap second correction for true conformance.
--
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule SystemV min 1973 - Apr lastSun 2:00 1:00 D
--Rule SystemV min 1973 - Oct lastSun 2:00 0 S
--Rule SystemV 1974 only - Jan 6 2:00 1:00 D
--Rule SystemV 1974 only - Nov lastSun 2:00 0 S
--Rule SystemV 1975 only - Feb 23 2:00 1:00 D
--Rule SystemV 1975 only - Oct lastSun 2:00 0 S
--Rule SystemV 1976 max - Apr lastSun 2:00 1:00 D
--Rule SystemV 1976 max - Oct lastSun 2:00 0 S
--
--# Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL]
--## Zone SystemV/AST4ADT -4:00 SystemV A%sT
--## Zone SystemV/EST5EDT -5:00 SystemV E%sT
--## Zone SystemV/CST6CDT -6:00 SystemV C%sT
--## Zone SystemV/MST7MDT -7:00 SystemV M%sT
--## Zone SystemV/PST8PDT -8:00 SystemV P%sT
--## Zone SystemV/YST9YDT -9:00 SystemV Y%sT
--## Zone SystemV/AST4 -4:00 - AST
--## Zone SystemV/EST5 -5:00 - EST
--## Zone SystemV/CST6 -6:00 - CST
--## Zone SystemV/MST7 -7:00 - MST
--## Zone SystemV/PST8 -8:00 - PST
--## Zone SystemV/YST9 -9:00 - YST
--## Zone SystemV/HST10 -10:00 - HST
-diff --git openjdk.orig/jdk/make/gendata/GendataTZDB.gmk openjdk/jdk/make/gendata/GendataTZDB.gmk
---- openjdk.orig/jdk/make/gendata/GendataTZDB.gmk
-+++ openjdk/jdk/make/gendata/GendataTZDB.gmk
-@@ -29,7 +29,7 @@
- # Time zone data file creation
- #
- TZDATA_DIR := $(JDK_TOPDIR)/make/data/tzdata
--TZDATA_TZFILE := africa antarctica asia australasia europe northamerica pacificnew southamerica backward etcetera gmt jdk11_backward
-+TZDATA_TZFILE := africa antarctica asia australasia europe northamerica southamerica backward etcetera gmt jdk11_backward
- TZDATA_TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZDATA_TZFILE))
-
- GENDATA_TZDB_DAT := $(JDK_OUTPUTDIR)/lib/tzdb.dat
-diff --git openjdk.orig/jdk/src/aix/lib/tzmappings openjdk/jdk/src/aix/lib/tzmappings
---- openjdk.orig/jdk/src/aix/lib/tzmappings
-+++ openjdk/jdk/src/aix/lib/tzmappings
-@@ -568,7 +568,6 @@
- US/Michigan America/New_York
- US/Mountain America/Denver
- US/Pacific America/Los_Angeles
--US/Pacific-New America/Los_Angeles
- US/Samoa Pacific/Pago_Pago
- USAST-2 Africa/Johannesburg
- USAST-2USADT Europe/Istanbul
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
-@@ -1040,7 +1040,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java openjdk/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java openjdk/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java openjdk/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java openjdk/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java openjdk/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java openjdk/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java openjdk/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java openjdk/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java openjdk/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
-@@ -1035,7 +1035,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git a/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java b/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
---- openjdk.orig/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
-+++ openjdk/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
-@@ -1037,7 +1037,6 @@
- {"US/Michigan", EST},
- {"US/Mountain", MST},
- {"US/Pacific", PST},
-- {"US/Pacific-New", PST},
- {"US/Samoa", SAMOA},
- {"VST", ICT},
- {"W-SU", MSK},
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java openjdk/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
---- openjdk.orig/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
-+++ openjdk/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
-@@ -47,7 +47,7 @@
- String TESTDIR = System.getProperty("test.dir", ".");
- String SRCDIR = System.getProperty("test.src", ".");
- String tzdir = SRCDIR + File.separator + "tzdata";
-- String tzfiles = "africa antarctica asia australasia europe northamerica pacificnew southamerica backward etcetera systemv";
-+ String tzfiles = "africa antarctica asia australasia europe northamerica southamerica backward etcetera";
- String jdk_tzdir = SRCDIR + File.separator + "tzdata_jdk";
- String jdk_tzfiles = "gmt jdk11_backward";
- String zidir = TESTDIR + File.separator + "zi";
-@@ -194,8 +194,9 @@
-
- // test getAvailableIDs(raw);
- zids_new = TimeZone.getAvailableIDs(-8 * 60 * 60 * 1000);
-- //Arrays.sort(zids_new);
-+ Arrays.sort(zids_new);
- zids_old = ZoneInfoOld.getAvailableIDs(-8 * 60 * 60 * 1000);
-+ Arrays.sort(zids_old);
- if (!Arrays.equals(zids_new, zids_old)) {
- System.out.println("------------------------");
- System.out.println("NEW.getAvailableIDs(-8:00)");
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/VERSION openjdk/jdk/test/sun/util/calendar/zi/tzdata/VERSION
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/VERSION
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/VERSION
-@@ -21,4 +21,4 @@
- # or visit www.oracle.com if you need additional information or have any
- # questions.
- #
--tzdata2020a
-+tzdata2020b
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/africa openjdk/jdk/test/sun/util/calendar/zi/tzdata/africa
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/africa
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/africa
-@@ -87,7 +87,7 @@
- # Corrections are welcome.
-
- # Algeria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Algeria 1916 only - Jun 14 23:00s 1:00 S
- Rule Algeria 1916 1919 - Oct Sun>=1 23:00s 0 -
- Rule Algeria 1917 only - Mar 24 23:00s 1:00 S
-@@ -110,10 +110,9 @@
- Rule Algeria 1978 only - Sep 22 3:00 0 -
- Rule Algeria 1980 only - Apr 25 0:00 1:00 S
- Rule Algeria 1980 only - Oct 31 2:00 0 -
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
-+# See Europe/Paris for PMT-related transitions.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01
-+Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 16
- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
- 0:00 Algeria WE%sT 1940 Feb 25 2:00
- 1:00 Algeria CE%sT 1946 Oct 7
-@@ -199,7 +198,7 @@
- # Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this
- # did not apply to Cairo, Alexandria, or Port Said.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Egypt 1940 only - Jul 15 0:00 1:00 S
- Rule Egypt 1940 only - Oct 1 0:00 0 -
- Rule Egypt 1941 only - Apr 15 0:00 1:00 S
-@@ -434,7 +433,7 @@
- # now Ghana observed different DST regimes in different years. For
- # lack of better info, use Shanks except treat the minus sign as a
- # typo, and assume DST started in 1920 not 1936.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Ghana 1920 1942 - Sep 1 0:00 0:20 -
- Rule Ghana 1920 1942 - Dec 31 0:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -524,7 +523,7 @@
- # From Paul Eggert (2013-10-25):
- # For now, assume they're reverting to the pre-2012 rules of permanent UT +02.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Libya 1951 only - Oct 14 2:00 1:00 S
- Rule Libya 1952 only - Jan 1 0:00 0 -
- Rule Libya 1953 only - Oct 9 2:00 1:00 S
-@@ -647,7 +646,7 @@
- # "The trial ended on March 29, 2009, when the clocks moved back by one hour
- # at 2am (or 02:00) local time..."
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mauritius 1982 only - Oct 10 0:00 1:00 -
- Rule Mauritius 1983 only - Mar 21 0:00 0 -
- Rule Mauritius 2008 only - Oct lastSun 2:00 1:00 -
-@@ -898,17 +897,30 @@
- # https://maroc-diplomatique.net/maroc-le-retour-a-lheure-gmt-est-prevu-dim...
- # http://aujourdhui.ma/actualite/gmt1-retour-a-lheure-normale-dimanche-proc...
- #
--# From Paul Eggert (2020-04-14):
-+# From Milamber (2020-05-31)
-+# In Morocco (where I live), the end of Ramadan (Arabic month) is followed by
-+# the Eid al-Fitr, and concretely it's 1 or 2 day offs for the people (with
-+# traditional visiting of family, big lunches/dinners, etc.). So for this
-+# year the astronomical calculations don't include the following 2 days off in
-+# the calc. These 2 days fall in a Sunday/Monday, so it's not acceptable by
-+# people to have a time shift during these 2 days off. Perhaps you can modify
-+# the (predicted) rules for next years: if the end of Ramadan is a (probable)
-+# Friday or Saturday (and so the 2 days off are on a weekend), the next time
-+# shift will be the next weekend.
-+#
-+# From Paul Eggert (2020-05-31):
- # For now, guess that in the future Morocco will fall back at 03:00
- # the last Sunday before Ramadan, and spring forward at 02:00 the
--# first Sunday after the day after Ramadan. To implement this,
--# transition dates for 2021 through 2087 were determined by running
--# the following program under GNU Emacs 26.3.
--# (let ((islamic-year 1442))
-+# first Sunday after two days after Ramadan. To implement this,
-+# transition dates and times for 2019 through 2087 were determined by
-+# running the following program under GNU Emacs 26.3. (This algorithm
-+# also produces the correct transition dates for 2016 through 2018,
-+# though the times differ due to Morocco's time zone change in 2018.)
-+# (let ((islamic-year 1440))
- # (require 'cal-islam)
- # (while (< islamic-year 1511)
- # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
--# (b (1+ (calendar-islamic-to-absolute (list 10 1 islamic-year))))
-+# (b (+ 2 (calendar-islamic-to-absolute (list 10 1 islamic-year))))
- # (sunday 0))
- # (while (/= sunday (mod (setq a (1- a)) 7)))
- # (while (/= sunday (mod b 7))
-@@ -923,7 +935,7 @@
- # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
- # (setq islamic-year (+ 1 islamic-year))))
-
--# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Morocco 1939 only - Sep 12 0:00 1:00 -
- Rule Morocco 1939 only - Nov 19 0:00 0 -
- Rule Morocco 1940 only - Feb 25 0:00 1:00 -
-@@ -974,7 +986,7 @@
- Rule Morocco 2022 only - Mar 27 3:00 0 -
- Rule Morocco 2022 only - May 8 2:00 1:00 -
- Rule Morocco 2023 only - Mar 19 3:00 0 -
--Rule Morocco 2023 only - Apr 23 2:00 1:00 -
-+Rule Morocco 2023 only - Apr 30 2:00 1:00 -
- Rule Morocco 2024 only - Mar 10 3:00 0 -
- Rule Morocco 2024 only - Apr 14 2:00 1:00 -
- Rule Morocco 2025 only - Feb 23 3:00 0 -
-@@ -990,7 +1002,7 @@
- Rule Morocco 2029 only - Dec 30 3:00 0 -
- Rule Morocco 2030 only - Feb 10 2:00 1:00 -
- Rule Morocco 2030 only - Dec 22 3:00 0 -
--Rule Morocco 2031 only - Jan 26 2:00 1:00 -
-+Rule Morocco 2031 only - Feb 2 2:00 1:00 -
- Rule Morocco 2031 only - Dec 14 3:00 0 -
- Rule Morocco 2032 only - Jan 18 2:00 1:00 -
- Rule Morocco 2032 only - Nov 28 3:00 0 -
-@@ -1006,7 +1018,7 @@
- Rule Morocco 2037 only - Oct 4 3:00 0 -
- Rule Morocco 2037 only - Nov 15 2:00 1:00 -
- Rule Morocco 2038 only - Sep 26 3:00 0 -
--Rule Morocco 2038 only - Oct 31 2:00 1:00 -
-+Rule Morocco 2038 only - Nov 7 2:00 1:00 -
- Rule Morocco 2039 only - Sep 18 3:00 0 -
- Rule Morocco 2039 only - Oct 23 2:00 1:00 -
- Rule Morocco 2040 only - Sep 2 3:00 0 -
-@@ -1022,7 +1034,7 @@
- Rule Morocco 2045 only - Jul 9 3:00 0 -
- Rule Morocco 2045 only - Aug 20 2:00 1:00 -
- Rule Morocco 2046 only - Jul 1 3:00 0 -
--Rule Morocco 2046 only - Aug 5 2:00 1:00 -
-+Rule Morocco 2046 only - Aug 12 2:00 1:00 -
- Rule Morocco 2047 only - Jun 23 3:00 0 -
- Rule Morocco 2047 only - Jul 28 2:00 1:00 -
- Rule Morocco 2048 only - Jun 7 3:00 0 -
-@@ -1038,7 +1050,7 @@
- Rule Morocco 2053 only - Apr 13 3:00 0 -
- Rule Morocco 2053 only - May 25 2:00 1:00 -
- Rule Morocco 2054 only - Apr 5 3:00 0 -
--Rule Morocco 2054 only - May 10 2:00 1:00 -
-+Rule Morocco 2054 only - May 17 2:00 1:00 -
- Rule Morocco 2055 only - Mar 28 3:00 0 -
- Rule Morocco 2055 only - May 2 2:00 1:00 -
- Rule Morocco 2056 only - Mar 12 3:00 0 -
-@@ -1054,7 +1066,7 @@
- Rule Morocco 2061 only - Jan 16 3:00 0 -
- Rule Morocco 2061 only - Feb 27 2:00 1:00 -
- Rule Morocco 2062 only - Jan 8 3:00 0 -
--Rule Morocco 2062 only - Feb 12 2:00 1:00 -
-+Rule Morocco 2062 only - Feb 19 2:00 1:00 -
- Rule Morocco 2062 only - Dec 31 3:00 0 -
- Rule Morocco 2063 only - Feb 4 2:00 1:00 -
- Rule Morocco 2063 only - Dec 16 3:00 0 -
-@@ -1070,7 +1082,7 @@
- Rule Morocco 2068 only - Oct 21 3:00 0 -
- Rule Morocco 2068 only - Dec 2 2:00 1:00 -
- Rule Morocco 2069 only - Oct 13 3:00 0 -
--Rule Morocco 2069 only - Nov 17 2:00 1:00 -
-+Rule Morocco 2069 only - Nov 24 2:00 1:00 -
- Rule Morocco 2070 only - Oct 5 3:00 0 -
- Rule Morocco 2070 only - Nov 9 2:00 1:00 -
- Rule Morocco 2071 only - Sep 20 3:00 0 -
-@@ -1086,7 +1098,7 @@
- Rule Morocco 2076 only - Jul 26 3:00 0 -
- Rule Morocco 2076 only - Sep 6 2:00 1:00 -
- Rule Morocco 2077 only - Jul 18 3:00 0 -
--Rule Morocco 2077 only - Aug 22 2:00 1:00 -
-+Rule Morocco 2077 only - Aug 29 2:00 1:00 -
- Rule Morocco 2078 only - Jul 10 3:00 0 -
- Rule Morocco 2078 only - Aug 14 2:00 1:00 -
- Rule Morocco 2079 only - Jun 25 3:00 0 -
-@@ -1096,13 +1108,13 @@
- Rule Morocco 2081 only - Jun 1 3:00 0 -
- Rule Morocco 2081 only - Jul 13 2:00 1:00 -
- Rule Morocco 2082 only - May 24 3:00 0 -
--Rule Morocco 2082 only - Jun 28 2:00 1:00 -
-+Rule Morocco 2082 only - Jul 5 2:00 1:00 -
- Rule Morocco 2083 only - May 16 3:00 0 -
- Rule Morocco 2083 only - Jun 20 2:00 1:00 -
- Rule Morocco 2084 only - Apr 30 3:00 0 -
- Rule Morocco 2084 only - Jun 11 2:00 1:00 -
- Rule Morocco 2085 only - Apr 22 3:00 0 -
--Rule Morocco 2085 only - May 27 2:00 1:00 -
-+Rule Morocco 2085 only - Jun 3 2:00 1:00 -
- Rule Morocco 2086 only - Apr 14 3:00 0 -
- Rule Morocco 2086 only - May 19 2:00 1:00 -
- Rule Morocco 2087 only - Mar 30 3:00 0 -
-@@ -1203,7 +1215,7 @@
- # Use plain "WAT" and "CAT" for the time zone abbreviations, to be compatible
- # with Namibia's neighbors.
-
--# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Vanguard section, for zic and other parsers that support negative DST.
- #Rule Namibia 1994 only - Mar 21 0:00 -1:00 WAT
- #Rule Namibia 1994 2017 - Sep Sun>=1 2:00 0 CAT
-@@ -1326,7 +1338,7 @@
- # See Africa/Nairobi.
-
- # South Africa
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule SA 1942 1943 - Sep Sun>=15 2:00 1:00 -
- Rule SA 1943 1944 - Mar Sun>=15 2:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1359,7 +1371,7 @@
- # Abdalla of NTC, archived at:
- # https://mm.icann.org/pipermail/tz/2017-October/025333.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Sudan 1970 only - May 1 0:00 1:00 S
- Rule Sudan 1970 1985 - Oct 15 0:00 0 -
- Rule Sudan 1971 only - Apr 30 0:00 1:00 S
-@@ -1447,7 +1459,7 @@
- # http://www.almadenahnews.com/newss/news.php?c=118&id=38036
- # http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Tunisia 1939 only - Apr 15 23:00s 1:00 S
- Rule Tunisia 1939 only - Nov 18 23:00s 0 -
- Rule Tunisia 1940 only - Feb 25 23:00s 1:00 S
-@@ -1474,9 +1486,7 @@
- Rule Tunisia 2006 2008 - Mar lastSun 2:00s 1:00 S
- Rule Tunisia 2006 2008 - Oct lastSun 2:00s 0 -
-
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
--# Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
-+# See Europe/Paris for PMT-related transitions.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
- Zone Africa/Tunis 0:40:44 - LMT 1881 May 12
- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/antarctica openjdk/jdk/test/sun/util/calendar/zi/tzdata/antarctica
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/antarctica
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/antarctica
-@@ -93,15 +93,30 @@
- # Australian Antarctica Division informed us that Casey changed time
- # zone to UTC+11 in "the morning of 22nd October 2016".
-
-+# From Steffen Thorsen (2020-10-02, as corrected):
-+# Based on information we have received from the Australian Antarctic
-+# Division, Casey station and Macquarie Island station will move to Tasmanian
-+# daylight savings time on Sunday 4 October. This will take effect from 0001
-+# hrs on Sunday 4 October 2020 and will mean Casey and Macquarie Island will
-+# be on the same time zone as Hobart. Some past dates too for this 3 hour
-+# time change back and forth between UTC+8 and UTC+11 for Casey:
-+# - 2018 Oct 7 4:00 - 2019 Mar 17 3:00 - 2019 Oct 4 3:00 - 2020 Mar 8 3:00
-+# and now - 2020 Oct 4 0:01
-+
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Antarctica/Casey 0 - -00 1969
-- 8:00 - +08 2009 Oct 18 2:00
-+Zone Antarctica/Casey 0 - -00 1969
-+ 8:00 - +08 2009 Oct 18 2:00
- 11:00 - +11 2010 Mar 5 2:00
-- 8:00 - +08 2011 Oct 28 2:00
-+ 8:00 - +08 2011 Oct 28 2:00
- 11:00 - +11 2012 Feb 21 17:00u
-- 8:00 - +08 2016 Oct 22
-+ 8:00 - +08 2016 Oct 22
- 11:00 - +11 2018 Mar 11 4:00
-- 8:00 - +08
-+ 8:00 - +08 2018 Oct 7 4:00
-+ 11:00 - +11 2019 Mar 17 3:00
-+ 8:00 - +08 2019 Oct 4 3:00
-+ 11:00 - +11 2020 Mar 8 3:00
-+ 8:00 - +08 2020 Oct 4 0:01
-+ 11:00 - +11
- Zone Antarctica/Davis 0 - -00 1957 Jan 13
- 7:00 - +07 1964 Nov
- 0 - -00 1969 Feb
-@@ -247,7 +262,7 @@
- # suggested by Bengt-Inge Larsson comment them out for now, and approximate
- # with only UTC and CEST. Uncomment them when 2014b is more prevalent.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- #Rule Troll 2005 max - Mar 1 1:00u 1:00 +01
- Rule Troll 2005 max - Mar lastSun 1:00u 2:00 +02
- #Rule Troll 2005 max - Oct lastSun 1:00u 1:00 +01
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/asia openjdk/jdk/test/sun/util/calendar/zi/tzdata/asia
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/asia
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/asia
-@@ -93,7 +93,7 @@
- ###############################################################################
-
- # These rules are stolen from the 'europe' file.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EUAsia 1981 max - Mar lastSun 1:00u 1:00 S
- Rule EUAsia 1979 1995 - Sep lastSun 1:00u 0 -
- Rule EUAsia 1996 max - Oct lastSun 1:00u 0 -
-@@ -137,7 +137,7 @@
- # or
- # (brief)
- # http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Armenia 2011 only - Mar lastSun 2:00s 1:00 -
- Rule Armenia 2011 only - Oct lastSun 2:00s 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -163,7 +163,7 @@
- # http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-d...
- # http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Azer 1997 2015 - Mar lastSun 4:00 1:00 -
- Rule Azer 1997 2015 - Oct lastSun 5:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -250,7 +250,7 @@
- # http://www.thedailystar.net/newDesign/latest_news.php?nid=22817
- # http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Dhaka 2009 only - Jun 19 23:00 1:00 -
- Rule Dhaka 2009 only - Dec 31 24:00 0 -
-
-@@ -326,7 +326,7 @@
- # generally esteemed a success, it was announced early in 1920 that it would
- # not be repeated."
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Shang 1919 only - Apr 12 24:00 1:00 D
- Rule Shang 1919 only - Sep 30 24:00 0 S
-
-@@ -422,7 +422,7 @@
- # the Yangtze river delta area during that period of time although the scope
- # of such use will need to be investigated to determine.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Shang 1940 only - Jun 1 0:00 1:00 D
- Rule Shang 1940 only - Oct 12 24:00 0 S
- Rule Shang 1941 only - Mar 15 0:00 1:00 D
-@@ -485,7 +485,7 @@
- # to begin on 17 April.
- # http://data.people.com.cn/pic/101p/1988/04/1988041201.jpg
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule PRC 1986 only - May 4 2:00 1:00 D
- Rule PRC 1986 1991 - Sep Sun>=11 2:00 0 S
- Rule PRC 1987 1991 - Apr Sun>=11 2:00 1:00 D
-@@ -869,7 +869,7 @@
- # or dates for the 1942 and 1945 transitions.
- # The Japanese occupation of Hong Kong began 1941-12-25.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule HK 1946 only - Apr 21 0:00 1:00 S
- Rule HK 1946 only - Dec 1 3:30s 0 -
- Rule HK 1947 only - Apr 13 3:30s 1:00 S
-@@ -996,7 +996,7 @@
- # until 1945-09-21 at 01:00, overriding Shanks & Pottenger.
- # Likewise, use Yu-Cheng Chuang's data for DST in Taiwan.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Taiwan 1946 only - May 15 0:00 1:00 D
- Rule Taiwan 1946 only - Oct 1 0:00 0 S
- Rule Taiwan 1947 only - Apr 15 0:00 1:00 D
-@@ -1122,7 +1122,7 @@
- # The 1904 decree says that Macau changed from the meridian of
- # Fortaleza do Monte, presumably the basis for the 7:34:10 for LMT.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Macau 1942 1943 - Apr 30 23:00 1:00 -
- Rule Macau 1942 only - Nov 17 23:00 0 -
- Rule Macau 1943 only - Sep 30 23:00 0 S
-@@ -1180,7 +1180,7 @@
- # Cyprus to remain united in time. Cyprus Mail 2017-10-17.
- # https://cyprus-mail.com/2017/10/17/cyprus-remain-united-time/
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cyprus 1975 only - Apr 13 0:00 1:00 S
- Rule Cyprus 1975 only - Oct 12 0:00 0 -
- Rule Cyprus 1976 only - May 15 0:00 1:00 S
-@@ -1557,7 +1557,7 @@
- # be changed back to its previous state on the 24 hours of the
- # thirtieth day of Shahrivar.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iran 1978 1980 - Mar 20 24:00 1:00 -
- Rule Iran 1978 only - Oct 20 24:00 0 -
- Rule Iran 1979 only - Sep 18 24:00 0 -
-@@ -1699,7 +1699,7 @@
- # We have published a short article in English about the change:
- # https://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iraq 1982 only - May 1 0:00 1:00 -
- Rule Iraq 1982 1984 - Oct 1 0:00 0 -
- Rule Iraq 1983 only - Mar 31 0:00 1:00 -
-@@ -1722,6 +1722,10 @@
-
- # Israel
-
-+# For more info about the motivation for DST in Israel, see:
-+# Barak Y. Israel's Daylight Saving Time controversy. Israel Affairs.
-+# 2020-08-11. https://doi.org/10.1080/13537121.2020.1806564
-+
- # From Ephraim Silverberg (2001-01-11):
- #
- # I coined "IST/IDT" circa 1988. Until then there were three
-@@ -1743,7 +1747,7 @@
- # family is from India).
-
- # From Shanks & Pottenger:
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1940 only - Jun 1 0:00 1:00 D
- Rule Zion 1942 1944 - Nov 1 0:00 0 S
- Rule Zion 1943 only - Apr 1 2:00 1:00 D
-@@ -1835,7 +1839,7 @@
- # (except in 2002) is three nights before Yom Kippur [Day of Atonement]
- # (the eve of the 7th of Tishrei in the lunar Hebrew calendar).
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1989 only - Apr 30 0:00 1:00 D
- Rule Zion 1989 only - Sep 3 0:00 0 S
- Rule Zion 1990 only - Mar 25 0:00 1:00 D
-@@ -1851,7 +1855,7 @@
- # Ministry of Interior, Jerusalem, Israel. The spokeswoman can be reached by
- # calling the office directly at 972-2-6701447 or 972-2-6701448.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1994 only - Apr 1 0:00 1:00 D
- Rule Zion 1994 only - Aug 28 0:00 0 S
- Rule Zion 1995 only - Mar 31 0:00 1:00 D
-@@ -1871,7 +1875,7 @@
- #
- # where YYYY is the relevant year.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 1996 only - Mar 15 0:00 1:00 D
- Rule Zion 1996 only - Sep 16 0:00 0 S
- Rule Zion 1997 only - Mar 21 0:00 1:00 D
-@@ -1894,7 +1898,7 @@
- #
- # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2000-2004.ps.gz
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2000 only - Apr 14 2:00 1:00 D
- Rule Zion 2000 only - Oct 6 1:00 0 S
- Rule Zion 2001 only - Apr 9 1:00 1:00 D
-@@ -1916,7 +1920,7 @@
- #
- # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2005 2012 - Apr Fri<=1 2:00 1:00 D
- Rule Zion 2005 only - Oct 9 2:00 0 S
- Rule Zion 2006 only - Oct 1 2:00 0 S
-@@ -1936,7 +1940,7 @@
- # As of 2013, DST starts at 02:00 on the Friday before the last Sunday
- # in March. DST ends at 02:00 on the last Sunday of October.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D
- Rule Zion 2013 max - Oct lastSun 2:00 0 S
-
-@@ -2036,7 +2040,7 @@
- # do in any POSIX or C platform. The "25:00" assumes zic from 2007 or later,
- # which should be safe now.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Japan 1948 only - May Sat>=1 24:00 1:00 D
- Rule Japan 1948 1951 - Sep Sun>=9 1:00 0 S
- Rule Japan 1949 only - Apr Sat>=1 24:00 1:00 D
-@@ -2113,7 +2117,7 @@
- # From Paul Eggert (2013-12-11):
- # As Steffen suggested, consider the past 21-month experiment to be DST.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Jordan 1973 only - Jun 6 0:00 1:00 S
- Rule Jordan 1973 1975 - Oct 1 0:00 0 -
- Rule Jordan 1974 1977 - May 1 0:00 1:00 S
-@@ -2439,7 +2443,7 @@
- # Our government cancels daylight saving time 6th of August 2005.
- # From 2005-08-12 our GMT-offset is +6, w/o any daylight saving.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Kyrgyz 1992 1996 - Apr Sun>=7 0:00s 1:00 -
- Rule Kyrgyz 1992 1996 - Sep lastSun 0:00 0 -
- Rule Kyrgyz 1997 2005 - Mar lastSun 2:30 1:00 -
-@@ -2495,7 +2499,7 @@
- # follow and continued to use GMT+9:00 for interoperability.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule ROK 1948 only - Jun 1 0:00 1:00 D
- Rule ROK 1948 only - Sep 12 24:00 0 S
- Rule ROK 1949 only - Apr 3 0:00 1:00 D
-@@ -2583,7 +2587,7 @@
-
-
- # Lebanon
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Lebanon 1920 only - Mar 28 0:00 1:00 S
- Rule Lebanon 1920 only - Oct 25 0:00 0 -
- Rule Lebanon 1921 only - Apr 3 0:00 1:00 S
-@@ -2613,7 +2617,7 @@
- 2:00 Lebanon EE%sT
-
- # Malaysia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NBorneo 1935 1941 - Sep 14 0:00 0:20 -
- Rule NBorneo 1935 1941 - Dec 14 0:00 0 -
- #
-@@ -2758,7 +2762,7 @@
- # September daylight saving time ends. Source:
- # http://zasag.mn/news/view/8969
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mongol 1983 1984 - Apr 1 0:00 1:00 -
- Rule Mongol 1983 only - Oct 1 0:00 0 -
- # Shanks & Pottenger and IATA SSIM say 1990s switches occurred at 00:00,
-@@ -2946,7 +2950,7 @@
- # "People laud PM's announcement to end DST"
- # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Pakistan 2002 only - Apr Sun>=2 0:00 1:00 S
- Rule Pakistan 2002 only - Oct Sun>=2 0:00 0 -
- Rule Pakistan 2008 only - Jun 1 0:00 1:00 S
-@@ -3248,7 +3252,7 @@
- # From Tim Parenti (2016-10-19):
- # Predict fall transitions on October's last Saturday at 01:00 from now on.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
- Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
- Rule EgyptAsia 1958 only - May 1 0:00 1:00 S
-@@ -3348,7 +3352,7 @@
- # influence of the sources. There is no current abbreviation for DST,
- # so use "PDT", the usual American style.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Phil 1936 only - Nov 1 0:00 1:00 D
- Rule Phil 1937 only - Feb 1 0:00 0 S
- Rule Phil 1954 only - Apr 12 0:00 1:00 D
-@@ -3496,7 +3500,7 @@
- 5:30 - +0530
-
- # Syria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Syria 1920 1923 - Apr Sun>=15 2:00 1:00 S
- Rule Syria 1920 1923 - Oct Sun>=1 2:00 0 -
- Rule Syria 1962 only - Apr 29 2:00 1:00 S
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/australasia openjdk/jdk/test/sun/util/calendar/zi/tzdata/australasia
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/australasia
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/australasia
-@@ -36,7 +36,7 @@
-
- # Please see the notes below for the controversy about "EST" versus "AEST" etc.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Aus 1917 only - Jan 1 0:01 1:00 D
- Rule Aus 1917 only - Mar 25 2:00 0 S
- Rule Aus 1942 only - Jan 1 2:00 1:00 D
-@@ -55,7 +55,7 @@
- 9:30 Aus AC%sT
- # Western Australia
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AW 1974 only - Oct lastSun 2:00s 1:00 D
- Rule AW 1975 only - Mar Sun>=1 2:00s 0 S
- Rule AW 1983 only - Oct lastSun 2:00s 1:00 D
-@@ -93,7 +93,7 @@
- # applies to all of the Whitsundays.
- # http://www.australia.gov.au/about-australia/australian-story/austn-islands
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AQ 1971 only - Oct lastSun 2:00s 1:00 D
- Rule AQ 1972 only - Feb lastSun 2:00s 0 S
- Rule AQ 1989 1991 - Oct lastSun 2:00s 1:00 D
-@@ -109,7 +109,7 @@
- 10:00 Holiday AE%sT
-
- # South Australia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AS 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AS 1986 only - Oct 19 2:00s 1:00 D
- Rule AS 1987 2007 - Oct lastSun 2:00s 1:00 D
-@@ -137,7 +137,7 @@
- # http://www.bom.gov.au/climate/averages/tables/dst_times.shtml
- # says King Island didn't observe DST from WWII until late 1971.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AT 1967 only - Oct Sun>=1 2:00s 1:00 D
- Rule AT 1968 only - Mar lastSun 2:00s 0 S
- Rule AT 1968 1985 - Oct lastSun 2:00s 1:00 D
-@@ -170,7 +170,7 @@
- 10:00 AT AE%sT
-
- # Victoria
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AV 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AV 1972 only - Feb lastSun 2:00s 0 S
- Rule AV 1973 1985 - Mar Sun>=1 2:00s 0 S
-@@ -191,7 +191,7 @@
- 10:00 AV AE%sT
-
- # New South Wales
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule AN 1971 1985 - Oct lastSun 2:00s 1:00 D
- Rule AN 1972 only - Feb 27 2:00s 0 S
- Rule AN 1973 1981 - Mar Sun>=1 2:00s 0 S
-@@ -220,7 +220,7 @@
- 9:30 AS AC%sT
-
- # Lord Howe Island
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule LH 1981 1984 - Oct lastSun 2:00 1:00 -
- Rule LH 1982 1985 - Mar Sun>=1 2:00 0 -
- Rule LH 1985 only - Oct lastSun 2:00 0:30 -
-@@ -275,8 +275,9 @@
- 10:00 Aus AE%sT 1919 Apr 1 0:00s
- 0 - -00 1948 Mar 25
- 10:00 Aus AE%sT 1967
-- 10:00 AT AE%sT 2010 Apr 4 3:00
-- 11:00 - +11
-+ 10:00 AT AE%sT 2010
-+ 10:00 1:00 AEDT 2011
-+ 10:00 AT AE%sT
-
- # Christmas
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -403,7 +404,7 @@
- # From Michael Deckers (2019-08-06):
- # https://www.laws.gov.fj/LawsAsMade/downloadfile/848
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 -
- Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
- Rule Fiji 2009 only - Nov 29 2:00 1:00 -
-@@ -432,7 +433,7 @@
-
- # Guam
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # http://guamlegislature.com/Public_Laws_5th/PL05-025.pdf
- # http://documents.guam.gov/wp-content/uploads/E.O.-59-7-Guam-Daylight-Savi...
- Rule Guam 1959 only - Jun 27 2:00 1:00 D
-@@ -543,7 +544,7 @@
- 12:00 - +12
-
- # New Caledonia
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NC 1977 1978 - Dec Sun>=1 0:00 1:00 -
- Rule NC 1978 1979 - Feb 27 0:00 0 -
- Rule NC 1996 only - Dec 1 2:00s 1:00 -
-@@ -558,7 +559,7 @@
-
- # New Zealand
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NZ 1927 only - Nov 6 2:00 1:00 S
- Rule NZ 1928 only - Mar 4 2:00 0 M
- Rule NZ 1928 1933 - Oct Sun>=8 2:00 0:30 S
-@@ -610,7 +611,7 @@
-
- # Cook Is
- # From Shanks & Pottenger:
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cook 1978 only - Nov 12 0:00 0:30 -
- Rule Cook 1979 1991 - Mar Sun>=1 0:00 0 -
- Rule Cook 1979 1990 - Oct lastSun 0:00 0:30 -
-@@ -755,7 +756,7 @@
- # That web page currently lists transitions for 2012/3 and 2013/4.
- # Assume the pattern instituted in 2012 will continue indefinitely.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule WS 2010 only - Sep lastSun 0:00 1 -
- Rule WS 2011 only - Apr Sat>=1 4:00 0 -
- Rule WS 2011 only - Sep lastSat 3:00 1 -
-@@ -799,7 +800,7 @@
- 13:00 - +13
-
- # Tonga
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Tonga 1999 only - Oct 7 2:00s 1:00 -
- Rule Tonga 2000 only - Mar 19 2:00s 0 -
- Rule Tonga 2000 2001 - Nov Sun>=1 2:00 1:00 -
-@@ -880,7 +881,7 @@
-
-
- # Vanuatu
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Vanuatu 1983 only - Sep 25 0:00 1:00 -
- Rule Vanuatu 1984 1991 - Mar Sun>=23 0:00 0 -
- Rule Vanuatu 1984 only - Oct 23 0:00 1:00 -
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/europe openjdk/jdk/test/sun/util/calendar/zi/tzdata/europe
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/europe
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/europe
-@@ -411,7 +411,7 @@
- # http://www.irishstatutebook.ie/eli/1926/sro/919/made/en/print
- # http://www.irishstatutebook.ie/eli/1947/sro/71/made/en/print
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Summer Time Act, 1916
- Rule GB-Eire 1916 only - May 21 2:00s 1:00 BST
- Rule GB-Eire 1916 only - Oct 1 2:00s 0 GMT
-@@ -552,7 +552,7 @@
- # The following is like GB-Eire and EU, except with standard time in
- # summer and negative daylight saving time in winter. It is for when
- # negative SAVE values are used.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- #Rule Eire 1971 only - Oct 31 2:00u -1:00 -
- #Rule Eire 1972 1980 - Mar Sun>=16 2:00u 0 -
- #Rule Eire 1972 1980 - Oct Sun>=23 2:00u -1:00 -
-@@ -589,7 +589,7 @@
- # predecessor organization, the European Communities.
- # For brevity they are called "EU rules" elsewhere in this file.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule EU 1977 1980 - Apr Sun>=1 1:00u 1:00 S
- Rule EU 1977 only - Sep lastSun 1:00u 0 -
- Rule EU 1978 only - Oct 1 1:00u 0 -
-@@ -629,13 +629,13 @@
- # corrected in version 2008d). The circumstantial evidence is simply the
- # tz database itself, as seen below:
- #
--# Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
-+# Zone Europe/Paris ...
- # 0:00 France WE%sT 1945 Sep 16 3:00
- #
--# Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
-+# Zone Europe/Monaco ...
- # 0:00 France WE%sT 1945 Sep 16 3:00
- #
--# Zone Europe/Belgrade 1:22:00 - LMT 1884
-+# Zone Europe/Belgrade ...
- # 1:00 1:00 CEST 1945 Sep 16 2:00s
- #
- # Rule France 1945 only - Sep 16 3:00 0 -
-@@ -681,7 +681,7 @@
- #
- # The 1917-1921 decree URLs are from Alexander Belopolsky (2016-08-23).
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Russia 1917 only - Jul 1 23:00 1:00 MST # Moscow Summer Time
- #
- # Decree No. 142 (1917-12-22) http://istmat.info/node/28137
-@@ -795,7 +795,7 @@
-
-
- # Albania
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Albania 1940 only - Jun 16 0:00 1:00 S
- Rule Albania 1942 only - Nov 2 3:00 0 -
- Rule Albania 1943 only - Mar 29 2:00 1:00 S
-@@ -849,7 +849,7 @@
- # In 1946 the end of DST was on Monday, 7 October 1946, at 3:00 am.
- # Shanks had this right. Source: Die Weltpresse, 5. Oktober 1946, page 5.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Austria 1920 only - Apr 5 2:00s 1:00 S
- Rule Austria 1920 only - Sep 13 2:00s 0 -
- Rule Austria 1946 only - Apr 14 2:00s 1:00 S
-@@ -936,7 +936,7 @@
- # The 1918 rules are listed for completeness; they apply to unoccupied Belgium.
- # Assume Brussels switched to WET in 1918 when the armistice took effect.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Belgium 1918 only - Mar 9 0:00s 1:00 S
- Rule Belgium 1918 1919 - Oct Sat>=1 23:00s 0 -
- Rule Belgium 1919 only - Mar 1 23:00s 1:00 S
-@@ -996,7 +996,7 @@
- # EET -> EETDST is in 03:00 Local time in last Sunday of March ...
- # EETDST -> EET is in 04:00 Local time in last Sunday of October
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Bulg 1979 only - Mar 31 23:00 1:00 S
- Rule Bulg 1979 only - Oct 1 1:00 0 -
- Rule Bulg 1980 1982 - Apr Sat>=1 23:00 1:00 S
-@@ -1028,7 +1028,7 @@
- # We know of no English-language name for historical Czech winter time;
- # abbreviate it as "GMT", as it happened to be GMT.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Czech 1945 only - Apr Mon>=1 2:00s 1:00 S
- Rule Czech 1945 only - Oct 1 2:00s 0 -
- Rule Czech 1946 only - May 6 2:00s 1:00 S
-@@ -1084,7 +1084,7 @@
- # Hence the "02:00" of the 1980 law refers to standard time, not
- # wall-clock time, and so the EU rules were in effect in 1980.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Denmark 1916 only - May 14 23:00 1:00 S
- Rule Denmark 1916 only - Sep 30 23:00 0 -
- Rule Denmark 1940 only - May 15 0:00 1:00 S
-@@ -1186,7 +1186,7 @@
- # http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-t...
- # It is their only National Park.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D
- Rule Thule 1991 1992 - Sep lastSun 2:00 0 S
- Rule Thule 1993 2006 - Apr Sun>=1 2:00 1:00 D
-@@ -1317,7 +1317,7 @@
- # From Paul Eggert (2014-06-14):
- # Go with Oja over Shanks.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Finland 1942 only - Apr 2 24:00 1:00 S
- Rule Finland 1942 only - Oct 4 1:00 0 -
- Rule Finland 1981 1982 - Mar lastSun 2:00 1:00 S
-@@ -1349,10 +1349,58 @@
- # Françoise Gauquelin, Problèmes de l'heure résolus en astrologie,
- # Guy Trédaniel, Paris 1987
-
-+# From Michael Deckers (2020-06-11):
-+# the law of 1891 <https://gallica.bnf.fr/ark:/12148/bpt6k64415343.texteImage>
-+# was published on 1891-03-15, so it could only take force on 1891-03-16.
-+
-+# From Michael Deckers (2020-06-10):
-+# Le Gaulois, 1911-03-11, page 1/6, online at
-+# https://www.retronews.fr/societe/echo-de-presse/2018/01/29/1911-change-lh...
-+# ... [ Instantly, all pressure driven clock dials halted... Nine minutes and
-+# twenty-one seconds later the hands resumed their circular motion. ]
-+# There are also precise reports about how the change was prepared in train
-+# stations: all the publicly visible clocks stopped at midnight railway time
-+# (or were covered), only the chief of service had a watch, labeled
-+# "Heure ancienne", that he kept running until it reached 00:04:21, when
-+# he announced "Heure nouvelle". See the "Le Petit Journal 1911-03-11".
-+# https://gallica.bnf.fr/ark:/12148/bpt6k6192911/f1.item.zoom
-+#
-+# From Michael Deckers (2020-06-12):
-+# That "all French clocks stopped" for 00:09:21 is a misreading of French
-+# newspapers; this sort of adjustment applies only to certain
-+# remote-controlled clocks ("pendules pneumatiques", of which there existed
-+# perhaps a dozen in Paris, and which simply could not be set back remotely),
-+# but not to all the clocks in all French towns and villages. For instance,
-+# the following story in the "Courrier de Saône-et-Loire" 1911-03-11, page 2:
-+# only works if legal time was stepped back (was not monotone): ...
-+# [One can observe that children who had been born at midnight less 5
-+# minutes and who had died at midnight of the old time, would turn out to
-+# be dead before being born, time having been set back and having
-+# suppressed 9 minutes and 25 seconds of their existence, that is, more
-+# than they could spend.]
-+#
-+# From Paul Eggert (2020-06-12):
-+# French time in railway stations was legally five minutes behind civil time,
-+# which explains why railway "old time" ran to 00:04:21 instead of to 00:09:21.
-+# The law's text (which Michael Deckers noted is at
-+# <https://gallica.bnf.fr/ark:/12148/bpt6k2022333z/f2>) says only that
-+# at 1911-03-11 00:00 legal time was that of Paris mean time delayed by
-+# nine minutes and twenty-one seconds, and does not say how the
-+# transition from Paris mean time was to occur.
-+#
-+# tzdb has no way to represent stopped clocks. As the railway practice
-+# was to keep a watch running on "old time" to decide when to restart
-+# the other clocks, this could be modeled as a transition for "old time" at
-+# 00:09:21. However, since the law was ambiguous and clocks outside railway
-+# stations were probably done haphazardly with the popular impression being
-+# that the transition was done at 00:00 "old time", simply leave the time
-+# blank; this causes zic to default to 00:00 "old time" which is good enough.
-+# Do something similar for the 1891-03-16 transition. There are similar
-+# problems in Algiers, Monaco and Tunis.
-
- #
- # Shank & Pottenger seem to use '24:00' ambiguously; resolve it with Whitman.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule France 1916 only - Jun 14 23:00s 1:00 S
- Rule France 1916 1919 - Oct Sun>=1 23:00s 0 -
- Rule France 1917 only - Mar 24 23:00s 1:00 S
-@@ -1412,13 +1460,11 @@
- # go with Excoffier's 28/3/76 0hUT and 25/9/76 23hUT.
- Rule France 1976 only - Mar 28 1:00 1:00 S
- Rule France 1976 only - Sep 26 1:00 0 -
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time, and Whitman 0:09:05,
--# but Howse quotes the actual French legislation as saying 0:09:21.
--# Go with Howse. Howse writes that the time in France was officially based
-+# Howse writes that the time in France was officially based
- # on PMT-0:09:21 until 1978-08-09, when the time base finally switched to UTC.
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
-- 0:09:21 - PMT 1911 Mar 11 0:01 # Paris MT
-+Zone Europe/Paris 0:09:21 - LMT 1891 Mar 16
-+ 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
- # Shanks & Pottenger give 1940 Jun 14 0:00; go with Excoffier and Le Corre.
- 0:00 France WE%sT 1940 Jun 14 23:00
- # Le Corre says Paris stuck with occupied-France time after the liberation;
-@@ -1447,7 +1493,7 @@
- # this was equivalent to UT +03, not +04.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Germany 1946 only - Apr 14 2:00s 1:00 S
- Rule Germany 1946 only - Oct 7 2:00s 0 -
- Rule Germany 1947 1949 - Oct Sun>=1 2:00s 0 -
-@@ -1499,7 +1545,7 @@
- 1:00 EU CE%sT
-
- # Greece
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Whitman gives 1932 Jul 5 - Nov 1; go with Shanks & Pottenger.
- Rule Greece 1932 only - Jul 7 0:00 1:00 S
- Rule Greece 1932 only - Sep 1 0:00 0 -
-@@ -1534,38 +1580,69 @@
- 2:00 EU EE%sT
-
- # Hungary
--# From Paul Eggert (2014-07-15):
--# Dates for 1916-1945 are taken from:
--# Oross A. Jelen a múlt jövője: a nyári időszámítás Magyarországon 1916-1945.
--# National Archives of Hungary (2012-10-29).
--# http://mnl.gov.hu/a_het_dokumentuma/a_nyari_idoszamitas_magyarorszagon_19...
--# This source does not always give times, which are taken from Shanks
--# & Pottenger (which disagree about the dates).
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule Hungary 1918 only - Apr 1 3:00 1:00 S
--Rule Hungary 1918 only - Sep 16 3:00 0 -
--Rule Hungary 1919 only - Apr 15 3:00 1:00 S
--Rule Hungary 1919 only - Nov 24 3:00 0 -
-+
-+# From Michael Deckers (2020-06-09):
-+# an Austrian encyclopedia of railroads of 1913, online at
-+# http://www.zeno.org/Roell-1912/A/Eisenbahnzeit
-+# says that the switch [to CET] happened on 1890-11-01.
-+
-+# From Géza Nyáry (2020-06-07):
-+# Data for 1918-1983 are based on the archive database of Library Hungaricana.
-+# The dates are collected from original, scanned governmental orders,
-+# bulletins, instructions and public press.
-+# [See URLs below.]
-+
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1918/?pg=238
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1919/?pg=808
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1920/?pg=201
-+Rule Hungary 1918 1919 - Apr 15 2:00 1:00 S
-+Rule Hungary 1918 1920 - Sep Mon>=15 3:00 0 -
-+Rule Hungary 1920 only - Apr 5 2:00 1:00 S
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1945/?pg=882
- Rule Hungary 1945 only - May 1 23:00 1:00 S
--Rule Hungary 1945 only - Nov 1 0:00 0 -
-+Rule Hungary 1945 only - Nov 1 1:00 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1946_03/?pg=49
- Rule Hungary 1946 only - Mar 31 2:00s 1:00 S
--Rule Hungary 1946 1949 - Oct Sun>=1 2:00s 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1946_09/?pg=54
-+Rule Hungary 1946 only - Oct 7 2:00 0 -
-+# https://library.hungaricana.hu/hu/view/KulfBelfHirek_1947_04_1__001-123/?...
-+# https://library.hungaricana.hu/hu/view/DunantuliNaplo_1947_09/?pg=128
-+# https://library.hungaricana.hu/hu/view/KulfBelfHirek_1948_03_3__001-123/?...
-+# https://library.hungaricana.hu/hu/view/Zala_1948_09/?pg=64
-+# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniN...
-+# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniN...
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1949_09/?pg=94
- Rule Hungary 1947 1949 - Apr Sun>=4 2:00s 1:00 S
--Rule Hungary 1950 only - Apr 17 2:00s 1:00 S
--Rule Hungary 1950 only - Oct 23 2:00s 0 -
--Rule Hungary 1954 1955 - May 23 0:00 1:00 S
--Rule Hungary 1954 1955 - Oct 3 0:00 0 -
--Rule Hungary 1956 only - Jun Sun>=1 0:00 1:00 S
--Rule Hungary 1956 only - Sep lastSun 0:00 0 -
--Rule Hungary 1957 only - Jun Sun>=1 1:00 1:00 S
--Rule Hungary 1957 only - Sep lastSun 3:00 0 -
--Rule Hungary 1980 only - Apr 6 1:00 1:00 S
-+Rule Hungary 1947 1949 - Oct Sun>=1 2:00s 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1954/?pg...
-+Rule Hungary 1954 only - May 23 0:00 1:00 S
-+Rule Hungary 1954 only - Oct 3 0:00 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1955/?pg...
-+Rule Hungary 1955 only - May 22 2:00 1:00 S
-+Rule Hungary 1955 only - Oct 2 3:00 0 -
-+# https://library.hungaricana.hu/hu/view/HevesMegyeiNepujsag_1956_06/?pg=0
-+# https://library.hungaricana.hu/hu/view/EszakMagyarorszag_1956_06/?pg=6
-+# https://library.hungaricana.hu/hu/view/SzolnokMegyeiNeplap_1957_04/?pg=120
-+# https://library.hungaricana.hu/hu/view/PestMegyeiHirlap_1957_09/?pg=143
-+Rule Hungary 1956 1957 - Jun Sun>=1 2:00 1:00 S
-+Rule Hungary 1956 1957 - Sep lastSun 3:00 0 -
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1980/?pg...
-+Rule Hungary 1980 only - Apr 6 0:00 1:00 S
-+Rule Hungary 1980 only - Sep 28 1:00 0 -
-+# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1981_01/?pg=79
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1982/?pg...
-+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1983/?pg=85
-+Rule Hungary 1981 1983 - Mar lastSun 0:00 1:00 S
-+Rule Hungary 1981 1983 - Sep lastSun 1:00 0 -
-+#
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Budapest 1:16:20 - LMT 1890 Oct
-+Zone Europe/Budapest 1:16:20 - LMT 1890 Nov 1
- 1:00 C-Eur CE%sT 1918
-- 1:00 Hungary CE%sT 1941 Apr 8
-+# https://library.hungaricana.hu/hu/view/OGYK_RT_1941/?pg=1204
-+ 1:00 Hungary CE%sT 1941 Apr 7 23:00
- 1:00 C-Eur CE%sT 1945
-- 1:00 Hungary CE%sT 1980 Sep 28 2:00s
-+ 1:00 Hungary CE%sT 1984
- 1:00 EU CE%sT
-
- # Iceland
-@@ -1601,7 +1678,7 @@
- # The information below is taken from the 1988 Almanak; see
- # http://www.almanak.hi.is/klukkan.html
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Iceland 1917 1919 - Feb 19 23:00 1:00 -
- Rule Iceland 1917 only - Oct 21 1:00 0 -
- Rule Iceland 1918 1919 - Nov 16 1:00 0 -
-@@ -1693,7 +1770,7 @@
- # to 1944-06-04; although Rome was an open city during this period, it
- # was effectively controlled by Germany.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Italy 1916 only - Jun 3 24:00 1:00 S
- Rule Italy 1916 1917 - Sep 30 24:00 0 -
- Rule Italy 1917 only - Mar 31 24:00 1:00 S
-@@ -1803,7 +1880,7 @@
- # urged Lithuania and Estonia to adopt a similar time policy, but it
- # appears that they will not do so....
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Latvia 1989 1996 - Mar lastSun 2:00s 1:00 S
- Rule Latvia 1989 1996 - Sep lastSun 2:00s 0 -
-
-@@ -1896,7 +1973,7 @@
- # Luxembourg
- # Whitman disagrees with most of these dates in minor ways;
- # go with Shanks & Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Lux 1916 only - May 14 23:00 1:00 S
- Rule Lux 1916 only - Oct 1 1:00 0 -
- Rule Lux 1917 only - Apr 28 23:00 1:00 S
-@@ -1937,7 +2014,7 @@
- # From Paul Eggert (2016-10-21):
- # Assume 1900-1972 was like Rome, overriding Shanks.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Malta 1973 only - Mar 31 0:00s 1:00 S
- Rule Malta 1973 only - Sep 29 0:00s 0 -
- Rule Malta 1974 only - Apr 21 0:00s 1:00 S
-@@ -2010,7 +2087,7 @@
- # says the 2014-03-30 spring-forward transition was at 02:00 local time.
- # Guess that since 1997 Moldova has switched one hour before the EU.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Moldova 1997 max - Mar lastSun 2:00 1:00 S
- Rule Moldova 1997 max - Oct lastSun 3:00 0 -
-
-@@ -2028,11 +2105,24 @@
- 2:00 Moldova EE%sT
-
- # Monaco
--# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
--# more precise 0:09:21.
-+#
-+# From Michael Deckers (2020-06-12):
-+# In the "Journal de Monaco" of 1892-05-24, online at
-+# https://journaldemonaco.gouv.mc/var/jdm/storage/original/application/b1c6...
-+# we read: ...
-+# [In virtue of a Sovereign Ordinance of the May 13 of the current [year],
-+# legal time in the Principality will be set to, from the date of June 1,
-+# 1892 onwards, to the meridian of Paris, as in France.]
-+# In the "Journal de Monaco" of 1911-03-28, online at
-+# https://journaldemonaco.gouv.mc/var/jdm/storage/original/application/de74...
-+# we read an ordinance of 1911-03-16: ...
-+# [Legal time in the Principality will be set, from the date of promulgation
-+# of the present ordinance, to legal time in France.... Consequently, legal
-+# time will be retarded by 9 minutes and 21 seconds.]
-+#
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
--Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
-- 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
-+Zone Europe/Monaco 0:29:32 - LMT 1892 Jun 1
-+ 0:09:21 - PMT 1911 Mar 29 # Paris Mean Time
- 0:00 France WE%sT 1945 Sep 16 3:00
- 1:00 France CE%sT 1977
- 1:00 EU CE%sT
-@@ -2080,7 +2170,7 @@
- # The data entries before 1945 are taken from
- # https://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Neth 1916 only - May 1 0:00 1:00 NST # Netherlands Summer Time
- Rule Neth 1916 only - Oct 1 0:00 0 AMT # Amsterdam Mean Time
- Rule Neth 1917 only - Apr 16 2:00s 1:00 NST
-@@ -2117,7 +2207,7 @@
- # Norway
- # http://met.no/met/met_lex/q_u/sommertid.html (2004-01) agrees with Shanks &
- # Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Norway 1916 only - May 22 1:00 1:00 S
- Rule Norway 1916 only - Sep 30 0:00 0 -
- Rule Norway 1945 only - Apr 2 2:00s 1:00 S
-@@ -2186,7 +2276,7 @@
- # The 1919 dates and times can be found in Tygodnik Urzędowy nr 1 (1919-03-20),
- # <http://www.wbc.poznan.pl/publication/32156> pp 1-2.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Poland 1918 1919 - Sep 16 2:00s 0 -
- Rule Poland 1919 only - Apr 15 2:00s 1:00 S
- Rule Poland 1944 only - Apr 3 2:00s 1:00 S
-@@ -2257,7 +2347,7 @@
- # Guess that the Azores changed to EU rules in 1992 (since that's when Portugal
- # harmonized with EU rules), and that they stayed +0:00 that winter.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # DSH writes that despite Decree 1,469 (1915), the change to the clocks was not
- # done every year, depending on what Spain did, because of railroad schedules.
- # Go with Shanks & Pottenger.
-@@ -2370,7 +2460,7 @@
- # assume that Romania and Moldova switched to EU rules in 1997,
- # the same year as Bulgaria.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Romania 1932 only - May 21 0:00s 1:00 S
- Rule Romania 1932 1939 - Oct Sun>=1 0:00s 0 -
- Rule Romania 1933 1939 - Apr Sun>=2 0:00s 1:00 S
-@@ -3468,14 +3558,14 @@
- # fallback transition from the next day's 00:59... to 00:00.
-
- # From Michael Deckers (2016-12-15):
--# The Royal Decree of 1900-06-26 quoted by Planesas, online at
-+# The Royal Decree of 1900-07-26 quoted by Planesas, online at
- # https://www.boe.es/datos/pdfs/BOE//1900/209/A00383-00384.pdf
- # says in its article 5 (my translation):
- # These dispositions will enter into force beginning with the
- # instant at which, according to the time indicated in article 1,
- # the 1st day of January of 1901 will begin.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Spain 1918 only - Apr 15 23:00 1:00 S
- Rule Spain 1918 1919 - Oct 6 24:00s 0 -
- Rule Spain 1919 only - Apr 6 23:00 1:00 S
-@@ -3612,7 +3702,7 @@
- # By the end of the 18th century clocks and watches became commonplace
- # and their performance improved enormously. Communities began to keep
- # mean time in preference to apparent time - Geneva from 1780 ....
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # From Whitman (who writes "Midnight?"):
- # Rule Swiss 1940 only - Nov 2 0:00 1:00 S
- # Rule Swiss 1940 only - Dec 31 0:00 0 -
-@@ -3699,7 +3789,7 @@
- # 1853-07-16, though it probably occurred at some other date in Zurich, and
- # legal civil time probably changed at still some other transition date.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Swiss 1941 1942 - May Mon>=1 1:00 1:00 S
- Rule Swiss 1941 1942 - Oct Mon>=1 2:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -3848,7 +3938,7 @@
- # Although Google Translate misfires on that source, it looks like
- # Turkey reversed last month's decision, and so will stay at +03.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Turkey 1916 only - May 1 0:00 1:00 S
- Rule Turkey 1916 only - Oct 1 0:00 0 -
- Rule Turkey 1920 only - Mar 28 0:00 1:00 S
-@@ -4006,7 +4096,7 @@
- 2:00 1:00 EEST 1991 Sep 29 3:00
- 2:00 E-Eur EE%sT 1995
- 2:00 EU EE%sT
--# Ruthenia used CET 1990/1991.
-+# Transcarpathia used CET 1990/1991.
- # "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but
- # "Uzhgorod" is more common in English.
- Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/leapseconds openjdk/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/leapseconds
-@@ -91,11 +91,11 @@
- # Any additional leap seconds will come after this.
- # This Expires line is commented out for now,
- # so that pre-2020a zic implementations do not reject this file.
--#Expires 2020 Dec 28 00:00:00
-+#Expires 2021 Jun 28 00:00:00
-
- # POSIX timestamps for the data in this file:
- #updated 1467936000 (2016-07-08 00:00:00 UTC)
--#expires 1609113600 (2020-12-28 00:00:00 UTC)
-+#expires 1624838400 (2021-06-28 00:00:00 UTC)
-
--# Updated through IERS Bulletin C59
--# File expires on: 28 December 2020
-+# Updated through IERS Bulletin C60
-+# File expires on: 28 June 2021
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/northamerica openjdk/jdk/test/sun/util/calendar/zi/tzdata/northamerica
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/northamerica
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/northamerica
-@@ -193,7 +193,7 @@
- # U.S. government action. So even though the "US" rules have changed
- # in the latest release, other countries won't be affected.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule US 1918 1919 - Mar lastSun 2:00 1:00 D
- Rule US 1918 1919 - Oct lastSun 2:00 0 S
- Rule US 1942 only - Feb 9 2:00 1:00 W # War
-@@ -370,7 +370,7 @@
- # Eastern time (i.e., -4:56:01.6) just before the 1883 switch. Round to the
- # nearest second.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule NYC 1920 only - Mar lastSun 2:00 1:00 D
- Rule NYC 1920 only - Oct lastSun 2:00 0 S
- Rule NYC 1921 1966 - Apr lastSun 2:00 1:00 D
-@@ -454,7 +454,7 @@
- # The Tennessean 2007-05-11, republished 2015-04-06.
- # https://www.tennessean.com/story/insider/extras/2015/04/06/archives-seige...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Chicago 1920 only - Jun 13 2:00 1:00 D
- Rule Chicago 1920 1921 - Oct lastSun 2:00 0 S
- Rule Chicago 1921 only - Mar lastSun 2:00 1:00 D
-@@ -523,7 +523,7 @@
- # El Paso Times. 2018-10-24 06:40 -06.
- # https://www.elpasotimes.com/story/news/local/el-paso/2018/10/24/el-pasoan...
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Denver 1920 1921 - Mar lastSun 2:00 1:00 D
- Rule Denver 1920 only - Oct lastSun 2:00 0 S
- Rule Denver 1921 only - May 22 2:00 0 S
-@@ -576,7 +576,7 @@
- # https://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&contex...
- # https://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&contex...
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule CA 1948 only - Mar 14 2:01 1:00 D
- Rule CA 1949 only - Jan 1 2:00 0 S
- Rule CA 1950 1966 - Apr lastSun 1:00 1:00 D
-@@ -934,7 +934,7 @@
- # going to switch from Central to Eastern Time on March 11, 2007....
- # http://www.indystar.com/apps/pbcs.dll/article?AID=/20070207/LOCAL190108/7...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Indianapolis 1941 only - Jun 22 2:00 1:00 D
- Rule Indianapolis 1941 1954 - Sep lastSun 2:00 0 S
- Rule Indianapolis 1946 1954 - Apr lastSun 2:00 1:00 D
-@@ -953,7 +953,7 @@
- #
- # Eastern Crawford County, Indiana, left its clocks alone in 1974,
- # as well as from 1976 through 2005.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Marengo 1951 only - Apr lastSun 2:00 1:00 D
- Rule Marengo 1951 only - Sep lastSun 2:00 0 S
- Rule Marengo 1954 1960 - Apr lastSun 2:00 1:00 D
-@@ -972,7 +972,7 @@
- # Daviess, Dubois, Knox, and Martin Counties, Indiana,
- # switched from eastern to central time in April 2006, then switched back
- # in November 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Vincennes 1946 only - Apr lastSun 2:00 1:00 D
- Rule Vincennes 1946 only - Sep lastSun 2:00 0 S
- Rule Vincennes 1953 1954 - Apr lastSun 2:00 1:00 D
-@@ -997,7 +997,7 @@
- # The Indianapolis News, Friday 27 October 1967 states that Perry County
- # returned to CST. It went again to EST on 27 April 1969, as documented by the
- # Indianapolis star of Saturday 26 April.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Perry 1955 only - May 1 0:00 1:00 D
- Rule Perry 1955 1960 - Sep lastSun 2:00 0 S
- Rule Perry 1956 1963 - Apr lastSun 2:00 1:00 D
-@@ -1014,7 +1014,7 @@
- #
- # Pike County, Indiana moved from central to eastern time in 1977,
- # then switched back in 2006, then switched back again in 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Pike 1955 only - May 1 0:00 1:00 D
- Rule Pike 1955 1960 - Sep lastSun 2:00 0 S
- Rule Pike 1956 1964 - Apr lastSun 2:00 1:00 D
-@@ -1035,7 +1035,7 @@
- # An article on page A3 of the Sunday, 1991-10-27 Washington Post
- # notes that Starke County switched from Central time to Eastern time as of
- # 1991-10-27.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Starke 1947 1961 - Apr lastSun 2:00 1:00 D
- Rule Starke 1947 1954 - Sep lastSun 2:00 0 S
- Rule Starke 1955 1956 - Oct lastSun 2:00 0 S
-@@ -1052,7 +1052,7 @@
- #
- # Pulaski County, Indiana, switched from eastern to central time in
- # April 2006 and then switched back in March 2007.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Pulaski 1946 1960 - Apr lastSun 2:00 1:00 D
- Rule Pulaski 1946 1954 - Sep lastSun 2:00 0 S
- Rule Pulaski 1955 1956 - Oct lastSun 2:00 0 S
-@@ -1094,7 +1094,7 @@
- #
- # Part of Kentucky left its clocks alone in 1974.
- # This also includes Clark, Floyd, and Harrison counties in Indiana.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Louisville 1921 only - May 1 2:00 1:00 D
- Rule Louisville 1921 only - Sep 1 2:00 0 S
- Rule Louisville 1941 only - Apr lastSun 2:00 1:00 D
-@@ -1208,7 +1208,7 @@
- # election Michigan voters narrowly repealed DST, effective 1969.
- #
- # Most of Michigan observed DST from 1973 on, but was a bit late in 1975.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Detroit 1948 only - Apr lastSun 2:00 1:00 D
- Rule Detroit 1948 only - Sep lastSun 2:00 0 S
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1225,7 +1225,7 @@
- #
- # Dickinson, Gogebic, Iron, and Menominee Counties, Michigan,
- # switched from EST to CST/CDT in 1973.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER
- Rule Menominee 1946 only - Apr lastSun 2:00 1:00 D
- Rule Menominee 1946 only - Sep lastSun 2:00 0 S
- Rule Menominee 1966 only - Apr lastSun 2:00 1:00 D
-@@ -1395,7 +1395,7 @@
- # Oct 31, to Oct 27, 1918 (and Sunday is a more likely transition day
- # than Thursday) in all Canadian rulesets.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Canada 1918 only - Apr 14 2:00 1:00 D
- Rule Canada 1918 only - Oct 27 2:00 0 S
- Rule Canada 1942 only - Feb 9 2:00 1:00 W # War
-@@ -1418,7 +1418,7 @@
- # that follows the rules is the southeast corner, including Port Hope
- # Simpson and Mary's Harbour, but excluding, say, Black Tickle.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule StJohns 1917 only - Apr 8 2:00 1:00 D
- Rule StJohns 1917 only - Sep 17 2:00 0 S
- # Whitman gives 1919 Apr 5 and 1920 Apr 5; go with Shanks & Pottenger.
-@@ -1520,7 +1520,7 @@
- # bill say that it is "accommodating the customs and practices" of those
- # regions, which suggests that they have always been in-line with Halifax.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Halifax 1916 only - Apr 1 0:00 1:00 D
- Rule Halifax 1916 only - Oct 1 0:00 0 S
- Rule Halifax 1920 only - May 9 0:00 1:00 D
-@@ -1586,7 +1586,7 @@
- # clear that this was the case since at least 1993.
- # For now, assume it started in 1993.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Moncton 1933 1935 - Jun Sun>=8 1:00 1:00 D
- Rule Moncton 1933 1935 - Sep Sun>=8 1:00 0 S
- Rule Moncton 1936 1938 - Jun Sun>=1 1:00 1:00 D
-@@ -1795,7 +1795,7 @@
- # With some exceptions, the use of daylight saving may be said to be limited
- # to those cities and towns lying between Quebec city and Windsor, Ont.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Toronto 1919 only - Mar 30 23:30 1:00 D
- Rule Toronto 1919 only - Oct 26 0:00 0 S
- Rule Toronto 1920 only - May 2 2:00 1:00 D
-@@ -1893,7 +1893,7 @@
- # starting 1966. Since 02:00s is clearly correct for 1967 on, assume
- # it was also 02:00s in 1966.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Winn 1916 only - Apr 23 0:00 1:00 D
- Rule Winn 1916 only - Sep 17 0:00 0 S
- Rule Winn 1918 only - Apr 14 2:00 1:00 D
-@@ -1984,7 +1984,7 @@
- # long and rather painful to read.
- # http://www.qp.gov.sk.ca/documents/English/Statutes/Statutes/T14.pdf
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Regina 1918 only - Apr 14 2:00 1:00 D
- Rule Regina 1918 only - Oct 27 2:00 0 S
- Rule Regina 1930 1934 - May Sun>=1 0:00 1:00 D
-@@ -2034,7 +2034,7 @@
- # Boyer JP. Forcing Choice: The Risky Reward of Referendums. Dundum. 2017.
- # ISBN 978-1459739123.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Edm 1918 1919 - Apr Sun>=8 2:00 1:00 D
- Rule Edm 1918 only - Oct 27 2:00 0 S
- Rule Edm 1919 only - May 27 2:00 0 S
-@@ -2143,7 +2143,7 @@
- # https://searcharchives.vancouver.ca/daylight-saving-1918-starts-again-jul...
- # We have no further details, so omit them for now.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Vanc 1918 only - Apr 14 2:00 1:00 D
- Rule Vanc 1918 only - Oct 27 2:00 0 S
- Rule Vanc 1942 only - Feb 9 2:00 1:00 W # War
-@@ -2472,7 +2472,19 @@
- # consistency with nearby Dawson Creek, Creston, and Fort Nelson.
- # https://yukon.ca/en/news/yukon-end-seasonal-time-change
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# From Andrew G. Smith (2020-09-24):
-+# Yukon has completed its regulatory change to be on UTC -7 year-round....
-+# http://www.gov.yk.ca/legislation/regs/oic2020_125.pdf
-+# What we have done is re-defined Yukon Standard Time, as we are
-+# authorized to do under section 33 of our Interpretation Act:
-+# http://www.gov.yk.ca/legislation/acts/interpretation_c.pdf
-+#
-+# From Paul Eggert (2020-09-24):
-+# tzdb uses the obsolete YST abbreviation for standard time in Yukon through
-+# about 1970, and uses PST for standard time in Yukon since then. Consistent
-+# with that, use MST for -07, the new standard time in Yukon effective Nov. 1.
-+
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule NT_YK 1918 only - Apr 14 2:00 1:00 D
- Rule NT_YK 1918 only - Oct 27 2:00 0 S
- Rule NT_YK 1919 only - May 25 2:00 1:00 D
-@@ -2526,12 +2538,12 @@
- Zone America/Whitehorse -9:00:12 - LMT 1900 Aug 20
- -9:00 NT_YK Y%sT 1967 May 28 0:00
- -8:00 NT_YK P%sT 1980
-- -8:00 Canada P%sT 2020 Mar 8 2:00
-+ -8:00 Canada P%sT 2020 Nov 1
- -7:00 - MST
- Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
- -9:00 NT_YK Y%sT 1973 Oct 28 0:00
- -8:00 NT_YK P%sT 1980
-- -8:00 Canada P%sT 2020 Mar 8 2:00
-+ -8:00 Canada P%sT 2020 Nov 1
- -7:00 - MST
-
-
-@@ -2746,7 +2758,7 @@
- # 5- The islands, reefs and keys shall take their timezone from the
- # longitude they are located at.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Mexico 1939 only - Feb 5 0:00 1:00 D
- Rule Mexico 1939 only - Jun 25 0:00 0 S
- Rule Mexico 1940 only - Dec 9 0:00 1:00 D
-@@ -2951,7 +2963,7 @@
- # rules to sync with the U.S. starting in 2007....
- # http://www.jonesbahamas.com/?c=45&a=10412
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Bahamas 1964 1975 - Oct lastSun 2:00 0 S
- Rule Bahamas 1964 1975 - Apr lastSun 2:00 1:00 D
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -2963,7 +2975,7 @@
-
- # For 1899 Milne gives -3:58:29.2; round that.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Barb 1977 only - Jun 12 2:00 1:00 D
- Rule Barb 1977 1978 - Oct Sun>=1 2:00 0 S
- Rule Barb 1978 1980 - Apr Sun>=15 2:00 1:00 D
-@@ -2976,7 +2988,7 @@
-
- # Belize
- # Whitman entirely disagrees with Shanks; go with Shanks & Pottenger.
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Belize 1918 1942 - Oct Sun>=2 0:00 0:30 -0530
- Rule Belize 1919 1943 - Feb Sun>=9 0:00 0 CST
- Rule Belize 1973 only - Dec 5 0:00 1:00 CDT
-@@ -3013,7 +3025,7 @@
-
- # Milne gives -5:36:13.3 as San José mean time; round to nearest.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule CR 1979 1980 - Feb lastSun 0:00 1:00 D
- Rule CR 1979 1980 - Jun Sun>=1 0:00 0 S
- Rule CR 1991 1992 - Jan Sat>=15 0:00 1:00 D
-@@ -3187,7 +3199,7 @@
- # From Paul Eggert (2012-11-03):
- # For now, assume the future rule is first Sunday in November.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Cuba 1928 only - Jun 10 0:00 1:00 D
- Rule Cuba 1928 only - Oct 10 0:00 0 S
- Rule Cuba 1940 1942 - Jun Sun>=1 0:00 1:00 D
-@@ -3256,7 +3268,7 @@
- # decided to revert.
-
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule DR 1966 only - Oct 30 0:00 1:00 EDT
- Rule DR 1967 only - Feb 28 0:00 0 EST
- Rule DR 1969 1973 - Oct lastSun 0:00 0:30 -0430
-@@ -3273,7 +3285,7 @@
-
- # El Salvador
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Salv 1987 1988 - May Sun>=1 0:00 1:00 D
- Rule Salv 1987 1988 - Sep lastSun 0:00 0 S
- # There are too many San Salvadors elsewhere, so use America/El_Salvador
-@@ -3302,7 +3314,7 @@
- # (2006-04-19), says DST ends at 24:00. See
- # http://www.sieca.org.gt/Sitio_publico/Energeticos/Doc/Medidas/Cambio_Hora...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Guat 1973 only - Nov 25 0:00 1:00 D
- Rule Guat 1974 only - Feb 24 0:00 0 S
- Rule Guat 1983 only - May 21 0:00 1:00 D
-@@ -3383,7 +3395,7 @@
- # I have not been able to find a more authoritative source:
- # https://www.haitilibre.com/en/news-20319-haiti-notices-time-change-in-hai...
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Haiti 1983 only - May 8 0:00 1:00 D
- Rule Haiti 1984 1987 - Apr lastSun 0:00 1:00 D
- Rule Haiti 1983 1987 - Oct lastSun 0:00 0 S
-@@ -3431,7 +3443,7 @@
- # http://www.laprensahn.com/pais_nota.php?id04962=7386
- # So it seems that Honduras will not enter DST this year....
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Hond 1987 1988 - May Sun>=1 0:00 1:00 D
- Rule Hond 1987 1988 - Sep lastSun 0:00 0 S
- Rule Hond 2006 only - May Sun>=1 0:00 1:00 D
-@@ -3522,7 +3534,7 @@
- # The natural sun time is restored in all the national territory, in that the
- # time is returned one hour at 01:00 am of October 1 of 2006.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Nic 1979 1980 - Mar Sun>=16 0:00 1:00 D
- Rule Nic 1979 1980 - Jun Mon>=23 0:00 0 S
- Rule Nic 2005 only - Apr 10 0:00 1:00 D
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/pacificnew openjdk/jdk/test/sun/util/calendar/zi/tzdata/pacificnew
-deleted file mode 100644
---- openjdk/jdk/test/sun/util/calendar/zi/tzdata/pacificnew
-+++ /dev/null
-@@ -1,52 +0,0 @@
--#
--# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--#
--# This code is free software; you can redistribute it and/or modify it
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation. Oracle designates this
--# particular file as subject to the "Classpath" exception as provided
--# by Oracle in the LICENSE file that accompanied this code.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--# tzdb data for proposed US election time (this file is obsolete)
--
--# This file is in the public domain, so clarified as of
--# 2009-05-17 by Arthur David Olson.
--
--# From Arthur David Olson (1989-04-05):
--# On 1989-04-05, the U. S. House of Representatives passed (238-154) a bill
--# establishing "Pacific Presidential Election Time"; it was not acted on
--# by the Senate or signed into law by the President.
--# You might want to change the "PE" (Presidential Election) below to
--# "Q" (Quadrennial) to maintain three-character zone abbreviations.
--# If you're really conservative, you might want to change it to "D".
--# Avoid "L" (Leap Year), which won't be true in 2100.
--
--# If Presidential Election Time is ever established, replace "XXXX" below
--# with the year the law takes effect and uncomment the "##" lines.
--
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--## Rule Twilite XXXX max - Apr Sun>=1 2:00 1:00 D
--## Rule Twilite XXXX max uspres Oct lastSun 2:00 1:00 PE
--## Rule Twilite XXXX max uspres Nov Sun>=7 2:00 0 S
--## Rule Twilite XXXX max nonpres Oct lastSun 2:00 0 S
--
--# Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL]
--## Zone America/Los_Angeles-PET -8:00 US P%sT XXXX
--## -8:00 Twilite P%sT
--
--# For now...
--Link America/Los_Angeles US/Pacific-New ##
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/southamerica openjdk/jdk/test/sun/util/calendar/zi/tzdata/southamerica
---- openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/southamerica
-+++ openjdk/jdk/test/sun/util/calendar/zi/tzdata/southamerica
-@@ -71,7 +71,7 @@
- # I am sending modifications to the Argentine time zone table...
- # AR was chosen because they are the ISO letters that represent Argentina.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Arg 1930 only - Dec 1 0:00 1:00 -
- Rule Arg 1931 only - Apr 1 0:00 0 -
- Rule Arg 1931 only - Oct 15 0:00 1:00 -
-@@ -792,7 +792,7 @@
- # From Paul Eggert (2013-10-17):
- # For now, assume western Amazonas will change as well.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- # Decree 20,466 <http://pcdsh01.on.br/HV20466.htm> (1931-10-01)
- # Decree 21,896 <http://pcdsh01.on.br/HV21896.htm> (1932-01-10)
- Rule Brazil 1931 only - Oct 3 11:00 1:00 -
-@@ -1281,7 +1281,7 @@
- # For now, assume that they will not revert,
- # since they have extended the expiration date once already.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Chile 1927 1931 - Sep 1 0:00 1:00 -
- Rule Chile 1928 1932 - Apr 1 0:00 0 -
- Rule Chile 1968 only - Nov 3 4:00u 1:00 -
-@@ -1381,7 +1381,7 @@
- # Milne gives 4:56:16.4 for Bogotá time in 1899; round to nearest. He writes,
- # "A variation of fifteen minutes in the public clocks of Bogota is not rare."
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule CO 1992 only - May 3 0:00 1:00 -
- Rule CO 1993 only - Apr 4 0:00 0 -
- # Zone NAME STDOFF RULES FORMAT [UNTIL]
-@@ -1441,7 +1441,7 @@
- # (Not one step back), the clocks went back in 1993 and the experiment was not
- # repeated. For now, assume transitions were at 00:00 local time country-wide.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Ecuador 1992 only - Nov 28 0:00 1:00 -
- Rule Ecuador 1993 only - Feb 5 0:00 0 -
- #
-@@ -1535,7 +1535,7 @@
- # For now we will assume permanent -03 for the Falklands
- # until advised differently (to apply for 2012 and beyond, after the 2011
- # experiment was apparently successful.)
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 -
- Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 -
- Rule Falk 1939 only - Oct 1 0:00 1:00 -
-@@ -1581,7 +1581,7 @@
- # No time of the day is established for the adjustment, so people normally
- # adjust their clocks at 0 hour of the given dates.
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Para 1975 1988 - Oct 1 0:00 1:00 -
- Rule Para 1975 1978 - Mar 1 0:00 0 -
- Rule Para 1979 1991 - Apr 1 0:00 0 -
-@@ -1674,7 +1674,7 @@
- # From Paul Eggert (2006-03-22):
- # Shanks & Pottenger don't have this transition. Assume 1986 was like 1987.
-
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Peru 1938 only - Jan 1 0:00 1:00 -
- Rule Peru 1938 only - Apr 1 0:00 0 -
- Rule Peru 1938 1939 - Sep lastSun 0:00 1:00 -
-@@ -1770,7 +1770,7 @@
- # https://www.impo.com.uy/diariooficial/1926/03/10/2
- # https://www.impo.com.uy/diariooficial/1926/03/18/2
- #
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-+# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
- Rule Uruguay 1923 1925 - Oct 1 0:00 0:30 -
- Rule Uruguay 1924 1926 - Apr 1 0:00 0 -
- # From Tim Parenti (2018-02-15):
-diff --git openjdk.orig/jdk/test/sun/util/calendar/zi/tzdata/systemv openjdk/jdk/test/sun/util/calendar/zi/tzdata/systemv
-deleted file mode 100644
---- openjdk/jdk/test/sun/util/calendar/zi/tzdata/systemv
-+++ /dev/null
-@@ -1,62 +0,0 @@
--#
--# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--#
--# This code is free software; you can redistribute it and/or modify it
--# under the terms of the GNU General Public License version 2 only, as
--# published by the Free Software Foundation. Oracle designates this
--# particular file as subject to the "Classpath" exception as provided
--# by Oracle in the LICENSE file that accompanied this code.
--#
--# This code is distributed in the hope that it will be useful, but WITHOUT
--# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
--# version 2 for more details (a copy is included in the LICENSE file that
--# accompanied this code).
--#
--# You should have received a copy of the GNU General Public License version
--# 2 along with this work; if not, write to the Free Software Foundation,
--# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
--#
--# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
--# or visit www.oracle.com if you need additional information or have any
--# questions.
--#
--# tzdb data for System V rules (this file is obsolete)
--
--# This file is in the public domain, so clarified as of
--# 2009-05-17 by Arthur David Olson.
--
--# Old rules, should the need arise.
--# No attempt is made to handle Newfoundland, since it cannot be expressed
--# using the System V "TZ" scheme (half-hour offset), or anything outside
--# North America (no support for non-standard DST start/end dates), nor
--# the changes in the DST rules in the US after 1976 (which occurred after
--# the old rules were written).
--#
--# If you need the old rules, uncomment ## lines.
--# Compile this *without* leap second correction for true conformance.
--
--# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
--Rule SystemV min 1973 - Apr lastSun 2:00 1:00 D
--Rule SystemV min 1973 - Oct lastSun 2:00 0 S
--Rule SystemV 1974 only - Jan 6 2:00 1:00 D
--Rule SystemV 1974 only - Nov lastSun 2:00 0 S
--Rule SystemV 1975 only - Feb 23 2:00 1:00 D
--Rule SystemV 1975 only - Oct lastSun 2:00 0 S
--Rule SystemV 1976 max - Apr lastSun 2:00 1:00 D
--Rule SystemV 1976 max - Oct lastSun 2:00 0 S
--
--# Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL]
--## Zone SystemV/AST4ADT -4:00 SystemV A%sT
--## Zone SystemV/EST5EDT -5:00 SystemV E%sT
--## Zone SystemV/CST6CDT -6:00 SystemV C%sT
--## Zone SystemV/MST7MDT -7:00 SystemV M%sT
--## Zone SystemV/PST8PDT -8:00 SystemV P%sT
--## Zone SystemV/YST9YDT -9:00 SystemV Y%sT
--## Zone SystemV/AST4 -4:00 - AST
--## Zone SystemV/EST5 -5:00 - EST
--## Zone SystemV/CST6 -6:00 - CST
--## Zone SystemV/MST7 -7:00 - MST
--## Zone SystemV/PST8 -8:00 - PST
--## Zone SystemV/YST9 -9:00 - YST
--## Zone SystemV/HST10 -10:00 - HST
diff --git a/pr3519-fix_further_functions_with_a_missing_return_value.patch b/pr3519-fix_further_functions_with_a_missing_return_value.patch
deleted file mode 100644
index 51ca7f1..0000000
--- a/pr3519-fix_further_functions_with_a_missing_return_value.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1518669922 0
-# Thu Feb 15 04:45:22 2018 +0000
-# Node ID adaf109718c10888cce5b6e73af7f3e15a7ab0db
-# Parent 3ade0115344b77e6d00462044e0cf68722685bfe
-PR3519: Fix further functions with a missing return value.
-
-diff --git openjdk.orig/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
---- openjdk.orig/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
-+++ openjdk/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
-@@ -205,6 +205,7 @@
- return Address(base, tmp, Address::lsl(addr->scale()));
- }
- }
-+ return Address();
- }
-
- Address LIR_Assembler::as_Address_hi(LIR_Address* addr) {
diff --git a/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch b/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
deleted file mode 100644
index d1e9576..0000000
--- a/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1529475043 -3600
-# Wed Jun 20 07:10:43 2018 +0100
-# Node ID f6341f4635dacb56678264d29a88cd052b74036b
-# Parent 30520d5018b509b0ae68f5fcc9a5c540e3e5b2de
-PR3601: Fix additional -Wreturn-type issues introduced by 8061651
-
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
-@@ -835,7 +835,7 @@
- JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname))
- JVMWrapper("JVM_KnownToNotExist");
- #if INCLUDE_CDS
-- return ClassLoaderExt::known_to_not_exist(env, loader, classname, CHECK_(false));
-+ return ClassLoaderExt::known_to_not_exist(env, loader, classname, THREAD);
- #else
- return false;
- #endif
-@@ -845,7 +845,7 @@
- JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader))
- JVMWrapper("JVM_GetResourceLookupCacheURLs");
- #if INCLUDE_CDS
-- return ClassLoaderExt::get_lookup_cache_urls(env, loader, CHECK_NULL);
-+ return ClassLoaderExt::get_lookup_cache_urls(env, loader, THREAD);
- #else
- return NULL;
- #endif
-@@ -855,7 +855,7 @@
- JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name))
- JVMWrapper("JVM_GetResourceLookupCache");
- #if INCLUDE_CDS
-- return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, CHECK_NULL);
-+ return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, THREAD);
- #else
- return NULL;
- #endif
diff --git a/rh1566890-CVE_2018_3639-speculative_store_bypass.patch b/rh1566890-CVE_2018_3639-speculative_store_bypass.patch
deleted file mode 100644
index d8f3a5a..0000000
--- a/rh1566890-CVE_2018_3639-speculative_store_bypass.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -103,6 +103,8 @@
- # include <inttypes.h>
- # include <sys/ioctl.h>
-
-+#include <sys/prctl.h>
-+
- PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
- #ifndef _GNU_SOURCE
-@@ -4997,6 +4999,31 @@
- }
- }
-
-+/* Per task speculation control */
-+#ifndef PR_GET_SPECULATION_CTRL
-+#define PR_GET_SPECULATION_CTRL 52
-+#endif
-+#ifndef PR_SET_SPECULATION_CTRL
-+#define PR_SET_SPECULATION_CTRL 53
-+#endif
-+/* Speculation control variants */
-+# undef PR_SPEC_STORE_BYPASS
-+# define PR_SPEC_STORE_BYPASS 0
-+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
-+# undef PR_SPEC_NOT_AFFECTED
-+# undef PR_SPEC_PRCTL
-+# undef PR_SPEC_ENABLE
-+# undef PR_SPEC_DISABLE
-+# define PR_SPEC_NOT_AFFECTED 0
-+# define PR_SPEC_PRCTL (1UL << 0)
-+# define PR_SPEC_ENABLE (1UL << 1)
-+# define PR_SPEC_DISABLE (1UL << 2)
-+
-+static void set_speculation() __attribute__((constructor));
-+static void set_speculation() {
-+ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
-+}
-+
- // this is called _before_ most of the global arguments have been parsed
- void os::init(void) {
- char dummy; /* used to get a guess on initial stack address */
diff --git a/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch b/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch
deleted file mode 100644
index 94ef9d4..0000000
--- a/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -5001,26 +5001,43 @@
-
- /* Per task speculation control */
- #ifndef PR_GET_SPECULATION_CTRL
--#define PR_GET_SPECULATION_CTRL 52
-+# define PR_GET_SPECULATION_CTRL 52
- #endif
- #ifndef PR_SET_SPECULATION_CTRL
--#define PR_SET_SPECULATION_CTRL 53
-+# define PR_SET_SPECULATION_CTRL 53
- #endif
- /* Speculation control variants */
--# undef PR_SPEC_STORE_BYPASS
-+#ifndef PR_SPEC_STORE_BYPASS
- # define PR_SPEC_STORE_BYPASS 0
-+#endif
- /* Return and control values for PR_SET/GET_SPECULATION_CTRL */
--# undef PR_SPEC_NOT_AFFECTED
--# undef PR_SPEC_PRCTL
--# undef PR_SPEC_ENABLE
--# undef PR_SPEC_DISABLE
-+
-+#ifndef PR_SPEC_NOT_AFFECTED
- # define PR_SPEC_NOT_AFFECTED 0
-+#endif
-+#ifndef PR_SPEC_PRCTL
- # define PR_SPEC_PRCTL (1UL << 0)
-+#endif
-+#ifndef PR_SPEC_ENABLE
- # define PR_SPEC_ENABLE (1UL << 1)
-+#endif
-+#ifndef PR_SPEC_DISABLE
- # define PR_SPEC_DISABLE (1UL << 2)
-+#endif
-+#ifndef PR_SPEC_FORCE_DISABLE
-+# define PR_SPEC_FORCE_DISABLE (1UL << 3)
-+#endif
-+#ifndef PR_SPEC_DISABLE_NOEXEC
-+# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
-+#endif
-
- static void set_speculation() __attribute__((constructor));
- static void set_speculation() {
-+ if ( prctl(PR_SET_SPECULATION_CTRL,
-+ PR_SPEC_STORE_BYPASS,
-+ PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
-+ return;
-+ }
- prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
- }
-
diff --git a/rh1750419-redhat_alt_java.patch b/rh1750419-redhat_alt_java.patch
new file mode 100644
index 0000000..4789f0b
--- /dev/null
+++ b/rh1750419-redhat_alt_java.patch
@@ -0,0 +1,133 @@
+diff --git openjdk.orig/jdk/make/CompileLaunchers.gmk openjdk/jdk/make/CompileLaunchers.gmk
+--- openjdk.orig/jdk/make/CompileLaunchers.gmk
++++ openjdk/jdk/make/CompileLaunchers.gmk
+@@ -255,6 +255,33 @@
+ endif
+ endif
+
++# -Wno-error=cpp is present to allow commented warning in ifdef part of main.c
++$(eval $(call SetupLauncher,alt-java, \
++ -DEXPAND_CLASSPATH_WILDCARDS -DREDHAT_ALT_JAVA -Wno-error=cpp,,,user32.lib comctl32.lib, \
++ $(JDK_OUTPUTDIR)/objs/jli_static.lib, $(JAVA_RC_FLAGS), \
++ $(JDK_TOPDIR)/src/windows/resource/java.rc, $(JDK_OUTPUTDIR)/objs/java_objs,true))
++
++$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/alt-java$(EXE_SUFFIX): $(BUILD_LAUNCHER_alt-java)
++ $(MKDIR) -p $(@D)
++ $(RM) $@
++ $(CP) $(JDK_OUTPUTDIR)/objs/java_objs$(OUTPUT_SUBDIR)/alt-java$(EXE_SUFFIX) $@
++
++$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/alt-java$(DEBUGINFO_EXT): $(BUILD_LAUNCHER_alt-java)
++ $(MKDIR) -p $(@D)
++ $(RM) $@
++ $(CP) $(JDK_OUTPUTDIR)/objs/java_objs$(OUTPUT_SUBDIR)/alt-java$(DEBUGINFO_EXT) $@
++
++ifeq ($(OPENJDK_TARGET_OS), linux)
++ BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/alt-java$(EXE_SUFFIX)
++ ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
++ ifneq ($(POST_STRIP_CMD), )
++ ifneq ($(STRIP_POLICY), no_strip)
++ BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/alt-java$(DEBUGINFO_EXT)
++ endif
++ endif
++ endif
++endif
++
+ ifeq ($(OPENJDK_TARGET_OS), windows)
+ $(eval $(call SetupLauncher,javaw, \
+ -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \
+diff --git openjdk.orig/jdk/src/share/bin/alt_main.h openjdk/jdk/src/share/bin/alt_main.h
+new file mode 100644
+--- /dev/null
++++ openjdk/jdk/src/share/bin/alt_main.h
+@@ -0,0 +1,73 @@
++/*
++ * Copyright (c) 2019, Red Hat, Inc. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++#ifdef REDHAT_ALT_JAVA
++
++#include <sys/prctl.h>
++
++
++/* Per task speculation control */
++#ifndef PR_GET_SPECULATION_CTRL
++# define PR_GET_SPECULATION_CTRL 52
++#endif
++#ifndef PR_SET_SPECULATION_CTRL
++# define PR_SET_SPECULATION_CTRL 53
++#endif
++/* Speculation control variants */
++#ifndef PR_SPEC_STORE_BYPASS
++# define PR_SPEC_STORE_BYPASS 0
++#endif
++/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
++
++#ifndef PR_SPEC_NOT_AFFECTED
++# define PR_SPEC_NOT_AFFECTED 0
++#endif
++#ifndef PR_SPEC_PRCTL
++# define PR_SPEC_PRCTL (1UL << 0)
++#endif
++#ifndef PR_SPEC_ENABLE
++# define PR_SPEC_ENABLE (1UL << 1)
++#endif
++#ifndef PR_SPEC_DISABLE
++# define PR_SPEC_DISABLE (1UL << 2)
++#endif
++#ifndef PR_SPEC_FORCE_DISABLE
++# define PR_SPEC_FORCE_DISABLE (1UL << 3)
++#endif
++#ifndef PR_SPEC_DISABLE_NOEXEC
++# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
++#endif
++
++static void set_speculation() __attribute__((constructor));
++static void set_speculation() {
++ if ( prctl(PR_SET_SPECULATION_CTRL,
++ PR_SPEC_STORE_BYPASS,
++ PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
++ return;
++ }
++ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
++}
++
++#endif // REDHAT_ALT_JAVA
+diff --git openjdk.orig/jdk/src/share/bin/main.c openjdk/jdk/src/share/bin/main.c
+--- openjdk.orig/jdk/src/share/bin/main.c
++++ openjdk/jdk/src/share/bin/main.c
+@@ -32,6 +32,14 @@
+
+ #include "defines.h"
+
++#ifdef REDHAT_ALT_JAVA
++#if defined(__linux__) && defined(__x86_64__)
++#include "alt_main.h"
++#else
++#warning alt-java requested but SSB mitigation not available on this platform.
++#endif
++#endif
++
+ #ifdef _MSC_VER
+ #if _MSC_VER > 1400 && _MSC_VER < 1600
+
diff --git a/sources b/sources
index 70e7e49..8de2960 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (aarch32-port-jdk8u-jdk8u275-ga-aarch32-20201109-4curve.tar.xz) = 648b6149eb7010f51ba60bf86ffe56c0f4780fcf87f3f853b71b951123257d6c3e0ab7983559ea8115f320e0de4bb79b01f2497529774be0c6dd01fcf4598c41
+SHA512 (aarch32-port-jdk8u-jdk8u282-ga-aarch32-20210125-4curve.tar.xz) = b83541f5c5b3e274b17e4ebd034990ae99685e85263b9d1a399f3b5c70b35670e7efa714d0d209c04e05100dda5c08a3f411cbec7aa829092967df008031a428
SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
2 years, 3 months
- 1
- 0
[Report] Packages Restricting Arches
by root
Package no longer excluding arches (1)
==================================
- reg
List of packages currently excluding arches (1888)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- OpenImageIO
ExclusiveArch: x86_64 ppc64le
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-V8
ExclusiveArch: %{nodejs_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aboot
ExclusiveArch: alpha
- accel-config
ExclusiveArch: x86_64
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- alleyoop
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64
- anet
ExclusiveArch: %{GPRbuild_arches}
- anki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- arduino
ExclusiveArch: %{go_arches}
- arduino-builder
ExclusiveArch: %{go_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- aunit
ExclusiveArch: %GPRbuild_arches
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- bareftp
ExclusiveArch: %{mono_arches}
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
- bcm283x-firmware
ExclusiveArch: %{arm} aarch64
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- blender
ExclusiveArch: x86_64 aarch64 ppc64le
- bless
ExclusiveArch: %mono_arches
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- calamares
ExclusiveArch: %{ix86} x86_64
- calibre
ExclusiveArch: %{qt5_qtwebengine_arches}
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- ceph
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- chromium
ExclusiveArch: x86_64 i686
ExclusiveArch: x86_64 i686 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- clevis-pin-tpm2
ExclusiveArch: %{rust_arches}
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- coffee-script
ExclusiveArch: %{nodejs_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- cpu-x
ExclusiveArch: i686 x86_64
- cpuid
ExclusiveArch: %{ix86} x86_64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- cryptlib
ExclusiveArch: x86_64 %{ix86} aarch64 ppc64 ppc64le
- cryptobone
ExclusiveArch: x86_64 %{ix86} ppc64 ppc64le aarch64
- daq
ExclusiveArch: x86_64 aarch64
- darktable
ExclusiveArch: x86_64 aarch64
ExclusiveArch: x86_64 ppc64le
- dbus-parsec
ExclusiveArch: %{rust_arches}
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- dbxtool
ExclusiveArch: i386 x86_64 aarch64
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-desktop-schemas
ExclusiveArch: %{go_arches}
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dolphin-emu
ExclusiveArch: x86_64 aarch64 ppc64le
- dotnet-build-reference-packages
ExclusiveArch: aarch64 x86_64
ExclusiveArch: x86_64
- dotnet3.1
ExclusiveArch: aarch64 x86_64
ExclusiveArch: x86_64
- dotnet5.0
ExclusiveArch: aarch64 x86_64
ExclusiveArch: x86_64
- dotnet5.0-build-reference-packages
ExclusiveArch: aarch64 x86_64
ExclusiveArch: x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dssi-vst
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e3
ExclusiveArch: %{ix86} x86_64
- edk2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExclusiveArch: x86_64 aarch64
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efitools
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- embree
ExclusiveArch: x86_64
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- eric
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- extlinux-bootloader
ExclusiveArch: %{arm} aarch64
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- fes
ExclusiveArch: %{ix86} x86_64
- flannel
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- florist
ExclusiveArch: %{GPRbuild_arches}
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: %{ix86} x86_64 ppc64
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- ga
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- gbrainy
ExclusiveArch: %mono_arches
- gdata-sharp
ExclusiveArch: %mono_arches
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gearhead1
ExclusiveArch: %{fpc_arches}
- gela-asis
ExclusiveArch: %GPRbuild_arches
- ghdl
ExclusiveArch: %{GNAT_arches}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- glibc32
ExclusiveArch: x86_64
- glibd
ExclusiveArch: %{ldc_arches}
- gmqcc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-guitar
ExclusiveArch: %{mono_arches}
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- go-compilers
ExclusiveArch: %{go_arches}
- go-rpm-macros
ExclusiveArch: %{golang_arches} %{gccgo_arches}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang
ExclusiveArch: %{golang_arches}
- gomtree
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- goverlay
ExclusiveArch: %{fpc_arches}
- gprbuild
ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- gudev-sharp
ExclusiveArch: %mono_arches
- hedgewars
ExclusiveArch: %{fpc_arches}
- hsakmt
ExclusiveArch: x86_64 aarch64
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64
- i3status-rs
ExclusiveArch: %{rust_arches}
- icaro
ExclusiveArch: %{ix86} x86_64 noarch
- ignition
ExclusiveArch: %{go_arches}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cmt-cat
ExclusiveArch: x86_64 i686 i586
ExclusiveArch: x86_64 i686 i586
- intel-gmmlib
ExclusiveArch: x86_64 i686
- intel-ipsec-mb
ExclusiveArch: x86_64
ExclusiveArch: x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipmctl
ExclusiveArch: x86_64
- ipw2100-firmware
ExclusiveArch: noarch i386 x86_64
- ipw2200-firmware
ExclusiveArch: noarch i386 x86_64
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- keepass
ExclusiveArch: %{mono_arches}
- kernel
ExclusiveArch: x86_64 s390x %{arm} aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x %{arm} aarch64 ppc64le
- keyring-ima-signer
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kalarmcal
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kmailtransport
ExclusiveArch: x86_64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- kicad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- knotes
ExclusiveArch: x86_64 %{arm}
- kompose
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- ldc
ExclusiveArch: %{ldc_arches}
- libbsr
ExclusiveArch: %{power64}
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdispatch
ExclusiveArch: x86_64 aarch64
- libguestfs
ExclusiveArch: %{kernel_arches}
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libnxz
ExclusiveArch: ppc64le
- libocxl
ExclusiveArch: ppc64le
- libpmemobj-cpp
ExclusiveArch: x86_64
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- librtas
ExclusiveArch: %{power64}
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
- libva-intel-hybrid-driver
ExclusiveArch: %{ix86} x86_64 ia64
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzfcphbaapi
ExclusiveArch: s390 s390x
- lightdm
ExclusiveArch: x86_64 ppc64le
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 s390x ppc64le
- luxcorerender
ExclusiveArch: x86_64
- mactel-boot
ExclusiveArch: x86_64
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- mantle
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matreshka
ExclusiveArch: %GPRbuild_arches
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- megapixels
ExclusiveArch: aarch64 armv7hl
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtest86+
ExclusiveArch: %{ix86} x86_64
- mesos
ExclusiveArch: x86_64
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} %{ix86} x86_64
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mirrorlist-server
ExclusiveArch: %{rust_arches}
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- mod_mono
ExclusiveArch: %mono_arches
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monobristol
ExclusiveArch: %{mono_arches}
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- monosim
ExclusiveArch: %mono_arches
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msr-tools
ExclusiveArch: %{ix86} x86_64
- mustache-d
ExclusiveArch: %{ldc_arches}
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- nant
ExclusiveArch: %mono_arches
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- newsflash
ExclusiveArch: %{rust_arches}
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nispor
ExclusiveArch: %{rust_arches}
- nodejs
ExclusiveArch: %{nodejs_arches}
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-supervisor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-svgo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-typescript
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: x86_64 ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64 ppc64le
- nwchem
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- oci-kvm-hook
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %%{power64} aarch64 s390x armv7hl
- oci-umount
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- oidn
ExclusiveArch: x86_64
- olpc-kbdshim
ExclusiveArch: %{ix86} %{arm}
- olpc-netutils
ExclusiveArch: %{ix86} %{arm}
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le
- onedrive
ExclusiveArch: %{ldc_arches}
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjfx
ExclusiveArch: x86_64
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openni
ExclusiveArch: %{ix86} x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openshadinglanguage
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- openssl-ibmca
ExclusiveArch: s390 s390x
- origin
ExclusiveArch: %{go_arches}
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- orion
ExclusiveArch: %{qt5_qtwebengine_arches}
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- paflib
ExclusiveArch: ppc %{power64}
- parsec
ExclusiveArch: %{rust_arches}
- parsec-tool
ExclusiveArch: %{rust_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdbg
ExclusiveArch: ppc64le
- pdfmod
ExclusiveArch: %mono_arches
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: x86_64
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- pmdk-convert
ExclusiveArch: x86_64
- pmemkv
ExclusiveArch: x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- powerpc-utils
ExclusiveArch: ppc %{power64}
- ppc64-diag
ExclusiveArch: ppc %{power64}
- psi-plus
ExclusiveArch: %{qt5_qtwebengine_arches}
- pveclib
ExclusiveArch: ppc %{power64}
- pvs-sbcl
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-healpy
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-javabridge
ExclusiveArch: i686 x86_64
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-rpi-gpio
ExclusiveArch: %{arm} aarch64
- python-setuptools-rust
ExclusiveArch: %{rust_arches}
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- quantum-espresso
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- redhat-lsb
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- renderdoc
ExclusiveArch: x86_64
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm}
- rescene
ExclusiveArch: %{mono_arches}
- restsharp
ExclusiveArch: %{mono_arches}
- rhythmbox-alternative-toolbar
ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le
- rmd
ExclusiveArch: %{ix86} x86_64
- rocm-runtime
ExclusiveArch: x86_64 aarch64
- rocminfo
ExclusiveArch: x86_64 aarch64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rr
ExclusiveArch: %{ix86} x86_64
- rssguard
ExclusiveArch: %{qt5_qtwebengine_arches}
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- runc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x
- rust
ExclusiveArch: %{rust_arches}
- rust-ab_glyph_rasterizer
ExclusiveArch: %{rust_arches}
- rust-abomonation
ExclusiveArch: %{rust_arches}
- rust-actix
ExclusiveArch: %{rust_arches}
- rust-actix-codec
ExclusiveArch: %{rust_arches}
- rust-actix-connect
ExclusiveArch: %{rust_arches}
- rust-actix-files
ExclusiveArch: %{rust_arches}
- rust-actix-http
ExclusiveArch: %{rust_arches}
- rust-actix-macros
ExclusiveArch: %{rust_arches}
- rust-actix-router
ExclusiveArch: %{rust_arches}
- rust-actix-rt
ExclusiveArch: %{rust_arches}
- rust-actix-server
ExclusiveArch: %{rust_arches}
- rust-actix-server-config
ExclusiveArch: %{rust_arches}
- rust-actix-service
ExclusiveArch: %{rust_arches}
- rust-actix-testing
ExclusiveArch: %{rust_arches}
- rust-actix-threadpool
ExclusiveArch: %{rust_arches}
- rust-actix-tls
ExclusiveArch: %{rust_arches}
- rust-actix-utils
ExclusiveArch: %{rust_arches}
- rust-actix-web
ExclusiveArch: %{rust_arches}
- rust-actix-web-codegen
ExclusiveArch: %{rust_arches}
- rust-actix_derive
ExclusiveArch: %{rust_arches}
- rust-addr2line
ExclusiveArch: %{rust_arches}
- rust-adler
ExclusiveArch: %{rust_arches}
- rust-adler32
ExclusiveArch: %{rust_arches}
- rust-aead
ExclusiveArch: %{rust_arches}
- rust-aes
ExclusiveArch: %{rust_arches}
- rust-aes-gcm
ExclusiveArch: %{rust_arches}
- rust-aes-soft
ExclusiveArch: %{rust_arches}
- rust-afterburn
ExclusiveArch: %{rust_arches}
- rust-ahash
ExclusiveArch: %{rust_arches}
- rust-aho-corasick
ExclusiveArch: %{rust_arches}
- rust-alacritty
ExclusiveArch: %{rust_arches}
- rust-alacritty_config_derive
ExclusiveArch: %{rust_arches}
- rust-alacritty_terminal
ExclusiveArch: %{rust_arches}
- rust-alga
ExclusiveArch: %{rust_arches}
- rust-alga_derive
ExclusiveArch: %{rust_arches}
- rust-alloc-no-stdlib
ExclusiveArch: %{rust_arches}
- rust-alloc-stdlib
ExclusiveArch: %{rust_arches}
- rust-alphanumeric-sort
ExclusiveArch: %{rust_arches}
- rust-ammonia
ExclusiveArch: %{rust_arches}
- rust-andrew
ExclusiveArch: %{rust_arches}
- rust-ansi_colours
ExclusiveArch: %{rust_arches}
- rust-ansi_term
ExclusiveArch: %{rust_arches}
- rust-ansi_term0.11
ExclusiveArch: %{rust_arches}
- rust-antidote
ExclusiveArch: %{rust_arches}
- rust-anyhow
ExclusiveArch: %{rust_arches}
- rust-anymap
ExclusiveArch: %{rust_arches}
- rust-aom-sys
ExclusiveArch: %{rust_arches}
- rust-app_dirs
ExclusiveArch: %{rust_arches}
- rust-approx
ExclusiveArch: %{rust_arches}
- rust-arbitrary
ExclusiveArch: %{rust_arches}
- rust-arc-swap
ExclusiveArch: %{rust_arches}
- rust-arg_enum_proc_macro
ExclusiveArch: %{rust_arches}
- rust-argparse
ExclusiveArch: %{rust_arches}
- rust-array-init
ExclusiveArch: %{rust_arches}
- rust-arraydeque
ExclusiveArch: %{rust_arches}
- rust-arrayref
ExclusiveArch: %{rust_arches}
- rust-arrayvec
ExclusiveArch: %{rust_arches}
- rust-article_scraper
ExclusiveArch: %{rust_arches}
- rust-ascii
ExclusiveArch: %{rust_arches}
- rust-askalono
ExclusiveArch: %{rust_arches}
- rust-askalono-cli
ExclusiveArch: %{rust_arches}
- rust-askama
ExclusiveArch: %{rust_arches}
- rust-askama_derive
ExclusiveArch: %{rust_arches}
- rust-askama_escape
ExclusiveArch: %{rust_arches}
- rust-askama_shared
ExclusiveArch: %{rust_arches}
- rust-assert-json-diff
ExclusiveArch: %{rust_arches}
- rust-assert_approx_eq
ExclusiveArch: %{rust_arches}
- rust-assert_cli
ExclusiveArch: %{rust_arches}
- rust-assert_cmd
ExclusiveArch: %{rust_arches}
- rust-assert_fs
ExclusiveArch: %{rust_arches}
- rust-assert_matches
ExclusiveArch: %{rust_arches}
- rust-assign
ExclusiveArch: %{rust_arches}
- rust-async-attributes
ExclusiveArch: %{rust_arches}
- rust-async-compression
ExclusiveArch: %{rust_arches}
- rust-async-io
ExclusiveArch: %{rust_arches}
- rust-async-task
ExclusiveArch: %{rust_arches}
- rust-async-trait
ExclusiveArch: %{rust_arches}
- rust-asyncgit
ExclusiveArch: %{rust_arches}
- rust-atk
ExclusiveArch: %{rust_arches}
- rust-atk-sys
ExclusiveArch: %{rust_arches}
- rust-atom
ExclusiveArch: %{rust_arches}
- rust-atomicwrites
ExclusiveArch: %{rust_arches}
- rust-attohttpc
ExclusiveArch: %{rust_arches}
- rust-atty
ExclusiveArch: %{rust_arches}
- rust-autocfg
ExclusiveArch: %{rust_arches}
- rust-av-metrics
ExclusiveArch: %{rust_arches}
- rust-average
ExclusiveArch: %{rust_arches}
- rust-awc
ExclusiveArch: %{rust_arches}
- rust-backtrace
ExclusiveArch: %{rust_arches}
- rust-backtrace-sys
ExclusiveArch: %{rust_arches}
- rust-base100
ExclusiveArch: %{rust_arches}
- rust-base64
ExclusiveArch: %{rust_arches}
- rust-base64-0.10
ExclusiveArch: %{rust_arches}
- rust-base64-0.11
ExclusiveArch: %{rust_arches}
- rust-base64_0.12
ExclusiveArch: %{rust_arches}
- rust-bat
ExclusiveArch: %{rust_arches}
- rust-battery
ExclusiveArch: %{rust_arches}
- rust-bencher
ExclusiveArch: %{rust_arches}
- rust-better-panic
ExclusiveArch: %{rust_arches}
- rust-bincode
ExclusiveArch: %{rust_arches}
- rust-bincode0.8
ExclusiveArch: %{rust_arches}
- rust-bindgen
ExclusiveArch: %{rust_arches}
- rust-binfarce
ExclusiveArch: %{rust_arches}
- rust-biscuit
ExclusiveArch: %{rust_arches}
- rust-bit-set
ExclusiveArch: %{rust_arches}
- rust-bit-vec
ExclusiveArch: %{rust_arches}
- rust-bitfield
ExclusiveArch: %{rust_arches}
- rust-bitflags
ExclusiveArch: %{rust_arches}
- rust-bitmaps
ExclusiveArch: %{rust_arches}
- rust-bitstream-io
ExclusiveArch: %{rust_arches}
- rust-bitvec
ExclusiveArch: %{rust_arches}
- rust-blake2
ExclusiveArch: %{rust_arches}
- rust-blobby
ExclusiveArch: %{rust_arches}
- rust-blobby0.1
ExclusiveArch: %{rust_arches}
- rust-block-buffer
ExclusiveArch: %{rust_arches}
- rust-block-buffer0.7
ExclusiveArch: %{rust_arches}
- rust-block-cipher
ExclusiveArch: %{rust_arches}
- rust-block-modes
ExclusiveArch: %{rust_arches}
- rust-block-padding
ExclusiveArch: %{rust_arches}
- rust-blsctl
ExclusiveArch: %{rust_arches}
- rust-bodhi
ExclusiveArch: %{rust_arches}
- rust-bodhi-cli
ExclusiveArch: %{rust_arches}
- rust-bootupd
ExclusiveArch: x86_64 aarch64
- rust-box_drawing
ExclusiveArch: %{rust_arches}
- rust-brev
ExclusiveArch: %{rust_arches}
- rust-brotli
ExclusiveArch: %{rust_arches}
- rust-brotli-decompressor
ExclusiveArch: %{rust_arches}
- rust-brotli-sys
ExclusiveArch: %{rust_arches}
- rust-brotli2
ExclusiveArch: %{rust_arches}
- rust-bstr
ExclusiveArch: %{rust_arches}
- rust-buf-min
ExclusiveArch: %{rust_arches}
- rust-buf_redux
ExclusiveArch: %{rust_arches}
- rust-bufsize
ExclusiveArch: %{rust_arches}
- rust-bufstream
ExclusiveArch: %{rust_arches}
- rust-build_const
ExclusiveArch: %{rust_arches}
- rust-bumpalo
ExclusiveArch: %{rust_arches}
- rust-byte-tools
ExclusiveArch: %{rust_arches}
- rust-byte-unit
ExclusiveArch: %{rust_arches}
- rust-byte-unit3
ExclusiveArch: %{rust_arches}
- rust-bytecount
ExclusiveArch: %{rust_arches}
- rust-bytelines
ExclusiveArch: %{rust_arches}
- rust-bytemuck
ExclusiveArch: %{rust_arches}
- rust-bytemuck_derive
ExclusiveArch: %{rust_arches}
- rust-byteorder
ExclusiveArch: %{rust_arches}
- rust-bytes
ExclusiveArch: %{rust_arches}
- rust-bytes0.3
ExclusiveArch: %{rust_arches}
- rust-bytes0.4
ExclusiveArch: %{rust_arches}
- rust-bytes0.5
ExclusiveArch: %{rust_arches}
- rust-bytes0.6
ExclusiveArch: %{rust_arches}
- rust-bytesize
ExclusiveArch: %{rust_arches}
- rust-bytestring
ExclusiveArch: %{rust_arches}
- rust-bzip2
ExclusiveArch: %{rust_arches}
- rust-bzip2-sys
ExclusiveArch: %{rust_arches}
- rust-c_vec
ExclusiveArch: %{rust_arches}
- rust-cache-padded
ExclusiveArch: %{rust_arches}
- rust-cairo-rs
ExclusiveArch: %{rust_arches}
- rust-cairo-sys-rs
ExclusiveArch: %{rust_arches}
- rust-calloop
ExclusiveArch: %{rust_arches}
- rust-caps
ExclusiveArch: %{rust_arches}
- rust-cargo
ExclusiveArch: %{rust_arches}
- rust-cargo-bloat
ExclusiveArch: %{rust_arches}
- rust-cargo-c
ExclusiveArch: %{rust_arches}
- rust-cargo-husky
ExclusiveArch: %{rust_arches}
- rust-cargo-insta
ExclusiveArch: %{rust_arches}
- rust-cargo-platform
ExclusiveArch: %{rust_arches}
- rust-cargo-readme
ExclusiveArch: %{rust_arches}
- rust-cargo_metadata
ExclusiveArch: %{rust_arches}
- rust-cassowary
ExclusiveArch: %{rust_arches}
- rust-cast
ExclusiveArch: %{rust_arches}
- rust-cbindgen
ExclusiveArch: %{rust_arches}
- rust-cc
ExclusiveArch: %{rust_arches}
- rust-cedarwood
ExclusiveArch: %{rust_arches}
- rust-cexpr
ExclusiveArch: %{rust_arches}
- rust-cfg-if
ExclusiveArch: %{rust_arches}
- rust-cfg-if0.1
ExclusiveArch: %{rust_arches}
- rust-chainerror
ExclusiveArch: %{rust_arches}
- rust-charset
ExclusiveArch: %{rust_arches}
- rust-chbs
ExclusiveArch: %{rust_arches}
- rust-checked_int_cast
ExclusiveArch: %{rust_arches}
- rust-choosier
ExclusiveArch: %{rust_arches}
- rust-chrono
ExclusiveArch: %{rust_arches}
- rust-chrono-humanize
ExclusiveArch: %{rust_arches}
- rust-chrono-tz
ExclusiveArch: %{rust_arches}
- rust-chunked_transfer
ExclusiveArch: %{rust_arches}
- rust-cipher
ExclusiveArch: %{rust_arches}
- rust-clang-sys
ExclusiveArch: %{rust_arches}
- rust-clap
ExclusiveArch: %{rust_arches}
- rust-clap2
ExclusiveArch: %{rust_arches}
- rust-clap_derive
ExclusiveArch: %{rust_arches}
- rust-clicolors-control
ExclusiveArch: %{rust_arches}
- rust-cmake
ExclusiveArch: %{rust_arches}
- rust-codespan-reporting
ExclusiveArch: %{rust_arches}
- rust-codicon
ExclusiveArch: %{rust_arches}
- rust-color-backtrace
ExclusiveArch: %{rust_arches}
- rust-color_quant
ExclusiveArch: %{rust_arches}
- rust-colored
ExclusiveArch: %{rust_arches}
- rust-colored1
ExclusiveArch: %{rust_arches}
- rust-colored_json
ExclusiveArch: %{rust_arches}
- rust-colorful
ExclusiveArch: %{rust_arches}
- rust-compiletest_rs
ExclusiveArch: %{rust_arches}
- rust-comrak
ExclusiveArch: %{rust_arches}
- rust-concurrent-queue
ExclusiveArch: %{rust_arches}
- rust-config
ExclusiveArch: %{rust_arches}
- rust-console
ExclusiveArch: %{rust_arches}
- rust-console0.11
ExclusiveArch: %{rust_arches}
- rust-console0.12
ExclusiveArch: %{rust_arches}
- rust-console0.13
ExclusiveArch: %{rust_arches}
- rust-console0.9
ExclusiveArch: %{rust_arches}
- rust-const-cstr
ExclusiveArch: %{rust_arches}
- rust-const-random
ExclusiveArch: %{rust_arches}
- rust-const-random-macro
ExclusiveArch: %{rust_arches}
- rust-const_fn
ExclusiveArch: %{rust_arches}
- rust-content_inspector
ExclusiveArch: %{rust_arches}
- rust-conv
ExclusiveArch: %{rust_arches}
- rust-cookie
ExclusiveArch: %{rust_arches}
- rust-cookie_store
ExclusiveArch: %{rust_arches}
- rust-copydeps
ExclusiveArch: %{rust_arches}
- rust-copyless
ExclusiveArch: %{rust_arches}
- rust-copypasta
ExclusiveArch: %{rust_arches}
- rust-coreos-installer
ExclusiveArch: %{rust_arches}
- rust-cpio
ExclusiveArch: %{rust_arches}
- rust-cpp_demangle
ExclusiveArch: %{rust_arches}
- rust-cpuid-bool
ExclusiveArch: %{rust_arches}
- rust-cpython
ExclusiveArch: %{rust_arches}
- rust-crates-io
ExclusiveArch: %{rust_arches}
- rust-crc
ExclusiveArch: %{rust_arches}
- rust-crc-any
ExclusiveArch: %{rust_arches}
- rust-crc-core
ExclusiveArch: %{rust_arches}
- rust-crc32fast
ExclusiveArch: %{rust_arches}
- rust-criterion
ExclusiveArch: %{rust_arches}
- rust-criterion-plot
ExclusiveArch: %{rust_arches}
- rust-crossbeam
ExclusiveArch: %{rust_arches}
- rust-crossbeam-channel
ExclusiveArch: %{rust_arches}
- rust-crossbeam-channel0.4
ExclusiveArch: %{rust_arches}
- rust-crossbeam-deque
ExclusiveArch: %{rust_arches}
- rust-crossbeam-deque0.7
ExclusiveArch: %{rust_arches}
- rust-crossbeam-epoch
ExclusiveArch: %{rust_arches}
- rust-crossbeam-epoch0.8
ExclusiveArch: %{rust_arches}
- rust-crossbeam-queue
ExclusiveArch: %{rust_arches}
- rust-crossbeam-queue0.2
ExclusiveArch: %{rust_arches}
- rust-crossbeam-utils
ExclusiveArch: %{rust_arches}
- rust-crossbeam-utils0.7
ExclusiveArch: %{rust_arches}
- rust-crossbeam0.7
ExclusiveArch: %{rust_arches}
- rust-crossfont
ExclusiveArch: %{rust_arches}
- rust-crossterm
ExclusiveArch: %{rust_arches}
- rust-crossterm0.17
ExclusiveArch: %{rust_arches}
- rust-crosstermion
ExclusiveArch: %{rust_arches}
- rust-crypto-hash
ExclusiveArch: %{rust_arches}
- rust-crypto-mac
ExclusiveArch: %{rust_arches}
- rust-crypto-mac0.8
ExclusiveArch: %{rust_arches}
- rust-cryptovec
ExclusiveArch: %{rust_arches}
- rust-cssparser
ExclusiveArch: %{rust_arches}
- rust-cssparser-macros
ExclusiveArch: %{rust_arches}
- rust-csv
ExclusiveArch: %{rust_arches}
- rust-csv-core
ExclusiveArch: %{rust_arches}
- rust-ctor
ExclusiveArch: %{rust_arches}
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-ctrlc
ExclusiveArch: %{rust_arches}
- rust-cty
ExclusiveArch: %{rust_arches}
- rust-curl
ExclusiveArch: %{rust_arches}
- rust-curl-sys
ExclusiveArch: %{rust_arches}
- rust-custom_derive
ExclusiveArch: %{rust_arches}
- rust-cxx
ExclusiveArch: %{rust_arches}
- rust-cxx-build
ExclusiveArch: %{rust_arches}
- rust-cxx-gen
ExclusiveArch: %{rust_arches}
- rust-cxxbridge-flags
ExclusiveArch: %{rust_arches}
- rust-cxxbridge-macro
ExclusiveArch: %{rust_arches}
- rust-darling
ExclusiveArch: %{rust_arches}
- rust-darling_core
ExclusiveArch: %{rust_arches}
- rust-darling_macro
ExclusiveArch: %{rust_arches}
- rust-dashmap
ExclusiveArch: %{rust_arches}
- rust-data-encoding
ExclusiveArch: %{rust_arches}
- rust-data-url
ExclusiveArch: %{rust_arches}
- rust-datetime
ExclusiveArch: %{rust_arches}
- rust-dav1d-sys
ExclusiveArch: %{rust_arches}
- rust-dbus
ExclusiveArch: %{rust_arches}
- rust-dbus-codegen
ExclusiveArch: %{rust_arches}
- rust-dbus-crossroads
ExclusiveArch: %{rust_arches}
- rust-dbus0.2
ExclusiveArch: %{rust_arches}
- rust-dbus0.6
ExclusiveArch: %{rust_arches}
- rust-dbus0.8
ExclusiveArch: %{rust_arches}
- rust-debug-helper
ExclusiveArch: %{rust_arches}
- rust-decimal
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-defmac
ExclusiveArch: %{rust_arches}
- rust-delta_e
ExclusiveArch: %{rust_arches}
- rust-derivative
ExclusiveArch: %{rust_arches}
- rust-derive-new
ExclusiveArch: %{rust_arches}
- rust-derive_arbitrary
ExclusiveArch: %{rust_arches}
- rust-derive_builder
ExclusiveArch: %{rust_arches}
- rust-derive_builder_core
ExclusiveArch: %{rust_arches}
- rust-derive_more
ExclusiveArch: %{rust_arches}
- rust-des
ExclusiveArch: %{rust_arches}
- rust-desed
ExclusiveArch: %{rust_arches}
- rust-deunicode
ExclusiveArch: %{rust_arches}
- rust-devicemapper
ExclusiveArch: %{rust_arches}
- rust-dialoguer
ExclusiveArch: %{rust_arches}
- rust-diesel
ExclusiveArch: %{rust_arches}
- rust-diesel_derives
ExclusiveArch: %{rust_arches}
- rust-diesel_migrations
ExclusiveArch: %{rust_arches}
- rust-diff
ExclusiveArch: %{rust_arches}
- rust-difference
ExclusiveArch: %{rust_arches}
- rust-digest
ExclusiveArch: %{rust_arches}
- rust-digest0.8
ExclusiveArch: %{rust_arches}
- rust-directories
ExclusiveArch: %{rust_arches}
- rust-dirs
ExclusiveArch: %{rust_arches}
- rust-dirs-next
ExclusiveArch: %{rust_arches}
- rust-dirs-sys
ExclusiveArch: %{rust_arches}
- rust-dirs-sys-next
ExclusiveArch: %{rust_arches}
- rust-dirs2
ExclusiveArch: %{rust_arches}
- rust-diskonaut
ExclusiveArch: %{rust_arches}
- rust-dissimilar
ExclusiveArch: %{rust_arches}
- rust-dlib
ExclusiveArch: %{rust_arches}
- rust-dlv-list
ExclusiveArch: %{rust_arches}
- rust-dns-lookup
ExclusiveArch: %{rust_arches}
- rust-dns-parser
ExclusiveArch: %{rust_arches}
- rust-doc-comment
ExclusiveArch: %{rust_arches}
- rust-docmatic
ExclusiveArch: %{rust_arches}
- rust-docopt
ExclusiveArch: %{rust_arches}
- rust-dotenv
ExclusiveArch: %{rust_arches}
- rust-downcast-rs
ExclusiveArch: %{rust_arches}
- rust-dtoa
ExclusiveArch: %{rust_arches}
- rust-dtoa-short
ExclusiveArch: %{rust_arches}
- rust-dua-cli
ExclusiveArch: %{rust_arches}
- rust-duct
ExclusiveArch: %{rust_arches}
- rust-dummy
ExclusiveArch: %{rust_arches}
- rust-dunce
ExclusiveArch: %{rust_arches}
- rust-dutree
ExclusiveArch: %{rust_arches}
- rust-easy-parallel
ExclusiveArch: %{rust_arches}
- rust-edit-distance
ExclusiveArch: %{rust_arches}
- rust-either
ExclusiveArch: %{rust_arches}
- rust-elasticlunr-rs
ExclusiveArch: %{rust_arches}
- rust-encode_unicode
ExclusiveArch: %{rust_arches}
- rust-encoding
ExclusiveArch: %{rust_arches}
- rust-encoding-index-japanese
ExclusiveArch: %{rust_arches}
- rust-encoding-index-korean
ExclusiveArch: %{rust_arches}
- rust-encoding-index-simpchinese
ExclusiveArch: %{rust_arches}
- rust-encoding-index-singlebyte
ExclusiveArch: %{rust_arches}
- rust-encoding-index-tradchinese
ExclusiveArch: %{rust_arches}
- rust-encoding_index_tests
ExclusiveArch: %{rust_arches}
- rust-encoding_rs
ExclusiveArch: %{rust_arches}
- rust-encoding_rs_io
ExclusiveArch: %{rust_arches}
- rust-entities
ExclusiveArch: %{rust_arches}
- rust-enum-as-inner
ExclusiveArch: %{rust_arches}
- rust-enum_primitive
ExclusiveArch: %{rust_arches}
- rust-enumflags2
ExclusiveArch: %{rust_arches}
- rust-enumflags2_derive
ExclusiveArch: %{rust_arches}
- rust-env_logger
ExclusiveArch: %{rust_arches}
- rust-env_logger0.4
ExclusiveArch: %{rust_arches}
- rust-env_logger0.5
ExclusiveArch: %{rust_arches}
- rust-env_logger0.6
ExclusiveArch: %{rust_arches}
- rust-env_logger0.7
ExclusiveArch: %{rust_arches}
- rust-environment
ExclusiveArch: %{rust_arches}
- rust-envsubst
ExclusiveArch: %{rust_arches}
- rust-erased-serde
ExclusiveArch: %{rust_arches}
- rust-err-derive
ExclusiveArch: %{rust_arches}
- rust-errln
ExclusiveArch: %{rust_arches}
- rust-errno
ExclusiveArch: %{rust_arches}
- rust-error-chain
ExclusiveArch: %{rust_arches}
- rust-escaper
ExclusiveArch: %{rust_arches}
- rust-escargot
ExclusiveArch: %{rust_arches}
- rust-euclid
ExclusiveArch: %{rust_arches}
- rust-exa
ExclusiveArch: %{rust_arches}
- rust-expat-sys
ExclusiveArch: %{rust_arches}
- rust-extend
ExclusiveArch: %{rust_arches}
- rust-extprim
ExclusiveArch: %{rust_arches}
- rust-extprim_literals_macros
ExclusiveArch: %{rust_arches}
- rust-fail
ExclusiveArch: %{rust_arches}
- rust-failure
ExclusiveArch: %{rust_arches}
- rust-failure-tools
ExclusiveArch: %{rust_arches}
- rust-failure_derive
ExclusiveArch: %{rust_arches}
- rust-fake
ExclusiveArch: %{rust_arches}
- rust-fake-simd
ExclusiveArch: %{rust_arches}
- rust-fake_clock
ExclusiveArch: %{rust_arches}
- rust-fallible-iterator
ExclusiveArch: %{rust_arches}
- rust-fastrand
ExclusiveArch: %{rust_arches}
- rust-fbthrift_codegen_includer_proc_macro
ExclusiveArch: %{rust_arches}
- rust-fd-find
ExclusiveArch: %{rust_arches}
- rust-fdlimit
ExclusiveArch: %{rust_arches}
- rust-fedora
ExclusiveArch: %{rust_arches}
- rust-fedora-coreos-pinger
ExclusiveArch: %{rust_arches}
- rust-fedora-update-feedback
ExclusiveArch: %{rust_arches}
- rust-feed-rs
ExclusiveArch: %{rust_arches}
- rust-feedbin_api
ExclusiveArch: %{rust_arches}
- rust-feedly_api
ExclusiveArch: %{rust_arches}
- rust-fern
ExclusiveArch: %{rust_arches}
- rust-fever_api
ExclusiveArch: %{rust_arches}
- rust-ffsend
ExclusiveArch: %{rust_arches}
- rust-ffsend-api
ExclusiveArch: %{rust_arches}
- rust-filesize
ExclusiveArch: %{rust_arches}
- rust-filetime
ExclusiveArch: %{rust_arches}
- rust-findshlibs
ExclusiveArch: %{rust_arches}
- rust-fixedbitset
ExclusiveArch: %{rust_arches}
- rust-flame
ExclusiveArch: %{rust_arches}
- rust-flate2
ExclusiveArch: %{rust_arches}
- rust-float-cmp
ExclusiveArch: %{rust_arches}
- rust-float-cmp0.6
ExclusiveArch: %{rust_arches}
- rust-float-ord
ExclusiveArch: %{rust_arches}
- rust-flume
ExclusiveArch: %{rust_arches}
- rust-fnv
ExclusiveArch: %{rust_arches}
- rust-font-kit
ExclusiveArch: %{rust_arches}
- rust-foreign-types
ExclusiveArch: %{rust_arches}
- rust-foreign-types-macros
ExclusiveArch: %{rust_arches}
- rust-foreign-types-shared
ExclusiveArch: %{rust_arches}
- rust-foreign-types-shared0.1
ExclusiveArch: %{rust_arches}
- rust-foreign-types0.3
ExclusiveArch: %{rust_arches}
- rust-form_urlencoded
ExclusiveArch: %{rust_arches}
- rust-fragile
ExclusiveArch: %{rust_arches}
- rust-freetype
ExclusiveArch: %{rust_arches}
- rust-freetype-rs
ExclusiveArch: %{rust_arches}
- rust-freetype-sys
ExclusiveArch: %{rust_arches}
- rust-fs2
ExclusiveArch: %{rust_arches}
- rust-fs_extra
ExclusiveArch: %{rust_arches}
- rust-funty
ExclusiveArch: %{rust_arches}
- rust-fuse
ExclusiveArch: %{rust_arches}
- rust-futf
ExclusiveArch: %{rust_arches}
- rust-futures
ExclusiveArch: %{rust_arches}
- rust-futures-channel
ExclusiveArch: %{rust_arches}
- rust-futures-core
ExclusiveArch: %{rust_arches}
- rust-futures-cpupool
ExclusiveArch: %{rust_arches}
- rust-futures-executor
ExclusiveArch: %{rust_arches}
- rust-futures-io
ExclusiveArch: %{rust_arches}
- rust-futures-lite
ExclusiveArch: %{rust_arches}
- rust-futures-macro
ExclusiveArch: %{rust_arches}
- rust-futures-sink
ExclusiveArch: %{rust_arches}
- rust-futures-task
ExclusiveArch: %{rust_arches}
- rust-futures-timer
ExclusiveArch: %{rust_arches}
- rust-futures-util
ExclusiveArch: %{rust_arches}
- rust-futures0.1
ExclusiveArch: %{rust_arches}
- rust-fuzzy-matcher
ExclusiveArch: %{rust_arches}
- rust-fxhash
ExclusiveArch: %{rust_arches}
- rust-gcsf
ExclusiveArch: %{rust_arches}
- rust-gdk
ExclusiveArch: %{rust_arches}
- rust-gdk-pixbuf
ExclusiveArch: %{rust_arches}
- rust-gdk-pixbuf-sys
ExclusiveArch: %{rust_arches}
- rust-gdk-sys
ExclusiveArch: %{rust_arches}
- rust-generic-array
ExclusiveArch: %{rust_arches}
- rust-generic-array0.12
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gethostname
ExclusiveArch: %{rust_arches}
- rust-getopts
ExclusiveArch: %{rust_arches}
- rust-getrandom
ExclusiveArch: %{rust_arches}
- rust-getrandom0.1
ExclusiveArch: %{rust_arches}
- rust-gettext-rs
ExclusiveArch: %{rust_arches}
- rust-gettext-sys
ExclusiveArch: %{rust_arches}
- rust-ghash
ExclusiveArch: %{rust_arches}
- rust-ghost
ExclusiveArch: %{rust_arches}
- rust-gif
ExclusiveArch: %{rust_arches}
- rust-gif0.10
ExclusiveArch: %{rust_arches}
- rust-gimli
ExclusiveArch: %{rust_arches}
- rust-gio
ExclusiveArch: %{rust_arches}
- rust-gio-sys
ExclusiveArch: %{rust_arches}
- rust-gir-format-check
ExclusiveArch: %{rust_arches}
- rust-git-delta
ExclusiveArch: %{rust_arches}
- rust-git2
ExclusiveArch: %{rust_arches}
- rust-git2-curl
ExclusiveArch: %{rust_arches}
- rust-gitui
ExclusiveArch: %{rust_arches}
- rust-gl_generator
ExclusiveArch: %{rust_arches}
- rust-glib
ExclusiveArch: %{rust_arches}
- rust-glib-macros
ExclusiveArch: %{rust_arches}
- rust-glib-sys
ExclusiveArch: %{rust_arches}
- rust-glob
ExclusiveArch: %{rust_arches}
- rust-globset
ExclusiveArch: %{rust_arches}
- rust-globwalk
ExclusiveArch: %{rust_arches}
- rust-glutin
ExclusiveArch: %{rust_arches}
- rust-glutin_egl_sys
ExclusiveArch: %{rust_arches}
- rust-glutin_glx_sys
ExclusiveArch: %{rust_arches}
- rust-gobject-sys
ExclusiveArch: %{rust_arches}
- rust-goblin
ExclusiveArch: %{rust_arches}
- rust-google-drive3-fork
ExclusiveArch: %{rust_arches}
- rust-gptman
ExclusiveArch: %{rust_arches}
- rust-grep
ExclusiveArch: %{rust_arches}
- rust-grep-cli
ExclusiveArch: %{rust_arches}
- rust-grep-matcher
ExclusiveArch: %{rust_arches}
- rust-grep-pcre2
ExclusiveArch: %{rust_arches}
- rust-grep-printer
ExclusiveArch: %{rust_arches}
- rust-grep-regex
ExclusiveArch: %{rust_arches}
- rust-grep-searcher
ExclusiveArch: %{rust_arches}
- rust-groupable
ExclusiveArch: %{rust_arches}
- rust-gspell
ExclusiveArch: %{rust_arches}
- rust-gspell-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer
ExclusiveArch: %{rust_arches}
- rust-gstreamer-audio
ExclusiveArch: %{rust_arches}
- rust-gstreamer-audio-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-base
ExclusiveArch: %{rust_arches}
- rust-gstreamer-base-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-editing-services
ExclusiveArch: %{rust_arches}
- rust-gstreamer-editing-services-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-pbutils
ExclusiveArch: %{rust_arches}
- rust-gstreamer-pbutils-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-player
ExclusiveArch: %{rust_arches}
- rust-gstreamer-player-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-video
ExclusiveArch: %{rust_arches}
- rust-gstreamer-video-sys
ExclusiveArch: %{rust_arches}
- rust-gtk
ExclusiveArch: %{rust_arches}
- rust-gtk-macros
ExclusiveArch: %{rust_arches}
- rust-gtk-rs-lgpl-docs
ExclusiveArch: %{rust_arches}
- rust-gtk-source-sys
ExclusiveArch: %{rust_arches}
- rust-gtk-sys
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-h2
ExclusiveArch: %{rust_arches}
- rust-half
ExclusiveArch: %{rust_arches}
- rust-hamcrest
ExclusiveArch: %{rust_arches}
- rust-handlebars
ExclusiveArch: %{rust_arches}
- rust-hashbrown
ExclusiveArch: %{rust_arches}
- rust-headers
ExclusiveArch: %{rust_arches}
- rust-headers-core
ExclusiveArch: %{rust_arches}
- rust-headers-derive
ExclusiveArch: %{rust_arches}
- rust-heapsize
ExclusiveArch: %{rust_arches}
- rust-heatseeker
ExclusiveArch: %{rust_arches}
- rust-heck
ExclusiveArch: %{rust_arches}
- rust-hex
ExclusiveArch: %{rust_arches}
- rust-hex-literal
ExclusiveArch: %{rust_arches}
- rust-hex-literal-impl
ExclusiveArch: %{rust_arches}
- rust-hex-literal0.2
ExclusiveArch: %{rust_arches}
- rust-hexyl
ExclusiveArch: %{rust_arches}
- rust-hkdf
ExclusiveArch: %{rust_arches}
- rust-hmac
ExclusiveArch: %{rust_arches}
- rust-home
ExclusiveArch: %{rust_arches}
- rust-horrorshow
ExclusiveArch: %{rust_arches}
- rust-hostname
ExclusiveArch: %{rust_arches}
- rust-hostname-validator
ExclusiveArch: %{rust_arches}
- rust-html2pango
ExclusiveArch: %{rust_arches}
- rust-html5ever
ExclusiveArch: %{rust_arches}
- rust-http
ExclusiveArch: %{rust_arches}
- rust-http-body
ExclusiveArch: %{rust_arches}
- rust-http0.1
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-httpdate
ExclusiveArch: %{rust_arches}
- rust-humansize
ExclusiveArch: %{rust_arches}
- rust-humantime
ExclusiveArch: %{rust_arches}
- rust-humantime1
ExclusiveArch: %{rust_arches}
- rust-hyper
ExclusiveArch: %{rust_arches}
- rust-hyper-native-tls
ExclusiveArch: %{rust_arches}
- rust-hyper-staticfile
ExclusiveArch: %{rust_arches}
- rust-hyper-tls
ExclusiveArch: %{rust_arches}
- rust-hyper0.10
ExclusiveArch: %{rust_arches}
- rust-hyperfine
ExclusiveArch: %{rust_arches}
- rust-i3ipc
ExclusiveArch: %{rust_arches}
- rust-id_tree
ExclusiveArch: %{rust_arches}
- rust-ident_case
ExclusiveArch: %{rust_arches}
- rust-idna
ExclusiveArch: %{rust_arches}
- rust-idna0.1
ExclusiveArch: %{rust_arches}
- rust-ignore
ExclusiveArch: %{rust_arches}
- rust-im-rc
ExclusiveArch: %{rust_arches}
- rust-image
ExclusiveArch: %{rust_arches}
- rust-imgref
ExclusiveArch: %{rust_arches}
- rust-indexmap
ExclusiveArch: %{rust_arches}
- rust-indicatif
ExclusiveArch: %{rust_arches}
- rust-indoc
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-inotify
ExclusiveArch: %{rust_arches}
- rust-inotify-sys
ExclusiveArch: %{rust_arches}
- rust-input_buffer
ExclusiveArch: %{rust_arches}
- rust-insta
ExclusiveArch: %{rust_arches}
- rust-instant
ExclusiveArch: %{rust_arches}
- rust-interpolate_name
ExclusiveArch: %{rust_arches}
- rust-intervaltree
ExclusiveArch: %{rust_arches}
- rust-invalidstring
ExclusiveArch: %{rust_arches}
- rust-inventory
ExclusiveArch: %{rust_arches}
- rust-inventory-impl
ExclusiveArch: %{rust_arches}
- rust-iocuddle
ExclusiveArch: %{rust_arches}
- rust-iovec
ExclusiveArch: %{rust_arches}
- rust-ipnet
ExclusiveArch: %{rust_arches}
- rust-ipnetwork
ExclusiveArch: %{rust_arches}
- rust-iron
ExclusiveArch: %{rust_arches}
- rust-isahc
ExclusiveArch: %{rust_arches}
- rust-iso8601
ExclusiveArch: %{rust_arches}
- rust-iter-read
ExclusiveArch: %{rust_arches}
- rust-itertools
ExclusiveArch: %{rust_arches}
- rust-itertools-num
ExclusiveArch: %{rust_arches}
- rust-itertools0.8
ExclusiveArch: %{rust_arches}
- rust-itertools0.9
ExclusiveArch: %{rust_arches}
- rust-itoa
ExclusiveArch: %{rust_arches}
- rust-ivf
ExclusiveArch: %{rust_arches}
- rust-javascriptcore-rs
ExclusiveArch: %{rust_arches}
- rust-javascriptcore-rs-sys
ExclusiveArch: %{rust_arches}
- rust-jetscii
ExclusiveArch: %{rust_arches}
- rust-jieba-rs
ExclusiveArch: %{rust_arches}
- rust-jobserver
ExclusiveArch: %{rust_arches}
- rust-jpeg-decoder
ExclusiveArch: %{rust_arches}
- rust-jql
ExclusiveArch: %{rust_arches}
- rust-js-sys
ExclusiveArch: %{rust_arches}
- rust-js_int
ExclusiveArch: %{rust_arches}
- rust-json
ExclusiveArch: %{rust_arches}
- rust-jwalk
ExclusiveArch: %{rust_arches}
- rust-keccak
ExclusiveArch: %{rust_arches}
- rust-khronos_api
ExclusiveArch: %{rust_arches}
- rust-kstring
ExclusiveArch: %{rust_arches}
- rust-kv-log-macro
ExclusiveArch: %{rust_arches}
- rust-lab
ExclusiveArch: %{rust_arches}
- rust-language-tags
ExclusiveArch: %{rust_arches}
- rust-lazy-init
ExclusiveArch: %{rust_arches}
- rust-lazy_static
ExclusiveArch: %{rust_arches}
- rust-lazycell
ExclusiveArch: %{rust_arches}
- rust-leb128
ExclusiveArch: %{rust_arches}
- rust-letter-avatar
ExclusiveArch: %{rust_arches}
- rust-lexical-core
ExclusiveArch: %{rust_arches}
- rust-libc
ExclusiveArch: %{rust_arches}
- rust-libcryptsetup-rs
ExclusiveArch: %{rust_arches}
- rust-libcryptsetup-rs-sys
ExclusiveArch: %{rust_arches}
- rust-libdbus-sys
ExclusiveArch: %{rust_arches}
- rust-libflate
ExclusiveArch: %{rust_arches}
- rust-libflate_lz77
ExclusiveArch: %{rust_arches}
- rust-libgit2-sys
ExclusiveArch: %{rust_arches}
- rust-libhandy
ExclusiveArch: %{rust_arches}
- rust-libhandy-sys
ExclusiveArch: %{rust_arches}
- rust-libloading
ExclusiveArch: %{rust_arches}
- rust-libm
ExclusiveArch: %{rust_arches}
- rust-libmount
ExclusiveArch: %{rust_arches}
- rust-libnotcurses-sys
ExclusiveArch: %{rust_arches}
- rust-liboverdrop
ExclusiveArch: %{rust_arches}
- rust-libpulse-binding
ExclusiveArch: %{rust_arches}
- rust-libpulse-sys
ExclusiveArch: %{rust_arches}
- rust-libslirp
ExclusiveArch: %{rust_arches}
- rust-libslirp-sys
ExclusiveArch: %{rust_arches}
- rust-libsqlite3-sys
ExclusiveArch: %{rust_arches}
- rust-libssh2-sys
ExclusiveArch: %{rust_arches}
- rust-libsystemd
ExclusiveArch: %{rust_arches}
- rust-libudev
ExclusiveArch: %{rust_arches}
- rust-libudev-sys
ExclusiveArch: %{rust_arches}
- rust-libxml
ExclusiveArch: %{rust_arches}
- rust-libz-sys
ExclusiveArch: %{rust_arches}
- rust-line-wrap
ExclusiveArch: %{rust_arches}
- rust-line_drawing
ExclusiveArch: %{rust_arches}
- rust-link-cplusplus
ExclusiveArch: %{rust_arches}
- rust-linked-hash-map
ExclusiveArch: %{rust_arches}
- rust-linkify
ExclusiveArch: %{rust_arches}
- rust-lipsum
ExclusiveArch: %{rust_arches}
- rust-liquid
ExclusiveArch: %{rust_arches}
- rust-liquid-core
ExclusiveArch: %{rust_arches}
- rust-liquid-derive
ExclusiveArch: %{rust_arches}
- rust-liquid-lib
ExclusiveArch: %{rust_arches}
- rust-listenfd
ExclusiveArch: %{rust_arches}
- rust-lmdb
ExclusiveArch: %{rust_arches}
- rust-lmdb-sys
ExclusiveArch: %{rust_arches}
- rust-locale
ExclusiveArch: %{rust_arches}
- rust-locale_config
ExclusiveArch: %{rust_arches}
- rust-lock_api
ExclusiveArch: %{rust_arches}
- rust-lockfree
ExclusiveArch: %{rust_arches}
- rust-log
ExclusiveArch: %{rust_arches}
- rust-log-mdc
ExclusiveArch: %{rust_arches}
- rust-log-panics
ExclusiveArch: %{rust_arches}
- rust-log0.3
ExclusiveArch: %{rust_arches}
- rust-log4rs
ExclusiveArch: %{rust_arches}
- rust-loggerv
ExclusiveArch: %{rust_arches}
- rust-loopdev
ExclusiveArch: %{rust_arches}
- rust-lru-cache
ExclusiveArch: %{rust_arches}
- rust-lru_time_cache
ExclusiveArch: %{rust_arches}
- rust-lscolors
ExclusiveArch: %{rust_arches}
- rust-lsd
ExclusiveArch: %{rust_arches}
- rust-lzma-sys
ExclusiveArch: %{rust_arches}
- rust-lzw
ExclusiveArch: %{rust_arches}
- rust-mac
ExclusiveArch: %{rust_arches}
- rust-macro-attr
ExclusiveArch: %{rust_arches}
- rust-magic-crypt
ExclusiveArch: %{rust_arches}
- rust-maildir
ExclusiveArch: %{rust_arches}
- rust-mailparse
ExclusiveArch: %{rust_arches}
- rust-man
ExclusiveArch: %{rust_arches}
- rust-maplit
ExclusiveArch: %{rust_arches}
- rust-markup5ever
ExclusiveArch: %{rust_arches}
- rust-markup5ever_rcdom
ExclusiveArch: %{rust_arches}
- rust-match_cfg
ExclusiveArch: %{rust_arches}
- rust-matches
ExclusiveArch: %{rust_arches}
- rust-matrixmultiply
ExclusiveArch: %{rust_arches}
- rust-maxminddb
ExclusiveArch: %{rust_arches}
- rust-maybe-uninit
ExclusiveArch: %{rust_arches}
- rust-mbox
ExclusiveArch: %{rust_arches}
- rust-md-5
ExclusiveArch: %{rust_arches}
- rust-md5
ExclusiveArch: %{rust_arches}
- rust-mdl
ExclusiveArch: %{rust_arches}
- rust-memchr
ExclusiveArch: %{rust_arches}
- rust-memmap
ExclusiveArch: %{rust_arches}
- rust-memmap2
ExclusiveArch: %{rust_arches}
- rust-memoffset
ExclusiveArch: %{rust_arches}
- rust-memoffset0.5
ExclusiveArch: %{rust_arches}
- rust-metadeps
ExclusiveArch: %{rust_arches}
- rust-migrations_internals
ExclusiveArch: %{rust_arches}
- rust-migrations_macros
ExclusiveArch: %{rust_arches}
- rust-mime
ExclusiveArch: %{rust_arches}
- rust-mime-sniffer
ExclusiveArch: %{rust_arches}
- rust-mime0.2
ExclusiveArch: %{rust_arches}
- rust-mime_guess
ExclusiveArch: %{rust_arches}
- rust-mime_guess1
ExclusiveArch: %{rust_arches}
- rust-miniflux_api
ExclusiveArch: %{rust_arches}
- rust-minify-html
ExclusiveArch: %{rust_arches}
- rust-miniz-sys
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide0.3
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide_c_api
ExclusiveArch: %{rust_arches}
- rust-mint
ExclusiveArch: %{rust_arches}
- rust-mio
ExclusiveArch: %{rust_arches}
- rust-mio-extras
ExclusiveArch: %{rust_arches}
- rust-mio-uds
ExclusiveArch: %{rust_arches}
- rust-mio0.6
ExclusiveArch: %{rust_arches}
- rust-mktemp
ExclusiveArch: %{rust_arches}
- rust-mnt
ExclusiveArch: %{rust_arches}
- rust-mockito
ExclusiveArch: %{rust_arches}
- rust-modifier
ExclusiveArch: %{rust_arches}
- rust-more-asserts
ExclusiveArch: %{rust_arches}
- rust-muldiv
ExclusiveArch: %{rust_arches}
- rust-multimap
ExclusiveArch: %{rust_arches}
- rust-multipart
ExclusiveArch: %{rust_arches}
- rust-mustache
ExclusiveArch: %{rust_arches}
- rust-nasm-rs
ExclusiveArch: %{rust_arches}
- rust-native-tls
ExclusiveArch: %{rust_arches}
- rust-natord
ExclusiveArch: %{rust_arches}
- rust-nb-connect
ExclusiveArch: %{rust_arches}
- rust-net2
ExclusiveArch: %{rust_arches}
- rust-netlink-packet-core
ExclusiveArch: %{rust_arches}
- rust-netlink-packet-route
ExclusiveArch: %{rust_arches}
- rust-netlink-packet-utils
ExclusiveArch: %{rust_arches}
- rust-netlink-proto
ExclusiveArch: %{rust_arches}
- rust-netlink-sys
ExclusiveArch: %{rust_arches}
- rust-netmap_sys
ExclusiveArch: %{rust_arches}
- rust-new_debug_unreachable
ExclusiveArch: %{rust_arches}
- rust-news-flash
ExclusiveArch: %{rust_arches}
- rust-newtype_derive
ExclusiveArch: %{rust_arches}
- rust-nickel
ExclusiveArch: %{rust_arches}
- rust-nix
ExclusiveArch: %{rust_arches}
- rust-nix0.14
ExclusiveArch: %{rust_arches}
- rust-nix0.17
ExclusiveArch: %{rust_arches}
- rust-nix0.18
ExclusiveArch: %{rust_arches}
- rust-no-panic
ExclusiveArch: %{rust_arches}
- rust-nodrop
ExclusiveArch: %{rust_arches}
- rust-nom
ExclusiveArch: %{rust_arches}
- rust-nom4
ExclusiveArch: %{rust_arches}
- rust-nom5
ExclusiveArch: %{rust_arches}
- rust-noop_proc_macro
ExclusiveArch: %{rust_arches}
- rust-normalize-line-endings
ExclusiveArch: %{rust_arches}
- rust-notify
ExclusiveArch: %{rust_arches}
- rust-notify-rust
ExclusiveArch: %{rust_arches}
- rust-num
ExclusiveArch: %{rust_arches}
- rust-num-bigint
ExclusiveArch: %{rust_arches}
- rust-num-bigint-dig
ExclusiveArch: %{rust_arches}
- rust-num-complex
ExclusiveArch: %{rust_arches}
- rust-num-derive
ExclusiveArch: %{rust_arches}
- rust-num-integer
ExclusiveArch: %{rust_arches}
- rust-num-iter
ExclusiveArch: %{rust_arches}
- rust-num-rational
ExclusiveArch: %{rust_arches}
- rust-num-traits
ExclusiveArch: %{rust_arches}
- rust-num-traits0.1
ExclusiveArch: %{rust_arches}
- rust-num_cpus
ExclusiveArch: %{rust_arches}
- rust-number_prefix
ExclusiveArch: %{rust_arches}
- rust-numtoa
ExclusiveArch: %{rust_arches}
- rust-obfstr
ExclusiveArch: %{rust_arches}
- rust-object
ExclusiveArch: %{rust_arches}
- rust-odds
ExclusiveArch: %{rust_arches}
- rust-oid
ExclusiveArch: %{rust_arches}
- rust-once_cell
ExclusiveArch: %{rust_arches}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-onig_sys
ExclusiveArch: %{rust_arches}
- rust-oorandom
ExclusiveArch: %{rust_arches}
- rust-opaque-debug
ExclusiveArch: %{rust_arches}
- rust-open
ExclusiveArch: %{rust_arches}
- rust-openat
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-opener
ExclusiveArch: %{rust_arches}
- rust-openssh-keys
ExclusiveArch: %{rust_arches}
- rust-openssl
ExclusiveArch: %{rust_arches}
- rust-openssl-probe
ExclusiveArch: %{rust_arches}
- rust-openssl-sys
ExclusiveArch: %{rust_arches}
- rust-ord_subset
ExclusiveArch: %{rust_arches}
- rust-ordered-float
ExclusiveArch: %{rust_arches}
- rust-ordered-multimap
ExclusiveArch: %{rust_arches}
- rust-os_info
ExclusiveArch: %{rust_arches}
- rust-os_pipe
ExclusiveArch: %{rust_arches}
- rust-os_str_bytes
ExclusiveArch: %{rust_arches}
- rust-osmesa-sys
ExclusiveArch: %{rust_arches}
- rust-osstrtools
ExclusiveArch: %{rust_arches}
- rust-ostree
ExclusiveArch: %{rust_arches}
- rust-ostree-sys
ExclusiveArch: %{rust_arches}
- rust-owned-alloc
ExclusiveArch: %{rust_arches}
- rust-owned_ttf_parser
ExclusiveArch: %{rust_arches}
- rust-owning_ref
ExclusiveArch: %{rust_arches}
- rust-packaging
ExclusiveArch: %{rust_arches}
- rust-pad
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-palette
ExclusiveArch: %{rust_arches}
- rust-palette_derive
ExclusiveArch: %{rust_arches}
- rust-pango
ExclusiveArch: %{rust_arches}
- rust-pango-sys
ExclusiveArch: %{rust_arches}
- rust-pangocairo
ExclusiveArch: %{rust_arches}
- rust-pangocairo-sys
ExclusiveArch: %{rust_arches}
- rust-parity-wasm
ExclusiveArch: %{rust_arches}
- rust-parking
ExclusiveArch: %{rust_arches}
- rust-parking_lot
ExclusiveArch: %{rust_arches}
- rust-parking_lot_core
ExclusiveArch: %{rust_arches}
- rust-parse-zoneinfo
ExclusiveArch: %{rust_arches}
- rust-parse_cfg
ExclusiveArch: %{rust_arches}
- rust-parsec-client
ExclusiveArch: %{rust_arches}
- rust-parsec-interface
ExclusiveArch: %{rust_arches}
- rust-partial-io
ExclusiveArch: %{rust_arches}
- rust-paste
ExclusiveArch: %{rust_arches}
- rust-paste-impl
ExclusiveArch: %{rust_arches}
- rust-path-absolutize
ExclusiveArch: %{rust_arches}
- rust-path-dedot
ExclusiveArch: %{rust_arches}
- rust-path-slash
ExclusiveArch: %{rust_arches}
- rust-pathdiff
ExclusiveArch: %{rust_arches}
- rust-pathfinder_geometry
ExclusiveArch: %{rust_arches}
- rust-pathfinder_simd
ExclusiveArch: %{rust_arches}
- rust-pbr
ExclusiveArch: %{rust_arches}
- rust-pcap
ExclusiveArch: %{rust_arches}
- rust-pcre2
ExclusiveArch: %{rust_arches}
- rust-pcre2-sys
ExclusiveArch: %{rust_arches}
- rust-peeking_take_while
ExclusiveArch: %{rust_arches}
- rust-peg
ExclusiveArch: %{rust_arches}
- rust-peg-macros
ExclusiveArch: %{rust_arches}
- rust-peg-runtime
ExclusiveArch: %{rust_arches}
- rust-peg0.5
ExclusiveArch: %{rust_arches}
- rust-pem
ExclusiveArch: %{rust_arches}
- rust-percent-encoding
ExclusiveArch: %{rust_arches}
- rust-percent-encoding1
ExclusiveArch: %{rust_arches}
- rust-peresil
ExclusiveArch: %{rust_arches}
- rust-permutate
ExclusiveArch: %{rust_arches}
- rust-permutohedron
ExclusiveArch: %{rust_arches}
- rust-pest
ExclusiveArch: %{rust_arches}
- rust-pest_derive
ExclusiveArch: %{rust_arches}
- rust-pest_generator
ExclusiveArch: %{rust_arches}
- rust-pest_meta
ExclusiveArch: %{rust_arches}
- rust-petgraph
ExclusiveArch: %{rust_arches}
- rust-phf
ExclusiveArch: %{rust_arches}
- rust-phf0.7
ExclusiveArch: %{rust_arches}
- rust-phf_codegen
ExclusiveArch: %{rust_arches}
- rust-phf_codegen0.7
ExclusiveArch: %{rust_arches}
- rust-phf_generator
ExclusiveArch: %{rust_arches}
- rust-phf_generator0.7
ExclusiveArch: %{rust_arches}
- rust-phf_macros
ExclusiveArch: %{rust_arches}
- rust-phf_macros0.7
ExclusiveArch: %{rust_arches}
- rust-phf_shared
ExclusiveArch: %{rust_arches}
- rust-phf_shared0.7
ExclusiveArch: %{rust_arches}
- rust-picky-asn1
ExclusiveArch: %{rust_arches}
- rust-picky-asn1-der
ExclusiveArch: %{rust_arches}
- rust-picky-asn1-x509
ExclusiveArch: %{rust_arches}
- rust-pico-args
ExclusiveArch: %{rust_arches}
- rust-pin-project
ExclusiveArch: %{rust_arches}
- rust-pin-project-internal
ExclusiveArch: %{rust_arches}
- rust-pin-project-internal0.4
ExclusiveArch: %{rust_arches}
- rust-pin-project-lite
ExclusiveArch: %{rust_arches}
- rust-pin-project-lite0.1
ExclusiveArch: %{rust_arches}
- rust-pin-project0.4
ExclusiveArch: %{rust_arches}
- rust-pin-utils
ExclusiveArch: %{rust_arches}
- rust-pipe
ExclusiveArch: %{rust_arches}
- rust-piper
ExclusiveArch: %{rust_arches}
- rust-pkcs11
ExclusiveArch: %{rust_arches}
- rust-pkg-config
ExclusiveArch: %{rust_arches}
- rust-plain
ExclusiveArch: %{rust_arches}
- rust-platform-dirs
ExclusiveArch: %{rust_arches}
- rust-platforms
ExclusiveArch: %{rust_arches}
- rust-plist
ExclusiveArch: %{rust_arches}
- rust-plotters
ExclusiveArch: %{rust_arches}
- rust-plugin
ExclusiveArch: %{rust_arches}
- rust-pnet_base
ExclusiveArch: %{rust_arches}
- rust-pnet_datalink
ExclusiveArch: %{rust_arches}
- rust-pnet_sys
ExclusiveArch: %{rust_arches}
- rust-png
ExclusiveArch: %{rust_arches}
- rust-podio
ExclusiveArch: %{rust_arches}
- rust-polling
ExclusiveArch: %{rust_arches}
- rust-polyval
ExclusiveArch: %{rust_arches}
- rust-pommes
ExclusiveArch: %{rust_arches}
- rust-ppv-lite86
ExclusiveArch: %{rust_arches}
- rust-pq-sys
ExclusiveArch: %{rust_arches}
- rust-precomputed-hash
ExclusiveArch: %{rust_arches}
- rust-predicates
ExclusiveArch: %{rust_arches}
- rust-predicates-core
ExclusiveArch: %{rust_arches}
- rust-predicates-tree
ExclusiveArch: %{rust_arches}
- rust-pretty-git-prompt
ExclusiveArch: %{rust_arches}
- rust-pretty-hex
ExclusiveArch: %{rust_arches}
- rust-pretty_assertions
ExclusiveArch: %{rust_arches}
- rust-pretty_env_logger
ExclusiveArch: %{rust_arches}
- rust-prettytable-rs
ExclusiveArch: %{rust_arches}
- rust-proc-macro-crate
ExclusiveArch: %{rust_arches}
- rust-proc-macro-error
ExclusiveArch: %{rust_arches}
- rust-proc-macro-error-attr
ExclusiveArch: %{rust_arches}
- rust-proc-macro-hack
ExclusiveArch: %{rust_arches}
- rust-proc-macro-nested
ExclusiveArch: %{rust_arches}
- rust-proc-macro2
ExclusiveArch: %{rust_arches}
- rust-proc-macro2-0.4
ExclusiveArch: %{rust_arches}
- rust-proc-quote
ExclusiveArch: %{rust_arches}
- rust-proc-quote-impl
ExclusiveArch: %{rust_arches}
- rust-procedural-masquerade
ExclusiveArch: %{rust_arches}
- rust-process_path
ExclusiveArch: %{rust_arches}
- rust-procfs
ExclusiveArch: %{rust_arches}
- rust-procfs0.8
ExclusiveArch: %{rust_arches}
- rust-procs
ExclusiveArch: %{rust_arches}
- rust-progress-streams
ExclusiveArch: %{rust_arches}
- rust-prometheus
ExclusiveArch: %{rust_arches}
- rust-proptest
ExclusiveArch: %{rust_arches}
- rust-proptest-derive
ExclusiveArch: %{rust_arches}
- rust-prost
ExclusiveArch: %{rust_arches}
- rust-prost-build
ExclusiveArch: %{rust_arches}
- rust-prost-derive
ExclusiveArch: %{rust_arches}
- rust-prost-types
ExclusiveArch: %{rust_arches}
- rust-protobuf
ExclusiveArch: %{rust_arches}
- rust-protobuf-codegen
ExclusiveArch: %{rust_arches}
- rust-protobuf-codegen-pure
ExclusiveArch: %{rust_arches}
- rust-protoc
ExclusiveArch: %{rust_arches}
- rust-protoc-rust
ExclusiveArch: %{rust_arches}
- rust-psa-crypto
ExclusiveArch: %{rust_arches}
- rust-psa-crypto-sys
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-psutil
ExclusiveArch: %{rust_arches}
- rust-publicsuffix
ExclusiveArch: %{rust_arches}
- rust-pulldown-cmark
ExclusiveArch: %{rust_arches}
- rust-pulse
ExclusiveArch: %{rust_arches}
- rust-pure-rust-locales
ExclusiveArch: %{rust_arches}
- rust-pyo3
ExclusiveArch: %{rust_arches}
- rust-pyo3-macros
ExclusiveArch: %{rust_arches}
- rust-pyo3-macros-backend
ExclusiveArch: %{rust_arches}
- rust-python3-sys
ExclusiveArch: %{rust_arches}
- rust-qr2term
ExclusiveArch: %{rust_arches}
- rust-qrcode
ExclusiveArch: %{rust_arches}
- rust-quick-error
ExclusiveArch: %{rust_arches}
- rust-quick-error1
ExclusiveArch: %{rust_arches}
- rust-quick-xml
ExclusiveArch: %{rust_arches}
- rust-quickcheck
ExclusiveArch: %{rust_arches}
- rust-quickcheck0.6
ExclusiveArch: %{rust_arches}
- rust-quickcheck_macros
ExclusiveArch: %{rust_arches}
- rust-quickersort
ExclusiveArch: %{rust_arches}
- rust-quote
ExclusiveArch: %{rust_arches}
- rust-quote0.3
ExclusiveArch: %{rust_arches}
- rust-quote0.6
ExclusiveArch: %{rust_arches}
- rust-quoted_printable
ExclusiveArch: %{rust_arches}
- rust-r2d2
ExclusiveArch: %{rust_arches}
- rust-radium
ExclusiveArch: %{rust_arches}
- rust-rand
ExclusiveArch: %{rust_arches}
- rust-rand0.4
ExclusiveArch: %{rust_arches}
- rust-rand0.5
ExclusiveArch: %{rust_arches}
- rust-rand0.6
ExclusiveArch: %{rust_arches}
- rust-rand0.7
ExclusiveArch: %{rust_arches}
- rust-rand_chacha
ExclusiveArch: %{rust_arches}
- rust-rand_chacha0.1
ExclusiveArch: %{rust_arches}
- rust-rand_chacha0.2
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-rand_core0.3
ExclusiveArch: %{rust_arches}
- rust-rand_core0.4
ExclusiveArch: %{rust_arches}
- rust-rand_core0.5
ExclusiveArch: %{rust_arches}
- rust-rand_distr
ExclusiveArch: %{rust_arches}
- rust-rand_distr0.2
ExclusiveArch: %{rust_arches}
- rust-rand_hc
ExclusiveArch: %{rust_arches}
- rust-rand_hc0.1
ExclusiveArch: %{rust_arches}
- rust-rand_isaac
ExclusiveArch: %{rust_arches}
- rust-rand_isaac0.1
ExclusiveArch: %{rust_arches}
- rust-rand_jitter
ExclusiveArch: %{rust_arches}
- rust-rand_jitter0.1
ExclusiveArch: %{rust_arches}
- rust-rand_os
ExclusiveArch: %{rust_arches}
- rust-rand_os0.1
ExclusiveArch: %{rust_arches}
- rust-rand_pcg
ExclusiveArch: %{rust_arches}
- rust-rand_pcg0.1
ExclusiveArch: %{rust_arches}
- rust-rand_pcg0.2
ExclusiveArch: %{rust_arches}
- rust-rand_xorshift
ExclusiveArch: %{rust_arches}
- rust-rand_xorshift0.1
ExclusiveArch: %{rust_arches}
- rust-rand_xoshiro
ExclusiveArch: %{rust_arches}
- rust-random-fast-rng
ExclusiveArch: %{rust_arches}
- rust-random-trait
ExclusiveArch: %{rust_arches}
- rust-randomize
ExclusiveArch: %{rust_arches}
- rust-rav1e
ExclusiveArch: %{rust_arches}
- rust-raw-window-handle
ExclusiveArch: %{rust_arches}
- rust-rawpointer
ExclusiveArch: %{rust_arches}
- rust-rawslice
ExclusiveArch: %{rust_arches}
- rust-rayon
ExclusiveArch: %{rust_arches}
- rust-rayon-core
ExclusiveArch: %{rust_arches}
- rust-readability-fork
ExclusiveArch: %{rust_arches}
- rust-readwrite
ExclusiveArch: %{rust_arches}
- rust-recycler
ExclusiveArch: %{rust_arches}
- rust-ref-cast
ExclusiveArch: %{rust_arches}
- rust-ref-cast-impl
ExclusiveArch: %{rust_arches}
- rust-regex
ExclusiveArch: %{rust_arches}
- rust-regex-automata
ExclusiveArch: %{rust_arches}
- rust-regex-syntax
ExclusiveArch: %{rust_arches}
- rust-region
ExclusiveArch: %{rust_arches}
- rust-relative-path
ExclusiveArch: %{rust_arches}
- rust-relay
ExclusiveArch: %{rust_arches}
- rust-remove_dir_all
ExclusiveArch: %{rust_arches}
- rust-reqwest
ExclusiveArch: %{rust_arches}
- rust-resize
ExclusiveArch: %{rust_arches}
- rust-resolv-conf
ExclusiveArch: %{rust_arches}
- rust-restson
ExclusiveArch: %{rust_arches}
- rust-retry
ExclusiveArch: %{rust_arches}
- rust-rgb
ExclusiveArch: %{rust_arches}
- rust-ring
ExclusiveArch: %{rust_arches}
- rust-ripgrep
ExclusiveArch: %{rust_arches}
- rust-rle-decode-fast
ExclusiveArch: %{rust_arches}
- rust-rmp
ExclusiveArch: %{rust_arches}
- rust-rmp-serde
ExclusiveArch: %{rust_arches}
- rust-roff
ExclusiveArch: %{rust_arches}
- rust-ron
ExclusiveArch: %{rust_arches}
- rust-roxmltree
ExclusiveArch: %{rust_arches}
- rust-rpassword
ExclusiveArch: %{rust_arches}
- rust-rpick
ExclusiveArch: %{rust_arches}
- rust-rsa
ExclusiveArch: %{rust_arches}
- rust-rtnetlink
ExclusiveArch: %{rust_arches}
- rust-ruma
ExclusiveArch: %{rust_arches}
- rust-ruma-api
ExclusiveArch: %{rust_arches}
- rust-ruma-api-macros
ExclusiveArch: %{rust_arches}
- rust-ruma-appservice-api
ExclusiveArch: %{rust_arches}
- rust-ruma-client-api
ExclusiveArch: %{rust_arches}
- rust-ruma-common
ExclusiveArch: %{rust_arches}
- rust-ruma-events
ExclusiveArch: %{rust_arches}
- rust-ruma-events-macros
ExclusiveArch: %{rust_arches}
- rust-ruma-federation-api
ExclusiveArch: %{rust_arches}
- rust-ruma-identifiers
ExclusiveArch: %{rust_arches}
- rust-ruma-identifiers-macros
ExclusiveArch: %{rust_arches}
- rust-ruma-identifiers-validation
ExclusiveArch: %{rust_arches}
- rust-ruma-identity-service-api
ExclusiveArch: %{rust_arches}
- rust-ruma-push-gateway-api
ExclusiveArch: %{rust_arches}
- rust-ruma-serde
ExclusiveArch: %{rust_arches}
- rust-ruma-serde-macros
ExclusiveArch: %{rust_arches}
- rust-ruma-signatures
ExclusiveArch: %{rust_arches}
- rust-rust-embed
ExclusiveArch: %{rust_arches}
- rust-rust-embed-impl
ExclusiveArch: %{rust_arches}
- rust-rust-embed-utils
ExclusiveArch: %{rust_arches}
- rust-rust-ini
ExclusiveArch: %{rust_arches}
- rust-rust-stemmers
ExclusiveArch: %{rust_arches}
- rust-rust_decimal
ExclusiveArch: %{rust_arches}
- rust-rust_hawktracer
ExclusiveArch: %{rust_arches}
- rust-rust_hawktracer_normal_macro
ExclusiveArch: %{rust_arches}
- rust-rust_hawktracer_proc_macro
ExclusiveArch: %{rust_arches}
- rust-rust_hawktracer_sys
ExclusiveArch: %{rust_arches}
- rust-rustc-demangle
ExclusiveArch: %{rust_arches}
- rust-rustc-hash
ExclusiveArch: %{rust_arches}
- rust-rustc-serialize
ExclusiveArch: %{rust_arches}
- rust-rustc-test
ExclusiveArch: %{rust_arches}
- rust-rustc_tools_util
ExclusiveArch: %{rust_arches}
- rust-rustc_version
ExclusiveArch: %{rust_arches}
- rust-rustdoc-stripper
ExclusiveArch: %{rust_arches}
- rust-rustfilt
ExclusiveArch: %{rust_arches}
- rust-rustfix
ExclusiveArch: %{rust_arches}
- rust-rustio
ExclusiveArch: %{rust_arches}
- rust-rusttype
ExclusiveArch: %{rust_arches}
- rust-rustversion
ExclusiveArch: %{rust_arches}
- rust-rusty-fork
ExclusiveArch: %{rust_arches}
- rust-rustyline
ExclusiveArch: %{rust_arches}
- rust-rustyline-derive
ExclusiveArch: %{rust_arches}
- rust-ryu
ExclusiveArch: %{rust_arches}
- rust-safe-transmute
ExclusiveArch: %{rust_arches}
- rust-safemem
ExclusiveArch: %{rust_arches}
- rust-same-file
ExclusiveArch: %{rust_arches}
- rust-sass-rs
ExclusiveArch: %{rust_arches}
- rust-sass-sys
ExclusiveArch: %{rust_arches}
- rust-scan_fmt
ExclusiveArch: %{rust_arches}
- rust-scheduled-thread-pool
ExclusiveArch: %{rust_arches}
- rust-scoped-tls
ExclusiveArch: %{rust_arches}
- rust-scoped-tls-hkt
ExclusiveArch: %{rust_arches}
- rust-scoped_threadpool
ExclusiveArch: %{rust_arches}
- rust-scopeguard
ExclusiveArch: %{rust_arches}
- rust-scopetime
ExclusiveArch: %{rust_arches}
- rust-scratch
ExclusiveArch: %{rust_arches}
- rust-scroll
ExclusiveArch: %{rust_arches}
- rust-scroll_derive
ExclusiveArch: %{rust_arches}
- rust-sct
ExclusiveArch: %{rust_arches}
- rust-sd
ExclusiveArch: %{rust_arches}
- rust-sd-notify
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-secrecy
ExclusiveArch: %{rust_arches}
- rust-secret-service
ExclusiveArch: %{rust_arches}
- rust-semver
ExclusiveArch: %{rust_arches}
- rust-semver-parser
ExclusiveArch: %{rust_arches}
- rust-semver-parser0.7
ExclusiveArch: %{rust_arches}
- rust-semver-parser0.9
ExclusiveArch: %{rust_arches}
- rust-semver0.10
ExclusiveArch: %{rust_arches}
- rust-semver0.9
ExclusiveArch: %{rust_arches}
- rust-serde
ExclusiveArch: %{rust_arches}
- rust-serde-big-array
ExclusiveArch: %{rust_arches}
- rust-serde-pickle
ExclusiveArch: %{rust_arches}
- rust-serde-value
ExclusiveArch: %{rust_arches}
- rust-serde-xml-rs
ExclusiveArch: %{rust_arches}
- rust-serde_bytes
ExclusiveArch: %{rust_arches}
- rust-serde_cbor
ExclusiveArch: %{rust_arches}
- rust-serde_derive
ExclusiveArch: %{rust_arches}
- rust-serde_ignored
ExclusiveArch: %{rust_arches}
- rust-serde_json
ExclusiveArch: %{rust_arches}
- rust-serde_repr
ExclusiveArch: %{rust_arches}
- rust-serde_stacker
ExclusiveArch: %{rust_arches}
- rust-serde_test
ExclusiveArch: %{rust_arches}
- rust-serde_url_params
ExclusiveArch: %{rust_arches}
- rust-serde_urlencoded
ExclusiveArch: %{rust_arches}
- rust-serde_urlencoded0.6
ExclusiveArch: %{rust_arches}
- rust-serde_with_macros
ExclusiveArch: %{rust_arches}
- rust-serde_yaml
ExclusiveArch: %{rust_arches}
- rust-serial_test
ExclusiveArch: %{rust_arches}
- rust-serial_test_derive
ExclusiveArch: %{rust_arches}
- rust-servo-fontconfig
ExclusiveArch: %{rust_arches}
- rust-servo-fontconfig-sys
ExclusiveArch: %{rust_arches}
- rust-sha-1
ExclusiveArch: %{rust_arches}
- rust-sha1
ExclusiveArch: %{rust_arches}
- rust-sha2
ExclusiveArch: %{rust_arches}
- rust-sha3
ExclusiveArch: %{rust_arches}
- rust-shared_child
ExclusiveArch: %{rust_arches}
- rust-shared_library
ExclusiveArch: %{rust_arches}
- rust-shell-escape
ExclusiveArch: %{rust_arches}
- rust-shell-words
ExclusiveArch: %{rust_arches}
- rust-shellexpand
ExclusiveArch: %{rust_arches}
- rust-shlex
ExclusiveArch: %{rust_arches}
- rust-signal-hook
ExclusiveArch: %{rust_arches}
- rust-signal-hook-registry
ExclusiveArch: %{rust_arches}
- rust-silver
ExclusiveArch: %{rust_arches}
- rust-simd_helpers
ExclusiveArch: %{rust_arches}
- rust-simple_asn1
ExclusiveArch: %{rust_arches}
- rust-simple_logger
ExclusiveArch: %{rust_arches}
- rust-simplelog
ExclusiveArch: %{rust_arches}
- rust-siphasher
ExclusiveArch: %{rust_arches}
- rust-size
ExclusiveArch: %{rust_arches}
- rust-sized-chunks
ExclusiveArch: %{rust_arches}
- rust-skeptic
ExclusiveArch: %{rust_arches}
- rust-skim
ExclusiveArch: %{rust_arches}
- rust-slab
ExclusiveArch: %{rust_arches}
- rust-slash-formatter
ExclusiveArch: %{rust_arches}
- rust-slice-deque
ExclusiveArch: %{rust_arches}
- rust-slog
ExclusiveArch: %{rust_arches}
- rust-slog-async
ExclusiveArch: %{rust_arches}
- rust-slog-scope
ExclusiveArch: %{rust_arches}
- rust-slog-term
ExclusiveArch: %{rust_arches}
- rust-slotmap
ExclusiveArch: %{rust_arches}
- rust-slug
ExclusiveArch: %{rust_arches}
- rust-sluice
ExclusiveArch: %{rust_arches}
- rust-smallvec
ExclusiveArch: %{rust_arches}
- rust-smart-default
ExclusiveArch: %{rust_arches}
- rust-smawk
ExclusiveArch: %{rust_arches}
- rust-smithay-client-toolkit
ExclusiveArch: %{rust_arches}
- rust-smithay-clipboard
ExclusiveArch: %{rust_arches}
- rust-snafu
ExclusiveArch: %{rust_arches}
- rust-snafu-derive
ExclusiveArch: %{rust_arches}
- rust-snowflake
ExclusiveArch: %{rust_arches}
- rust-socket2
ExclusiveArch: %{rust_arches}
- rust-soup-sys
ExclusiveArch: %{rust_arches}
- rust-sourceview
ExclusiveArch: %{rust_arches}
- rust-spin
ExclusiveArch: %{rust_arches}
- rust-spin_on
ExclusiveArch: %{rust_arches}
- rust-spinning_top
ExclusiveArch: %{rust_arches}
- rust-spmc
ExclusiveArch: %{rust_arches}
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stable_deref_trait
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-standback
ExclusiveArch: %{rust_arches}
- rust-starship
ExclusiveArch: %{rust_arches}
- rust-starship_module_config_derive
ExclusiveArch: %{rust_arches}
- rust-static_assertions
ExclusiveArch: %{rust_arches}
- rust-statistical
ExclusiveArch: %{rust_arches}
- rust-stb_truetype
ExclusiveArch: %{rust_arches}
- rust-stream-cipher
ExclusiveArch: %{rust_arches}
- rust-streaming-stats
ExclusiveArch: %{rust_arches}
- rust-string
ExclusiveArch: %{rust_arches}
- rust-string_cache
ExclusiveArch: %{rust_arches}
- rust-string_cache_codegen
ExclusiveArch: %{rust_arches}
- rust-string_cache_shared
ExclusiveArch: %{rust_arches}
- rust-strings
ExclusiveArch: %{rust_arches}
- rust-strip-ansi-escapes
ExclusiveArch: %{rust_arches}
- rust-strsim
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-structopt-derive
ExclusiveArch: %{rust_arches}
- rust-structopt-derive0.2
ExclusiveArch: %{rust_arches}
- rust-structopt0.2
ExclusiveArch: %{rust_arches}
- rust-strum
ExclusiveArch: %{rust_arches}
- rust-strum_macros
ExclusiveArch: %{rust_arches}
- rust-subtle
ExclusiveArch: %{rust_arches}
- rust-sudo_plugin
ExclusiveArch: %{rust_arches}
- rust-sudo_plugin-sys
ExclusiveArch: %{rust_arches}
- rust-sval
ExclusiveArch: %{rust_arches}
- rust-sval_derive
ExclusiveArch: %{rust_arches}
- rust-svg_metadata
ExclusiveArch: %{rust_arches}
- rust-sxd-document
ExclusiveArch: %{rust_arches}
- rust-syn
ExclusiveArch: %{rust_arches}
- rust-syn-mid
ExclusiveArch: %{rust_arches}
- rust-syn0.15
ExclusiveArch: %{rust_arches}
- rust-synom
ExclusiveArch: %{rust_arches}
- rust-synstructure
ExclusiveArch: %{rust_arches}
- rust-syntect
ExclusiveArch: %{rust_arches}
- rust-sys-info
ExclusiveArch: %{rust_arches}
- rust-sysinfo
ExclusiveArch: %{rust_arches}
- rust-system-deps
ExclusiveArch: %{rust_arches}
- rust-tabwriter
ExclusiveArch: %{rust_arches}
- rust-take
ExclusiveArch: %{rust_arches}
- rust-take_mut
ExclusiveArch: %{rust_arches}
- rust-tap
ExclusiveArch: %{rust_arches}
- rust-tar
ExclusiveArch: %{rust_arches}
- rust-target-lexicon
ExclusiveArch: %{rust_arches}
- rust-tealdeer
ExclusiveArch: %{rust_arches}
- rust-teloxide
ExclusiveArch: %{rust_arches}
- rust-teloxide-macros
ExclusiveArch: %{rust_arches}
- rust-tempdir
ExclusiveArch: %{rust_arches}
- rust-tempfile
ExclusiveArch: %{rust_arches}
- rust-tendril
ExclusiveArch: %{rust_arches}
- rust-tera
ExclusiveArch: %{rust_arches}
- rust-term
ExclusiveArch: %{rust_arches}
- rust-term_grid
ExclusiveArch: %{rust_arches}
- rust-term_size
ExclusiveArch: %{rust_arches}
- rust-termcolor
ExclusiveArch: %{rust_arches}
- rust-terminal_size
ExclusiveArch: %{rust_arches}
- rust-terminfo
ExclusiveArch: %{rust_arches}
- rust-termion
ExclusiveArch: %{rust_arches}
- rust-termios
ExclusiveArch: %{rust_arches}
- rust-test-assembler
ExclusiveArch: %{rust_arches}
- rust-tester
ExclusiveArch: %{rust_arches}
- rust-testing_logger
ExclusiveArch: %{rust_arches}
- rust-textwrap
ExclusiveArch: %{rust_arches}
- rust-textwrap0.11
ExclusiveArch: %{rust_arches}
- rust-textwrap0.12
ExclusiveArch: %{rust_arches}
- rust-thiserror
ExclusiveArch: %{rust_arches}
- rust-thiserror-impl
ExclusiveArch: %{rust_arches}
- rust-thread-id
ExclusiveArch: %{rust_arches}
- rust-thread-scoped
ExclusiveArch: %{rust_arches}
- rust-thread_local
ExclusiveArch: %{rust_arches}
- rust-threadpool
ExclusiveArch: %{rust_arches}
- rust-tiff
ExclusiveArch: %{rust_arches}
- rust-tiger-digest
ExclusiveArch: %{rust_arches}
- rust-time
ExclusiveArch: %{rust_arches}
- rust-time-macros
ExclusiveArch: %{rust_arches}
- rust-time-macros-impl
ExclusiveArch: %{rust_arches}
- rust-time0.1
ExclusiveArch: %{rust_arches}
- rust-timebomb
ExclusiveArch: %{rust_arches}
- rust-timer
ExclusiveArch: %{rust_arches}
- rust-timerfd
ExclusiveArch: %{rust_arches}
- rust-tiny_http
ExclusiveArch: %{rust_arches}
- rust-tinytemplate
ExclusiveArch: %{rust_arches}
- rust-tinyvec
ExclusiveArch: %{rust_arches}
- rust-tinyvec0.3
ExclusiveArch: %{rust_arches}
- rust-tinyvec_macros
ExclusiveArch: %{rust_arches}
- rust-tokei
ExclusiveArch: %{rust_arches}
- rust-tokio
ExclusiveArch: %{rust_arches}
- rust-tokio-codec
ExclusiveArch: %{rust_arches}
- rust-tokio-core
ExclusiveArch: %{rust_arches}
- rust-tokio-current-thread
ExclusiveArch: %{rust_arches}
- rust-tokio-executor
ExclusiveArch: %{rust_arches}
- rust-tokio-fs
ExclusiveArch: %{rust_arches}
- rust-tokio-io
ExclusiveArch: %{rust_arches}
- rust-tokio-io-pool
ExclusiveArch: %{rust_arches}
- rust-tokio-macros
ExclusiveArch: %{rust_arches}
- rust-tokio-macros0.2
ExclusiveArch: %{rust_arches}
- rust-tokio-mock-task
ExclusiveArch: %{rust_arches}
- rust-tokio-openssl
ExclusiveArch: %{rust_arches}
- rust-tokio-reactor
ExclusiveArch: %{rust_arches}
- rust-tokio-socks
ExclusiveArch: %{rust_arches}
- rust-tokio-sync
ExclusiveArch: %{rust_arches}
- rust-tokio-tcp
ExclusiveArch: %{rust_arches}
- rust-tokio-test
ExclusiveArch: %{rust_arches}
- rust-tokio-threadpool
ExclusiveArch: %{rust_arches}
- rust-tokio-timer
ExclusiveArch: %{rust_arches}
- rust-tokio-tls
ExclusiveArch: %{rust_arches}
- rust-tokio-tls0.2
ExclusiveArch: %{rust_arches}
- rust-tokio-tungstenite
ExclusiveArch: %{rust_arches}
- rust-tokio-udp
ExclusiveArch: %{rust_arches}
- rust-tokio-uds
ExclusiveArch: %{rust_arches}
- rust-tokio-util
ExclusiveArch: %{rust_arches}
- rust-tokio-util0.2
ExclusiveArch: %{rust_arches}
- rust-tokio0.1
ExclusiveArch: %{rust_arches}
- rust-tokio0.2
ExclusiveArch: %{rust_arches}
- rust-toml
ExclusiveArch: %{rust_arches}
- rust-toml0.4
ExclusiveArch: %{rust_arches}
- rust-tower-layer
ExclusiveArch: %{rust_arches}
- rust-tower-service
ExclusiveArch: %{rust_arches}
- rust-tower-test
ExclusiveArch: %{rust_arches}
- rust-tower-util
ExclusiveArch: %{rust_arches}
- rust-tpm2-policy
ExclusiveArch: %{rust_arches}
- rust-tracing
ExclusiveArch: %{rust_arches}
- rust-tracing-attributes
ExclusiveArch: %{rust_arches}
- rust-tracing-core
ExclusiveArch: %{rust_arches}
- rust-tracing-futures
ExclusiveArch: %{rust_arches}
- rust-traitobject
ExclusiveArch: %{rust_arches}
- rust-treebitmap
ExclusiveArch: %{rust_arches}
- rust-treeline
ExclusiveArch: %{rust_arches}
- rust-trust-dns-native-tls
ExclusiveArch: %{rust_arches}
- rust-trust-dns-openssl
ExclusiveArch: %{rust_arches}
- rust-trust-dns-proto
ExclusiveArch: %{rust_arches}
- rust-trust-dns-resolver
ExclusiveArch: %{rust_arches}
- rust-try-lock
ExclusiveArch: %{rust_arches}
- rust-try_from
ExclusiveArch: %{rust_arches}
- rust-try_or
ExclusiveArch: %{rust_arches}
- rust-trybuild
ExclusiveArch: %{rust_arches}
- rust-tss-esapi
ExclusiveArch: %{rust_arches}
- rust-ttf-parser
ExclusiveArch: %{rust_arches}
- rust-tui
ExclusiveArch: %{rust_arches}
- rust-tui-react
ExclusiveArch: %{rust_arches}
- rust-tui0.11
ExclusiveArch: %{rust_arches}
- rust-tui0.9
ExclusiveArch: %{rust_arches}
- rust-tuikit
ExclusiveArch: %{rust_arches}
- rust-tungstenite
ExclusiveArch: %{rust_arches}
- rust-twoway
ExclusiveArch: %{rust_arches}
- rust-typeable
ExclusiveArch: %{rust_arches}
- rust-typed-arena
ExclusiveArch: %{rust_arches}
- rust-typemap
ExclusiveArch: %{rust_arches}
- rust-typenum
ExclusiveArch: %{rust_arches}
- rust-typetag-impl
ExclusiveArch: %{rust_arches}
- rust-ucd-parse
ExclusiveArch: %{rust_arches}
- rust-ucd-trie
ExclusiveArch: %{rust_arches}
- rust-ucd-util
ExclusiveArch: %{rust_arches}
- rust-unchecked-index
ExclusiveArch: %{rust_arches}
- rust-unescape
ExclusiveArch: %{rust_arches}
- rust-unic-char-property
ExclusiveArch: %{rust_arches}
- rust-unic-char-range
ExclusiveArch: %{rust_arches}
- rust-unic-common
ExclusiveArch: %{rust_arches}
- rust-unic-segment
ExclusiveArch: %{rust_arches}
- rust-unic-ucd-category
ExclusiveArch: %{rust_arches}
- rust-unic-ucd-common
ExclusiveArch: %{rust_arches}
- rust-unic-ucd-segment
ExclusiveArch: %{rust_arches}
- rust-unic-ucd-version
ExclusiveArch: %{rust_arches}
- rust-unicase
ExclusiveArch: %{rust_arches}
- rust-unicase1
ExclusiveArch: %{rust_arches}
- rust-unicode-bidi
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-segmentation
ExclusiveArch: %{rust_arches}
- rust-unicode-width
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-unicode-xid0.1
ExclusiveArch: %{rust_arches}
- rust-unicode_categories
ExclusiveArch: %{rust_arches}
- rust-unindent
ExclusiveArch: %{rust_arches}
- rust-universal-hash
ExclusiveArch: %{rust_arches}
- rust-unix_socket
ExclusiveArch: %{rust_arches}
- rust-unreachable
ExclusiveArch: %{rust_arches}
- rust-unsafe-any
ExclusiveArch: %{rust_arches}
- rust-untrusted
ExclusiveArch: %{rust_arches}
- rust-uom
ExclusiveArch: %{rust_arches}
- rust-url
ExclusiveArch: %{rust_arches}
- rust-url1
ExclusiveArch: %{rust_arches}
- rust-url_serde
ExclusiveArch: %{rust_arches}
- rust-urlencoding
ExclusiveArch: %{rust_arches}
- rust-urlocator
ExclusiveArch: %{rust_arches}
- rust-urlshortener
ExclusiveArch: %{rust_arches}
- rust-users
ExclusiveArch: %{rust_arches}
- rust-users0.10
ExclusiveArch: %{rust_arches}
- rust-utf-8
ExclusiveArch: %{rust_arches}
- rust-utf8-ranges
ExclusiveArch: %{rust_arches}
- rust-utf8-width
ExclusiveArch: %{rust_arches}
- rust-utf8parse
ExclusiveArch: %{rust_arches}
- rust-uuid
ExclusiveArch: %{rust_arches}
- rust-uuid0.7
ExclusiveArch: %{rust_arches}
- rust-v_escape
ExclusiveArch: %{rust_arches}
- rust-v_escape_derive
ExclusiveArch: %{rust_arches}
- rust-v_frame
ExclusiveArch: %{rust_arches}
- rust-v_htmlescape
ExclusiveArch: %{rust_arches}
- rust-varlink
ExclusiveArch: %{rust_arches}
- rust-varlink-cli
ExclusiveArch: %{rust_arches}
- rust-varlink_generator
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-varlink_stdinterfaces
ExclusiveArch: %{rust_arches}
- rust-vec-arena
ExclusiveArch: %{rust_arches}
- rust-vec_map
ExclusiveArch: %{rust_arches}
- rust-vergen
ExclusiveArch: %{rust_arches}
- rust-version
ExclusiveArch: %{rust_arches}
- rust-version-compare
ExclusiveArch: %{rust_arches}
- rust-version-sync
ExclusiveArch: %{rust_arches}
- rust-version-sync0.8
ExclusiveArch: %{rust_arches}
- rust-version_check
ExclusiveArch: %{rust_arches}
- rust-vmw_backdoor
ExclusiveArch: %{rust_arches}
- rust-void
ExclusiveArch: %{rust_arches}
- rust-vte
ExclusiveArch: %{rust_arches}
- rust-vte0.3
ExclusiveArch: %{rust_arches}
- rust-vte_generate_state_changes
ExclusiveArch: %{rust_arches}
- rust-wait-timeout
ExclusiveArch: %{rust_arches}
- rust-waker-fn
ExclusiveArch: %{rust_arches}
- rust-walkdir
ExclusiveArch: %{rust_arches}
- rust-want
ExclusiveArch: %{rust_arches}
- rust-warp
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-backend
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-macro
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-macro-support
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-shared
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-test-macro
ExclusiveArch: %{rust_arches}
- rust-wayland-client
ExclusiveArch: %{rust_arches}
- rust-wayland-commons
ExclusiveArch: %{rust_arches}
- rust-wayland-cursor
ExclusiveArch: %{rust_arches}
- rust-wayland-egl
ExclusiveArch: %{rust_arches}
- rust-wayland-protocols
ExclusiveArch: %{rust_arches}
- rust-wayland-scanner
ExclusiveArch: %{rust_arches}
- rust-wayland-server
ExclusiveArch: %{rust_arches}
- rust-wayland-sys
ExclusiveArch: %{rust_arches}
- rust-web-sys
ExclusiveArch: %{rust_arches}
- rust-webkit2gtk
ExclusiveArch: %{rust_arches}
- rust-webkit2gtk-sys
ExclusiveArch: %{rust_arches}
- rust-websocket
ExclusiveArch: %{rust_arches}
- rust-websocket-base
ExclusiveArch: %{rust_arches}
- rust-weezl
ExclusiveArch: %{rust_arches}
- rust-which
ExclusiveArch: %{rust_arches}
- rust-wild
ExclusiveArch: %{rust_arches}
- rust-wildmatch
ExclusiveArch: %{rust_arches}
- rust-winit
ExclusiveArch: %{rust_arches}
- rust-ws
ExclusiveArch: %{rust_arches}
- rust-wyz
ExclusiveArch: %{rust_arches}
- rust-x11
ExclusiveArch: %{rust_arches}
- rust-x11-clipboard
ExclusiveArch: %{rust_arches}
- rust-x11-dl
ExclusiveArch: %{rust_arches}
- rust-xattr
ExclusiveArch: %{rust_arches}
- rust-xcb
ExclusiveArch: %{rust_arches}
- rust-xcursor
ExclusiveArch: %{rust_arches}
- rust-xdg
ExclusiveArch: %{rust_arches}
- rust-xkbcommon
ExclusiveArch: %{rust_arches}
- rust-xml-rs
ExclusiveArch: %{rust_arches}
- rust-xml5ever
ExclusiveArch: %{rust_arches}
- rust-xmlparser
ExclusiveArch: %{rust_arches}
- rust-xz2
ExclusiveArch: %{rust_arches}
- rust-y4m
ExclusiveArch: %{rust_arches}
- rust-yaml-rust
ExclusiveArch: %{rust_arches}
- rust-yaml-rust0.3
ExclusiveArch: %{rust_arches}
- rust-ybaas
ExclusiveArch: %{rust_arches}
- rust-ytop
ExclusiveArch: %{rust_arches}
- rust-yubibomb
ExclusiveArch: %{rust_arches}
- rust-yup-oauth2
ExclusiveArch: %{rust_arches}
- rust-zbus
ExclusiveArch: %{rust_arches}
- rust-zbus_macros
ExclusiveArch: %{rust_arches}
- rust-zeroize
ExclusiveArch: %{rust_arches}
- rust-zeroize_derive
ExclusiveArch: %{rust_arches}
- rust-zincati
ExclusiveArch: %{rust_arches}
- rust-zip
ExclusiveArch: %{rust_arches}
- rust-zoneinfo_compiled
ExclusiveArch: %{rust_arches}
- rust-zoxide
ExclusiveArch: %{rust_arches}
- rust-zram-generator
ExclusiveArch: %{rust_arches}
- rust-zstd
ExclusiveArch: %{rust_arches}
- rust-zstd-safe
ExclusiveArch: %{rust_arches}
- rust-zstd-sys
ExclusiveArch: %{rust_arches}
- rust-zvariant
ExclusiveArch: %{rust_arches}
- rust-zvariant_derive
ExclusiveArch: %{rust_arches}
- s390utils
ExclusiveArch: s390 s390x
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- sagemath
ExclusiveArch: aarch64 %{ix86} x86_64 ppc sparcv9
- sbcl
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- sbd
ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- seabios
ExclusiveArch: x86_64
- seadrive-gui
ExclusiveArch: %{qt5_qtwebengine_arches}
- seafile-client
ExclusiveArch: %{qt5_qtwebengine_arches}
- seamonkey
ExclusiveArch: x86_64
- seqan3
ExclusiveArch: %{power64} x86_64 aarch64
- servicelog
ExclusiveArch: ppc %{power64}
- sgabios
ExclusiveArch: %{ix86} x86_64
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigul
ExclusiveArch: x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- snapd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- soup-sharp
ExclusiveArch: %{mono_arches}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- springlobby
ExclusiveArch: %{ix86} x86_64
- squeekboard
ExclusiveArch: %{rust_arches}
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- supercollider
ExclusiveArch: %{qt5_qtwebengine_arches}
- supermin
ExclusiveArch: %{kernel_arches}
- svt-av1
ExclusiveArch: x86_64
- svt-vp9
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64 aarch64
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tarantool
ExclusiveArch: %{ix86} x86_64
- tboot
ExclusiveArch: %{ix86} x86_64
- tdlib
ExclusiveArch: x86_64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- testcloud
ExclusiveArch: %{kernel_arches} noarch
- themonospot-base
ExclusiveArch: %mono_arches
- themonospot-console
ExclusiveArch: %mono_arches
- themonospot-gui-gtk
ExclusiveArch: %mono_arches
- themonospot-plugin-avi
ExclusiveArch: %mono_arches
- themonospot-plugin-mkv
ExclusiveArch: %mono_arches
- thermald
ExclusiveArch: %{ix86} x86_64
- tilix
ExclusiveArch: %{ldc_arches}
- tmux-top
ExclusiveArch: %{go_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- torbrowser-launcher
ExclusiveArch: %{ix86} x86_64
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- ugene
ExclusiveArch: %{ix86} x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
- uglify-js1
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- unetbootin
ExclusiveArch: %{ix86} x86_64
- ursa-major
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vapoursynth
ExclusiveArch: %{ix86} x86_64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- virt-p2v
ExclusiveArch: x86_64
- virt-v2v
ExclusiveArch: x86_64
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- virtualplanet
ExclusiveArch: %{fpc_arches}
- vkd3d
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- vmaf
ExclusiveArch: x86_64
- vmem
ExclusiveArch: x86_64
- vmemcache
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- vrq
ExclusiveArch: %{ix86} x86_64
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- webkit2-sharp
ExclusiveArch: %mono_arches
- wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExclusiveArch: %{ix86} %{arm}
- wine-dxvk
ExclusiveArch: %{ix86} x86_64
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- xe-guest-utilities-latest
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: %{ix86} x86_64 armv7hl aarch64
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- yarnpkg
ExclusiveArch: %{nodejs_arches} noarch
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ng
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- zola
ExclusiveArch: %{rust_arches}
2 years, 3 months
- 1
- 0
Architecture specific change in rpms/dd_rescue.git
by githook-noreply＠fedoraproject.org
The package rpms/dd_rescue.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/dd_rescue.git/commit/?id=6151a906....
Change:
-%ifarch armv7hl
Thanks.
Full change:
============
commit fccd56407f5271112a97d41dcbb93171075d8799
Author: Hans Ulrich Niedermann <hun(a)n-dimensional.de>
Date: Sat Feb 27 21:57:38 2021 +0100
Update to dd_rescue-1.99.9 and dd_rhelp-0.3.0
diff --git a/.gitignore b/.gitignore
index aef72c6..2bc5374 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@
/dd_rescue-1.99.7.tar.bz2
/dd_rescue-1.99.8.tar.bz2
/dd_rescue-1.99.8.tar.bz2.asc
+/dd_rescue-1.99.9.tar.bz2
+/dd_rescue-1.99.9.tar.bz2.asc
diff --git a/dd_rescue.spec b/dd_rescue.spec
index 66cf02f..7a25946 100644
--- a/dd_rescue.spec
+++ b/dd_rescue.spec
@@ -1,7 +1,7 @@
%define rhelp_version 0.3.0
Name: dd_rescue
-Version: 1.99.8
+Version: 1.99.9
Release: 13%{?dist}
Summary: Fault tolerant "dd" utility for rescuing data from bad media
# No version specified
@@ -66,6 +66,9 @@ install -D -m 755 dd_rhelp-%{rhelp_version}/dd_rhelp %{buildroot}%{_bindir}/dd_r
%changelog
+* Sat Feb 27 2021 Hans Ulrich Niedermann <hun(a)n-dimensional.de> - 1.99.9-13
+- Update to dd_rescue-1.99.9 and dd_rhelp-0.3.0
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.99.8-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 48b7f91..5f9f3f7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (dd_rhelp-0.3.0.tar.gz) = a29aa4b01ae1a1d9652e990cebf0f00ec464a4d4b9109f4c52e066d7406cc82b40113b7d6c4ab0bf2f4547947a89608c8403ff011de1f3ddf47745f88c59bc9e
-SHA512 (dd_rescue-1.99.8.tar.bz2) = a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
-SHA512 (dd_rescue-1.99.8.tar.bz2.asc) = c3ff6bb47c5bb418fb18756ba7cd18de4d0e6863e704913b2eb323927c57df7cb428f614cbeed54cbb3e2944b13787392a63e16f55a442752dec7c33e074e910
+SHA512 (dd_rescue-1.99.9.tar.bz2) = 88d585ae7980d832f85cf936aa41d8c5fdd531192a2e705b0c0b23b20ad40917fc01a5deb03184ba2927ff4615134048a1be897a4fed663b34821763e7122fca
+SHA512 (dd_rescue-1.99.9.tar.bz2.asc) = 8613e3b879217d92b67766b97e77183aec5e7ab91b287f6be02a98fe9ab4bfe556933c3ab6aa0109ac454fb38f89f0793fe8914ed50fd78d5c7ff82fb0b49939
commit 15b560856a0efb008c5b77f56e0861eeb032f8cf
Author: Hans Ulrich Niedermann <hun(a)n-dimensional.de>
Date: Sat Feb 27 21:54:58 2021 +0100
spec file space typo fixes
diff --git a/dd_rescue.spec b/dd_rescue.spec
index 61b64cd..66cf02f 100644
--- a/dd_rescue.spec
+++ b/dd_rescue.spec
@@ -18,7 +18,7 @@ BuildRequires: automake
BuildRequires: gcc
BuildRequires: gnupg2
BuildRequires: lzo-devel
-BuildRequires: make
+BuildRequires: make
%description
@@ -27,7 +27,7 @@ data from a file or block device to another. ddrescue does however
not abort on errors in the input file. This makes it suitable for
rescuing data from media with errors, e.g. a disk with bad sectors.
-This package includes dd_rhelp, a wrapper script facilitating data
+This package includes dd_rhelp, a wrapper script facilitating data
recovery.
%prep
commit 8e73fb2dffadad9309cd7933cfbbf7ef0146a95b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 03:05:31 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/dd_rescue.spec b/dd_rescue.spec
index ba81d82..61b64cd 100644
--- a/dd_rescue.spec
+++ b/dd_rescue.spec
@@ -2,7 +2,7 @@
Name: dd_rescue
Version: 1.99.8
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Fault tolerant "dd" utility for rescuing data from bad media
# No version specified
License: GPL+
@@ -66,6 +66,9 @@ install -D -m 755 dd_rhelp-%{rhelp_version}/dd_rhelp %{buildroot}%{_bindir}/dd_r
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.99.8-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Mon Sep 28 2020 Jeff Law <law(a)redhat.com> - 1.99.8-12
- Re-enable LTO as upstream GCC target/96939 has been fixed
commit 8b87a9fd6d00d606974c6d44b7fa29016b4d6426
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Thu Dec 17 04:19:39 2020 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/dd_rescue.spec b/dd_rescue.spec
index c2f979f..ba81d82 100644
--- a/dd_rescue.spec
+++ b/dd_rescue.spec
@@ -18,6 +18,7 @@ BuildRequires: automake
BuildRequires: gcc
BuildRequires: gnupg2
BuildRequires: lzo-devel
+BuildRequires: make
%description
commit 6151a906f9323110b0f07be5325a6b231812c6de
Author: Jeff Law <law(a)redhat.com>
Date: Mon Sep 28 12:22:41 2020 -0600
- Re-enable LTO as upstream GCC target/96939 has been fixed
diff --git a/dd_rescue.spec b/dd_rescue.spec
index 7e9288f..c2f979f 100644
--- a/dd_rescue.spec
+++ b/dd_rescue.spec
@@ -2,7 +2,7 @@
Name: dd_rescue
Version: 1.99.8
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Fault tolerant "dd" utility for rescuing data from bad media
# No version specified
License: GPL+
@@ -37,13 +37,6 @@ autoreconf -vif
%configure
%build
-# This package fails to build with LTO on armv7 as it complains about using
-# NEON instructions. We've seen this on several packages and it's not yet
-# clear what the root cause is yet. Until that's settled disable LTO on
-# armv7 for now
-%ifarch armv7hl
-%define _lto_cflags %{nil}
-%endif
%ifarch ppc64le
rm -f aesni.c find_nonzero_sse2.c find_nonzero_arm.c find_nonzero_arm64.c
%endif
@@ -72,6 +65,9 @@ install -D -m 755 dd_rhelp-%{rhelp_version}/dd_rhelp %{buildroot}%{_bindir}/dd_r
%changelog
+* Mon Sep 28 2020 Jeff Law <law(a)redhat.com> - 1.99.8-12
+- Re-enable LTO as upstream GCC target/96939 has been fixed
+
* Mon Aug 10 2020 Jeff Law <law(a)redhat.com> - 1.99.8-11
- Disable LTO on armv7 for now
2 years, 3 months
- 1
- 0
Architecture specific change in rpms/dd_rescue.git
by githook-noreply＠fedoraproject.org
The package rpms/dd_rescue.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/dd_rescue.git/commit/?id=6151a906...
https://src.fedoraproject.org/cgit/rpms/dd_rescue.git/commit/?id=55d47bbf....
Change:
-%ifarch armv7hl
+%ifarch armv7hl
Thanks.
Full change:
============
commit fccd56407f5271112a97d41dcbb93171075d8799
Author: Hans Ulrich Niedermann <hun(a)n-dimensional.de>
Date: Sat Feb 27 21:57:38 2021 +0100
Update to dd_rescue-1.99.9 and dd_rhelp-0.3.0
diff --git a/.gitignore b/.gitignore
index aef72c6..2bc5374 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@
/dd_rescue-1.99.7.tar.bz2
/dd_rescue-1.99.8.tar.bz2
/dd_rescue-1.99.8.tar.bz2.asc
+/dd_rescue-1.99.9.tar.bz2
+/dd_rescue-1.99.9.tar.bz2.asc
diff --git a/dd_rescue.spec b/dd_rescue.spec
index 66cf02f..7a25946 100644
--- a/dd_rescue.spec
+++ b/dd_rescue.spec
@@ -1,7 +1,7 @@
%define rhelp_version 0.3.0
Name: dd_rescue
-Version: 1.99.8
+Version: 1.99.9
Release: 13%{?dist}
Summary: Fault tolerant "dd" utility for rescuing data from bad media
# No version specified
@@ -66,6 +66,9 @@ install -D -m 755 dd_rhelp-%{rhelp_version}/dd_rhelp %{buildroot}%{_bindir}/dd_r
%changelog
+* Sat Feb 27 2021 Hans Ulrich Niedermann <hun(a)n-dimensional.de> - 1.99.9-13
+- Update to dd_rescue-1.99.9 and dd_rhelp-0.3.0
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.99.8-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 48b7f91..5f9f3f7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (dd_rhelp-0.3.0.tar.gz) = a29aa4b01ae1a1d9652e990cebf0f00ec464a4d4b9109f4c52e066d7406cc82b40113b7d6c4ab0bf2f4547947a89608c8403ff011de1f3ddf47745f88c59bc9e
-SHA512 (dd_rescue-1.99.8.tar.bz2) = a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
-SHA512 (dd_rescue-1.99.8.tar.bz2.asc) = c3ff6bb47c5bb418fb18756ba7cd18de4d0e6863e704913b2eb323927c57df7cb428f614cbeed54cbb3e2944b13787392a63e16f55a442752dec7c33e074e910
+SHA512 (dd_rescue-1.99.9.tar.bz2) = 88d585ae7980d832f85cf936aa41d8c5fdd531192a2e705b0c0b23b20ad40917fc01a5deb03184ba2927ff4615134048a1be897a4fed663b34821763e7122fca
+SHA512 (dd_rescue-1.99.9.tar.bz2.asc) = 8613e3b879217d92b67766b97e77183aec5e7ab91b287f6be02a98fe9ab4bfe556933c3ab6aa0109ac454fb38f89f0793fe8914ed50fd78d5c7ff82fb0b49939
commit 15b560856a0efb008c5b77f56e0861eeb032f8cf
Author: Hans Ulrich Niedermann <hun(a)n-dimensional.de>
Date: Sat Feb 27 21:54:58 2021 +0100
spec file space typo fixes
diff --git a/dd_rescue.spec b/dd_rescue.spec
index 61b64cd..66cf02f 100644
--- a/dd_rescue.spec
+++ b/dd_rescue.spec
@@ -18,7 +18,7 @@ BuildRequires: automake
BuildRequires: gcc
BuildRequires: gnupg2
BuildRequires: lzo-devel
-BuildRequires: make
+BuildRequires: make
%description
@@ -27,7 +27,7 @@ data from a file or block device to another. ddrescue does however
not abort on errors in the input file. This makes it suitable for
rescuing data from media with errors, e.g. a disk with bad sectors.
-This package includes dd_rhelp, a wrapper script facilitating data
+This package includes dd_rhelp, a wrapper script facilitating data
recovery.
%prep
commit 8e73fb2dffadad9309cd7933cfbbf7ef0146a95b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 03:05:31 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/dd_rescue.spec b/dd_rescue.spec
index ba81d82..61b64cd 100644
--- a/dd_rescue.spec
+++ b/dd_rescue.spec
@@ -2,7 +2,7 @@
Name: dd_rescue
Version: 1.99.8
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Fault tolerant "dd" utility for rescuing data from bad media
# No version specified
License: GPL+
@@ -66,6 +66,9 @@ install -D -m 755 dd_rhelp-%{rhelp_version}/dd_rhelp %{buildroot}%{_bindir}/dd_r
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.99.8-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Mon Sep 28 2020 Jeff Law <law(a)redhat.com> - 1.99.8-12
- Re-enable LTO as upstream GCC target/96939 has been fixed
commit 8b87a9fd6d00d606974c6d44b7fa29016b4d6426
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Thu Dec 17 04:19:39 2020 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/dd_rescue.spec b/dd_rescue.spec
index c2f979f..ba81d82 100644
--- a/dd_rescue.spec
+++ b/dd_rescue.spec
@@ -18,6 +18,7 @@ BuildRequires: automake
BuildRequires: gcc
BuildRequires: gnupg2
BuildRequires: lzo-devel
+BuildRequires: make
%description
commit 6151a906f9323110b0f07be5325a6b231812c6de
Author: Jeff Law <law(a)redhat.com>
Date: Mon Sep 28 12:22:41 2020 -0600
- Re-enable LTO as upstream GCC target/96939 has been fixed
diff --git a/dd_rescue.spec b/dd_rescue.spec
index 7e9288f..c2f979f 100644
--- a/dd_rescue.spec
+++ b/dd_rescue.spec
@@ -2,7 +2,7 @@
Name: dd_rescue
Version: 1.99.8
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Fault tolerant "dd" utility for rescuing data from bad media
# No version specified
License: GPL+
@@ -37,13 +37,6 @@ autoreconf -vif
%configure
%build
-# This package fails to build with LTO on armv7 as it complains about using
-# NEON instructions. We've seen this on several packages and it's not yet
-# clear what the root cause is yet. Until that's settled disable LTO on
-# armv7 for now
-%ifarch armv7hl
-%define _lto_cflags %{nil}
-%endif
%ifarch ppc64le
rm -f aesni.c find_nonzero_sse2.c find_nonzero_arm.c find_nonzero_arm64.c
%endif
@@ -72,6 +65,9 @@ install -D -m 755 dd_rhelp-%{rhelp_version}/dd_rhelp %{buildroot}%{_bindir}/dd_r
%changelog
+* Mon Sep 28 2020 Jeff Law <law(a)redhat.com> - 1.99.8-12
+- Re-enable LTO as upstream GCC target/96939 has been fixed
+
* Mon Aug 10 2020 Jeff Law <law(a)redhat.com> - 1.99.8-11
- Disable LTO on armv7 for now
commit 55d47bbf4422ee2b1b6a0320087f30cfa9b9ea98
Author: Jeff Law <law(a)redhat.com>
Date: Mon Aug 10 20:11:11 2020 -0600
Disable LTO on armv7 for now
diff --git a/dd_rescue.spec b/dd_rescue.spec
index 1b27244..7e9288f 100644
--- a/dd_rescue.spec
+++ b/dd_rescue.spec
@@ -2,7 +2,7 @@
Name: dd_rescue
Version: 1.99.8
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Fault tolerant "dd" utility for rescuing data from bad media
# No version specified
License: GPL+
@@ -37,6 +37,13 @@ autoreconf -vif
%configure
%build
+# This package fails to build with LTO on armv7 as it complains about using
+# NEON instructions. We've seen this on several packages and it's not yet
+# clear what the root cause is yet. Until that's settled disable LTO on
+# armv7 for now
+%ifarch armv7hl
+%define _lto_cflags %{nil}
+%endif
%ifarch ppc64le
rm -f aesni.c find_nonzero_sse2.c find_nonzero_arm.c find_nonzero_arm64.c
%endif
@@ -65,6 +72,9 @@ install -D -m 755 dd_rhelp-%{rhelp_version}/dd_rhelp %{buildroot}%{_bindir}/dd_r
%changelog
+* Mon Aug 10 2020 Jeff Law <law(a)redhat.com> - 1.99.8-11
+- Disable LTO on armv7 for now
+
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.99.8-10
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 44e7438a8fbf6be1adfcc685ab04b55a0bc7ed3b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Aug 1 00:34:29 2020 +0000
- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/dd_rescue.spec b/dd_rescue.spec
index b9b1beb..1b27244 100644
--- a/dd_rescue.spec
+++ b/dd_rescue.spec
@@ -2,7 +2,7 @@
Name: dd_rescue
Version: 1.99.8
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Fault tolerant "dd" utility for rescuing data from bad media
# No version specified
License: GPL+
@@ -65,6 +65,10 @@ install -D -m 755 dd_rhelp-%{rhelp_version}/dd_rhelp %{buildroot}%{_bindir}/dd_r
%changelog
+* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.99.8-10
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.99.8-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 8d27b705ce2dc78d3493829ea8bbdbb748340efc
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Mon Jul 27 15:06:26 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/dd_rescue.spec b/dd_rescue.spec
index 0e45d78..b9b1beb 100644
--- a/dd_rescue.spec
+++ b/dd_rescue.spec
@@ -2,7 +2,7 @@
Name: dd_rescue
Version: 1.99.8
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Fault tolerant "dd" utility for rescuing data from bad media
# No version specified
License: GPL+
@@ -65,6 +65,9 @@ install -D -m 755 dd_rhelp-%{rhelp_version}/dd_rhelp %{buildroot}%{_bindir}/dd_r
%changelog
+* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.99.8-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.99.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
2 years, 3 months
- 1
- 0
Architecture specific change in rpms/reg.git
by githook-noreply＠fedoraproject.org
The package rpms/reg.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/reg.git/commit/?id=9eccf94409f9e3....
Change:
-ExclusiveArch: x86_64
Thanks.
Full change:
============
commit 9eccf94409f9e3ab6d9ffa95ff95b7fb26773126
Author: Mattia Verga <mattia.verga(a)protonmail.com>
Date: Sat Feb 27 10:00:07 2021 +0100
Update to 0.16.1 and fix F34 FTB
diff --git a/.gitignore b/.gitignore
index a56c3cf..6c547e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/reg-0.4.1.tar.gz
/v0.15.5.tar.gz
+/reg-0.16.1.tar.gz
diff --git a/reg-server-0.4.1-run-once.patch b/reg-server-0.4.1-run-once.patch
deleted file mode 100644
index 6cf1f20..0000000
--- a/reg-server-0.4.1-run-once.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From bc6ace0a8019132eeac2324fe7f055a64d5c8d9e Mon Sep 17 00:00:00 2001
-From: Patrick Uiterwijk <puiterwijk(a)redhat.com>
-Date: Tue, 27 Jun 2017 21:51:26 +0200
-Subject: [PATCH] Add flag to only generate registry overview once
-
-Signed-off-by: Patrick Uiterwijk <puiterwijk(a)redhat.com>
----
- server/server.go | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/server/server.go b/server/server.go
-index 9d4681f..15e1501 100644
---- a/server/server.go
-+++ b/server/server.go
-@@ -70,6 +70,10 @@ func main() {
- Name: "insecure, k",
- Usage: "do not verify tls certificates of registry",
- },
-+ cli.BoolFlag{
-+ Name: "once, o",
-+ Usage: "generate an output once and then exit",
-+ },
- cli.StringFlag{
- Name: "port",
- Value: "8080",
-@@ -183,6 +187,11 @@ func main() {
- logrus.Fatalf("Error creating index: %v", err)
- }
-
-+ if c.GlobalBool("once") {
-+ logrus.Info("Output generated")
-+ return nil
-+ }
-+
- // parse the duration
- dur, err := time.ParseDuration(c.String("interval"))
- if err != nil {
diff --git a/reg.spec b/reg.spec
index 549882c..794167b 100644
--- a/reg.spec
+++ b/reg.spec
@@ -1,38 +1,25 @@
-#
-# Currently debuginfo breaks the build.
-#
-# I get one of the following two failures following recommended debuginfo
-# methods for golang:
-#
-# *** ERROR: No build ID note found in /builddir/build/BUILDROOT/reg-0.4.1-1.x86_64/usr/bin/reg-server
-#
-# or:
-#
-# /var/tmp/rpm-tmp.U9Lwrk: line 36: syntax error near unexpected token `)'
-#
-%global debug_package %{nil}
+# https://github.com/genuinetools/reg
+# EPEL build is curently broken due to golang macros not working
+%global goipath github.com/genuinetools/reg
+Version: 0.16.1
-# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
-%global _dwz_low_mem_die_limit 0
+%gometa
-# modifying the Go binaries breaks the DWARF debugging
-%global __os_install_post %{_rpmconfigdir}/brp-compress
+%global common_description %{expand:
+Docker registry v2 command line client and repo listing generator with security
+checks.}
-%global provider_prefix github.com/genuinetools/reg
-%global import_path %{provider_prefix}
-#global commit 8d8ca405f7a8c8c4f72686ed239c767aba663f9b
-#global shortcommit %%(c=%%{commit}; echo ${c:0:7})
+%global golicenses LICENSE
+%global godocs VERSION.txt README.md
Name: reg
-Version: 0.15.5
-Release: 8%{?dist}
+Release: 3%{?dist}
Summary: Docker registry v2 command line client
License: MIT
-URL: https://%{import_path}/%{name}
-
-Source0: https://github.com/genuinetools/reg/archive/v%{version}.tar.gz
+URL: %{gourl}
+Source0: %{gosource}
# Upstream advertises this as something that's meant to be run in a container
# and doesn't provide a systemd unit or sysV init script or sysconfig files
@@ -43,122 +30,142 @@ Source2: sysconfig.reg-server
# https://github.com/genuinetools/reg/pull/200
Patch0: fix-row-cell-index-for-server-searching-feature.patch
-BuildRequires: golang
-BuildRequires: systemd
-
-%if 0%{?epel}
-# The version of golang is too old to understand the vendor manifest and can't
-# find the appropriate path for the vendored version of this.
-BuildRequires: golang-github-gorilla-context-devel
-
-# For whatever reason golang-github-gorilla-context-devel isn't available in
-# EPEL for any of the other arches.
-# BZ filed: https://bugzilla.redhat.com/show_bug.cgi?id=1466521
-ExclusiveArch: x86_64
+BuildRequires: golang
+BuildRequires: systemd-rpm-macros
+BuildRequires: golang-ipath(golang.org/x/net)
+BuildRequires: golang-ipath(golang.org/x/sys)
+BuildRequires: golang-ipath(golang.org/x/text)
+
+# These are not packaged in EPEL
+%if 0%{!?epel}
+BuildRequires: golang-ipath(github.com/Azure/go-ansiterm)
+BuildRequires: golang-ipath(github.com/containerd/containerd)
+BuildRequires: golang-ipath(github.com/davecgh/go-spew)
+BuildRequires: golang-ipath(github.com/deckarep/golang-set)
+BuildRequires: golang-ipath(github.com/docker/cli)
+BuildRequires: golang-ipath(github.com/docker/distribution)
+BuildRequires: golang-ipath(github.com/docker/docker)
+BuildRequires: golang-ipath(github.com/docker/docker-credential-helpers)
+BuildRequires: golang-ipath(github.com/docker/go-connections)
+BuildRequires: golang-ipath(github.com/docker/go-units)
+BuildRequires: golang-ipath(github.com/docker/libtrust)
+BuildRequires: golang-ipath(github.com/fernet/fernet-go)
+BuildRequires: golang-ipath(github.com/gogo/protobuf)
+BuildRequires: golang-ipath(github.com/golang/protobuf)
+BuildRequires: golang-ipath(github.com/google/go-cmp)
+BuildRequires: golang-ipath(github.com/gorilla/mux)
+BuildRequires: golang-ipath(github.com/grpc-ecosystem/grpc-gateway)
+BuildRequires: golang-ipath(github.com/mitchellh/go-wordwrap)
+BuildRequires: golang-ipath(github.com/morikuni/aec)
+BuildRequires: golang-ipath(github.com/opencontainers/go-digest)
+BuildRequires: golang-ipath(github.com/opencontainers/image-spec)
+BuildRequires: golang-ipath(github.com/opencontainers/runc)
+BuildRequires: golang-ipath(github.com/pkg/errors)
+BuildRequires: golang-ipath(github.com/pmezard/go-difflib)
+BuildRequires: golang-ipath(github.com/shurcooL/httpfs)
+BuildRequires: golang-ipath(github.com/sirupsen/logrus)
+BuildRequires: golang-ipath(github.com/stretchr/testify)
+BuildRequires: golang-ipath(google.golang.org/genproto)
+BuildRequires: golang-ipath(google.golang.org/grpc)
%endif
-# The following section is populated by parsing the Gopkg.lock file
-# at the base dir of a git checkout of the source code.
-#
-# $ git clone https://github.com/jessfraz/reg.git
-# $ cd reg
+# The following section is populated by parsing the modules.txt file
+# in the vendor dir of the source code.
#
# Bundled Provides are defined as per Fedora Guidelines:
# https://fedoraproject.org/wiki/Packaging:Guidelines#Bundling_and_Duplicat...
#
-Provides: bundled(golang(github.com/Azure/go-ansiterm)) = d6e3b3328b783f23731bc4d058875b0371ff8109
-Provides: bundled(golang(github.com/Microsoft/go-winio)) = 67921128fb397dd80339870d2193d6b1e6856fd4
-Provides: bundled(golang(github.com/Nvveen/Gotty)) = cd527374f1e5bff4938207604a14f2e38a9cf512
-Provides: bundled(golang(github.com/beorn7/perks)) = 3a771d992973f24aa725d07868b467d1ddfceafb
-Provides: bundled(golang(github.com/containerd/continuity)) = 0377f7d767206f3a9e8881d0f02267b0d89c7a62
-Provides: bundled(golang(github.com/coreos/clair)) = 9a9b1f7a13fa1cb796fe6dfb45ed241f39ce9f01
-Provides: bundled(golang(github.com/docker/cli)) = b395d2d6f5eec2c047e6bba4a3fd941d5757d725
-Provides: bundled(golang(github.com/docker/distribution)) = 749f6afb4572201e3c37325d0ffedb6f32be8950
-Provides: bundled(golang(github.com/docker/docker)) = 492545e139e7461aac044149a931bb4b2dd48f75
-Provides: bundled(golang(github.com/docker/docker-ce)) = 2ec1cede27a3dc04c44f8ed2feb1efb00c724d63
-Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = 5241b46610f2491efdf9d1c85f1ddf5b02f6d962
-Provides: bundled(golang(github.com/docker/go-connections)) = 7395e3f8aa162843a74ed6d48e79627d9792ac55
-Provides: bundled(golang(github.com/docker/go-metrics)) = 399ea8c73916000c64c2c76e8da00ca82f8387ab
-Provides: bundled(golang(github.com/docker/go-units)) = 47565b4f722fb6ceae66b95f853feed578a4a51c
-Provides: bundled(golang(github.com/docker/libtrust)) = aabc10ec26b754e797f9028f4589c5b7bd90dc20
-Provides: bundled(golang(github.com/genuinetools/pkg)) = 3654fc151753f8cd41b366e0c15b9fa070890ddf
-Provides: bundled(golang(github.com/gogo/protobuf)) = 7d68e886eac4f7e34d0d82241a6273d6c304c5cf
-Provides: bundled(golang(github.com/golang/protobuf)) = b4deda0973fb4c70b50d226b1af49f3da59f5265
-Provides: bundled(golang(github.com/google/go-cmp)) = 3af367b6b30c263d47e8895973edcca9a49cf029
-Provides: bundled(golang(github.com/gorilla/context)) = 08b5f424b9271eedf6f9f0ce86cb9396ed337a42
-Provides: bundled(golang(github.com/gorilla/mux)) = e3702bed27f0d39777b0b37b664b6280e8ef8fbf
-Provides: bundled(golang(github.com/grpc-ecosystem/grpc-gateway)) = 92583770e3f01b09a0d3e9bdf64321d8bebd48f2
-Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = c12348ce28de40eed0136aa2b644d0ee0650e56c
-Provides: bundled(golang(github.com/mitchellh/go-wordwrap)) = ad45545899c7b13c020ea92b2072220eefad42b8
-Provides: bundled(golang(github.com/opencontainers/go-digest)) = c9281466c8b2f606084ac71339773efd177436e7
-Provides: bundled(golang(github.com/opencontainers/image-spec)) = d60099175f88c47cd379c4738d158884749ed235
-Provides: bundled(golang(github.com/opencontainers/runc)) = baf6536d6259209c3edfa2b22237af82942d3dfa
-Provides: bundled(golang(github.com/peterhellberg/link)) = d1cebc7ea14a5fc0de7cb4a45acae773161642c6
-Provides: bundled(golang(github.com/pkg/errors)) = 645ef00459ed84a119197bfb8d8205042c6df63d
-Provides: bundled(golang(github.com/prometheus/client_golang)) = bcbbc08eb2ddff3af83bbf11e7ec13b4fd730b6e
-Provides: bundled(golang(github.com/prometheus/client_model)) = 5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f
-Provides: bundled(golang(github.com/prometheus/common)) = 7600349dcfe1abd18d72d3a1770870d9800a7801
-Provides: bundled(golang(github.com/prometheus/procfs)) = ae68e2d4c00fed4943b5f6698d504a5fe083da8a
-Provides: bundled(golang(github.com/sirupsen/logrus)) = c155da19408a8799da419ed3eeb0cb5db0ad5dbc
-Provides: bundled(golang(golang.org/x/crypto)) = a49355c7e3f8fe157a85be2f77e6e269a0f89602
-Provides: bundled(golang(golang.org/x/net)) = d0887baf81f4598189d4e12a37c6da86f0bba4d0
-Provides: bundled(golang(golang.org/x/sys)) = ac767d655b305d4e9612f5f6e33120b9176c4ad4
-Provides: bundled(golang(golang.org/x/text)) = f21a4dfb5e38f5895301dc265a8def02365cc3d0
-Provides: bundled(golang(google.golang.org/genproto)) = e92b116572682a5b432ddd840aeaba2a559eeff1
-Provides: bundled(golang(google.golang.org/grpc)) = 168a6198bcb0ef175f7dacec0b8691fc141dc9b8
+Provides: bundled(golang(github.com/coreos/clair)) = 2.0.1-0.20190910143208
+Provides: bundled(golang(github.com/genuinetools/pkg)) = 0.0.0-20181022210355
+Provides: bundled(golang(github.com/konsorten/go-windows-terminal-sequences)) = 1.0.1
+Provides: bundled(golang(github.com/Microsoft/go-winio)) = 0.4.14
+Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 0.8.6
+Provides: bundled(golang(github.com/peterhellberg/link)) = 1.0.0
+
+# These are not packaged in EPEL
+# We will use the bundled modules
+%if 0%{?epel}
+Provides: bundled(golang(github.com/Azure/go-ansiterm)) = 0.0.0-20170929234023
+Provides: bundled(golang(github.com/containerd/containerd)) = 1.2.9
+Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1
+Provides: bundled(golang(github.com/deckarep/golang-set)) = 1.7.1
+Provides: bundled(golang(github.com/docker/cli)) = 0.0.0-20190913211141
+Provides: bundled(golang(github.com/docker/distribution)) = 2.7.1
+Provides: bundled(golang(github.com/docker/docker)) = 1.4.2-0.20190916154449
+Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = 0.6.3
+Provides: bundled(golang(github.com/docker/go-connections)) = 0.4.0
+Provides: bundled(golang(github.com/docker/go-units)) = 0.4.0
+Provides: bundled(golang(github.com/docker/libtrust)) = 0.0.0-20160708172513
+Provides: bundled(golang(github.com/fernet/fernet-go)) = 0.0.0-20180830025343
+Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.0
+Provides: bundled(golang(github.com/golang/protobuf)) = 1.2.0
+Provides: bundled(golang(github.com/google/go-cmp)) = 0.3.1
+Provides: bundled(golang(github.com/gorilla/mux)) = 1.7.3
+Provides: bundled(golang(github.com/grpc-ecosystem/grpc-gateway)) = 1.11.1
+Provides: bundled(golang(github.com/mitchellh/go-wordwrap)) = 1.0.0
+Provides: bundled(golang(github.com/morikuni/aec)) = 0.0.0-20170113033406
+Provides: bundled(golang(github.com/opencontainers/go-digest)) = 1.0.0-rc1
+Provides: bundled(golang(github.com/opencontainers/image-spec)) = 1.0.1
+Provides: bundled(golang(github.com/opencontainers/runc)) = 0.1.1
+Provides: bundled(golang(github.com/pkg/errors)) = 0.8.1
+Provides: bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0
+Provides: bundled(golang(github.com/shurcooL/httpfs)) = 0.0.0-20190707220628
+Provides: bundled(golang(github.com/sirupsen/logrus)) = 1.4.2
+Provides: bundled(golang(github.com/stretchr/testify)) = 1.2.2
+Provides: bundled(golang(google.golang.org/genproto)) = 0.0.0-20180817151627
+Provides: bundled(golang(google.golang.org/grpc)) = 1.23.1
+%endif
+
Obsoletes: reg-server < %{version}
%description
-Docker registry v2 client.
+%{common_description}
+
+%gopkg
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
-# Have to move things around because of how golang likes to search $GOPATH
-cd ../
-mv $OLDPWD hack
-mkdir $OLDPWD
-cd $OLDPWD
-mkdir -p $(pwd)/go/src/%{import_path}
-mv ../hack/* $(pwd)/go/src/%{import_path}/
-
-# Have to mess with the pathing even more to make the older version of golang
-# in el7 happy.
-%if 0%{?epel}
-for d in $(ls $(pwd)/go/src/%{import_path}/vendor/)
-do
- if [[ -d "$(pwd)/go/src/%{import_path}/vendor/${d}" ]]; then
- printf "D VALUE: %s\n" "${d}"
- mkdir -p $(pwd)/go/src/${d}
- cp -r $(pwd)/go/src/%{import_path}/vendor/${d}/* $(pwd)/go/src/${d}/
- fi
-done
+# Do not remove 'vendor' dir entirely
+%goprep -ke
+
+# Remove bundled modules packaged in Fedora
+rm -rf vendor/golang.org
+
+%if 0%{!?epel}
+rm -rf vendor/github.com/Azure
+rm -rf vendor/github.com/containerd
+rm -rf vendor/github.com/davecgh
+rm -rf vendor/github.com/deckarep
+rm -rf vendor/github.com/docker
+rm -rf vendor/github.com/fernet
+rm -rf vendor/github.com/gogo
+rm -rf vendor/github.com/golang
+rm -rf vendor/github.com/google
+rm -rf vendor/github.com/gorilla
+rm -rf vendor/github.com/grpc-ecosystem
+rm -rf vendor/github.com/mitchellh
+rm -rf vendor/github.com/morikuni
+rm -rf vendor/github.com/opencontainers
+rm -rf vendor/github.com/pkg
+rm -rf vendor/github.com/pmezard
+rm -rf vendor/github.com/shurcooL
+rm -rf vendor/github.com/sirupsen
+rm -rf vendor/github.com/stretchr
+rm -rf vendor/google.golang.org
%endif
%build
-export GOPATH="$(pwd)/go:%{buildroot}%{gopath}:%{gopath}"
+%gobuild -o %{gobuilddir}/bin/reg %{goipath}
-cd $(pwd)/go/src/%{import_path}/
-
-# Leave this here for when we can sort out the debuginfo fix
-# https://bugzilla.redhat.com/show_bug.cgi?id=1432214
-#go build \
-# -ldflags '-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d \' \\n\')' \
-# -o reg .
-#
-#go build \
-# -ldflags '-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d \' \\n\')' \
-# -o reg-server ./server
-
-go build -o reg .
%install
# Install the binaries
-cd ./go/src/%{import_path}/
-mkdir -p %{buildroot}%{_bindir}
-install -p -m 0755 %{name} %{buildroot}%{_bindir}/%{name}
+%gopkginstall
+install -m 0755 -vd %{buildroot}%{_bindir}
+install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
# Install templates and static content
mkdir -p %{buildroot}%{_sharedstatedir}/%{name}-server
@@ -176,17 +183,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
install -p -m 0640 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}-server
-mkdir -p %{buildroot}/%{name}-%{version}
-
-# Setup doc files for doc macro
-for i in README.md Dockerfile Makefile
-do
- cp -p ${i} %{_builddir}/%{name}-%{version}/
-done
-
-# Setup license file for license macro
-cp -p LICENSE %{_builddir}/%{name}-%{version}/
-
%post
%systemd_post %{name}-server.service
@@ -196,6 +192,7 @@ cp -p LICENSE %{_builddir}/%{name}-%{version}/
%postun
%systemd_postun %{name}-server.service
+
%files
%doc README.md Dockerfile Makefile
%license LICENSE
@@ -205,7 +202,20 @@ cp -p LICENSE %{_builddir}/%{name}-%{version}/
%config(noreplace) %{_sharedstatedir}/%{name}-server/static/
%config(noreplace) %{_sharedstatedir}/%{name}-server/templates/
+%gopkgfiles
+
%changelog
+* Tue Feb 23 2021 Mattia Verga <mattia.verga(a)protonmail.com> - 0.16.1-3
+- Use bundled modules for EPEL8
+
+* Sun Feb 21 2021 Mattia Verga <mattia.verga(a)protonmail.com> - 0.16.1-2
+- Use modules from Fedora repository where possible
+
+* Sat Feb 20 2021 Mattia Verga <mattia.verga(a)protonmail.com> - 0.16.1-1
+- Update to 0.16.1
+- Fix FTB in F34
+- Make use of some Golang macros
+
* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.15.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 9af03ce..836d209 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v0.15.5.tar.gz) = c1293868ea30dcdfc5251f95a5f287f8043be3a2372fdd08c0836919f6722c5931eb429f9047769b442bf3fdbb50c476e8509c62cb20b4b45d30793571cce44e
+SHA512 (reg-0.16.1.tar.gz) = 2be68b405bb384d8eb3ae17a9b1c802a7f3212865ce61cf72f01794b9456787b1ef0eb62a538735d119153b0f472e741a8bbe99f1ce70d3b16ce1b8ba90eb4b8
2 years, 3 months
- 1
- 0
[Report] Packages Restricting Arches
by root
List of packages currently excluding arches (1889)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- OpenImageIO
ExclusiveArch: x86_64 ppc64le
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-V8
ExclusiveArch: %{nodejs_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aboot
ExclusiveArch: alpha
- accel-config
ExclusiveArch: x86_64
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- alleyoop
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64
- anet
ExclusiveArch: %{GPRbuild_arches}
- anki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- arduino
ExclusiveArch: %{go_arches}
- arduino-builder
ExclusiveArch: %{go_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- aunit
ExclusiveArch: %GPRbuild_arches
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- bareftp
ExclusiveArch: %{mono_arches}
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
- bcm283x-firmware
ExclusiveArch: %{arm} aarch64
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- blender
ExclusiveArch: x86_64 aarch64 ppc64le
- bless
ExclusiveArch: %mono_arches
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- calamares
ExclusiveArch: %{ix86} x86_64
- calibre
ExclusiveArch: %{qt5_qtwebengine_arches}
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- ceph
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- chromium
ExclusiveArch: x86_64 i686
ExclusiveArch: x86_64 i686 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- clevis-pin-tpm2
ExclusiveArch: %{rust_arches}
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- coffee-script
ExclusiveArch: %{nodejs_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- cpu-x
ExclusiveArch: i686 x86_64
- cpuid
ExclusiveArch: %{ix86} x86_64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- cryptlib
ExclusiveArch: x86_64 %{ix86} aarch64 ppc64 ppc64le
- cryptobone
ExclusiveArch: x86_64 %{ix86} ppc64 ppc64le aarch64
- daq
ExclusiveArch: x86_64 aarch64
- darktable
ExclusiveArch: x86_64 aarch64
ExclusiveArch: x86_64 ppc64le
- dbus-parsec
ExclusiveArch: %{rust_arches}
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- dbxtool
ExclusiveArch: i386 x86_64 aarch64
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-desktop-schemas
ExclusiveArch: %{go_arches}
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dolphin-emu
ExclusiveArch: x86_64 aarch64 ppc64le
- dotnet-build-reference-packages
ExclusiveArch: aarch64 x86_64
ExclusiveArch: x86_64
- dotnet3.1
ExclusiveArch: aarch64 x86_64
ExclusiveArch: x86_64
- dotnet5.0
ExclusiveArch: aarch64 x86_64
ExclusiveArch: x86_64
- dotnet5.0-build-reference-packages
ExclusiveArch: aarch64 x86_64
ExclusiveArch: x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dssi-vst
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e3
ExclusiveArch: %{ix86} x86_64
- edk2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExclusiveArch: x86_64 aarch64
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efitools
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- embree
ExclusiveArch: x86_64
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- eric
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- extlinux-bootloader
ExclusiveArch: %{arm} aarch64
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- fes
ExclusiveArch: %{ix86} x86_64
- flannel
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- florist
ExclusiveArch: %{GPRbuild_arches}
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: %{ix86} x86_64 ppc64
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- ga
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- gbrainy
ExclusiveArch: %mono_arches
- gdata-sharp
ExclusiveArch: %mono_arches
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gearhead1
ExclusiveArch: %{fpc_arches}
- gela-asis
ExclusiveArch: %GPRbuild_arches
- ghdl
ExclusiveArch: %{GNAT_arches}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- glibc32
ExclusiveArch: x86_64
- glibd
ExclusiveArch: %{ldc_arches}
- gmqcc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-guitar
ExclusiveArch: %{mono_arches}
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- go-compilers
ExclusiveArch: %{go_arches}
- go-rpm-macros
ExclusiveArch: %{golang_arches} %{gccgo_arches}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang
ExclusiveArch: %{golang_arches}
- gomtree
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- goverlay
ExclusiveArch: %{fpc_arches}
- gprbuild
ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- gudev-sharp
ExclusiveArch: %mono_arches
- hedgewars
ExclusiveArch: %{fpc_arches}
- hsakmt
ExclusiveArch: x86_64 aarch64
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64
- i3status-rs
ExclusiveArch: %{rust_arches}
- icaro
ExclusiveArch: %{ix86} x86_64 noarch
- ignition
ExclusiveArch: %{go_arches}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cmt-cat
ExclusiveArch: x86_64 i686 i586
ExclusiveArch: x86_64 i686 i586
- intel-gmmlib
ExclusiveArch: x86_64 i686
- intel-ipsec-mb
ExclusiveArch: x86_64
ExclusiveArch: x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipmctl
ExclusiveArch: x86_64
- ipw2100-firmware
ExclusiveArch: noarch i386 x86_64
- ipw2200-firmware
ExclusiveArch: noarch i386 x86_64
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- keepass
ExclusiveArch: %{mono_arches}
- kernel
ExclusiveArch: x86_64 s390x %{arm} aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x %{arm} aarch64 ppc64le
- keyring-ima-signer
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kalarmcal
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kmailtransport
ExclusiveArch: x86_64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- kicad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- knotes
ExclusiveArch: x86_64 %{arm}
- kompose
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- ldc
ExclusiveArch: %{ldc_arches}
- libbsr
ExclusiveArch: %{power64}
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdispatch
ExclusiveArch: x86_64 aarch64
- libguestfs
ExclusiveArch: %{kernel_arches}
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libnxz
ExclusiveArch: ppc64le
- libocxl
ExclusiveArch: ppc64le
- libpmemobj-cpp
ExclusiveArch: x86_64
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- librtas
ExclusiveArch: %{power64}
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
- libva-intel-hybrid-driver
ExclusiveArch: %{ix86} x86_64 ia64
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzfcphbaapi
ExclusiveArch: s390 s390x
- lightdm
ExclusiveArch: x86_64 ppc64le
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 s390x ppc64le
- luxcorerender
ExclusiveArch: x86_64
- mactel-boot
ExclusiveArch: x86_64
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- mantle
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matreshka
ExclusiveArch: %GPRbuild_arches
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- megapixels
ExclusiveArch: aarch64 armv7hl
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtest86+
ExclusiveArch: %{ix86} x86_64
- mesos
ExclusiveArch: x86_64
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} %{ix86} x86_64
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mirrorlist-server
ExclusiveArch: %{rust_arches}
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- mod_mono
ExclusiveArch: %mono_arches
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monobristol
ExclusiveArch: %{mono_arches}
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- monosim
ExclusiveArch: %mono_arches
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msr-tools
ExclusiveArch: %{ix86} x86_64
- mustache-d
ExclusiveArch: %{ldc_arches}
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- nant
ExclusiveArch: %mono_arches
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- newsflash
ExclusiveArch: %{rust_arches}
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nispor
ExclusiveArch: %{rust_arches}
- nodejs
ExclusiveArch: %{nodejs_arches}
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-supervisor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-svgo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-typescript
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: x86_64 ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64 ppc64le
- nwchem
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- oci-kvm-hook
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %%{power64} aarch64 s390x armv7hl
- oci-umount
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- oidn
ExclusiveArch: x86_64
- olpc-kbdshim
ExclusiveArch: %{ix86} %{arm}
- olpc-netutils
ExclusiveArch: %{ix86} %{arm}
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le
- onedrive
ExclusiveArch: %{ldc_arches}
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjfx
ExclusiveArch: x86_64
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openni
ExclusiveArch: %{ix86} x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openshadinglanguage
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- openssl-ibmca
ExclusiveArch: s390 s390x
- origin
ExclusiveArch: %{go_arches}
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- orion
ExclusiveArch: %{qt5_qtwebengine_arches}
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- paflib
ExclusiveArch: ppc %{power64}
- parsec
ExclusiveArch: %{rust_arches}
- parsec-tool
ExclusiveArch: %{rust_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdbg
ExclusiveArch: ppc64le
- pdfmod
ExclusiveArch: %mono_arches
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: x86_64
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- pmdk-convert
ExclusiveArch: x86_64
- pmemkv
ExclusiveArch: x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- powerpc-utils
ExclusiveArch: ppc %{power64}
- ppc64-diag
ExclusiveArch: ppc %{power64}
- psi-plus
ExclusiveArch: %{qt5_qtwebengine_arches}
- pveclib
ExclusiveArch: ppc %{power64}
- pvs-sbcl
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-healpy
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-javabridge
ExclusiveArch: i686 x86_64
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-rpi-gpio
ExclusiveArch: %{arm} aarch64
- python-setuptools-rust
ExclusiveArch: %{rust_arches}
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- quantum-espresso
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- redhat-lsb
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- reg
ExclusiveArch: x86_64
- renderdoc
ExclusiveArch: x86_64
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm}
- rescene
ExclusiveArch: %{mono_arches}
- restsharp
ExclusiveArch: %{mono_arches}
- rhythmbox-alternative-toolbar
ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le
- rmd
ExclusiveArch: %{ix86} x86_64
- rocm-runtime
ExclusiveArch: x86_64 aarch64
- rocminfo
ExclusiveArch: x86_64 aarch64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rr
ExclusiveArch: %{ix86} x86_64
- rssguard
ExclusiveArch: %{qt5_qtwebengine_arches}
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- runc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x
- rust
ExclusiveArch: %{rust_arches}
- rust-ab_glyph_rasterizer
ExclusiveArch: %{rust_arches}
- rust-abomonation
ExclusiveArch: %{rust_arches}
- rust-actix
ExclusiveArch: %{rust_arches}
- rust-actix-codec
ExclusiveArch: %{rust_arches}
- rust-actix-connect
ExclusiveArch: %{rust_arches}
- rust-actix-files
ExclusiveArch: %{rust_arches}
- rust-actix-http
ExclusiveArch: %{rust_arches}
- rust-actix-macros
ExclusiveArch: %{rust_arches}
- rust-actix-router
ExclusiveArch: %{rust_arches}
- rust-actix-rt
ExclusiveArch: %{rust_arches}
- rust-actix-server
ExclusiveArch: %{rust_arches}
- rust-actix-server-config
ExclusiveArch: %{rust_arches}
- rust-actix-service
ExclusiveArch: %{rust_arches}
- rust-actix-testing
ExclusiveArch: %{rust_arches}
- rust-actix-threadpool
ExclusiveArch: %{rust_arches}
- rust-actix-tls
ExclusiveArch: %{rust_arches}
- rust-actix-utils
ExclusiveArch: %{rust_arches}
- rust-actix-web
ExclusiveArch: %{rust_arches}
- rust-actix-web-codegen
ExclusiveArch: %{rust_arches}
- rust-actix_derive
ExclusiveArch: %{rust_arches}
- rust-addr2line
ExclusiveArch: %{rust_arches}
- rust-adler
ExclusiveArch: %{rust_arches}
- rust-adler32
ExclusiveArch: %{rust_arches}
- rust-aead
ExclusiveArch: %{rust_arches}
- rust-aes
ExclusiveArch: %{rust_arches}
- rust-aes-gcm
ExclusiveArch: %{rust_arches}
- rust-aes-soft
ExclusiveArch: %{rust_arches}
- rust-afterburn
ExclusiveArch: %{rust_arches}
- rust-ahash
ExclusiveArch: %{rust_arches}
- rust-aho-corasick
ExclusiveArch: %{rust_arches}
- rust-alacritty
ExclusiveArch: %{rust_arches}
- rust-alacritty_config_derive
ExclusiveArch: %{rust_arches}
- rust-alacritty_terminal
ExclusiveArch: %{rust_arches}
- rust-alga
ExclusiveArch: %{rust_arches}
- rust-alga_derive
ExclusiveArch: %{rust_arches}
- rust-alloc-no-stdlib
ExclusiveArch: %{rust_arches}
- rust-alloc-stdlib
ExclusiveArch: %{rust_arches}
- rust-alphanumeric-sort
ExclusiveArch: %{rust_arches}
- rust-ammonia
ExclusiveArch: %{rust_arches}
- rust-andrew
ExclusiveArch: %{rust_arches}
- rust-ansi_colours
ExclusiveArch: %{rust_arches}
- rust-ansi_term
ExclusiveArch: %{rust_arches}
- rust-ansi_term0.11
ExclusiveArch: %{rust_arches}
- rust-antidote
ExclusiveArch: %{rust_arches}
- rust-anyhow
ExclusiveArch: %{rust_arches}
- rust-anymap
ExclusiveArch: %{rust_arches}
- rust-aom-sys
ExclusiveArch: %{rust_arches}
- rust-app_dirs
ExclusiveArch: %{rust_arches}
- rust-approx
ExclusiveArch: %{rust_arches}
- rust-arbitrary
ExclusiveArch: %{rust_arches}
- rust-arc-swap
ExclusiveArch: %{rust_arches}
- rust-arg_enum_proc_macro
ExclusiveArch: %{rust_arches}
- rust-argparse
ExclusiveArch: %{rust_arches}
- rust-array-init
ExclusiveArch: %{rust_arches}
- rust-arraydeque
ExclusiveArch: %{rust_arches}
- rust-arrayref
ExclusiveArch: %{rust_arches}
- rust-arrayvec
ExclusiveArch: %{rust_arches}
- rust-article_scraper
ExclusiveArch: %{rust_arches}
- rust-ascii
ExclusiveArch: %{rust_arches}
- rust-askalono
ExclusiveArch: %{rust_arches}
- rust-askalono-cli
ExclusiveArch: %{rust_arches}
- rust-askama
ExclusiveArch: %{rust_arches}
- rust-askama_derive
ExclusiveArch: %{rust_arches}
- rust-askama_escape
ExclusiveArch: %{rust_arches}
- rust-askama_shared
ExclusiveArch: %{rust_arches}
- rust-assert-json-diff
ExclusiveArch: %{rust_arches}
- rust-assert_approx_eq
ExclusiveArch: %{rust_arches}
- rust-assert_cli
ExclusiveArch: %{rust_arches}
- rust-assert_cmd
ExclusiveArch: %{rust_arches}
- rust-assert_fs
ExclusiveArch: %{rust_arches}
- rust-assert_matches
ExclusiveArch: %{rust_arches}
- rust-assign
ExclusiveArch: %{rust_arches}
- rust-async-attributes
ExclusiveArch: %{rust_arches}
- rust-async-compression
ExclusiveArch: %{rust_arches}
- rust-async-io
ExclusiveArch: %{rust_arches}
- rust-async-task
ExclusiveArch: %{rust_arches}
- rust-async-trait
ExclusiveArch: %{rust_arches}
- rust-asyncgit
ExclusiveArch: %{rust_arches}
- rust-atk
ExclusiveArch: %{rust_arches}
- rust-atk-sys
ExclusiveArch: %{rust_arches}
- rust-atom
ExclusiveArch: %{rust_arches}
- rust-atomicwrites
ExclusiveArch: %{rust_arches}
- rust-attohttpc
ExclusiveArch: %{rust_arches}
- rust-atty
ExclusiveArch: %{rust_arches}
- rust-autocfg
ExclusiveArch: %{rust_arches}
- rust-av-metrics
ExclusiveArch: %{rust_arches}
- rust-average
ExclusiveArch: %{rust_arches}
- rust-awc
ExclusiveArch: %{rust_arches}
- rust-backtrace
ExclusiveArch: %{rust_arches}
- rust-backtrace-sys
ExclusiveArch: %{rust_arches}
- rust-base100
ExclusiveArch: %{rust_arches}
- rust-base64
ExclusiveArch: %{rust_arches}
- rust-base64-0.10
ExclusiveArch: %{rust_arches}
- rust-base64-0.11
ExclusiveArch: %{rust_arches}
- rust-base64_0.12
ExclusiveArch: %{rust_arches}
- rust-bat
ExclusiveArch: %{rust_arches}
- rust-battery
ExclusiveArch: %{rust_arches}
- rust-bencher
ExclusiveArch: %{rust_arches}
- rust-better-panic
ExclusiveArch: %{rust_arches}
- rust-bincode
ExclusiveArch: %{rust_arches}
- rust-bincode0.8
ExclusiveArch: %{rust_arches}
- rust-bindgen
ExclusiveArch: %{rust_arches}
- rust-binfarce
ExclusiveArch: %{rust_arches}
- rust-biscuit
ExclusiveArch: %{rust_arches}
- rust-bit-set
ExclusiveArch: %{rust_arches}
- rust-bit-vec
ExclusiveArch: %{rust_arches}
- rust-bitfield
ExclusiveArch: %{rust_arches}
- rust-bitflags
ExclusiveArch: %{rust_arches}
- rust-bitmaps
ExclusiveArch: %{rust_arches}
- rust-bitstream-io
ExclusiveArch: %{rust_arches}
- rust-bitvec
ExclusiveArch: %{rust_arches}
- rust-blake2
ExclusiveArch: %{rust_arches}
- rust-blobby
ExclusiveArch: %{rust_arches}
- rust-blobby0.1
ExclusiveArch: %{rust_arches}
- rust-block-buffer
ExclusiveArch: %{rust_arches}
- rust-block-buffer0.7
ExclusiveArch: %{rust_arches}
- rust-block-cipher
ExclusiveArch: %{rust_arches}
- rust-block-modes
ExclusiveArch: %{rust_arches}
- rust-block-padding
ExclusiveArch: %{rust_arches}
- rust-blsctl
ExclusiveArch: %{rust_arches}
- rust-bodhi
ExclusiveArch: %{rust_arches}
- rust-bodhi-cli
ExclusiveArch: %{rust_arches}
- rust-bootupd
ExclusiveArch: x86_64 aarch64
- rust-box_drawing
ExclusiveArch: %{rust_arches}
- rust-brev
ExclusiveArch: %{rust_arches}
- rust-brotli
ExclusiveArch: %{rust_arches}
- rust-brotli-decompressor
ExclusiveArch: %{rust_arches}
- rust-brotli-sys
ExclusiveArch: %{rust_arches}
- rust-brotli2
ExclusiveArch: %{rust_arches}
- rust-bstr
ExclusiveArch: %{rust_arches}
- rust-buf-min
ExclusiveArch: %{rust_arches}
- rust-buf_redux
ExclusiveArch: %{rust_arches}
- rust-bufsize
ExclusiveArch: %{rust_arches}
- rust-bufstream
ExclusiveArch: %{rust_arches}
- rust-build_const
ExclusiveArch: %{rust_arches}
- rust-bumpalo
ExclusiveArch: %{rust_arches}
- rust-byte-tools
ExclusiveArch: %{rust_arches}
- rust-byte-unit
ExclusiveArch: %{rust_arches}
- rust-byte-unit3
ExclusiveArch: %{rust_arches}
- rust-bytecount
ExclusiveArch: %{rust_arches}
- rust-bytelines
ExclusiveArch: %{rust_arches}
- rust-bytemuck
ExclusiveArch: %{rust_arches}
- rust-bytemuck_derive
ExclusiveArch: %{rust_arches}
- rust-byteorder
ExclusiveArch: %{rust_arches}
- rust-bytes
ExclusiveArch: %{rust_arches}
- rust-bytes0.3
ExclusiveArch: %{rust_arches}
- rust-bytes0.4
ExclusiveArch: %{rust_arches}
- rust-bytes0.5
ExclusiveArch: %{rust_arches}
- rust-bytes0.6
ExclusiveArch: %{rust_arches}
- rust-bytesize
ExclusiveArch: %{rust_arches}
- rust-bytestring
ExclusiveArch: %{rust_arches}
- rust-bzip2
ExclusiveArch: %{rust_arches}
- rust-bzip2-sys
ExclusiveArch: %{rust_arches}
- rust-c_vec
ExclusiveArch: %{rust_arches}
- rust-cache-padded
ExclusiveArch: %{rust_arches}
- rust-cairo-rs
ExclusiveArch: %{rust_arches}
- rust-cairo-sys-rs
ExclusiveArch: %{rust_arches}
- rust-calloop
ExclusiveArch: %{rust_arches}
- rust-caps
ExclusiveArch: %{rust_arches}
- rust-cargo
ExclusiveArch: %{rust_arches}
- rust-cargo-bloat
ExclusiveArch: %{rust_arches}
- rust-cargo-c
ExclusiveArch: %{rust_arches}
- rust-cargo-husky
ExclusiveArch: %{rust_arches}
- rust-cargo-insta
ExclusiveArch: %{rust_arches}
- rust-cargo-platform
ExclusiveArch: %{rust_arches}
- rust-cargo-readme
ExclusiveArch: %{rust_arches}
- rust-cargo_metadata
ExclusiveArch: %{rust_arches}
- rust-cassowary
ExclusiveArch: %{rust_arches}
- rust-cast
ExclusiveArch: %{rust_arches}
- rust-cbindgen
ExclusiveArch: %{rust_arches}
- rust-cc
ExclusiveArch: %{rust_arches}
- rust-cedarwood
ExclusiveArch: %{rust_arches}
- rust-cexpr
ExclusiveArch: %{rust_arches}
- rust-cfg-if
ExclusiveArch: %{rust_arches}
- rust-cfg-if0.1
ExclusiveArch: %{rust_arches}
- rust-chainerror
ExclusiveArch: %{rust_arches}
- rust-charset
ExclusiveArch: %{rust_arches}
- rust-chbs
ExclusiveArch: %{rust_arches}
- rust-checked_int_cast
ExclusiveArch: %{rust_arches}
- rust-choosier
ExclusiveArch: %{rust_arches}
- rust-chrono
ExclusiveArch: %{rust_arches}
- rust-chrono-humanize
ExclusiveArch: %{rust_arches}
- rust-chrono-tz
ExclusiveArch: %{rust_arches}
- rust-chunked_transfer
ExclusiveArch: %{rust_arches}
- rust-cipher
ExclusiveArch: %{rust_arches}
- rust-clang-sys
ExclusiveArch: %{rust_arches}
- rust-clap
ExclusiveArch: %{rust_arches}
- rust-clap2
ExclusiveArch: %{rust_arches}
- rust-clap_derive
ExclusiveArch: %{rust_arches}
- rust-clicolors-control
ExclusiveArch: %{rust_arches}
- rust-cmake
ExclusiveArch: %{rust_arches}
- rust-codespan-reporting
ExclusiveArch: %{rust_arches}
- rust-codicon
ExclusiveArch: %{rust_arches}
- rust-color-backtrace
ExclusiveArch: %{rust_arches}
- rust-color_quant
ExclusiveArch: %{rust_arches}
- rust-colored
ExclusiveArch: %{rust_arches}
- rust-colored1
ExclusiveArch: %{rust_arches}
- rust-colored_json
ExclusiveArch: %{rust_arches}
- rust-colorful
ExclusiveArch: %{rust_arches}
- rust-compiletest_rs
ExclusiveArch: %{rust_arches}
- rust-comrak
ExclusiveArch: %{rust_arches}
- rust-concurrent-queue
ExclusiveArch: %{rust_arches}
- rust-config
ExclusiveArch: %{rust_arches}
- rust-console
ExclusiveArch: %{rust_arches}
- rust-console0.11
ExclusiveArch: %{rust_arches}
- rust-console0.12
ExclusiveArch: %{rust_arches}
- rust-console0.13
ExclusiveArch: %{rust_arches}
- rust-console0.9
ExclusiveArch: %{rust_arches}
- rust-const-cstr
ExclusiveArch: %{rust_arches}
- rust-const-random
ExclusiveArch: %{rust_arches}
- rust-const-random-macro
ExclusiveArch: %{rust_arches}
- rust-const_fn
ExclusiveArch: %{rust_arches}
- rust-content_inspector
ExclusiveArch: %{rust_arches}
- rust-conv
ExclusiveArch: %{rust_arches}
- rust-cookie
ExclusiveArch: %{rust_arches}
- rust-cookie_store
ExclusiveArch: %{rust_arches}
- rust-copydeps
ExclusiveArch: %{rust_arches}
- rust-copyless
ExclusiveArch: %{rust_arches}
- rust-copypasta
ExclusiveArch: %{rust_arches}
- rust-coreos-installer
ExclusiveArch: %{rust_arches}
- rust-cpio
ExclusiveArch: %{rust_arches}
- rust-cpp_demangle
ExclusiveArch: %{rust_arches}
- rust-cpuid-bool
ExclusiveArch: %{rust_arches}
- rust-cpython
ExclusiveArch: %{rust_arches}
- rust-crates-io
ExclusiveArch: %{rust_arches}
- rust-crc
ExclusiveArch: %{rust_arches}
- rust-crc-any
ExclusiveArch: %{rust_arches}
- rust-crc-core
ExclusiveArch: %{rust_arches}
- rust-crc32fast
ExclusiveArch: %{rust_arches}
- rust-criterion
ExclusiveArch: %{rust_arches}
- rust-criterion-plot
ExclusiveArch: %{rust_arches}
- rust-crossbeam
ExclusiveArch: %{rust_arches}
- rust-crossbeam-channel
ExclusiveArch: %{rust_arches}
- rust-crossbeam-channel0.4
ExclusiveArch: %{rust_arches}
- rust-crossbeam-deque
ExclusiveArch: %{rust_arches}
- rust-crossbeam-deque0.7
ExclusiveArch: %{rust_arches}
- rust-crossbeam-epoch
ExclusiveArch: %{rust_arches}
- rust-crossbeam-epoch0.8
ExclusiveArch: %{rust_arches}
- rust-crossbeam-queue
ExclusiveArch: %{rust_arches}
- rust-crossbeam-queue0.2
ExclusiveArch: %{rust_arches}
- rust-crossbeam-utils
ExclusiveArch: %{rust_arches}
- rust-crossbeam-utils0.7
ExclusiveArch: %{rust_arches}
- rust-crossbeam0.7
ExclusiveArch: %{rust_arches}
- rust-crossfont
ExclusiveArch: %{rust_arches}
- rust-crossterm
ExclusiveArch: %{rust_arches}
- rust-crossterm0.17
ExclusiveArch: %{rust_arches}
- rust-crosstermion
ExclusiveArch: %{rust_arches}
- rust-crypto-hash
ExclusiveArch: %{rust_arches}
- rust-crypto-mac
ExclusiveArch: %{rust_arches}
- rust-crypto-mac0.8
ExclusiveArch: %{rust_arches}
- rust-cryptovec
ExclusiveArch: %{rust_arches}
- rust-cssparser
ExclusiveArch: %{rust_arches}
- rust-cssparser-macros
ExclusiveArch: %{rust_arches}
- rust-csv
ExclusiveArch: %{rust_arches}
- rust-csv-core
ExclusiveArch: %{rust_arches}
- rust-ctor
ExclusiveArch: %{rust_arches}
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-ctrlc
ExclusiveArch: %{rust_arches}
- rust-cty
ExclusiveArch: %{rust_arches}
- rust-curl
ExclusiveArch: %{rust_arches}
- rust-curl-sys
ExclusiveArch: %{rust_arches}
- rust-custom_derive
ExclusiveArch: %{rust_arches}
- rust-cxx
ExclusiveArch: %{rust_arches}
- rust-cxx-build
ExclusiveArch: %{rust_arches}
- rust-cxx-gen
ExclusiveArch: %{rust_arches}
- rust-cxxbridge-flags
ExclusiveArch: %{rust_arches}
- rust-cxxbridge-macro
ExclusiveArch: %{rust_arches}
- rust-darling
ExclusiveArch: %{rust_arches}
- rust-darling_core
ExclusiveArch: %{rust_arches}
- rust-darling_macro
ExclusiveArch: %{rust_arches}
- rust-dashmap
ExclusiveArch: %{rust_arches}
- rust-data-encoding
ExclusiveArch: %{rust_arches}
- rust-data-url
ExclusiveArch: %{rust_arches}
- rust-datetime
ExclusiveArch: %{rust_arches}
- rust-dav1d-sys
ExclusiveArch: %{rust_arches}
- rust-dbus
ExclusiveArch: %{rust_arches}
- rust-dbus-codegen
ExclusiveArch: %{rust_arches}
- rust-dbus-crossroads
ExclusiveArch: %{rust_arches}
- rust-dbus0.2
ExclusiveArch: %{rust_arches}
- rust-dbus0.6
ExclusiveArch: %{rust_arches}
- rust-dbus0.8
ExclusiveArch: %{rust_arches}
- rust-debug-helper
ExclusiveArch: %{rust_arches}
- rust-decimal
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-defmac
ExclusiveArch: %{rust_arches}
- rust-delta_e
ExclusiveArch: %{rust_arches}
- rust-derivative
ExclusiveArch: %{rust_arches}
- rust-derive-new
ExclusiveArch: %{rust_arches}
- rust-derive_arbitrary
ExclusiveArch: %{rust_arches}
- rust-derive_builder
ExclusiveArch: %{rust_arches}
- rust-derive_builder_core
ExclusiveArch: %{rust_arches}
- rust-derive_more
ExclusiveArch: %{rust_arches}
- rust-des
ExclusiveArch: %{rust_arches}
- rust-desed
ExclusiveArch: %{rust_arches}
- rust-deunicode
ExclusiveArch: %{rust_arches}
- rust-devicemapper
ExclusiveArch: %{rust_arches}
- rust-dialoguer
ExclusiveArch: %{rust_arches}
- rust-diesel
ExclusiveArch: %{rust_arches}
- rust-diesel_derives
ExclusiveArch: %{rust_arches}
- rust-diesel_migrations
ExclusiveArch: %{rust_arches}
- rust-diff
ExclusiveArch: %{rust_arches}
- rust-difference
ExclusiveArch: %{rust_arches}
- rust-digest
ExclusiveArch: %{rust_arches}
- rust-digest0.8
ExclusiveArch: %{rust_arches}
- rust-directories
ExclusiveArch: %{rust_arches}
- rust-dirs
ExclusiveArch: %{rust_arches}
- rust-dirs-next
ExclusiveArch: %{rust_arches}
- rust-dirs-sys
ExclusiveArch: %{rust_arches}
- rust-dirs-sys-next
ExclusiveArch: %{rust_arches}
- rust-dirs2
ExclusiveArch: %{rust_arches}
- rust-diskonaut
ExclusiveArch: %{rust_arches}
- rust-dissimilar
ExclusiveArch: %{rust_arches}
- rust-dlib
ExclusiveArch: %{rust_arches}
- rust-dlv-list
ExclusiveArch: %{rust_arches}
- rust-dns-lookup
ExclusiveArch: %{rust_arches}
- rust-dns-parser
ExclusiveArch: %{rust_arches}
- rust-doc-comment
ExclusiveArch: %{rust_arches}
- rust-docmatic
ExclusiveArch: %{rust_arches}
- rust-docopt
ExclusiveArch: %{rust_arches}
- rust-dotenv
ExclusiveArch: %{rust_arches}
- rust-downcast-rs
ExclusiveArch: %{rust_arches}
- rust-dtoa
ExclusiveArch: %{rust_arches}
- rust-dtoa-short
ExclusiveArch: %{rust_arches}
- rust-dua-cli
ExclusiveArch: %{rust_arches}
- rust-duct
ExclusiveArch: %{rust_arches}
- rust-dummy
ExclusiveArch: %{rust_arches}
- rust-dunce
ExclusiveArch: %{rust_arches}
- rust-dutree
ExclusiveArch: %{rust_arches}
- rust-easy-parallel
ExclusiveArch: %{rust_arches}
- rust-edit-distance
ExclusiveArch: %{rust_arches}
- rust-either
ExclusiveArch: %{rust_arches}
- rust-elasticlunr-rs
ExclusiveArch: %{rust_arches}
- rust-encode_unicode
ExclusiveArch: %{rust_arches}
- rust-encoding
ExclusiveArch: %{rust_arches}
- rust-encoding-index-japanese
ExclusiveArch: %{rust_arches}
- rust-encoding-index-korean
ExclusiveArch: %{rust_arches}
- rust-encoding-index-simpchinese
ExclusiveArch: %{rust_arches}
- rust-encoding-index-singlebyte
ExclusiveArch: %{rust_arches}
- rust-encoding-index-tradchinese
ExclusiveArch: %{rust_arches}
- rust-encoding_index_tests
ExclusiveArch: %{rust_arches}
- rust-encoding_rs
ExclusiveArch: %{rust_arches}
- rust-encoding_rs_io
ExclusiveArch: %{rust_arches}
- rust-entities
ExclusiveArch: %{rust_arches}
- rust-enum-as-inner
ExclusiveArch: %{rust_arches}
- rust-enum_primitive
ExclusiveArch: %{rust_arches}
- rust-enumflags2
ExclusiveArch: %{rust_arches}
- rust-enumflags2_derive
ExclusiveArch: %{rust_arches}
- rust-env_logger
ExclusiveArch: %{rust_arches}
- rust-env_logger0.4
ExclusiveArch: %{rust_arches}
- rust-env_logger0.5
ExclusiveArch: %{rust_arches}
- rust-env_logger0.6
ExclusiveArch: %{rust_arches}
- rust-env_logger0.7
ExclusiveArch: %{rust_arches}
- rust-environment
ExclusiveArch: %{rust_arches}
- rust-envsubst
ExclusiveArch: %{rust_arches}
- rust-erased-serde
ExclusiveArch: %{rust_arches}
- rust-err-derive
ExclusiveArch: %{rust_arches}
- rust-errln
ExclusiveArch: %{rust_arches}
- rust-errno
ExclusiveArch: %{rust_arches}
- rust-error-chain
ExclusiveArch: %{rust_arches}
- rust-escaper
ExclusiveArch: %{rust_arches}
- rust-escargot
ExclusiveArch: %{rust_arches}
- rust-euclid
ExclusiveArch: %{rust_arches}
- rust-exa
ExclusiveArch: %{rust_arches}
- rust-expat-sys
ExclusiveArch: %{rust_arches}
- rust-extend
ExclusiveArch: %{rust_arches}
- rust-extprim
ExclusiveArch: %{rust_arches}
- rust-extprim_literals_macros
ExclusiveArch: %{rust_arches}
- rust-fail
ExclusiveArch: %{rust_arches}
- rust-failure
ExclusiveArch: %{rust_arches}
- rust-failure-tools
ExclusiveArch: %{rust_arches}
- rust-failure_derive
ExclusiveArch: %{rust_arches}
- rust-fake
ExclusiveArch: %{rust_arches}
- rust-fake-simd
ExclusiveArch: %{rust_arches}
- rust-fake_clock
ExclusiveArch: %{rust_arches}
- rust-fallible-iterator
ExclusiveArch: %{rust_arches}
- rust-fastrand
ExclusiveArch: %{rust_arches}
- rust-fbthrift_codegen_includer_proc_macro
ExclusiveArch: %{rust_arches}
- rust-fd-find
ExclusiveArch: %{rust_arches}
- rust-fdlimit
ExclusiveArch: %{rust_arches}
- rust-fedora
ExclusiveArch: %{rust_arches}
- rust-fedora-coreos-pinger
ExclusiveArch: %{rust_arches}
- rust-fedora-update-feedback
ExclusiveArch: %{rust_arches}
- rust-feed-rs
ExclusiveArch: %{rust_arches}
- rust-feedbin_api
ExclusiveArch: %{rust_arches}
- rust-feedly_api
ExclusiveArch: %{rust_arches}
- rust-fern
ExclusiveArch: %{rust_arches}
- rust-fever_api
ExclusiveArch: %{rust_arches}
- rust-ffsend
ExclusiveArch: %{rust_arches}
- rust-ffsend-api
ExclusiveArch: %{rust_arches}
- rust-filesize
ExclusiveArch: %{rust_arches}
- rust-filetime
ExclusiveArch: %{rust_arches}
- rust-findshlibs
ExclusiveArch: %{rust_arches}
- rust-fixedbitset
ExclusiveArch: %{rust_arches}
- rust-flame
ExclusiveArch: %{rust_arches}
- rust-flate2
ExclusiveArch: %{rust_arches}
- rust-float-cmp
ExclusiveArch: %{rust_arches}
- rust-float-cmp0.6
ExclusiveArch: %{rust_arches}
- rust-float-ord
ExclusiveArch: %{rust_arches}
- rust-flume
ExclusiveArch: %{rust_arches}
- rust-fnv
ExclusiveArch: %{rust_arches}
- rust-font-kit
ExclusiveArch: %{rust_arches}
- rust-foreign-types
ExclusiveArch: %{rust_arches}
- rust-foreign-types-macros
ExclusiveArch: %{rust_arches}
- rust-foreign-types-shared
ExclusiveArch: %{rust_arches}
- rust-foreign-types-shared0.1
ExclusiveArch: %{rust_arches}
- rust-foreign-types0.3
ExclusiveArch: %{rust_arches}
- rust-form_urlencoded
ExclusiveArch: %{rust_arches}
- rust-fragile
ExclusiveArch: %{rust_arches}
- rust-freetype
ExclusiveArch: %{rust_arches}
- rust-freetype-rs
ExclusiveArch: %{rust_arches}
- rust-freetype-sys
ExclusiveArch: %{rust_arches}
- rust-fs2
ExclusiveArch: %{rust_arches}
- rust-fs_extra
ExclusiveArch: %{rust_arches}
- rust-funty
ExclusiveArch: %{rust_arches}
- rust-fuse
ExclusiveArch: %{rust_arches}
- rust-futf
ExclusiveArch: %{rust_arches}
- rust-futures
ExclusiveArch: %{rust_arches}
- rust-futures-channel
ExclusiveArch: %{rust_arches}
- rust-futures-core
ExclusiveArch: %{rust_arches}
- rust-futures-cpupool
ExclusiveArch: %{rust_arches}
- rust-futures-executor
ExclusiveArch: %{rust_arches}
- rust-futures-io
ExclusiveArch: %{rust_arches}
- rust-futures-lite
ExclusiveArch: %{rust_arches}
- rust-futures-macro
ExclusiveArch: %{rust_arches}
- rust-futures-sink
ExclusiveArch: %{rust_arches}
- rust-futures-task
ExclusiveArch: %{rust_arches}
- rust-futures-timer
ExclusiveArch: %{rust_arches}
- rust-futures-util
ExclusiveArch: %{rust_arches}
- rust-futures0.1
ExclusiveArch: %{rust_arches}
- rust-fuzzy-matcher
ExclusiveArch: %{rust_arches}
- rust-fxhash
ExclusiveArch: %{rust_arches}
- rust-gcsf
ExclusiveArch: %{rust_arches}
- rust-gdk
ExclusiveArch: %{rust_arches}
- rust-gdk-pixbuf
ExclusiveArch: %{rust_arches}
- rust-gdk-pixbuf-sys
ExclusiveArch: %{rust_arches}
- rust-gdk-sys
ExclusiveArch: %{rust_arches}
- rust-generic-array
ExclusiveArch: %{rust_arches}
- rust-generic-array0.12
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gethostname
ExclusiveArch: %{rust_arches}
- rust-getopts
ExclusiveArch: %{rust_arches}
- rust-getrandom
ExclusiveArch: %{rust_arches}
- rust-getrandom0.1
ExclusiveArch: %{rust_arches}
- rust-gettext-rs
ExclusiveArch: %{rust_arches}
- rust-gettext-sys
ExclusiveArch: %{rust_arches}
- rust-ghash
ExclusiveArch: %{rust_arches}
- rust-ghost
ExclusiveArch: %{rust_arches}
- rust-gif
ExclusiveArch: %{rust_arches}
- rust-gif0.10
ExclusiveArch: %{rust_arches}
- rust-gimli
ExclusiveArch: %{rust_arches}
- rust-gio
ExclusiveArch: %{rust_arches}
- rust-gio-sys
ExclusiveArch: %{rust_arches}
- rust-gir-format-check
ExclusiveArch: %{rust_arches}
- rust-git-delta
ExclusiveArch: %{rust_arches}
- rust-git2
ExclusiveArch: %{rust_arches}
- rust-git2-curl
ExclusiveArch: %{rust_arches}
- rust-gitui
ExclusiveArch: %{rust_arches}
- rust-gl_generator
ExclusiveArch: %{rust_arches}
- rust-glib
ExclusiveArch: %{rust_arches}
- rust-glib-macros
ExclusiveArch: %{rust_arches}
- rust-glib-sys
ExclusiveArch: %{rust_arches}
- rust-glob
ExclusiveArch: %{rust_arches}
- rust-globset
ExclusiveArch: %{rust_arches}
- rust-globwalk
ExclusiveArch: %{rust_arches}
- rust-glutin
ExclusiveArch: %{rust_arches}
- rust-glutin_egl_sys
ExclusiveArch: %{rust_arches}
- rust-glutin_glx_sys
ExclusiveArch: %{rust_arches}
- rust-gobject-sys
ExclusiveArch: %{rust_arches}
- rust-goblin
ExclusiveArch: %{rust_arches}
- rust-google-drive3-fork
ExclusiveArch: %{rust_arches}
- rust-gptman
ExclusiveArch: %{rust_arches}
- rust-grep
ExclusiveArch: %{rust_arches}
- rust-grep-cli
ExclusiveArch: %{rust_arches}
- rust-grep-matcher
ExclusiveArch: %{rust_arches}
- rust-grep-pcre2
ExclusiveArch: %{rust_arches}
- rust-grep-printer
ExclusiveArch: %{rust_arches}
- rust-grep-regex
ExclusiveArch: %{rust_arches}
- rust-grep-searcher
ExclusiveArch: %{rust_arches}
- rust-groupable
ExclusiveArch: %{rust_arches}
- rust-gspell
ExclusiveArch: %{rust_arches}
- rust-gspell-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer
ExclusiveArch: %{rust_arches}
- rust-gstreamer-audio
ExclusiveArch: %{rust_arches}
- rust-gstreamer-audio-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-base
ExclusiveArch: %{rust_arches}
- rust-gstreamer-base-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-editing-services
ExclusiveArch: %{rust_arches}
- rust-gstreamer-editing-services-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-pbutils
ExclusiveArch: %{rust_arches}
- rust-gstreamer-pbutils-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-player
ExclusiveArch: %{rust_arches}
- rust-gstreamer-player-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-video
ExclusiveArch: %{rust_arches}
- rust-gstreamer-video-sys
ExclusiveArch: %{rust_arches}
- rust-gtk
ExclusiveArch: %{rust_arches}
- rust-gtk-macros
ExclusiveArch: %{rust_arches}
- rust-gtk-rs-lgpl-docs
ExclusiveArch: %{rust_arches}
- rust-gtk-source-sys
ExclusiveArch: %{rust_arches}
- rust-gtk-sys
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-h2
ExclusiveArch: %{rust_arches}
- rust-half
ExclusiveArch: %{rust_arches}
- rust-hamcrest
ExclusiveArch: %{rust_arches}
- rust-handlebars
ExclusiveArch: %{rust_arches}
- rust-hashbrown
ExclusiveArch: %{rust_arches}
- rust-headers
ExclusiveArch: %{rust_arches}
- rust-headers-core
ExclusiveArch: %{rust_arches}
- rust-headers-derive
ExclusiveArch: %{rust_arches}
- rust-heapsize
ExclusiveArch: %{rust_arches}
- rust-heatseeker
ExclusiveArch: %{rust_arches}
- rust-heck
ExclusiveArch: %{rust_arches}
- rust-hex
ExclusiveArch: %{rust_arches}
- rust-hex-literal
ExclusiveArch: %{rust_arches}
- rust-hex-literal-impl
ExclusiveArch: %{rust_arches}
- rust-hex-literal0.2
ExclusiveArch: %{rust_arches}
- rust-hexyl
ExclusiveArch: %{rust_arches}
- rust-hkdf
ExclusiveArch: %{rust_arches}
- rust-hmac
ExclusiveArch: %{rust_arches}
- rust-home
ExclusiveArch: %{rust_arches}
- rust-horrorshow
ExclusiveArch: %{rust_arches}
- rust-hostname
ExclusiveArch: %{rust_arches}
- rust-hostname-validator
ExclusiveArch: %{rust_arches}
- rust-html2pango
ExclusiveArch: %{rust_arches}
- rust-html5ever
ExclusiveArch: %{rust_arches}
- rust-http
ExclusiveArch: %{rust_arches}
- rust-http-body
ExclusiveArch: %{rust_arches}
- rust-http0.1
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-httpdate
ExclusiveArch: %{rust_arches}
- rust-humansize
ExclusiveArch: %{rust_arches}
- rust-humantime
ExclusiveArch: %{rust_arches}
- rust-humantime1
ExclusiveArch: %{rust_arches}
- rust-hyper
ExclusiveArch: %{rust_arches}
- rust-hyper-native-tls
ExclusiveArch: %{rust_arches}
- rust-hyper-staticfile
ExclusiveArch: %{rust_arches}
- rust-hyper-tls
ExclusiveArch: %{rust_arches}
- rust-hyper0.10
ExclusiveArch: %{rust_arches}
- rust-hyperfine
ExclusiveArch: %{rust_arches}
- rust-i3ipc
ExclusiveArch: %{rust_arches}
- rust-id_tree
ExclusiveArch: %{rust_arches}
- rust-ident_case
ExclusiveArch: %{rust_arches}
- rust-idna
ExclusiveArch: %{rust_arches}
- rust-idna0.1
ExclusiveArch: %{rust_arches}
- rust-ignore
ExclusiveArch: %{rust_arches}
- rust-im-rc
ExclusiveArch: %{rust_arches}
- rust-image
ExclusiveArch: %{rust_arches}
- rust-imgref
ExclusiveArch: %{rust_arches}
- rust-indexmap
ExclusiveArch: %{rust_arches}
- rust-indicatif
ExclusiveArch: %{rust_arches}
- rust-indoc
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-inotify
ExclusiveArch: %{rust_arches}
- rust-inotify-sys
ExclusiveArch: %{rust_arches}
- rust-input_buffer
ExclusiveArch: %{rust_arches}
- rust-insta
ExclusiveArch: %{rust_arches}
- rust-instant
ExclusiveArch: %{rust_arches}
- rust-interpolate_name
ExclusiveArch: %{rust_arches}
- rust-intervaltree
ExclusiveArch: %{rust_arches}
- rust-invalidstring
ExclusiveArch: %{rust_arches}
- rust-inventory
ExclusiveArch: %{rust_arches}
- rust-inventory-impl
ExclusiveArch: %{rust_arches}
- rust-iocuddle
ExclusiveArch: %{rust_arches}
- rust-iovec
ExclusiveArch: %{rust_arches}
- rust-ipnet
ExclusiveArch: %{rust_arches}
- rust-ipnetwork
ExclusiveArch: %{rust_arches}
- rust-iron
ExclusiveArch: %{rust_arches}
- rust-isahc
ExclusiveArch: %{rust_arches}
- rust-iso8601
ExclusiveArch: %{rust_arches}
- rust-iter-read
ExclusiveArch: %{rust_arches}
- rust-itertools
ExclusiveArch: %{rust_arches}
- rust-itertools-num
ExclusiveArch: %{rust_arches}
- rust-itertools0.8
ExclusiveArch: %{rust_arches}
- rust-itertools0.9
ExclusiveArch: %{rust_arches}
- rust-itoa
ExclusiveArch: %{rust_arches}
- rust-ivf
ExclusiveArch: %{rust_arches}
- rust-javascriptcore-rs
ExclusiveArch: %{rust_arches}
- rust-javascriptcore-rs-sys
ExclusiveArch: %{rust_arches}
- rust-jetscii
ExclusiveArch: %{rust_arches}
- rust-jieba-rs
ExclusiveArch: %{rust_arches}
- rust-jobserver
ExclusiveArch: %{rust_arches}
- rust-jpeg-decoder
ExclusiveArch: %{rust_arches}
- rust-jql
ExclusiveArch: %{rust_arches}
- rust-js-sys
ExclusiveArch: %{rust_arches}
- rust-js_int
ExclusiveArch: %{rust_arches}
- rust-json
ExclusiveArch: %{rust_arches}
- rust-jwalk
ExclusiveArch: %{rust_arches}
- rust-keccak
ExclusiveArch: %{rust_arches}
- rust-khronos_api
ExclusiveArch: %{rust_arches}
- rust-kstring
ExclusiveArch: %{rust_arches}
- rust-kv-log-macro
ExclusiveArch: %{rust_arches}
- rust-lab
ExclusiveArch: %{rust_arches}
- rust-language-tags
ExclusiveArch: %{rust_arches}
- rust-lazy-init
ExclusiveArch: %{rust_arches}
- rust-lazy_static
ExclusiveArch: %{rust_arches}
- rust-lazycell
ExclusiveArch: %{rust_arches}
- rust-leb128
ExclusiveArch: %{rust_arches}
- rust-letter-avatar
ExclusiveArch: %{rust_arches}
- rust-lexical-core
ExclusiveArch: %{rust_arches}
- rust-libc
ExclusiveArch: %{rust_arches}
- rust-libcryptsetup-rs
ExclusiveArch: %{rust_arches}
- rust-libcryptsetup-rs-sys
ExclusiveArch: %{rust_arches}
- rust-libdbus-sys
ExclusiveArch: %{rust_arches}
- rust-libflate
ExclusiveArch: %{rust_arches}
- rust-libflate_lz77
ExclusiveArch: %{rust_arches}
- rust-libgit2-sys
ExclusiveArch: %{rust_arches}
- rust-libhandy
ExclusiveArch: %{rust_arches}
- rust-libhandy-sys
ExclusiveArch: %{rust_arches}
- rust-libloading
ExclusiveArch: %{rust_arches}
- rust-libm
ExclusiveArch: %{rust_arches}
- rust-libmount
ExclusiveArch: %{rust_arches}
- rust-libnotcurses-sys
ExclusiveArch: %{rust_arches}
- rust-liboverdrop
ExclusiveArch: %{rust_arches}
- rust-libpulse-binding
ExclusiveArch: %{rust_arches}
- rust-libpulse-sys
ExclusiveArch: %{rust_arches}
- rust-libslirp
ExclusiveArch: %{rust_arches}
- rust-libslirp-sys
ExclusiveArch: %{rust_arches}
- rust-libsqlite3-sys
ExclusiveArch: %{rust_arches}
- rust-libssh2-sys
ExclusiveArch: %{rust_arches}
- rust-libsystemd
ExclusiveArch: %{rust_arches}
- rust-libudev
ExclusiveArch: %{rust_arches}
- rust-libudev-sys
ExclusiveArch: %{rust_arches}
- rust-libxml
ExclusiveArch: %{rust_arches}
- rust-libz-sys
ExclusiveArch: %{rust_arches}
- rust-line-wrap
ExclusiveArch: %{rust_arches}
- rust-line_drawing
ExclusiveArch: %{rust_arches}
- rust-link-cplusplus
ExclusiveArch: %{rust_arches}
- rust-linked-hash-map
ExclusiveArch: %{rust_arches}
- rust-linkify
ExclusiveArch: %{rust_arches}
- rust-lipsum
ExclusiveArch: %{rust_arches}
- rust-liquid
ExclusiveArch: %{rust_arches}
- rust-liquid-core
ExclusiveArch: %{rust_arches}
- rust-liquid-derive
ExclusiveArch: %{rust_arches}
- rust-liquid-lib
ExclusiveArch: %{rust_arches}
- rust-listenfd
ExclusiveArch: %{rust_arches}
- rust-lmdb
ExclusiveArch: %{rust_arches}
- rust-lmdb-sys
ExclusiveArch: %{rust_arches}
- rust-locale
ExclusiveArch: %{rust_arches}
- rust-locale_config
ExclusiveArch: %{rust_arches}
- rust-lock_api
ExclusiveArch: %{rust_arches}
- rust-lockfree
ExclusiveArch: %{rust_arches}
- rust-log
ExclusiveArch: %{rust_arches}
- rust-log-mdc
ExclusiveArch: %{rust_arches}
- rust-log-panics
ExclusiveArch: %{rust_arches}
- rust-log0.3
ExclusiveArch: %{rust_arches}
- rust-log4rs
ExclusiveArch: %{rust_arches}
- rust-loggerv
ExclusiveArch: %{rust_arches}
- rust-loopdev
ExclusiveArch: %{rust_arches}
- rust-lru-cache
ExclusiveArch: %{rust_arches}
- rust-lru_time_cache
ExclusiveArch: %{rust_arches}
- rust-lscolors
ExclusiveArch: %{rust_arches}
- rust-lsd
ExclusiveArch: %{rust_arches}
- rust-lzma-sys
ExclusiveArch: %{rust_arches}
- rust-lzw
ExclusiveArch: %{rust_arches}
- rust-mac
ExclusiveArch: %{rust_arches}
- rust-macro-attr
ExclusiveArch: %{rust_arches}
- rust-magic-crypt
ExclusiveArch: %{rust_arches}
- rust-maildir
ExclusiveArch: %{rust_arches}
- rust-mailparse
ExclusiveArch: %{rust_arches}
- rust-man
ExclusiveArch: %{rust_arches}
- rust-maplit
ExclusiveArch: %{rust_arches}
- rust-markup5ever
ExclusiveArch: %{rust_arches}
- rust-markup5ever_rcdom
ExclusiveArch: %{rust_arches}
- rust-match_cfg
ExclusiveArch: %{rust_arches}
- rust-matches
ExclusiveArch: %{rust_arches}
- rust-matrixmultiply
ExclusiveArch: %{rust_arches}
- rust-maxminddb
ExclusiveArch: %{rust_arches}
- rust-maybe-uninit
ExclusiveArch: %{rust_arches}
- rust-mbox
ExclusiveArch: %{rust_arches}
- rust-md-5
ExclusiveArch: %{rust_arches}
- rust-md5
ExclusiveArch: %{rust_arches}
- rust-mdl
ExclusiveArch: %{rust_arches}
- rust-memchr
ExclusiveArch: %{rust_arches}
- rust-memmap
ExclusiveArch: %{rust_arches}
- rust-memmap2
ExclusiveArch: %{rust_arches}
- rust-memoffset
ExclusiveArch: %{rust_arches}
- rust-memoffset0.5
ExclusiveArch: %{rust_arches}
- rust-metadeps
ExclusiveArch: %{rust_arches}
- rust-migrations_internals
ExclusiveArch: %{rust_arches}
- rust-migrations_macros
ExclusiveArch: %{rust_arches}
- rust-mime
ExclusiveArch: %{rust_arches}
- rust-mime-sniffer
ExclusiveArch: %{rust_arches}
- rust-mime0.2
ExclusiveArch: %{rust_arches}
- rust-mime_guess
ExclusiveArch: %{rust_arches}
- rust-mime_guess1
ExclusiveArch: %{rust_arches}
- rust-miniflux_api
ExclusiveArch: %{rust_arches}
- rust-minify-html
ExclusiveArch: %{rust_arches}
- rust-miniz-sys
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide0.3
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide_c_api
ExclusiveArch: %{rust_arches}
- rust-mint
ExclusiveArch: %{rust_arches}
- rust-mio
ExclusiveArch: %{rust_arches}
- rust-mio-extras
ExclusiveArch: %{rust_arches}
- rust-mio-uds
ExclusiveArch: %{rust_arches}
- rust-mio0.6
ExclusiveArch: %{rust_arches}
- rust-mktemp
ExclusiveArch: %{rust_arches}
- rust-mnt
ExclusiveArch: %{rust_arches}
- rust-mockito
ExclusiveArch: %{rust_arches}
- rust-modifier
ExclusiveArch: %{rust_arches}
- rust-more-asserts
ExclusiveArch: %{rust_arches}
- rust-muldiv
ExclusiveArch: %{rust_arches}
- rust-multimap
ExclusiveArch: %{rust_arches}
- rust-multipart
ExclusiveArch: %{rust_arches}
- rust-mustache
ExclusiveArch: %{rust_arches}
- rust-nasm-rs
ExclusiveArch: %{rust_arches}
- rust-native-tls
ExclusiveArch: %{rust_arches}
- rust-natord
ExclusiveArch: %{rust_arches}
- rust-nb-connect
ExclusiveArch: %{rust_arches}
- rust-net2
ExclusiveArch: %{rust_arches}
- rust-netlink-packet-core
ExclusiveArch: %{rust_arches}
- rust-netlink-packet-route
ExclusiveArch: %{rust_arches}
- rust-netlink-packet-utils
ExclusiveArch: %{rust_arches}
- rust-netlink-proto
ExclusiveArch: %{rust_arches}
- rust-netlink-sys
ExclusiveArch: %{rust_arches}
- rust-netmap_sys
ExclusiveArch: %{rust_arches}
- rust-new_debug_unreachable
ExclusiveArch: %{rust_arches}
- rust-news-flash
ExclusiveArch: %{rust_arches}
- rust-newtype_derive
ExclusiveArch: %{rust_arches}
- rust-nickel
ExclusiveArch: %{rust_arches}
- rust-nix
ExclusiveArch: %{rust_arches}
- rust-nix0.14
ExclusiveArch: %{rust_arches}
- rust-nix0.17
ExclusiveArch: %{rust_arches}
- rust-nix0.18
ExclusiveArch: %{rust_arches}
- rust-no-panic
ExclusiveArch: %{rust_arches}
- rust-nodrop
ExclusiveArch: %{rust_arches}
- rust-nom
ExclusiveArch: %{rust_arches}
- rust-nom4
ExclusiveArch: %{rust_arches}
- rust-nom5
ExclusiveArch: %{rust_arches}
- rust-noop_proc_macro
ExclusiveArch: %{rust_arches}
- rust-normalize-line-endings
ExclusiveArch: %{rust_arches}
- rust-notify
ExclusiveArch: %{rust_arches}
- rust-notify-rust
ExclusiveArch: %{rust_arches}
- rust-num
ExclusiveArch: %{rust_arches}
- rust-num-bigint
ExclusiveArch: %{rust_arches}
- rust-num-bigint-dig
ExclusiveArch: %{rust_arches}
- rust-num-complex
ExclusiveArch: %{rust_arches}
- rust-num-derive
ExclusiveArch: %{rust_arches}
- rust-num-integer
ExclusiveArch: %{rust_arches}
- rust-num-iter
ExclusiveArch: %{rust_arches}
- rust-num-rational
ExclusiveArch: %{rust_arches}
- rust-num-traits
ExclusiveArch: %{rust_arches}
- rust-num-traits0.1
ExclusiveArch: %{rust_arches}
- rust-num_cpus
ExclusiveArch: %{rust_arches}
- rust-number_prefix
ExclusiveArch: %{rust_arches}
- rust-numtoa
ExclusiveArch: %{rust_arches}
- rust-obfstr
ExclusiveArch: %{rust_arches}
- rust-object
ExclusiveArch: %{rust_arches}
- rust-odds
ExclusiveArch: %{rust_arches}
- rust-oid
ExclusiveArch: %{rust_arches}
- rust-once_cell
ExclusiveArch: %{rust_arches}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-onig_sys
ExclusiveArch: %{rust_arches}
- rust-oorandom
ExclusiveArch: %{rust_arches}
- rust-opaque-debug
ExclusiveArch: %{rust_arches}
- rust-open
ExclusiveArch: %{rust_arches}
- rust-openat
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-opener
ExclusiveArch: %{rust_arches}
- rust-openssh-keys
ExclusiveArch: %{rust_arches}
- rust-openssl
ExclusiveArch: %{rust_arches}
- rust-openssl-probe
ExclusiveArch: %{rust_arches}
- rust-openssl-sys
ExclusiveArch: %{rust_arches}
- rust-ord_subset
ExclusiveArch: %{rust_arches}
- rust-ordered-float
ExclusiveArch: %{rust_arches}
- rust-ordered-multimap
ExclusiveArch: %{rust_arches}
- rust-os_info
ExclusiveArch: %{rust_arches}
- rust-os_pipe
ExclusiveArch: %{rust_arches}
- rust-os_str_bytes
ExclusiveArch: %{rust_arches}
- rust-osmesa-sys
ExclusiveArch: %{rust_arches}
- rust-osstrtools
ExclusiveArch: %{rust_arches}
- rust-ostree
ExclusiveArch: %{rust_arches}
- rust-ostree-sys
ExclusiveArch: %{rust_arches}
- rust-owned-alloc
ExclusiveArch: %{rust_arches}
- rust-owned_ttf_parser
ExclusiveArch: %{rust_arches}
- rust-owning_ref
ExclusiveArch: %{rust_arches}
- rust-packaging
ExclusiveArch: %{rust_arches}
- rust-pad
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-palette
ExclusiveArch: %{rust_arches}
- rust-palette_derive
ExclusiveArch: %{rust_arches}
- rust-pango
ExclusiveArch: %{rust_arches}
- rust-pango-sys
ExclusiveArch: %{rust_arches}
- rust-pangocairo
ExclusiveArch: %{rust_arches}
- rust-pangocairo-sys
ExclusiveArch: %{rust_arches}
- rust-parity-wasm
ExclusiveArch: %{rust_arches}
- rust-parking
ExclusiveArch: %{rust_arches}
- rust-parking_lot
ExclusiveArch: %{rust_arches}
- rust-parking_lot_core
ExclusiveArch: %{rust_arches}
- rust-parse-zoneinfo
ExclusiveArch: %{rust_arches}
- rust-parse_cfg
ExclusiveArch: %{rust_arches}
- rust-parsec-client
ExclusiveArch: %{rust_arches}
- rust-parsec-interface
ExclusiveArch: %{rust_arches}
- rust-partial-io
ExclusiveArch: %{rust_arches}
- rust-paste
ExclusiveArch: %{rust_arches}
- rust-paste-impl
ExclusiveArch: %{rust_arches}
- rust-path-absolutize
ExclusiveArch: %{rust_arches}
- rust-path-dedot
ExclusiveArch: %{rust_arches}
- rust-path-slash
ExclusiveArch: %{rust_arches}
- rust-pathdiff
ExclusiveArch: %{rust_arches}
- rust-pathfinder_geometry
ExclusiveArch: %{rust_arches}
- rust-pathfinder_simd
ExclusiveArch: %{rust_arches}
- rust-pbr
ExclusiveArch: %{rust_arches}
- rust-pcap
ExclusiveArch: %{rust_arches}
- rust-pcre2
ExclusiveArch: %{rust_arches}
- rust-pcre2-sys
ExclusiveArch: %{rust_arches}
- rust-peeking_take_while
ExclusiveArch: %{rust_arches}
- rust-peg
ExclusiveArch: %{rust_arches}
- rust-peg-macros
ExclusiveArch: %{rust_arches}
- rust-peg-runtime
ExclusiveArch: %{rust_arches}
- rust-peg0.5
ExclusiveArch: %{rust_arches}
- rust-pem
ExclusiveArch: %{rust_arches}
- rust-percent-encoding
ExclusiveArch: %{rust_arches}
- rust-percent-encoding1
ExclusiveArch: %{rust_arches}
- rust-peresil
ExclusiveArch: %{rust_arches}
- rust-permutate
ExclusiveArch: %{rust_arches}
- rust-permutohedron
ExclusiveArch: %{rust_arches}
- rust-pest
ExclusiveArch: %{rust_arches}
- rust-pest_derive
ExclusiveArch: %{rust_arches}
- rust-pest_generator
ExclusiveArch: %{rust_arches}
- rust-pest_meta
ExclusiveArch: %{rust_arches}
- rust-petgraph
ExclusiveArch: %{rust_arches}
- rust-phf
ExclusiveArch: %{rust_arches}
- rust-phf0.7
ExclusiveArch: %{rust_arches}
- rust-phf_codegen
ExclusiveArch: %{rust_arches}
- rust-phf_codegen0.7
ExclusiveArch: %{rust_arches}
- rust-phf_generator
ExclusiveArch: %{rust_arches}
- rust-phf_generator0.7
ExclusiveArch: %{rust_arches}
- rust-phf_macros
ExclusiveArch: %{rust_arches}
- rust-phf_macros0.7
ExclusiveArch: %{rust_arches}
- rust-phf_shared
ExclusiveArch: %{rust_arches}
- rust-phf_shared0.7
ExclusiveArch: %{rust_arches}
- rust-picky-asn1
ExclusiveArch: %{rust_arches}
- rust-picky-asn1-der
ExclusiveArch: %{rust_arches}
- rust-picky-asn1-x509
ExclusiveArch: %{rust_arches}
- rust-pico-args
ExclusiveArch: %{rust_arches}
- rust-pin-project
ExclusiveArch: %{rust_arches}
- rust-pin-project-internal
ExclusiveArch: %{rust_arches}
- rust-pin-project-internal0.4
ExclusiveArch: %{rust_arches}
- rust-pin-project-lite
ExclusiveArch: %{rust_arches}
- rust-pin-project-lite0.1
ExclusiveArch: %{rust_arches}
- rust-pin-project0.4
ExclusiveArch: %{rust_arches}
- rust-pin-utils
ExclusiveArch: %{rust_arches}
- rust-pipe
ExclusiveArch: %{rust_arches}
- rust-piper
ExclusiveArch: %{rust_arches}
- rust-pkcs11
ExclusiveArch: %{rust_arches}
- rust-pkg-config
ExclusiveArch: %{rust_arches}
- rust-plain
ExclusiveArch: %{rust_arches}
- rust-platform-dirs
ExclusiveArch: %{rust_arches}
- rust-platforms
ExclusiveArch: %{rust_arches}
- rust-plist
ExclusiveArch: %{rust_arches}
- rust-plotters
ExclusiveArch: %{rust_arches}
- rust-plugin
ExclusiveArch: %{rust_arches}
- rust-pnet_base
ExclusiveArch: %{rust_arches}
- rust-pnet_datalink
ExclusiveArch: %{rust_arches}
- rust-pnet_sys
ExclusiveArch: %{rust_arches}
- rust-png
ExclusiveArch: %{rust_arches}
- rust-podio
ExclusiveArch: %{rust_arches}
- rust-polling
ExclusiveArch: %{rust_arches}
- rust-polyval
ExclusiveArch: %{rust_arches}
- rust-pommes
ExclusiveArch: %{rust_arches}
- rust-ppv-lite86
ExclusiveArch: %{rust_arches}
- rust-pq-sys
ExclusiveArch: %{rust_arches}
- rust-precomputed-hash
ExclusiveArch: %{rust_arches}
- rust-predicates
ExclusiveArch: %{rust_arches}
- rust-predicates-core
ExclusiveArch: %{rust_arches}
- rust-predicates-tree
ExclusiveArch: %{rust_arches}
- rust-pretty-git-prompt
ExclusiveArch: %{rust_arches}
- rust-pretty-hex
ExclusiveArch: %{rust_arches}
- rust-pretty_assertions
ExclusiveArch: %{rust_arches}
- rust-pretty_env_logger
ExclusiveArch: %{rust_arches}
- rust-prettytable-rs
ExclusiveArch: %{rust_arches}
- rust-proc-macro-crate
ExclusiveArch: %{rust_arches}
- rust-proc-macro-error
ExclusiveArch: %{rust_arches}
- rust-proc-macro-error-attr
ExclusiveArch: %{rust_arches}
- rust-proc-macro-hack
ExclusiveArch: %{rust_arches}
- rust-proc-macro-nested
ExclusiveArch: %{rust_arches}
- rust-proc-macro2
ExclusiveArch: %{rust_arches}
- rust-proc-macro2-0.4
ExclusiveArch: %{rust_arches}
- rust-proc-quote
ExclusiveArch: %{rust_arches}
- rust-proc-quote-impl
ExclusiveArch: %{rust_arches}
- rust-procedural-masquerade
ExclusiveArch: %{rust_arches}
- rust-process_path
ExclusiveArch: %{rust_arches}
- rust-procfs
ExclusiveArch: %{rust_arches}
- rust-procfs0.8
ExclusiveArch: %{rust_arches}
- rust-procs
ExclusiveArch: %{rust_arches}
- rust-progress-streams
ExclusiveArch: %{rust_arches}
- rust-prometheus
ExclusiveArch: %{rust_arches}
- rust-proptest
ExclusiveArch: %{rust_arches}
- rust-proptest-derive
ExclusiveArch: %{rust_arches}
- rust-prost
ExclusiveArch: %{rust_arches}
- rust-prost-build
ExclusiveArch: %{rust_arches}
- rust-prost-derive
ExclusiveArch: %{rust_arches}
- rust-prost-types
ExclusiveArch: %{rust_arches}
- rust-protobuf
ExclusiveArch: %{rust_arches}
- rust-protobuf-codegen
ExclusiveArch: %{rust_arches}
- rust-protobuf-codegen-pure
ExclusiveArch: %{rust_arches}
- rust-protoc
ExclusiveArch: %{rust_arches}
- rust-protoc-rust
ExclusiveArch: %{rust_arches}
- rust-psa-crypto
ExclusiveArch: %{rust_arches}
- rust-psa-crypto-sys
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-psutil
ExclusiveArch: %{rust_arches}
- rust-publicsuffix
ExclusiveArch: %{rust_arches}
- rust-pulldown-cmark
ExclusiveArch: %{rust_arches}
- rust-pulse
ExclusiveArch: %{rust_arches}
- rust-pure-rust-locales
ExclusiveArch: %{rust_arches}
- rust-pyo3
ExclusiveArch: %{rust_arches}
- rust-pyo3-macros
ExclusiveArch: %{rust_arches}
- rust-pyo3-macros-backend
ExclusiveArch: %{rust_arches}
- rust-python3-sys
ExclusiveArch: %{rust_arches}
- rust-qr2term
ExclusiveArch: %{rust_arches}
- rust-qrcode
ExclusiveArch: %{rust_arches}
- rust-quick-error
ExclusiveArch: %{rust_arches}
- rust-quick-error1
ExclusiveArch: %{rust_arches}
- rust-quick-xml
ExclusiveArch: %{rust_arches}
- rust-quickcheck
ExclusiveArch: %{rust_arches}
- rust-quickcheck0.6
ExclusiveArch: %{rust_arches}
- rust-quickcheck_macros
ExclusiveArch: %{rust_arches}
- rust-quickersort
ExclusiveArch: %{rust_arches}
- rust-quote
ExclusiveArch: %{rust_arches}
- rust-quote0.3
ExclusiveArch: %{rust_arches}
- rust-quote0.6
ExclusiveArch: %{rust_arches}
- rust-quoted_printable
ExclusiveArch: %{rust_arches}
- rust-r2d2
ExclusiveArch: %{rust_arches}
- rust-radium
ExclusiveArch: %{rust_arches}
- rust-rand
ExclusiveArch: %{rust_arches}
- rust-rand0.4
ExclusiveArch: %{rust_arches}
- rust-rand0.5
ExclusiveArch: %{rust_arches}
- rust-rand0.6
ExclusiveArch: %{rust_arches}
- rust-rand0.7
ExclusiveArch: %{rust_arches}
- rust-rand_chacha
ExclusiveArch: %{rust_arches}
- rust-rand_chacha0.1
ExclusiveArch: %{rust_arches}
- rust-rand_chacha0.2
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-rand_core0.3
ExclusiveArch: %{rust_arches}
- rust-rand_core0.4
ExclusiveArch: %{rust_arches}
- rust-rand_core0.5
ExclusiveArch: %{rust_arches}
- rust-rand_distr
ExclusiveArch: %{rust_arches}
- rust-rand_distr0.2
ExclusiveArch: %{rust_arches}
- rust-rand_hc
ExclusiveArch: %{rust_arches}
- rust-rand_hc0.1
ExclusiveArch: %{rust_arches}
- rust-rand_isaac
ExclusiveArch: %{rust_arches}
- rust-rand_isaac0.1
ExclusiveArch: %{rust_arches}
- rust-rand_jitter
ExclusiveArch: %{rust_arches}
- rust-rand_jitter0.1
ExclusiveArch: %{rust_arches}
- rust-rand_os
ExclusiveArch: %{rust_arches}
- rust-rand_os0.1
ExclusiveArch: %{rust_arches}
- rust-rand_pcg
ExclusiveArch: %{rust_arches}
- rust-rand_pcg0.1
ExclusiveArch: %{rust_arches}
- rust-rand_pcg0.2
ExclusiveArch: %{rust_arches}
- rust-rand_xorshift
ExclusiveArch: %{rust_arches}
- rust-rand_xorshift0.1
ExclusiveArch: %{rust_arches}
- rust-rand_xoshiro
ExclusiveArch: %{rust_arches}
- rust-random-fast-rng
ExclusiveArch: %{rust_arches}
- rust-random-trait
ExclusiveArch: %{rust_arches}
- rust-randomize
ExclusiveArch: %{rust_arches}
- rust-rav1e
ExclusiveArch: %{rust_arches}
- rust-raw-window-handle
ExclusiveArch: %{rust_arches}
- rust-rawpointer
ExclusiveArch: %{rust_arches}
- rust-rawslice
ExclusiveArch: %{rust_arches}
- rust-rayon
ExclusiveArch: %{rust_arches}
- rust-rayon-core
ExclusiveArch: %{rust_arches}
- rust-readability-fork
ExclusiveArch: %{rust_arches}
- rust-readwrite
ExclusiveArch: %{rust_arches}
- rust-recycler
ExclusiveArch: %{rust_arches}
- rust-ref-cast
ExclusiveArch: %{rust_arches}
- rust-ref-cast-impl
ExclusiveArch: %{rust_arches}
- rust-regex
ExclusiveArch: %{rust_arches}
- rust-regex-automata
ExclusiveArch: %{rust_arches}
- rust-regex-syntax
ExclusiveArch: %{rust_arches}
- rust-region
ExclusiveArch: %{rust_arches}
- rust-relative-path
ExclusiveArch: %{rust_arches}
- rust-relay
ExclusiveArch: %{rust_arches}
- rust-remove_dir_all
ExclusiveArch: %{rust_arches}
- rust-reqwest
ExclusiveArch: %{rust_arches}
- rust-resize
ExclusiveArch: %{rust_arches}
- rust-resolv-conf
ExclusiveArch: %{rust_arches}
- rust-restson
ExclusiveArch: %{rust_arches}
- rust-retry
ExclusiveArch: %{rust_arches}
- rust-rgb
ExclusiveArch: %{rust_arches}
- rust-ring
ExclusiveArch: %{rust_arches}
- rust-ripgrep
ExclusiveArch: %{rust_arches}
- rust-rle-decode-fast
ExclusiveArch: %{rust_arches}
- rust-rmp
ExclusiveArch: %{rust_arches}
- rust-rmp-serde
ExclusiveArch: %{rust_arches}
- rust-roff
ExclusiveArch: %{rust_arches}
- rust-ron
ExclusiveArch: %{rust_arches}
- rust-roxmltree
ExclusiveArch: %{rust_arches}
- rust-rpassword
ExclusiveArch: %{rust_arches}
- rust-rpick
ExclusiveArch: %{rust_arches}
- rust-rsa
ExclusiveArch: %{rust_arches}
- rust-rtnetlink
ExclusiveArch: %{rust_arches}
- rust-ruma
ExclusiveArch: %{rust_arches}
- rust-ruma-api
ExclusiveArch: %{rust_arches}
- rust-ruma-api-macros
ExclusiveArch: %{rust_arches}
- rust-ruma-appservice-api
ExclusiveArch: %{rust_arches}
- rust-ruma-client-api
ExclusiveArch: %{rust_arches}
- rust-ruma-common
ExclusiveArch: %{rust_arches}
- rust-ruma-events
ExclusiveArch: %{rust_arches}
- rust-ruma-events-macros
ExclusiveArch: %{rust_arches}
- rust-ruma-federation-api
ExclusiveArch: %{rust_arches}
- rust-ruma-identifiers
ExclusiveArch: %{rust_arches}
- rust-ruma-identifiers-macros
ExclusiveArch: %{rust_arches}
- rust-ruma-identifiers-validation
ExclusiveArch: %{rust_arches}
- rust-ruma-identity-service-api
ExclusiveArch: %{rust_arches}
- rust-ruma-push-gateway-api
ExclusiveArch: %{rust_arches}
- rust-ruma-serde
ExclusiveArch: %{rust_arches}
- rust-ruma-serde-macros
ExclusiveArch: %{rust_arches}
- rust-ruma-signatures
ExclusiveArch: %{rust_arches}
- rust-rust-embed
ExclusiveArch: %{rust_arches}
- rust-rust-embed-impl
ExclusiveArch: %{rust_arches}
- rust-rust-embed-utils
ExclusiveArch: %{rust_arches}
- rust-rust-ini
ExclusiveArch: %{rust_arches}
- rust-rust-stemmers
ExclusiveArch: %{rust_arches}
- rust-rust_decimal
ExclusiveArch: %{rust_arches}
- rust-rust_hawktracer
ExclusiveArch: %{rust_arches}
- rust-rust_hawktracer_normal_macro
ExclusiveArch: %{rust_arches}
- rust-rust_hawktracer_proc_macro
ExclusiveArch: %{rust_arches}
- rust-rust_hawktracer_sys
ExclusiveArch: %{rust_arches}
- rust-rustc-demangle
ExclusiveArch: %{rust_arches}
- rust-rustc-hash
ExclusiveArch: %{rust_arches}
- rust-rustc-serialize
ExclusiveArch: %{rust_arches}
- rust-rustc-test
ExclusiveArch: %{rust_arches}
- rust-rustc_tools_util
ExclusiveArch: %{rust_arches}
- rust-rustc_version
ExclusiveArch: %{rust_arches}
- rust-rustdoc-stripper
ExclusiveArch: %{rust_arches}
- rust-rustfilt
ExclusiveArch: %{rust_arches}
- rust-rustfix
ExclusiveArch: %{rust_arches}
- rust-rustio
ExclusiveArch: %{rust_arches}
- rust-rusttype
ExclusiveArch: %{rust_arches}
- rust-rustversion
ExclusiveArch: %{rust_arches}
- rust-rusty-fork
ExclusiveArch: %{rust_arches}
- rust-rustyline
ExclusiveArch: %{rust_arches}
- rust-rustyline-derive
ExclusiveArch: %{rust_arches}
- rust-ryu
ExclusiveArch: %{rust_arches}
- rust-safe-transmute
ExclusiveArch: %{rust_arches}
- rust-safemem
ExclusiveArch: %{rust_arches}
- rust-same-file
ExclusiveArch: %{rust_arches}
- rust-sass-rs
ExclusiveArch: %{rust_arches}
- rust-sass-sys
ExclusiveArch: %{rust_arches}
- rust-scan_fmt
ExclusiveArch: %{rust_arches}
- rust-scheduled-thread-pool
ExclusiveArch: %{rust_arches}
- rust-scoped-tls
ExclusiveArch: %{rust_arches}
- rust-scoped-tls-hkt
ExclusiveArch: %{rust_arches}
- rust-scoped_threadpool
ExclusiveArch: %{rust_arches}
- rust-scopeguard
ExclusiveArch: %{rust_arches}
- rust-scopetime
ExclusiveArch: %{rust_arches}
- rust-scratch
ExclusiveArch: %{rust_arches}
- rust-scroll
ExclusiveArch: %{rust_arches}
- rust-scroll_derive
ExclusiveArch: %{rust_arches}
- rust-sct
ExclusiveArch: %{rust_arches}
- rust-sd
ExclusiveArch: %{rust_arches}
- rust-sd-notify
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-secrecy
ExclusiveArch: %{rust_arches}
- rust-secret-service
ExclusiveArch: %{rust_arches}
- rust-semver
ExclusiveArch: %{rust_arches}
- rust-semver-parser
ExclusiveArch: %{rust_arches}
- rust-semver-parser0.7
ExclusiveArch: %{rust_arches}
- rust-semver-parser0.9
ExclusiveArch: %{rust_arches}
- rust-semver0.10
ExclusiveArch: %{rust_arches}
- rust-semver0.9
ExclusiveArch: %{rust_arches}
- rust-serde
ExclusiveArch: %{rust_arches}
- rust-serde-big-array
ExclusiveArch: %{rust_arches}
- rust-serde-pickle
ExclusiveArch: %{rust_arches}
- rust-serde-value
ExclusiveArch: %{rust_arches}
- rust-serde-xml-rs
ExclusiveArch: %{rust_arches}
- rust-serde_bytes
ExclusiveArch: %{rust_arches}
- rust-serde_cbor
ExclusiveArch: %{rust_arches}
- rust-serde_derive
ExclusiveArch: %{rust_arches}
- rust-serde_ignored
ExclusiveArch: %{rust_arches}
- rust-serde_json
ExclusiveArch: %{rust_arches}
- rust-serde_repr
ExclusiveArch: %{rust_arches}
- rust-serde_stacker
ExclusiveArch: %{rust_arches}
- rust-serde_test
ExclusiveArch: %{rust_arches}
- rust-serde_url_params
ExclusiveArch: %{rust_arches}
- rust-serde_urlencoded
ExclusiveArch: %{rust_arches}
- rust-serde_urlencoded0.6
ExclusiveArch: %{rust_arches}
- rust-serde_with_macros
ExclusiveArch: %{rust_arches}
- rust-serde_yaml
ExclusiveArch: %{rust_arches}
- rust-serial_test
ExclusiveArch: %{rust_arches}
- rust-serial_test_derive
ExclusiveArch: %{rust_arches}
- rust-servo-fontconfig
ExclusiveArch: %{rust_arches}
- rust-servo-fontconfig-sys
ExclusiveArch: %{rust_arches}
- rust-sha-1
ExclusiveArch: %{rust_arches}
- rust-sha1
ExclusiveArch: %{rust_arches}
- rust-sha2
ExclusiveArch: %{rust_arches}
- rust-sha3
ExclusiveArch: %{rust_arches}
- rust-shared_child
ExclusiveArch: %{rust_arches}
- rust-shared_library
ExclusiveArch: %{rust_arches}
- rust-shell-escape
ExclusiveArch: %{rust_arches}
- rust-shell-words
ExclusiveArch: %{rust_arches}
- rust-shellexpand
ExclusiveArch: %{rust_arches}
- rust-shlex
ExclusiveArch: %{rust_arches}
- rust-signal-hook
ExclusiveArch: %{rust_arches}
- rust-signal-hook-registry
ExclusiveArch: %{rust_arches}
- rust-silver
ExclusiveArch: %{rust_arches}
- rust-simd_helpers
ExclusiveArch: %{rust_arches}
- rust-simple_asn1
ExclusiveArch: %{rust_arches}
- rust-simple_logger
ExclusiveArch: %{rust_arches}
- rust-simplelog
ExclusiveArch: %{rust_arches}
- rust-siphasher
ExclusiveArch: %{rust_arches}
- rust-size
ExclusiveArch: %{rust_arches}
- rust-sized-chunks
ExclusiveArch: %{rust_arches}
- rust-skeptic
ExclusiveArch: %{rust_arches}
- rust-skim
ExclusiveArch: %{rust_arches}
- rust-slab
ExclusiveArch: %{rust_arches}
- rust-slash-formatter
ExclusiveArch: %{rust_arches}
- rust-slice-deque
ExclusiveArch: %{rust_arches}
- rust-slog
ExclusiveArch: %{rust_arches}
- rust-slog-async
ExclusiveArch: %{rust_arches}
- rust-slog-scope
ExclusiveArch: %{rust_arches}
- rust-slog-term
ExclusiveArch: %{rust_arches}
- rust-slotmap
ExclusiveArch: %{rust_arches}
- rust-slug
ExclusiveArch: %{rust_arches}
- rust-sluice
ExclusiveArch: %{rust_arches}
- rust-smallvec
ExclusiveArch: %{rust_arches}
- rust-smart-default
ExclusiveArch: %{rust_arches}
- rust-smawk
ExclusiveArch: %{rust_arches}
- rust-smithay-client-toolkit
ExclusiveArch: %{rust_arches}
- rust-smithay-clipboard
ExclusiveArch: %{rust_arches}
- rust-snafu
ExclusiveArch: %{rust_arches}
- rust-snafu-derive
ExclusiveArch: %{rust_arches}
- rust-snowflake
ExclusiveArch: %{rust_arches}
- rust-socket2
ExclusiveArch: %{rust_arches}
- rust-soup-sys
ExclusiveArch: %{rust_arches}
- rust-sourceview
ExclusiveArch: %{rust_arches}
- rust-spin
ExclusiveArch: %{rust_arches}
- rust-spin_on
ExclusiveArch: %{rust_arches}
- rust-spinning_top
ExclusiveArch: %{rust_arches}
- rust-spmc
ExclusiveArch: %{rust_arches}
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stable_deref_trait
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-standback
ExclusiveArch: %{rust_arches}
- rust-starship
ExclusiveArch: %{rust_arches}
- rust-starship_module_config_derive
ExclusiveArch: %{rust_arches}
- rust-static_assertions
ExclusiveArch: %{rust_arches}
- rust-statistical
ExclusiveArch: %{rust_arches}
- rust-stb_truetype
ExclusiveArch: %{rust_arches}
- rust-stream-cipher
ExclusiveArch: %{rust_arches}
- rust-streaming-stats
ExclusiveArch: %{rust_arches}
- rust-string
ExclusiveArch: %{rust_arches}
- rust-string_cache
ExclusiveArch: %{rust_arches}
- rust-string_cache_codegen
ExclusiveArch: %{rust_arches}
- rust-string_cache_shared
ExclusiveArch: %{rust_arches}
- rust-strings
ExclusiveArch: %{rust_arches}
- rust-strip-ansi-escapes
ExclusiveArch: %{rust_arches}
- rust-strsim
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-structopt-derive
ExclusiveArch: %{rust_arches}
- rust-structopt-derive0.2
ExclusiveArch: %{rust_arches}
- rust-structopt0.2
ExclusiveArch: %{rust_arches}
- rust-strum
ExclusiveArch: %{rust_arches}
- rust-strum_macros
ExclusiveArch: %{rust_arches}
- rust-subtle
ExclusiveArch: %{rust_arches}
- rust-sudo_plugin
ExclusiveArch: %{rust_arches}
- rust-sudo_plugin-sys
ExclusiveArch: %{rust_arches}
- rust-sval
ExclusiveArch: %{rust_arches}
- rust-sval_derive
ExclusiveArch: %{rust_arches}
- rust-svg_metadata
ExclusiveArch: %{rust_arches}
- rust-sxd-document
ExclusiveArch: %{rust_arches}
- rust-syn
ExclusiveArch: %{rust_arches}
- rust-syn-mid
ExclusiveArch: %{rust_arches}
- rust-syn0.15
ExclusiveArch: %{rust_arches}
- rust-synom
ExclusiveArch: %{rust_arches}
- rust-synstructure
ExclusiveArch: %{rust_arches}
- rust-syntect
ExclusiveArch: %{rust_arches}
- rust-sys-info
ExclusiveArch: %{rust_arches}
- rust-sysinfo
ExclusiveArch: %{rust_arches}
- rust-system-deps
ExclusiveArch: %{rust_arches}
- rust-tabwriter
ExclusiveArch: %{rust_arches}
- rust-take
ExclusiveArch: %{rust_arches}
- rust-take_mut
ExclusiveArch: %{rust_arches}
- rust-tap
ExclusiveArch: %{rust_arches}
- rust-tar
ExclusiveArch: %{rust_arches}
- rust-target-lexicon
ExclusiveArch: %{rust_arches}
- rust-tealdeer
ExclusiveArch: %{rust_arches}
- rust-teloxide
ExclusiveArch: %{rust_arches}
- rust-teloxide-macros
ExclusiveArch: %{rust_arches}
- rust-tempdir
ExclusiveArch: %{rust_arches}
- rust-tempfile
ExclusiveArch: %{rust_arches}
- rust-tendril
ExclusiveArch: %{rust_arches}
- rust-tera
ExclusiveArch: %{rust_arches}
- rust-term
ExclusiveArch: %{rust_arches}
- rust-term_grid
ExclusiveArch: %{rust_arches}
- rust-term_size
ExclusiveArch: %{rust_arches}
- rust-termcolor
ExclusiveArch: %{rust_arches}
- rust-terminal_size
ExclusiveArch: %{rust_arches}
- rust-terminfo
ExclusiveArch: %{rust_arches}
- rust-termion
ExclusiveArch: %{rust_arches}
- rust-termios
ExclusiveArch: %{rust_arches}
- rust-test-assembler
ExclusiveArch: %{rust_arches}
- rust-tester
ExclusiveArch: %{rust_arches}
- rust-testing_logger
ExclusiveArch: %{rust_arches}
- rust-textwrap
ExclusiveArch: %{rust_arches}
- rust-textwrap0.11
ExclusiveArch: %{rust_arches}
- rust-textwrap0.12
ExclusiveArch: %{rust_arches}
- rust-thiserror
ExclusiveArch: %{rust_arches}
- rust-thiserror-impl
ExclusiveArch: %{rust_arches}
- rust-thread-id
ExclusiveArch: %{rust_arches}
- rust-thread-scoped
ExclusiveArch: %{rust_arches}
- rust-thread_local
ExclusiveArch: %{rust_arches}
- rust-threadpool
ExclusiveArch: %{rust_arches}
- rust-tiff
ExclusiveArch: %{rust_arches}
- rust-tiger-digest
ExclusiveArch: %{rust_arches}
- rust-time
ExclusiveArch: %{rust_arches}
- rust-time-macros
ExclusiveArch: %{rust_arches}
- rust-time-macros-impl
ExclusiveArch: %{rust_arches}
- rust-time0.1
ExclusiveArch: %{rust_arches}
- rust-timebomb
ExclusiveArch: %{rust_arches}
- rust-timer
ExclusiveArch: %{rust_arches}
- rust-timerfd
ExclusiveArch: %{rust_arches}
- rust-tiny_http
ExclusiveArch: %{rust_arches}
- rust-tinytemplate
ExclusiveArch: %{rust_arches}
- rust-tinyvec
ExclusiveArch: %{rust_arches}
- rust-tinyvec0.3
ExclusiveArch: %{rust_arches}
- rust-tinyvec_macros
ExclusiveArch: %{rust_arches}
- rust-tokei
ExclusiveArch: %{rust_arches}
- rust-tokio
ExclusiveArch: %{rust_arches}
- rust-tokio-codec
ExclusiveArch: %{rust_arches}
- rust-tokio-core
ExclusiveArch: %{rust_arches}
- rust-tokio-current-thread
ExclusiveArch: %{rust_arches}
- rust-tokio-executor