Architecture specific change in rpms/coin-or-Ipopt.git
by githook-noreply@fedoraproject.org
The package rpms/coin-or-Ipopt.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/coin-or-Ipopt.git/commit/?id=9399....
Change:
-%ifarch %{openblas_arches}
Thanks.
Full change:
============
commit 9399967fccf87aa06054fe34e109c30522b2cd9c
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Nov 1 20:19:46 2018 +0100
Update to Ipopt-3.12.11
diff --git a/.gitignore b/.gitignore
index 3e859cd..0d88688 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
/Ipopt-3.12.8.tgz
/Ipopt-3.12.9.tgz
/Ipopt-3.12.10.tgz
+/Ipopt-3.12.11.tgz
diff --git a/coin-or-Ipopt.spec b/coin-or-Ipopt.spec
index f3ba36a..cebc75e 100644
--- a/coin-or-Ipopt.spec
+++ b/coin-or-Ipopt.spec
@@ -31,11 +31,6 @@
%endif
# openblas available on these architectures.
-%if 0%{?fedora} && 0%{?fedora} > 26
-%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64 s390x}
-%else
-%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
-%endif
%if 0%{?rhel}
%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
%endif
@@ -43,21 +38,14 @@
%global with_asl 1
Name: coin-or-%{module}
-Group: Applications/Engineering
Summary: Interior Point OPTimizer
-Version: 3.12.10
-Release: 2%{?dist}
+Version: 3.12.11
+Release: 1%{?dist}
License: EPL and GPLv2+
URL: https://projects.coin-or.org/%{module}
Source0: http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz
-%ifarch %{openblas_arches}
BuildRequires: openblas-devel
BuildRequires: openblas-srpm-macros
-%else
-BuildRequires: blas-devel
-BuildRequires: lapack-devel
-BuildRequires: atlas-devel
-%endif
BuildRequires: gcc-gfortran, gcc-c++
BuildRequires: doxygen
BuildRequires: glpk-devel
@@ -102,8 +90,7 @@ corresponding components of g_L and g_U to the same value.
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: coin-or-CoinUtils-devel
+Requires: coin-or-CoinUtils-devel%{?_isa}
Requires: MUMPS-devel >= 4.10.0-21
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -133,7 +120,7 @@ BuildRequires: scalapack-openmpi-devel
BuildRequires: ptscotch-openmpi-devel
Requires: %{name}-common = %{version}-%{release}
-Requires: openmpi
+Requires: openmpi%{?_isa}
Requires: gcc-gfortran%{?_isa}
%description openmpi
%{name} libraries compiled against openmpi.
@@ -156,7 +143,7 @@ BuildRequires: scalapack-mpich-devel
BuildRequires: ptscotch-mpich-devel
Requires: %{name}-common = %{version}-%{release}
-Requires: mpich
+Requires: mpich%{?_isa}
Requires: gcc-gfortran%{?_isa}
%description mpich
%{name} libraries compiled against MPICH.
@@ -189,17 +176,10 @@ done
mkdir -p %{name}-%{version}-serial
cd %{name}-%{version}-serial
-%ifarch %{openblas_arches}
export LIBBLAS="-L%{_libdir} -lopenblas"
export INCBLAS=-I%{_includedir}/openblas
export LIBLAPACK=
export INCLAPACK=-I%{_includedir}
-%else
-export LIBBLAS="-L%{_libdir} -lblas"
-export INCBLAS=-I%{_includedir}
-export LIBLAPACK="-L%{_libdir} -llapack"
-export INCLAPACK=-I%{_includedir}/lapacke
-%endif
CFLAGS="%{optflags}"
OPT_CFLAGS="%{__global_ldflags} -Wl,-z,now"
@@ -274,17 +254,10 @@ export CC=$MPI_BIN/mpicc
export CXX=$MPI_BIN/mpic++
export F77=$MPI_BIN/mpif77
-%ifarch %{openblas_arches}
export LIBBLAS="-L%{_libdir} -lopenblas"
export INCBLAS=-I%{_includedir}/openblas
export LIBLAPACK=
export INCLAPACK=-I%{_includedir}
-%else
-export LIBBLAS="-L%{_libdir} -lblas"
-export INCBLAS=-I%{_includedir}
-export LIBLAPACK="-L%{_libdir} -llapack"
-export INCLAPACK=-I%{_includedir}/lapacke
-%endif
%dconfigure --with-mumps-incdir=$MPI_INCLUDE --with-mumps-lib="-L$MPI_LIB -ldmumps -lmumps_common" \
%if 0%{?with_asl}
@@ -341,17 +314,10 @@ export CC=$MPI_BIN/mpicc
export CXX=$MPI_BIN/mpic++
export F77=$MPI_BIN/mpifort
-%ifarch %{openblas_arches}
export LIBBLAS="-L%{_libdir} -lopenblas"
export INCBLAS=-I%{_includedir}/openblas
export LIBLAPACK=
export INCLAPACK=-I%{_includedir}
-%else
-export LIBBLAS="-L%{_libdir} -lblas"
-export INCBLAS=-I%{_includedir}
-export LIBLAPACK="-L%{_libdir} -llapack"
-export INCLAPACK=-I%{_includedir}/lapacke
-%endif
%dconfigure --with-mumps-incdir=$MPI_INCLUDE --with-mumps-lib="-L$MPI_LIB -ldmumps -lmumps_common -lmpich" \
%if 0%{?with_asl}
@@ -575,17 +541,16 @@ cd ..
%files mpich-devel
%{_libmpichdir}/*.so
%{_incmpichdir}/*
-
%endif
%files common
-%doc AUTHORS LICENSE
%license LICENSE
-%dir %{_docdir}/%{name}
-%{_docdir}/%{name}/html
-%{_docdir}/%{name}/*.pdf
+%{_docdir}/%{name}/
%changelog
+* Thu Nov 01 2018 Antonio Trande <sagitterATfedoraproject.org> - 3.12.11-1
+- Update to Ipopt-3.12.11
+
* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.12.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 71e5b91..c2dfde4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Ipopt-3.12.10.tgz) = 950571481918df6e7761ceaec1fb9c0aaccc6521817a5de0373576c3f07fa2191147b37c013a6eddd5d13b0871f601d4a02ea4d6d3bb9abefac5af22843bbf7d
+SHA512 (Ipopt-3.12.11.tgz) = 14ef770c5ac8a73591a7b1ee2fc547c439788f593f8560ec4dfeaf0d80487604c9ee7885541631f863d10cbddd90b2f69dc6f329d63aead26cb260f6d8003070
5 years, 6 months
Architecture specific change in rpms/golang-github-mattn-go-colorable.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-mattn-go-colorable.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/golang-github-mattn-go-colorable.....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit a96932eb39452daef128d5c66828cded8f92f1ca
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Fri Nov 2 18:59:31 2018 +0100
Bump to commit efa589957cd060542a26d2dd7832fd6a6c6c3ade
diff --git a/.gitignore b/.gitignore
index 0ed672c..f9fa1a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/go-colorable-ad5389d.tar.gz
+/go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz
diff --git a/golang-github-mattn-go-colorable.spec b/golang-github-mattn-go-colorable.spec
index a238e83..5351e3e 100644
--- a/golang-github-mattn-go-colorable.spec
+++ b/golang-github-mattn-go-colorable.spec
@@ -1,172 +1,58 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%global with_devel 1
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%global provider github
-%global provider_tld com
-%global project mattn
-%global repo go-colorable
# https://github.com/mattn/go-colorable
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20170816
+%global goipath github.com/mattn/go-colorable
+%global commit efa589957cd060542a26d2dd7832fd6a6c6c3ade
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.7.%{commitdate}git%{shortcommit}%{?dist}
-Summary: Common Functions in Go
-License: ASL 2.0
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}.tar.gz#/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+%gometa
+Name: golang-github-mattn-go-colorable
+Version: 0.0.9
+Release: 0.1%{?dist}
+Summary: Colorable writer for windows
+# Detected licences
+# - Expat License at 'LICENSE'
+License: MIT
+URL: %{gourl}
+Source0: %{gosource}
+BuildRequires: golang(github.com/mattn/go-isatty)
%description
%{summary}
-%if 0%{?with_devel}
+
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(github.com/mattn/go-isatty)
-%endif
-
-Requires: golang(github.com/mattn/go-isatty)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{provider_prefix}) = %{version}-%{release}
-
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary: Unit tests for %{name} package
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test-devel
-%{summary}
+%{goipath} prefix.
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
%prep
-%setup -q -n %{repo}-%{commit}
+%forgeautosetup
-%build
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go" \! -path "./_example/*") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." && "$dirprefix" != "" ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
-%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-%gotest %{import_path}
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
+%check
+%gochecks
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
-%doc README.md _example
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
%doc README.md
-%endif
+
%changelog
+* Fri Nov 02 2018 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0.0.9-0.1.20181102gitefa5899
+- Bump to commit efa589957cd060542a26d2dd7832fd6a6c6c3ade
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.7.20170816gitad5389d
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
@@ -186,3 +72,4 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
* Thu Apr 7 2016 Matthias Runge <mrunge(a)redhat.com> - 0.1git-9cbef7c
- initial package
+
diff --git a/sources b/sources
index 2657365..22eba6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (go-colorable-ad5389d.tar.gz) = 0f458e6acfec266b58cd458bd05bc04617df0ef223ffa6a6c374decd29555a78441f3a17df7b5f782d96a25f56bcece061407e9778e25ceafeedafa014a45bb4
+SHA512 (go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz) = fc274e5699b637e953b31e5014b759f0367d925c289f9eabd7538eaf916ec8a7613e3eaf6d8f9294869f54e943448cca21130daccf1717525aa123761026902e
5 years, 6 months
Architecture specific change in rpms/golang-github-mattn-go-colorable.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-mattn-go-colorable.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/golang-github-mattn-go-colorable.....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 0f08fec94cf5838c23622df2ce73ff718e7b0fd4
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Fri Nov 2 18:59:31 2018 +0100
Bump to commit efa589957cd060542a26d2dd7832fd6a6c6c3ade
diff --git a/.gitignore b/.gitignore
index 0ed672c..f9fa1a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/go-colorable-ad5389d.tar.gz
+/go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz
diff --git a/golang-github-mattn-go-colorable.spec b/golang-github-mattn-go-colorable.spec
index a238e83..5351e3e 100644
--- a/golang-github-mattn-go-colorable.spec
+++ b/golang-github-mattn-go-colorable.spec
@@ -1,172 +1,58 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%global with_devel 1
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%global provider github
-%global provider_tld com
-%global project mattn
-%global repo go-colorable
# https://github.com/mattn/go-colorable
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20170816
+%global goipath github.com/mattn/go-colorable
+%global commit efa589957cd060542a26d2dd7832fd6a6c6c3ade
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.7.%{commitdate}git%{shortcommit}%{?dist}
-Summary: Common Functions in Go
-License: ASL 2.0
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}.tar.gz#/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+%gometa
+Name: golang-github-mattn-go-colorable
+Version: 0.0.9
+Release: 0.1%{?dist}
+Summary: Colorable writer for windows
+# Detected licences
+# - Expat License at 'LICENSE'
+License: MIT
+URL: %{gourl}
+Source0: %{gosource}
+BuildRequires: golang(github.com/mattn/go-isatty)
%description
%{summary}
-%if 0%{?with_devel}
+
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(github.com/mattn/go-isatty)
-%endif
-
-Requires: golang(github.com/mattn/go-isatty)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{provider_prefix}) = %{version}-%{release}
-
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary: Unit tests for %{name} package
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test-devel
-%{summary}
+%{goipath} prefix.
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
%prep
-%setup -q -n %{repo}-%{commit}
+%forgeautosetup
-%build
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go" \! -path "./_example/*") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." && "$dirprefix" != "" ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
-%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-%gotest %{import_path}
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
+%check
+%gochecks
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
-%doc README.md _example
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
%doc README.md
-%endif
+
%changelog
+* Fri Nov 02 2018 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0.0.9-0.1.20181102gitefa5899
+- Bump to commit efa589957cd060542a26d2dd7832fd6a6c6c3ade
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.7.20170816gitad5389d
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
@@ -186,3 +72,4 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
* Thu Apr 7 2016 Matthias Runge <mrunge(a)redhat.com> - 0.1git-9cbef7c
- initial package
+
diff --git a/sources b/sources
index 2657365..22eba6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (go-colorable-ad5389d.tar.gz) = 0f458e6acfec266b58cd458bd05bc04617df0ef223ffa6a6c374decd29555a78441f3a17df7b5f782d96a25f56bcece061407e9778e25ceafeedafa014a45bb4
+SHA512 (go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz) = fc274e5699b637e953b31e5014b759f0367d925c289f9eabd7538eaf916ec8a7613e3eaf6d8f9294869f54e943448cca21130daccf1717525aa123761026902e
5 years, 6 months
Architecture specific change in rpms/openvswitch.git
by githook-noreply@fedoraproject.org
The package rpms/openvswitch.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/openvswitch.git/commit/?id=6603d5....
Change:
-ExclusiveArch: x86_64 aarch64 ppc64le s390x
Thanks.
Full change:
============
commit 6603d5c3215b0c7232484c5139df3d4d54d42fda
Author: Timothy Redaelli <tredaelli(a)redhat.com>
Date: Fri Nov 2 13:22:38 2018 +0100
Build for any architectures
diff --git a/openvswitch.spec b/openvswitch.spec
index 769d713..44c9a65 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -41,7 +41,7 @@ Name: openvswitch
Summary: Open vSwitch daemon/database/utilities
URL: http://www.openvswitch.org/
Version: 2.10.0
-Release: 1%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
+Release: 2%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
# Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the
# lib/sflow*.[ch] files are SISSL
@@ -49,7 +49,7 @@ Release: 1%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
License: ASL 2.0 and LGPLv2+ and SISSL
# NOTE: DPDK does not currently build for s390x
-%define dpdkarches x86_64 aarch64 ppc64le
+%define dpdkarches aarch64 i686 ppc64le x86_64
%if 0%{?commit0:1}
Source: https://github.com/openvswitch/ovs/archive/%{commit0}.tar.gz#/%{name}-%{s...
@@ -57,11 +57,6 @@ Source: https://github.com/openvswitch/ovs/archive/%{commit0}.tar.gz#/%{name}-%{
Source: http://openvswitch.org/releases/%{name}-%{version}.tar.gz
%endif
-# The DPDK is designed to optimize througput of network traffic using, among
-# other techniques, carefully crafted assembly instructions. As such it
-# needs extensive work to port it to other architectures.
-ExclusiveArch: x86_64 aarch64 ppc64le s390x
-
# ovs-patches
# OVS (including OVN) backports (0 - 300)
@@ -673,6 +668,9 @@ chown -R openvswitch:openvswitch /etc/openvswitch
%{_unitdir}/ovn-controller-vtep.service
%changelog
+* Fri Nov 02 2018 Timothy Redaelli <tredaelli(a)redhat.com> - 2.10.0-2
+- Build for any architectures
+
* Fri Oct 05 2018 Timothy Redaelli <tredaelli(a)redhat.com> - 2.10.0-1
- Align with "Fast Datapath" 2.10.0-10 (#1633555)
5 years, 6 months
Architecture specific change in rpms/psblas3.git
by githook-noreply@fedoraproject.org
The package rpms/psblas3.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/psblas3.git/commit/?id=857f56d741....
Change:
-%ifarch %{openblas_arches}
Thanks.
Full change:
============
commit 806c88622abc995ebae123c83a41c9c5e0943dc2
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Nov 2 15:47:40 2018 +0100
Enable MPI builds
diff --git a/psblas3.spec b/psblas3.spec
index 05a305e..8dc465b 100644
--- a/psblas3.spec
+++ b/psblas3.spec
@@ -1,5 +1,5 @@
-%global with_mpich 0
-%global with_openmpi 0
+%global with_mpich 1
+%global with_openmpi 1
%global with_serial 1
%global major_version 3
@@ -8,7 +8,7 @@
Name: psblas3
Summary: Parallel Sparse Basic Linear Algebra Subroutines
Version: %{major_version}.5.2
-Release: 4%{?dist}
+Release: 5%{?dist}
License: BSD
URL: https://github.com/sfilippone/psblas3
Source0: https://github.com/sfilippone/psblas3/archive/V%{version}-%{postrelease_v...
@@ -403,6 +403,9 @@ popd
######################################################
%changelog
+* Fri Nov 02 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 3.5.2-5
+- Enable MPI builds
+
* Fri Nov 02 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 3.5.2-4
- Update to release 3.5.2-2
commit 857f56d7416ac4271b6eb302358207859b447b1f
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Nov 2 15:06:21 2018 +0100
Update to release 3.5.2-2
diff --git a/.gitignore b/.gitignore
index 350fefe..d0825d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/psblas3-3.5.0-3.tar.gz
/psblas3-3.5.1.tar.gz
/psblas3-3.5.2.tar.gz
+/psblas3-3.5.2-2.tar.gz
diff --git a/psblas3-fix_bug9.patch b/psblas3-fix_bug9.patch
deleted file mode 100644
index 130e75c..0000000
--- a/psblas3-fix_bug9.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 1a5ee8c46a4a332fce997522560d7b9f6dbde547 Mon Sep 17 00:00:00 2001
-From: Salvatore Filippone <salvatore.filippone(a)cranfield.ac.uk>
-Date: Thu, 13 Sep 2018 14:21:52 +0100
-Subject: [PATCH] Fix bounds computation in set_vect. Bug report by Alexandre
- Silva Lopes
-
----
- base/modules/serial/psb_c_base_vect_mod.f90 | 5 +++--
- base/modules/serial/psb_d_base_vect_mod.f90 | 5 +++--
- base/modules/serial/psb_i_base_vect_mod.f90 | 5 +++--
- base/modules/serial/psb_s_base_vect_mod.f90 | 5 +++--
- base/modules/serial/psb_z_base_vect_mod.f90 | 5 +++--
- 5 files changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/base/modules/serial/psb_c_base_vect_mod.f90 b/base/modules/serial/psb_c_base_vect_mod.f90
-index 6fa0bc70..54635a6d 100644
---- a/base/modules/serial/psb_c_base_vect_mod.f90
-+++ b/base/modules/serial/psb_c_base_vect_mod.f90
-@@ -749,9 +749,10 @@ subroutine c_base_set_vect(x,val,first,last)
-
- integer(psb_ipk_) :: info, first_, last_, nr
-
-- first_=1
-- last_=min(psb_size(x%v),size(val))
-+
-+ first_ = 1
- if (present(first)) first_ = max(1,first)
-+ last_ = min(psb_size(x%v),first_+size(val)-1)
- if (present(last)) last_ = min(last,last_)
-
- if (allocated(x%v)) then
-diff --git a/base/modules/serial/psb_d_base_vect_mod.f90 b/base/modules/serial/psb_d_base_vect_mod.f90
-index 36e95142..3ec2356a 100644
---- a/base/modules/serial/psb_d_base_vect_mod.f90
-+++ b/base/modules/serial/psb_d_base_vect_mod.f90
-@@ -749,9 +749,10 @@ subroutine d_base_set_vect(x,val,first,last)
-
- integer(psb_ipk_) :: info, first_, last_, nr
-
-- first_=1
-- last_=min(psb_size(x%v),size(val))
-+
-+ first_ = 1
- if (present(first)) first_ = max(1,first)
-+ last_ = min(psb_size(x%v),first_+size(val)-1)
- if (present(last)) last_ = min(last,last_)
-
- if (allocated(x%v)) then
-diff --git a/base/modules/serial/psb_i_base_vect_mod.f90 b/base/modules/serial/psb_i_base_vect_mod.f90
-index 4cc592ac..cdbe91e5 100644
---- a/base/modules/serial/psb_i_base_vect_mod.f90
-+++ b/base/modules/serial/psb_i_base_vect_mod.f90
-@@ -718,9 +718,10 @@ subroutine i_base_set_vect(x,val,first,last)
-
- integer(psb_ipk_) :: info, first_, last_, nr
-
-- first_=1
-- last_=min(psb_size(x%v),size(val))
-+
-+ first_ = 1
- if (present(first)) first_ = max(1,first)
-+ last_ = min(psb_size(x%v),first_+size(val)-1)
- if (present(last)) last_ = min(last,last_)
-
- if (allocated(x%v)) then
-diff --git a/base/modules/serial/psb_s_base_vect_mod.f90 b/base/modules/serial/psb_s_base_vect_mod.f90
-index 9ee77ea6..97c7c11e 100644
---- a/base/modules/serial/psb_s_base_vect_mod.f90
-+++ b/base/modules/serial/psb_s_base_vect_mod.f90
-@@ -749,9 +749,10 @@ subroutine s_base_set_vect(x,val,first,last)
-
- integer(psb_ipk_) :: info, first_, last_, nr
-
-- first_=1
-- last_=min(psb_size(x%v),size(val))
-+
-+ first_ = 1
- if (present(first)) first_ = max(1,first)
-+ last_ = min(psb_size(x%v),first_+size(val)-1)
- if (present(last)) last_ = min(last,last_)
-
- if (allocated(x%v)) then
-diff --git a/base/modules/serial/psb_z_base_vect_mod.f90 b/base/modules/serial/psb_z_base_vect_mod.f90
-index 0960624a..8c1b6baf 100644
---- a/base/modules/serial/psb_z_base_vect_mod.f90
-+++ b/base/modules/serial/psb_z_base_vect_mod.f90
-@@ -749,9 +749,10 @@ subroutine z_base_set_vect(x,val,first,last)
-
- integer(psb_ipk_) :: info, first_, last_, nr
-
-- first_=1
-- last_=min(psb_size(x%v),size(val))
-+
-+ first_ = 1
- if (present(first)) first_ = max(1,first)
-+ last_ = min(psb_size(x%v),first_+size(val)-1)
- if (present(last)) last_ = min(last,last_)
-
- if (allocated(x%v)) then
diff --git a/psblas3.spec b/psblas3.spec
index 06dfb7e..05a305e 100644
--- a/psblas3.spec
+++ b/psblas3.spec
@@ -1,36 +1,23 @@
-%global with_mpich 1
-%global with_openmpi 1
+%global with_mpich 0
+%global with_openmpi 0
%global with_serial 1
-# openblas available on these architectures.
-%if 0%{?rhel}
-%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
-%endif
-
%global major_version 3
-#%%global postrelease_version
+%global postrelease_version 2
-Name: psblas3
+Name: psblas3
Summary: Parallel Sparse Basic Linear Algebra Subroutines
Version: %{major_version}.5.2
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD
-URL: https://github.com/sfilippone/psblas3
-Source0: https://github.com/sfilippone/psblas3/archive/v%{version}.tar.gz#/psblas3...
+URL: https://github.com/sfilippone/psblas3
+Source0: https://github.com/sfilippone/psblas3/archive/V%{version}-%{postrelease_v...
# Call default Fedora ldflags when linker creates links
-Patch0: %{name}-fix_ldflags.patch
-
-# https://github.com/sfilippone/psblas3/issues/9
-Patch1: %{name}-fix_bug9.patch
+Patch0: %{name}-fix_ldflags.patch
BuildRequires: suitesparse-devel
-%ifarch %{openblas_arches}
BuildRequires: openblas-devel, openblas-srpm-macros
-%else
-BuildRequires: blas-devel
-BuildRequires: lapack-devel
-%endif
BuildRequires: metis-devel
%description
@@ -142,26 +129,25 @@ Shared links, header files and static libraries for MPICH %{name}.
##########################################################
%prep
-%setup -qc -n psblas3-%{version}
+%setup -qc -n psblas3-%{version}-%{postrelease_version}
-pushd psblas3-%{version}
+pushd psblas3-%{version}-%{postrelease_version}
%patch0 -p0
-%patch1 -p1
popd
#######################################################
## Copy source for MPI versions
%if 0%{?with_openmpi}
-cp -a psblas3-%{version} openmpi-build
+cp -a psblas3-%{version}-%{postrelease_version} openmpi-build
%endif
%if 0%{?with_mpich}
-cp -a psblas3-%{version} mpich-build
+cp -a psblas3-%{version}-%{postrelease_version} mpich-build
%endif
######################################################
%build
%if 0%{?with_serial}
-cd psblas3-%{version}
+cd psblas3-%{version}-%{postrelease_version}
%ifarch %{openblas_arches}
export LIBBLAS=-lopenblas
@@ -171,9 +157,10 @@ export LIBBLAS=-lblas
export LIBLAPACK=-llapack
export INCBLAS=-I%{_includedir}
%endif
-%configure --enable-serial --with-fcopt="%{optflags} -Wno-unused-variable -fPIC -I%{_fmoddir} $INCBLAS" --with-ccopt="%{optflags} -fPIC $INCBLAS" \
- --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \
- --with-amdincdir=%{_includedir}/suitesparse
+%configure \
+ --enable-serial --with-fcopt="%{optflags} -Wno-unused-variable -fPIC -I%{_fmoddir} $INCBLAS" --with-ccopt="%{optflags} -fPIC $INCBLAS" \
+ --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \
+ --with-amdincdir=%{_includedir}/suitesparse
%make_build
# Make shared libraries
@@ -205,11 +192,12 @@ export LIBBLAS=-lblas
export LIBLAPACK=-llapack
export INCBLAS=-I%{_includedir}
%endif
-%configure --with-fcopt="%{optflags} -fPIC -I%{_fmoddir} $INCBLAS" \
- --with-ccopt="%{optflags} -fPIC $INCBLAS" \
- FC=mpifort F77=mpif77 F90=mpif90 MPIFC=mpifort MPIF77=mpif77 MPCC=mpicc \
- --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \
- --with-amdincdir=%{_includedir}/suitesparse
+%configure \
+ --with-fcopt="%{optflags} -fPIC -I%{_fmoddir} $INCBLAS" \
+ --with-ccopt="%{optflags} -fPIC $INCBLAS" \
+ FC=mpifort F77=mpif77 F90=mpif90 MPIFC=mpifort MPIF77=mpif77 MPCC=mpicc \
+ --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \
+ --with-amdincdir=%{_includedir}/suitesparse
%make_build
# Make shared libraries
@@ -239,11 +227,12 @@ export LIBBLAS=-lblas
export LIBLAPACK=-llapack
export INCBLAS=-I%{_includedir}
%endif
-%configure --with-fcopt="%{optflags} -fPIC -I%{_fmoddir} $INCBLAS" \
- --with-ccopt="%{optflags} -fPIC $INCBLAS" \
- FC=mpif77 F77=mpif77 F90=mpif90 MPIFC=mpif77 MPIF77=mpif77 MPCC=mpicc \
- --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \
- --with-amdincdir=%{_includedir}/suitesparse
+%configure \
+ --with-fcopt="%{optflags} -fPIC -I%{_fmoddir} $INCBLAS" \
+ --with-ccopt="%{optflags} -fPIC $INCBLAS" \
+ FC=mpif77 F77=mpif77 F90=mpif90 MPIFC=mpif77 MPIF77=mpif77 MPCC=mpicc \
+ --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \
+ --with-amdincdir=%{_includedir}/suitesparse
%make_build
# Make shared libraries
@@ -274,7 +263,7 @@ popd
%install
%if 0%{?with_serial}
-pushd psblas3-%{version}
+pushd psblas3-%{version}-%{postrelease_version}
mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_fmoddir}/%{name}
@@ -375,10 +364,10 @@ popd
%endif
%files common
-%doc psblas3-%{version}/README.md psblas3-%{version}/Changelog
-%doc psblas3-%{version}/ReleaseNews
-%doc psblas3-%{version}/docs/html psblas3-%{version}/docs/*.pdf
-%license psblas3-%{version}/LICENSE
+%doc psblas3-%{version}-%{postrelease_version}/README.md psblas3-%{version}-%{postrelease_version}/Changelog
+%doc psblas3-%{version}-%{postrelease_version}/ReleaseNews
+%doc psblas3-%{version}-%{postrelease_version}/docs/html psblas3-%{version}-%{postrelease_version}/docs/*.pdf
+%license psblas3-%{version}-%{postrelease_version}/LICENSE
#######################################################
## MPI versions
@@ -414,6 +403,9 @@ popd
######################################################
%changelog
+* Fri Nov 02 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 3.5.2-4
+- Update to release 3.5.2-2
+
* Fri Sep 14 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 3.5.2-3
- Fix upstream bug #9 (rhbz #1628858)
diff --git a/sources b/sources
index 53eb403..47bd4d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (psblas3-3.5.2.tar.gz) = 0b25252a1f089d6d14dc0629dc217b68eb1098cf6a413deab4f590e05b340df6e65462be5333828a628cbae3560d6475fef07b2290bb9bb15f1bdc10ee658e22
+SHA512 (psblas3-3.5.2-2.tar.gz) = b3784193ad393062cf04e35e82a4fe3b46bfe64b25577d67679110f022c55a5fb8157c82d71d5cf38bec530b32472e4e4838ba954b92bd356fd9fc51bd974cd8
5 years, 6 months
Architecture specific change in rpms/python2-faulthandler.git
by githook-noreply@fedoraproject.org
The package rpms/python2-faulthandler.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/python2-faulthandler.git/commit/?....
Change:
-%ifarch i686
Thanks.
Full change:
============
commit e8da9cb6c4640d37e230601f9a749d83600fd111
Author: Lumir Balhar <lbalhar(a)redhat.com>
Date: Fri Nov 2 15:44:03 2018 +0100
No Python 2 in Fedora 30+
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f5dd562..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/faulthandler-2.4.tar.gz
-/faulthandler-3.0.tar.gz
-/python-thread-name-in-tests.patch
-/faulthandler-3.1.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..6e559cf
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+No Python 2 in Fedora 30+
diff --git a/python2-faulthandler.spec b/python2-faulthandler.spec
deleted file mode 100644
index 01bcbbb..0000000
--- a/python2-faulthandler.spec
+++ /dev/null
@@ -1,83 +0,0 @@
-%global srcname faulthandler
-
-Name: python2-%{srcname}
-Version: 3.1
-Release: 2%{?dist}
-Summary: Display the Python traceback on a crash
-
-License: MIT
-URL: https://pypi.python.org/pypi/%{srcname}
-Source0: https://files.pythonhosted.org/packages/source/f/%{srcname}/%{srcname}-%{...
-
-BuildRequires: gcc
-BuildRequires: python2-devel
-BuildRequires: python2-setuptools
-BuildRequires: python2-nose
-
-%description
-Fault handler for SIGSEGV, SIGFPE, SIGABRT, SIGBUS and SIGILL signals:
-display the Python traceback and restore the previous handler.
-Allocate an alternate stack for this handler, if sigaltstack() is available,
-to be able to allocate memory on the stack, even on stack overflow.
-
-%prep
-%autosetup -p1 -n %{srcname}-%{version}
-
-%build
-%py2_build
-
-%install
-%py2_install
-
-%check
-# Create sitecustomize.py to process .pth files in non-standard site dir
-echo -e "import site\nsite.addsitedir(\"%{buildroot}%{python2_sitearch}\")" > %{buildroot}%{python2_sitearch}/sitecustomize.py
-
-# On i686 we can run all tests
-%ifarch i686
-PYTHONPATH=%{buildroot}%{python2_sitearch} nosetests-%{python2_version}
-%else
-# On other archs we need to skip one test
-PYTHONPATH=%{buildroot}%{python2_sitearch} nosetests-%{python2_version} --exclude=test_stack_overflow
-%endif
-# Remove sitecustomize.py after tests
-rm %{buildroot}%{python2_sitearch}/sitecustomize.py*
-
-%files
-%doc README.rst AUTHORS TODO
-%license COPYING
-%{python2_sitearch}/%{srcname}.so
-%{python2_sitearch}/%{srcname}.pth
-%{python2_sitearch}/%{srcname}-%{version}-py%{python2_version}.egg-info/
-
-%changelog
-* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Apr 24 2018 Lumr Balhar <lbalhar(a)redhat.com> - 3.1-1
-- New upstream version
-- Removed downstream patch (merged to upstream)
-- Fixed changelog
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Sep 20 2017 Lumr Balhar <lbalhar(a)redhat.com> - 3.0-2
-- New patch from upstream source (issue #32)
-- New approach how to process .pth file in non-standard site directory
-
-* Sun Sep 17 2017 Lumr Balhar <lbalhar(a)redhat.com> - 3.0-1
-- New upstream version
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Aug 29 2016 Dominika Krejci <dkrejci(a)redhat.com> - 2.4-1
-- Inital release
-
diff --git a/sources b/sources
deleted file mode 100644
index 958da94..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (faulthandler-3.1.tar.gz) = fb133e7c1a8e2c611d9bcfa4d4b6ade92fb638ac60d12701d6bf5320f6a616e3e1b5f3b543f3e3c62f71e26167e2bdd17dfb4741bf758b7052286e5bc19faa59
5 years, 6 months
Architecture specific change in rpms/java-openjdk.git
by githook-noreply@fedoraproject.org
The package rpms/java-openjdk.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-openjdk.git/commit/?id=040ad....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit 040add593ca24b4b4b7ded75cafdbca2b6277af8
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Fri Nov 2 15:22:59 2018 +0100
Updated to jdk11
diff --git a/.gitignore b/.gitignore
index 554b078..1fdaa39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
*.rpm
-/systemtap-tapset-3.6.0pre02.tar.xz
-/jdk-jdk10-jdk-10+46.tar.xz
-/jdk-updates-jdk10u-jdk-10.0.1+10.tar.xz
-/jdk-updates-jdk10u-jdk-10.0.2+13.tar.xz
+/systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
+/shenandoah-jdk11-b516c8c7a0a4.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11+22.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11+28.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.1+13.tar.xz
diff --git a/JDK-8201495-s390-java-opts.patch b/JDK-8201495-s390-java-opts.patch
deleted file mode 100644
index a16db0c..0000000
--- a/JDK-8201495-s390-java-opts.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1523874036 -7200
-# Mon Apr 16 12:20:36 2018 +0200
-# Node ID fc3a72e286e0d5bf9b994d1b778b39f3b080c686
-# Parent 69bae761600bdbc97953500ac51a396d31f54ee9
-8201495: [Zero] Reduce limits of max heap size for boot JDK on s390
-Reviewed-by: ihse, aph, simonis
-
-diff --git a/make/autoconf/boot-jdk.m4 b/make/autoconf/boot-jdk.m4
---- a/make/autoconf/boot-jdk.m4
-+++ b/make/autoconf/boot-jdk.m4
-@@ -405,7 +405,7 @@
- BOOTCYCLE_JVM_ARGS_BIG=-Xms64M
-
- # Maximum amount of heap memory and stack size.
-- JVM_HEAP_LIMIT_32="1024"
-+ JVM_HEAP_LIMIT_32="768"
- # Running a 64 bit JVM allows for and requires a bigger heap
- JVM_HEAP_LIMIT_64="1600"
- STACK_SIZE_32=768
diff --git a/JDK-8202262-libjsig.so-extra-link-flags.patch b/JDK-8202262-libjsig.so-extra-link-flags.patch
deleted file mode 100644
index 1e2b60c..0000000
--- a/JDK-8202262-libjsig.so-extra-link-flags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1524663215 -7200
-# Wed Apr 25 15:33:35 2018 +0200
-# Node ID c000e94e3d789bcb30d18541a3be33856bb3fe17
-# Parent a29fc1f5b37d344c771f83f528dcd223ad240e6c
-8202262: libjsig.so not linked with extra linker flags from configure
-Reviewed-by: duke
-
-diff --git a/make/hotspot/lib/CompileLibjsig.gmk b/make/hotspot/lib/CompileLibjsig.gmk
---- a/make/hotspot/lib/CompileLibjsig.gmk
-+++ b/make/hotspot/lib/CompileLibjsig.gmk
-@@ -36,7 +36,7 @@
- ifeq ($(STATIC_BUILD), false)
- ifeq ($(OPENJDK_TARGET_OS), linux)
- LIBJSIG_CFLAGS := -fPIC -D_GNU_SOURCE -D_REENTRANT $(EXTRA_CFLAGS)
-- LIBJSIG_LDFLAGS := $(LDFLAGS_HASH_STYLE) ${LDFLAGS_NO_EXEC_STACK} $(EXTRA_CFLAGS)
-+ LIBJSIG_LDFLAGS := $(LDFLAGS_HASH_STYLE) ${LDFLAGS_NO_EXEC_STACK} $(EXTRA_LDFLAGS)
- LIBJSIG_LIBS := $(LIBDL)
-
- # NOTE: The old build compiled this library without -soname.
diff --git a/JDK-8210416-RHBZ-1632174-fdlibm-opt-fix.patch b/JDK-8210416-RHBZ-1632174-fdlibm-opt-fix.patch
new file mode 100644
index 0000000..85428db
--- /dev/null
+++ b/JDK-8210416-RHBZ-1632174-fdlibm-opt-fix.patch
@@ -0,0 +1,84 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1536142767 -7200
+# Wed Sep 05 12:19:27 2018 +0200
+# Node ID 7ea57274e55054579d1532e757edb21e67beed83
+# Parent 3ee91722550680c18b977f0e00b1013323b5c9ef
+8210416: [linux] Poor StrictMath performance due to non-optimized compilation
+Summary: Compile fdlibm with -O2 -ffp-contract=off on gcc/clang arches.
+Reviewed-by: aph, erikj, dholmes, darcy
+
+diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
+--- a/make/autoconf/flags-cflags.m4
++++ b/make/autoconf/flags-cflags.m4
+@@ -373,6 +373,18 @@
+
+ FLAGS_SETUP_CFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])
+
++ COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off"
++ # Check that the compiler supports -ffp-contract=off flag
++ # Set FDLIBM_CFLAGS to -ffp-contract=off if it does. Empty
++ # otherwise.
++ # These flags are required for GCC-based builds of
++ # fdlibm with optimization without losing precision.
++ # Notably, -ffp-contract=off needs to be added for GCC >= 4.6.
++ FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${COMPILER_FP_CONTRACT_OFF_FLAG}],
++ IF_TRUE: [FDLIBM_CFLAGS=${COMPILER_FP_CONTRACT_OFF_FLAG}],
++ IF_FALSE: [FDLIBM_CFLAGS=""])
++ AC_SUBST(FDLIBM_CFLAGS)
++
+ # Tests are only ever compiled for TARGET
+ CFLAGS_TESTLIB="$CFLAGS_JDKLIB"
+ CXXFLAGS_TESTLIB="$CXXFLAGS_JDKLIB"
+diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
+--- a/make/autoconf/spec.gmk.in
++++ b/make/autoconf/spec.gmk.in
+@@ -450,6 +450,7 @@
+ LIBJSIG_HASHSTYLE_LDFLAGS := @LIBJSIG_HASHSTYLE_LDFLAGS@
+ LIBJSIG_NOEXECSTACK_LDFLAGS := @LIBJSIG_NOEXECSTACK_LDFLAGS@
+
++FDLIBM_CFLAGS := @FDLIBM_CFLAGS@
+ JVM_CFLAGS := @JVM_CFLAGS@
+ JVM_LDFLAGS := @JVM_LDFLAGS@
+ JVM_ASFLAGS := @JVM_ASFLAGS@
+diff --git a/make/lib/CoreLibraries.gmk b/make/lib/CoreLibraries.gmk
+--- a/make/lib/CoreLibraries.gmk
++++ b/make/lib/CoreLibraries.gmk
+@@ -39,20 +39,15 @@
+ BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+ endif
+
+-ifeq ($(OPENJDK_TARGET_OS), linux)
+- ifeq ($(OPENJDK_TARGET_CPU), ppc64)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- else ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- else ifeq ($(OPENJDK_TARGET_CPU), s390x)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- else ifeq ($(OPENJDK_TARGET_CPU), aarch64)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- endif
++# If FDLIBM_CFLAGS is non-empty we know that we can optimize
++# fdlibm by adding those extra C flags. Currently GCC,
++# and clang only.
++ifneq ($(FDLIBM_CFLAGS), )
++ BUILD_LIBFDLIBM_OPTIMIZATION := LOW
+ endif
+
+ LIBFDLIBM_SRC := $(TOPDIR)/src/java.base/share/native/libfdlibm
+-LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC)
++LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC) $(FDLIBM_CFLAGS)
+
+ ifneq ($(OPENJDK_TARGET_OS), macosx)
+ $(eval $(call SetupNativeCompilation, BUILD_LIBFDLIBM, \
+@@ -64,10 +59,6 @@
+ CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \
+ CFLAGS_windows_debug := -DLOGGING, \
+ CFLAGS_aix := -qfloat=nomaf, \
+- CFLAGS_linux_ppc64 := -ffp-contract=off, \
+- CFLAGS_linux_ppc64le := -ffp-contract=off, \
+- CFLAGS_linux_s390x := -ffp-contract=off, \
+- CFLAGS_linux_aarch64 := -ffp-contract=off, \
+ DISABLED_WARNINGS_gcc := sign-compare misleading-indentation, \
+ DISABLED_WARNINGS_microsoft := 4146 4244 4018, \
+ ARFLAGS := $(ARFLAGS), \
diff --git a/JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch b/JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch
new file mode 100644
index 0000000..843ae3c
--- /dev/null
+++ b/JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch
@@ -0,0 +1,48 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1536682731 -7200
+# Tue Sep 11 18:18:51 2018 +0200
+# Node ID 7157249fdd4366d95dd68f3d083ebb0ef84c753b
+# Parent 8d86b149e10f0a0896e5fd4d8d407e5fda64a529
+8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
+Reviewed-by: duke
+
+diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
+--- a/make/hotspot/lib/JvmOverrideFiles.gmk
++++ b/make/hotspot/lib/JvmOverrideFiles.gmk
+@@ -43,20 +43,26 @@ ifeq ($(TOOLCHAIN_TYPE), gcc)
+ endif
+ endif
+
++LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NONE)
++# If the FDLIBM_CFLAGS variable is non-empty we know
++# that the fdlibm-fork in hotspot can get optimized
++# by using -ffp-contract=off on GCC/Clang platforms.
++ifneq ($(FDLIBM_CFLAGS), )
++ LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NORM)
++endif
++
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+ BUILD_LIBJVM_ostream.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
+ BUILD_LIBJVM_logFileOutput.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
+
+- ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
+- BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(CXX_O_FLAG_NONE)
+- BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := -DNO_PCH $(CXX_O_FLAG_NONE)
++ BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
++ BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
+
+- ifeq ($(TOOLCHAIN_TYPE), clang)
+- JVM_PRECOMPILED_HEADER_EXCLUDE := \
+- sharedRuntimeTrig.cpp \
+- sharedRuntimeTrans.cpp \
+- #
+- endif
++ ifeq ($(TOOLCHAIN_TYPE), clang)
++ JVM_PRECOMPILED_HEADER_EXCLUDE := \
++ sharedRuntimeTrig.cpp \
++ sharedRuntimeTrans.cpp \
++ #
+ endif
+
+ ifeq ($(OPENJDK_TARGET_CPU), x86)
diff --git a/JDK-8210647-RHBZ-1632174-libsaproc-opt-fix.patch b/JDK-8210647-RHBZ-1632174-libsaproc-opt-fix.patch
new file mode 100644
index 0000000..a279f8a
--- /dev/null
+++ b/JDK-8210647-RHBZ-1632174-libsaproc-opt-fix.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1536751862 -7200
+# Wed Sep 12 13:31:02 2018 +0200
+# Node ID f95c6746fe256fe0456e0ea0d2930631ef840286
+# Parent 7157249fdd4366d95dd68f3d083ebb0ef84c753b
+8210647: libsaproc is being compiled without optimization
+Reviewed-by: duke
+
+diff --git a/make/lib/Lib-jdk.hotspot.agent.gmk b/make/lib/Lib-jdk.hotspot.agent.gmk
+--- a/make/lib/Lib-jdk.hotspot.agent.gmk
++++ b/make/lib/Lib-jdk.hotspot.agent.gmk
+@@ -52,7 +52,7 @@
+
+ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
+ NAME := saproc, \
+- OPTIMIZATION := NONE, \
++ OPTIMIZATION := LOW, \
+ DISABLED_WARNINGS_microsoft := 4267, \
+ DISABLED_WARNINGS_gcc := sign-compare, \
+ DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \
diff --git a/JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch b/JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch
new file mode 100644
index 0000000..6fc6c07
--- /dev/null
+++ b/JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1536829660 -7200
+# Thu Sep 13 11:07:40 2018 +0200
+# Node ID 39ccca116f79139fc4b779f5df83cb32357b9ae9
+# Parent 7512bd28304cf0dc5676247990f1907162c719ca
+8210703: vmStructs.cpp compiled with -O0
+Reviewed-by: duke
+
+diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
+--- a/make/hotspot/lib/JvmOverrideFiles.gmk
++++ b/make/hotspot/lib/JvmOverrideFiles.gmk
+@@ -30,7 +30,7 @@
+ # status for individual files on specific platforms.
+
+ ifeq ($(TOOLCHAIN_TYPE), gcc)
+- BUILD_LIBJVM_vmStructs.cpp_CXXFLAGS := -fno-var-tracking-assignments -O0
++ BUILD_LIBJVM_vmStructs.cpp_CXXFLAGS := -fno-var-tracking-assignments
+ BUILD_LIBJVM_jvmciCompilerToVM.cpp_CXXFLAGS := -fno-var-tracking-assignments
+ BUILD_LIBJVM_jvmciCompilerToVMInit.cpp_CXXFLAGS := -fno-var-tracking-assignments
+ BUILD_LIBJVM_assembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
diff --git a/JDK-8210761-RHBZ-1632174-libjsig-opt-fix.patch b/JDK-8210761-RHBZ-1632174-libjsig-opt-fix.patch
new file mode 100644
index 0000000..b5a88b0
--- /dev/null
+++ b/JDK-8210761-RHBZ-1632174-libjsig-opt-fix.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1537541916 -7200
+# Fri Sep 21 16:58:36 2018 +0200
+# Node ID cd8483acfe56ade257685d93323f78e6e13704a0
+# Parent e40fa3a70efdbc22f85c0d30350189f632779831
+8210761: libjsig is being compiled without optimization
+Reviewed-by: duke
+
+diff --git a/make/lib/Lib-java.base.gmk b/make/lib/Lib-java.base.gmk
+--- a/make/lib/Lib-java.base.gmk
++++ b/make/lib/Lib-java.base.gmk
+@@ -138,6 +138,7 @@
+
+ $(eval $(call SetupJdkLibrary, BUILD_LIBJSIG, \
+ NAME := jsig, \
++ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(LIBJSIG_CFLAGS), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
diff --git a/JDK-8211105-aarch64-log-sin-intrinsics-disable.patch b/JDK-8211105-aarch64-log-sin-intrinsics-disable.patch
new file mode 100644
index 0000000..734ee89
--- /dev/null
+++ b/JDK-8211105-aarch64-log-sin-intrinsics-disable.patch
@@ -0,0 +1,35 @@
+# HG changeset patch
+# User adinn
+# Date 1537977709 -3600
+# Wed Sep 26 17:01:49 2018 +0100
+# Node ID 18426968f11cd0c3b238dec365003798d07576fc
+# Parent 0abe9de66ea9e1371bf35a2394daf31d8bfada98
+8211105: AArch64: Disable cos/sin and log intrinsics in jdk11u pending fix
+Summary: AArch64 cos/sin and log intrinsics are currently broken so should be disabled
+Reviewed-by: aph, shade
+
+diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
++++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+@@ -5741,15 +5741,18 @@
+ }
+
+ if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dlog)) {
+- StubRoutines::_dlog = generate_dlog();
++ // disabled pending fix and retest of generated code via JDK-8210858
++ // StubRoutines::_dlog = generate_dlog();
+ }
+
+ if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin)) {
+- StubRoutines::_dsin = generate_dsin_dcos(/* isCos = */ false);
++ // disabled pending fix and retest of generated code via JDK-8210461
++ // StubRoutines::_dsin = generate_dsin_dcos(/* isCos = */ false);
+ }
+
+ if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos)) {
+- StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true);
++ // disabled pending fix and retest of generated code via JDK-8210461
++ // StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true);
+ }
+ }
+
diff --git a/README.md b/README.md
index e3ebf0c..c21900a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
Rolling release of (usually) STSs OpenJDK
OpenJDK have release cadence of 6 months. but 3/4 of them are Short Term Supported for 6 months only. This package is designed to harbore them. Currently it is build on openJDK 10. LTSs (next is 11) will go as separate packages.
-JDK10 is next major release of Java platform. It is bringing many cool improvements - http://openjdk.java.net/projects/jdk/10/ and is landing to your Fedora. Where it will be maintained for f27 and newer. Unluckily, it is STS (short term support) version. Between individual LTS will be always several STS. Again, please See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html and See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf . So this is rolling release of all STSs to come. Its fate during the release of fresh LTS is yet to be decided. You will always be allowed to install Used LTS in fedora build root, alongside with latest STS via alternatives.
+JDK11 is last release of Java platform. It is bringing many cool improvements - http://openjdk.java.net/projects/jdk/11/ and is landing to your Fedora. Where it will be maintained for f27 and newer. Unluckily, this package is STS (short term support) version. Between individual LTS will be always several STS. Again, please See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html and See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf . So this is rolling release of all STSs to come. Its fate during the release of fresh LTS is yet to be decided. You will always be allowed to install Used LTS in fedora build root, alongside with latest STS via alternatives.
See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html
@@ -9,3 +9,4 @@ See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaRe
https://bugzilla.redhat.com/show_bug.cgi?id=1557371#c0
https://fedoraproject.org/wiki/Changes/java-openjdk-10
+https://fedoraproject.org/wiki/Changes/java-11-openjdk-TechPreview
diff --git a/RHBZ-1565658-system-nss-SunEC.patch b/RHBZ-1565658-system-nss-SunEC.patch
index 7b1d4aa..42ce7cd 100644
--- a/RHBZ-1565658-system-nss-SunEC.patch
+++ b/RHBZ-1565658-system-nss-SunEC.patch
@@ -1,7 +1,7 @@
-diff --git openjdk/make/autoconf/jdk-options.m4 openjdk/make/autoconf/jdk-options.m4
---- openjdk/make/autoconf/jdk-options.m4
-+++ openjdk/make/autoconf/jdk-options.m4
-@@ -264,9 +264,10 @@
+diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
+--- a/make/autoconf/jdk-options.m4
++++ b/make/autoconf/jdk-options.m4
+@@ -267,9 +267,10 @@
#
AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
[
@@ -13,10 +13,10 @@ diff --git openjdk/make/autoconf/jdk-options.m4 openjdk/make/autoconf/jdk-option
ENABLE_INTREE_EC=true
AC_MSG_RESULT([yes])
else
-diff --git openjdk/make/autoconf/libraries.m4 openjdk/make/autoconf/libraries.m4
---- openjdk/make/autoconf/libraries.m4
-+++ openjdk/make/autoconf/libraries.m4
-@@ -175,6 +175,48 @@
+diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
+--- a/make/autoconf/libraries.m4
++++ b/make/autoconf/libraries.m4
+@@ -178,6 +178,48 @@
AC_SUBST(LIBDL)
LIBS="$save_LIBS"
@@ -65,10 +65,10 @@ diff --git openjdk/make/autoconf/libraries.m4 openjdk/make/autoconf/libraries.m4
# Deprecated libraries, keep the flags for backwards compatibility
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
BASIC_DEPRECATED_ARG_WITH([dxsdk])
-diff --git openjdk/make/autoconf/spec.gmk.in openjdk/make/autoconf/spec.gmk.in
---- openjdk/make/autoconf/spec.gmk.in
-+++ openjdk/make/autoconf/spec.gmk.in
-@@ -764,6 +764,10 @@
+diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
+--- a/make/autoconf/spec.gmk.in
++++ b/make/autoconf/spec.gmk.in
+@@ -795,6 +795,10 @@
# Libraries
#
@@ -79,50 +79,38 @@ diff --git openjdk/make/autoconf/spec.gmk.in openjdk/make/autoconf/spec.gmk.in
USE_EXTERNAL_LCMS:=@USE_EXTERNAL_LCMS@
LCMS_CFLAGS:=@LCMS_CFLAGS@
LCMS_LIBS:=@LCMS_LIBS@
-diff --git openjdk/make/lib/Lib-jdk.crypto.ec.gmk openjdk/make/lib/Lib-jdk.crypto.ec.gmk
---- openjdk/make/lib/Lib-jdk.crypto.ec.gmk
-+++ openjdk/make/lib/Lib-jdk.crypto.ec.gmk
-@@ -29,9 +29,15 @@
-
- ifeq ($(ENABLE_INTREE_EC), true)
-
-- LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec
- BUILD_LIBSUNEC_FLAGS := $(addprefix -I, $(SUNEC_SRC))
+diff --git a/make/lib/Lib-jdk.crypto.ec.gmk b/make/lib/Lib-jdk.crypto.ec.gmk
+--- a/make/lib/Lib-jdk.crypto.ec.gmk
++++ b/make/lib/Lib-jdk.crypto.ec.gmk
+@@ -38,6 +38,11 @@
+ BUILD_LIBSUNEC_CXXFLAGS_JDKLIB := $(CXXFLAGS_JDKLIB)
+ endif
+ ifeq ($(USE_EXTERNAL_NSS), true)
-+ LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
-+ BUILD_LIBSUNEC_FLAGS += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
-+ else
-+ LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec
++ BUILD_LIBSUNEC_CFLAGS_JDKLIB += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
++ BUILD_LIBSUNEC_CXXFLAGS_JDKLIB += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
+ endif
+
- #
- # On sol-sparc...all libraries are compiled with -xregs=no%appl
- # (set in CFLAGS_REQUIRED_sparc)
-@@ -60,7 +66,7 @@
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
+ $(eval $(call SetupJdkLibrary, BUILD_LIBSUNEC, \
+ NAME := sunec, \
+ TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
+@@ -47,9 +52,11 @@
+ CXXFLAGS := $(BUILD_LIBSUNEC_CXXFLAGS_JDKLIB), \
+ DISABLED_WARNINGS_gcc := sign-compare implicit-fallthrough, \
+ DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \
+- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
++ LDFLAGS := $(subst -Xlinker --as-needed,, \
++ $(subst -Wl$(COMMA)--as-needed,, $(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK), \
LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS := $(LIBCXX), \
-- LIBS_linux := -lc, \
+ LIBS_linux := -lc $(NSS_LIBS), \
- LIBS_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
- RC_FLAGS := $(RC_FLAGS) \
-diff --git openjdk/make/mapfiles/libsunec/mapfile-vers openjdk/make/mapfiles/libsunec/mapfile-vers
---- openjdk/make/mapfiles/libsunec/mapfile-vers
-+++ openjdk/make/mapfiles/libsunec/mapfile-vers
-@@ -31,6 +31,7 @@
- Java_sun_security_ec_ECDSASignature_signDigest;
- Java_sun_security_ec_ECDSASignature_verifySignedDigest;
- Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
-+ Java_sun_security_ec_SunEC_initialize;
- local:
- *;
- };
-diff --git openjdk/src/java.base/unix/native/include/jni_md.h openjdk/src/java.base/unix/native/include/jni_md.h
---- openjdk/src/java.base/unix/native/include/jni_md.h
-+++ openjdk/src/java.base/unix/native/include/jni_md.h
-@@ -36,6 +36,11 @@
+ ))
+
+ TARGETS += $(BUILD_LIBSUNEC)
+diff --git a/src/java.base/unix/native/include/jni_md.h b/src/java.base/unix/native/include/jni_md.h
+--- a/src/java.base/unix/native/include/jni_md.h
++++ b/src/java.base/unix/native/include/jni_md.h
+@@ -41,6 +41,11 @@
#define JNIEXPORT
#define JNIIMPORT
#endif
@@ -134,9 +122,9 @@ diff --git openjdk/src/java.base/unix/native/include/jni_md.h openjdk/src/java.b
#define JNICALL
-diff --git openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
---- openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
-+++ openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
+diff --git a/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
+--- a/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
++++ b/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
@@ -61,6 +61,7 @@
AccessController.doPrivileged(new PrivilegedAction<Void>() {
public Void run() {
@@ -145,19 +133,21 @@ diff --git openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java op
return null;
}
});
-@@ -272,4 +273,9 @@
- putService(new ProviderService(this, "KeyAgreement",
+@@ -293,6 +294,11 @@
"ECDH", "sun.security.ec.ECDHKeyAgreement", null, ATTRS));
}
-+
+
+ /**
+ * Initialize the native code.
+ */
+ private static native void initialize();
- }
-diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
---- openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
-+++ openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
++
+ private void putXDHEntries() {
+
+ HashMap<String, String> ATTRS = new HashMap<>(1);
+diff --git a/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp b/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
+--- a/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
++++ b/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
@@ -25,7 +25,11 @@
#include <jni.h>
@@ -167,9 +157,9 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
+#else
#include "impl/ecc_impl.h"
+#endif
-
- #define ILLEGAL_STATE_EXCEPTION "java/lang/IllegalStateException"
- #define INVALID_ALGORITHM_PARAMETER_EXCEPTION \
+ #include "sun_security_ec_ECDHKeyAgreement.h"
+ #include "sun_security_ec_ECKeyPairGenerator.h"
+ #include "sun_security_ec_ECDSASignature.h"
@@ -33,6 +37,13 @@
#define INVALID_PARAMETER_EXCEPTION \
"java/security/InvalidParameterException"
@@ -207,7 +197,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
}
jbyteArray getEncodedBytes(JNIEnv *env, SECItem *hSECItem)
-@@ -95,7 +112,7 @@
+@@ -139,7 +156,7 @@
*/
JNIEXPORT jobjectArray
JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair
@@ -216,7 +206,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
{
ECPrivateKey *privKey = NULL; // contains both public and private values
ECParams *ecparams = NULL;
-@@ -127,8 +144,17 @@
+@@ -171,8 +188,17 @@
env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
// Generate the new keypair (using the supplied seed)
@@ -234,7 +224,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
ThrowException(env, KEY_EXCEPTION);
goto cleanup;
}
-@@ -175,10 +201,15 @@
+@@ -219,10 +245,15 @@
}
if (privKey) {
FreeECParams(&privKey->ecParams, false);
@@ -250,7 +240,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
}
if (pSeedBuffer) {
-@@ -196,7 +227,7 @@
+@@ -240,7 +271,7 @@
*/
JNIEXPORT jbyteArray
JNICALL Java_sun_security_ec_ECDSASignature_signDigest
@@ -259,7 +249,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
{
jbyte* pDigestBuffer = NULL;
jint jDigestLength = env->GetArrayLength(digest);
-@@ -255,8 +286,18 @@
+@@ -299,8 +330,18 @@
env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
// Sign the digest (using the supplied seed)
@@ -278,7 +268,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
ThrowException(env, KEY_EXCEPTION);
goto cleanup;
}
-@@ -305,7 +346,7 @@
+@@ -349,7 +390,7 @@
*/
JNIEXPORT jboolean
JNICALL Java_sun_security_ec_ECDSASignature_verifySignedDigest
@@ -287,7 +277,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
{
jboolean isValid = false;
-@@ -362,9 +403,10 @@
+@@ -406,9 +447,10 @@
cleanup:
{
@@ -299,7 +289,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
if (pubKey.publicValue.data)
env->ReleaseByteArrayElements(publicKey,
-@@ -390,7 +432,7 @@
+@@ -434,7 +476,7 @@
*/
JNIEXPORT jbyteArray
JNICALL Java_sun_security_ec_ECDHKeyAgreement_deriveKey
@@ -308,7 +298,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
{
jbyteArray jSecret = NULL;
ECParams *ecparams = NULL;
-@@ -466,9 +508,10 @@
+@@ -510,9 +552,10 @@
env->ReleaseByteArrayElements(publicKey,
(jbyte *) publicValue_item.data, JNI_ABORT);
@@ -320,7 +310,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
if (ecparams)
FreeECParams(ecparams, true);
-@@ -477,4 +520,28 @@
+@@ -521,4 +564,28 @@
return jSecret;
}
@@ -349,10 +339,10 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
+}
+
} /* extern "C" */
-diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h openjdk/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
+diff --git a/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h b/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
new file mode 100644
--- /dev/null
-+++ openjdk/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
++++ b/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
@@ -0,0 +1,298 @@
+/*
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 32dd399..62218ba 100644
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Generates the 'source tarball' for JDK 8 projects.
+# Generates the 'source tarball' for JDK projects.
#
# Example:
# When used from local repo set REPO_ROOT pointing to file:// with your repo
@@ -123,7 +123,7 @@ pushd "${FILE_NAME_ROOT}"
# get pr2126.patch (from http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d2c9a898f50) from most correct tag
# Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2126)
# there is currnetly no "upstram version of this patch, hardcoding custom version
- PR2126="../../pr2126-10.patch"
+ PR2126="../../pr2126-11.patch"
fi;
echo "Applying ${PR2126}"
patch -Np1 < $PR2126
diff --git a/java-openjdk-s390-size_t.patch b/java-openjdk-s390-size_t.patch
deleted file mode 100644
index 920624c..0000000
--- a/java-openjdk-s390-size_t.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
---- a/src/hotspot/share/code/codeCache.cpp
-+++ b/src/hotspot/share/code/codeCache.cpp
-@@ -405,7 +405,7 @@
- add_heap(heap);
-
- // Reserve Space
-- size_t size_initial = MIN2(InitialCodeCacheSize, rs.size());
-+ size_t size_initial = MIN2((size_t)InitialCodeCacheSize, rs.size());
- size_initial = align_up(size_initial, os::vm_page_size());
- if (!heap->reserve(rs, size_initial, CodeCacheSegmentSize)) {
- vm_exit_during_initialization(err_msg("Could not reserve enough space in %s (" SIZE_FORMAT "K)",
-diff --git a/src/hotspot/share/gc/cms/parNewGeneration.cpp b/src/hotspot/share/gc/cms/parNewGeneration.cpp
---- a/src/hotspot/share/gc/cms/parNewGeneration.cpp
-+++ b/src/hotspot/share/gc/cms/parNewGeneration.cpp
-@@ -200,7 +200,7 @@
- const size_t num_overflow_elems = of_stack->size();
- const size_t space_available = queue->max_elems() - queue->size();
- const size_t num_take_elems = MIN3(space_available / 4,
-- ParGCDesiredObjsFromOverflowList,
-+ (size_t)ParGCDesiredObjsFromOverflowList,
- num_overflow_elems);
- // Transfer the most recent num_take_elems from the overflow
- // stack to our work queue.
-diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
---- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
-+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
-@@ -2296,7 +2296,7 @@
- // of things to do) or totally (at the very end).
- size_t target_size;
- if (partially) {
-- target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
-+ target_size = MIN2((size_t)_task_queue->max_elems()/3, (size_t)GCDrainStackTargetSize);
- } else {
- target_size = 0;
- }
-diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
---- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
-+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
-@@ -31,7 +31,7 @@
- }
-
- size_t G1CMObjArrayProcessor::process_array_slice(objArrayOop obj, HeapWord* start_from, size_t remaining) {
-- size_t words_to_scan = MIN2(remaining, ObjArrayMarkingStride);
-+ size_t words_to_scan = MIN2(remaining, (size_t)ObjArrayMarkingStride);
-
- if (remaining > ObjArrayMarkingStride) {
- push_array_slice(start_from + ObjArrayMarkingStride);
-diff --git a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
---- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
-+++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
-@@ -100,7 +100,7 @@
- return reserved_size() - committed_size();
- }
-
--size_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
-+uintptr_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
- return (addr - _low_boundary) / _page_size;
- }
-
-diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
---- a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
-+++ b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
-@@ -115,7 +115,7 @@
- const size_t beg_index = size_t(index);
- assert(beg_index < len || len == 0, "index too large");
-
-- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
-+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
- const size_t end_index = beg_index + stride;
- T* const base = (T*)obj->base();
- T* const beg = base + beg_index;
-diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
---- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
-+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
-@@ -905,8 +905,8 @@
- void PSParallelCompact::initialize_dead_wood_limiter()
- {
- const size_t max = 100;
-- _dwl_mean = double(MIN2(ParallelOldDeadWoodLimiterMean, max)) / 100.0;
-- _dwl_std_dev = double(MIN2(ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
-+ _dwl_mean = double(MIN2((size_t)ParallelOldDeadWoodLimiterMean, max)) / 100.0;
-+ _dwl_std_dev = double(MIN2((size_t)ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
- _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
- DEBUG_ONLY(_dwl_initialized = true;)
- _dwl_adjustment = normal_distribution(1.0);
-diff --git a/src/hotspot/share/gc/shared/plab.cpp b/src/hotspot/share/gc/shared/plab.cpp
---- a/src/hotspot/share/gc/shared/plab.cpp
-+++ b/src/hotspot/share/gc/shared/plab.cpp
-@@ -32,7 +32,7 @@
-
- size_t PLAB::min_size() {
- // Make sure that we return something that is larger than AlignmentReserve
-- return align_object_size(MAX2(MinTLABSize / HeapWordSize, (uintx)oopDesc::header_size())) + AlignmentReserve;
-+ return align_object_size(MAX2(MinTLABSize / HeapWordSize, (size_t)oopDesc::header_size())) + AlignmentReserve;
- }
-
- size_t PLAB::max_size() {
-diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
---- a/src/hotspot/share/prims/whitebox.cpp
-+++ b/src/hotspot/share/prims/whitebox.cpp
-@@ -1096,7 +1096,7 @@
- WB_END
-
- WB_ENTRY(jobject, WB_GetSizeTVMFlag(JNIEnv* env, jobject o, jstring name))
-- uintx result;
-+ size_t result;
- if (GetVMFlag <size_t> (thread, env, name, &result, &CommandLineFlags::size_tAt)) {
- ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI
- return longBox(thread, env, result);
-diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
---- a/src/hotspot/share/runtime/arguments.cpp
-+++ b/src/hotspot/share/runtime/arguments.cpp
-@@ -1586,7 +1586,7 @@
- // Increase the code cache size - tiered compiles a lot more.
- if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) {
- FLAG_SET_ERGO(uintx, ReservedCodeCacheSize,
-- MIN2(CODE_CACHE_DEFAULT_LIMIT, ReservedCodeCacheSize * 5));
-+ MIN2(CODE_CACHE_DEFAULT_LIMIT, (size_t)(ReservedCodeCacheSize * 5)));
- }
- // Enable SegmentedCodeCache if TieredCompilation is enabled and ReservedCodeCacheSize >= 240M
- if (FLAG_IS_DEFAULT(SegmentedCodeCache) && ReservedCodeCacheSize >= 240*M) {
-diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
---- a/src/hotspot/share/runtime/arguments.hpp
-+++ b/src/hotspot/share/runtime/arguments.hpp
-@@ -328,7 +328,7 @@
- // Value of the conservative maximum heap alignment needed
- static size_t _conservative_max_heap_alignment;
-
-- static uintx _min_heap_size;
-+ static size_t _min_heap_size;
-
- // -Xrun arguments
- static AgentLibraryList _libraryList;
diff --git a/java-openjdk.spec b/java-openjdk.spec
index 95d7635..687ad70 100644
--- a/java-openjdk.spec
+++ b/java-openjdk.spec
@@ -54,7 +54,7 @@
%global ppc64be ppc64 ppc64p7
%global multilib_arches %{power64} sparc64 x86_64
%global jit_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} s390x
-%global aot_arches x86_64
+%global aot_arches x86_64 %{aarch64}
# By default, we build a debug build during main build on JIT architectures
%if %{with slowdebug}
@@ -71,6 +71,13 @@
%global include_debug_build 0
%endif
+# On x86_64 and AArch64, we use the Shenandoah HotSpot
+%ifarch x86_64 %{aarch64}
+%global use_shenandoah_hotspot 1
+%else
+%global use_shenandoah_hotspot 0
+%endif
+
%if %{include_debug_build}
%global build_loop2 %{debug_suffix}
%else
@@ -120,12 +127,8 @@
%global NSS_BUILDTIME_VERSION %(if [ "x%{NSS_BUILDTIME_NUMBER}" == "x" ] ; then echo "" ;else echo ">= %{NSS_BUILDTIME_NUMBER}" ;fi)
-# Fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349.
-# See also https://bugzilla.redhat.com/show_bug.cgi?id=1590796
-# as to why some libraries *cannot* be excluded. In particular,
-# these are:
-# libjsig.so, libjava.so, libjawt.so, libjvm.so and libverify.so
-%global _privatelibs libjsoundalsa[.]so.*|libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas_unix[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libunpack[.]so.*|libzip[.]so.*|lib[.]so\\(SUNWprivate_.*
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
+%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libunpack[.]so.*|libzip[.]so.*
%global __provides_exclude ^(%{_privatelibs})$
%global __requires_exclude ^(%{_privatelibs})$
@@ -185,8 +188,21 @@
%endif
# New Version-String scheme-style defines
-%global majorver 10
-%global securityver 2
+%global majorver 11
+%global securityver 1
+# Used via new version scheme. JDK 11 was
+# GA'ed in September 2018 => 18.9
+%global vendor_version_string 18.9
+# Add LTS designator for RHEL builds
+%if 0%{?rhel}
+ # the rolling release isneverpacked for rhel,
+ # nro even in epel, will this LTS be used
+ %global lts_designator "LTS"
+ %global lts_designator_zip -%{lts_designator}
+%else
+ %global lts_designator ""
+ %global lts_designator_zip ""
+%endif
# Standard JPackage naming and versioning defines
%global origin openjdk
@@ -209,7 +225,7 @@
# output dir stub
%define buildoutputdir() %{expand:openjdk/build%{?1}}
# we can copy the javadoc to not arched dir, or make it not noarch
-%define uniquejavadocdir() %{expand:%{fullversion}%{?1}}
+%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
# main id and dir of this jdk
%define uniquesuffix() %{expand:%{fullversion}.%{_arch}%{?1}}
@@ -269,12 +285,9 @@ alternatives \\
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\
--slave %{_bindir}/jjs jjs %{jrebindir -- %{?1}}/jjs \\
--slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
- --slave %{_bindir}/orbd orbd %{jrebindir -- %{?1}}/orbd \\
--slave %{_bindir}/pack200 pack200 %{jrebindir -- %{?1}}/pack200 \\
--slave %{_bindir}/rmid rmid %{jrebindir -- %{?1}}/rmid \\
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- %{?1}}/rmiregistry \\
- --slave %{_bindir}/servertool servertool %{jrebindir -- %{?1}}/servertool \\
- --slave %{_bindir}/tnameserv tnameserv %{jrebindir -- %{?1}}/tnameserv \\
--slave %{_bindir}/unpack200 unpack200 %{jrebindir -- %{?1}}/unpack200 \\
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
@@ -282,18 +295,12 @@ alternatives \\
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/orbd.1$ext orbd.1$ext \\
- %{_mandir}/man1/orbd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \\
%{_mandir}/man1/pack200-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/rmid.1$ext rmid.1$ext \\
%{_mandir}/man1/rmid-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \\
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/servertool.1$ext servertool.1$ext \\
- %{_mandir}/man1/servertool-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/tnameserv.1$ext tnameserv.1$ext \\
- %{_mandir}/man1/tnameserv-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/unpack200.1$ext unpack200.1$ext \\
%{_mandir}/man1/unpack200-%{uniquesuffix -- %{?1}}.1$ext
@@ -350,14 +357,16 @@ ext=.gz
alternatives \\
--install %{_bindir}/javac javac %{sdkbindir -- %{?1}}/javac $PRIORITY --family %{name}.%{_arch} \\
--slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir -- %{?1}} \\
- --slave %{_bindir}/appletviewer appletviewer %{sdkbindir -- %{?1}}/appletviewer \\
%ifarch %{aot_arches}
--slave %{_bindir}/jaotc jaotc %{sdkbindir -- %{?1}}/jaotc \\
%endif
--slave %{_bindir}/jlink jlink %{sdkbindir -- %{?1}}/jlink \\
--slave %{_bindir}/jmod jmod %{sdkbindir -- %{?1}}/jmod \\
+%ifarch %{jit_arches}
+%ifnarch s390x
--slave %{_bindir}/jhsdb jhsdb %{sdkbindir -- %{?1}}/jhsdb \\
- --slave %{_bindir}/idlj idlj %{sdkbindir -- %{?1}}/idlj \\
+%endif
+%endif
--slave %{_bindir}/jar jar %{sdkbindir -- %{?1}}/jar \\
--slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\
--slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\
@@ -377,15 +386,7 @@ alternatives \\
--slave %{_bindir}/jstat jstat %{sdkbindir -- %{?1}}/jstat \\
--slave %{_bindir}/jstatd jstatd %{sdkbindir -- %{?1}}/jstatd \\
--slave %{_bindir}/rmic rmic %{sdkbindir -- %{?1}}/rmic \\
- --slave %{_bindir}/schemagen schemagen %{sdkbindir -- %{?1}}/schemagen \\
--slave %{_bindir}/serialver serialver %{sdkbindir -- %{?1}}/serialver \\
- --slave %{_bindir}/wsgen wsgen %{sdkbindir -- %{?1}}/wsgen \\
- --slave %{_bindir}/wsimport wsimport %{sdkbindir -- %{?1}}/wsimport \\
- --slave %{_bindir}/xjc xjc %{sdkbindir -- %{?1}}/xjc \\
- --slave %{_mandir}/man1/appletviewer.1$ext appletviewer.1$ext \\
- %{_mandir}/man1/appletviewer-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/idlj.1$ext idlj.1$ext \\
- %{_mandir}/man1/idlj-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jar.1$ext jar.1$ext \\
%{_mandir}/man1/jar-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jarsigner.1$ext jarsigner.1$ext \\
@@ -420,16 +421,8 @@ alternatives \\
%{_mandir}/man1/jstatd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/rmic.1$ext rmic.1$ext \\
%{_mandir}/man1/rmic-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/schemagen.1$ext schemagen.1$ext \\
- %{_mandir}/man1/schemagen-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/serialver.1$ext serialver.1$ext \\
%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/wsgen.1$ext wsgen.1$ext \\
- %{_mandir}/man1/wsgen-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/wsimport.1$ext wsimport.1$ext \\
- %{_mandir}/man1/wsimport-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/xjc.1$ext xjc.1$ext \\
- %{_mandir}/man1/xjc-%{uniquesuffix -- %{?1}}.1$ext
for X in %{origin} %{javaver} ; do
alternatives \\
@@ -501,7 +494,6 @@ exit 0
%define files_jre() %{expand:
%{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}-%{origin}.png
-%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjsoundalsa.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsplashscreen.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libawt_xawt.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjawt.so
@@ -519,15 +511,14 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/java
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jjs
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/keytool
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/orbd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/pack200
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmid
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/servertool
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/tnameserv
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/unpack200
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
+%ifarch %{jit_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
+%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jrt-fs.jar
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/modules
@@ -548,7 +539,7 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2gss.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2pcsc.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2pkcs11.so
-%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjaas_unix.so
+%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjaas.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjava.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjavajpeg.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjdwp.so
@@ -563,21 +554,26 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libnio.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libprefs.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/librmi.so
+# Zero and S390x don't have SA
+%ifarch %{jit_arches}
+%ifnarch s390x
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsaproc.so
+%endif
+%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsctp.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsunec.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libunpack.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libverify.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libzip.so
+%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr
+%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/default.jfc
+%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/orbd-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/pack200-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmid-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/servertool-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/tnameserv-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/unpack200-%{uniquesuffix -- %{?1}}.1*
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/server/
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/client/
@@ -600,6 +596,7 @@ exit 0
%dir %{etcjavadir -- %{?1}}/conf/security/policy/unlimited
%config(noreplace) %{etcjavadir -- %{?1}}/lib/security/default.policy
%config(noreplace) %{etcjavadir -- %{?1}}/lib/security/blacklisted.certs
+%config(noreplace) %{etcjavadir -- %{?1}}/lib/security/public_suffix_list.dat
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/policy/limited/exempt_local.policy
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/policy/limited/default_local.policy
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/policy/limited/default_US_export.policy
@@ -622,8 +619,6 @@ exit 0
%define files_devel() %{expand:
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/bin
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/appletviewer
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/idlj
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jar
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jarsigner
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javac
@@ -635,7 +630,12 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeps
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeprscan
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jimage
+# Zero and S390x don't have SA
+%ifarch %{jit_arches}
+%ifnarch s390x
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jhsdb
+%endif
+%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jinfo
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jlink
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jmap
@@ -647,11 +647,7 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstat
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstatd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmic
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/schemagen
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/serialver
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/wsgen
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/wsimport
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/xjc
%ifarch %{aot_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jaotc
%endif
@@ -661,8 +657,6 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/tapset
%endif
%{_datadir}/applications/*jconsole%{?1}.desktop
-%{_mandir}/man1/appletviewer-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/idlj-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jar-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jarsigner-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/javac-%{uniquesuffix -- %{?1}}.1*
@@ -680,11 +674,7 @@ exit 0
%{_mandir}/man1/jstat-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jstatd-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmic-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/schemagen-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/wsgen-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/wsimport-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/xjc-%{uniquesuffix -- %{?1}}.1*
%if %{with_systemtap}
%dir %{tapsetroot}
%dir %{tapsetdirttapset}
@@ -861,7 +851,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{origin}
Version: %{newjavaver}.%{buildver}
-Release: 7%{?dist}
+Release: 4%{?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
@@ -878,21 +868,25 @@ Group: Development/Languages
# HotSpot code is licensed under GPLv2
# JDK library code is licensed under GPLv2 with the Classpath exception
-# The Apache license is used in code taken from Apache projects (primarily JAXP & JAXWS)
+# The Apache license is used in code taken from Apache projects (primarily xalan & xerces)
# DOM levels 2 & 3 and the XML digital signature schemas are licensed under the W3C Software License
# The JSR166 concurrency code is in the public domain
-# The BSD and MIT licenses are used for a number of third-party libraries (see THIRD_PARTY_README)
-# The OpenJDK source tree includes the JPEG library (IJG), zlib & libpng (zlib), giflib and LCMS (MIT)
+# The BSD and MIT licenses are used for a number of third-party libraries (see ADDITIONAL_LICENSE_INFO)
+# The OpenJDK source tree includes:
+# - JPEG library (IJG), zlib & libpng (zlib), giflib (MIT), harfbuzz (ISC),
+# - freetype (FTL), jline (BSD) and LCMS (MIT)
+# - jquery (MIT), jdk.crypto.cryptoki PKCS 11 wrapper (RSA)
+# - public_suffix_list.dat from publicsuffix.org (MPLv2.0)
# The test code includes copies of NSS under the Mozilla Public License v2.0
# The PCSClite headers are under a BSD with advertising license
# The elliptic curve cryptography (ECC) source code is licensed under the LGPLv2.1 or any later version
-License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib
+License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
URL: http://openjdk.java.net/
# to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh
# update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
-Source0: jdk-updates-jdk%{majorver}u-jdk-%{newjavaver}+%{buildver}.tar.xz
+Source0: shenandoah-jdk%{majorver}-shenandoah-jdk-%{newjavaver}+%{buildver}.tar.xz
Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
# Desktop files. Adapted from IcedTea
@@ -936,14 +930,33 @@ Patch5: RHBZ-1565658-system-nss-SunEC.patch
#
#############################################
-# s390 (Zero) build does not bootcycle without this patch
-# Already in JDK-11. Missing backports.
-Patch100: JDK-8201495-s390-java-opts.patch
-# See JDK-8198844. This won't be needed any more in
-# JDK 11+
-Patch101: sorted-diff.patch
-# Type fixing for s390 (Zero). Not upstream.
-Patch102: java-openjdk-s390-size_t.patch
+# 8210416, RHBZ#1632174: [linux] Poor StrictMath performance due to non-optimized compilation
+Patch8: JDK-8210416-RHBZ-1632174-fdlibm-opt-fix.patch
+# 8210425, RHBZ#1632174: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
+Patch9: JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch
+
+#############################################
+#
+# JDK 9+ only patches
+#
+#############################################
+
+# 8210647, RHBZ#1632174: libsaproc is being compiled without optimization
+Patch10: JDK-8210647-RHBZ-1632174-libsaproc-opt-fix.patch
+# 8210761, RHBZ#1632174: libjsig is being compiled without optimization
+Patch11: JDK-8210761-RHBZ-1632174-libjsig-opt-fix.patch
+# 8210703, RHBZ#1632174: vmStructs.cpp compiled with -O0
+Patch12: JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch
+# 8211105, RHBZ-1628612, RHBZ-1630996: Temporarily disable dsin/dcos/log
+# intrinsics on aarch64, falling back to C code. Re-enable once JDK-8210461
+# is fixed and available in jdk11u.
+Patch6: JDK-8211105-aarch64-log-sin-intrinsics-disable.patch
+#############################################
+#
+# Patches appearing in 11.0.2
+#
+#############################################
+Patch584: jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -974,7 +987,7 @@ BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
BuildRequires: javapackages-filesystem
-BuildRequires: java-openjdk-devel
+BuildRequires: java-11-openjdk-devel
# Zero-assembler build requirement
%ifnarch %{jit_arches}
BuildRequires: libffi-devel
@@ -1207,10 +1220,13 @@ pushd %{top_level_dir_name}
%patch3 -p1
%patch4 -p1
%patch5 -p1
-
-%patch101 -p1
-%patch102 -p1
-
+%patch6 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch584 -p1
popd # openjdk
%patch1000
@@ -1288,10 +1304,6 @@ EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing"
%endif
export EXTRA_CFLAGS
-(cd %{top_level_dir_name}/make/autoconf
- bash ./autogen.sh
-)
-
for suffix in %{build_loop} ; do
if [ "x$suffix" = "x" ] ; then
debugbuild=release
@@ -1315,8 +1327,9 @@ bash ../configure \
%endif
--with-version-build=%{buildver} \
--with-version-pre="" \
- --with-version-opt="" \
- --with-boot-jdk=/usr/lib/jvm/java-%{majorver}-openjdk \
+ --with-version-opt=%{lts_designator} \
+ --with-vendor-version-string="%{vendor_version_string}" \
+ --with-boot-jdk=/usr/lib/jvm/java-11-openjdk \
--with-debug-level=$debugbuild \
--with-native-debug-symbols=internal \
--enable-unlimited-crypto \
@@ -1332,6 +1345,9 @@ bash ../configure \
--with-extra-ldflags="%{ourldflags}" \
--with-num-cores="$NUM_PROC" \
--disable-javac-server \
+%ifarch x86_64
+ --with-jvm-features=zgc \
+%endif
--disable-warnings-as-errors
make \
@@ -1348,10 +1364,6 @@ make docs-zip
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
find images/%{jdkimage} -iname '*.jar' -exec chmod ugo+r {} \;
-# remove redundant *diz and *debuginfo files
-find images/%{jdkimage} -iname '*.diz' -exec rm {} \;
-find images/%{jdkimage} -iname '*.debuginfo' -exec rm {} \;
-
# Build screws up permissions on binaries
# https://bugs.openjdk.java.net/browse/JDK-8173610
find images/%{jdkimage} -iname '*.so' -exec chmod +x {} \;
@@ -1379,6 +1391,11 @@ for suffix in %{rev_build_loop} ; do
export JAVA_HOME=$(pwd)/%{buildoutputdir -- $suffix}/images/%{jdkimage}
+#check sheandoah is enabled
+%if %{use_shenandoah_hotspot}
+$JAVA_HOME//bin/java -XX:+UseShenandoahGC -version
+%endif
+
# Check unlimited policy has been used
$JAVA_HOME/bin/javac -d . %{SOURCE13}
$JAVA_HOME/bin/java --add-opens java.base/javax.crypto=ALL-UNNAMED TestCryptoLevel
@@ -1530,7 +1547,7 @@ popd
# Install Javadoc documentation
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
-cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{newjavaver}+%{buildver}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
+cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{newjavaver}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
# Install icons and menu entries
for s in 16 24 32 48 ; do
@@ -1550,9 +1567,6 @@ done
# See https://bugzilla.redhat.com/show_bug.cgi?id=741821
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/.java/.systemPrefs
-# FIXME: remove SONAME entries from demo DSOs. See
-# https://bugzilla.redhat.com/show_bug.cgi?id=436497
-
# copy samples next to demos; samples are mostly js files
cp -r %{top_level_dir_name}/src/sample $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/
@@ -1763,6 +1777,14 @@ require "copy_jdk_configs.lua"
%changelog
+* Thu Nov 01 2018 Jiri Vanek <jvanek(a)redhat.com> - 1:11.0.1.13-3
+- updated to jdk11
+
+* Wed Aug 29 2018 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:10.0.3.13-8
+- Adjust system NSS patch, RHBZ-1565658-system-nss-SunEC.patch, so
+ as to account for -Wl,--as-needed default linker flag by filtering
+ it. Resolves RHBZ#1623399.
+
* Thu Aug 23 2018 Jiri Vanek <jvanek(a)redhat.com> - 1:10.0.3.13-6
- dissabled accessibility, fixed provides for main package's debug variant
- now buildrequires javapackages-filesystem as the issue with macros should be fixed
diff --git a/jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch b/jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch
new file mode 100644
index 0000000..b3221f8
--- /dev/null
+++ b/jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch
@@ -0,0 +1,114 @@
+
+# HG changeset patch
+# User roland
+# Date 1534518792 -7200
+# Node ID 690d9be191bf068b68c37bc835b355b1535e6075
+# Parent 5be470fb7a19293eb95fd33806413b94abca9724
+8209639: assert failure in coalesce.cpp: attempted to spill a non-spillable item
+Reviewed-by: neliasso, kvn
+
+diff -r 5be470fb7a19 -r 690d9be191bf src/hotspot/share/opto/coalesce.cpp
+--- a/src/hotspot/share/opto/coalesce.cpp Tue Oct 16 12:47:56 2018 +0100
++++ b/src/hotspot/share/opto/coalesce.cpp Fri Aug 17 17:13:12 2018 +0200
+@@ -25,6 +25,7 @@
+ #include "precompiled.hpp"
+ #include "memory/allocation.inline.hpp"
+ #include "opto/block.hpp"
++#include "opto/c2compiler.hpp"
+ #include "opto/cfgnode.hpp"
+ #include "opto/chaitin.hpp"
+ #include "opto/coalesce.hpp"
+@@ -294,9 +295,13 @@
+ } else {
+ uint ireg = m->ideal_reg();
+ if (ireg == 0 || ireg == Op_RegFlags) {
+- assert(false, "attempted to spill a non-spillable item: %d: %s, ireg = %u, spill_type: %s",
+- m->_idx, m->Name(), ireg, MachSpillCopyNode::spill_type(MachSpillCopyNode::PhiInput));
+- C->record_method_not_compilable("attempted to spill a non-spillable item");
++ if (C->subsume_loads()) {
++ C->record_failure(C2Compiler::retry_no_subsuming_loads());
++ } else {
++ assert(false, "attempted to spill a non-spillable item: %d: %s, ireg = %u, spill_type: %s",
++ m->_idx, m->Name(), ireg, MachSpillCopyNode::spill_type(MachSpillCopyNode::PhiInput));
++ C->record_method_not_compilable("attempted to spill a non-spillable item");
++ }
+ return;
+ }
+ const RegMask *rm = C->matcher()->idealreg2spillmask[ireg];
+diff -r 5be470fb7a19 -r 690d9be191bf test/hotspot/jtreg/compiler/c2/SubsumingLoadsCauseFlagSpill.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/test/hotspot/jtreg/compiler/c2/SubsumingLoadsCauseFlagSpill.java Fri Aug 17 17:13:12 2018 +0200
+@@ -0,0 +1,72 @@
++/*
++ * Copyright (c) 2018, 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.
++ *
++ * 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.
++ */
++
++/**
++ * @test
++ * @bug 8209639
++ * @summary assert failure in coalesce.cpp: attempted to spill a non-spillable item
++ *
++ * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,SubsumingLoadsCauseFlagSpill::not_inlined -Xmx1024m SubsumingLoadsCauseFlagSpill
++ *
++ */
++
++public class SubsumingLoadsCauseFlagSpill {
++ private static Object field;
++ private static boolean do_throw;
++ private static volatile boolean barrier;
++
++ public static void main(String[] args) {
++ for (int i = 0; i < 20_000; i++) {
++ do_throw = true;
++ field = null;
++ test(0);
++ do_throw = false;
++ field = new Object();
++ test(0);
++ }
++ }
++
++ private static float test(float f) {
++ Object v = null;
++ try {
++ not_inlined();
++ v = field;
++ } catch (MyException me) {
++ v = field;
++ barrier = true;
++ }
++ if (v == null) {
++ return f * f;
++ }
++ return f;
++ }
++
++ private static void not_inlined() throws MyException{
++ if (do_throw) {
++ throw new MyException();
++ }
++ }
++
++ private static class MyException extends Throwable {
++ }
++}
+
diff --git a/pr2126-10.patch b/pr2126-10.patch
deleted file mode 100644
index a4c0a46..0000000
--- a/pr2126-10.patch
+++ /dev/null
@@ -1,675 +0,0 @@
-diff --git a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
---- openjdk/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
-+++ openjdk/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
-@@ -34,57 +34,6 @@
- //
- // See sun.security.util.CurveDB for the OIDs
-
-- // NIST K-163
-- SECT163_K1(1, NAMED_GROUP_ECDHE, "sect163k1", "1.3.132.0.1", true),
--
-- SECT163_R1(2, NAMED_GROUP_ECDHE, "sect163r1", "1.3.132.0.2", false),
--
-- // NIST B-163
-- SECT163_R2(3, NAMED_GROUP_ECDHE, "sect163r2", "1.3.132.0.15", true),
--
-- SECT193_R1(4, NAMED_GROUP_ECDHE, "sect193r1", "1.3.132.0.24", false),
-- SECT193_R2(5, NAMED_GROUP_ECDHE, "sect193r2", "1.3.132.0.25", false),
--
-- // NIST K-233
-- SECT233_K1(6, NAMED_GROUP_ECDHE, "sect233k1", "1.3.132.0.26", true),
--
-- // NIST B-233
-- SECT233_R1(7, NAMED_GROUP_ECDHE, "sect233r1", "1.3.132.0.27", true),
--
-- SECT239_K1(8, NAMED_GROUP_ECDHE, "sect239k1", "1.3.132.0.3", false),
--
-- // NIST K-283
-- SECT283_K1(9, NAMED_GROUP_ECDHE, "sect283k1", "1.3.132.0.16", true),
--
-- // NIST B-283
-- SECT283_R1(10, NAMED_GROUP_ECDHE, "sect283r1", "1.3.132.0.17", true),
--
-- // NIST K-409
-- SECT409_K1(11, NAMED_GROUP_ECDHE, "sect409k1", "1.3.132.0.36", true),
--
-- // NIST B-409
-- SECT409_R1(12, NAMED_GROUP_ECDHE, "sect409r1", "1.3.132.0.37", true),
--
-- // NIST K-571
-- SECT571_K1(13, NAMED_GROUP_ECDHE, "sect571k1", "1.3.132.0.38", true),
--
-- // NIST B-571
-- SECT571_R1(14, NAMED_GROUP_ECDHE, "sect571r1", "1.3.132.0.39", true),
--
-- SECP160_K1(15, NAMED_GROUP_ECDHE, "secp160k1", "1.3.132.0.9", false),
-- SECP160_R1(16, NAMED_GROUP_ECDHE, "secp160r1", "1.3.132.0.8", false),
-- SECP160_R2(17, NAMED_GROUP_ECDHE, "secp160r2", "1.3.132.0.30", false),
-- SECP192_K1(18, NAMED_GROUP_ECDHE, "secp192k1", "1.3.132.0.31", false),
--
-- // NIST P-192
-- SECP192_R1(19, NAMED_GROUP_ECDHE, "secp192r1", "1.2.840.10045.3.1.1", true),
--
-- SECP224_K1(20, NAMED_GROUP_ECDHE, "secp224k1", "1.3.132.0.32", false),
-- // NIST P-224
-- SECP224_R1(21, NAMED_GROUP_ECDHE, "secp224r1", "1.3.132.0.33", true),
--
-- SECP256_K1(22, NAMED_GROUP_ECDHE, "secp256k1", "1.3.132.0.10", false),
--
- // NIST P-256
- SECP256_R1(23, NAMED_GROUP_ECDHE, "secp256r1", "1.2.840.10045.3.1.7", true),
-
-diff --git a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
---- openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
-+++ openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
-@@ -116,12 +116,6 @@
- NamedGroup.SECP256_R1,
- NamedGroup.SECP384_R1,
- NamedGroup.SECP521_R1,
-- NamedGroup.SECT283_K1,
-- NamedGroup.SECT283_R1,
-- NamedGroup.SECT409_K1,
-- NamedGroup.SECT409_R1,
-- NamedGroup.SECT571_K1,
-- NamedGroup.SECT571_R1,
-
- // FFDHE 2048
- NamedGroup.FFDHE_2048,
-@@ -136,15 +130,6 @@
- NamedGroup.SECP256_R1,
- NamedGroup.SECP384_R1,
- NamedGroup.SECP521_R1,
-- NamedGroup.SECT283_K1,
-- NamedGroup.SECT283_R1,
-- NamedGroup.SECT409_K1,
-- NamedGroup.SECT409_R1,
-- NamedGroup.SECT571_K1,
-- NamedGroup.SECT571_R1,
--
-- // non-NIST curves
-- NamedGroup.SECP256_K1,
-
- // FFDHE 2048
- NamedGroup.FFDHE_2048,
-diff --git a/src/java.base/share/classes/sun/security/util/CurveDB.java b/src/java.base/share/classes/sun/security/util/CurveDB.java
---- openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
-+++ openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
-@@ -168,114 +168,6 @@
- Pattern nameSplitPattern = Pattern.compile(SPLIT_PATTERN);
-
- /* SEC2 prime curves */
-- add("secp112r1", "1.3.132.0.6", P,
-- "DB7C2ABF62E35E668076BEAD208B",
-- "DB7C2ABF62E35E668076BEAD2088",
-- "659EF8BA043916EEDE8911702B22",
-- "09487239995A5EE76B55F9C2F098",
-- "A89CE5AF8724C0A23E0E0FF77500",
-- "DB7C2ABF62E35E7628DFAC6561C5",
-- 1, nameSplitPattern);
--
-- add("secp112r2", "1.3.132.0.7", P,
-- "DB7C2ABF62E35E668076BEAD208B",
-- "6127C24C05F38A0AAAF65C0EF02C",
-- "51DEF1815DB5ED74FCC34C85D709",
-- "4BA30AB5E892B4E1649DD0928643",
-- "adcd46f5882e3747def36e956e97",
-- "36DF0AAFD8B8D7597CA10520D04B",
-- 4, nameSplitPattern);
--
-- add("secp128r1", "1.3.132.0.28", P,
-- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
-- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC",
-- "E87579C11079F43DD824993C2CEE5ED3",
-- "161FF7528B899B2D0C28607CA52C5B86",
-- "CF5AC8395BAFEB13C02DA292DDED7A83",
-- "FFFFFFFE0000000075A30D1B9038A115",
-- 1, nameSplitPattern);
--
-- add("secp128r2", "1.3.132.0.29", P,
-- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
-- "D6031998D1B3BBFEBF59CC9BBFF9AEE1",
-- "5EEEFCA380D02919DC2C6558BB6D8A5D",
-- "7B6AA5D85E572983E6FB32A7CDEBC140",
-- "27B6916A894D3AEE7106FE805FC34B44",
-- "3FFFFFFF7FFFFFFFBE0024720613B5A3",
-- 4, nameSplitPattern);
--
-- add("secp160k1", "1.3.132.0.9", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
-- "0000000000000000000000000000000000000000",
-- "0000000000000000000000000000000000000007",
-- "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB",
-- "938CF935318FDCED6BC28286531733C3F03C4FEE",
-- "0100000000000000000001B8FA16DFAB9ACA16B6B3",
-- 1, nameSplitPattern);
--
-- add("secp160r1", "1.3.132.0.8", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC",
-- "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45",
-- "4A96B5688EF573284664698968C38BB913CBFC82",
-- "23A628553168947D59DCC912042351377AC5FB32",
-- "0100000000000000000001F4C8F927AED3CA752257",
-- 1, nameSplitPattern);
--
-- add("secp160r2", "1.3.132.0.30", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70",
-- "B4E134D3FB59EB8BAB57274904664D5AF50388BA",
-- "52DCB034293A117E1F4FF11B30F7199D3144CE6D",
-- "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E",
-- "0100000000000000000000351EE786A818F3A1A16B",
-- 1, nameSplitPattern);
--
-- add("secp192k1", "1.3.132.0.31", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37",
-- "000000000000000000000000000000000000000000000000",
-- "000000000000000000000000000000000000000000000003",
-- "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D",
-- "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D",
-- "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D",
-- 1, nameSplitPattern);
--
-- add("secp192r1 [NIST P-192, X9.62 prime192v1]", "1.2.840.10045.3.1.1", PD,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
-- "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1",
-- "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012",
-- "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811",
-- "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831",
-- 1, nameSplitPattern);
--
-- add("secp224k1", "1.3.132.0.32", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D",
-- "00000000000000000000000000000000000000000000000000000000",
-- "00000000000000000000000000000000000000000000000000000005",
-- "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C",
-- "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5",
-- "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7",
-- 1, nameSplitPattern);
--
-- add("secp224r1 [NIST P-224]", "1.3.132.0.33", PD,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
-- "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
-- "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
-- "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D",
-- 1, nameSplitPattern);
--
-- add("secp256k1", "1.3.132.0.10", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F",
-- "0000000000000000000000000000000000000000000000000000000000000000",
-- "0000000000000000000000000000000000000000000000000000000000000007",
-- "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798",
-- "483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141",
-- 1, nameSplitPattern);
--
- add("secp256r1 [NIST P-256, X9.62 prime256v1]", "1.2.840.10045.3.1.7", PD,
- "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF",
- "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC",
-@@ -303,435 +195,6 @@
- "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409",
- 1, nameSplitPattern);
-
-- /* ANSI X9.62 prime curves */
-- add("X9.62 prime192v2", "1.2.840.10045.3.1.2", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
-- "CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953",
-- "EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A",
-- "6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15",
-- "FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31",
-- 1, nameSplitPattern);
--
-- add("X9.62 prime192v3", "1.2.840.10045.3.1.3", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
-- "22123DC2395A05CAA7423DAECCC94760A7D462256BD56916",
-- "7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896",
-- "38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0",
-- "FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13",
-- 1, nameSplitPattern);
--
-- add("X9.62 prime239v1", "1.2.840.10045.3.1.4", P,
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
-- "6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A",
-- "0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF",
-- "7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE",
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B",
-- 1, nameSplitPattern);
--
-- add("X9.62 prime239v2", "1.2.840.10045.3.1.5", P,
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
-- "617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C",
-- "38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7",
-- "5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA",
-- "7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063",
-- 1, nameSplitPattern);
--
-- add("X9.62 prime239v3", "1.2.840.10045.3.1.6", P,
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
-- "255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E",
-- "6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A",
-- "1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3",
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551",
-- 1, nameSplitPattern);
--
-- /* SEC2 binary curves */
-- add("sect113r1", "1.3.132.0.4", B,
-- "020000000000000000000000000201",
-- "003088250CA6E7C7FE649CE85820F7",
-- "00E8BEE4D3E2260744188BE0E9C723",
-- "009D73616F35F4AB1407D73562C10F",
-- "00A52830277958EE84D1315ED31886",
-- "0100000000000000D9CCEC8A39E56F",
-- 2, nameSplitPattern);
--
-- add("sect113r2", "1.3.132.0.5", B,
-- "020000000000000000000000000201",
-- "00689918DBEC7E5A0DD6DFC0AA55C7",
-- "0095E9A9EC9B297BD4BF36E059184F",
-- "01A57A6A7B26CA5EF52FCDB8164797",
-- "00B3ADC94ED1FE674C06E695BABA1D",
-- "010000000000000108789B2496AF93",
-- 2, nameSplitPattern);
--
-- add("sect131r1", "1.3.132.0.22", B,
-- "080000000000000000000000000000010D",
-- "07A11B09A76B562144418FF3FF8C2570B8",
-- "0217C05610884B63B9C6C7291678F9D341",
-- "0081BAF91FDF9833C40F9C181343638399",
-- "078C6E7EA38C001F73C8134B1B4EF9E150",
-- "0400000000000000023123953A9464B54D",
-- 2, nameSplitPattern);
--
-- add("sect131r2", "1.3.132.0.23", B,
-- "080000000000000000000000000000010D",
-- "03E5A88919D7CAFCBF415F07C2176573B2",
-- "04B8266A46C55657AC734CE38F018F2192",
-- "0356DCD8F2F95031AD652D23951BB366A8",
-- "0648F06D867940A5366D9E265DE9EB240F",
-- "0400000000000000016954A233049BA98F",
-- 2, nameSplitPattern);
--
-- add("sect163k1 [NIST K-163]", "1.3.132.0.1", BD,
-- "0800000000000000000000000000000000000000C9",
-- "000000000000000000000000000000000000000001",
-- "000000000000000000000000000000000000000001",
-- "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8",
-- "0289070FB05D38FF58321F2E800536D538CCDAA3D9",
-- "04000000000000000000020108A2E0CC0D99F8A5EF",
-- 2, nameSplitPattern);
--
-- add("sect163r1", "1.3.132.0.2", B,
-- "0800000000000000000000000000000000000000C9",
-- "07B6882CAAEFA84F9554FF8428BD88E246D2782AE2",
-- "0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9",
-- "0369979697AB43897789566789567F787A7876A654",
-- "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883",
-- "03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B",
-- 2, nameSplitPattern);
--
-- add("sect163r2 [NIST B-163]", "1.3.132.0.15", BD,
-- "0800000000000000000000000000000000000000C9",
-- "000000000000000000000000000000000000000001",
-- "020A601907B8C953CA1481EB10512F78744A3205FD",
-- "03F0EBA16286A2D57EA0991168D4994637E8343E36",
-- "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1",
-- "040000000000000000000292FE77E70C12A4234C33",
-- 2, nameSplitPattern);
--
-- add("sect193r1", "1.3.132.0.24", B,
-- "02000000000000000000000000000000000000000000008001",
-- "0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01",
-- "00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814",
-- "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1",
-- "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05",
-- "01000000000000000000000000C7F34A778F443ACC920EBA49",
-- 2, nameSplitPattern);
--
-- add("sect193r2", "1.3.132.0.25", B,
-- "02000000000000000000000000000000000000000000008001",
-- "0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B",
-- "00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE",
-- "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F",
-- "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C",
-- "010000000000000000000000015AAB561B005413CCD4EE99D5",
-- 2, nameSplitPattern);
--
-- add("sect233k1 [NIST K-233]", "1.3.132.0.26", BD,
-- "020000000000000000000000000000000000000004000000000000000001",
-- "000000000000000000000000000000000000000000000000000000000000",
-- "000000000000000000000000000000000000000000000000000000000001",
-- "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126",
-- "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3",
-- "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF",
-- 4, nameSplitPattern);
--
-- add("sect233r1 [NIST B-233]", "1.3.132.0.27", B,
-- "020000000000000000000000000000000000000004000000000000000001",
-- "000000000000000000000000000000000000000000000000000000000001",
-- "0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD",
-- "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B",
-- "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052",
-- "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7",
-- 2, nameSplitPattern);
--
-- add("sect239k1", "1.3.132.0.3", B,
-- "800000000000000000004000000000000000000000000000000000000001",
-- "000000000000000000000000000000000000000000000000000000000000",
-- "000000000000000000000000000000000000000000000000000000000001",
-- "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC",
-- "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA",
-- "2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5",
-- 4, nameSplitPattern);
--
-- add("sect283k1 [NIST K-283]", "1.3.132.0.16", BD,
-- "0800000000000000000000000000000000000000000000000000000000000000000010A1",
-- "000000000000000000000000000000000000000000000000000000000000000000000000",
-- "000000000000000000000000000000000000000000000000000000000000000000000001",
-- "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836",
-- "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259",
-- "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61",
-- 4, nameSplitPattern);
--
-- add("sect283r1 [NIST B-283]", "1.3.132.0.17", B,
-- "0800000000000000000000000000000000000000000000000000000000000000000010A1",
-- "000000000000000000000000000000000000000000000000000000000000000000000001",
-- "027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5",
-- "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053",
-- "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4",
-- "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307",
-- 2, nameSplitPattern);
--
-- add("sect409k1 [NIST K-409]", "1.3.132.0.36", BD,
-- "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
-- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-- "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746",
-- "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B",
-- "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF",
-- 4, nameSplitPattern);
--
-- add("sect409r1 [NIST B-409]", "1.3.132.0.37", B,
-- "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
-- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-- "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F",
-- "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7",
-- "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706",
-- "010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173",
-- 2, nameSplitPattern);
--
-- add("sect571k1 [NIST K-571]", "1.3.132.0.38", BD,
-- "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
-- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-- "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972",
-- "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3",
-- "020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001",
-- 4, nameSplitPattern);
--
-- add("sect571r1 [NIST B-571]", "1.3.132.0.39", B,
-- "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
-- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-- "02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A",
-- "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19",
-- "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B",
-- "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47",
-- 2, nameSplitPattern);
--
-- /* ANSI X9.62 binary curves */
-- add("X9.62 c2tnb191v1", "1.2.840.10045.3.0.5", B,
-- "800000000000000000000000000000000000000000000201",
-- "2866537B676752636A68F56554E12640276B649EF7526267",
-- "2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC",
-- "36B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D",
-- "765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB",
-- "40000000000000000000000004A20E90C39067C893BBB9A5",
-- 2, nameSplitPattern);
--
-- add("X9.62 c2tnb191v2", "1.2.840.10045.3.0.6", B,
-- "800000000000000000000000000000000000000000000201",
-- "401028774D7777C7B7666D1366EA432071274F89FF01E718",
-- "0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01",
-- "3809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10",
-- "17434386626D14F3DBF01760D9213A3E1CF37AEC437D668A",
-- "20000000000000000000000050508CB89F652824E06B8173",
-- 4, nameSplitPattern);
--
-- add("X9.62 c2tnb191v3", "1.2.840.10045.3.0.7", B,
-- "800000000000000000000000000000000000000000000201",
-- "6C01074756099122221056911C77D77E77A777E7E7E77FCB",
-- "71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8",
-- "375D4CE24FDE434489DE8746E71786015009E66E38A926DD",
-- "545A39176196575D985999366E6AD34CE0A77CD7127B06BE",
-- "155555555555555555555555610C0B196812BFB6288A3EA3",
-- 6, nameSplitPattern);
--
-- add("X9.62 c2tnb239v1", "1.2.840.10045.3.0.11", B,
-- "800000000000000000000000000000000000000000000000001000000001",
-- "32010857077C5431123A46B808906756F543423E8D27877578125778AC76",
-- "790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16",
-- "57927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D",
-- "61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305",
-- "2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447",
-- 4, nameSplitPattern);
--
-- add("X9.62 c2tnb239v2", "1.2.840.10045.3.0.12", B,
-- "800000000000000000000000000000000000000000000000001000000001",
-- "4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F",
-- "5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B",
-- "28F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205",
-- "5667334C45AFF3B5A03BAD9DD75E2C71A99362567D5453F7FA6E227EC833",
-- "1555555555555555555555555555553C6F2885259C31E3FCDF154624522D",
-- 6, nameSplitPattern);
--
-- add("X9.62 c2tnb239v3", "1.2.840.10045.3.0.13", B,
-- "800000000000000000000000000000000000000000000000001000000001",
-- "01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F",
-- "6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40",
-- "70F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92",
-- "2E5A0EAF6E5E1305B9004DCE5C0ED7FE59A35608F33837C816D80B79F461",
-- "0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF",
-- 0xA, nameSplitPattern);
--
-- add("X9.62 c2tnb359v1", "1.2.840.10045.3.0.18", B,
-- "800000000000000000000000000000000000000000000000000000000000000000000000100000000000000001",
-- "5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05656FB549016A96656A557",
-- "2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC345626089687742B6329E70680231988",
-- "3C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097",
-- "53D7E08529547048121E9C95F3791DD804963948F34FAE7BF44EA82365DC7868FE57E4AE2DE211305A407104BD",
-- "01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB964FE7719E74F490758D3B",
-- 0x4C, nameSplitPattern);
--
-- add("X9.62 c2tnb431r1", "1.2.840.10045.3.0.20", B,
-- "800000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000001",
-- "1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF620B0EB9906D0957F6C6FEACD615468DF104DE296CD8F",
-- "10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A919B626D4E50A8DD731B107A9962381FB5D807BF2618",
-- "120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7",
-- "20D0AF8903A96F8D5FA2C255745D3C451B302C9346D9B7E485E7BCE41F6B591F3E8F6ADDCBB0BC4C2F947A7DE1A89B625D6A598B3760",
-- "0340340340340340340340340340340340340340340340340340340323C313FAB50589703B5EC68D3587FEC60D161CC149C1AD4A91",
-- 0x2760, nameSplitPattern);
--
-- /* ANSI X9.62 binary curves from the 1998 standard but forbidden
-- * in the 2005 version of the standard.
-- * We don't register them but leave them here for the time being in
-- * case we need to support them after all.
-- */
--/*
-- add("X9.62 c2pnb163v1", "1.2.840.10045.3.0.1", B,
-- "080000000000000000000000000000000000000107",
-- "072546B5435234A422E0789675F432C89435DE5242",
-- "00C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9",
-- "07AF69989546103D79329FCC3D74880F33BBE803CB",
-- "01EC23211B5966ADEA1D3F87F7EA5848AEF0B7CA9F",
-- "0400000000000000000001E60FC8821CC74DAEAFC1",
-- 2, nameSplitPattern);
--
-- add("X9.62 c2pnb163v2", "1.2.840.10045.3.0.2", B,
-- "080000000000000000000000000000000000000107",
-- "0108B39E77C4B108BED981ED0E890E117C511CF072",
-- "0667ACEB38AF4E488C407433FFAE4F1C811638DF20",
-- "0024266E4EB5106D0A964D92C4860E2671DB9B6CC5",
-- "079F684DDF6684C5CD258B3890021B2386DFD19FC5",
-- "03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7",
-- 2, nameSplitPattern);
--
-- add("X9.62 c2pnb163v3", "1.2.840.10045.3.0.3", B,
-- "080000000000000000000000000000000000000107",
-- "07A526C63D3E25A256A007699F5447E32AE456B50E",
-- "03F7061798EB99E238FD6F1BF95B48FEEB4854252B",
-- "02F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB",
-- "05B935590C155E17EA48EB3FF3718B893DF59A05D0",
-- "03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309",
-- 2, nameSplitPattern);
--
-- add("X9.62 c2pnb176w1", "1.2.840.10045.3.0.4", B,
-- "0100000000000000000000000000000000080000000007",
-- "E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B",
-- "5DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2",
-- "8D16C2866798B600F9F08BB4A8E860F3298CE04A5798",
-- "6FA4539C2DADDDD6BAB5167D61B436E1D92BB16A562C",
-- "00010092537397ECA4F6145799D62B0A19CE06FE26AD",
-- 0xFF6E, nameSplitPattern);
--
-- add("X9.62 c2pnb208w1", "1.2.840.10045.3.0.10", B,
-- "010000000000000000000000000000000800000000000000000007",
-- "0000000000000000000000000000000000000000000000000000",
-- "C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E",
-- "89FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A",
-- "0F55B51A06E78E9AC38A035FF520D8B01781BEB1A6BB08617DE3",
-- "000101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D",
-- 0xFE48, nameSplitPattern);
--
-- add("X9.62 c2pnb272w1", "1.2.840.10045.3.0.16", B,
-- "010000000000000000000000000000000000000000000000000000010000000000000B",
-- "91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586FB20",
-- "7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E540F7",
-- "6108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D",
-- "10C7695716851EEF6BA7F6872E6142FBD241B830FF5EFCACECCAB05E02005DDE9D23",
-- "000100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521",
-- 0xFF06, nameSplitPattern);
--
-- add("X9.62 c2pnb304w1", "1.2.840.10045.3.0.17", B,
-- "010000000000000000000000000000000000000000000000000000000000000000000000000807",
-- "FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C1288078365A0396C8E681",
-- "BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C14039601E55827340BE",
-- "197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614",
-- "E19FBEB76E0DA171517ECF401B50289BF014103288527A9B416A105E80260B549FDC1B92C03B",
-- "000101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164443051D",
-- 0xFE2E, nameSplitPattern);
--
-- add("X9.62 c2pnb368w1", "1.2.840.10045.3.0.19", B,
-- "0100000000000000000000000000000000000000000000000000000000000000000000002000000000000000000007",
-- "E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C576D62F0AB7519CCD2A1A906AE30D",
-- "FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1C2112D84D164F444F8F74786046A",
-- "1085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F",
-- "7B3EB1BDDCBA62D5D8B2059B525797FC73822C59059C623A45FF3843CEE8F87CD1855ADAA81E2A0750B80FDA2310",
-- "00010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E909AE40A6F131E9CFCE5BD967",
-- 0xFF70, nameSplitPattern);
--*/
--
-- /*
-- * Brainpool curves (RFC 5639)
-- * (Twisted curves are not included)
-- */
--
-- add("brainpoolP160r1", "1.3.36.3.3.2.8.1.1.1", P,
-- "E95E4A5F737059DC60DFC7AD95B3D8139515620F",
-- "340E7BE2A280EB74E2BE61BADA745D97E8F7C300",
-- "1E589A8595423412134FAA2DBDEC95C8D8675E58",
-- "BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC3",
-- "1667CB477A1A8EC338F94741669C976316DA6321",
-- "E95E4A5F737059DC60DF5991D45029409E60FC09",
-- 1, nameSplitPattern);
--
-- add("brainpoolP192r1", "1.3.36.3.3.2.8.1.1.3", P,
-- "C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297",
-- "6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF",
-- "469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9",
-- "C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD6",
-- "14B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F",
-- "C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1",
-- 1, nameSplitPattern);
--
-- add("brainpoolP224r1", "1.3.36.3.3.2.8.1.1.5", P,
-- "D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF",
-- "68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43",
-- "2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B",
-- "0D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D",
-- "58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD",
-- "D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F",
-- 1, nameSplitPattern);
--
-- add("brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7", P,
-- "A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377",
-- "7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9",
-- "26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6",
-- "8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262",
-- "547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997",
-- "A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7",
-- 1, nameSplitPattern);
--
-- add("brainpoolP320r1", "1.3.36.3.3.2.8.1.1.9", P,
-- "D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27",
-- "3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4",
-- "520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6",
-- "43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E20611",
-- "14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1",
-- "D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311",
-- 1, nameSplitPattern);
--
-- add("brainpoolP384r1", "1.3.36.3.3.2.8.1.1.11", P,
-- "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53",
-- "7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826",
-- "04A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11",
-- "1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E",
-- "8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315",
-- "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565",
-- 1, nameSplitPattern);
--
-- add("brainpoolP512r1", "1.3.36.3.3.2.8.1.1.13", P,
-- "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3",
-- "7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA",
-- "3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723",
-- "81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822",
-- "7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892",
-- "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069",
-- 1, nameSplitPattern);
--
- specCollection = Collections.unmodifiableCollection(oidMap.values());
- }
- }
-diff --git a/test/jdk/sun/security/ec/TestEC.java b/test/jdk/sun/security/ec/TestEC.java
---- openjdk/test/jdk/sun/security/ec/TestEC.java
-+++ openjdk/test/jdk/sun/security/ec/TestEC.java
-@@ -35,8 +35,8 @@
- * @library ../pkcs11/sslecc
- * @library ../../../java/security/testlibrary
- * @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper
-- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
-- * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
-+ * @run main/othervm -Djdk.tls.namedGroups="secp256r1" TestEC
-+ * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1" TestEC
- */
-
- import java.security.NoSuchProviderException;
-diff -r bd66ea2fdde3 test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
---- openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Thu Jul 27 18:04:48 2017 +0000
-+++ openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Fri Oct 06 13:18:47 2017 +0200
-@@ -34,9 +34,9 @@
- * @library ..
- * @library ../../../../java/security/testlibrary
- * @modules jdk.crypto.cryptoki
-- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
-+ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
- * ClientJSSEServerJSSE
-- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
-+ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
- * ClientJSSEServerJSSE sm policy
- */
diff --git a/pr2126-11.patch b/pr2126-11.patch
new file mode 100644
index 0000000..6a1da4c
--- /dev/null
+++ b/pr2126-11.patch
@@ -0,0 +1,687 @@
+diff --git a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
+--- openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
++++ openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
+@@ -180,72 +180,6 @@
+ // Elliptic Curves (RFC 4492)
+ //
+ // See sun.security.util.CurveDB for the OIDs
+- // NIST K-163
+- SECT163_K1 (0x0001, "sect163k1", "1.3.132.0.1", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT163_R1 (0x0002, "sect163r1", "1.3.132.0.2", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-163
+- SECT163_R2 (0x0003, "sect163r2", "1.3.132.0.15", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT193_R1 (0x0004, "sect193r1", "1.3.132.0.24", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT193_R2 (0x0005, "sect193r2", "1.3.132.0.25", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-233
+- SECT233_K1 (0x0006, "sect233k1", "1.3.132.0.26", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-233
+- SECT233_R1 (0x0007, "sect233r1", "1.3.132.0.27", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT239_K1 (0x0008, "sect239k1", "1.3.132.0.3", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-283
+- SECT283_K1 (0x0009, "sect283k1", "1.3.132.0.16", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-283
+- SECT283_R1 (0x000A, "sect283r1", "1.3.132.0.17", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-409
+- SECT409_K1 (0x000B, "sect409k1", "1.3.132.0.36", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-409
+- SECT409_R1 (0x000C, "sect409r1", "1.3.132.0.37", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-571
+- SECT571_K1 (0x000D, "sect571k1", "1.3.132.0.38", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-571
+- SECT571_R1 (0x000E, "sect571r1", "1.3.132.0.39", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP160_K1 (0x000F, "secp160k1", "1.3.132.0.9", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP160_R1 (0x0010, "secp160r1", "1.3.132.0.8", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP160_R2 (0x0011, "secp160r2", "1.3.132.0.30", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP192_K1 (0x0012, "secp192k1", "1.3.132.0.31", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST P-192
+- SECP192_R1 (0x0013, "secp192r1", "1.2.840.10045.3.1.1", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP224_K1 (0x0014, "secp224k1", "1.3.132.0.32", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- // NIST P-224
+- SECP224_R1 (0x0015, "secp224r1", "1.3.132.0.33", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP256_K1 (0x0016, "secp256k1", "1.3.132.0.10", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+
+ // NIST P-256
+ SECP256_R1 (0x0017, "secp256r1", "1.2.840.10045.3.1.7", true,
+@@ -116,12 +116,6 @@
+ NamedGroup.SECP256_R1,
+ NamedGroup.SECP384_R1,
+ NamedGroup.SECP521_R1,
+- NamedGroup.SECT283_K1,
+- NamedGroup.SECT283_R1,
+- NamedGroup.SECT409_K1,
+- NamedGroup.SECT409_R1,
+- NamedGroup.SECT571_K1,
+- NamedGroup.SECT571_R1,
+
+ // FFDHE 2048
+ NamedGroup.FFDHE_2048,
+@@ -136,15 +130,6 @@
+ NamedGroup.SECP256_R1,
+ NamedGroup.SECP384_R1,
+ NamedGroup.SECP521_R1,
+- NamedGroup.SECT283_K1,
+- NamedGroup.SECT283_R1,
+- NamedGroup.SECT409_K1,
+- NamedGroup.SECT409_R1,
+- NamedGroup.SECT571_K1,
+- NamedGroup.SECT571_R1,
+-
+- // non-NIST curves
+- NamedGroup.SECP256_K1,
+
+ // FFDHE 2048
+ NamedGroup.FFDHE_2048,
+diff --git a/src/java.base/share/classes/sun/security/util/CurveDB.java b/src/java.base/share/classes/sun/security/util/CurveDB.java
+--- openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
++++ openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
+@@ -168,114 +168,6 @@
+ Pattern nameSplitPattern = Pattern.compile(SPLIT_PATTERN);
+
+ /* SEC2 prime curves */
+- add("secp112r1", "1.3.132.0.6", P,
+- "DB7C2ABF62E35E668076BEAD208B",
+- "DB7C2ABF62E35E668076BEAD2088",
+- "659EF8BA043916EEDE8911702B22",
+- "09487239995A5EE76B55F9C2F098",
+- "A89CE5AF8724C0A23E0E0FF77500",
+- "DB7C2ABF62E35E7628DFAC6561C5",
+- 1, nameSplitPattern);
+-
+- add("secp112r2", "1.3.132.0.7", P,
+- "DB7C2ABF62E35E668076BEAD208B",
+- "6127C24C05F38A0AAAF65C0EF02C",
+- "51DEF1815DB5ED74FCC34C85D709",
+- "4BA30AB5E892B4E1649DD0928643",
+- "adcd46f5882e3747def36e956e97",
+- "36DF0AAFD8B8D7597CA10520D04B",
+- 4, nameSplitPattern);
+-
+- add("secp128r1", "1.3.132.0.28", P,
+- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
+- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC",
+- "E87579C11079F43DD824993C2CEE5ED3",
+- "161FF7528B899B2D0C28607CA52C5B86",
+- "CF5AC8395BAFEB13C02DA292DDED7A83",
+- "FFFFFFFE0000000075A30D1B9038A115",
+- 1, nameSplitPattern);
+-
+- add("secp128r2", "1.3.132.0.29", P,
+- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
+- "D6031998D1B3BBFEBF59CC9BBFF9AEE1",
+- "5EEEFCA380D02919DC2C6558BB6D8A5D",
+- "7B6AA5D85E572983E6FB32A7CDEBC140",
+- "27B6916A894D3AEE7106FE805FC34B44",
+- "3FFFFFFF7FFFFFFFBE0024720613B5A3",
+- 4, nameSplitPattern);
+-
+- add("secp160k1", "1.3.132.0.9", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
+- "0000000000000000000000000000000000000000",
+- "0000000000000000000000000000000000000007",
+- "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB",
+- "938CF935318FDCED6BC28286531733C3F03C4FEE",
+- "0100000000000000000001B8FA16DFAB9ACA16B6B3",
+- 1, nameSplitPattern);
+-
+- add("secp160r1", "1.3.132.0.8", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC",
+- "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45",
+- "4A96B5688EF573284664698968C38BB913CBFC82",
+- "23A628553168947D59DCC912042351377AC5FB32",
+- "0100000000000000000001F4C8F927AED3CA752257",
+- 1, nameSplitPattern);
+-
+- add("secp160r2", "1.3.132.0.30", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70",
+- "B4E134D3FB59EB8BAB57274904664D5AF50388BA",
+- "52DCB034293A117E1F4FF11B30F7199D3144CE6D",
+- "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E",
+- "0100000000000000000000351EE786A818F3A1A16B",
+- 1, nameSplitPattern);
+-
+- add("secp192k1", "1.3.132.0.31", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37",
+- "000000000000000000000000000000000000000000000000",
+- "000000000000000000000000000000000000000000000003",
+- "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D",
+- "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D",
+- "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D",
+- 1, nameSplitPattern);
+-
+- add("secp192r1 [NIST P-192, X9.62 prime192v1]", "1.2.840.10045.3.1.1", PD,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+- "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1",
+- "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012",
+- "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811",
+- "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831",
+- 1, nameSplitPattern);
+-
+- add("secp224k1", "1.3.132.0.32", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D",
+- "00000000000000000000000000000000000000000000000000000000",
+- "00000000000000000000000000000000000000000000000000000005",
+- "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C",
+- "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5",
+- "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7",
+- 1, nameSplitPattern);
+-
+- add("secp224r1 [NIST P-224]", "1.3.132.0.33", PD,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
+- "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
+- "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
+- "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D",
+- 1, nameSplitPattern);
+-
+- add("secp256k1", "1.3.132.0.10", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F",
+- "0000000000000000000000000000000000000000000000000000000000000000",
+- "0000000000000000000000000000000000000000000000000000000000000007",
+- "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798",
+- "483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141",
+- 1, nameSplitPattern);
+-
+ add("secp256r1 [NIST P-256, X9.62 prime256v1]", "1.2.840.10045.3.1.7", PD,
+ "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF",
+ "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC",
+@@ -303,435 +195,6 @@
+ "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409",
+ 1, nameSplitPattern);
+
+- /* ANSI X9.62 prime curves */
+- add("X9.62 prime192v2", "1.2.840.10045.3.1.2", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+- "CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953",
+- "EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A",
+- "6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15",
+- "FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31",
+- 1, nameSplitPattern);
+-
+- add("X9.62 prime192v3", "1.2.840.10045.3.1.3", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+- "22123DC2395A05CAA7423DAECCC94760A7D462256BD56916",
+- "7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896",
+- "38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0",
+- "FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13",
+- 1, nameSplitPattern);
+-
+- add("X9.62 prime239v1", "1.2.840.10045.3.1.4", P,
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+- "6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A",
+- "0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF",
+- "7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE",
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B",
+- 1, nameSplitPattern);
+-
+- add("X9.62 prime239v2", "1.2.840.10045.3.1.5", P,
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+- "617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C",
+- "38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7",
+- "5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA",
+- "7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063",
+- 1, nameSplitPattern);
+-
+- add("X9.62 prime239v3", "1.2.840.10045.3.1.6", P,
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+- "255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E",
+- "6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A",
+- "1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3",
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551",
+- 1, nameSplitPattern);
+-
+- /* SEC2 binary curves */
+- add("sect113r1", "1.3.132.0.4", B,
+- "020000000000000000000000000201",
+- "003088250CA6E7C7FE649CE85820F7",
+- "00E8BEE4D3E2260744188BE0E9C723",
+- "009D73616F35F4AB1407D73562C10F",
+- "00A52830277958EE84D1315ED31886",
+- "0100000000000000D9CCEC8A39E56F",
+- 2, nameSplitPattern);
+-
+- add("sect113r2", "1.3.132.0.5", B,
+- "020000000000000000000000000201",
+- "00689918DBEC7E5A0DD6DFC0AA55C7",
+- "0095E9A9EC9B297BD4BF36E059184F",
+- "01A57A6A7B26CA5EF52FCDB8164797",
+- "00B3ADC94ED1FE674C06E695BABA1D",
+- "010000000000000108789B2496AF93",
+- 2, nameSplitPattern);
+-
+- add("sect131r1", "1.3.132.0.22", B,
+- "080000000000000000000000000000010D",
+- "07A11B09A76B562144418FF3FF8C2570B8",
+- "0217C05610884B63B9C6C7291678F9D341",
+- "0081BAF91FDF9833C40F9C181343638399",
+- "078C6E7EA38C001F73C8134B1B4EF9E150",
+- "0400000000000000023123953A9464B54D",
+- 2, nameSplitPattern);
+-
+- add("sect131r2", "1.3.132.0.23", B,
+- "080000000000000000000000000000010D",
+- "03E5A88919D7CAFCBF415F07C2176573B2",
+- "04B8266A46C55657AC734CE38F018F2192",
+- "0356DCD8F2F95031AD652D23951BB366A8",
+- "0648F06D867940A5366D9E265DE9EB240F",
+- "0400000000000000016954A233049BA98F",
+- 2, nameSplitPattern);
+-
+- add("sect163k1 [NIST K-163]", "1.3.132.0.1", BD,
+- "0800000000000000000000000000000000000000C9",
+- "000000000000000000000000000000000000000001",
+- "000000000000000000000000000000000000000001",
+- "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8",
+- "0289070FB05D38FF58321F2E800536D538CCDAA3D9",
+- "04000000000000000000020108A2E0CC0D99F8A5EF",
+- 2, nameSplitPattern);
+-
+- add("sect163r1", "1.3.132.0.2", B,
+- "0800000000000000000000000000000000000000C9",
+- "07B6882CAAEFA84F9554FF8428BD88E246D2782AE2",
+- "0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9",
+- "0369979697AB43897789566789567F787A7876A654",
+- "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883",
+- "03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B",
+- 2, nameSplitPattern);
+-
+- add("sect163r2 [NIST B-163]", "1.3.132.0.15", BD,
+- "0800000000000000000000000000000000000000C9",
+- "000000000000000000000000000000000000000001",
+- "020A601907B8C953CA1481EB10512F78744A3205FD",
+- "03F0EBA16286A2D57EA0991168D4994637E8343E36",
+- "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1",
+- "040000000000000000000292FE77E70C12A4234C33",
+- 2, nameSplitPattern);
+-
+- add("sect193r1", "1.3.132.0.24", B,
+- "02000000000000000000000000000000000000000000008001",
+- "0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01",
+- "00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814",
+- "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1",
+- "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05",
+- "01000000000000000000000000C7F34A778F443ACC920EBA49",
+- 2, nameSplitPattern);
+-
+- add("sect193r2", "1.3.132.0.25", B,
+- "02000000000000000000000000000000000000000000008001",
+- "0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B",
+- "00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE",
+- "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F",
+- "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C",
+- "010000000000000000000000015AAB561B005413CCD4EE99D5",
+- 2, nameSplitPattern);
+-
+- add("sect233k1 [NIST K-233]", "1.3.132.0.26", BD,
+- "020000000000000000000000000000000000000004000000000000000001",
+- "000000000000000000000000000000000000000000000000000000000000",
+- "000000000000000000000000000000000000000000000000000000000001",
+- "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126",
+- "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3",
+- "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF",
+- 4, nameSplitPattern);
+-
+- add("sect233r1 [NIST B-233]", "1.3.132.0.27", B,
+- "020000000000000000000000000000000000000004000000000000000001",
+- "000000000000000000000000000000000000000000000000000000000001",
+- "0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD",
+- "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B",
+- "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052",
+- "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7",
+- 2, nameSplitPattern);
+-
+- add("sect239k1", "1.3.132.0.3", B,
+- "800000000000000000004000000000000000000000000000000000000001",
+- "000000000000000000000000000000000000000000000000000000000000",
+- "000000000000000000000000000000000000000000000000000000000001",
+- "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC",
+- "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA",
+- "2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5",
+- 4, nameSplitPattern);
+-
+- add("sect283k1 [NIST K-283]", "1.3.132.0.16", BD,
+- "0800000000000000000000000000000000000000000000000000000000000000000010A1",
+- "000000000000000000000000000000000000000000000000000000000000000000000000",
+- "000000000000000000000000000000000000000000000000000000000000000000000001",
+- "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836",
+- "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259",
+- "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61",
+- 4, nameSplitPattern);
+-
+- add("sect283r1 [NIST B-283]", "1.3.132.0.17", B,
+- "0800000000000000000000000000000000000000000000000000000000000000000010A1",
+- "000000000000000000000000000000000000000000000000000000000000000000000001",
+- "027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5",
+- "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053",
+- "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4",
+- "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307",
+- 2, nameSplitPattern);
+-
+- add("sect409k1 [NIST K-409]", "1.3.132.0.36", BD,
+- "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
+- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+- "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746",
+- "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B",
+- "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF",
+- 4, nameSplitPattern);
+-
+- add("sect409r1 [NIST B-409]", "1.3.132.0.37", B,
+- "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
+- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+- "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F",
+- "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7",
+- "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706",
+- "010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173",
+- 2, nameSplitPattern);
+-
+- add("sect571k1 [NIST K-571]", "1.3.132.0.38", BD,
+- "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
+- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+- "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972",
+- "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3",
+- "020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001",
+- 4, nameSplitPattern);
+-
+- add("sect571r1 [NIST B-571]", "1.3.132.0.39", B,
+- "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
+- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+- "02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A",
+- "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19",
+- "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B",
+- "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47",
+- 2, nameSplitPattern);
+-
+- /* ANSI X9.62 binary curves */
+- add("X9.62 c2tnb191v1", "1.2.840.10045.3.0.5", B,
+- "800000000000000000000000000000000000000000000201",
+- "2866537B676752636A68F56554E12640276B649EF7526267",
+- "2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC",
+- "36B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D",
+- "765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB",
+- "40000000000000000000000004A20E90C39067C893BBB9A5",
+- 2, nameSplitPattern);
+-
+- add("X9.62 c2tnb191v2", "1.2.840.10045.3.0.6", B,
+- "800000000000000000000000000000000000000000000201",
+- "401028774D7777C7B7666D1366EA432071274F89FF01E718",
+- "0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01",
+- "3809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10",
+- "17434386626D14F3DBF01760D9213A3E1CF37AEC437D668A",
+- "20000000000000000000000050508CB89F652824E06B8173",
+- 4, nameSplitPattern);
+-
+- add("X9.62 c2tnb191v3", "1.2.840.10045.3.0.7", B,
+- "800000000000000000000000000000000000000000000201",
+- "6C01074756099122221056911C77D77E77A777E7E7E77FCB",
+- "71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8",
+- "375D4CE24FDE434489DE8746E71786015009E66E38A926DD",
+- "545A39176196575D985999366E6AD34CE0A77CD7127B06BE",
+- "155555555555555555555555610C0B196812BFB6288A3EA3",
+- 6, nameSplitPattern);
+-
+- add("X9.62 c2tnb239v1", "1.2.840.10045.3.0.11", B,
+- "800000000000000000000000000000000000000000000000001000000001",
+- "32010857077C5431123A46B808906756F543423E8D27877578125778AC76",
+- "790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16",
+- "57927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D",
+- "61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305",
+- "2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447",
+- 4, nameSplitPattern);
+-
+- add("X9.62 c2tnb239v2", "1.2.840.10045.3.0.12", B,
+- "800000000000000000000000000000000000000000000000001000000001",
+- "4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F",
+- "5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B",
+- "28F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205",
+- "5667334C45AFF3B5A03BAD9DD75E2C71A99362567D5453F7FA6E227EC833",
+- "1555555555555555555555555555553C6F2885259C31E3FCDF154624522D",
+- 6, nameSplitPattern);
+-
+- add("X9.62 c2tnb239v3", "1.2.840.10045.3.0.13", B,
+- "800000000000000000000000000000000000000000000000001000000001",
+- "01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F",
+- "6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40",
+- "70F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92",
+- "2E5A0EAF6E5E1305B9004DCE5C0ED7FE59A35608F33837C816D80B79F461",
+- "0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF",
+- 0xA, nameSplitPattern);
+-
+- add("X9.62 c2tnb359v1", "1.2.840.10045.3.0.18", B,
+- "800000000000000000000000000000000000000000000000000000000000000000000000100000000000000001",
+- "5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05656FB549016A96656A557",
+- "2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC345626089687742B6329E70680231988",
+- "3C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097",
+- "53D7E08529547048121E9C95F3791DD804963948F34FAE7BF44EA82365DC7868FE57E4AE2DE211305A407104BD",
+- "01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB964FE7719E74F490758D3B",
+- 0x4C, nameSplitPattern);
+-
+- add("X9.62 c2tnb431r1", "1.2.840.10045.3.0.20", B,
+- "800000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000001",
+- "1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF620B0EB9906D0957F6C6FEACD615468DF104DE296CD8F",
+- "10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A919B626D4E50A8DD731B107A9962381FB5D807BF2618",
+- "120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7",
+- "20D0AF8903A96F8D5FA2C255745D3C451B302C9346D9B7E485E7BCE41F6B591F3E8F6ADDCBB0BC4C2F947A7DE1A89B625D6A598B3760",
+- "0340340340340340340340340340340340340340340340340340340323C313FAB50589703B5EC68D3587FEC60D161CC149C1AD4A91",
+- 0x2760, nameSplitPattern);
+-
+- /* ANSI X9.62 binary curves from the 1998 standard but forbidden
+- * in the 2005 version of the standard.
+- * We don't register them but leave them here for the time being in
+- * case we need to support them after all.
+- */
+-/*
+- add("X9.62 c2pnb163v1", "1.2.840.10045.3.0.1", B,
+- "080000000000000000000000000000000000000107",
+- "072546B5435234A422E0789675F432C89435DE5242",
+- "00C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9",
+- "07AF69989546103D79329FCC3D74880F33BBE803CB",
+- "01EC23211B5966ADEA1D3F87F7EA5848AEF0B7CA9F",
+- "0400000000000000000001E60FC8821CC74DAEAFC1",
+- 2, nameSplitPattern);
+-
+- add("X9.62 c2pnb163v2", "1.2.840.10045.3.0.2", B,
+- "080000000000000000000000000000000000000107",
+- "0108B39E77C4B108BED981ED0E890E117C511CF072",
+- "0667ACEB38AF4E488C407433FFAE4F1C811638DF20",
+- "0024266E4EB5106D0A964D92C4860E2671DB9B6CC5",
+- "079F684DDF6684C5CD258B3890021B2386DFD19FC5",
+- "03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7",
+- 2, nameSplitPattern);
+-
+- add("X9.62 c2pnb163v3", "1.2.840.10045.3.0.3", B,
+- "080000000000000000000000000000000000000107",
+- "07A526C63D3E25A256A007699F5447E32AE456B50E",
+- "03F7061798EB99E238FD6F1BF95B48FEEB4854252B",
+- "02F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB",
+- "05B935590C155E17EA48EB3FF3718B893DF59A05D0",
+- "03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309",
+- 2, nameSplitPattern);
+-
+- add("X9.62 c2pnb176w1", "1.2.840.10045.3.0.4", B,
+- "0100000000000000000000000000000000080000000007",
+- "E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B",
+- "5DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2",
+- "8D16C2866798B600F9F08BB4A8E860F3298CE04A5798",
+- "6FA4539C2DADDDD6BAB5167D61B436E1D92BB16A562C",
+- "00010092537397ECA4F6145799D62B0A19CE06FE26AD",
+- 0xFF6E, nameSplitPattern);
+-
+- add("X9.62 c2pnb208w1", "1.2.840.10045.3.0.10", B,
+- "010000000000000000000000000000000800000000000000000007",
+- "0000000000000000000000000000000000000000000000000000",
+- "C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E",
+- "89FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A",
+- "0F55B51A06E78E9AC38A035FF520D8B01781BEB1A6BB08617DE3",
+- "000101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D",
+- 0xFE48, nameSplitPattern);
+-
+- add("X9.62 c2pnb272w1", "1.2.840.10045.3.0.16", B,
+- "010000000000000000000000000000000000000000000000000000010000000000000B",
+- "91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586FB20",
+- "7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E540F7",
+- "6108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D",
+- "10C7695716851EEF6BA7F6872E6142FBD241B830FF5EFCACECCAB05E02005DDE9D23",
+- "000100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521",
+- 0xFF06, nameSplitPattern);
+-
+- add("X9.62 c2pnb304w1", "1.2.840.10045.3.0.17", B,
+- "010000000000000000000000000000000000000000000000000000000000000000000000000807",
+- "FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C1288078365A0396C8E681",
+- "BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C14039601E55827340BE",
+- "197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614",
+- "E19FBEB76E0DA171517ECF401B50289BF014103288527A9B416A105E80260B549FDC1B92C03B",
+- "000101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164443051D",
+- 0xFE2E, nameSplitPattern);
+-
+- add("X9.62 c2pnb368w1", "1.2.840.10045.3.0.19", B,
+- "0100000000000000000000000000000000000000000000000000000000000000000000002000000000000000000007",
+- "E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C576D62F0AB7519CCD2A1A906AE30D",
+- "FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1C2112D84D164F444F8F74786046A",
+- "1085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F",
+- "7B3EB1BDDCBA62D5D8B2059B525797FC73822C59059C623A45FF3843CEE8F87CD1855ADAA81E2A0750B80FDA2310",
+- "00010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E909AE40A6F131E9CFCE5BD967",
+- 0xFF70, nameSplitPattern);
+-*/
+-
+- /*
+- * Brainpool curves (RFC 5639)
+- * (Twisted curves are not included)
+- */
+-
+- add("brainpoolP160r1", "1.3.36.3.3.2.8.1.1.1", P,
+- "E95E4A5F737059DC60DFC7AD95B3D8139515620F",
+- "340E7BE2A280EB74E2BE61BADA745D97E8F7C300",
+- "1E589A8595423412134FAA2DBDEC95C8D8675E58",
+- "BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC3",
+- "1667CB477A1A8EC338F94741669C976316DA6321",
+- "E95E4A5F737059DC60DF5991D45029409E60FC09",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP192r1", "1.3.36.3.3.2.8.1.1.3", P,
+- "C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297",
+- "6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF",
+- "469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9",
+- "C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD6",
+- "14B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F",
+- "C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP224r1", "1.3.36.3.3.2.8.1.1.5", P,
+- "D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF",
+- "68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43",
+- "2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B",
+- "0D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D",
+- "58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD",
+- "D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7", P,
+- "A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377",
+- "7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9",
+- "26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6",
+- "8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262",
+- "547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997",
+- "A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP320r1", "1.3.36.3.3.2.8.1.1.9", P,
+- "D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27",
+- "3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4",
+- "520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6",
+- "43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E20611",
+- "14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1",
+- "D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP384r1", "1.3.36.3.3.2.8.1.1.11", P,
+- "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53",
+- "7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826",
+- "04A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11",
+- "1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E",
+- "8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315",
+- "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP512r1", "1.3.36.3.3.2.8.1.1.13", P,
+- "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3",
+- "7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA",
+- "3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723",
+- "81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822",
+- "7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892",
+- "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069",
+- 1, nameSplitPattern);
+-
+ specCollection = Collections.unmodifiableCollection(oidMap.values());
+ }
+ }
+diff --git a/test/jdk/sun/security/ec/TestEC.java b/test/jdk/sun/security/ec/TestEC.java
+--- openjdk/test/jdk/sun/security/ec/TestEC.java
++++ openjdk/test/jdk/sun/security/ec/TestEC.java
+@@ -35,8 +35,8 @@
+ * @library ../pkcs11/sslecc
+ * @library ../../../java/security/testlibrary
+ * @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper
+- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
+- * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
++ * @run main/othervm -Djdk.tls.namedGroups="secp256r1" TestEC
++ * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1" TestEC
+ */
+
+ import java.security.NoSuchProviderException;
+diff -r bd66ea2fdde3 test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
+--- openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Thu Jul 27 18:04:48 2017 +0000
++++ openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Fri Oct 06 13:18:47 2017 +0200
+@@ -34,9 +34,9 @@
+ * @library ..
+ * @library ../../../../java/security/testlibrary
+ * @modules jdk.crypto.cryptoki
+- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
++ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
+ * ClientJSSEServerJSSE
+- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
++ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
+ * ClientJSSEServerJSSE sm policy
+ */
diff --git a/sorted-diff.patch b/sorted-diff.patch
deleted file mode 100644
index 7ba596e..0000000
--- a/sorted-diff.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- openjdk/make/gensrc/GensrcX11Wrappers.gmk
-+++ openjdk/make/gensrc/GensrcX11Wrappers.gmk
-@@ -117,7 +117,8 @@
- $(call LogInfo, Verifying X11 wrapper sizes)
- $(call MakeDir, $(@D))
- $(GENSRC_X11WRAPPERS_TMP)/sizer.$*.exe | $(SORT) > $@.tmp
-- $(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp $(GENSRC_X11WRAPPERS_TMP)/sizes.$*
-+ $(SORT) $(GENSRC_X11WRAPPERS_TMP)/sizes.$* > $(a)-orig.tmp
-+ $(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification-orig.tmp
- mv $@.tmp $@
-
- GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/sizes.$(OPENJDK_TARGET_CPU_BITS).verification
diff --git a/sources b/sources
index d6cbb37..5a4c26a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
-SHA512 (jdk-updates-jdk10u-jdk-10.0.2+13.tar.xz) = e5de419cec42e376ce341126c64370211cb09f326cdfafc64cec52640d2a2780f3ee705d51b6d025af6ca74c1525ed8d4a9d9afbe5b45f9709dd4d2242f1af08
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.1+13.tar.xz) = e5e2ffd022ee2f0311efc17de2ad7585676aac5e23fe4de821651b859f432af63da14ce356eaae0538583e58ea3de397969170ef02bbcc37b0de12da238879db
diff --git a/update_package.sh b/update_package.sh
index 4adab49..868a52d 100644
--- a/update_package.sh
+++ b/update_package.sh
@@ -31,12 +31,11 @@ else
echo ${TAPSET}
fi
-
-# OpenJDK from jdk10 updates project
-export PROJECT_NAME="jdk-updates"
-export REPO_NAME="jdk10u"
+# OpenJDK from Shenandoah project
+export PROJECT_NAME="shenandoah"
+export REPO_NAME="jdk11"
# warning, clonning without shenadnaoh suffix, you will clone pure jdk - thus without shenandaoh GC
-export VERSION="jdk-10.0.2+13"
+export VERSION="shenandoah-jdk-11.0.1+13"
export COMPRESSION=xz
# unset tapsets overrides
export OPENJDK_URL=""
5 years, 6 months
Architecture specific change in rpms/java-openjdk.git
by githook-noreply@fedoraproject.org
The package rpms/java-openjdk.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-openjdk.git/commit/?id=42d17....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit 42d178d6827a22d09a2d253b00d222a38dc4c0d8
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Fri Nov 2 15:17:07 2018 +0100
Updated to jdk11
diff --git a/.gitignore b/.gitignore
index 554b078..1fdaa39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
*.rpm
-/systemtap-tapset-3.6.0pre02.tar.xz
-/jdk-jdk10-jdk-10+46.tar.xz
-/jdk-updates-jdk10u-jdk-10.0.1+10.tar.xz
-/jdk-updates-jdk10u-jdk-10.0.2+13.tar.xz
+/systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
+/shenandoah-jdk11-b516c8c7a0a4.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11+22.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11+28.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.1+13.tar.xz
diff --git a/JDK-8201495-s390-java-opts.patch b/JDK-8201495-s390-java-opts.patch
deleted file mode 100644
index a16db0c..0000000
--- a/JDK-8201495-s390-java-opts.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1523874036 -7200
-# Mon Apr 16 12:20:36 2018 +0200
-# Node ID fc3a72e286e0d5bf9b994d1b778b39f3b080c686
-# Parent 69bae761600bdbc97953500ac51a396d31f54ee9
-8201495: [Zero] Reduce limits of max heap size for boot JDK on s390
-Reviewed-by: ihse, aph, simonis
-
-diff --git a/make/autoconf/boot-jdk.m4 b/make/autoconf/boot-jdk.m4
---- a/make/autoconf/boot-jdk.m4
-+++ b/make/autoconf/boot-jdk.m4
-@@ -405,7 +405,7 @@
- BOOTCYCLE_JVM_ARGS_BIG=-Xms64M
-
- # Maximum amount of heap memory and stack size.
-- JVM_HEAP_LIMIT_32="1024"
-+ JVM_HEAP_LIMIT_32="768"
- # Running a 64 bit JVM allows for and requires a bigger heap
- JVM_HEAP_LIMIT_64="1600"
- STACK_SIZE_32=768
diff --git a/JDK-8202262-libjsig.so-extra-link-flags.patch b/JDK-8202262-libjsig.so-extra-link-flags.patch
deleted file mode 100644
index 1e2b60c..0000000
--- a/JDK-8202262-libjsig.so-extra-link-flags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1524663215 -7200
-# Wed Apr 25 15:33:35 2018 +0200
-# Node ID c000e94e3d789bcb30d18541a3be33856bb3fe17
-# Parent a29fc1f5b37d344c771f83f528dcd223ad240e6c
-8202262: libjsig.so not linked with extra linker flags from configure
-Reviewed-by: duke
-
-diff --git a/make/hotspot/lib/CompileLibjsig.gmk b/make/hotspot/lib/CompileLibjsig.gmk
---- a/make/hotspot/lib/CompileLibjsig.gmk
-+++ b/make/hotspot/lib/CompileLibjsig.gmk
-@@ -36,7 +36,7 @@
- ifeq ($(STATIC_BUILD), false)
- ifeq ($(OPENJDK_TARGET_OS), linux)
- LIBJSIG_CFLAGS := -fPIC -D_GNU_SOURCE -D_REENTRANT $(EXTRA_CFLAGS)
-- LIBJSIG_LDFLAGS := $(LDFLAGS_HASH_STYLE) ${LDFLAGS_NO_EXEC_STACK} $(EXTRA_CFLAGS)
-+ LIBJSIG_LDFLAGS := $(LDFLAGS_HASH_STYLE) ${LDFLAGS_NO_EXEC_STACK} $(EXTRA_LDFLAGS)
- LIBJSIG_LIBS := $(LIBDL)
-
- # NOTE: The old build compiled this library without -soname.
diff --git a/JDK-8210416-RHBZ-1632174-fdlibm-opt-fix.patch b/JDK-8210416-RHBZ-1632174-fdlibm-opt-fix.patch
new file mode 100644
index 0000000..85428db
--- /dev/null
+++ b/JDK-8210416-RHBZ-1632174-fdlibm-opt-fix.patch
@@ -0,0 +1,84 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1536142767 -7200
+# Wed Sep 05 12:19:27 2018 +0200
+# Node ID 7ea57274e55054579d1532e757edb21e67beed83
+# Parent 3ee91722550680c18b977f0e00b1013323b5c9ef
+8210416: [linux] Poor StrictMath performance due to non-optimized compilation
+Summary: Compile fdlibm with -O2 -ffp-contract=off on gcc/clang arches.
+Reviewed-by: aph, erikj, dholmes, darcy
+
+diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
+--- a/make/autoconf/flags-cflags.m4
++++ b/make/autoconf/flags-cflags.m4
+@@ -373,6 +373,18 @@
+
+ FLAGS_SETUP_CFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])
+
++ COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off"
++ # Check that the compiler supports -ffp-contract=off flag
++ # Set FDLIBM_CFLAGS to -ffp-contract=off if it does. Empty
++ # otherwise.
++ # These flags are required for GCC-based builds of
++ # fdlibm with optimization without losing precision.
++ # Notably, -ffp-contract=off needs to be added for GCC >= 4.6.
++ FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${COMPILER_FP_CONTRACT_OFF_FLAG}],
++ IF_TRUE: [FDLIBM_CFLAGS=${COMPILER_FP_CONTRACT_OFF_FLAG}],
++ IF_FALSE: [FDLIBM_CFLAGS=""])
++ AC_SUBST(FDLIBM_CFLAGS)
++
+ # Tests are only ever compiled for TARGET
+ CFLAGS_TESTLIB="$CFLAGS_JDKLIB"
+ CXXFLAGS_TESTLIB="$CXXFLAGS_JDKLIB"
+diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
+--- a/make/autoconf/spec.gmk.in
++++ b/make/autoconf/spec.gmk.in
+@@ -450,6 +450,7 @@
+ LIBJSIG_HASHSTYLE_LDFLAGS := @LIBJSIG_HASHSTYLE_LDFLAGS@
+ LIBJSIG_NOEXECSTACK_LDFLAGS := @LIBJSIG_NOEXECSTACK_LDFLAGS@
+
++FDLIBM_CFLAGS := @FDLIBM_CFLAGS@
+ JVM_CFLAGS := @JVM_CFLAGS@
+ JVM_LDFLAGS := @JVM_LDFLAGS@
+ JVM_ASFLAGS := @JVM_ASFLAGS@
+diff --git a/make/lib/CoreLibraries.gmk b/make/lib/CoreLibraries.gmk
+--- a/make/lib/CoreLibraries.gmk
++++ b/make/lib/CoreLibraries.gmk
+@@ -39,20 +39,15 @@
+ BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+ endif
+
+-ifeq ($(OPENJDK_TARGET_OS), linux)
+- ifeq ($(OPENJDK_TARGET_CPU), ppc64)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- else ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- else ifeq ($(OPENJDK_TARGET_CPU), s390x)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- else ifeq ($(OPENJDK_TARGET_CPU), aarch64)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- endif
++# If FDLIBM_CFLAGS is non-empty we know that we can optimize
++# fdlibm by adding those extra C flags. Currently GCC,
++# and clang only.
++ifneq ($(FDLIBM_CFLAGS), )
++ BUILD_LIBFDLIBM_OPTIMIZATION := LOW
+ endif
+
+ LIBFDLIBM_SRC := $(TOPDIR)/src/java.base/share/native/libfdlibm
+-LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC)
++LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC) $(FDLIBM_CFLAGS)
+
+ ifneq ($(OPENJDK_TARGET_OS), macosx)
+ $(eval $(call SetupNativeCompilation, BUILD_LIBFDLIBM, \
+@@ -64,10 +59,6 @@
+ CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \
+ CFLAGS_windows_debug := -DLOGGING, \
+ CFLAGS_aix := -qfloat=nomaf, \
+- CFLAGS_linux_ppc64 := -ffp-contract=off, \
+- CFLAGS_linux_ppc64le := -ffp-contract=off, \
+- CFLAGS_linux_s390x := -ffp-contract=off, \
+- CFLAGS_linux_aarch64 := -ffp-contract=off, \
+ DISABLED_WARNINGS_gcc := sign-compare misleading-indentation, \
+ DISABLED_WARNINGS_microsoft := 4146 4244 4018, \
+ ARFLAGS := $(ARFLAGS), \
diff --git a/JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch b/JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch
new file mode 100644
index 0000000..843ae3c
--- /dev/null
+++ b/JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch
@@ -0,0 +1,48 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1536682731 -7200
+# Tue Sep 11 18:18:51 2018 +0200
+# Node ID 7157249fdd4366d95dd68f3d083ebb0ef84c753b
+# Parent 8d86b149e10f0a0896e5fd4d8d407e5fda64a529
+8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
+Reviewed-by: duke
+
+diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
+--- a/make/hotspot/lib/JvmOverrideFiles.gmk
++++ b/make/hotspot/lib/JvmOverrideFiles.gmk
+@@ -43,20 +43,26 @@ ifeq ($(TOOLCHAIN_TYPE), gcc)
+ endif
+ endif
+
++LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NONE)
++# If the FDLIBM_CFLAGS variable is non-empty we know
++# that the fdlibm-fork in hotspot can get optimized
++# by using -ffp-contract=off on GCC/Clang platforms.
++ifneq ($(FDLIBM_CFLAGS), )
++ LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NORM)
++endif
++
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+ BUILD_LIBJVM_ostream.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
+ BUILD_LIBJVM_logFileOutput.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
+
+- ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
+- BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(CXX_O_FLAG_NONE)
+- BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := -DNO_PCH $(CXX_O_FLAG_NONE)
++ BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
++ BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
+
+- ifeq ($(TOOLCHAIN_TYPE), clang)
+- JVM_PRECOMPILED_HEADER_EXCLUDE := \
+- sharedRuntimeTrig.cpp \
+- sharedRuntimeTrans.cpp \
+- #
+- endif
++ ifeq ($(TOOLCHAIN_TYPE), clang)
++ JVM_PRECOMPILED_HEADER_EXCLUDE := \
++ sharedRuntimeTrig.cpp \
++ sharedRuntimeTrans.cpp \
++ #
+ endif
+
+ ifeq ($(OPENJDK_TARGET_CPU), x86)
diff --git a/JDK-8210647-RHBZ-1632174-libsaproc-opt-fix.patch b/JDK-8210647-RHBZ-1632174-libsaproc-opt-fix.patch
new file mode 100644
index 0000000..a279f8a
--- /dev/null
+++ b/JDK-8210647-RHBZ-1632174-libsaproc-opt-fix.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1536751862 -7200
+# Wed Sep 12 13:31:02 2018 +0200
+# Node ID f95c6746fe256fe0456e0ea0d2930631ef840286
+# Parent 7157249fdd4366d95dd68f3d083ebb0ef84c753b
+8210647: libsaproc is being compiled without optimization
+Reviewed-by: duke
+
+diff --git a/make/lib/Lib-jdk.hotspot.agent.gmk b/make/lib/Lib-jdk.hotspot.agent.gmk
+--- a/make/lib/Lib-jdk.hotspot.agent.gmk
++++ b/make/lib/Lib-jdk.hotspot.agent.gmk
+@@ -52,7 +52,7 @@
+
+ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
+ NAME := saproc, \
+- OPTIMIZATION := NONE, \
++ OPTIMIZATION := LOW, \
+ DISABLED_WARNINGS_microsoft := 4267, \
+ DISABLED_WARNINGS_gcc := sign-compare, \
+ DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \
diff --git a/JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch b/JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch
new file mode 100644
index 0000000..6fc6c07
--- /dev/null
+++ b/JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1536829660 -7200
+# Thu Sep 13 11:07:40 2018 +0200
+# Node ID 39ccca116f79139fc4b779f5df83cb32357b9ae9
+# Parent 7512bd28304cf0dc5676247990f1907162c719ca
+8210703: vmStructs.cpp compiled with -O0
+Reviewed-by: duke
+
+diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
+--- a/make/hotspot/lib/JvmOverrideFiles.gmk
++++ b/make/hotspot/lib/JvmOverrideFiles.gmk
+@@ -30,7 +30,7 @@
+ # status for individual files on specific platforms.
+
+ ifeq ($(TOOLCHAIN_TYPE), gcc)
+- BUILD_LIBJVM_vmStructs.cpp_CXXFLAGS := -fno-var-tracking-assignments -O0
++ BUILD_LIBJVM_vmStructs.cpp_CXXFLAGS := -fno-var-tracking-assignments
+ BUILD_LIBJVM_jvmciCompilerToVM.cpp_CXXFLAGS := -fno-var-tracking-assignments
+ BUILD_LIBJVM_jvmciCompilerToVMInit.cpp_CXXFLAGS := -fno-var-tracking-assignments
+ BUILD_LIBJVM_assembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
diff --git a/JDK-8210761-RHBZ-1632174-libjsig-opt-fix.patch b/JDK-8210761-RHBZ-1632174-libjsig-opt-fix.patch
new file mode 100644
index 0000000..b5a88b0
--- /dev/null
+++ b/JDK-8210761-RHBZ-1632174-libjsig-opt-fix.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1537541916 -7200
+# Fri Sep 21 16:58:36 2018 +0200
+# Node ID cd8483acfe56ade257685d93323f78e6e13704a0
+# Parent e40fa3a70efdbc22f85c0d30350189f632779831
+8210761: libjsig is being compiled without optimization
+Reviewed-by: duke
+
+diff --git a/make/lib/Lib-java.base.gmk b/make/lib/Lib-java.base.gmk
+--- a/make/lib/Lib-java.base.gmk
++++ b/make/lib/Lib-java.base.gmk
+@@ -138,6 +138,7 @@
+
+ $(eval $(call SetupJdkLibrary, BUILD_LIBJSIG, \
+ NAME := jsig, \
++ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(LIBJSIG_CFLAGS), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
diff --git a/JDK-8211105-aarch64-log-sin-intrinsics-disable.patch b/JDK-8211105-aarch64-log-sin-intrinsics-disable.patch
new file mode 100644
index 0000000..734ee89
--- /dev/null
+++ b/JDK-8211105-aarch64-log-sin-intrinsics-disable.patch
@@ -0,0 +1,35 @@
+# HG changeset patch
+# User adinn
+# Date 1537977709 -3600
+# Wed Sep 26 17:01:49 2018 +0100
+# Node ID 18426968f11cd0c3b238dec365003798d07576fc
+# Parent 0abe9de66ea9e1371bf35a2394daf31d8bfada98
+8211105: AArch64: Disable cos/sin and log intrinsics in jdk11u pending fix
+Summary: AArch64 cos/sin and log intrinsics are currently broken so should be disabled
+Reviewed-by: aph, shade
+
+diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
++++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+@@ -5741,15 +5741,18 @@
+ }
+
+ if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dlog)) {
+- StubRoutines::_dlog = generate_dlog();
++ // disabled pending fix and retest of generated code via JDK-8210858
++ // StubRoutines::_dlog = generate_dlog();
+ }
+
+ if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin)) {
+- StubRoutines::_dsin = generate_dsin_dcos(/* isCos = */ false);
++ // disabled pending fix and retest of generated code via JDK-8210461
++ // StubRoutines::_dsin = generate_dsin_dcos(/* isCos = */ false);
+ }
+
+ if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos)) {
+- StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true);
++ // disabled pending fix and retest of generated code via JDK-8210461
++ // StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true);
+ }
+ }
+
diff --git a/README.md b/README.md
index e3ebf0c..c21900a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
Rolling release of (usually) STSs OpenJDK
OpenJDK have release cadence of 6 months. but 3/4 of them are Short Term Supported for 6 months only. This package is designed to harbore them. Currently it is build on openJDK 10. LTSs (next is 11) will go as separate packages.
-JDK10 is next major release of Java platform. It is bringing many cool improvements - http://openjdk.java.net/projects/jdk/10/ and is landing to your Fedora. Where it will be maintained for f27 and newer. Unluckily, it is STS (short term support) version. Between individual LTS will be always several STS. Again, please See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html and See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf . So this is rolling release of all STSs to come. Its fate during the release of fresh LTS is yet to be decided. You will always be allowed to install Used LTS in fedora build root, alongside with latest STS via alternatives.
+JDK11 is last release of Java platform. It is bringing many cool improvements - http://openjdk.java.net/projects/jdk/11/ and is landing to your Fedora. Where it will be maintained for f27 and newer. Unluckily, this package is STS (short term support) version. Between individual LTS will be always several STS. Again, please See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html and See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf . So this is rolling release of all STSs to come. Its fate during the release of fresh LTS is yet to be decided. You will always be allowed to install Used LTS in fedora build root, alongside with latest STS via alternatives.
See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html
@@ -9,3 +9,4 @@ See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaRe
https://bugzilla.redhat.com/show_bug.cgi?id=1557371#c0
https://fedoraproject.org/wiki/Changes/java-openjdk-10
+https://fedoraproject.org/wiki/Changes/java-11-openjdk-TechPreview
diff --git a/RHBZ-1565658-system-nss-SunEC.patch b/RHBZ-1565658-system-nss-SunEC.patch
index 7b1d4aa..42ce7cd 100644
--- a/RHBZ-1565658-system-nss-SunEC.patch
+++ b/RHBZ-1565658-system-nss-SunEC.patch
@@ -1,7 +1,7 @@
-diff --git openjdk/make/autoconf/jdk-options.m4 openjdk/make/autoconf/jdk-options.m4
---- openjdk/make/autoconf/jdk-options.m4
-+++ openjdk/make/autoconf/jdk-options.m4
-@@ -264,9 +264,10 @@
+diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
+--- a/make/autoconf/jdk-options.m4
++++ b/make/autoconf/jdk-options.m4
+@@ -267,9 +267,10 @@
#
AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
[
@@ -13,10 +13,10 @@ diff --git openjdk/make/autoconf/jdk-options.m4 openjdk/make/autoconf/jdk-option
ENABLE_INTREE_EC=true
AC_MSG_RESULT([yes])
else
-diff --git openjdk/make/autoconf/libraries.m4 openjdk/make/autoconf/libraries.m4
---- openjdk/make/autoconf/libraries.m4
-+++ openjdk/make/autoconf/libraries.m4
-@@ -175,6 +175,48 @@
+diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
+--- a/make/autoconf/libraries.m4
++++ b/make/autoconf/libraries.m4
+@@ -178,6 +178,48 @@
AC_SUBST(LIBDL)
LIBS="$save_LIBS"
@@ -65,10 +65,10 @@ diff --git openjdk/make/autoconf/libraries.m4 openjdk/make/autoconf/libraries.m4
# Deprecated libraries, keep the flags for backwards compatibility
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
BASIC_DEPRECATED_ARG_WITH([dxsdk])
-diff --git openjdk/make/autoconf/spec.gmk.in openjdk/make/autoconf/spec.gmk.in
---- openjdk/make/autoconf/spec.gmk.in
-+++ openjdk/make/autoconf/spec.gmk.in
-@@ -764,6 +764,10 @@
+diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
+--- a/make/autoconf/spec.gmk.in
++++ b/make/autoconf/spec.gmk.in
+@@ -795,6 +795,10 @@
# Libraries
#
@@ -79,50 +79,38 @@ diff --git openjdk/make/autoconf/spec.gmk.in openjdk/make/autoconf/spec.gmk.in
USE_EXTERNAL_LCMS:=@USE_EXTERNAL_LCMS@
LCMS_CFLAGS:=@LCMS_CFLAGS@
LCMS_LIBS:=@LCMS_LIBS@
-diff --git openjdk/make/lib/Lib-jdk.crypto.ec.gmk openjdk/make/lib/Lib-jdk.crypto.ec.gmk
---- openjdk/make/lib/Lib-jdk.crypto.ec.gmk
-+++ openjdk/make/lib/Lib-jdk.crypto.ec.gmk
-@@ -29,9 +29,15 @@
-
- ifeq ($(ENABLE_INTREE_EC), true)
-
-- LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec
- BUILD_LIBSUNEC_FLAGS := $(addprefix -I, $(SUNEC_SRC))
+diff --git a/make/lib/Lib-jdk.crypto.ec.gmk b/make/lib/Lib-jdk.crypto.ec.gmk
+--- a/make/lib/Lib-jdk.crypto.ec.gmk
++++ b/make/lib/Lib-jdk.crypto.ec.gmk
+@@ -38,6 +38,11 @@
+ BUILD_LIBSUNEC_CXXFLAGS_JDKLIB := $(CXXFLAGS_JDKLIB)
+ endif
+ ifeq ($(USE_EXTERNAL_NSS), true)
-+ LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
-+ BUILD_LIBSUNEC_FLAGS += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
-+ else
-+ LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec
++ BUILD_LIBSUNEC_CFLAGS_JDKLIB += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
++ BUILD_LIBSUNEC_CXXFLAGS_JDKLIB += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
+ endif
+
- #
- # On sol-sparc...all libraries are compiled with -xregs=no%appl
- # (set in CFLAGS_REQUIRED_sparc)
-@@ -60,7 +66,7 @@
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
+ $(eval $(call SetupJdkLibrary, BUILD_LIBSUNEC, \
+ NAME := sunec, \
+ TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
+@@ -47,9 +52,11 @@
+ CXXFLAGS := $(BUILD_LIBSUNEC_CXXFLAGS_JDKLIB), \
+ DISABLED_WARNINGS_gcc := sign-compare implicit-fallthrough, \
+ DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \
+- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
++ LDFLAGS := $(subst -Xlinker --as-needed,, \
++ $(subst -Wl$(COMMA)--as-needed,, $(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK), \
LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS := $(LIBCXX), \
-- LIBS_linux := -lc, \
+ LIBS_linux := -lc $(NSS_LIBS), \
- LIBS_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
- RC_FLAGS := $(RC_FLAGS) \
-diff --git openjdk/make/mapfiles/libsunec/mapfile-vers openjdk/make/mapfiles/libsunec/mapfile-vers
---- openjdk/make/mapfiles/libsunec/mapfile-vers
-+++ openjdk/make/mapfiles/libsunec/mapfile-vers
-@@ -31,6 +31,7 @@
- Java_sun_security_ec_ECDSASignature_signDigest;
- Java_sun_security_ec_ECDSASignature_verifySignedDigest;
- Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
-+ Java_sun_security_ec_SunEC_initialize;
- local:
- *;
- };
-diff --git openjdk/src/java.base/unix/native/include/jni_md.h openjdk/src/java.base/unix/native/include/jni_md.h
---- openjdk/src/java.base/unix/native/include/jni_md.h
-+++ openjdk/src/java.base/unix/native/include/jni_md.h
-@@ -36,6 +36,11 @@
+ ))
+
+ TARGETS += $(BUILD_LIBSUNEC)
+diff --git a/src/java.base/unix/native/include/jni_md.h b/src/java.base/unix/native/include/jni_md.h
+--- a/src/java.base/unix/native/include/jni_md.h
++++ b/src/java.base/unix/native/include/jni_md.h
+@@ -41,6 +41,11 @@
#define JNIEXPORT
#define JNIIMPORT
#endif
@@ -134,9 +122,9 @@ diff --git openjdk/src/java.base/unix/native/include/jni_md.h openjdk/src/java.b
#define JNICALL
-diff --git openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
---- openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
-+++ openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
+diff --git a/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
+--- a/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
++++ b/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
@@ -61,6 +61,7 @@
AccessController.doPrivileged(new PrivilegedAction<Void>() {
public Void run() {
@@ -145,19 +133,21 @@ diff --git openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java op
return null;
}
});
-@@ -272,4 +273,9 @@
- putService(new ProviderService(this, "KeyAgreement",
+@@ -293,6 +294,11 @@
"ECDH", "sun.security.ec.ECDHKeyAgreement", null, ATTRS));
}
-+
+
+ /**
+ * Initialize the native code.
+ */
+ private static native void initialize();
- }
-diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
---- openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
-+++ openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
++
+ private void putXDHEntries() {
+
+ HashMap<String, String> ATTRS = new HashMap<>(1);
+diff --git a/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp b/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
+--- a/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
++++ b/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
@@ -25,7 +25,11 @@
#include <jni.h>
@@ -167,9 +157,9 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
+#else
#include "impl/ecc_impl.h"
+#endif
-
- #define ILLEGAL_STATE_EXCEPTION "java/lang/IllegalStateException"
- #define INVALID_ALGORITHM_PARAMETER_EXCEPTION \
+ #include "sun_security_ec_ECDHKeyAgreement.h"
+ #include "sun_security_ec_ECKeyPairGenerator.h"
+ #include "sun_security_ec_ECDSASignature.h"
@@ -33,6 +37,13 @@
#define INVALID_PARAMETER_EXCEPTION \
"java/security/InvalidParameterException"
@@ -207,7 +197,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
}
jbyteArray getEncodedBytes(JNIEnv *env, SECItem *hSECItem)
-@@ -95,7 +112,7 @@
+@@ -139,7 +156,7 @@
*/
JNIEXPORT jobjectArray
JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair
@@ -216,7 +206,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
{
ECPrivateKey *privKey = NULL; // contains both public and private values
ECParams *ecparams = NULL;
-@@ -127,8 +144,17 @@
+@@ -171,8 +188,17 @@
env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
// Generate the new keypair (using the supplied seed)
@@ -234,7 +224,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
ThrowException(env, KEY_EXCEPTION);
goto cleanup;
}
-@@ -175,10 +201,15 @@
+@@ -219,10 +245,15 @@
}
if (privKey) {
FreeECParams(&privKey->ecParams, false);
@@ -250,7 +240,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
}
if (pSeedBuffer) {
-@@ -196,7 +227,7 @@
+@@ -240,7 +271,7 @@
*/
JNIEXPORT jbyteArray
JNICALL Java_sun_security_ec_ECDSASignature_signDigest
@@ -259,7 +249,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
{
jbyte* pDigestBuffer = NULL;
jint jDigestLength = env->GetArrayLength(digest);
-@@ -255,8 +286,18 @@
+@@ -299,8 +330,18 @@
env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
// Sign the digest (using the supplied seed)
@@ -278,7 +268,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
ThrowException(env, KEY_EXCEPTION);
goto cleanup;
}
-@@ -305,7 +346,7 @@
+@@ -349,7 +390,7 @@
*/
JNIEXPORT jboolean
JNICALL Java_sun_security_ec_ECDSASignature_verifySignedDigest
@@ -287,7 +277,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
{
jboolean isValid = false;
-@@ -362,9 +403,10 @@
+@@ -406,9 +447,10 @@
cleanup:
{
@@ -299,7 +289,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
if (pubKey.publicValue.data)
env->ReleaseByteArrayElements(publicKey,
-@@ -390,7 +432,7 @@
+@@ -434,7 +476,7 @@
*/
JNIEXPORT jbyteArray
JNICALL Java_sun_security_ec_ECDHKeyAgreement_deriveKey
@@ -308,7 +298,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
{
jbyteArray jSecret = NULL;
ECParams *ecparams = NULL;
-@@ -466,9 +508,10 @@
+@@ -510,9 +552,10 @@
env->ReleaseByteArrayElements(publicKey,
(jbyte *) publicValue_item.data, JNI_ABORT);
@@ -320,7 +310,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
if (ecparams)
FreeECParams(ecparams, true);
-@@ -477,4 +520,28 @@
+@@ -521,4 +564,28 @@
return jSecret;
}
@@ -349,10 +339,10 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
+}
+
} /* extern "C" */
-diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h openjdk/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
+diff --git a/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h b/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
new file mode 100644
--- /dev/null
-+++ openjdk/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
++++ b/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
@@ -0,0 +1,298 @@
+/*
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 32dd399..62218ba 100644
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Generates the 'source tarball' for JDK 8 projects.
+# Generates the 'source tarball' for JDK projects.
#
# Example:
# When used from local repo set REPO_ROOT pointing to file:// with your repo
@@ -123,7 +123,7 @@ pushd "${FILE_NAME_ROOT}"
# get pr2126.patch (from http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d2c9a898f50) from most correct tag
# Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2126)
# there is currnetly no "upstram version of this patch, hardcoding custom version
- PR2126="../../pr2126-10.patch"
+ PR2126="../../pr2126-11.patch"
fi;
echo "Applying ${PR2126}"
patch -Np1 < $PR2126
diff --git a/java-openjdk-s390-size_t.patch b/java-openjdk-s390-size_t.patch
deleted file mode 100644
index 920624c..0000000
--- a/java-openjdk-s390-size_t.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
---- a/src/hotspot/share/code/codeCache.cpp
-+++ b/src/hotspot/share/code/codeCache.cpp
-@@ -405,7 +405,7 @@
- add_heap(heap);
-
- // Reserve Space
-- size_t size_initial = MIN2(InitialCodeCacheSize, rs.size());
-+ size_t size_initial = MIN2((size_t)InitialCodeCacheSize, rs.size());
- size_initial = align_up(size_initial, os::vm_page_size());
- if (!heap->reserve(rs, size_initial, CodeCacheSegmentSize)) {
- vm_exit_during_initialization(err_msg("Could not reserve enough space in %s (" SIZE_FORMAT "K)",
-diff --git a/src/hotspot/share/gc/cms/parNewGeneration.cpp b/src/hotspot/share/gc/cms/parNewGeneration.cpp
---- a/src/hotspot/share/gc/cms/parNewGeneration.cpp
-+++ b/src/hotspot/share/gc/cms/parNewGeneration.cpp
-@@ -200,7 +200,7 @@
- const size_t num_overflow_elems = of_stack->size();
- const size_t space_available = queue->max_elems() - queue->size();
- const size_t num_take_elems = MIN3(space_available / 4,
-- ParGCDesiredObjsFromOverflowList,
-+ (size_t)ParGCDesiredObjsFromOverflowList,
- num_overflow_elems);
- // Transfer the most recent num_take_elems from the overflow
- // stack to our work queue.
-diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
---- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
-+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
-@@ -2296,7 +2296,7 @@
- // of things to do) or totally (at the very end).
- size_t target_size;
- if (partially) {
-- target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
-+ target_size = MIN2((size_t)_task_queue->max_elems()/3, (size_t)GCDrainStackTargetSize);
- } else {
- target_size = 0;
- }
-diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
---- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
-+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
-@@ -31,7 +31,7 @@
- }
-
- size_t G1CMObjArrayProcessor::process_array_slice(objArrayOop obj, HeapWord* start_from, size_t remaining) {
-- size_t words_to_scan = MIN2(remaining, ObjArrayMarkingStride);
-+ size_t words_to_scan = MIN2(remaining, (size_t)ObjArrayMarkingStride);
-
- if (remaining > ObjArrayMarkingStride) {
- push_array_slice(start_from + ObjArrayMarkingStride);
-diff --git a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
---- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
-+++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
-@@ -100,7 +100,7 @@
- return reserved_size() - committed_size();
- }
-
--size_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
-+uintptr_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
- return (addr - _low_boundary) / _page_size;
- }
-
-diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
---- a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
-+++ b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
-@@ -115,7 +115,7 @@
- const size_t beg_index = size_t(index);
- assert(beg_index < len || len == 0, "index too large");
-
-- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
-+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
- const size_t end_index = beg_index + stride;
- T* const base = (T*)obj->base();
- T* const beg = base + beg_index;
-diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
---- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
-+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
-@@ -905,8 +905,8 @@
- void PSParallelCompact::initialize_dead_wood_limiter()
- {
- const size_t max = 100;
-- _dwl_mean = double(MIN2(ParallelOldDeadWoodLimiterMean, max)) / 100.0;
-- _dwl_std_dev = double(MIN2(ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
-+ _dwl_mean = double(MIN2((size_t)ParallelOldDeadWoodLimiterMean, max)) / 100.0;
-+ _dwl_std_dev = double(MIN2((size_t)ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
- _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
- DEBUG_ONLY(_dwl_initialized = true;)
- _dwl_adjustment = normal_distribution(1.0);
-diff --git a/src/hotspot/share/gc/shared/plab.cpp b/src/hotspot/share/gc/shared/plab.cpp
---- a/src/hotspot/share/gc/shared/plab.cpp
-+++ b/src/hotspot/share/gc/shared/plab.cpp
-@@ -32,7 +32,7 @@
-
- size_t PLAB::min_size() {
- // Make sure that we return something that is larger than AlignmentReserve
-- return align_object_size(MAX2(MinTLABSize / HeapWordSize, (uintx)oopDesc::header_size())) + AlignmentReserve;
-+ return align_object_size(MAX2(MinTLABSize / HeapWordSize, (size_t)oopDesc::header_size())) + AlignmentReserve;
- }
-
- size_t PLAB::max_size() {
-diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
---- a/src/hotspot/share/prims/whitebox.cpp
-+++ b/src/hotspot/share/prims/whitebox.cpp
-@@ -1096,7 +1096,7 @@
- WB_END
-
- WB_ENTRY(jobject, WB_GetSizeTVMFlag(JNIEnv* env, jobject o, jstring name))
-- uintx result;
-+ size_t result;
- if (GetVMFlag <size_t> (thread, env, name, &result, &CommandLineFlags::size_tAt)) {
- ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI
- return longBox(thread, env, result);
-diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
---- a/src/hotspot/share/runtime/arguments.cpp
-+++ b/src/hotspot/share/runtime/arguments.cpp
-@@ -1586,7 +1586,7 @@
- // Increase the code cache size - tiered compiles a lot more.
- if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) {
- FLAG_SET_ERGO(uintx, ReservedCodeCacheSize,
-- MIN2(CODE_CACHE_DEFAULT_LIMIT, ReservedCodeCacheSize * 5));
-+ MIN2(CODE_CACHE_DEFAULT_LIMIT, (size_t)(ReservedCodeCacheSize * 5)));
- }
- // Enable SegmentedCodeCache if TieredCompilation is enabled and ReservedCodeCacheSize >= 240M
- if (FLAG_IS_DEFAULT(SegmentedCodeCache) && ReservedCodeCacheSize >= 240*M) {
-diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
---- a/src/hotspot/share/runtime/arguments.hpp
-+++ b/src/hotspot/share/runtime/arguments.hpp
-@@ -328,7 +328,7 @@
- // Value of the conservative maximum heap alignment needed
- static size_t _conservative_max_heap_alignment;
-
-- static uintx _min_heap_size;
-+ static size_t _min_heap_size;
-
- // -Xrun arguments
- static AgentLibraryList _libraryList;
diff --git a/java-openjdk.spec b/java-openjdk.spec
index 95d7635..687ad70 100644
--- a/java-openjdk.spec
+++ b/java-openjdk.spec
@@ -54,7 +54,7 @@
%global ppc64be ppc64 ppc64p7
%global multilib_arches %{power64} sparc64 x86_64
%global jit_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} s390x
-%global aot_arches x86_64
+%global aot_arches x86_64 %{aarch64}
# By default, we build a debug build during main build on JIT architectures
%if %{with slowdebug}
@@ -71,6 +71,13 @@
%global include_debug_build 0
%endif
+# On x86_64 and AArch64, we use the Shenandoah HotSpot
+%ifarch x86_64 %{aarch64}
+%global use_shenandoah_hotspot 1
+%else
+%global use_shenandoah_hotspot 0
+%endif
+
%if %{include_debug_build}
%global build_loop2 %{debug_suffix}
%else
@@ -120,12 +127,8 @@
%global NSS_BUILDTIME_VERSION %(if [ "x%{NSS_BUILDTIME_NUMBER}" == "x" ] ; then echo "" ;else echo ">= %{NSS_BUILDTIME_NUMBER}" ;fi)
-# Fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349.
-# See also https://bugzilla.redhat.com/show_bug.cgi?id=1590796
-# as to why some libraries *cannot* be excluded. In particular,
-# these are:
-# libjsig.so, libjava.so, libjawt.so, libjvm.so and libverify.so
-%global _privatelibs libjsoundalsa[.]so.*|libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas_unix[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libunpack[.]so.*|libzip[.]so.*|lib[.]so\\(SUNWprivate_.*
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
+%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libunpack[.]so.*|libzip[.]so.*
%global __provides_exclude ^(%{_privatelibs})$
%global __requires_exclude ^(%{_privatelibs})$
@@ -185,8 +188,21 @@
%endif
# New Version-String scheme-style defines
-%global majorver 10
-%global securityver 2
+%global majorver 11
+%global securityver 1
+# Used via new version scheme. JDK 11 was
+# GA'ed in September 2018 => 18.9
+%global vendor_version_string 18.9
+# Add LTS designator for RHEL builds
+%if 0%{?rhel}
+ # the rolling release isneverpacked for rhel,
+ # nro even in epel, will this LTS be used
+ %global lts_designator "LTS"
+ %global lts_designator_zip -%{lts_designator}
+%else
+ %global lts_designator ""
+ %global lts_designator_zip ""
+%endif
# Standard JPackage naming and versioning defines
%global origin openjdk
@@ -209,7 +225,7 @@
# output dir stub
%define buildoutputdir() %{expand:openjdk/build%{?1}}
# we can copy the javadoc to not arched dir, or make it not noarch
-%define uniquejavadocdir() %{expand:%{fullversion}%{?1}}
+%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
# main id and dir of this jdk
%define uniquesuffix() %{expand:%{fullversion}.%{_arch}%{?1}}
@@ -269,12 +285,9 @@ alternatives \\
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\
--slave %{_bindir}/jjs jjs %{jrebindir -- %{?1}}/jjs \\
--slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
- --slave %{_bindir}/orbd orbd %{jrebindir -- %{?1}}/orbd \\
--slave %{_bindir}/pack200 pack200 %{jrebindir -- %{?1}}/pack200 \\
--slave %{_bindir}/rmid rmid %{jrebindir -- %{?1}}/rmid \\
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- %{?1}}/rmiregistry \\
- --slave %{_bindir}/servertool servertool %{jrebindir -- %{?1}}/servertool \\
- --slave %{_bindir}/tnameserv tnameserv %{jrebindir -- %{?1}}/tnameserv \\
--slave %{_bindir}/unpack200 unpack200 %{jrebindir -- %{?1}}/unpack200 \\
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
@@ -282,18 +295,12 @@ alternatives \\
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/orbd.1$ext orbd.1$ext \\
- %{_mandir}/man1/orbd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \\
%{_mandir}/man1/pack200-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/rmid.1$ext rmid.1$ext \\
%{_mandir}/man1/rmid-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \\
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/servertool.1$ext servertool.1$ext \\
- %{_mandir}/man1/servertool-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/tnameserv.1$ext tnameserv.1$ext \\
- %{_mandir}/man1/tnameserv-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/unpack200.1$ext unpack200.1$ext \\
%{_mandir}/man1/unpack200-%{uniquesuffix -- %{?1}}.1$ext
@@ -350,14 +357,16 @@ ext=.gz
alternatives \\
--install %{_bindir}/javac javac %{sdkbindir -- %{?1}}/javac $PRIORITY --family %{name}.%{_arch} \\
--slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir -- %{?1}} \\
- --slave %{_bindir}/appletviewer appletviewer %{sdkbindir -- %{?1}}/appletviewer \\
%ifarch %{aot_arches}
--slave %{_bindir}/jaotc jaotc %{sdkbindir -- %{?1}}/jaotc \\
%endif
--slave %{_bindir}/jlink jlink %{sdkbindir -- %{?1}}/jlink \\
--slave %{_bindir}/jmod jmod %{sdkbindir -- %{?1}}/jmod \\
+%ifarch %{jit_arches}
+%ifnarch s390x
--slave %{_bindir}/jhsdb jhsdb %{sdkbindir -- %{?1}}/jhsdb \\
- --slave %{_bindir}/idlj idlj %{sdkbindir -- %{?1}}/idlj \\
+%endif
+%endif
--slave %{_bindir}/jar jar %{sdkbindir -- %{?1}}/jar \\
--slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\
--slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\
@@ -377,15 +386,7 @@ alternatives \\
--slave %{_bindir}/jstat jstat %{sdkbindir -- %{?1}}/jstat \\
--slave %{_bindir}/jstatd jstatd %{sdkbindir -- %{?1}}/jstatd \\
--slave %{_bindir}/rmic rmic %{sdkbindir -- %{?1}}/rmic \\
- --slave %{_bindir}/schemagen schemagen %{sdkbindir -- %{?1}}/schemagen \\
--slave %{_bindir}/serialver serialver %{sdkbindir -- %{?1}}/serialver \\
- --slave %{_bindir}/wsgen wsgen %{sdkbindir -- %{?1}}/wsgen \\
- --slave %{_bindir}/wsimport wsimport %{sdkbindir -- %{?1}}/wsimport \\
- --slave %{_bindir}/xjc xjc %{sdkbindir -- %{?1}}/xjc \\
- --slave %{_mandir}/man1/appletviewer.1$ext appletviewer.1$ext \\
- %{_mandir}/man1/appletviewer-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/idlj.1$ext idlj.1$ext \\
- %{_mandir}/man1/idlj-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jar.1$ext jar.1$ext \\
%{_mandir}/man1/jar-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jarsigner.1$ext jarsigner.1$ext \\
@@ -420,16 +421,8 @@ alternatives \\
%{_mandir}/man1/jstatd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/rmic.1$ext rmic.1$ext \\
%{_mandir}/man1/rmic-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/schemagen.1$ext schemagen.1$ext \\
- %{_mandir}/man1/schemagen-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/serialver.1$ext serialver.1$ext \\
%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/wsgen.1$ext wsgen.1$ext \\
- %{_mandir}/man1/wsgen-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/wsimport.1$ext wsimport.1$ext \\
- %{_mandir}/man1/wsimport-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/xjc.1$ext xjc.1$ext \\
- %{_mandir}/man1/xjc-%{uniquesuffix -- %{?1}}.1$ext
for X in %{origin} %{javaver} ; do
alternatives \\
@@ -501,7 +494,6 @@ exit 0
%define files_jre() %{expand:
%{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}-%{origin}.png
-%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjsoundalsa.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsplashscreen.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libawt_xawt.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjawt.so
@@ -519,15 +511,14 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/java
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jjs
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/keytool
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/orbd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/pack200
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmid
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/servertool
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/tnameserv
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/unpack200
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
+%ifarch %{jit_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
+%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jrt-fs.jar
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/modules
@@ -548,7 +539,7 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2gss.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2pcsc.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2pkcs11.so
-%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjaas_unix.so
+%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjaas.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjava.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjavajpeg.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjdwp.so
@@ -563,21 +554,26 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libnio.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libprefs.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/librmi.so
+# Zero and S390x don't have SA
+%ifarch %{jit_arches}
+%ifnarch s390x
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsaproc.so
+%endif
+%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsctp.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsunec.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libunpack.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libverify.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libzip.so
+%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr
+%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/default.jfc
+%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/orbd-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/pack200-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmid-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/servertool-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/tnameserv-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/unpack200-%{uniquesuffix -- %{?1}}.1*
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/server/
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/client/
@@ -600,6 +596,7 @@ exit 0
%dir %{etcjavadir -- %{?1}}/conf/security/policy/unlimited
%config(noreplace) %{etcjavadir -- %{?1}}/lib/security/default.policy
%config(noreplace) %{etcjavadir -- %{?1}}/lib/security/blacklisted.certs
+%config(noreplace) %{etcjavadir -- %{?1}}/lib/security/public_suffix_list.dat
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/policy/limited/exempt_local.policy
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/policy/limited/default_local.policy
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/policy/limited/default_US_export.policy
@@ -622,8 +619,6 @@ exit 0
%define files_devel() %{expand:
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/bin
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/appletviewer
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/idlj
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jar
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jarsigner
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javac
@@ -635,7 +630,12 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeps
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeprscan
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jimage
+# Zero and S390x don't have SA
+%ifarch %{jit_arches}
+%ifnarch s390x
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jhsdb
+%endif
+%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jinfo
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jlink
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jmap
@@ -647,11 +647,7 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstat
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstatd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmic
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/schemagen
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/serialver
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/wsgen
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/wsimport
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/xjc
%ifarch %{aot_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jaotc
%endif
@@ -661,8 +657,6 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/tapset
%endif
%{_datadir}/applications/*jconsole%{?1}.desktop
-%{_mandir}/man1/appletviewer-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/idlj-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jar-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jarsigner-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/javac-%{uniquesuffix -- %{?1}}.1*
@@ -680,11 +674,7 @@ exit 0
%{_mandir}/man1/jstat-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jstatd-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmic-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/schemagen-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/wsgen-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/wsimport-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/xjc-%{uniquesuffix -- %{?1}}.1*
%if %{with_systemtap}
%dir %{tapsetroot}
%dir %{tapsetdirttapset}
@@ -861,7 +851,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{origin}
Version: %{newjavaver}.%{buildver}
-Release: 7%{?dist}
+Release: 4%{?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
@@ -878,21 +868,25 @@ Group: Development/Languages
# HotSpot code is licensed under GPLv2
# JDK library code is licensed under GPLv2 with the Classpath exception
-# The Apache license is used in code taken from Apache projects (primarily JAXP & JAXWS)
+# The Apache license is used in code taken from Apache projects (primarily xalan & xerces)
# DOM levels 2 & 3 and the XML digital signature schemas are licensed under the W3C Software License
# The JSR166 concurrency code is in the public domain
-# The BSD and MIT licenses are used for a number of third-party libraries (see THIRD_PARTY_README)
-# The OpenJDK source tree includes the JPEG library (IJG), zlib & libpng (zlib), giflib and LCMS (MIT)
+# The BSD and MIT licenses are used for a number of third-party libraries (see ADDITIONAL_LICENSE_INFO)
+# The OpenJDK source tree includes:
+# - JPEG library (IJG), zlib & libpng (zlib), giflib (MIT), harfbuzz (ISC),
+# - freetype (FTL), jline (BSD) and LCMS (MIT)
+# - jquery (MIT), jdk.crypto.cryptoki PKCS 11 wrapper (RSA)
+# - public_suffix_list.dat from publicsuffix.org (MPLv2.0)
# The test code includes copies of NSS under the Mozilla Public License v2.0
# The PCSClite headers are under a BSD with advertising license
# The elliptic curve cryptography (ECC) source code is licensed under the LGPLv2.1 or any later version
-License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib
+License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
URL: http://openjdk.java.net/
# to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh
# update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
-Source0: jdk-updates-jdk%{majorver}u-jdk-%{newjavaver}+%{buildver}.tar.xz
+Source0: shenandoah-jdk%{majorver}-shenandoah-jdk-%{newjavaver}+%{buildver}.tar.xz
Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
# Desktop files. Adapted from IcedTea
@@ -936,14 +930,33 @@ Patch5: RHBZ-1565658-system-nss-SunEC.patch
#
#############################################
-# s390 (Zero) build does not bootcycle without this patch
-# Already in JDK-11. Missing backports.
-Patch100: JDK-8201495-s390-java-opts.patch
-# See JDK-8198844. This won't be needed any more in
-# JDK 11+
-Patch101: sorted-diff.patch
-# Type fixing for s390 (Zero). Not upstream.
-Patch102: java-openjdk-s390-size_t.patch
+# 8210416, RHBZ#1632174: [linux] Poor StrictMath performance due to non-optimized compilation
+Patch8: JDK-8210416-RHBZ-1632174-fdlibm-opt-fix.patch
+# 8210425, RHBZ#1632174: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
+Patch9: JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch
+
+#############################################
+#
+# JDK 9+ only patches
+#
+#############################################
+
+# 8210647, RHBZ#1632174: libsaproc is being compiled without optimization
+Patch10: JDK-8210647-RHBZ-1632174-libsaproc-opt-fix.patch
+# 8210761, RHBZ#1632174: libjsig is being compiled without optimization
+Patch11: JDK-8210761-RHBZ-1632174-libjsig-opt-fix.patch
+# 8210703, RHBZ#1632174: vmStructs.cpp compiled with -O0
+Patch12: JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch
+# 8211105, RHBZ-1628612, RHBZ-1630996: Temporarily disable dsin/dcos/log
+# intrinsics on aarch64, falling back to C code. Re-enable once JDK-8210461
+# is fixed and available in jdk11u.
+Patch6: JDK-8211105-aarch64-log-sin-intrinsics-disable.patch
+#############################################
+#
+# Patches appearing in 11.0.2
+#
+#############################################
+Patch584: jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -974,7 +987,7 @@ BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
BuildRequires: javapackages-filesystem
-BuildRequires: java-openjdk-devel
+BuildRequires: java-11-openjdk-devel
# Zero-assembler build requirement
%ifnarch %{jit_arches}
BuildRequires: libffi-devel
@@ -1207,10 +1220,13 @@ pushd %{top_level_dir_name}
%patch3 -p1
%patch4 -p1
%patch5 -p1
-
-%patch101 -p1
-%patch102 -p1
-
+%patch6 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch584 -p1
popd # openjdk
%patch1000
@@ -1288,10 +1304,6 @@ EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing"
%endif
export EXTRA_CFLAGS
-(cd %{top_level_dir_name}/make/autoconf
- bash ./autogen.sh
-)
-
for suffix in %{build_loop} ; do
if [ "x$suffix" = "x" ] ; then
debugbuild=release
@@ -1315,8 +1327,9 @@ bash ../configure \
%endif
--with-version-build=%{buildver} \
--with-version-pre="" \
- --with-version-opt="" \
- --with-boot-jdk=/usr/lib/jvm/java-%{majorver}-openjdk \
+ --with-version-opt=%{lts_designator} \
+ --with-vendor-version-string="%{vendor_version_string}" \
+ --with-boot-jdk=/usr/lib/jvm/java-11-openjdk \
--with-debug-level=$debugbuild \
--with-native-debug-symbols=internal \
--enable-unlimited-crypto \
@@ -1332,6 +1345,9 @@ bash ../configure \
--with-extra-ldflags="%{ourldflags}" \
--with-num-cores="$NUM_PROC" \
--disable-javac-server \
+%ifarch x86_64
+ --with-jvm-features=zgc \
+%endif
--disable-warnings-as-errors
make \
@@ -1348,10 +1364,6 @@ make docs-zip
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
find images/%{jdkimage} -iname '*.jar' -exec chmod ugo+r {} \;
-# remove redundant *diz and *debuginfo files
-find images/%{jdkimage} -iname '*.diz' -exec rm {} \;
-find images/%{jdkimage} -iname '*.debuginfo' -exec rm {} \;
-
# Build screws up permissions on binaries
# https://bugs.openjdk.java.net/browse/JDK-8173610
find images/%{jdkimage} -iname '*.so' -exec chmod +x {} \;
@@ -1379,6 +1391,11 @@ for suffix in %{rev_build_loop} ; do
export JAVA_HOME=$(pwd)/%{buildoutputdir -- $suffix}/images/%{jdkimage}
+#check sheandoah is enabled
+%if %{use_shenandoah_hotspot}
+$JAVA_HOME//bin/java -XX:+UseShenandoahGC -version
+%endif
+
# Check unlimited policy has been used
$JAVA_HOME/bin/javac -d . %{SOURCE13}
$JAVA_HOME/bin/java --add-opens java.base/javax.crypto=ALL-UNNAMED TestCryptoLevel
@@ -1530,7 +1547,7 @@ popd
# Install Javadoc documentation
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
-cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{newjavaver}+%{buildver}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
+cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{newjavaver}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
# Install icons and menu entries
for s in 16 24 32 48 ; do
@@ -1550,9 +1567,6 @@ done
# See https://bugzilla.redhat.com/show_bug.cgi?id=741821
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/.java/.systemPrefs
-# FIXME: remove SONAME entries from demo DSOs. See
-# https://bugzilla.redhat.com/show_bug.cgi?id=436497
-
# copy samples next to demos; samples are mostly js files
cp -r %{top_level_dir_name}/src/sample $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/
@@ -1763,6 +1777,14 @@ require "copy_jdk_configs.lua"
%changelog
+* Thu Nov 01 2018 Jiri Vanek <jvanek(a)redhat.com> - 1:11.0.1.13-3
+- updated to jdk11
+
+* Wed Aug 29 2018 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:10.0.3.13-8
+- Adjust system NSS patch, RHBZ-1565658-system-nss-SunEC.patch, so
+ as to account for -Wl,--as-needed default linker flag by filtering
+ it. Resolves RHBZ#1623399.
+
* Thu Aug 23 2018 Jiri Vanek <jvanek(a)redhat.com> - 1:10.0.3.13-6
- dissabled accessibility, fixed provides for main package's debug variant
- now buildrequires javapackages-filesystem as the issue with macros should be fixed
diff --git a/jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch b/jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch
new file mode 100644
index 0000000..b3221f8
--- /dev/null
+++ b/jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch
@@ -0,0 +1,114 @@
+
+# HG changeset patch
+# User roland
+# Date 1534518792 -7200
+# Node ID 690d9be191bf068b68c37bc835b355b1535e6075
+# Parent 5be470fb7a19293eb95fd33806413b94abca9724
+8209639: assert failure in coalesce.cpp: attempted to spill a non-spillable item
+Reviewed-by: neliasso, kvn
+
+diff -r 5be470fb7a19 -r 690d9be191bf src/hotspot/share/opto/coalesce.cpp
+--- a/src/hotspot/share/opto/coalesce.cpp Tue Oct 16 12:47:56 2018 +0100
++++ b/src/hotspot/share/opto/coalesce.cpp Fri Aug 17 17:13:12 2018 +0200
+@@ -25,6 +25,7 @@
+ #include "precompiled.hpp"
+ #include "memory/allocation.inline.hpp"
+ #include "opto/block.hpp"
++#include "opto/c2compiler.hpp"
+ #include "opto/cfgnode.hpp"
+ #include "opto/chaitin.hpp"
+ #include "opto/coalesce.hpp"
+@@ -294,9 +295,13 @@
+ } else {
+ uint ireg = m->ideal_reg();
+ if (ireg == 0 || ireg == Op_RegFlags) {
+- assert(false, "attempted to spill a non-spillable item: %d: %s, ireg = %u, spill_type: %s",
+- m->_idx, m->Name(), ireg, MachSpillCopyNode::spill_type(MachSpillCopyNode::PhiInput));
+- C->record_method_not_compilable("attempted to spill a non-spillable item");
++ if (C->subsume_loads()) {
++ C->record_failure(C2Compiler::retry_no_subsuming_loads());
++ } else {
++ assert(false, "attempted to spill a non-spillable item: %d: %s, ireg = %u, spill_type: %s",
++ m->_idx, m->Name(), ireg, MachSpillCopyNode::spill_type(MachSpillCopyNode::PhiInput));
++ C->record_method_not_compilable("attempted to spill a non-spillable item");
++ }
+ return;
+ }
+ const RegMask *rm = C->matcher()->idealreg2spillmask[ireg];
+diff -r 5be470fb7a19 -r 690d9be191bf test/hotspot/jtreg/compiler/c2/SubsumingLoadsCauseFlagSpill.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/test/hotspot/jtreg/compiler/c2/SubsumingLoadsCauseFlagSpill.java Fri Aug 17 17:13:12 2018 +0200
+@@ -0,0 +1,72 @@
++/*
++ * Copyright (c) 2018, 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.
++ *
++ * 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.
++ */
++
++/**
++ * @test
++ * @bug 8209639
++ * @summary assert failure in coalesce.cpp: attempted to spill a non-spillable item
++ *
++ * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,SubsumingLoadsCauseFlagSpill::not_inlined -Xmx1024m SubsumingLoadsCauseFlagSpill
++ *
++ */
++
++public class SubsumingLoadsCauseFlagSpill {
++ private static Object field;
++ private static boolean do_throw;
++ private static volatile boolean barrier;
++
++ public static void main(String[] args) {
++ for (int i = 0; i < 20_000; i++) {
++ do_throw = true;
++ field = null;
++ test(0);
++ do_throw = false;
++ field = new Object();
++ test(0);
++ }
++ }
++
++ private static float test(float f) {
++ Object v = null;
++ try {
++ not_inlined();
++ v = field;
++ } catch (MyException me) {
++ v = field;
++ barrier = true;
++ }
++ if (v == null) {
++ return f * f;
++ }
++ return f;
++ }
++
++ private static void not_inlined() throws MyException{
++ if (do_throw) {
++ throw new MyException();
++ }
++ }
++
++ private static class MyException extends Throwable {
++ }
++}
+
diff --git a/pr2126-10.patch b/pr2126-10.patch
deleted file mode 100644
index a4c0a46..0000000
--- a/pr2126-10.patch
+++ /dev/null
@@ -1,675 +0,0 @@
-diff --git a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
---- openjdk/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
-+++ openjdk/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
-@@ -34,57 +34,6 @@
- //
- // See sun.security.util.CurveDB for the OIDs
-
-- // NIST K-163
-- SECT163_K1(1, NAMED_GROUP_ECDHE, "sect163k1", "1.3.132.0.1", true),
--
-- SECT163_R1(2, NAMED_GROUP_ECDHE, "sect163r1", "1.3.132.0.2", false),
--
-- // NIST B-163
-- SECT163_R2(3, NAMED_GROUP_ECDHE, "sect163r2", "1.3.132.0.15", true),
--
-- SECT193_R1(4, NAMED_GROUP_ECDHE, "sect193r1", "1.3.132.0.24", false),
-- SECT193_R2(5, NAMED_GROUP_ECDHE, "sect193r2", "1.3.132.0.25", false),
--
-- // NIST K-233
-- SECT233_K1(6, NAMED_GROUP_ECDHE, "sect233k1", "1.3.132.0.26", true),
--
-- // NIST B-233
-- SECT233_R1(7, NAMED_GROUP_ECDHE, "sect233r1", "1.3.132.0.27", true),
--
-- SECT239_K1(8, NAMED_GROUP_ECDHE, "sect239k1", "1.3.132.0.3", false),
--
-- // NIST K-283
-- SECT283_K1(9, NAMED_GROUP_ECDHE, "sect283k1", "1.3.132.0.16", true),
--
-- // NIST B-283
-- SECT283_R1(10, NAMED_GROUP_ECDHE, "sect283r1", "1.3.132.0.17", true),
--
-- // NIST K-409
-- SECT409_K1(11, NAMED_GROUP_ECDHE, "sect409k1", "1.3.132.0.36", true),
--
-- // NIST B-409
-- SECT409_R1(12, NAMED_GROUP_ECDHE, "sect409r1", "1.3.132.0.37", true),
--
-- // NIST K-571
-- SECT571_K1(13, NAMED_GROUP_ECDHE, "sect571k1", "1.3.132.0.38", true),
--
-- // NIST B-571
-- SECT571_R1(14, NAMED_GROUP_ECDHE, "sect571r1", "1.3.132.0.39", true),
--
-- SECP160_K1(15, NAMED_GROUP_ECDHE, "secp160k1", "1.3.132.0.9", false),
-- SECP160_R1(16, NAMED_GROUP_ECDHE, "secp160r1", "1.3.132.0.8", false),
-- SECP160_R2(17, NAMED_GROUP_ECDHE, "secp160r2", "1.3.132.0.30", false),
-- SECP192_K1(18, NAMED_GROUP_ECDHE, "secp192k1", "1.3.132.0.31", false),
--
-- // NIST P-192
-- SECP192_R1(19, NAMED_GROUP_ECDHE, "secp192r1", "1.2.840.10045.3.1.1", true),
--
-- SECP224_K1(20, NAMED_GROUP_ECDHE, "secp224k1", "1.3.132.0.32", false),
-- // NIST P-224
-- SECP224_R1(21, NAMED_GROUP_ECDHE, "secp224r1", "1.3.132.0.33", true),
--
-- SECP256_K1(22, NAMED_GROUP_ECDHE, "secp256k1", "1.3.132.0.10", false),
--
- // NIST P-256
- SECP256_R1(23, NAMED_GROUP_ECDHE, "secp256r1", "1.2.840.10045.3.1.7", true),
-
-diff --git a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
---- openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
-+++ openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
-@@ -116,12 +116,6 @@
- NamedGroup.SECP256_R1,
- NamedGroup.SECP384_R1,
- NamedGroup.SECP521_R1,
-- NamedGroup.SECT283_K1,
-- NamedGroup.SECT283_R1,
-- NamedGroup.SECT409_K1,
-- NamedGroup.SECT409_R1,
-- NamedGroup.SECT571_K1,
-- NamedGroup.SECT571_R1,
-
- // FFDHE 2048
- NamedGroup.FFDHE_2048,
-@@ -136,15 +130,6 @@
- NamedGroup.SECP256_R1,
- NamedGroup.SECP384_R1,
- NamedGroup.SECP521_R1,
-- NamedGroup.SECT283_K1,
-- NamedGroup.SECT283_R1,
-- NamedGroup.SECT409_K1,
-- NamedGroup.SECT409_R1,
-- NamedGroup.SECT571_K1,
-- NamedGroup.SECT571_R1,
--
-- // non-NIST curves
-- NamedGroup.SECP256_K1,
-
- // FFDHE 2048
- NamedGroup.FFDHE_2048,
-diff --git a/src/java.base/share/classes/sun/security/util/CurveDB.java b/src/java.base/share/classes/sun/security/util/CurveDB.java
---- openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
-+++ openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
-@@ -168,114 +168,6 @@
- Pattern nameSplitPattern = Pattern.compile(SPLIT_PATTERN);
-
- /* SEC2 prime curves */
-- add("secp112r1", "1.3.132.0.6", P,
-- "DB7C2ABF62E35E668076BEAD208B",
-- "DB7C2ABF62E35E668076BEAD2088",
-- "659EF8BA043916EEDE8911702B22",
-- "09487239995A5EE76B55F9C2F098",
-- "A89CE5AF8724C0A23E0E0FF77500",
-- "DB7C2ABF62E35E7628DFAC6561C5",
-- 1, nameSplitPattern);
--
-- add("secp112r2", "1.3.132.0.7", P,
-- "DB7C2ABF62E35E668076BEAD208B",
-- "6127C24C05F38A0AAAF65C0EF02C",
-- "51DEF1815DB5ED74FCC34C85D709",
-- "4BA30AB5E892B4E1649DD0928643",
-- "adcd46f5882e3747def36e956e97",
-- "36DF0AAFD8B8D7597CA10520D04B",
-- 4, nameSplitPattern);
--
-- add("secp128r1", "1.3.132.0.28", P,
-- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
-- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC",
-- "E87579C11079F43DD824993C2CEE5ED3",
-- "161FF7528B899B2D0C28607CA52C5B86",
-- "CF5AC8395BAFEB13C02DA292DDED7A83",
-- "FFFFFFFE0000000075A30D1B9038A115",
-- 1, nameSplitPattern);
--
-- add("secp128r2", "1.3.132.0.29", P,
-- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
-- "D6031998D1B3BBFEBF59CC9BBFF9AEE1",
-- "5EEEFCA380D02919DC2C6558BB6D8A5D",
-- "7B6AA5D85E572983E6FB32A7CDEBC140",
-- "27B6916A894D3AEE7106FE805FC34B44",
-- "3FFFFFFF7FFFFFFFBE0024720613B5A3",
-- 4, nameSplitPattern);
--
-- add("secp160k1", "1.3.132.0.9", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
-- "0000000000000000000000000000000000000000",
-- "0000000000000000000000000000000000000007",
-- "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB",
-- "938CF935318FDCED6BC28286531733C3F03C4FEE",
-- "0100000000000000000001B8FA16DFAB9ACA16B6B3",
-- 1, nameSplitPattern);
--
-- add("secp160r1", "1.3.132.0.8", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC",
-- "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45",
-- "4A96B5688EF573284664698968C38BB913CBFC82",
-- "23A628553168947D59DCC912042351377AC5FB32",
-- "0100000000000000000001F4C8F927AED3CA752257",
-- 1, nameSplitPattern);
--
-- add("secp160r2", "1.3.132.0.30", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70",
-- "B4E134D3FB59EB8BAB57274904664D5AF50388BA",
-- "52DCB034293A117E1F4FF11B30F7199D3144CE6D",
-- "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E",
-- "0100000000000000000000351EE786A818F3A1A16B",
-- 1, nameSplitPattern);
--
-- add("secp192k1", "1.3.132.0.31", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37",
-- "000000000000000000000000000000000000000000000000",
-- "000000000000000000000000000000000000000000000003",
-- "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D",
-- "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D",
-- "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D",
-- 1, nameSplitPattern);
--
-- add("secp192r1 [NIST P-192, X9.62 prime192v1]", "1.2.840.10045.3.1.1", PD,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
-- "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1",
-- "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012",
-- "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811",
-- "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831",
-- 1, nameSplitPattern);
--
-- add("secp224k1", "1.3.132.0.32", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D",
-- "00000000000000000000000000000000000000000000000000000000",
-- "00000000000000000000000000000000000000000000000000000005",
-- "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C",
-- "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5",
-- "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7",
-- 1, nameSplitPattern);
--
-- add("secp224r1 [NIST P-224]", "1.3.132.0.33", PD,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
-- "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
-- "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
-- "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D",
-- 1, nameSplitPattern);
--
-- add("secp256k1", "1.3.132.0.10", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F",
-- "0000000000000000000000000000000000000000000000000000000000000000",
-- "0000000000000000000000000000000000000000000000000000000000000007",
-- "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798",
-- "483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141",
-- 1, nameSplitPattern);
--
- add("secp256r1 [NIST P-256, X9.62 prime256v1]", "1.2.840.10045.3.1.7", PD,
- "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF",
- "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC",
-@@ -303,435 +195,6 @@
- "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409",
- 1, nameSplitPattern);
-
-- /* ANSI X9.62 prime curves */
-- add("X9.62 prime192v2", "1.2.840.10045.3.1.2", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
-- "CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953",
-- "EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A",
-- "6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15",
-- "FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31",
-- 1, nameSplitPattern);
--
-- add("X9.62 prime192v3", "1.2.840.10045.3.1.3", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
-- "22123DC2395A05CAA7423DAECCC94760A7D462256BD56916",
-- "7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896",
-- "38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0",
-- "FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13",
-- 1, nameSplitPattern);
--
-- add("X9.62 prime239v1", "1.2.840.10045.3.1.4", P,
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
-- "6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A",
-- "0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF",
-- "7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE",
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B",
-- 1, nameSplitPattern);
--
-- add("X9.62 prime239v2", "1.2.840.10045.3.1.5", P,
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
-- "617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C",
-- "38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7",
-- "5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA",
-- "7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063",
-- 1, nameSplitPattern);
--
-- add("X9.62 prime239v3", "1.2.840.10045.3.1.6", P,
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
-- "255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E",
-- "6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A",
-- "1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3",
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551",
-- 1, nameSplitPattern);
--
-- /* SEC2 binary curves */
-- add("sect113r1", "1.3.132.0.4", B,
-- "020000000000000000000000000201",
-- "003088250CA6E7C7FE649CE85820F7",
-- "00E8BEE4D3E2260744188BE0E9C723",
-- "009D73616F35F4AB1407D73562C10F",
-- "00A52830277958EE84D1315ED31886",
-- "0100000000000000D9CCEC8A39E56F",
-- 2, nameSplitPattern);
--
-- add("sect113r2", "1.3.132.0.5", B,
-- "020000000000000000000000000201",
-- "00689918DBEC7E5A0DD6DFC0AA55C7",
-- "0095E9A9EC9B297BD4BF36E059184F",
-- "01A57A6A7B26CA5EF52FCDB8164797",
-- "00B3ADC94ED1FE674C06E695BABA1D",
-- "010000000000000108789B2496AF93",
-- 2, nameSplitPattern);
--
-- add("sect131r1", "1.3.132.0.22", B,
-- "080000000000000000000000000000010D",
-- "07A11B09A76B562144418FF3FF8C2570B8",
-- "0217C05610884B63B9C6C7291678F9D341",
-- "0081BAF91FDF9833C40F9C181343638399",
-- "078C6E7EA38C001F73C8134B1B4EF9E150",
-- "0400000000000000023123953A9464B54D",
-- 2, nameSplitPattern);
--
-- add("sect131r2", "1.3.132.0.23", B,
-- "080000000000000000000000000000010D",
-- "03E5A88919D7CAFCBF415F07C2176573B2",
-- "04B8266A46C55657AC734CE38F018F2192",
-- "0356DCD8F2F95031AD652D23951BB366A8",
-- "0648F06D867940A5366D9E265DE9EB240F",
-- "0400000000000000016954A233049BA98F",
-- 2, nameSplitPattern);
--
-- add("sect163k1 [NIST K-163]", "1.3.132.0.1", BD,
-- "0800000000000000000000000000000000000000C9",
-- "000000000000000000000000000000000000000001",
-- "000000000000000000000000000000000000000001",
-- "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8",
-- "0289070FB05D38FF58321F2E800536D538CCDAA3D9",
-- "04000000000000000000020108A2E0CC0D99F8A5EF",
-- 2, nameSplitPattern);
--
-- add("sect163r1", "1.3.132.0.2", B,
-- "0800000000000000000000000000000000000000C9",
-- "07B6882CAAEFA84F9554FF8428BD88E246D2782AE2",
-- "0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9",
-- "0369979697AB43897789566789567F787A7876A654",
-- "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883",
-- "03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B",
-- 2, nameSplitPattern);
--
-- add("sect163r2 [NIST B-163]", "1.3.132.0.15", BD,
-- "0800000000000000000000000000000000000000C9",
-- "000000000000000000000000000000000000000001",
-- "020A601907B8C953CA1481EB10512F78744A3205FD",
-- "03F0EBA16286A2D57EA0991168D4994637E8343E36",
-- "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1",
-- "040000000000000000000292FE77E70C12A4234C33",
-- 2, nameSplitPattern);
--
-- add("sect193r1", "1.3.132.0.24", B,
-- "02000000000000000000000000000000000000000000008001",
-- "0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01",
-- "00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814",
-- "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1",
-- "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05",
-- "01000000000000000000000000C7F34A778F443ACC920EBA49",
-- 2, nameSplitPattern);
--
-- add("sect193r2", "1.3.132.0.25", B,
-- "02000000000000000000000000000000000000000000008001",
-- "0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B",
-- "00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE",
-- "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F",
-- "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C",
-- "010000000000000000000000015AAB561B005413CCD4EE99D5",
-- 2, nameSplitPattern);
--
-- add("sect233k1 [NIST K-233]", "1.3.132.0.26", BD,
-- "020000000000000000000000000000000000000004000000000000000001",
-- "000000000000000000000000000000000000000000000000000000000000",
-- "000000000000000000000000000000000000000000000000000000000001",
-- "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126",
-- "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3",
-- "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF",
-- 4, nameSplitPattern);
--
-- add("sect233r1 [NIST B-233]", "1.3.132.0.27", B,
-- "020000000000000000000000000000000000000004000000000000000001",
-- "000000000000000000000000000000000000000000000000000000000001",
-- "0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD",
-- "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B",
-- "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052",
-- "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7",
-- 2, nameSplitPattern);
--
-- add("sect239k1", "1.3.132.0.3", B,
-- "800000000000000000004000000000000000000000000000000000000001",
-- "000000000000000000000000000000000000000000000000000000000000",
-- "000000000000000000000000000000000000000000000000000000000001",
-- "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC",
-- "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA",
-- "2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5",
-- 4, nameSplitPattern);
--
-- add("sect283k1 [NIST K-283]", "1.3.132.0.16", BD,
-- "0800000000000000000000000000000000000000000000000000000000000000000010A1",
-- "000000000000000000000000000000000000000000000000000000000000000000000000",
-- "000000000000000000000000000000000000000000000000000000000000000000000001",
-- "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836",
-- "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259",
-- "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61",
-- 4, nameSplitPattern);
--
-- add("sect283r1 [NIST B-283]", "1.3.132.0.17", B,
-- "0800000000000000000000000000000000000000000000000000000000000000000010A1",
-- "000000000000000000000000000000000000000000000000000000000000000000000001",
-- "027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5",
-- "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053",
-- "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4",
-- "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307",
-- 2, nameSplitPattern);
--
-- add("sect409k1 [NIST K-409]", "1.3.132.0.36", BD,
-- "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
-- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-- "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746",
-- "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B",
-- "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF",
-- 4, nameSplitPattern);
--
-- add("sect409r1 [NIST B-409]", "1.3.132.0.37", B,
-- "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
-- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-- "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F",
-- "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7",
-- "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706",
-- "010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173",
-- 2, nameSplitPattern);
--
-- add("sect571k1 [NIST K-571]", "1.3.132.0.38", BD,
-- "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
-- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-- "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972",
-- "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3",
-- "020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001",
-- 4, nameSplitPattern);
--
-- add("sect571r1 [NIST B-571]", "1.3.132.0.39", B,
-- "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
-- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-- "02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A",
-- "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19",
-- "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B",
-- "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47",
-- 2, nameSplitPattern);
--
-- /* ANSI X9.62 binary curves */
-- add("X9.62 c2tnb191v1", "1.2.840.10045.3.0.5", B,
-- "800000000000000000000000000000000000000000000201",
-- "2866537B676752636A68F56554E12640276B649EF7526267",
-- "2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC",
-- "36B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D",
-- "765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB",
-- "40000000000000000000000004A20E90C39067C893BBB9A5",
-- 2, nameSplitPattern);
--
-- add("X9.62 c2tnb191v2", "1.2.840.10045.3.0.6", B,
-- "800000000000000000000000000000000000000000000201",
-- "401028774D7777C7B7666D1366EA432071274F89FF01E718",
-- "0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01",
-- "3809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10",
-- "17434386626D14F3DBF01760D9213A3E1CF37AEC437D668A",
-- "20000000000000000000000050508CB89F652824E06B8173",
-- 4, nameSplitPattern);
--
-- add("X9.62 c2tnb191v3", "1.2.840.10045.3.0.7", B,
-- "800000000000000000000000000000000000000000000201",
-- "6C01074756099122221056911C77D77E77A777E7E7E77FCB",
-- "71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8",
-- "375D4CE24FDE434489DE8746E71786015009E66E38A926DD",
-- "545A39176196575D985999366E6AD34CE0A77CD7127B06BE",
-- "155555555555555555555555610C0B196812BFB6288A3EA3",
-- 6, nameSplitPattern);
--
-- add("X9.62 c2tnb239v1", "1.2.840.10045.3.0.11", B,
-- "800000000000000000000000000000000000000000000000001000000001",
-- "32010857077C5431123A46B808906756F543423E8D27877578125778AC76",
-- "790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16",
-- "57927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D",
-- "61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305",
-- "2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447",
-- 4, nameSplitPattern);
--
-- add("X9.62 c2tnb239v2", "1.2.840.10045.3.0.12", B,
-- "800000000000000000000000000000000000000000000000001000000001",
-- "4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F",
-- "5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B",
-- "28F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205",
-- "5667334C45AFF3B5A03BAD9DD75E2C71A99362567D5453F7FA6E227EC833",
-- "1555555555555555555555555555553C6F2885259C31E3FCDF154624522D",
-- 6, nameSplitPattern);
--
-- add("X9.62 c2tnb239v3", "1.2.840.10045.3.0.13", B,
-- "800000000000000000000000000000000000000000000000001000000001",
-- "01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F",
-- "6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40",
-- "70F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92",
-- "2E5A0EAF6E5E1305B9004DCE5C0ED7FE59A35608F33837C816D80B79F461",
-- "0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF",
-- 0xA, nameSplitPattern);
--
-- add("X9.62 c2tnb359v1", "1.2.840.10045.3.0.18", B,
-- "800000000000000000000000000000000000000000000000000000000000000000000000100000000000000001",
-- "5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05656FB549016A96656A557",
-- "2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC345626089687742B6329E70680231988",
-- "3C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097",
-- "53D7E08529547048121E9C95F3791DD804963948F34FAE7BF44EA82365DC7868FE57E4AE2DE211305A407104BD",
-- "01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB964FE7719E74F490758D3B",
-- 0x4C, nameSplitPattern);
--
-- add("X9.62 c2tnb431r1", "1.2.840.10045.3.0.20", B,
-- "800000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000001",
-- "1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF620B0EB9906D0957F6C6FEACD615468DF104DE296CD8F",
-- "10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A919B626D4E50A8DD731B107A9962381FB5D807BF2618",
-- "120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7",
-- "20D0AF8903A96F8D5FA2C255745D3C451B302C9346D9B7E485E7BCE41F6B591F3E8F6ADDCBB0BC4C2F947A7DE1A89B625D6A598B3760",
-- "0340340340340340340340340340340340340340340340340340340323C313FAB50589703B5EC68D3587FEC60D161CC149C1AD4A91",
-- 0x2760, nameSplitPattern);
--
-- /* ANSI X9.62 binary curves from the 1998 standard but forbidden
-- * in the 2005 version of the standard.
-- * We don't register them but leave them here for the time being in
-- * case we need to support them after all.
-- */
--/*
-- add("X9.62 c2pnb163v1", "1.2.840.10045.3.0.1", B,
-- "080000000000000000000000000000000000000107",
-- "072546B5435234A422E0789675F432C89435DE5242",
-- "00C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9",
-- "07AF69989546103D79329FCC3D74880F33BBE803CB",
-- "01EC23211B5966ADEA1D3F87F7EA5848AEF0B7CA9F",
-- "0400000000000000000001E60FC8821CC74DAEAFC1",
-- 2, nameSplitPattern);
--
-- add("X9.62 c2pnb163v2", "1.2.840.10045.3.0.2", B,
-- "080000000000000000000000000000000000000107",
-- "0108B39E77C4B108BED981ED0E890E117C511CF072",
-- "0667ACEB38AF4E488C407433FFAE4F1C811638DF20",
-- "0024266E4EB5106D0A964D92C4860E2671DB9B6CC5",
-- "079F684DDF6684C5CD258B3890021B2386DFD19FC5",
-- "03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7",
-- 2, nameSplitPattern);
--
-- add("X9.62 c2pnb163v3", "1.2.840.10045.3.0.3", B,
-- "080000000000000000000000000000000000000107",
-- "07A526C63D3E25A256A007699F5447E32AE456B50E",
-- "03F7061798EB99E238FD6F1BF95B48FEEB4854252B",
-- "02F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB",
-- "05B935590C155E17EA48EB3FF3718B893DF59A05D0",
-- "03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309",
-- 2, nameSplitPattern);
--
-- add("X9.62 c2pnb176w1", "1.2.840.10045.3.0.4", B,
-- "0100000000000000000000000000000000080000000007",
-- "E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B",
-- "5DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2",
-- "8D16C2866798B600F9F08BB4A8E860F3298CE04A5798",
-- "6FA4539C2DADDDD6BAB5167D61B436E1D92BB16A562C",
-- "00010092537397ECA4F6145799D62B0A19CE06FE26AD",
-- 0xFF6E, nameSplitPattern);
--
-- add("X9.62 c2pnb208w1", "1.2.840.10045.3.0.10", B,
-- "010000000000000000000000000000000800000000000000000007",
-- "0000000000000000000000000000000000000000000000000000",
-- "C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E",
-- "89FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A",
-- "0F55B51A06E78E9AC38A035FF520D8B01781BEB1A6BB08617DE3",
-- "000101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D",
-- 0xFE48, nameSplitPattern);
--
-- add("X9.62 c2pnb272w1", "1.2.840.10045.3.0.16", B,
-- "010000000000000000000000000000000000000000000000000000010000000000000B",
-- "91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586FB20",
-- "7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E540F7",
-- "6108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D",
-- "10C7695716851EEF6BA7F6872E6142FBD241B830FF5EFCACECCAB05E02005DDE9D23",
-- "000100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521",
-- 0xFF06, nameSplitPattern);
--
-- add("X9.62 c2pnb304w1", "1.2.840.10045.3.0.17", B,
-- "010000000000000000000000000000000000000000000000000000000000000000000000000807",
-- "FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C1288078365A0396C8E681",
-- "BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C14039601E55827340BE",
-- "197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614",
-- "E19FBEB76E0DA171517ECF401B50289BF014103288527A9B416A105E80260B549FDC1B92C03B",
-- "000101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164443051D",
-- 0xFE2E, nameSplitPattern);
--
-- add("X9.62 c2pnb368w1", "1.2.840.10045.3.0.19", B,
-- "0100000000000000000000000000000000000000000000000000000000000000000000002000000000000000000007",
-- "E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C576D62F0AB7519CCD2A1A906AE30D",
-- "FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1C2112D84D164F444F8F74786046A",
-- "1085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F",
-- "7B3EB1BDDCBA62D5D8B2059B525797FC73822C59059C623A45FF3843CEE8F87CD1855ADAA81E2A0750B80FDA2310",
-- "00010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E909AE40A6F131E9CFCE5BD967",
-- 0xFF70, nameSplitPattern);
--*/
--
-- /*
-- * Brainpool curves (RFC 5639)
-- * (Twisted curves are not included)
-- */
--
-- add("brainpoolP160r1", "1.3.36.3.3.2.8.1.1.1", P,
-- "E95E4A5F737059DC60DFC7AD95B3D8139515620F",
-- "340E7BE2A280EB74E2BE61BADA745D97E8F7C300",
-- "1E589A8595423412134FAA2DBDEC95C8D8675E58",
-- "BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC3",
-- "1667CB477A1A8EC338F94741669C976316DA6321",
-- "E95E4A5F737059DC60DF5991D45029409E60FC09",
-- 1, nameSplitPattern);
--
-- add("brainpoolP192r1", "1.3.36.3.3.2.8.1.1.3", P,
-- "C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297",
-- "6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF",
-- "469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9",
-- "C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD6",
-- "14B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F",
-- "C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1",
-- 1, nameSplitPattern);
--
-- add("brainpoolP224r1", "1.3.36.3.3.2.8.1.1.5", P,
-- "D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF",
-- "68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43",
-- "2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B",
-- "0D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D",
-- "58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD",
-- "D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F",
-- 1, nameSplitPattern);
--
-- add("brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7", P,
-- "A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377",
-- "7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9",
-- "26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6",
-- "8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262",
-- "547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997",
-- "A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7",
-- 1, nameSplitPattern);
--
-- add("brainpoolP320r1", "1.3.36.3.3.2.8.1.1.9", P,
-- "D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27",
-- "3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4",
-- "520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6",
-- "43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E20611",
-- "14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1",
-- "D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311",
-- 1, nameSplitPattern);
--
-- add("brainpoolP384r1", "1.3.36.3.3.2.8.1.1.11", P,
-- "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53",
-- "7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826",
-- "04A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11",
-- "1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E",
-- "8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315",
-- "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565",
-- 1, nameSplitPattern);
--
-- add("brainpoolP512r1", "1.3.36.3.3.2.8.1.1.13", P,
-- "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3",
-- "7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA",
-- "3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723",
-- "81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822",
-- "7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892",
-- "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069",
-- 1, nameSplitPattern);
--
- specCollection = Collections.unmodifiableCollection(oidMap.values());
- }
- }
-diff --git a/test/jdk/sun/security/ec/TestEC.java b/test/jdk/sun/security/ec/TestEC.java
---- openjdk/test/jdk/sun/security/ec/TestEC.java
-+++ openjdk/test/jdk/sun/security/ec/TestEC.java
-@@ -35,8 +35,8 @@
- * @library ../pkcs11/sslecc
- * @library ../../../java/security/testlibrary
- * @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper
-- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
-- * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
-+ * @run main/othervm -Djdk.tls.namedGroups="secp256r1" TestEC
-+ * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1" TestEC
- */
-
- import java.security.NoSuchProviderException;
-diff -r bd66ea2fdde3 test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
---- openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Thu Jul 27 18:04:48 2017 +0000
-+++ openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Fri Oct 06 13:18:47 2017 +0200
-@@ -34,9 +34,9 @@
- * @library ..
- * @library ../../../../java/security/testlibrary
- * @modules jdk.crypto.cryptoki
-- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
-+ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
- * ClientJSSEServerJSSE
-- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
-+ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
- * ClientJSSEServerJSSE sm policy
- */
diff --git a/pr2126-11.patch b/pr2126-11.patch
new file mode 100644
index 0000000..6a1da4c
--- /dev/null
+++ b/pr2126-11.patch
@@ -0,0 +1,687 @@
+diff --git a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
+--- openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
++++ openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
+@@ -180,72 +180,6 @@
+ // Elliptic Curves (RFC 4492)
+ //
+ // See sun.security.util.CurveDB for the OIDs
+- // NIST K-163
+- SECT163_K1 (0x0001, "sect163k1", "1.3.132.0.1", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT163_R1 (0x0002, "sect163r1", "1.3.132.0.2", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-163
+- SECT163_R2 (0x0003, "sect163r2", "1.3.132.0.15", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT193_R1 (0x0004, "sect193r1", "1.3.132.0.24", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT193_R2 (0x0005, "sect193r2", "1.3.132.0.25", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-233
+- SECT233_K1 (0x0006, "sect233k1", "1.3.132.0.26", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-233
+- SECT233_R1 (0x0007, "sect233r1", "1.3.132.0.27", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT239_K1 (0x0008, "sect239k1", "1.3.132.0.3", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-283
+- SECT283_K1 (0x0009, "sect283k1", "1.3.132.0.16", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-283
+- SECT283_R1 (0x000A, "sect283r1", "1.3.132.0.17", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-409
+- SECT409_K1 (0x000B, "sect409k1", "1.3.132.0.36", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-409
+- SECT409_R1 (0x000C, "sect409r1", "1.3.132.0.37", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-571
+- SECT571_K1 (0x000D, "sect571k1", "1.3.132.0.38", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-571
+- SECT571_R1 (0x000E, "sect571r1", "1.3.132.0.39", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP160_K1 (0x000F, "secp160k1", "1.3.132.0.9", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP160_R1 (0x0010, "secp160r1", "1.3.132.0.8", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP160_R2 (0x0011, "secp160r2", "1.3.132.0.30", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP192_K1 (0x0012, "secp192k1", "1.3.132.0.31", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST P-192
+- SECP192_R1 (0x0013, "secp192r1", "1.2.840.10045.3.1.1", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP224_K1 (0x0014, "secp224k1", "1.3.132.0.32", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- // NIST P-224
+- SECP224_R1 (0x0015, "secp224r1", "1.3.132.0.33", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP256_K1 (0x0016, "secp256k1", "1.3.132.0.10", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+
+ // NIST P-256
+ SECP256_R1 (0x0017, "secp256r1", "1.2.840.10045.3.1.7", true,
+@@ -116,12 +116,6 @@
+ NamedGroup.SECP256_R1,
+ NamedGroup.SECP384_R1,
+ NamedGroup.SECP521_R1,
+- NamedGroup.SECT283_K1,
+- NamedGroup.SECT283_R1,
+- NamedGroup.SECT409_K1,
+- NamedGroup.SECT409_R1,
+- NamedGroup.SECT571_K1,
+- NamedGroup.SECT571_R1,
+
+ // FFDHE 2048
+ NamedGroup.FFDHE_2048,
+@@ -136,15 +130,6 @@
+ NamedGroup.SECP256_R1,
+ NamedGroup.SECP384_R1,
+ NamedGroup.SECP521_R1,
+- NamedGroup.SECT283_K1,
+- NamedGroup.SECT283_R1,
+- NamedGroup.SECT409_K1,
+- NamedGroup.SECT409_R1,
+- NamedGroup.SECT571_K1,
+- NamedGroup.SECT571_R1,
+-
+- // non-NIST curves
+- NamedGroup.SECP256_K1,
+
+ // FFDHE 2048
+ NamedGroup.FFDHE_2048,
+diff --git a/src/java.base/share/classes/sun/security/util/CurveDB.java b/src/java.base/share/classes/sun/security/util/CurveDB.java
+--- openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
++++ openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
+@@ -168,114 +168,6 @@
+ Pattern nameSplitPattern = Pattern.compile(SPLIT_PATTERN);
+
+ /* SEC2 prime curves */
+- add("secp112r1", "1.3.132.0.6", P,
+- "DB7C2ABF62E35E668076BEAD208B",
+- "DB7C2ABF62E35E668076BEAD2088",
+- "659EF8BA043916EEDE8911702B22",
+- "09487239995A5EE76B55F9C2F098",
+- "A89CE5AF8724C0A23E0E0FF77500",
+- "DB7C2ABF62E35E7628DFAC6561C5",
+- 1, nameSplitPattern);
+-
+- add("secp112r2", "1.3.132.0.7", P,
+- "DB7C2ABF62E35E668076BEAD208B",
+- "6127C24C05F38A0AAAF65C0EF02C",
+- "51DEF1815DB5ED74FCC34C85D709",
+- "4BA30AB5E892B4E1649DD0928643",
+- "adcd46f5882e3747def36e956e97",
+- "36DF0AAFD8B8D7597CA10520D04B",
+- 4, nameSplitPattern);
+-
+- add("secp128r1", "1.3.132.0.28", P,
+- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
+- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC",
+- "E87579C11079F43DD824993C2CEE5ED3",
+- "161FF7528B899B2D0C28607CA52C5B86",
+- "CF5AC8395BAFEB13C02DA292DDED7A83",
+- "FFFFFFFE0000000075A30D1B9038A115",
+- 1, nameSplitPattern);
+-
+- add("secp128r2", "1.3.132.0.29", P,
+- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
+- "D6031998D1B3BBFEBF59CC9BBFF9AEE1",
+- "5EEEFCA380D02919DC2C6558BB6D8A5D",
+- "7B6AA5D85E572983E6FB32A7CDEBC140",
+- "27B6916A894D3AEE7106FE805FC34B44",
+- "3FFFFFFF7FFFFFFFBE0024720613B5A3",
+- 4, nameSplitPattern);
+-
+- add("secp160k1", "1.3.132.0.9", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
+- "0000000000000000000000000000000000000000",
+- "0000000000000000000000000000000000000007",
+- "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB",
+- "938CF935318FDCED6BC28286531733C3F03C4FEE",
+- "0100000000000000000001B8FA16DFAB9ACA16B6B3",
+- 1, nameSplitPattern);
+-
+- add("secp160r1", "1.3.132.0.8", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC",
+- "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45",
+- "4A96B5688EF573284664698968C38BB913CBFC82",
+- "23A628553168947D59DCC912042351377AC5FB32",
+- "0100000000000000000001F4C8F927AED3CA752257",
+- 1, nameSplitPattern);
+-
+- add("secp160r2", "1.3.132.0.30", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70",
+- "B4E134D3FB59EB8BAB57274904664D5AF50388BA",
+- "52DCB034293A117E1F4FF11B30F7199D3144CE6D",
+- "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E",
+- "0100000000000000000000351EE786A818F3A1A16B",
+- 1, nameSplitPattern);
+-
+- add("secp192k1", "1.3.132.0.31", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37",
+- "000000000000000000000000000000000000000000000000",
+- "000000000000000000000000000000000000000000000003",
+- "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D",
+- "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D",
+- "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D",
+- 1, nameSplitPattern);
+-
+- add("secp192r1 [NIST P-192, X9.62 prime192v1]", "1.2.840.10045.3.1.1", PD,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+- "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1",
+- "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012",
+- "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811",
+- "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831",
+- 1, nameSplitPattern);
+-
+- add("secp224k1", "1.3.132.0.32", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D",
+- "00000000000000000000000000000000000000000000000000000000",
+- "00000000000000000000000000000000000000000000000000000005",
+- "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C",
+- "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5",
+- "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7",
+- 1, nameSplitPattern);
+-
+- add("secp224r1 [NIST P-224]", "1.3.132.0.33", PD,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
+- "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
+- "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
+- "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D",
+- 1, nameSplitPattern);
+-
+- add("secp256k1", "1.3.132.0.10", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F",
+- "0000000000000000000000000000000000000000000000000000000000000000",
+- "0000000000000000000000000000000000000000000000000000000000000007",
+- "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798",
+- "483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141",
+- 1, nameSplitPattern);
+-
+ add("secp256r1 [NIST P-256, X9.62 prime256v1]", "1.2.840.10045.3.1.7", PD,
+ "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF",
+ "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC",
+@@ -303,435 +195,6 @@
+ "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409",
+ 1, nameSplitPattern);
+
+- /* ANSI X9.62 prime curves */
+- add("X9.62 prime192v2", "1.2.840.10045.3.1.2", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+- "CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953",
+- "EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A",
+- "6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15",
+- "FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31",
+- 1, nameSplitPattern);
+-
+- add("X9.62 prime192v3", "1.2.840.10045.3.1.3", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+- "22123DC2395A05CAA7423DAECCC94760A7D462256BD56916",
+- "7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896",
+- "38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0",
+- "FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13",
+- 1, nameSplitPattern);
+-
+- add("X9.62 prime239v1", "1.2.840.10045.3.1.4", P,
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+- "6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A",
+- "0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF",
+- "7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE",
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B",
+- 1, nameSplitPattern);
+-
+- add("X9.62 prime239v2", "1.2.840.10045.3.1.5", P,
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+- "617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C",
+- "38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7",
+- "5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA",
+- "7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063",
+- 1, nameSplitPattern);
+-
+- add("X9.62 prime239v3", "1.2.840.10045.3.1.6", P,
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+- "255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E",
+- "6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A",
+- "1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3",
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551",
+- 1, nameSplitPattern);
+-
+- /* SEC2 binary curves */
+- add("sect113r1", "1.3.132.0.4", B,
+- "020000000000000000000000000201",
+- "003088250CA6E7C7FE649CE85820F7",
+- "00E8BEE4D3E2260744188BE0E9C723",
+- "009D73616F35F4AB1407D73562C10F",
+- "00A52830277958EE84D1315ED31886",
+- "0100000000000000D9CCEC8A39E56F",
+- 2, nameSplitPattern);
+-
+- add("sect113r2", "1.3.132.0.5", B,
+- "020000000000000000000000000201",
+- "00689918DBEC7E5A0DD6DFC0AA55C7",
+- "0095E9A9EC9B297BD4BF36E059184F",
+- "01A57A6A7B26CA5EF52FCDB8164797",
+- "00B3ADC94ED1FE674C06E695BABA1D",
+- "010000000000000108789B2496AF93",
+- 2, nameSplitPattern);
+-
+- add("sect131r1", "1.3.132.0.22", B,
+- "080000000000000000000000000000010D",
+- "07A11B09A76B562144418FF3FF8C2570B8",
+- "0217C05610884B63B9C6C7291678F9D341",
+- "0081BAF91FDF9833C40F9C181343638399",
+- "078C6E7EA38C001F73C8134B1B4EF9E150",
+- "0400000000000000023123953A9464B54D",
+- 2, nameSplitPattern);
+-
+- add("sect131r2", "1.3.132.0.23", B,
+- "080000000000000000000000000000010D",
+- "03E5A88919D7CAFCBF415F07C2176573B2",
+- "04B8266A46C55657AC734CE38F018F2192",
+- "0356DCD8F2F95031AD652D23951BB366A8",
+- "0648F06D867940A5366D9E265DE9EB240F",
+- "0400000000000000016954A233049BA98F",
+- 2, nameSplitPattern);
+-
+- add("sect163k1 [NIST K-163]", "1.3.132.0.1", BD,
+- "0800000000000000000000000000000000000000C9",
+- "000000000000000000000000000000000000000001",
+- "000000000000000000000000000000000000000001",
+- "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8",
+- "0289070FB05D38FF58321F2E800536D538CCDAA3D9",
+- "04000000000000000000020108A2E0CC0D99F8A5EF",
+- 2, nameSplitPattern);
+-
+- add("sect163r1", "1.3.132.0.2", B,
+- "0800000000000000000000000000000000000000C9",
+- "07B6882CAAEFA84F9554FF8428BD88E246D2782AE2",
+- "0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9",
+- "0369979697AB43897789566789567F787A7876A654",
+- "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883",
+- "03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B",
+- 2, nameSplitPattern);
+-
+- add("sect163r2 [NIST B-163]", "1.3.132.0.15", BD,
+- "0800000000000000000000000000000000000000C9",
+- "000000000000000000000000000000000000000001",
+- "020A601907B8C953CA1481EB10512F78744A3205FD",
+- "03F0EBA16286A2D57EA0991168D4994637E8343E36",
+- "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1",
+- "040000000000000000000292FE77E70C12A4234C33",
+- 2, nameSplitPattern);
+-
+- add("sect193r1", "1.3.132.0.24", B,
+- "02000000000000000000000000000000000000000000008001",
+- "0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01",
+- "00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814",
+- "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1",
+- "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05",
+- "01000000000000000000000000C7F34A778F443ACC920EBA49",
+- 2, nameSplitPattern);
+-
+- add("sect193r2", "1.3.132.0.25", B,
+- "02000000000000000000000000000000000000000000008001",
+- "0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B",
+- "00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE",
+- "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F",
+- "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C",
+- "010000000000000000000000015AAB561B005413CCD4EE99D5",
+- 2, nameSplitPattern);
+-
+- add("sect233k1 [NIST K-233]", "1.3.132.0.26", BD,
+- "020000000000000000000000000000000000000004000000000000000001",
+- "000000000000000000000000000000000000000000000000000000000000",
+- "000000000000000000000000000000000000000000000000000000000001",
+- "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126",
+- "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3",
+- "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF",
+- 4, nameSplitPattern);
+-
+- add("sect233r1 [NIST B-233]", "1.3.132.0.27", B,
+- "020000000000000000000000000000000000000004000000000000000001",
+- "000000000000000000000000000000000000000000000000000000000001",
+- "0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD",
+- "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B",
+- "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052",
+- "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7",
+- 2, nameSplitPattern);
+-
+- add("sect239k1", "1.3.132.0.3", B,
+- "800000000000000000004000000000000000000000000000000000000001",
+- "000000000000000000000000000000000000000000000000000000000000",
+- "000000000000000000000000000000000000000000000000000000000001",
+- "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC",
+- "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA",
+- "2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5",
+- 4, nameSplitPattern);
+-
+- add("sect283k1 [NIST K-283]", "1.3.132.0.16", BD,
+- "0800000000000000000000000000000000000000000000000000000000000000000010A1",
+- "000000000000000000000000000000000000000000000000000000000000000000000000",
+- "000000000000000000000000000000000000000000000000000000000000000000000001",
+- "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836",
+- "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259",
+- "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61",
+- 4, nameSplitPattern);
+-
+- add("sect283r1 [NIST B-283]", "1.3.132.0.17", B,
+- "0800000000000000000000000000000000000000000000000000000000000000000010A1",
+- "000000000000000000000000000000000000000000000000000000000000000000000001",
+- "027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5",
+- "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053",
+- "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4",
+- "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307",
+- 2, nameSplitPattern);
+-
+- add("sect409k1 [NIST K-409]", "1.3.132.0.36", BD,
+- "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
+- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+- "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746",
+- "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B",
+- "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF",
+- 4, nameSplitPattern);
+-
+- add("sect409r1 [NIST B-409]", "1.3.132.0.37", B,
+- "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
+- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+- "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F",
+- "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7",
+- "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706",
+- "010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173",
+- 2, nameSplitPattern);
+-
+- add("sect571k1 [NIST K-571]", "1.3.132.0.38", BD,
+- "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
+- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+- "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972",
+- "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3",
+- "020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001",
+- 4, nameSplitPattern);
+-
+- add("sect571r1 [NIST B-571]", "1.3.132.0.39", B,
+- "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
+- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+- "02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A",
+- "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19",
+- "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B",
+- "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47",
+- 2, nameSplitPattern);
+-
+- /* ANSI X9.62 binary curves */
+- add("X9.62 c2tnb191v1", "1.2.840.10045.3.0.5", B,
+- "800000000000000000000000000000000000000000000201",
+- "2866537B676752636A68F56554E12640276B649EF7526267",
+- "2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC",
+- "36B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D",
+- "765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB",
+- "40000000000000000000000004A20E90C39067C893BBB9A5",
+- 2, nameSplitPattern);
+-
+- add("X9.62 c2tnb191v2", "1.2.840.10045.3.0.6", B,
+- "800000000000000000000000000000000000000000000201",
+- "401028774D7777C7B7666D1366EA432071274F89FF01E718",
+- "0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01",
+- "3809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10",
+- "17434386626D14F3DBF01760D9213A3E1CF37AEC437D668A",
+- "20000000000000000000000050508CB89F652824E06B8173",
+- 4, nameSplitPattern);
+-
+- add("X9.62 c2tnb191v3", "1.2.840.10045.3.0.7", B,
+- "800000000000000000000000000000000000000000000201",
+- "6C01074756099122221056911C77D77E77A777E7E7E77FCB",
+- "71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8",
+- "375D4CE24FDE434489DE8746E71786015009E66E38A926DD",
+- "545A39176196575D985999366E6AD34CE0A77CD7127B06BE",
+- "155555555555555555555555610C0B196812BFB6288A3EA3",
+- 6, nameSplitPattern);
+-
+- add("X9.62 c2tnb239v1", "1.2.840.10045.3.0.11", B,
+- "800000000000000000000000000000000000000000000000001000000001",
+- "32010857077C5431123A46B808906756F543423E8D27877578125778AC76",
+- "790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16",
+- "57927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D",
+- "61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305",
+- "2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447",
+- 4, nameSplitPattern);
+-
+- add("X9.62 c2tnb239v2", "1.2.840.10045.3.0.12", B,
+- "800000000000000000000000000000000000000000000000001000000001",
+- "4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F",
+- "5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B",
+- "28F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205",
+- "5667334C45AFF3B5A03BAD9DD75E2C71A99362567D5453F7FA6E227EC833",
+- "1555555555555555555555555555553C6F2885259C31E3FCDF154624522D",
+- 6, nameSplitPattern);
+-
+- add("X9.62 c2tnb239v3", "1.2.840.10045.3.0.13", B,
+- "800000000000000000000000000000000000000000000000001000000001",
+- "01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F",
+- "6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40",
+- "70F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92",
+- "2E5A0EAF6E5E1305B9004DCE5C0ED7FE59A35608F33837C816D80B79F461",
+- "0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF",
+- 0xA, nameSplitPattern);
+-
+- add("X9.62 c2tnb359v1", "1.2.840.10045.3.0.18", B,
+- "800000000000000000000000000000000000000000000000000000000000000000000000100000000000000001",
+- "5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05656FB549016A96656A557",
+- "2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC345626089687742B6329E70680231988",
+- "3C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097",
+- "53D7E08529547048121E9C95F3791DD804963948F34FAE7BF44EA82365DC7868FE57E4AE2DE211305A407104BD",
+- "01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB964FE7719E74F490758D3B",
+- 0x4C, nameSplitPattern);
+-
+- add("X9.62 c2tnb431r1", "1.2.840.10045.3.0.20", B,
+- "800000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000001",
+- "1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF620B0EB9906D0957F6C6FEACD615468DF104DE296CD8F",
+- "10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A919B626D4E50A8DD731B107A9962381FB5D807BF2618",
+- "120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7",
+- "20D0AF8903A96F8D5FA2C255745D3C451B302C9346D9B7E485E7BCE41F6B591F3E8F6ADDCBB0BC4C2F947A7DE1A89B625D6A598B3760",
+- "0340340340340340340340340340340340340340340340340340340323C313FAB50589703B5EC68D3587FEC60D161CC149C1AD4A91",
+- 0x2760, nameSplitPattern);
+-
+- /* ANSI X9.62 binary curves from the 1998 standard but forbidden
+- * in the 2005 version of the standard.
+- * We don't register them but leave them here for the time being in
+- * case we need to support them after all.
+- */
+-/*
+- add("X9.62 c2pnb163v1", "1.2.840.10045.3.0.1", B,
+- "080000000000000000000000000000000000000107",
+- "072546B5435234A422E0789675F432C89435DE5242",
+- "00C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9",
+- "07AF69989546103D79329FCC3D74880F33BBE803CB",
+- "01EC23211B5966ADEA1D3F87F7EA5848AEF0B7CA9F",
+- "0400000000000000000001E60FC8821CC74DAEAFC1",
+- 2, nameSplitPattern);
+-
+- add("X9.62 c2pnb163v2", "1.2.840.10045.3.0.2", B,
+- "080000000000000000000000000000000000000107",
+- "0108B39E77C4B108BED981ED0E890E117C511CF072",
+- "0667ACEB38AF4E488C407433FFAE4F1C811638DF20",
+- "0024266E4EB5106D0A964D92C4860E2671DB9B6CC5",
+- "079F684DDF6684C5CD258B3890021B2386DFD19FC5",
+- "03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7",
+- 2, nameSplitPattern);
+-
+- add("X9.62 c2pnb163v3", "1.2.840.10045.3.0.3", B,
+- "080000000000000000000000000000000000000107",
+- "07A526C63D3E25A256A007699F5447E32AE456B50E",
+- "03F7061798EB99E238FD6F1BF95B48FEEB4854252B",
+- "02F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB",
+- "05B935590C155E17EA48EB3FF3718B893DF59A05D0",
+- "03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309",
+- 2, nameSplitPattern);
+-
+- add("X9.62 c2pnb176w1", "1.2.840.10045.3.0.4", B,
+- "0100000000000000000000000000000000080000000007",
+- "E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B",
+- "5DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2",
+- "8D16C2866798B600F9F08BB4A8E860F3298CE04A5798",
+- "6FA4539C2DADDDD6BAB5167D61B436E1D92BB16A562C",
+- "00010092537397ECA4F6145799D62B0A19CE06FE26AD",
+- 0xFF6E, nameSplitPattern);
+-
+- add("X9.62 c2pnb208w1", "1.2.840.10045.3.0.10", B,
+- "010000000000000000000000000000000800000000000000000007",
+- "0000000000000000000000000000000000000000000000000000",
+- "C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E",
+- "89FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A",
+- "0F55B51A06E78E9AC38A035FF520D8B01781BEB1A6BB08617DE3",
+- "000101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D",
+- 0xFE48, nameSplitPattern);
+-
+- add("X9.62 c2pnb272w1", "1.2.840.10045.3.0.16", B,
+- "010000000000000000000000000000000000000000000000000000010000000000000B",
+- "91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586FB20",
+- "7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E540F7",
+- "6108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D",
+- "10C7695716851EEF6BA7F6872E6142FBD241B830FF5EFCACECCAB05E02005DDE9D23",
+- "000100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521",
+- 0xFF06, nameSplitPattern);
+-
+- add("X9.62 c2pnb304w1", "1.2.840.10045.3.0.17", B,
+- "010000000000000000000000000000000000000000000000000000000000000000000000000807",
+- "FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C1288078365A0396C8E681",
+- "BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C14039601E55827340BE",
+- "197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614",
+- "E19FBEB76E0DA171517ECF401B50289BF014103288527A9B416A105E80260B549FDC1B92C03B",
+- "000101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164443051D",
+- 0xFE2E, nameSplitPattern);
+-
+- add("X9.62 c2pnb368w1", "1.2.840.10045.3.0.19", B,
+- "0100000000000000000000000000000000000000000000000000000000000000000000002000000000000000000007",
+- "E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C576D62F0AB7519CCD2A1A906AE30D",
+- "FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1C2112D84D164F444F8F74786046A",
+- "1085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F",
+- "7B3EB1BDDCBA62D5D8B2059B525797FC73822C59059C623A45FF3843CEE8F87CD1855ADAA81E2A0750B80FDA2310",
+- "00010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E909AE40A6F131E9CFCE5BD967",
+- 0xFF70, nameSplitPattern);
+-*/
+-
+- /*
+- * Brainpool curves (RFC 5639)
+- * (Twisted curves are not included)
+- */
+-
+- add("brainpoolP160r1", "1.3.36.3.3.2.8.1.1.1", P,
+- "E95E4A5F737059DC60DFC7AD95B3D8139515620F",
+- "340E7BE2A280EB74E2BE61BADA745D97E8F7C300",
+- "1E589A8595423412134FAA2DBDEC95C8D8675E58",
+- "BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC3",
+- "1667CB477A1A8EC338F94741669C976316DA6321",
+- "E95E4A5F737059DC60DF5991D45029409E60FC09",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP192r1", "1.3.36.3.3.2.8.1.1.3", P,
+- "C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297",
+- "6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF",
+- "469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9",
+- "C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD6",
+- "14B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F",
+- "C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP224r1", "1.3.36.3.3.2.8.1.1.5", P,
+- "D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF",
+- "68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43",
+- "2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B",
+- "0D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D",
+- "58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD",
+- "D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7", P,
+- "A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377",
+- "7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9",
+- "26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6",
+- "8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262",
+- "547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997",
+- "A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP320r1", "1.3.36.3.3.2.8.1.1.9", P,
+- "D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27",
+- "3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4",
+- "520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6",
+- "43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E20611",
+- "14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1",
+- "D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP384r1", "1.3.36.3.3.2.8.1.1.11", P,
+- "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53",
+- "7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826",
+- "04A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11",
+- "1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E",
+- "8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315",
+- "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP512r1", "1.3.36.3.3.2.8.1.1.13", P,
+- "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3",
+- "7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA",
+- "3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723",
+- "81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822",
+- "7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892",
+- "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069",
+- 1, nameSplitPattern);
+-
+ specCollection = Collections.unmodifiableCollection(oidMap.values());
+ }
+ }
+diff --git a/test/jdk/sun/security/ec/TestEC.java b/test/jdk/sun/security/ec/TestEC.java
+--- openjdk/test/jdk/sun/security/ec/TestEC.java
++++ openjdk/test/jdk/sun/security/ec/TestEC.java
+@@ -35,8 +35,8 @@
+ * @library ../pkcs11/sslecc
+ * @library ../../../java/security/testlibrary
+ * @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper
+- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
+- * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
++ * @run main/othervm -Djdk.tls.namedGroups="secp256r1" TestEC
++ * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1" TestEC
+ */
+
+ import java.security.NoSuchProviderException;
+diff -r bd66ea2fdde3 test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
+--- openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Thu Jul 27 18:04:48 2017 +0000
++++ openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Fri Oct 06 13:18:47 2017 +0200
+@@ -34,9 +34,9 @@
+ * @library ..
+ * @library ../../../../java/security/testlibrary
+ * @modules jdk.crypto.cryptoki
+- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
++ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
+ * ClientJSSEServerJSSE
+- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
++ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
+ * ClientJSSEServerJSSE sm policy
+ */
diff --git a/sorted-diff.patch b/sorted-diff.patch
deleted file mode 100644
index 7ba596e..0000000
--- a/sorted-diff.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- openjdk/make/gensrc/GensrcX11Wrappers.gmk
-+++ openjdk/make/gensrc/GensrcX11Wrappers.gmk
-@@ -117,7 +117,8 @@
- $(call LogInfo, Verifying X11 wrapper sizes)
- $(call MakeDir, $(@D))
- $(GENSRC_X11WRAPPERS_TMP)/sizer.$*.exe | $(SORT) > $@.tmp
-- $(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp $(GENSRC_X11WRAPPERS_TMP)/sizes.$*
-+ $(SORT) $(GENSRC_X11WRAPPERS_TMP)/sizes.$* > $(a)-orig.tmp
-+ $(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification-orig.tmp
- mv $@.tmp $@
-
- GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/sizes.$(OPENJDK_TARGET_CPU_BITS).verification
diff --git a/sources b/sources
index d6cbb37..5a4c26a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
-SHA512 (jdk-updates-jdk10u-jdk-10.0.2+13.tar.xz) = e5de419cec42e376ce341126c64370211cb09f326cdfafc64cec52640d2a2780f3ee705d51b6d025af6ca74c1525ed8d4a9d9afbe5b45f9709dd4d2242f1af08
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.1+13.tar.xz) = e5e2ffd022ee2f0311efc17de2ad7585676aac5e23fe4de821651b859f432af63da14ce356eaae0538583e58ea3de397969170ef02bbcc37b0de12da238879db
diff --git a/update_package.sh b/update_package.sh
index 4adab49..868a52d 100644
--- a/update_package.sh
+++ b/update_package.sh
@@ -31,12 +31,11 @@ else
echo ${TAPSET}
fi
-
-# OpenJDK from jdk10 updates project
-export PROJECT_NAME="jdk-updates"
-export REPO_NAME="jdk10u"
+# OpenJDK from Shenandoah project
+export PROJECT_NAME="shenandoah"
+export REPO_NAME="jdk11"
# warning, clonning without shenadnaoh suffix, you will clone pure jdk - thus without shenandaoh GC
-export VERSION="jdk-10.0.2+13"
+export VERSION="shenandoah-jdk-11.0.1+13"
export COMPRESSION=xz
# unset tapsets overrides
export OPENJDK_URL=""
5 years, 6 months
Architecture specific change in rpms/psblas3.git
by githook-noreply@fedoraproject.org
The package rpms/psblas3.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/psblas3.git/commit/?id=857f56d741....
Change:
-%ifarch %{openblas_arches}
Thanks.
Full change:
============
commit 857f56d7416ac4271b6eb302358207859b447b1f
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Nov 2 15:06:21 2018 +0100
Update to release 3.5.2-2
diff --git a/.gitignore b/.gitignore
index 350fefe..d0825d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/psblas3-3.5.0-3.tar.gz
/psblas3-3.5.1.tar.gz
/psblas3-3.5.2.tar.gz
+/psblas3-3.5.2-2.tar.gz
diff --git a/psblas3-fix_bug9.patch b/psblas3-fix_bug9.patch
deleted file mode 100644
index 130e75c..0000000
--- a/psblas3-fix_bug9.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 1a5ee8c46a4a332fce997522560d7b9f6dbde547 Mon Sep 17 00:00:00 2001
-From: Salvatore Filippone <salvatore.filippone(a)cranfield.ac.uk>
-Date: Thu, 13 Sep 2018 14:21:52 +0100
-Subject: [PATCH] Fix bounds computation in set_vect. Bug report by Alexandre
- Silva Lopes
-
----
- base/modules/serial/psb_c_base_vect_mod.f90 | 5 +++--
- base/modules/serial/psb_d_base_vect_mod.f90 | 5 +++--
- base/modules/serial/psb_i_base_vect_mod.f90 | 5 +++--
- base/modules/serial/psb_s_base_vect_mod.f90 | 5 +++--
- base/modules/serial/psb_z_base_vect_mod.f90 | 5 +++--
- 5 files changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/base/modules/serial/psb_c_base_vect_mod.f90 b/base/modules/serial/psb_c_base_vect_mod.f90
-index 6fa0bc70..54635a6d 100644
---- a/base/modules/serial/psb_c_base_vect_mod.f90
-+++ b/base/modules/serial/psb_c_base_vect_mod.f90
-@@ -749,9 +749,10 @@ subroutine c_base_set_vect(x,val,first,last)
-
- integer(psb_ipk_) :: info, first_, last_, nr
-
-- first_=1
-- last_=min(psb_size(x%v),size(val))
-+
-+ first_ = 1
- if (present(first)) first_ = max(1,first)
-+ last_ = min(psb_size(x%v),first_+size(val)-1)
- if (present(last)) last_ = min(last,last_)
-
- if (allocated(x%v)) then
-diff --git a/base/modules/serial/psb_d_base_vect_mod.f90 b/base/modules/serial/psb_d_base_vect_mod.f90
-index 36e95142..3ec2356a 100644
---- a/base/modules/serial/psb_d_base_vect_mod.f90
-+++ b/base/modules/serial/psb_d_base_vect_mod.f90
-@@ -749,9 +749,10 @@ subroutine d_base_set_vect(x,val,first,last)
-
- integer(psb_ipk_) :: info, first_, last_, nr
-
-- first_=1
-- last_=min(psb_size(x%v),size(val))
-+
-+ first_ = 1
- if (present(first)) first_ = max(1,first)
-+ last_ = min(psb_size(x%v),first_+size(val)-1)
- if (present(last)) last_ = min(last,last_)
-
- if (allocated(x%v)) then
-diff --git a/base/modules/serial/psb_i_base_vect_mod.f90 b/base/modules/serial/psb_i_base_vect_mod.f90
-index 4cc592ac..cdbe91e5 100644
---- a/base/modules/serial/psb_i_base_vect_mod.f90
-+++ b/base/modules/serial/psb_i_base_vect_mod.f90
-@@ -718,9 +718,10 @@ subroutine i_base_set_vect(x,val,first,last)
-
- integer(psb_ipk_) :: info, first_, last_, nr
-
-- first_=1
-- last_=min(psb_size(x%v),size(val))
-+
-+ first_ = 1
- if (present(first)) first_ = max(1,first)
-+ last_ = min(psb_size(x%v),first_+size(val)-1)
- if (present(last)) last_ = min(last,last_)
-
- if (allocated(x%v)) then
-diff --git a/base/modules/serial/psb_s_base_vect_mod.f90 b/base/modules/serial/psb_s_base_vect_mod.f90
-index 9ee77ea6..97c7c11e 100644
---- a/base/modules/serial/psb_s_base_vect_mod.f90
-+++ b/base/modules/serial/psb_s_base_vect_mod.f90
-@@ -749,9 +749,10 @@ subroutine s_base_set_vect(x,val,first,last)
-
- integer(psb_ipk_) :: info, first_, last_, nr
-
-- first_=1
-- last_=min(psb_size(x%v),size(val))
-+
-+ first_ = 1
- if (present(first)) first_ = max(1,first)
-+ last_ = min(psb_size(x%v),first_+size(val)-1)
- if (present(last)) last_ = min(last,last_)
-
- if (allocated(x%v)) then
-diff --git a/base/modules/serial/psb_z_base_vect_mod.f90 b/base/modules/serial/psb_z_base_vect_mod.f90
-index 0960624a..8c1b6baf 100644
---- a/base/modules/serial/psb_z_base_vect_mod.f90
-+++ b/base/modules/serial/psb_z_base_vect_mod.f90
-@@ -749,9 +749,10 @@ subroutine z_base_set_vect(x,val,first,last)
-
- integer(psb_ipk_) :: info, first_, last_, nr
-
-- first_=1
-- last_=min(psb_size(x%v),size(val))
-+
-+ first_ = 1
- if (present(first)) first_ = max(1,first)
-+ last_ = min(psb_size(x%v),first_+size(val)-1)
- if (present(last)) last_ = min(last,last_)
-
- if (allocated(x%v)) then
diff --git a/psblas3.spec b/psblas3.spec
index 06dfb7e..05a305e 100644
--- a/psblas3.spec
+++ b/psblas3.spec
@@ -1,36 +1,23 @@
-%global with_mpich 1
-%global with_openmpi 1
+%global with_mpich 0
+%global with_openmpi 0
%global with_serial 1
-# openblas available on these architectures.
-%if 0%{?rhel}
-%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
-%endif
-
%global major_version 3
-#%%global postrelease_version
+%global postrelease_version 2
-Name: psblas3
+Name: psblas3
Summary: Parallel Sparse Basic Linear Algebra Subroutines
Version: %{major_version}.5.2
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD
-URL: https://github.com/sfilippone/psblas3
-Source0: https://github.com/sfilippone/psblas3/archive/v%{version}.tar.gz#/psblas3...
+URL: https://github.com/sfilippone/psblas3
+Source0: https://github.com/sfilippone/psblas3/archive/V%{version}-%{postrelease_v...
# Call default Fedora ldflags when linker creates links
-Patch0: %{name}-fix_ldflags.patch
-
-# https://github.com/sfilippone/psblas3/issues/9
-Patch1: %{name}-fix_bug9.patch
+Patch0: %{name}-fix_ldflags.patch
BuildRequires: suitesparse-devel
-%ifarch %{openblas_arches}
BuildRequires: openblas-devel, openblas-srpm-macros
-%else
-BuildRequires: blas-devel
-BuildRequires: lapack-devel
-%endif
BuildRequires: metis-devel
%description
@@ -142,26 +129,25 @@ Shared links, header files and static libraries for MPICH %{name}.
##########################################################
%prep
-%setup -qc -n psblas3-%{version}
+%setup -qc -n psblas3-%{version}-%{postrelease_version}
-pushd psblas3-%{version}
+pushd psblas3-%{version}-%{postrelease_version}
%patch0 -p0
-%patch1 -p1
popd
#######################################################
## Copy source for MPI versions
%if 0%{?with_openmpi}
-cp -a psblas3-%{version} openmpi-build
+cp -a psblas3-%{version}-%{postrelease_version} openmpi-build
%endif
%if 0%{?with_mpich}
-cp -a psblas3-%{version} mpich-build
+cp -a psblas3-%{version}-%{postrelease_version} mpich-build
%endif
######################################################
%build
%if 0%{?with_serial}
-cd psblas3-%{version}
+cd psblas3-%{version}-%{postrelease_version}
%ifarch %{openblas_arches}
export LIBBLAS=-lopenblas
@@ -171,9 +157,10 @@ export LIBBLAS=-lblas
export LIBLAPACK=-llapack
export INCBLAS=-I%{_includedir}
%endif
-%configure --enable-serial --with-fcopt="%{optflags} -Wno-unused-variable -fPIC -I%{_fmoddir} $INCBLAS" --with-ccopt="%{optflags} -fPIC $INCBLAS" \
- --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \
- --with-amdincdir=%{_includedir}/suitesparse
+%configure \
+ --enable-serial --with-fcopt="%{optflags} -Wno-unused-variable -fPIC -I%{_fmoddir} $INCBLAS" --with-ccopt="%{optflags} -fPIC $INCBLAS" \
+ --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \
+ --with-amdincdir=%{_includedir}/suitesparse
%make_build
# Make shared libraries
@@ -205,11 +192,12 @@ export LIBBLAS=-lblas
export LIBLAPACK=-llapack
export INCBLAS=-I%{_includedir}
%endif
-%configure --with-fcopt="%{optflags} -fPIC -I%{_fmoddir} $INCBLAS" \
- --with-ccopt="%{optflags} -fPIC $INCBLAS" \
- FC=mpifort F77=mpif77 F90=mpif90 MPIFC=mpifort MPIF77=mpif77 MPCC=mpicc \
- --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \
- --with-amdincdir=%{_includedir}/suitesparse
+%configure \
+ --with-fcopt="%{optflags} -fPIC -I%{_fmoddir} $INCBLAS" \
+ --with-ccopt="%{optflags} -fPIC $INCBLAS" \
+ FC=mpifort F77=mpif77 F90=mpif90 MPIFC=mpifort MPIF77=mpif77 MPCC=mpicc \
+ --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \
+ --with-amdincdir=%{_includedir}/suitesparse
%make_build
# Make shared libraries
@@ -239,11 +227,12 @@ export LIBBLAS=-lblas
export LIBLAPACK=-llapack
export INCBLAS=-I%{_includedir}
%endif
-%configure --with-fcopt="%{optflags} -fPIC -I%{_fmoddir} $INCBLAS" \
- --with-ccopt="%{optflags} -fPIC $INCBLAS" \
- FC=mpif77 F77=mpif77 F90=mpif90 MPIFC=mpif77 MPIF77=mpif77 MPCC=mpicc \
- --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \
- --with-amdincdir=%{_includedir}/suitesparse
+%configure \
+ --with-fcopt="%{optflags} -fPIC -I%{_fmoddir} $INCBLAS" \
+ --with-ccopt="%{optflags} -fPIC $INCBLAS" \
+ FC=mpif77 F77=mpif77 F90=mpif90 MPIFC=mpif77 MPIF77=mpif77 MPCC=mpicc \
+ --with-metis=-lmetis --with-amd=-lamd --with-blas=$LIBBLAS --with-lapack=$LIBLAPACK \
+ --with-amdincdir=%{_includedir}/suitesparse
%make_build
# Make shared libraries
@@ -274,7 +263,7 @@ popd
%install
%if 0%{?with_serial}
-pushd psblas3-%{version}
+pushd psblas3-%{version}-%{postrelease_version}
mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_fmoddir}/%{name}
@@ -375,10 +364,10 @@ popd
%endif
%files common
-%doc psblas3-%{version}/README.md psblas3-%{version}/Changelog
-%doc psblas3-%{version}/ReleaseNews
-%doc psblas3-%{version}/docs/html psblas3-%{version}/docs/*.pdf
-%license psblas3-%{version}/LICENSE
+%doc psblas3-%{version}-%{postrelease_version}/README.md psblas3-%{version}-%{postrelease_version}/Changelog
+%doc psblas3-%{version}-%{postrelease_version}/ReleaseNews
+%doc psblas3-%{version}-%{postrelease_version}/docs/html psblas3-%{version}-%{postrelease_version}/docs/*.pdf
+%license psblas3-%{version}-%{postrelease_version}/LICENSE
#######################################################
## MPI versions
@@ -414,6 +403,9 @@ popd
######################################################
%changelog
+* Fri Nov 02 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 3.5.2-4
+- Update to release 3.5.2-2
+
* Fri Sep 14 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 3.5.2-3
- Fix upstream bug #9 (rhbz #1628858)
diff --git a/sources b/sources
index 53eb403..47bd4d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (psblas3-3.5.2.tar.gz) = 0b25252a1f089d6d14dc0629dc217b68eb1098cf6a413deab4f590e05b340df6e65462be5333828a628cbae3560d6475fef07b2290bb9bb15f1bdc10ee658e22
+SHA512 (psblas3-3.5.2-2.tar.gz) = b3784193ad393062cf04e35e82a4fe3b46bfe64b25577d67679110f022c55a5fb8157c82d71d5cf38bec530b32472e4e4838ba954b92bd356fd9fc51bd974cd8
5 years, 6 months
Architecture specific change in rpms/java-openjdk.git
by githook-noreply@fedoraproject.org
The package rpms/java-openjdk.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-openjdk.git/commit/?id=f713f....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit f713f6a5e12631ab0f7b8848304618af876830a5
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Fri Nov 2 15:05:38 2018 +0100
Updated to jdk11
diff --git a/.gitignore b/.gitignore
index 554b078..1fdaa39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
*.rpm
-/systemtap-tapset-3.6.0pre02.tar.xz
-/jdk-jdk10-jdk-10+46.tar.xz
-/jdk-updates-jdk10u-jdk-10.0.1+10.tar.xz
-/jdk-updates-jdk10u-jdk-10.0.2+13.tar.xz
+/systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
+/shenandoah-jdk11-b516c8c7a0a4.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11+22.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11+28.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.1+13.tar.xz
diff --git a/JDK-8201495-s390-java-opts.patch b/JDK-8201495-s390-java-opts.patch
deleted file mode 100644
index a16db0c..0000000
--- a/JDK-8201495-s390-java-opts.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1523874036 -7200
-# Mon Apr 16 12:20:36 2018 +0200
-# Node ID fc3a72e286e0d5bf9b994d1b778b39f3b080c686
-# Parent 69bae761600bdbc97953500ac51a396d31f54ee9
-8201495: [Zero] Reduce limits of max heap size for boot JDK on s390
-Reviewed-by: ihse, aph, simonis
-
-diff --git a/make/autoconf/boot-jdk.m4 b/make/autoconf/boot-jdk.m4
---- a/make/autoconf/boot-jdk.m4
-+++ b/make/autoconf/boot-jdk.m4
-@@ -405,7 +405,7 @@
- BOOTCYCLE_JVM_ARGS_BIG=-Xms64M
-
- # Maximum amount of heap memory and stack size.
-- JVM_HEAP_LIMIT_32="1024"
-+ JVM_HEAP_LIMIT_32="768"
- # Running a 64 bit JVM allows for and requires a bigger heap
- JVM_HEAP_LIMIT_64="1600"
- STACK_SIZE_32=768
diff --git a/JDK-8202262-libjsig.so-extra-link-flags.patch b/JDK-8202262-libjsig.so-extra-link-flags.patch
deleted file mode 100644
index 1e2b60c..0000000
--- a/JDK-8202262-libjsig.so-extra-link-flags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1524663215 -7200
-# Wed Apr 25 15:33:35 2018 +0200
-# Node ID c000e94e3d789bcb30d18541a3be33856bb3fe17
-# Parent a29fc1f5b37d344c771f83f528dcd223ad240e6c
-8202262: libjsig.so not linked with extra linker flags from configure
-Reviewed-by: duke
-
-diff --git a/make/hotspot/lib/CompileLibjsig.gmk b/make/hotspot/lib/CompileLibjsig.gmk
---- a/make/hotspot/lib/CompileLibjsig.gmk
-+++ b/make/hotspot/lib/CompileLibjsig.gmk
-@@ -36,7 +36,7 @@
- ifeq ($(STATIC_BUILD), false)
- ifeq ($(OPENJDK_TARGET_OS), linux)
- LIBJSIG_CFLAGS := -fPIC -D_GNU_SOURCE -D_REENTRANT $(EXTRA_CFLAGS)
-- LIBJSIG_LDFLAGS := $(LDFLAGS_HASH_STYLE) ${LDFLAGS_NO_EXEC_STACK} $(EXTRA_CFLAGS)
-+ LIBJSIG_LDFLAGS := $(LDFLAGS_HASH_STYLE) ${LDFLAGS_NO_EXEC_STACK} $(EXTRA_LDFLAGS)
- LIBJSIG_LIBS := $(LIBDL)
-
- # NOTE: The old build compiled this library without -soname.
diff --git a/JDK-8210416-RHBZ-1632174-fdlibm-opt-fix.patch b/JDK-8210416-RHBZ-1632174-fdlibm-opt-fix.patch
new file mode 100644
index 0000000..85428db
--- /dev/null
+++ b/JDK-8210416-RHBZ-1632174-fdlibm-opt-fix.patch
@@ -0,0 +1,84 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1536142767 -7200
+# Wed Sep 05 12:19:27 2018 +0200
+# Node ID 7ea57274e55054579d1532e757edb21e67beed83
+# Parent 3ee91722550680c18b977f0e00b1013323b5c9ef
+8210416: [linux] Poor StrictMath performance due to non-optimized compilation
+Summary: Compile fdlibm with -O2 -ffp-contract=off on gcc/clang arches.
+Reviewed-by: aph, erikj, dholmes, darcy
+
+diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
+--- a/make/autoconf/flags-cflags.m4
++++ b/make/autoconf/flags-cflags.m4
+@@ -373,6 +373,18 @@
+
+ FLAGS_SETUP_CFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])
+
++ COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off"
++ # Check that the compiler supports -ffp-contract=off flag
++ # Set FDLIBM_CFLAGS to -ffp-contract=off if it does. Empty
++ # otherwise.
++ # These flags are required for GCC-based builds of
++ # fdlibm with optimization without losing precision.
++ # Notably, -ffp-contract=off needs to be added for GCC >= 4.6.
++ FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${COMPILER_FP_CONTRACT_OFF_FLAG}],
++ IF_TRUE: [FDLIBM_CFLAGS=${COMPILER_FP_CONTRACT_OFF_FLAG}],
++ IF_FALSE: [FDLIBM_CFLAGS=""])
++ AC_SUBST(FDLIBM_CFLAGS)
++
+ # Tests are only ever compiled for TARGET
+ CFLAGS_TESTLIB="$CFLAGS_JDKLIB"
+ CXXFLAGS_TESTLIB="$CXXFLAGS_JDKLIB"
+diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
+--- a/make/autoconf/spec.gmk.in
++++ b/make/autoconf/spec.gmk.in
+@@ -450,6 +450,7 @@
+ LIBJSIG_HASHSTYLE_LDFLAGS := @LIBJSIG_HASHSTYLE_LDFLAGS@
+ LIBJSIG_NOEXECSTACK_LDFLAGS := @LIBJSIG_NOEXECSTACK_LDFLAGS@
+
++FDLIBM_CFLAGS := @FDLIBM_CFLAGS@
+ JVM_CFLAGS := @JVM_CFLAGS@
+ JVM_LDFLAGS := @JVM_LDFLAGS@
+ JVM_ASFLAGS := @JVM_ASFLAGS@
+diff --git a/make/lib/CoreLibraries.gmk b/make/lib/CoreLibraries.gmk
+--- a/make/lib/CoreLibraries.gmk
++++ b/make/lib/CoreLibraries.gmk
+@@ -39,20 +39,15 @@
+ BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+ endif
+
+-ifeq ($(OPENJDK_TARGET_OS), linux)
+- ifeq ($(OPENJDK_TARGET_CPU), ppc64)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- else ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- else ifeq ($(OPENJDK_TARGET_CPU), s390x)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- else ifeq ($(OPENJDK_TARGET_CPU), aarch64)
+- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+- endif
++# If FDLIBM_CFLAGS is non-empty we know that we can optimize
++# fdlibm by adding those extra C flags. Currently GCC,
++# and clang only.
++ifneq ($(FDLIBM_CFLAGS), )
++ BUILD_LIBFDLIBM_OPTIMIZATION := LOW
+ endif
+
+ LIBFDLIBM_SRC := $(TOPDIR)/src/java.base/share/native/libfdlibm
+-LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC)
++LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC) $(FDLIBM_CFLAGS)
+
+ ifneq ($(OPENJDK_TARGET_OS), macosx)
+ $(eval $(call SetupNativeCompilation, BUILD_LIBFDLIBM, \
+@@ -64,10 +59,6 @@
+ CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \
+ CFLAGS_windows_debug := -DLOGGING, \
+ CFLAGS_aix := -qfloat=nomaf, \
+- CFLAGS_linux_ppc64 := -ffp-contract=off, \
+- CFLAGS_linux_ppc64le := -ffp-contract=off, \
+- CFLAGS_linux_s390x := -ffp-contract=off, \
+- CFLAGS_linux_aarch64 := -ffp-contract=off, \
+ DISABLED_WARNINGS_gcc := sign-compare misleading-indentation, \
+ DISABLED_WARNINGS_microsoft := 4146 4244 4018, \
+ ARFLAGS := $(ARFLAGS), \
diff --git a/JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch b/JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch
new file mode 100644
index 0000000..843ae3c
--- /dev/null
+++ b/JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch
@@ -0,0 +1,48 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1536682731 -7200
+# Tue Sep 11 18:18:51 2018 +0200
+# Node ID 7157249fdd4366d95dd68f3d083ebb0ef84c753b
+# Parent 8d86b149e10f0a0896e5fd4d8d407e5fda64a529
+8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
+Reviewed-by: duke
+
+diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
+--- a/make/hotspot/lib/JvmOverrideFiles.gmk
++++ b/make/hotspot/lib/JvmOverrideFiles.gmk
+@@ -43,20 +43,26 @@ ifeq ($(TOOLCHAIN_TYPE), gcc)
+ endif
+ endif
+
++LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NONE)
++# If the FDLIBM_CFLAGS variable is non-empty we know
++# that the fdlibm-fork in hotspot can get optimized
++# by using -ffp-contract=off on GCC/Clang platforms.
++ifneq ($(FDLIBM_CFLAGS), )
++ LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NORM)
++endif
++
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+ BUILD_LIBJVM_ostream.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
+ BUILD_LIBJVM_logFileOutput.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
+
+- ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
+- BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(CXX_O_FLAG_NONE)
+- BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := -DNO_PCH $(CXX_O_FLAG_NONE)
++ BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
++ BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
+
+- ifeq ($(TOOLCHAIN_TYPE), clang)
+- JVM_PRECOMPILED_HEADER_EXCLUDE := \
+- sharedRuntimeTrig.cpp \
+- sharedRuntimeTrans.cpp \
+- #
+- endif
++ ifeq ($(TOOLCHAIN_TYPE), clang)
++ JVM_PRECOMPILED_HEADER_EXCLUDE := \
++ sharedRuntimeTrig.cpp \
++ sharedRuntimeTrans.cpp \
++ #
+ endif
+
+ ifeq ($(OPENJDK_TARGET_CPU), x86)
diff --git a/JDK-8210647-RHBZ-1632174-libsaproc-opt-fix.patch b/JDK-8210647-RHBZ-1632174-libsaproc-opt-fix.patch
new file mode 100644
index 0000000..a279f8a
--- /dev/null
+++ b/JDK-8210647-RHBZ-1632174-libsaproc-opt-fix.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1536751862 -7200
+# Wed Sep 12 13:31:02 2018 +0200
+# Node ID f95c6746fe256fe0456e0ea0d2930631ef840286
+# Parent 7157249fdd4366d95dd68f3d083ebb0ef84c753b
+8210647: libsaproc is being compiled without optimization
+Reviewed-by: duke
+
+diff --git a/make/lib/Lib-jdk.hotspot.agent.gmk b/make/lib/Lib-jdk.hotspot.agent.gmk
+--- a/make/lib/Lib-jdk.hotspot.agent.gmk
++++ b/make/lib/Lib-jdk.hotspot.agent.gmk
+@@ -52,7 +52,7 @@
+
+ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
+ NAME := saproc, \
+- OPTIMIZATION := NONE, \
++ OPTIMIZATION := LOW, \
+ DISABLED_WARNINGS_microsoft := 4267, \
+ DISABLED_WARNINGS_gcc := sign-compare, \
+ DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \
diff --git a/JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch b/JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch
new file mode 100644
index 0000000..6fc6c07
--- /dev/null
+++ b/JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1536829660 -7200
+# Thu Sep 13 11:07:40 2018 +0200
+# Node ID 39ccca116f79139fc4b779f5df83cb32357b9ae9
+# Parent 7512bd28304cf0dc5676247990f1907162c719ca
+8210703: vmStructs.cpp compiled with -O0
+Reviewed-by: duke
+
+diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
+--- a/make/hotspot/lib/JvmOverrideFiles.gmk
++++ b/make/hotspot/lib/JvmOverrideFiles.gmk
+@@ -30,7 +30,7 @@
+ # status for individual files on specific platforms.
+
+ ifeq ($(TOOLCHAIN_TYPE), gcc)
+- BUILD_LIBJVM_vmStructs.cpp_CXXFLAGS := -fno-var-tracking-assignments -O0
++ BUILD_LIBJVM_vmStructs.cpp_CXXFLAGS := -fno-var-tracking-assignments
+ BUILD_LIBJVM_jvmciCompilerToVM.cpp_CXXFLAGS := -fno-var-tracking-assignments
+ BUILD_LIBJVM_jvmciCompilerToVMInit.cpp_CXXFLAGS := -fno-var-tracking-assignments
+ BUILD_LIBJVM_assembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
diff --git a/JDK-8210761-RHBZ-1632174-libjsig-opt-fix.patch b/JDK-8210761-RHBZ-1632174-libjsig-opt-fix.patch
new file mode 100644
index 0000000..b5a88b0
--- /dev/null
+++ b/JDK-8210761-RHBZ-1632174-libjsig-opt-fix.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1537541916 -7200
+# Fri Sep 21 16:58:36 2018 +0200
+# Node ID cd8483acfe56ade257685d93323f78e6e13704a0
+# Parent e40fa3a70efdbc22f85c0d30350189f632779831
+8210761: libjsig is being compiled without optimization
+Reviewed-by: duke
+
+diff --git a/make/lib/Lib-java.base.gmk b/make/lib/Lib-java.base.gmk
+--- a/make/lib/Lib-java.base.gmk
++++ b/make/lib/Lib-java.base.gmk
+@@ -138,6 +138,7 @@
+
+ $(eval $(call SetupJdkLibrary, BUILD_LIBJSIG, \
+ NAME := jsig, \
++ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) $(LIBJSIG_CFLAGS), \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
diff --git a/JDK-8211105-aarch64-log-sin-intrinsics-disable.patch b/JDK-8211105-aarch64-log-sin-intrinsics-disable.patch
new file mode 100644
index 0000000..734ee89
--- /dev/null
+++ b/JDK-8211105-aarch64-log-sin-intrinsics-disable.patch
@@ -0,0 +1,35 @@
+# HG changeset patch
+# User adinn
+# Date 1537977709 -3600
+# Wed Sep 26 17:01:49 2018 +0100
+# Node ID 18426968f11cd0c3b238dec365003798d07576fc
+# Parent 0abe9de66ea9e1371bf35a2394daf31d8bfada98
+8211105: AArch64: Disable cos/sin and log intrinsics in jdk11u pending fix
+Summary: AArch64 cos/sin and log intrinsics are currently broken so should be disabled
+Reviewed-by: aph, shade
+
+diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
++++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+@@ -5741,15 +5741,18 @@
+ }
+
+ if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dlog)) {
+- StubRoutines::_dlog = generate_dlog();
++ // disabled pending fix and retest of generated code via JDK-8210858
++ // StubRoutines::_dlog = generate_dlog();
+ }
+
+ if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin)) {
+- StubRoutines::_dsin = generate_dsin_dcos(/* isCos = */ false);
++ // disabled pending fix and retest of generated code via JDK-8210461
++ // StubRoutines::_dsin = generate_dsin_dcos(/* isCos = */ false);
+ }
+
+ if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos)) {
+- StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true);
++ // disabled pending fix and retest of generated code via JDK-8210461
++ // StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true);
+ }
+ }
+
diff --git a/README.md b/README.md
index e3ebf0c..c21900a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
Rolling release of (usually) STSs OpenJDK
OpenJDK have release cadence of 6 months. but 3/4 of them are Short Term Supported for 6 months only. This package is designed to harbore them. Currently it is build on openJDK 10. LTSs (next is 11) will go as separate packages.
-JDK10 is next major release of Java platform. It is bringing many cool improvements - http://openjdk.java.net/projects/jdk/10/ and is landing to your Fedora. Where it will be maintained for f27 and newer. Unluckily, it is STS (short term support) version. Between individual LTS will be always several STS. Again, please See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html and See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf . So this is rolling release of all STSs to come. Its fate during the release of fresh LTS is yet to be decided. You will always be allowed to install Used LTS in fedora build root, alongside with latest STS via alternatives.
+JDK11 is last release of Java platform. It is bringing many cool improvements - http://openjdk.java.net/projects/jdk/11/ and is landing to your Fedora. Where it will be maintained for f27 and newer. Unluckily, this package is STS (short term support) version. Between individual LTS will be always several STS. Again, please See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html and See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf . So this is rolling release of all STSs to come. Its fate during the release of fresh LTS is yet to be decided. You will always be allowed to install Used LTS in fedora build root, alongside with latest STS via alternatives.
See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html
@@ -9,3 +9,4 @@ See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaRe
https://bugzilla.redhat.com/show_bug.cgi?id=1557371#c0
https://fedoraproject.org/wiki/Changes/java-openjdk-10
+https://fedoraproject.org/wiki/Changes/java-11-openjdk-TechPreview
diff --git a/RHBZ-1565658-system-nss-SunEC.patch b/RHBZ-1565658-system-nss-SunEC.patch
index 7b1d4aa..42ce7cd 100644
--- a/RHBZ-1565658-system-nss-SunEC.patch
+++ b/RHBZ-1565658-system-nss-SunEC.patch
@@ -1,7 +1,7 @@
-diff --git openjdk/make/autoconf/jdk-options.m4 openjdk/make/autoconf/jdk-options.m4
---- openjdk/make/autoconf/jdk-options.m4
-+++ openjdk/make/autoconf/jdk-options.m4
-@@ -264,9 +264,10 @@
+diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
+--- a/make/autoconf/jdk-options.m4
++++ b/make/autoconf/jdk-options.m4
+@@ -267,9 +267,10 @@
#
AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
[
@@ -13,10 +13,10 @@ diff --git openjdk/make/autoconf/jdk-options.m4 openjdk/make/autoconf/jdk-option
ENABLE_INTREE_EC=true
AC_MSG_RESULT([yes])
else
-diff --git openjdk/make/autoconf/libraries.m4 openjdk/make/autoconf/libraries.m4
---- openjdk/make/autoconf/libraries.m4
-+++ openjdk/make/autoconf/libraries.m4
-@@ -175,6 +175,48 @@
+diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
+--- a/make/autoconf/libraries.m4
++++ b/make/autoconf/libraries.m4
+@@ -178,6 +178,48 @@
AC_SUBST(LIBDL)
LIBS="$save_LIBS"
@@ -65,10 +65,10 @@ diff --git openjdk/make/autoconf/libraries.m4 openjdk/make/autoconf/libraries.m4
# Deprecated libraries, keep the flags for backwards compatibility
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
BASIC_DEPRECATED_ARG_WITH([dxsdk])
-diff --git openjdk/make/autoconf/spec.gmk.in openjdk/make/autoconf/spec.gmk.in
---- openjdk/make/autoconf/spec.gmk.in
-+++ openjdk/make/autoconf/spec.gmk.in
-@@ -764,6 +764,10 @@
+diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
+--- a/make/autoconf/spec.gmk.in
++++ b/make/autoconf/spec.gmk.in
+@@ -795,6 +795,10 @@
# Libraries
#
@@ -79,50 +79,38 @@ diff --git openjdk/make/autoconf/spec.gmk.in openjdk/make/autoconf/spec.gmk.in
USE_EXTERNAL_LCMS:=@USE_EXTERNAL_LCMS@
LCMS_CFLAGS:=@LCMS_CFLAGS@
LCMS_LIBS:=@LCMS_LIBS@
-diff --git openjdk/make/lib/Lib-jdk.crypto.ec.gmk openjdk/make/lib/Lib-jdk.crypto.ec.gmk
---- openjdk/make/lib/Lib-jdk.crypto.ec.gmk
-+++ openjdk/make/lib/Lib-jdk.crypto.ec.gmk
-@@ -29,9 +29,15 @@
-
- ifeq ($(ENABLE_INTREE_EC), true)
-
-- LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec
- BUILD_LIBSUNEC_FLAGS := $(addprefix -I, $(SUNEC_SRC))
+diff --git a/make/lib/Lib-jdk.crypto.ec.gmk b/make/lib/Lib-jdk.crypto.ec.gmk
+--- a/make/lib/Lib-jdk.crypto.ec.gmk
++++ b/make/lib/Lib-jdk.crypto.ec.gmk
+@@ -38,6 +38,11 @@
+ BUILD_LIBSUNEC_CXXFLAGS_JDKLIB := $(CXXFLAGS_JDKLIB)
+ endif
+ ifeq ($(USE_EXTERNAL_NSS), true)
-+ LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
-+ BUILD_LIBSUNEC_FLAGS += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
-+ else
-+ LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec
++ BUILD_LIBSUNEC_CFLAGS_JDKLIB += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
++ BUILD_LIBSUNEC_CXXFLAGS_JDKLIB += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
+ endif
+
- #
- # On sol-sparc...all libraries are compiled with -xregs=no%appl
- # (set in CFLAGS_REQUIRED_sparc)
-@@ -60,7 +66,7 @@
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
+ $(eval $(call SetupJdkLibrary, BUILD_LIBSUNEC, \
+ NAME := sunec, \
+ TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
+@@ -47,9 +52,11 @@
+ CXXFLAGS := $(BUILD_LIBSUNEC_CXXFLAGS_JDKLIB), \
+ DISABLED_WARNINGS_gcc := sign-compare implicit-fallthrough, \
+ DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \
+- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
++ LDFLAGS := $(subst -Xlinker --as-needed,, \
++ $(subst -Wl$(COMMA)--as-needed,, $(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK), \
LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS := $(LIBCXX), \
-- LIBS_linux := -lc, \
+ LIBS_linux := -lc $(NSS_LIBS), \
- LIBS_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
- RC_FLAGS := $(RC_FLAGS) \
-diff --git openjdk/make/mapfiles/libsunec/mapfile-vers openjdk/make/mapfiles/libsunec/mapfile-vers
---- openjdk/make/mapfiles/libsunec/mapfile-vers
-+++ openjdk/make/mapfiles/libsunec/mapfile-vers
-@@ -31,6 +31,7 @@
- Java_sun_security_ec_ECDSASignature_signDigest;
- Java_sun_security_ec_ECDSASignature_verifySignedDigest;
- Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
-+ Java_sun_security_ec_SunEC_initialize;
- local:
- *;
- };
-diff --git openjdk/src/java.base/unix/native/include/jni_md.h openjdk/src/java.base/unix/native/include/jni_md.h
---- openjdk/src/java.base/unix/native/include/jni_md.h
-+++ openjdk/src/java.base/unix/native/include/jni_md.h
-@@ -36,6 +36,11 @@
+ ))
+
+ TARGETS += $(BUILD_LIBSUNEC)
+diff --git a/src/java.base/unix/native/include/jni_md.h b/src/java.base/unix/native/include/jni_md.h
+--- a/src/java.base/unix/native/include/jni_md.h
++++ b/src/java.base/unix/native/include/jni_md.h
+@@ -41,6 +41,11 @@
#define JNIEXPORT
#define JNIIMPORT
#endif
@@ -134,9 +122,9 @@ diff --git openjdk/src/java.base/unix/native/include/jni_md.h openjdk/src/java.b
#define JNICALL
-diff --git openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
---- openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
-+++ openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
+diff --git a/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
+--- a/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
++++ b/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
@@ -61,6 +61,7 @@
AccessController.doPrivileged(new PrivilegedAction<Void>() {
public Void run() {
@@ -145,19 +133,21 @@ diff --git openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java op
return null;
}
});
-@@ -272,4 +273,9 @@
- putService(new ProviderService(this, "KeyAgreement",
+@@ -293,6 +294,11 @@
"ECDH", "sun.security.ec.ECDHKeyAgreement", null, ATTRS));
}
-+
+
+ /**
+ * Initialize the native code.
+ */
+ private static native void initialize();
- }
-diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
---- openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
-+++ openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
++
+ private void putXDHEntries() {
+
+ HashMap<String, String> ATTRS = new HashMap<>(1);
+diff --git a/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp b/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
+--- a/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
++++ b/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
@@ -25,7 +25,11 @@
#include <jni.h>
@@ -167,9 +157,9 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
+#else
#include "impl/ecc_impl.h"
+#endif
-
- #define ILLEGAL_STATE_EXCEPTION "java/lang/IllegalStateException"
- #define INVALID_ALGORITHM_PARAMETER_EXCEPTION \
+ #include "sun_security_ec_ECDHKeyAgreement.h"
+ #include "sun_security_ec_ECKeyPairGenerator.h"
+ #include "sun_security_ec_ECDSASignature.h"
@@ -33,6 +37,13 @@
#define INVALID_PARAMETER_EXCEPTION \
"java/security/InvalidParameterException"
@@ -207,7 +197,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
}
jbyteArray getEncodedBytes(JNIEnv *env, SECItem *hSECItem)
-@@ -95,7 +112,7 @@
+@@ -139,7 +156,7 @@
*/
JNIEXPORT jobjectArray
JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair
@@ -216,7 +206,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
{
ECPrivateKey *privKey = NULL; // contains both public and private values
ECParams *ecparams = NULL;
-@@ -127,8 +144,17 @@
+@@ -171,8 +188,17 @@
env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
// Generate the new keypair (using the supplied seed)
@@ -234,7 +224,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
ThrowException(env, KEY_EXCEPTION);
goto cleanup;
}
-@@ -175,10 +201,15 @@
+@@ -219,10 +245,15 @@
}
if (privKey) {
FreeECParams(&privKey->ecParams, false);
@@ -250,7 +240,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
}
if (pSeedBuffer) {
-@@ -196,7 +227,7 @@
+@@ -240,7 +271,7 @@
*/
JNIEXPORT jbyteArray
JNICALL Java_sun_security_ec_ECDSASignature_signDigest
@@ -259,7 +249,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
{
jbyte* pDigestBuffer = NULL;
jint jDigestLength = env->GetArrayLength(digest);
-@@ -255,8 +286,18 @@
+@@ -299,8 +330,18 @@
env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
// Sign the digest (using the supplied seed)
@@ -278,7 +268,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
ThrowException(env, KEY_EXCEPTION);
goto cleanup;
}
-@@ -305,7 +346,7 @@
+@@ -349,7 +390,7 @@
*/
JNIEXPORT jboolean
JNICALL Java_sun_security_ec_ECDSASignature_verifySignedDigest
@@ -287,7 +277,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
{
jboolean isValid = false;
-@@ -362,9 +403,10 @@
+@@ -406,9 +447,10 @@
cleanup:
{
@@ -299,7 +289,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
if (pubKey.publicValue.data)
env->ReleaseByteArrayElements(publicKey,
-@@ -390,7 +432,7 @@
+@@ -434,7 +476,7 @@
*/
JNIEXPORT jbyteArray
JNICALL Java_sun_security_ec_ECDHKeyAgreement_deriveKey
@@ -308,7 +298,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
{
jbyteArray jSecret = NULL;
ECParams *ecparams = NULL;
-@@ -466,9 +508,10 @@
+@@ -510,9 +552,10 @@
env->ReleaseByteArrayElements(publicKey,
(jbyte *) publicValue_item.data, JNI_ABORT);
@@ -320,7 +310,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
if (ecparams)
FreeECParams(ecparams, true);
-@@ -477,4 +520,28 @@
+@@ -521,4 +564,28 @@
return jSecret;
}
@@ -349,10 +339,10 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
+}
+
} /* extern "C" */
-diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h openjdk/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
+diff --git a/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h b/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
new file mode 100644
--- /dev/null
-+++ openjdk/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
++++ b/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
@@ -0,0 +1,298 @@
+/*
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 32dd399..62218ba 100644
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Generates the 'source tarball' for JDK 8 projects.
+# Generates the 'source tarball' for JDK projects.
#
# Example:
# When used from local repo set REPO_ROOT pointing to file:// with your repo
@@ -123,7 +123,7 @@ pushd "${FILE_NAME_ROOT}"
# get pr2126.patch (from http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d2c9a898f50) from most correct tag
# Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2126)
# there is currnetly no "upstram version of this patch, hardcoding custom version
- PR2126="../../pr2126-10.patch"
+ PR2126="../../pr2126-11.patch"
fi;
echo "Applying ${PR2126}"
patch -Np1 < $PR2126
diff --git a/java-openjdk-s390-size_t.patch b/java-openjdk-s390-size_t.patch
deleted file mode 100644
index 920624c..0000000
--- a/java-openjdk-s390-size_t.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
---- a/src/hotspot/share/code/codeCache.cpp
-+++ b/src/hotspot/share/code/codeCache.cpp
-@@ -405,7 +405,7 @@
- add_heap(heap);
-
- // Reserve Space
-- size_t size_initial = MIN2(InitialCodeCacheSize, rs.size());
-+ size_t size_initial = MIN2((size_t)InitialCodeCacheSize, rs.size());
- size_initial = align_up(size_initial, os::vm_page_size());
- if (!heap->reserve(rs, size_initial, CodeCacheSegmentSize)) {
- vm_exit_during_initialization(err_msg("Could not reserve enough space in %s (" SIZE_FORMAT "K)",
-diff --git a/src/hotspot/share/gc/cms/parNewGeneration.cpp b/src/hotspot/share/gc/cms/parNewGeneration.cpp
---- a/src/hotspot/share/gc/cms/parNewGeneration.cpp
-+++ b/src/hotspot/share/gc/cms/parNewGeneration.cpp
-@@ -200,7 +200,7 @@
- const size_t num_overflow_elems = of_stack->size();
- const size_t space_available = queue->max_elems() - queue->size();
- const size_t num_take_elems = MIN3(space_available / 4,
-- ParGCDesiredObjsFromOverflowList,
-+ (size_t)ParGCDesiredObjsFromOverflowList,
- num_overflow_elems);
- // Transfer the most recent num_take_elems from the overflow
- // stack to our work queue.
-diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
---- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
-+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
-@@ -2296,7 +2296,7 @@
- // of things to do) or totally (at the very end).
- size_t target_size;
- if (partially) {
-- target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
-+ target_size = MIN2((size_t)_task_queue->max_elems()/3, (size_t)GCDrainStackTargetSize);
- } else {
- target_size = 0;
- }
-diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
---- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
-+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
-@@ -31,7 +31,7 @@
- }
-
- size_t G1CMObjArrayProcessor::process_array_slice(objArrayOop obj, HeapWord* start_from, size_t remaining) {
-- size_t words_to_scan = MIN2(remaining, ObjArrayMarkingStride);
-+ size_t words_to_scan = MIN2(remaining, (size_t)ObjArrayMarkingStride);
-
- if (remaining > ObjArrayMarkingStride) {
- push_array_slice(start_from + ObjArrayMarkingStride);
-diff --git a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
---- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
-+++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
-@@ -100,7 +100,7 @@
- return reserved_size() - committed_size();
- }
-
--size_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
-+uintptr_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
- return (addr - _low_boundary) / _page_size;
- }
-
-diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
---- a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
-+++ b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
-@@ -115,7 +115,7 @@
- const size_t beg_index = size_t(index);
- assert(beg_index < len || len == 0, "index too large");
-
-- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
-+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
- const size_t end_index = beg_index + stride;
- T* const base = (T*)obj->base();
- T* const beg = base + beg_index;
-diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
---- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
-+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
-@@ -905,8 +905,8 @@
- void PSParallelCompact::initialize_dead_wood_limiter()
- {
- const size_t max = 100;
-- _dwl_mean = double(MIN2(ParallelOldDeadWoodLimiterMean, max)) / 100.0;
-- _dwl_std_dev = double(MIN2(ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
-+ _dwl_mean = double(MIN2((size_t)ParallelOldDeadWoodLimiterMean, max)) / 100.0;
-+ _dwl_std_dev = double(MIN2((size_t)ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
- _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
- DEBUG_ONLY(_dwl_initialized = true;)
- _dwl_adjustment = normal_distribution(1.0);
-diff --git a/src/hotspot/share/gc/shared/plab.cpp b/src/hotspot/share/gc/shared/plab.cpp
---- a/src/hotspot/share/gc/shared/plab.cpp
-+++ b/src/hotspot/share/gc/shared/plab.cpp
-@@ -32,7 +32,7 @@
-
- size_t PLAB::min_size() {
- // Make sure that we return something that is larger than AlignmentReserve
-- return align_object_size(MAX2(MinTLABSize / HeapWordSize, (uintx)oopDesc::header_size())) + AlignmentReserve;
-+ return align_object_size(MAX2(MinTLABSize / HeapWordSize, (size_t)oopDesc::header_size())) + AlignmentReserve;
- }
-
- size_t PLAB::max_size() {
-diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
---- a/src/hotspot/share/prims/whitebox.cpp
-+++ b/src/hotspot/share/prims/whitebox.cpp
-@@ -1096,7 +1096,7 @@
- WB_END
-
- WB_ENTRY(jobject, WB_GetSizeTVMFlag(JNIEnv* env, jobject o, jstring name))
-- uintx result;
-+ size_t result;
- if (GetVMFlag <size_t> (thread, env, name, &result, &CommandLineFlags::size_tAt)) {
- ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI
- return longBox(thread, env, result);
-diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
---- a/src/hotspot/share/runtime/arguments.cpp
-+++ b/src/hotspot/share/runtime/arguments.cpp
-@@ -1586,7 +1586,7 @@
- // Increase the code cache size - tiered compiles a lot more.
- if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) {
- FLAG_SET_ERGO(uintx, ReservedCodeCacheSize,
-- MIN2(CODE_CACHE_DEFAULT_LIMIT, ReservedCodeCacheSize * 5));
-+ MIN2(CODE_CACHE_DEFAULT_LIMIT, (size_t)(ReservedCodeCacheSize * 5)));
- }
- // Enable SegmentedCodeCache if TieredCompilation is enabled and ReservedCodeCacheSize >= 240M
- if (FLAG_IS_DEFAULT(SegmentedCodeCache) && ReservedCodeCacheSize >= 240*M) {
-diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
---- a/src/hotspot/share/runtime/arguments.hpp
-+++ b/src/hotspot/share/runtime/arguments.hpp
-@@ -328,7 +328,7 @@
- // Value of the conservative maximum heap alignment needed
- static size_t _conservative_max_heap_alignment;
-
-- static uintx _min_heap_size;
-+ static size_t _min_heap_size;
-
- // -Xrun arguments
- static AgentLibraryList _libraryList;
diff --git a/java-openjdk.spec b/java-openjdk.spec
index 95d7635..22230c1 100644
--- a/java-openjdk.spec
+++ b/java-openjdk.spec
@@ -54,7 +54,7 @@
%global ppc64be ppc64 ppc64p7
%global multilib_arches %{power64} sparc64 x86_64
%global jit_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} s390x
-%global aot_arches x86_64
+%global aot_arches x86_64 %{aarch64}
# By default, we build a debug build during main build on JIT architectures
%if %{with slowdebug}
@@ -71,6 +71,13 @@
%global include_debug_build 0
%endif
+# On x86_64 and AArch64, we use the Shenandoah HotSpot
+%ifarch x86_64 %{aarch64}
+%global use_shenandoah_hotspot 1
+%else
+%global use_shenandoah_hotspot 0
+%endif
+
%if %{include_debug_build}
%global build_loop2 %{debug_suffix}
%else
@@ -120,12 +127,8 @@
%global NSS_BUILDTIME_VERSION %(if [ "x%{NSS_BUILDTIME_NUMBER}" == "x" ] ; then echo "" ;else echo ">= %{NSS_BUILDTIME_NUMBER}" ;fi)
-# Fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349.
-# See also https://bugzilla.redhat.com/show_bug.cgi?id=1590796
-# as to why some libraries *cannot* be excluded. In particular,
-# these are:
-# libjsig.so, libjava.so, libjawt.so, libjvm.so and libverify.so
-%global _privatelibs libjsoundalsa[.]so.*|libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas_unix[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libunpack[.]so.*|libzip[.]so.*|lib[.]so\\(SUNWprivate_.*
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
+%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libunpack[.]so.*|libzip[.]so.*
%global __provides_exclude ^(%{_privatelibs})$
%global __requires_exclude ^(%{_privatelibs})$
@@ -185,8 +188,19 @@
%endif
# New Version-String scheme-style defines
-%global majorver 10
-%global securityver 2
+%global majorver 11
+%global securityver 1
+# Used via new version scheme. JDK 11 was
+# GA'ed in September 2018 => 18.9
+%global vendor_version_string 18.9
+# Add LTS designator for RHEL builds
+%if 0%{?rhel}
+ %global lts_designator "LTS"
+ %global lts_designator_zip -%{lts_designator}
+%else
+ %global lts_designator ""
+ %global lts_designator_zip ""
+%endif
# Standard JPackage naming and versioning defines
%global origin openjdk
@@ -209,7 +223,7 @@
# output dir stub
%define buildoutputdir() %{expand:openjdk/build%{?1}}
# we can copy the javadoc to not arched dir, or make it not noarch
-%define uniquejavadocdir() %{expand:%{fullversion}%{?1}}
+%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
# main id and dir of this jdk
%define uniquesuffix() %{expand:%{fullversion}.%{_arch}%{?1}}
@@ -269,12 +283,9 @@ alternatives \\
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\
--slave %{_bindir}/jjs jjs %{jrebindir -- %{?1}}/jjs \\
--slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
- --slave %{_bindir}/orbd orbd %{jrebindir -- %{?1}}/orbd \\
--slave %{_bindir}/pack200 pack200 %{jrebindir -- %{?1}}/pack200 \\
--slave %{_bindir}/rmid rmid %{jrebindir -- %{?1}}/rmid \\
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- %{?1}}/rmiregistry \\
- --slave %{_bindir}/servertool servertool %{jrebindir -- %{?1}}/servertool \\
- --slave %{_bindir}/tnameserv tnameserv %{jrebindir -- %{?1}}/tnameserv \\
--slave %{_bindir}/unpack200 unpack200 %{jrebindir -- %{?1}}/unpack200 \\
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
@@ -282,18 +293,12 @@ alternatives \\
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/orbd.1$ext orbd.1$ext \\
- %{_mandir}/man1/orbd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \\
%{_mandir}/man1/pack200-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/rmid.1$ext rmid.1$ext \\
%{_mandir}/man1/rmid-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \\
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/servertool.1$ext servertool.1$ext \\
- %{_mandir}/man1/servertool-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/tnameserv.1$ext tnameserv.1$ext \\
- %{_mandir}/man1/tnameserv-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/unpack200.1$ext unpack200.1$ext \\
%{_mandir}/man1/unpack200-%{uniquesuffix -- %{?1}}.1$ext
@@ -350,14 +355,16 @@ ext=.gz
alternatives \\
--install %{_bindir}/javac javac %{sdkbindir -- %{?1}}/javac $PRIORITY --family %{name}.%{_arch} \\
--slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir -- %{?1}} \\
- --slave %{_bindir}/appletviewer appletviewer %{sdkbindir -- %{?1}}/appletviewer \\
%ifarch %{aot_arches}
--slave %{_bindir}/jaotc jaotc %{sdkbindir -- %{?1}}/jaotc \\
%endif
--slave %{_bindir}/jlink jlink %{sdkbindir -- %{?1}}/jlink \\
--slave %{_bindir}/jmod jmod %{sdkbindir -- %{?1}}/jmod \\
+%ifarch %{jit_arches}
+%ifnarch s390x
--slave %{_bindir}/jhsdb jhsdb %{sdkbindir -- %{?1}}/jhsdb \\
- --slave %{_bindir}/idlj idlj %{sdkbindir -- %{?1}}/idlj \\
+%endif
+%endif
--slave %{_bindir}/jar jar %{sdkbindir -- %{?1}}/jar \\
--slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\
--slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\
@@ -377,15 +384,7 @@ alternatives \\
--slave %{_bindir}/jstat jstat %{sdkbindir -- %{?1}}/jstat \\
--slave %{_bindir}/jstatd jstatd %{sdkbindir -- %{?1}}/jstatd \\
--slave %{_bindir}/rmic rmic %{sdkbindir -- %{?1}}/rmic \\
- --slave %{_bindir}/schemagen schemagen %{sdkbindir -- %{?1}}/schemagen \\
--slave %{_bindir}/serialver serialver %{sdkbindir -- %{?1}}/serialver \\
- --slave %{_bindir}/wsgen wsgen %{sdkbindir -- %{?1}}/wsgen \\
- --slave %{_bindir}/wsimport wsimport %{sdkbindir -- %{?1}}/wsimport \\
- --slave %{_bindir}/xjc xjc %{sdkbindir -- %{?1}}/xjc \\
- --slave %{_mandir}/man1/appletviewer.1$ext appletviewer.1$ext \\
- %{_mandir}/man1/appletviewer-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/idlj.1$ext idlj.1$ext \\
- %{_mandir}/man1/idlj-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jar.1$ext jar.1$ext \\
%{_mandir}/man1/jar-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/jarsigner.1$ext jarsigner.1$ext \\
@@ -420,16 +419,8 @@ alternatives \\
%{_mandir}/man1/jstatd-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/rmic.1$ext rmic.1$ext \\
%{_mandir}/man1/rmic-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/schemagen.1$ext schemagen.1$ext \\
- %{_mandir}/man1/schemagen-%{uniquesuffix -- %{?1}}.1$ext \\
--slave %{_mandir}/man1/serialver.1$ext serialver.1$ext \\
%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/wsgen.1$ext wsgen.1$ext \\
- %{_mandir}/man1/wsgen-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/wsimport.1$ext wsimport.1$ext \\
- %{_mandir}/man1/wsimport-%{uniquesuffix -- %{?1}}.1$ext \\
- --slave %{_mandir}/man1/xjc.1$ext xjc.1$ext \\
- %{_mandir}/man1/xjc-%{uniquesuffix -- %{?1}}.1$ext
for X in %{origin} %{javaver} ; do
alternatives \\
@@ -501,7 +492,6 @@ exit 0
%define files_jre() %{expand:
%{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}-%{origin}.png
-%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjsoundalsa.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsplashscreen.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libawt_xawt.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjawt.so
@@ -519,15 +509,14 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/java
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jjs
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/keytool
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/orbd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/pack200
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmid
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/servertool
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/tnameserv
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/unpack200
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
+%ifarch %{jit_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
+%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jrt-fs.jar
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/modules
@@ -548,7 +537,7 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2gss.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2pcsc.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2pkcs11.so
-%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjaas_unix.so
+%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjaas.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjava.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjavajpeg.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjdwp.so
@@ -563,21 +552,26 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libnio.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libprefs.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/librmi.so
+# Zero and S390x don't have SA
+%ifarch %{jit_arches}
+%ifnarch s390x
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsaproc.so
+%endif
+%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsctp.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsunec.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libunpack.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libverify.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libzip.so
+%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr
+%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/default.jfc
+%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/orbd-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/pack200-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmid-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/servertool-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/tnameserv-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/unpack200-%{uniquesuffix -- %{?1}}.1*
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/server/
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/client/
@@ -600,6 +594,7 @@ exit 0
%dir %{etcjavadir -- %{?1}}/conf/security/policy/unlimited
%config(noreplace) %{etcjavadir -- %{?1}}/lib/security/default.policy
%config(noreplace) %{etcjavadir -- %{?1}}/lib/security/blacklisted.certs
+%config(noreplace) %{etcjavadir -- %{?1}}/lib/security/public_suffix_list.dat
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/policy/limited/exempt_local.policy
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/policy/limited/default_local.policy
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/policy/limited/default_US_export.policy
@@ -622,8 +617,6 @@ exit 0
%define files_devel() %{expand:
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/bin
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/appletviewer
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/idlj
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jar
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jarsigner
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javac
@@ -635,7 +628,12 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeps
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeprscan
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jimage
+# Zero and S390x don't have SA
+%ifarch %{jit_arches}
+%ifnarch s390x
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jhsdb
+%endif
+%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jinfo
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jlink
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jmap
@@ -647,11 +645,7 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstat
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstatd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmic
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/schemagen
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/serialver
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/wsgen
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/wsimport
-%{_jvmdir}/%{sdkdir -- %{?1}}/bin/xjc
%ifarch %{aot_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jaotc
%endif
@@ -661,8 +655,6 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/tapset
%endif
%{_datadir}/applications/*jconsole%{?1}.desktop
-%{_mandir}/man1/appletviewer-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/idlj-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jar-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jarsigner-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/javac-%{uniquesuffix -- %{?1}}.1*
@@ -680,11 +672,7 @@ exit 0
%{_mandir}/man1/jstat-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jstatd-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmic-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/schemagen-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/wsgen-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/wsimport-%{uniquesuffix -- %{?1}}.1*
-%{_mandir}/man1/xjc-%{uniquesuffix -- %{?1}}.1*
%if %{with_systemtap}
%dir %{tapsetroot}
%dir %{tapsetdirttapset}
@@ -861,7 +849,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{origin}
Version: %{newjavaver}.%{buildver}
-Release: 7%{?dist}
+Release: 4%{?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
@@ -878,21 +866,25 @@ Group: Development/Languages
# HotSpot code is licensed under GPLv2
# JDK library code is licensed under GPLv2 with the Classpath exception
-# The Apache license is used in code taken from Apache projects (primarily JAXP & JAXWS)
+# The Apache license is used in code taken from Apache projects (primarily xalan & xerces)
# DOM levels 2 & 3 and the XML digital signature schemas are licensed under the W3C Software License
# The JSR166 concurrency code is in the public domain
-# The BSD and MIT licenses are used for a number of third-party libraries (see THIRD_PARTY_README)
-# The OpenJDK source tree includes the JPEG library (IJG), zlib & libpng (zlib), giflib and LCMS (MIT)
+# The BSD and MIT licenses are used for a number of third-party libraries (see ADDITIONAL_LICENSE_INFO)
+# The OpenJDK source tree includes:
+# - JPEG library (IJG), zlib & libpng (zlib), giflib (MIT), harfbuzz (ISC),
+# - freetype (FTL), jline (BSD) and LCMS (MIT)
+# - jquery (MIT), jdk.crypto.cryptoki PKCS 11 wrapper (RSA)
+# - public_suffix_list.dat from publicsuffix.org (MPLv2.0)
# The test code includes copies of NSS under the Mozilla Public License v2.0
# The PCSClite headers are under a BSD with advertising license
# The elliptic curve cryptography (ECC) source code is licensed under the LGPLv2.1 or any later version
-License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib
+License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA
URL: http://openjdk.java.net/
# to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh
# update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
-Source0: jdk-updates-jdk%{majorver}u-jdk-%{newjavaver}+%{buildver}.tar.xz
+Source0: shenandoah-jdk%{majorver}-shenandoah-jdk-%{newjavaver}+%{buildver}.tar.xz
Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
# Desktop files. Adapted from IcedTea
@@ -936,14 +928,33 @@ Patch5: RHBZ-1565658-system-nss-SunEC.patch
#
#############################################
-# s390 (Zero) build does not bootcycle without this patch
-# Already in JDK-11. Missing backports.
-Patch100: JDK-8201495-s390-java-opts.patch
-# See JDK-8198844. This won't be needed any more in
-# JDK 11+
-Patch101: sorted-diff.patch
-# Type fixing for s390 (Zero). Not upstream.
-Patch102: java-openjdk-s390-size_t.patch
+# 8210416, RHBZ#1632174: [linux] Poor StrictMath performance due to non-optimized compilation
+Patch8: JDK-8210416-RHBZ-1632174-fdlibm-opt-fix.patch
+# 8210425, RHBZ#1632174: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
+Patch9: JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch
+
+#############################################
+#
+# JDK 9+ only patches
+#
+#############################################
+
+# 8210647, RHBZ#1632174: libsaproc is being compiled without optimization
+Patch10: JDK-8210647-RHBZ-1632174-libsaproc-opt-fix.patch
+# 8210761, RHBZ#1632174: libjsig is being compiled without optimization
+Patch11: JDK-8210761-RHBZ-1632174-libjsig-opt-fix.patch
+# 8210703, RHBZ#1632174: vmStructs.cpp compiled with -O0
+Patch12: JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch
+# 8211105, RHBZ-1628612, RHBZ-1630996: Temporarily disable dsin/dcos/log
+# intrinsics on aarch64, falling back to C code. Re-enable once JDK-8210461
+# is fixed and available in jdk11u.
+Patch6: JDK-8211105-aarch64-log-sin-intrinsics-disable.patch
+#############################################
+#
+# Patches appearing in 11.0.2
+#
+#############################################
+Patch584: jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -974,7 +985,7 @@ BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
BuildRequires: javapackages-filesystem
-BuildRequires: java-openjdk-devel
+BuildRequires: java-11-openjdk-devel
# Zero-assembler build requirement
%ifnarch %{jit_arches}
BuildRequires: libffi-devel
@@ -1207,10 +1218,13 @@ pushd %{top_level_dir_name}
%patch3 -p1
%patch4 -p1
%patch5 -p1
-
-%patch101 -p1
-%patch102 -p1
-
+%patch6 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch584 -p1
popd # openjdk
%patch1000
@@ -1288,10 +1302,6 @@ EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing"
%endif
export EXTRA_CFLAGS
-(cd %{top_level_dir_name}/make/autoconf
- bash ./autogen.sh
-)
-
for suffix in %{build_loop} ; do
if [ "x$suffix" = "x" ] ; then
debugbuild=release
@@ -1315,8 +1325,9 @@ bash ../configure \
%endif
--with-version-build=%{buildver} \
--with-version-pre="" \
- --with-version-opt="" \
- --with-boot-jdk=/usr/lib/jvm/java-%{majorver}-openjdk \
+ --with-version-opt=%{lts_designator} \
+ --with-vendor-version-string="%{vendor_version_string}" \
+ --with-boot-jdk=/usr/lib/jvm/java-11-openjdk \
--with-debug-level=$debugbuild \
--with-native-debug-symbols=internal \
--enable-unlimited-crypto \
@@ -1332,6 +1343,9 @@ bash ../configure \
--with-extra-ldflags="%{ourldflags}" \
--with-num-cores="$NUM_PROC" \
--disable-javac-server \
+%ifarch x86_64
+ --with-jvm-features=zgc \
+%endif
--disable-warnings-as-errors
make \
@@ -1348,10 +1362,6 @@ make docs-zip
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
find images/%{jdkimage} -iname '*.jar' -exec chmod ugo+r {} \;
-# remove redundant *diz and *debuginfo files
-find images/%{jdkimage} -iname '*.diz' -exec rm {} \;
-find images/%{jdkimage} -iname '*.debuginfo' -exec rm {} \;
-
# Build screws up permissions on binaries
# https://bugs.openjdk.java.net/browse/JDK-8173610
find images/%{jdkimage} -iname '*.so' -exec chmod +x {} \;
@@ -1379,6 +1389,11 @@ for suffix in %{rev_build_loop} ; do
export JAVA_HOME=$(pwd)/%{buildoutputdir -- $suffix}/images/%{jdkimage}
+#check sheandoah is enabled
+%if %{use_shenandoah_hotspot}
+$JAVA_HOME//bin/java -XX:+UseShenandoahGC -version
+%endif
+
# Check unlimited policy has been used
$JAVA_HOME/bin/javac -d . %{SOURCE13}
$JAVA_HOME/bin/java --add-opens java.base/javax.crypto=ALL-UNNAMED TestCryptoLevel
@@ -1530,7 +1545,7 @@ popd
# Install Javadoc documentation
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
-cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{newjavaver}+%{buildver}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
+cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{newjavaver}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
# Install icons and menu entries
for s in 16 24 32 48 ; do
@@ -1550,9 +1565,6 @@ done
# See https://bugzilla.redhat.com/show_bug.cgi?id=741821
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/.java/.systemPrefs
-# FIXME: remove SONAME entries from demo DSOs. See
-# https://bugzilla.redhat.com/show_bug.cgi?id=436497
-
# copy samples next to demos; samples are mostly js files
cp -r %{top_level_dir_name}/src/sample $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/
diff --git a/jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch b/jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch
new file mode 100644
index 0000000..b3221f8
--- /dev/null
+++ b/jdk8209639-rh1640127-coalesce_attempted_spill_non_spillable_02.patch
@@ -0,0 +1,114 @@
+
+# HG changeset patch
+# User roland
+# Date 1534518792 -7200
+# Node ID 690d9be191bf068b68c37bc835b355b1535e6075
+# Parent 5be470fb7a19293eb95fd33806413b94abca9724
+8209639: assert failure in coalesce.cpp: attempted to spill a non-spillable item
+Reviewed-by: neliasso, kvn
+
+diff -r 5be470fb7a19 -r 690d9be191bf src/hotspot/share/opto/coalesce.cpp
+--- a/src/hotspot/share/opto/coalesce.cpp Tue Oct 16 12:47:56 2018 +0100
++++ b/src/hotspot/share/opto/coalesce.cpp Fri Aug 17 17:13:12 2018 +0200
+@@ -25,6 +25,7 @@
+ #include "precompiled.hpp"
+ #include "memory/allocation.inline.hpp"
+ #include "opto/block.hpp"
++#include "opto/c2compiler.hpp"
+ #include "opto/cfgnode.hpp"
+ #include "opto/chaitin.hpp"
+ #include "opto/coalesce.hpp"
+@@ -294,9 +295,13 @@
+ } else {
+ uint ireg = m->ideal_reg();
+ if (ireg == 0 || ireg == Op_RegFlags) {
+- assert(false, "attempted to spill a non-spillable item: %d: %s, ireg = %u, spill_type: %s",
+- m->_idx, m->Name(), ireg, MachSpillCopyNode::spill_type(MachSpillCopyNode::PhiInput));
+- C->record_method_not_compilable("attempted to spill a non-spillable item");
++ if (C->subsume_loads()) {
++ C->record_failure(C2Compiler::retry_no_subsuming_loads());
++ } else {
++ assert(false, "attempted to spill a non-spillable item: %d: %s, ireg = %u, spill_type: %s",
++ m->_idx, m->Name(), ireg, MachSpillCopyNode::spill_type(MachSpillCopyNode::PhiInput));
++ C->record_method_not_compilable("attempted to spill a non-spillable item");
++ }
+ return;
+ }
+ const RegMask *rm = C->matcher()->idealreg2spillmask[ireg];
+diff -r 5be470fb7a19 -r 690d9be191bf test/hotspot/jtreg/compiler/c2/SubsumingLoadsCauseFlagSpill.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/test/hotspot/jtreg/compiler/c2/SubsumingLoadsCauseFlagSpill.java Fri Aug 17 17:13:12 2018 +0200
+@@ -0,0 +1,72 @@
++/*
++ * Copyright (c) 2018, 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.
++ *
++ * 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.
++ */
++
++/**
++ * @test
++ * @bug 8209639
++ * @summary assert failure in coalesce.cpp: attempted to spill a non-spillable item
++ *
++ * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,SubsumingLoadsCauseFlagSpill::not_inlined -Xmx1024m SubsumingLoadsCauseFlagSpill
++ *
++ */
++
++public class SubsumingLoadsCauseFlagSpill {
++ private static Object field;
++ private static boolean do_throw;
++ private static volatile boolean barrier;
++
++ public static void main(String[] args) {
++ for (int i = 0; i < 20_000; i++) {
++ do_throw = true;
++ field = null;
++ test(0);
++ do_throw = false;
++ field = new Object();
++ test(0);
++ }
++ }
++
++ private static float test(float f) {
++ Object v = null;
++ try {
++ not_inlined();
++ v = field;
++ } catch (MyException me) {
++ v = field;
++ barrier = true;
++ }
++ if (v == null) {
++ return f * f;
++ }
++ return f;
++ }
++
++ private static void not_inlined() throws MyException{
++ if (do_throw) {
++ throw new MyException();
++ }
++ }
++
++ private static class MyException extends Throwable {
++ }
++}
+
diff --git a/pr2126-10.patch b/pr2126-10.patch
deleted file mode 100644
index a4c0a46..0000000
--- a/pr2126-10.patch
+++ /dev/null
@@ -1,675 +0,0 @@
-diff --git a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
---- openjdk/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
-+++ openjdk/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
-@@ -34,57 +34,6 @@
- //
- // See sun.security.util.CurveDB for the OIDs
-
-- // NIST K-163
-- SECT163_K1(1, NAMED_GROUP_ECDHE, "sect163k1", "1.3.132.0.1", true),
--
-- SECT163_R1(2, NAMED_GROUP_ECDHE, "sect163r1", "1.3.132.0.2", false),
--
-- // NIST B-163
-- SECT163_R2(3, NAMED_GROUP_ECDHE, "sect163r2", "1.3.132.0.15", true),
--
-- SECT193_R1(4, NAMED_GROUP_ECDHE, "sect193r1", "1.3.132.0.24", false),
-- SECT193_R2(5, NAMED_GROUP_ECDHE, "sect193r2", "1.3.132.0.25", false),
--
-- // NIST K-233
-- SECT233_K1(6, NAMED_GROUP_ECDHE, "sect233k1", "1.3.132.0.26", true),
--
-- // NIST B-233
-- SECT233_R1(7, NAMED_GROUP_ECDHE, "sect233r1", "1.3.132.0.27", true),
--
-- SECT239_K1(8, NAMED_GROUP_ECDHE, "sect239k1", "1.3.132.0.3", false),
--
-- // NIST K-283
-- SECT283_K1(9, NAMED_GROUP_ECDHE, "sect283k1", "1.3.132.0.16", true),
--
-- // NIST B-283
-- SECT283_R1(10, NAMED_GROUP_ECDHE, "sect283r1", "1.3.132.0.17", true),
--
-- // NIST K-409
-- SECT409_K1(11, NAMED_GROUP_ECDHE, "sect409k1", "1.3.132.0.36", true),
--
-- // NIST B-409
-- SECT409_R1(12, NAMED_GROUP_ECDHE, "sect409r1", "1.3.132.0.37", true),
--
-- // NIST K-571
-- SECT571_K1(13, NAMED_GROUP_ECDHE, "sect571k1", "1.3.132.0.38", true),
--
-- // NIST B-571
-- SECT571_R1(14, NAMED_GROUP_ECDHE, "sect571r1", "1.3.132.0.39", true),
--
-- SECP160_K1(15, NAMED_GROUP_ECDHE, "secp160k1", "1.3.132.0.9", false),
-- SECP160_R1(16, NAMED_GROUP_ECDHE, "secp160r1", "1.3.132.0.8", false),
-- SECP160_R2(17, NAMED_GROUP_ECDHE, "secp160r2", "1.3.132.0.30", false),
-- SECP192_K1(18, NAMED_GROUP_ECDHE, "secp192k1", "1.3.132.0.31", false),
--
-- // NIST P-192
-- SECP192_R1(19, NAMED_GROUP_ECDHE, "secp192r1", "1.2.840.10045.3.1.1", true),
--
-- SECP224_K1(20, NAMED_GROUP_ECDHE, "secp224k1", "1.3.132.0.32", false),
-- // NIST P-224
-- SECP224_R1(21, NAMED_GROUP_ECDHE, "secp224r1", "1.3.132.0.33", true),
--
-- SECP256_K1(22, NAMED_GROUP_ECDHE, "secp256k1", "1.3.132.0.10", false),
--
- // NIST P-256
- SECP256_R1(23, NAMED_GROUP_ECDHE, "secp256r1", "1.2.840.10045.3.1.7", true),
-
-diff --git a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
---- openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
-+++ openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
-@@ -116,12 +116,6 @@
- NamedGroup.SECP256_R1,
- NamedGroup.SECP384_R1,
- NamedGroup.SECP521_R1,
-- NamedGroup.SECT283_K1,
-- NamedGroup.SECT283_R1,
-- NamedGroup.SECT409_K1,
-- NamedGroup.SECT409_R1,
-- NamedGroup.SECT571_K1,
-- NamedGroup.SECT571_R1,
-
- // FFDHE 2048
- NamedGroup.FFDHE_2048,
-@@ -136,15 +130,6 @@
- NamedGroup.SECP256_R1,
- NamedGroup.SECP384_R1,
- NamedGroup.SECP521_R1,
-- NamedGroup.SECT283_K1,
-- NamedGroup.SECT283_R1,
-- NamedGroup.SECT409_K1,
-- NamedGroup.SECT409_R1,
-- NamedGroup.SECT571_K1,
-- NamedGroup.SECT571_R1,
--
-- // non-NIST curves
-- NamedGroup.SECP256_K1,
-
- // FFDHE 2048
- NamedGroup.FFDHE_2048,
-diff --git a/src/java.base/share/classes/sun/security/util/CurveDB.java b/src/java.base/share/classes/sun/security/util/CurveDB.java
---- openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
-+++ openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
-@@ -168,114 +168,6 @@
- Pattern nameSplitPattern = Pattern.compile(SPLIT_PATTERN);
-
- /* SEC2 prime curves */
-- add("secp112r1", "1.3.132.0.6", P,
-- "DB7C2ABF62E35E668076BEAD208B",
-- "DB7C2ABF62E35E668076BEAD2088",
-- "659EF8BA043916EEDE8911702B22",
-- "09487239995A5EE76B55F9C2F098",
-- "A89CE5AF8724C0A23E0E0FF77500",
-- "DB7C2ABF62E35E7628DFAC6561C5",
-- 1, nameSplitPattern);
--
-- add("secp112r2", "1.3.132.0.7", P,
-- "DB7C2ABF62E35E668076BEAD208B",
-- "6127C24C05F38A0AAAF65C0EF02C",
-- "51DEF1815DB5ED74FCC34C85D709",
-- "4BA30AB5E892B4E1649DD0928643",
-- "adcd46f5882e3747def36e956e97",
-- "36DF0AAFD8B8D7597CA10520D04B",
-- 4, nameSplitPattern);
--
-- add("secp128r1", "1.3.132.0.28", P,
-- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
-- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC",
-- "E87579C11079F43DD824993C2CEE5ED3",
-- "161FF7528B899B2D0C28607CA52C5B86",
-- "CF5AC8395BAFEB13C02DA292DDED7A83",
-- "FFFFFFFE0000000075A30D1B9038A115",
-- 1, nameSplitPattern);
--
-- add("secp128r2", "1.3.132.0.29", P,
-- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
-- "D6031998D1B3BBFEBF59CC9BBFF9AEE1",
-- "5EEEFCA380D02919DC2C6558BB6D8A5D",
-- "7B6AA5D85E572983E6FB32A7CDEBC140",
-- "27B6916A894D3AEE7106FE805FC34B44",
-- "3FFFFFFF7FFFFFFFBE0024720613B5A3",
-- 4, nameSplitPattern);
--
-- add("secp160k1", "1.3.132.0.9", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
-- "0000000000000000000000000000000000000000",
-- "0000000000000000000000000000000000000007",
-- "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB",
-- "938CF935318FDCED6BC28286531733C3F03C4FEE",
-- "0100000000000000000001B8FA16DFAB9ACA16B6B3",
-- 1, nameSplitPattern);
--
-- add("secp160r1", "1.3.132.0.8", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC",
-- "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45",
-- "4A96B5688EF573284664698968C38BB913CBFC82",
-- "23A628553168947D59DCC912042351377AC5FB32",
-- "0100000000000000000001F4C8F927AED3CA752257",
-- 1, nameSplitPattern);
--
-- add("secp160r2", "1.3.132.0.30", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70",
-- "B4E134D3FB59EB8BAB57274904664D5AF50388BA",
-- "52DCB034293A117E1F4FF11B30F7199D3144CE6D",
-- "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E",
-- "0100000000000000000000351EE786A818F3A1A16B",
-- 1, nameSplitPattern);
--
-- add("secp192k1", "1.3.132.0.31", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37",
-- "000000000000000000000000000000000000000000000000",
-- "000000000000000000000000000000000000000000000003",
-- "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D",
-- "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D",
-- "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D",
-- 1, nameSplitPattern);
--
-- add("secp192r1 [NIST P-192, X9.62 prime192v1]", "1.2.840.10045.3.1.1", PD,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
-- "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1",
-- "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012",
-- "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811",
-- "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831",
-- 1, nameSplitPattern);
--
-- add("secp224k1", "1.3.132.0.32", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D",
-- "00000000000000000000000000000000000000000000000000000000",
-- "00000000000000000000000000000000000000000000000000000005",
-- "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C",
-- "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5",
-- "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7",
-- 1, nameSplitPattern);
--
-- add("secp224r1 [NIST P-224]", "1.3.132.0.33", PD,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
-- "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
-- "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
-- "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D",
-- 1, nameSplitPattern);
--
-- add("secp256k1", "1.3.132.0.10", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F",
-- "0000000000000000000000000000000000000000000000000000000000000000",
-- "0000000000000000000000000000000000000000000000000000000000000007",
-- "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798",
-- "483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141",
-- 1, nameSplitPattern);
--
- add("secp256r1 [NIST P-256, X9.62 prime256v1]", "1.2.840.10045.3.1.7", PD,
- "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF",
- "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC",
-@@ -303,435 +195,6 @@
- "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409",
- 1, nameSplitPattern);
-
-- /* ANSI X9.62 prime curves */
-- add("X9.62 prime192v2", "1.2.840.10045.3.1.2", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
-- "CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953",
-- "EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A",
-- "6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15",
-- "FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31",
-- 1, nameSplitPattern);
--
-- add("X9.62 prime192v3", "1.2.840.10045.3.1.3", P,
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
-- "22123DC2395A05CAA7423DAECCC94760A7D462256BD56916",
-- "7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896",
-- "38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0",
-- "FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13",
-- 1, nameSplitPattern);
--
-- add("X9.62 prime239v1", "1.2.840.10045.3.1.4", P,
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
-- "6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A",
-- "0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF",
-- "7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE",
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B",
-- 1, nameSplitPattern);
--
-- add("X9.62 prime239v2", "1.2.840.10045.3.1.5", P,
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
-- "617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C",
-- "38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7",
-- "5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA",
-- "7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063",
-- 1, nameSplitPattern);
--
-- add("X9.62 prime239v3", "1.2.840.10045.3.1.6", P,
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
-- "255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E",
-- "6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A",
-- "1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3",
-- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551",
-- 1, nameSplitPattern);
--
-- /* SEC2 binary curves */
-- add("sect113r1", "1.3.132.0.4", B,
-- "020000000000000000000000000201",
-- "003088250CA6E7C7FE649CE85820F7",
-- "00E8BEE4D3E2260744188BE0E9C723",
-- "009D73616F35F4AB1407D73562C10F",
-- "00A52830277958EE84D1315ED31886",
-- "0100000000000000D9CCEC8A39E56F",
-- 2, nameSplitPattern);
--
-- add("sect113r2", "1.3.132.0.5", B,
-- "020000000000000000000000000201",
-- "00689918DBEC7E5A0DD6DFC0AA55C7",
-- "0095E9A9EC9B297BD4BF36E059184F",
-- "01A57A6A7B26CA5EF52FCDB8164797",
-- "00B3ADC94ED1FE674C06E695BABA1D",
-- "010000000000000108789B2496AF93",
-- 2, nameSplitPattern);
--
-- add("sect131r1", "1.3.132.0.22", B,
-- "080000000000000000000000000000010D",
-- "07A11B09A76B562144418FF3FF8C2570B8",
-- "0217C05610884B63B9C6C7291678F9D341",
-- "0081BAF91FDF9833C40F9C181343638399",
-- "078C6E7EA38C001F73C8134B1B4EF9E150",
-- "0400000000000000023123953A9464B54D",
-- 2, nameSplitPattern);
--
-- add("sect131r2", "1.3.132.0.23", B,
-- "080000000000000000000000000000010D",
-- "03E5A88919D7CAFCBF415F07C2176573B2",
-- "04B8266A46C55657AC734CE38F018F2192",
-- "0356DCD8F2F95031AD652D23951BB366A8",
-- "0648F06D867940A5366D9E265DE9EB240F",
-- "0400000000000000016954A233049BA98F",
-- 2, nameSplitPattern);
--
-- add("sect163k1 [NIST K-163]", "1.3.132.0.1", BD,
-- "0800000000000000000000000000000000000000C9",
-- "000000000000000000000000000000000000000001",
-- "000000000000000000000000000000000000000001",
-- "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8",
-- "0289070FB05D38FF58321F2E800536D538CCDAA3D9",
-- "04000000000000000000020108A2E0CC0D99F8A5EF",
-- 2, nameSplitPattern);
--
-- add("sect163r1", "1.3.132.0.2", B,
-- "0800000000000000000000000000000000000000C9",
-- "07B6882CAAEFA84F9554FF8428BD88E246D2782AE2",
-- "0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9",
-- "0369979697AB43897789566789567F787A7876A654",
-- "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883",
-- "03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B",
-- 2, nameSplitPattern);
--
-- add("sect163r2 [NIST B-163]", "1.3.132.0.15", BD,
-- "0800000000000000000000000000000000000000C9",
-- "000000000000000000000000000000000000000001",
-- "020A601907B8C953CA1481EB10512F78744A3205FD",
-- "03F0EBA16286A2D57EA0991168D4994637E8343E36",
-- "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1",
-- "040000000000000000000292FE77E70C12A4234C33",
-- 2, nameSplitPattern);
--
-- add("sect193r1", "1.3.132.0.24", B,
-- "02000000000000000000000000000000000000000000008001",
-- "0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01",
-- "00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814",
-- "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1",
-- "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05",
-- "01000000000000000000000000C7F34A778F443ACC920EBA49",
-- 2, nameSplitPattern);
--
-- add("sect193r2", "1.3.132.0.25", B,
-- "02000000000000000000000000000000000000000000008001",
-- "0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B",
-- "00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE",
-- "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F",
-- "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C",
-- "010000000000000000000000015AAB561B005413CCD4EE99D5",
-- 2, nameSplitPattern);
--
-- add("sect233k1 [NIST K-233]", "1.3.132.0.26", BD,
-- "020000000000000000000000000000000000000004000000000000000001",
-- "000000000000000000000000000000000000000000000000000000000000",
-- "000000000000000000000000000000000000000000000000000000000001",
-- "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126",
-- "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3",
-- "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF",
-- 4, nameSplitPattern);
--
-- add("sect233r1 [NIST B-233]", "1.3.132.0.27", B,
-- "020000000000000000000000000000000000000004000000000000000001",
-- "000000000000000000000000000000000000000000000000000000000001",
-- "0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD",
-- "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B",
-- "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052",
-- "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7",
-- 2, nameSplitPattern);
--
-- add("sect239k1", "1.3.132.0.3", B,
-- "800000000000000000004000000000000000000000000000000000000001",
-- "000000000000000000000000000000000000000000000000000000000000",
-- "000000000000000000000000000000000000000000000000000000000001",
-- "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC",
-- "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA",
-- "2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5",
-- 4, nameSplitPattern);
--
-- add("sect283k1 [NIST K-283]", "1.3.132.0.16", BD,
-- "0800000000000000000000000000000000000000000000000000000000000000000010A1",
-- "000000000000000000000000000000000000000000000000000000000000000000000000",
-- "000000000000000000000000000000000000000000000000000000000000000000000001",
-- "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836",
-- "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259",
-- "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61",
-- 4, nameSplitPattern);
--
-- add("sect283r1 [NIST B-283]", "1.3.132.0.17", B,
-- "0800000000000000000000000000000000000000000000000000000000000000000010A1",
-- "000000000000000000000000000000000000000000000000000000000000000000000001",
-- "027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5",
-- "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053",
-- "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4",
-- "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307",
-- 2, nameSplitPattern);
--
-- add("sect409k1 [NIST K-409]", "1.3.132.0.36", BD,
-- "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
-- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-- "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746",
-- "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B",
-- "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF",
-- 4, nameSplitPattern);
--
-- add("sect409r1 [NIST B-409]", "1.3.132.0.37", B,
-- "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
-- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-- "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F",
-- "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7",
-- "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706",
-- "010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173",
-- 2, nameSplitPattern);
--
-- add("sect571k1 [NIST K-571]", "1.3.132.0.38", BD,
-- "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
-- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-- "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972",
-- "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3",
-- "020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001",
-- 4, nameSplitPattern);
--
-- add("sect571r1 [NIST B-571]", "1.3.132.0.39", B,
-- "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
-- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-- "02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A",
-- "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19",
-- "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B",
-- "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47",
-- 2, nameSplitPattern);
--
-- /* ANSI X9.62 binary curves */
-- add("X9.62 c2tnb191v1", "1.2.840.10045.3.0.5", B,
-- "800000000000000000000000000000000000000000000201",
-- "2866537B676752636A68F56554E12640276B649EF7526267",
-- "2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC",
-- "36B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D",
-- "765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB",
-- "40000000000000000000000004A20E90C39067C893BBB9A5",
-- 2, nameSplitPattern);
--
-- add("X9.62 c2tnb191v2", "1.2.840.10045.3.0.6", B,
-- "800000000000000000000000000000000000000000000201",
-- "401028774D7777C7B7666D1366EA432071274F89FF01E718",
-- "0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01",
-- "3809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10",
-- "17434386626D14F3DBF01760D9213A3E1CF37AEC437D668A",
-- "20000000000000000000000050508CB89F652824E06B8173",
-- 4, nameSplitPattern);
--
-- add("X9.62 c2tnb191v3", "1.2.840.10045.3.0.7", B,
-- "800000000000000000000000000000000000000000000201",
-- "6C01074756099122221056911C77D77E77A777E7E7E77FCB",
-- "71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8",
-- "375D4CE24FDE434489DE8746E71786015009E66E38A926DD",
-- "545A39176196575D985999366E6AD34CE0A77CD7127B06BE",
-- "155555555555555555555555610C0B196812BFB6288A3EA3",
-- 6, nameSplitPattern);
--
-- add("X9.62 c2tnb239v1", "1.2.840.10045.3.0.11", B,
-- "800000000000000000000000000000000000000000000000001000000001",
-- "32010857077C5431123A46B808906756F543423E8D27877578125778AC76",
-- "790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16",
-- "57927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D",
-- "61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305",
-- "2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447",
-- 4, nameSplitPattern);
--
-- add("X9.62 c2tnb239v2", "1.2.840.10045.3.0.12", B,
-- "800000000000000000000000000000000000000000000000001000000001",
-- "4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F",
-- "5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B",
-- "28F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205",
-- "5667334C45AFF3B5A03BAD9DD75E2C71A99362567D5453F7FA6E227EC833",
-- "1555555555555555555555555555553C6F2885259C31E3FCDF154624522D",
-- 6, nameSplitPattern);
--
-- add("X9.62 c2tnb239v3", "1.2.840.10045.3.0.13", B,
-- "800000000000000000000000000000000000000000000000001000000001",
-- "01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F",
-- "6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40",
-- "70F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92",
-- "2E5A0EAF6E5E1305B9004DCE5C0ED7FE59A35608F33837C816D80B79F461",
-- "0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF",
-- 0xA, nameSplitPattern);
--
-- add("X9.62 c2tnb359v1", "1.2.840.10045.3.0.18", B,
-- "800000000000000000000000000000000000000000000000000000000000000000000000100000000000000001",
-- "5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05656FB549016A96656A557",
-- "2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC345626089687742B6329E70680231988",
-- "3C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097",
-- "53D7E08529547048121E9C95F3791DD804963948F34FAE7BF44EA82365DC7868FE57E4AE2DE211305A407104BD",
-- "01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB964FE7719E74F490758D3B",
-- 0x4C, nameSplitPattern);
--
-- add("X9.62 c2tnb431r1", "1.2.840.10045.3.0.20", B,
-- "800000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000001",
-- "1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF620B0EB9906D0957F6C6FEACD615468DF104DE296CD8F",
-- "10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A919B626D4E50A8DD731B107A9962381FB5D807BF2618",
-- "120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7",
-- "20D0AF8903A96F8D5FA2C255745D3C451B302C9346D9B7E485E7BCE41F6B591F3E8F6ADDCBB0BC4C2F947A7DE1A89B625D6A598B3760",
-- "0340340340340340340340340340340340340340340340340340340323C313FAB50589703B5EC68D3587FEC60D161CC149C1AD4A91",
-- 0x2760, nameSplitPattern);
--
-- /* ANSI X9.62 binary curves from the 1998 standard but forbidden
-- * in the 2005 version of the standard.
-- * We don't register them but leave them here for the time being in
-- * case we need to support them after all.
-- */
--/*
-- add("X9.62 c2pnb163v1", "1.2.840.10045.3.0.1", B,
-- "080000000000000000000000000000000000000107",
-- "072546B5435234A422E0789675F432C89435DE5242",
-- "00C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9",
-- "07AF69989546103D79329FCC3D74880F33BBE803CB",
-- "01EC23211B5966ADEA1D3F87F7EA5848AEF0B7CA9F",
-- "0400000000000000000001E60FC8821CC74DAEAFC1",
-- 2, nameSplitPattern);
--
-- add("X9.62 c2pnb163v2", "1.2.840.10045.3.0.2", B,
-- "080000000000000000000000000000000000000107",
-- "0108B39E77C4B108BED981ED0E890E117C511CF072",
-- "0667ACEB38AF4E488C407433FFAE4F1C811638DF20",
-- "0024266E4EB5106D0A964D92C4860E2671DB9B6CC5",
-- "079F684DDF6684C5CD258B3890021B2386DFD19FC5",
-- "03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7",
-- 2, nameSplitPattern);
--
-- add("X9.62 c2pnb163v3", "1.2.840.10045.3.0.3", B,
-- "080000000000000000000000000000000000000107",
-- "07A526C63D3E25A256A007699F5447E32AE456B50E",
-- "03F7061798EB99E238FD6F1BF95B48FEEB4854252B",
-- "02F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB",
-- "05B935590C155E17EA48EB3FF3718B893DF59A05D0",
-- "03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309",
-- 2, nameSplitPattern);
--
-- add("X9.62 c2pnb176w1", "1.2.840.10045.3.0.4", B,
-- "0100000000000000000000000000000000080000000007",
-- "E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B",
-- "5DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2",
-- "8D16C2866798B600F9F08BB4A8E860F3298CE04A5798",
-- "6FA4539C2DADDDD6BAB5167D61B436E1D92BB16A562C",
-- "00010092537397ECA4F6145799D62B0A19CE06FE26AD",
-- 0xFF6E, nameSplitPattern);
--
-- add("X9.62 c2pnb208w1", "1.2.840.10045.3.0.10", B,
-- "010000000000000000000000000000000800000000000000000007",
-- "0000000000000000000000000000000000000000000000000000",
-- "C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E",
-- "89FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A",
-- "0F55B51A06E78E9AC38A035FF520D8B01781BEB1A6BB08617DE3",
-- "000101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D",
-- 0xFE48, nameSplitPattern);
--
-- add("X9.62 c2pnb272w1", "1.2.840.10045.3.0.16", B,
-- "010000000000000000000000000000000000000000000000000000010000000000000B",
-- "91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586FB20",
-- "7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E540F7",
-- "6108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D",
-- "10C7695716851EEF6BA7F6872E6142FBD241B830FF5EFCACECCAB05E02005DDE9D23",
-- "000100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521",
-- 0xFF06, nameSplitPattern);
--
-- add("X9.62 c2pnb304w1", "1.2.840.10045.3.0.17", B,
-- "010000000000000000000000000000000000000000000000000000000000000000000000000807",
-- "FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C1288078365A0396C8E681",
-- "BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C14039601E55827340BE",
-- "197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614",
-- "E19FBEB76E0DA171517ECF401B50289BF014103288527A9B416A105E80260B549FDC1B92C03B",
-- "000101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164443051D",
-- 0xFE2E, nameSplitPattern);
--
-- add("X9.62 c2pnb368w1", "1.2.840.10045.3.0.19", B,
-- "0100000000000000000000000000000000000000000000000000000000000000000000002000000000000000000007",
-- "E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C576D62F0AB7519CCD2A1A906AE30D",
-- "FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1C2112D84D164F444F8F74786046A",
-- "1085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F",
-- "7B3EB1BDDCBA62D5D8B2059B525797FC73822C59059C623A45FF3843CEE8F87CD1855ADAA81E2A0750B80FDA2310",
-- "00010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E909AE40A6F131E9CFCE5BD967",
-- 0xFF70, nameSplitPattern);
--*/
--
-- /*
-- * Brainpool curves (RFC 5639)
-- * (Twisted curves are not included)
-- */
--
-- add("brainpoolP160r1", "1.3.36.3.3.2.8.1.1.1", P,
-- "E95E4A5F737059DC60DFC7AD95B3D8139515620F",
-- "340E7BE2A280EB74E2BE61BADA745D97E8F7C300",
-- "1E589A8595423412134FAA2DBDEC95C8D8675E58",
-- "BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC3",
-- "1667CB477A1A8EC338F94741669C976316DA6321",
-- "E95E4A5F737059DC60DF5991D45029409E60FC09",
-- 1, nameSplitPattern);
--
-- add("brainpoolP192r1", "1.3.36.3.3.2.8.1.1.3", P,
-- "C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297",
-- "6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF",
-- "469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9",
-- "C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD6",
-- "14B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F",
-- "C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1",
-- 1, nameSplitPattern);
--
-- add("brainpoolP224r1", "1.3.36.3.3.2.8.1.1.5", P,
-- "D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF",
-- "68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43",
-- "2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B",
-- "0D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D",
-- "58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD",
-- "D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F",
-- 1, nameSplitPattern);
--
-- add("brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7", P,
-- "A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377",
-- "7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9",
-- "26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6",
-- "8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262",
-- "547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997",
-- "A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7",
-- 1, nameSplitPattern);
--
-- add("brainpoolP320r1", "1.3.36.3.3.2.8.1.1.9", P,
-- "D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27",
-- "3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4",
-- "520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6",
-- "43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E20611",
-- "14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1",
-- "D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311",
-- 1, nameSplitPattern);
--
-- add("brainpoolP384r1", "1.3.36.3.3.2.8.1.1.11", P,
-- "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53",
-- "7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826",
-- "04A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11",
-- "1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E",
-- "8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315",
-- "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565",
-- 1, nameSplitPattern);
--
-- add("brainpoolP512r1", "1.3.36.3.3.2.8.1.1.13", P,
-- "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3",
-- "7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA",
-- "3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723",
-- "81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822",
-- "7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892",
-- "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069",
-- 1, nameSplitPattern);
--
- specCollection = Collections.unmodifiableCollection(oidMap.values());
- }
- }
-diff --git a/test/jdk/sun/security/ec/TestEC.java b/test/jdk/sun/security/ec/TestEC.java
---- openjdk/test/jdk/sun/security/ec/TestEC.java
-+++ openjdk/test/jdk/sun/security/ec/TestEC.java
-@@ -35,8 +35,8 @@
- * @library ../pkcs11/sslecc
- * @library ../../../java/security/testlibrary
- * @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper
-- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
-- * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
-+ * @run main/othervm -Djdk.tls.namedGroups="secp256r1" TestEC
-+ * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1" TestEC
- */
-
- import java.security.NoSuchProviderException;
-diff -r bd66ea2fdde3 test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
---- openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Thu Jul 27 18:04:48 2017 +0000
-+++ openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Fri Oct 06 13:18:47 2017 +0200
-@@ -34,9 +34,9 @@
- * @library ..
- * @library ../../../../java/security/testlibrary
- * @modules jdk.crypto.cryptoki
-- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
-+ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
- * ClientJSSEServerJSSE
-- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
-+ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
- * ClientJSSEServerJSSE sm policy
- */
diff --git a/pr2126-11.patch b/pr2126-11.patch
new file mode 100644
index 0000000..6a1da4c
--- /dev/null
+++ b/pr2126-11.patch
@@ -0,0 +1,687 @@
+diff --git a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
+--- openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
++++ openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
+@@ -180,72 +180,6 @@
+ // Elliptic Curves (RFC 4492)
+ //
+ // See sun.security.util.CurveDB for the OIDs
+- // NIST K-163
+- SECT163_K1 (0x0001, "sect163k1", "1.3.132.0.1", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT163_R1 (0x0002, "sect163r1", "1.3.132.0.2", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-163
+- SECT163_R2 (0x0003, "sect163r2", "1.3.132.0.15", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT193_R1 (0x0004, "sect193r1", "1.3.132.0.24", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT193_R2 (0x0005, "sect193r2", "1.3.132.0.25", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-233
+- SECT233_K1 (0x0006, "sect233k1", "1.3.132.0.26", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-233
+- SECT233_R1 (0x0007, "sect233r1", "1.3.132.0.27", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT239_K1 (0x0008, "sect239k1", "1.3.132.0.3", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-283
+- SECT283_K1 (0x0009, "sect283k1", "1.3.132.0.16", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-283
+- SECT283_R1 (0x000A, "sect283r1", "1.3.132.0.17", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-409
+- SECT409_K1 (0x000B, "sect409k1", "1.3.132.0.36", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-409
+- SECT409_R1 (0x000C, "sect409r1", "1.3.132.0.37", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-571
+- SECT571_K1 (0x000D, "sect571k1", "1.3.132.0.38", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-571
+- SECT571_R1 (0x000E, "sect571r1", "1.3.132.0.39", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP160_K1 (0x000F, "secp160k1", "1.3.132.0.9", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP160_R1 (0x0010, "secp160r1", "1.3.132.0.8", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP160_R2 (0x0011, "secp160r2", "1.3.132.0.30", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP192_K1 (0x0012, "secp192k1", "1.3.132.0.31", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST P-192
+- SECP192_R1 (0x0013, "secp192r1", "1.2.840.10045.3.1.1", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP224_K1 (0x0014, "secp224k1", "1.3.132.0.32", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- // NIST P-224
+- SECP224_R1 (0x0015, "secp224r1", "1.3.132.0.33", true,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP256_K1 (0x0016, "secp256k1", "1.3.132.0.10", false,
+- ProtocolVersion.PROTOCOLS_TO_12),
+
+ // NIST P-256
+ SECP256_R1 (0x0017, "secp256r1", "1.2.840.10045.3.1.7", true,
+@@ -116,12 +116,6 @@
+ NamedGroup.SECP256_R1,
+ NamedGroup.SECP384_R1,
+ NamedGroup.SECP521_R1,
+- NamedGroup.SECT283_K1,
+- NamedGroup.SECT283_R1,
+- NamedGroup.SECT409_K1,
+- NamedGroup.SECT409_R1,
+- NamedGroup.SECT571_K1,
+- NamedGroup.SECT571_R1,
+
+ // FFDHE 2048
+ NamedGroup.FFDHE_2048,
+@@ -136,15 +130,6 @@
+ NamedGroup.SECP256_R1,
+ NamedGroup.SECP384_R1,
+ NamedGroup.SECP521_R1,
+- NamedGroup.SECT283_K1,
+- NamedGroup.SECT283_R1,
+- NamedGroup.SECT409_K1,
+- NamedGroup.SECT409_R1,
+- NamedGroup.SECT571_K1,
+- NamedGroup.SECT571_R1,
+-
+- // non-NIST curves
+- NamedGroup.SECP256_K1,
+
+ // FFDHE 2048
+ NamedGroup.FFDHE_2048,
+diff --git a/src/java.base/share/classes/sun/security/util/CurveDB.java b/src/java.base/share/classes/sun/security/util/CurveDB.java
+--- openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
++++ openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
+@@ -168,114 +168,6 @@
+ Pattern nameSplitPattern = Pattern.compile(SPLIT_PATTERN);
+
+ /* SEC2 prime curves */
+- add("secp112r1", "1.3.132.0.6", P,
+- "DB7C2ABF62E35E668076BEAD208B",
+- "DB7C2ABF62E35E668076BEAD2088",
+- "659EF8BA043916EEDE8911702B22",
+- "09487239995A5EE76B55F9C2F098",
+- "A89CE5AF8724C0A23E0E0FF77500",
+- "DB7C2ABF62E35E7628DFAC6561C5",
+- 1, nameSplitPattern);
+-
+- add("secp112r2", "1.3.132.0.7", P,
+- "DB7C2ABF62E35E668076BEAD208B",
+- "6127C24C05F38A0AAAF65C0EF02C",
+- "51DEF1815DB5ED74FCC34C85D709",
+- "4BA30AB5E892B4E1649DD0928643",
+- "adcd46f5882e3747def36e956e97",
+- "36DF0AAFD8B8D7597CA10520D04B",
+- 4, nameSplitPattern);
+-
+- add("secp128r1", "1.3.132.0.28", P,
+- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
+- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC",
+- "E87579C11079F43DD824993C2CEE5ED3",
+- "161FF7528B899B2D0C28607CA52C5B86",
+- "CF5AC8395BAFEB13C02DA292DDED7A83",
+- "FFFFFFFE0000000075A30D1B9038A115",
+- 1, nameSplitPattern);
+-
+- add("secp128r2", "1.3.132.0.29", P,
+- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
+- "D6031998D1B3BBFEBF59CC9BBFF9AEE1",
+- "5EEEFCA380D02919DC2C6558BB6D8A5D",
+- "7B6AA5D85E572983E6FB32A7CDEBC140",
+- "27B6916A894D3AEE7106FE805FC34B44",
+- "3FFFFFFF7FFFFFFFBE0024720613B5A3",
+- 4, nameSplitPattern);
+-
+- add("secp160k1", "1.3.132.0.9", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
+- "0000000000000000000000000000000000000000",
+- "0000000000000000000000000000000000000007",
+- "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB",
+- "938CF935318FDCED6BC28286531733C3F03C4FEE",
+- "0100000000000000000001B8FA16DFAB9ACA16B6B3",
+- 1, nameSplitPattern);
+-
+- add("secp160r1", "1.3.132.0.8", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC",
+- "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45",
+- "4A96B5688EF573284664698968C38BB913CBFC82",
+- "23A628553168947D59DCC912042351377AC5FB32",
+- "0100000000000000000001F4C8F927AED3CA752257",
+- 1, nameSplitPattern);
+-
+- add("secp160r2", "1.3.132.0.30", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70",
+- "B4E134D3FB59EB8BAB57274904664D5AF50388BA",
+- "52DCB034293A117E1F4FF11B30F7199D3144CE6D",
+- "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E",
+- "0100000000000000000000351EE786A818F3A1A16B",
+- 1, nameSplitPattern);
+-
+- add("secp192k1", "1.3.132.0.31", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37",
+- "000000000000000000000000000000000000000000000000",
+- "000000000000000000000000000000000000000000000003",
+- "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D",
+- "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D",
+- "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D",
+- 1, nameSplitPattern);
+-
+- add("secp192r1 [NIST P-192, X9.62 prime192v1]", "1.2.840.10045.3.1.1", PD,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+- "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1",
+- "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012",
+- "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811",
+- "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831",
+- 1, nameSplitPattern);
+-
+- add("secp224k1", "1.3.132.0.32", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D",
+- "00000000000000000000000000000000000000000000000000000000",
+- "00000000000000000000000000000000000000000000000000000005",
+- "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C",
+- "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5",
+- "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7",
+- 1, nameSplitPattern);
+-
+- add("secp224r1 [NIST P-224]", "1.3.132.0.33", PD,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
+- "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
+- "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
+- "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D",
+- 1, nameSplitPattern);
+-
+- add("secp256k1", "1.3.132.0.10", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F",
+- "0000000000000000000000000000000000000000000000000000000000000000",
+- "0000000000000000000000000000000000000000000000000000000000000007",
+- "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798",
+- "483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141",
+- 1, nameSplitPattern);
+-
+ add("secp256r1 [NIST P-256, X9.62 prime256v1]", "1.2.840.10045.3.1.7", PD,
+ "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF",
+ "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC",
+@@ -303,435 +195,6 @@
+ "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409",
+ 1, nameSplitPattern);
+
+- /* ANSI X9.62 prime curves */
+- add("X9.62 prime192v2", "1.2.840.10045.3.1.2", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+- "CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953",
+- "EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A",
+- "6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15",
+- "FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31",
+- 1, nameSplitPattern);
+-
+- add("X9.62 prime192v3", "1.2.840.10045.3.1.3", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+- "22123DC2395A05CAA7423DAECCC94760A7D462256BD56916",
+- "7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896",
+- "38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0",
+- "FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13",
+- 1, nameSplitPattern);
+-
+- add("X9.62 prime239v1", "1.2.840.10045.3.1.4", P,
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+- "6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A",
+- "0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF",
+- "7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE",
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B",
+- 1, nameSplitPattern);
+-
+- add("X9.62 prime239v2", "1.2.840.10045.3.1.5", P,
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+- "617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C",
+- "38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7",
+- "5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA",
+- "7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063",
+- 1, nameSplitPattern);
+-
+- add("X9.62 prime239v3", "1.2.840.10045.3.1.6", P,
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+- "255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E",
+- "6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A",
+- "1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3",
+- "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551",
+- 1, nameSplitPattern);
+-
+- /* SEC2 binary curves */
+- add("sect113r1", "1.3.132.0.4", B,
+- "020000000000000000000000000201",
+- "003088250CA6E7C7FE649CE85820F7",
+- "00E8BEE4D3E2260744188BE0E9C723",
+- "009D73616F35F4AB1407D73562C10F",
+- "00A52830277958EE84D1315ED31886",
+- "0100000000000000D9CCEC8A39E56F",
+- 2, nameSplitPattern);
+-
+- add("sect113r2", "1.3.132.0.5", B,
+- "020000000000000000000000000201",
+- "00689918DBEC7E5A0DD6DFC0AA55C7",
+- "0095E9A9EC9B297BD4BF36E059184F",
+- "01A57A6A7B26CA5EF52FCDB8164797",
+- "00B3ADC94ED1FE674C06E695BABA1D",
+- "010000000000000108789B2496AF93",
+- 2, nameSplitPattern);
+-
+- add("sect131r1", "1.3.132.0.22", B,
+- "080000000000000000000000000000010D",
+- "07A11B09A76B562144418FF3FF8C2570B8",
+- "0217C05610884B63B9C6C7291678F9D341",
+- "0081BAF91FDF9833C40F9C181343638399",
+- "078C6E7EA38C001F73C8134B1B4EF9E150",
+- "0400000000000000023123953A9464B54D",
+- 2, nameSplitPattern);
+-
+- add("sect131r2", "1.3.132.0.23", B,
+- "080000000000000000000000000000010D",
+- "03E5A88919D7CAFCBF415F07C2176573B2",
+- "04B8266A46C55657AC734CE38F018F2192",
+- "0356DCD8F2F95031AD652D23951BB366A8",
+- "0648F06D867940A5366D9E265DE9EB240F",
+- "0400000000000000016954A233049BA98F",
+- 2, nameSplitPattern);
+-
+- add("sect163k1 [NIST K-163]", "1.3.132.0.1", BD,
+- "0800000000000000000000000000000000000000C9",
+- "000000000000000000000000000000000000000001",
+- "000000000000000000000000000000000000000001",
+- "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8",
+- "0289070FB05D38FF58321F2E800536D538CCDAA3D9",
+- "04000000000000000000020108A2E0CC0D99F8A5EF",
+- 2, nameSplitPattern);
+-
+- add("sect163r1", "1.3.132.0.2", B,
+- "0800000000000000000000000000000000000000C9",
+- "07B6882CAAEFA84F9554FF8428BD88E246D2782AE2",
+- "0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9",
+- "0369979697AB43897789566789567F787A7876A654",
+- "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883",
+- "03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B",
+- 2, nameSplitPattern);
+-
+- add("sect163r2 [NIST B-163]", "1.3.132.0.15", BD,
+- "0800000000000000000000000000000000000000C9",
+- "000000000000000000000000000000000000000001",
+- "020A601907B8C953CA1481EB10512F78744A3205FD",
+- "03F0EBA16286A2D57EA0991168D4994637E8343E36",
+- "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1",
+- "040000000000000000000292FE77E70C12A4234C33",
+- 2, nameSplitPattern);
+-
+- add("sect193r1", "1.3.132.0.24", B,
+- "02000000000000000000000000000000000000000000008001",
+- "0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01",
+- "00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814",
+- "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1",
+- "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05",
+- "01000000000000000000000000C7F34A778F443ACC920EBA49",
+- 2, nameSplitPattern);
+-
+- add("sect193r2", "1.3.132.0.25", B,
+- "02000000000000000000000000000000000000000000008001",
+- "0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B",
+- "00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE",
+- "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F",
+- "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C",
+- "010000000000000000000000015AAB561B005413CCD4EE99D5",
+- 2, nameSplitPattern);
+-
+- add("sect233k1 [NIST K-233]", "1.3.132.0.26", BD,
+- "020000000000000000000000000000000000000004000000000000000001",
+- "000000000000000000000000000000000000000000000000000000000000",
+- "000000000000000000000000000000000000000000000000000000000001",
+- "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126",
+- "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3",
+- "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF",
+- 4, nameSplitPattern);
+-
+- add("sect233r1 [NIST B-233]", "1.3.132.0.27", B,
+- "020000000000000000000000000000000000000004000000000000000001",
+- "000000000000000000000000000000000000000000000000000000000001",
+- "0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD",
+- "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B",
+- "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052",
+- "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7",
+- 2, nameSplitPattern);
+-
+- add("sect239k1", "1.3.132.0.3", B,
+- "800000000000000000004000000000000000000000000000000000000001",
+- "000000000000000000000000000000000000000000000000000000000000",
+- "000000000000000000000000000000000000000000000000000000000001",
+- "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC",
+- "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA",
+- "2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5",
+- 4, nameSplitPattern);
+-
+- add("sect283k1 [NIST K-283]", "1.3.132.0.16", BD,
+- "0800000000000000000000000000000000000000000000000000000000000000000010A1",
+- "000000000000000000000000000000000000000000000000000000000000000000000000",
+- "000000000000000000000000000000000000000000000000000000000000000000000001",
+- "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836",
+- "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259",
+- "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61",
+- 4, nameSplitPattern);
+-
+- add("sect283r1 [NIST B-283]", "1.3.132.0.17", B,
+- "0800000000000000000000000000000000000000000000000000000000000000000010A1",
+- "000000000000000000000000000000000000000000000000000000000000000000000001",
+- "027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5",
+- "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053",
+- "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4",
+- "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307",
+- 2, nameSplitPattern);
+-
+- add("sect409k1 [NIST K-409]", "1.3.132.0.36", BD,
+- "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
+- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+- "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746",
+- "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B",
+- "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF",
+- 4, nameSplitPattern);
+-
+- add("sect409r1 [NIST B-409]", "1.3.132.0.37", B,
+- "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
+- "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+- "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F",
+- "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7",
+- "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706",
+- "010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173",
+- 2, nameSplitPattern);
+-
+- add("sect571k1 [NIST K-571]", "1.3.132.0.38", BD,
+- "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
+- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+- "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972",
+- "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3",
+- "020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001",
+- 4, nameSplitPattern);
+-
+- add("sect571r1 [NIST B-571]", "1.3.132.0.39", B,
+- "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
+- "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+- "02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A",
+- "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19",
+- "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B",
+- "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47",
+- 2, nameSplitPattern);
+-
+- /* ANSI X9.62 binary curves */
+- add("X9.62 c2tnb191v1", "1.2.840.10045.3.0.5", B,
+- "800000000000000000000000000000000000000000000201",
+- "2866537B676752636A68F56554E12640276B649EF7526267",
+- "2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC",
+- "36B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D",
+- "765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB",
+- "40000000000000000000000004A20E90C39067C893BBB9A5",
+- 2, nameSplitPattern);
+-
+- add("X9.62 c2tnb191v2", "1.2.840.10045.3.0.6", B,
+- "800000000000000000000000000000000000000000000201",
+- "401028774D7777C7B7666D1366EA432071274F89FF01E718",
+- "0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01",
+- "3809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10",
+- "17434386626D14F3DBF01760D9213A3E1CF37AEC437D668A",
+- "20000000000000000000000050508CB89F652824E06B8173",
+- 4, nameSplitPattern);
+-
+- add("X9.62 c2tnb191v3", "1.2.840.10045.3.0.7", B,
+- "800000000000000000000000000000000000000000000201",
+- "6C01074756099122221056911C77D77E77A777E7E7E77FCB",
+- "71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8",
+- "375D4CE24FDE434489DE8746E71786015009E66E38A926DD",
+- "545A39176196575D985999366E6AD34CE0A77CD7127B06BE",
+- "155555555555555555555555610C0B196812BFB6288A3EA3",
+- 6, nameSplitPattern);
+-
+- add("X9.62 c2tnb239v1", "1.2.840.10045.3.0.11", B,
+- "800000000000000000000000000000000000000000000000001000000001",
+- "32010857077C5431123A46B808906756F543423E8D27877578125778AC76",
+- "790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16",
+- "57927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D",
+- "61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305",
+- "2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447",
+- 4, nameSplitPattern);
+-
+- add("X9.62 c2tnb239v2", "1.2.840.10045.3.0.12", B,
+- "800000000000000000000000000000000000000000000000001000000001",
+- "4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F",
+- "5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B",
+- "28F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205",
+- "5667334C45AFF3B5A03BAD9DD75E2C71A99362567D5453F7FA6E227EC833",
+- "1555555555555555555555555555553C6F2885259C31E3FCDF154624522D",
+- 6, nameSplitPattern);
+-
+- add("X9.62 c2tnb239v3", "1.2.840.10045.3.0.13", B,
+- "800000000000000000000000000000000000000000000000001000000001",
+- "01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F",
+- "6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40",
+- "70F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92",
+- "2E5A0EAF6E5E1305B9004DCE5C0ED7FE59A35608F33837C816D80B79F461",
+- "0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF",
+- 0xA, nameSplitPattern);
+-
+- add("X9.62 c2tnb359v1", "1.2.840.10045.3.0.18", B,
+- "800000000000000000000000000000000000000000000000000000000000000000000000100000000000000001",
+- "5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05656FB549016A96656A557",
+- "2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC345626089687742B6329E70680231988",
+- "3C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097",
+- "53D7E08529547048121E9C95F3791DD804963948F34FAE7BF44EA82365DC7868FE57E4AE2DE211305A407104BD",
+- "01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB964FE7719E74F490758D3B",
+- 0x4C, nameSplitPattern);
+-
+- add("X9.62 c2tnb431r1", "1.2.840.10045.3.0.20", B,
+- "800000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000001",
+- "1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF620B0EB9906D0957F6C6FEACD615468DF104DE296CD8F",
+- "10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A919B626D4E50A8DD731B107A9962381FB5D807BF2618",
+- "120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7",
+- "20D0AF8903A96F8D5FA2C255745D3C451B302C9346D9B7E485E7BCE41F6B591F3E8F6ADDCBB0BC4C2F947A7DE1A89B625D6A598B3760",
+- "0340340340340340340340340340340340340340340340340340340323C313FAB50589703B5EC68D3587FEC60D161CC149C1AD4A91",
+- 0x2760, nameSplitPattern);
+-
+- /* ANSI X9.62 binary curves from the 1998 standard but forbidden
+- * in the 2005 version of the standard.
+- * We don't register them but leave them here for the time being in
+- * case we need to support them after all.
+- */
+-/*
+- add("X9.62 c2pnb163v1", "1.2.840.10045.3.0.1", B,
+- "080000000000000000000000000000000000000107",
+- "072546B5435234A422E0789675F432C89435DE5242",
+- "00C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9",
+- "07AF69989546103D79329FCC3D74880F33BBE803CB",
+- "01EC23211B5966ADEA1D3F87F7EA5848AEF0B7CA9F",
+- "0400000000000000000001E60FC8821CC74DAEAFC1",
+- 2, nameSplitPattern);
+-
+- add("X9.62 c2pnb163v2", "1.2.840.10045.3.0.2", B,
+- "080000000000000000000000000000000000000107",
+- "0108B39E77C4B108BED981ED0E890E117C511CF072",
+- "0667ACEB38AF4E488C407433FFAE4F1C811638DF20",
+- "0024266E4EB5106D0A964D92C4860E2671DB9B6CC5",
+- "079F684DDF6684C5CD258B3890021B2386DFD19FC5",
+- "03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7",
+- 2, nameSplitPattern);
+-
+- add("X9.62 c2pnb163v3", "1.2.840.10045.3.0.3", B,
+- "080000000000000000000000000000000000000107",
+- "07A526C63D3E25A256A007699F5447E32AE456B50E",
+- "03F7061798EB99E238FD6F1BF95B48FEEB4854252B",
+- "02F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB",
+- "05B935590C155E17EA48EB3FF3718B893DF59A05D0",
+- "03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309",
+- 2, nameSplitPattern);
+-
+- add("X9.62 c2pnb176w1", "1.2.840.10045.3.0.4", B,
+- "0100000000000000000000000000000000080000000007",
+- "E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B",
+- "5DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2",
+- "8D16C2866798B600F9F08BB4A8E860F3298CE04A5798",
+- "6FA4539C2DADDDD6BAB5167D61B436E1D92BB16A562C",
+- "00010092537397ECA4F6145799D62B0A19CE06FE26AD",
+- 0xFF6E, nameSplitPattern);
+-
+- add("X9.62 c2pnb208w1", "1.2.840.10045.3.0.10", B,
+- "010000000000000000000000000000000800000000000000000007",
+- "0000000000000000000000000000000000000000000000000000",
+- "C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E",
+- "89FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A",
+- "0F55B51A06E78E9AC38A035FF520D8B01781BEB1A6BB08617DE3",
+- "000101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D",
+- 0xFE48, nameSplitPattern);
+-
+- add("X9.62 c2pnb272w1", "1.2.840.10045.3.0.16", B,
+- "010000000000000000000000000000000000000000000000000000010000000000000B",
+- "91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586FB20",
+- "7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E540F7",
+- "6108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D",
+- "10C7695716851EEF6BA7F6872E6142FBD241B830FF5EFCACECCAB05E02005DDE9D23",
+- "000100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521",
+- 0xFF06, nameSplitPattern);
+-
+- add("X9.62 c2pnb304w1", "1.2.840.10045.3.0.17", B,
+- "010000000000000000000000000000000000000000000000000000000000000000000000000807",
+- "FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C1288078365A0396C8E681",
+- "BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C14039601E55827340BE",
+- "197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614",
+- "E19FBEB76E0DA171517ECF401B50289BF014103288527A9B416A105E80260B549FDC1B92C03B",
+- "000101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164443051D",
+- 0xFE2E, nameSplitPattern);
+-
+- add("X9.62 c2pnb368w1", "1.2.840.10045.3.0.19", B,
+- "0100000000000000000000000000000000000000000000000000000000000000000000002000000000000000000007",
+- "E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C576D62F0AB7519CCD2A1A906AE30D",
+- "FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1C2112D84D164F444F8F74786046A",
+- "1085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F",
+- "7B3EB1BDDCBA62D5D8B2059B525797FC73822C59059C623A45FF3843CEE8F87CD1855ADAA81E2A0750B80FDA2310",
+- "00010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E909AE40A6F131E9CFCE5BD967",
+- 0xFF70, nameSplitPattern);
+-*/
+-
+- /*
+- * Brainpool curves (RFC 5639)
+- * (Twisted curves are not included)
+- */
+-
+- add("brainpoolP160r1", "1.3.36.3.3.2.8.1.1.1", P,
+- "E95E4A5F737059DC60DFC7AD95B3D8139515620F",
+- "340E7BE2A280EB74E2BE61BADA745D97E8F7C300",
+- "1E589A8595423412134FAA2DBDEC95C8D8675E58",
+- "BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC3",
+- "1667CB477A1A8EC338F94741669C976316DA6321",
+- "E95E4A5F737059DC60DF5991D45029409E60FC09",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP192r1", "1.3.36.3.3.2.8.1.1.3", P,
+- "C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297",
+- "6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF",
+- "469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9",
+- "C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD6",
+- "14B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F",
+- "C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP224r1", "1.3.36.3.3.2.8.1.1.5", P,
+- "D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF",
+- "68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43",
+- "2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B",
+- "0D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D",
+- "58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD",
+- "D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7", P,
+- "A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377",
+- "7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9",
+- "26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6",
+- "8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262",
+- "547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997",
+- "A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP320r1", "1.3.36.3.3.2.8.1.1.9", P,
+- "D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27",
+- "3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4",
+- "520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6",
+- "43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E20611",
+- "14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1",
+- "D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP384r1", "1.3.36.3.3.2.8.1.1.11", P,
+- "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53",
+- "7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826",
+- "04A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11",
+- "1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E",
+- "8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315",
+- "8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565",
+- 1, nameSplitPattern);
+-
+- add("brainpoolP512r1", "1.3.36.3.3.2.8.1.1.13", P,
+- "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3",
+- "7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA",
+- "3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723",
+- "81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822",
+- "7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892",
+- "AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069",
+- 1, nameSplitPattern);
+-
+ specCollection = Collections.unmodifiableCollection(oidMap.values());
+ }
+ }
+diff --git a/test/jdk/sun/security/ec/TestEC.java b/test/jdk/sun/security/ec/TestEC.java
+--- openjdk/test/jdk/sun/security/ec/TestEC.java
++++ openjdk/test/jdk/sun/security/ec/TestEC.java
+@@ -35,8 +35,8 @@
+ * @library ../pkcs11/sslecc
+ * @library ../../../java/security/testlibrary
+ * @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper
+- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
+- * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
++ * @run main/othervm -Djdk.tls.namedGroups="secp256r1" TestEC
++ * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1" TestEC
+ */
+
+ import java.security.NoSuchProviderException;
+diff -r bd66ea2fdde3 test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
+--- openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Thu Jul 27 18:04:48 2017 +0000
++++ openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Fri Oct 06 13:18:47 2017 +0200
+@@ -34,9 +34,9 @@
+ * @library ..
+ * @library ../../../../java/security/testlibrary
+ * @modules jdk.crypto.cryptoki
+- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
++ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
+ * ClientJSSEServerJSSE
+- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
++ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
+ * ClientJSSEServerJSSE sm policy
+ */
diff --git a/sorted-diff.patch b/sorted-diff.patch
deleted file mode 100644
index 7ba596e..0000000
--- a/sorted-diff.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- openjdk/make/gensrc/GensrcX11Wrappers.gmk
-+++ openjdk/make/gensrc/GensrcX11Wrappers.gmk
-@@ -117,7 +117,8 @@
- $(call LogInfo, Verifying X11 wrapper sizes)
- $(call MakeDir, $(@D))
- $(GENSRC_X11WRAPPERS_TMP)/sizer.$*.exe | $(SORT) > $@.tmp
-- $(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp $(GENSRC_X11WRAPPERS_TMP)/sizes.$*
-+ $(SORT) $(GENSRC_X11WRAPPERS_TMP)/sizes.$* > $(a)-orig.tmp
-+ $(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification-orig.tmp
- mv $@.tmp $@
-
- GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/sizes.$(OPENJDK_TARGET_CPU_BITS).verification
diff --git a/sources b/sources
index d6cbb37..5a4c26a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
-SHA512 (jdk-updates-jdk10u-jdk-10.0.2+13.tar.xz) = e5de419cec42e376ce341126c64370211cb09f326cdfafc64cec52640d2a2780f3ee705d51b6d025af6ca74c1525ed8d4a9d9afbe5b45f9709dd4d2242f1af08
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.1+13.tar.xz) = e5e2ffd022ee2f0311efc17de2ad7585676aac5e23fe4de821651b859f432af63da14ce356eaae0538583e58ea3de397969170ef02bbcc37b0de12da238879db
diff --git a/update_package.sh b/update_package.sh
index 4adab49..868a52d 100644
--- a/update_package.sh
+++ b/update_package.sh
@@ -31,12 +31,11 @@ else
echo ${TAPSET}
fi
-
-# OpenJDK from jdk10 updates project
-export PROJECT_NAME="jdk-updates"
-export REPO_NAME="jdk10u"
+# OpenJDK from Shenandoah project
+export PROJECT_NAME="shenandoah"
+export REPO_NAME="jdk11"
# warning, clonning without shenadnaoh suffix, you will clone pure jdk - thus without shenandaoh GC
-export VERSION="jdk-10.0.2+13"
+export VERSION="shenandoah-jdk-11.0.1+13"
export COMPRESSION=xz
# unset tapsets overrides
export OPENJDK_URL=""
5 years, 6 months