Update to aarch64-shenandoah-jdk8u222-b10.
Adjust PR3083/RH134640 to apply after JDK-8182999 Switch to GA mode for final release.
This commit is contained in:
parent
b0a4cbd6ae
commit
2ee1d54ad2
3
.gitignore
vendored
3
.gitignore
vendored
@ -145,3 +145,6 @@
|
|||||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b05.tar.xz
|
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b05.tar.xz
|
||||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b06.tar.xz
|
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b06.tar.xz
|
||||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz
|
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz
|
||||||
|
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b08.tar.xz
|
||||||
|
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b09.tar.xz
|
||||||
|
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b10.tar.xz
|
||||||
|
@ -217,7 +217,7 @@
|
|||||||
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
|
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
|
||||||
%global shenandoah_project aarch64-port
|
%global shenandoah_project aarch64-port
|
||||||
%global shenandoah_repo jdk8u-shenandoah
|
%global shenandoah_repo jdk8u-shenandoah
|
||||||
%global shenandoah_revision aarch64-shenandoah-jdk8u222-b07
|
%global shenandoah_revision aarch64-shenandoah-jdk8u222-b10
|
||||||
# Define old aarch64/jdk8u tree variables for compatibility
|
# Define old aarch64/jdk8u tree variables for compatibility
|
||||||
%global project %{shenandoah_project}
|
%global project %{shenandoah_project}
|
||||||
%global repo %{shenandoah_repo}
|
%global repo %{shenandoah_repo}
|
||||||
@ -238,7 +238,7 @@
|
|||||||
# Release will be (where N is usually a number starting at 1):
|
# Release will be (where N is usually a number starting at 1):
|
||||||
# - 0.N%%{?extraver}%%{?dist} for EA releases,
|
# - 0.N%%{?extraver}%%{?dist} for EA releases,
|
||||||
# - N%%{?extraver}{?dist} for GA releases
|
# - N%%{?extraver}{?dist} for GA releases
|
||||||
%global is_ga 0
|
%global is_ga 1
|
||||||
%if %{is_ga}
|
%if %{is_ga}
|
||||||
%global milestone fcs
|
%global milestone fcs
|
||||||
%global milestone_version %{nil}
|
%global milestone_version %{nil}
|
||||||
@ -2258,6 +2258,11 @@ require "copy_jdk_configs.lua"
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 11 2019 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.222.b10-0
|
||||||
|
- Update to aarch64-shenandoah-jdk8u222-b10.
|
||||||
|
- Adjust PR3083/RH134640 to apply after JDK-8182999
|
||||||
|
- Switch to GA mode for final release.
|
||||||
|
|
||||||
* Mon Jul 08 2019 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.222.b07-0.0.ea
|
* Mon Jul 08 2019 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.222.b07-0.0.ea
|
||||||
- Update to aarch64-shenandoah-jdk8u222-b07 and Shenandoah merge 2019-06-13.
|
- Update to aarch64-shenandoah-jdk8u222-b07 and Shenandoah merge 2019-06-13.
|
||||||
- Drop remaining JDK-8210425/RH1632174 patch now AArch64 part is upstream.
|
- Drop remaining JDK-8210425/RH1632174 patch now AArch64 part is upstream.
|
||||||
|
@ -7,9 +7,21 @@
|
|||||||
PR3083, RH1346460: Regression in SSL debug output without an ECC provider
|
PR3083, RH1346460: Regression in SSL debug output without an ECC provider
|
||||||
Summary: Return null rather than throwing an exception when there's no ECC provider.
|
Summary: Return null rather than throwing an exception when there's no ECC provider.
|
||||||
|
|
||||||
diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/Debug.java
|
diff --git openjdk.orig/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java
|
||||||
--- openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 17:08:12 2016 +0100
|
--- openjdk.orig/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java
|
||||||
+++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 18:21:29 2016 +0100
|
+++ openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java
|
||||||
|
@@ -121,7 +121,7 @@
|
||||||
|
private static void ensureCurveIsSupported(ECParameterSpec ecSpec)
|
||||||
|
throws InvalidAlgorithmParameterException {
|
||||||
|
|
||||||
|
- AlgorithmParameters ecParams = ECUtil.getECParameters(null);
|
||||||
|
+ AlgorithmParameters ecParams = ECUtil.getECParameters(null, true);
|
||||||
|
byte[] encodedParams;
|
||||||
|
try {
|
||||||
|
ecParams.init(ecSpec);
|
||||||
|
diff --git openjdk.orig/jdk/src/share/classes/sun/security/util/Debug.java openjdk/jdk/src/share/classes/sun/security/util/Debug.java
|
||||||
|
--- openjdk.orig/jdk/src/share/classes/sun/security/util/Debug.java
|
||||||
|
+++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java
|
||||||
@@ -73,6 +73,7 @@
|
@@ -73,6 +73,7 @@
|
||||||
System.err.println("certpath PKIX CertPathBuilder and");
|
System.err.println("certpath PKIX CertPathBuilder and");
|
||||||
System.err.println(" CertPathValidator debugging");
|
System.err.println(" CertPathValidator debugging");
|
||||||
@ -18,9 +30,9 @@ diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/Debug.j
|
|||||||
System.err.println("gssloginconfig");
|
System.err.println("gssloginconfig");
|
||||||
System.err.println(" GSS LoginConfigImpl debugging");
|
System.err.println(" GSS LoginConfigImpl debugging");
|
||||||
System.err.println("configfile JAAS ConfigFile loading");
|
System.err.println("configfile JAAS ConfigFile loading");
|
||||||
diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/ECUtil.java
|
diff --git openjdk.orig/jdk/src/share/classes/sun/security/util/ECUtil.java openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java
|
||||||
--- openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 17:08:12 2016 +0100
|
--- openjdk.orig/jdk/src/share/classes/sun/security/util/ECUtil.java
|
||||||
+++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 18:21:29 2016 +0100
|
+++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java
|
||||||
@@ -41,6 +41,9 @@
|
@@ -41,6 +41,9 @@
|
||||||
|
|
||||||
public class ECUtil {
|
public class ECUtil {
|
||||||
@ -34,11 +46,11 @@ diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/ECUtil.
|
|||||||
@@ -90,6 +93,10 @@
|
@@ -90,6 +93,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private static AlgorithmParameters getECParameters(Provider p) {
|
public static AlgorithmParameters getECParameters(Provider p) {
|
||||||
+ return getECParameters(p, false);
|
+ return getECParameters(p, false);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ private static AlgorithmParameters getECParameters(Provider p, boolean throwException) {
|
+ public static AlgorithmParameters getECParameters(Provider p, boolean throwException) {
|
||||||
try {
|
try {
|
||||||
if (p != null) {
|
if (p != null) {
|
||||||
return AlgorithmParameters.getInstance("EC", p);
|
return AlgorithmParameters.getInstance("EC", p);
|
||||||
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e
|
SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e
|
||||||
SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz) = f58e5ac864cd66a39f4e479982ff236c8fa560c4108a1e13e11f3dcee1d1c3cbcb8383c8f144bea0c7059eb77f80f0628eb91e93b77a86f75bd84a28382be66c
|
SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b10.tar.xz) = 8e8379260a0f896c41b79e41e51609f3363f734b47cd412d20a4fe18079f73cdeefefdfa62b22f83743d289f8f622201f6650343ee6741163c57d1c5797dcc58
|
||||||
|
Loading…
Reference in New Issue
Block a user