rpms/java-1.8.0-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to aarch64-shenandoah-jdk8u252-b03.

Browse Source 
Adjust PR2974/RH1337583 & PR3083/RH1346460 following context changes in JDK-8230978
This commit is contained in:
Andrew John Hughes 2020-06-07 18:38:05 +01:00
parent c32fe48733
commit eed066a1b1
5 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -170,3 +170,4 @@
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b01.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b01.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b02-4curve.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b02-4curve.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b02.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b02.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b03-4curve.tar.xz

6
java-1.8.0-openjdk.spec
View File

@ -229,7 +229,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-jdk8u252-b02 %global shenandoah_revision aarch64-shenandoah-jdk8u252-b03
# 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}
@ -2236,6 +2236,10 @@ require "copy_jdk_configs.lua"
%endif %endif
%changelog %changelog
* Sun Jun 07 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.252.b03-0.0.ea
- Update to aarch64-shenandoah-jdk8u252-b03.
- Adjust PR2974/RH1337583 & PR3083/RH1346460 following context changes in JDK-8230978
* Tue Jun 02 2020 Andrew John Hughes <gnu.andrew@redhat.com> - 1:1.8.0.252.b02-0.0.ea * Tue Jun 02 2020 Andrew John Hughes <gnu.andrew@redhat.com> - 1:1.8.0.252.b02-0.0.ea
- Update to aarch64-shenandoah-jdk8u252-b02. - Update to aarch64-shenandoah-jdk8u252-b02.

38
pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch
View File

@ -7,18 +7,10 @@
PR2974: PKCS#10 certificate requests now use CRLF line endings rather than system line endings PR2974: PKCS#10 certificate requests now use CRLF line endings rather than system line endings
Summary: Add -systemlineendings option to keytool to allow system line endings to be used again. Summary: Add -systemlineendings option to keytool to allow system line endings to be used again.
diff --git a/src/share/classes/sun/security/pkcs10/PKCS10.java b/src/share/classes/sun/security/pkcs10/PKCS10.java diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java openjdk/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
--- openjdk/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java --- openjdk.orig/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
+++ openjdk/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java +++ openjdk/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
@@ -30,6 +30,7 @@ @@ -35,6 +35,7 @@
import java.io.IOException;
import java.math.BigInteger;
+import java.security.AccessController;
import java.security.cert.CertificateException;
import java.security.NoSuchAlgorithmException;
import java.security.InvalidKeyException;
@@ -39,6 +40,7 @@
import java.util.Base64; import java.util.Base64;
@ -26,7 +18,7 @@ diff --git a/src/share/classes/sun/security/pkcs10/PKCS10.java b/src/share/class
import sun.security.util.*; import sun.security.util.*;
import sun.security.x509.AlgorithmId; import sun.security.x509.AlgorithmId;
import sun.security.x509.X509Key; import sun.security.x509.X509Key;
@@ -76,6 +78,14 @@ @@ -74,6 +75,14 @@
* @author Hemma Prafullchandra * @author Hemma Prafullchandra
*/ */
public class PKCS10 { public class PKCS10 {
@ -41,7 +33,7 @@ diff --git a/src/share/classes/sun/security/pkcs10/PKCS10.java b/src/share/class
/** /**
* Constructs an unsigned PKCS #10 certificate request. Before this * Constructs an unsigned PKCS #10 certificate request. Before this
* request may be used, it must be encoded and signed. Then it * request may be used, it must be encoded and signed. Then it
@@ -293,13 +303,39 @@ @@ -303,13 +312,39 @@
*/ */
public void print(PrintStream out) public void print(PrintStream out)
throws IOException, SignatureException { throws IOException, SignatureException {
@ -83,10 +75,10 @@ diff --git a/src/share/classes/sun/security/pkcs10/PKCS10.java b/src/share/class
out.println("-----END NEW CERTIFICATE REQUEST-----"); out.println("-----END NEW CERTIFICATE REQUEST-----");
} }
diff --git a/src/share/classes/sun/security/tools/keytool/Main.java b/src/share/classes/sun/security/tools/keytool/Main.java diff --git openjdk.orig/jdk/src/share/classes/sun/security/tools/keytool/Main.java openjdk/jdk/src/share/classes/sun/security/tools/keytool/Main.java
--- openjdk/jdk/src/share/classes/sun/security/tools/keytool/Main.java --- openjdk.orig/jdk/src/share/classes/sun/security/tools/keytool/Main.java
+++ openjdk/jdk/src/share/classes/sun/security/tools/keytool/Main.java +++ openjdk/jdk/src/share/classes/sun/security/tools/keytool/Main.java
@@ -124,6 +124,7 @@ @@ -126,6 +126,7 @@
private String infilename = null; private String infilename = null;
private String outfilename = null; private String outfilename = null;
private String srcksfname = null; private String srcksfname = null;
@ -94,7 +86,7 @@ diff --git a/src/share/classes/sun/security/tools/keytool/Main.java b/src/share/
// User-specified providers are added before any command is called. // User-specified providers are added before any command is called.
// However, they are not removed before the end of the main() method. // However, they are not removed before the end of the main() method.
@@ -186,7 +187,7 @@ @@ -188,7 +189,7 @@
CERTREQ("Generates.a.certificate.request", CERTREQ("Generates.a.certificate.request",
ALIAS, SIGALG, FILEOUT, KEYPASS, KEYSTORE, DNAME, ALIAS, SIGALG, FILEOUT, KEYPASS, KEYSTORE, DNAME,
STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS, STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
@ -103,7 +95,7 @@ diff --git a/src/share/classes/sun/security/tools/keytool/Main.java b/src/share/
CHANGEALIAS("Changes.an.entry.s.alias", CHANGEALIAS("Changes.an.entry.s.alias",
ALIAS, DESTALIAS, KEYPASS, KEYSTORE, STOREPASS, ALIAS, DESTALIAS, KEYPASS, KEYSTORE, STOREPASS,
STORETYPE, PROVIDERNAME, PROVIDERCLASS, PROVIDERARG, STORETYPE, PROVIDERNAME, PROVIDERCLASS, PROVIDERARG,
@@ -319,6 +320,7 @@ @@ -321,6 +322,7 @@
STARTDATE("startdate", "<startdate>", "certificate.validity.start.date.time"), STARTDATE("startdate", "<startdate>", "certificate.validity.start.date.time"),
STOREPASS("storepass", "<arg>", "keystore.password"), STOREPASS("storepass", "<arg>", "keystore.password"),
STORETYPE("storetype", "<storetype>", "keystore.type"), STORETYPE("storetype", "<storetype>", "keystore.type"),
@ -111,7 +103,7 @@ diff --git a/src/share/classes/sun/security/tools/keytool/Main.java b/src/share/
TRUSTCACERTS("trustcacerts", null, "trust.certificates.from.cacerts"), TRUSTCACERTS("trustcacerts", null, "trust.certificates.from.cacerts"),
V("v", null, "verbose.output"), V("v", null, "verbose.output"),
VALIDITY("validity", "<valDays>", "validity.number.of.days"); VALIDITY("validity", "<valDays>", "validity.number.of.days");
@@ -559,6 +561,8 @@ @@ -561,6 +563,8 @@
protectedPath = true; protectedPath = true;
} else if (collator.compare(flags, "-srcprotected") == 0) { } else if (collator.compare(flags, "-srcprotected") == 0) {
srcprotectedPath = true; srcprotectedPath = true;
@ -120,7 +112,7 @@ diff --git a/src/share/classes/sun/security/tools/keytool/Main.java b/src/share/
} else { } else {
System.err.println(rb.getString("Illegal.option.") + flags); System.err.println(rb.getString("Illegal.option.") + flags);
tinyHelp(); tinyHelp();
@@ -1463,7 +1467,7 @@ @@ -1464,7 +1468,7 @@
// Sign the request and base-64 encode it // Sign the request and base-64 encode it
request.encodeAndSign(subject, signature); request.encodeAndSign(subject, signature);
@ -129,13 +121,13 @@ diff --git a/src/share/classes/sun/security/tools/keytool/Main.java b/src/share/
checkWeak(rb.getString("the.generated.certificate.request"), request); checkWeak(rb.getString("the.generated.certificate.request"), request);
} }
@@ -4540,4 +4544,3 @@ @@ -4544,4 +4548,3 @@
return new Pair<>(a,b); return new Pair<>(a,b);
} }
} }
- -
diff --git a/src/share/classes/sun/security/tools/keytool/Resources.java b/src/share/classes/sun/security/tools/keytool/Resources.java diff --git openjdk.orig/jdk/src/share/classes/sun/security/tools/keytool/Resources.java openjdk/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
--- openjdk/jdk/src/share/classes/sun/security/tools/keytool/Resources.java --- openjdk.orig/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
+++ openjdk/jdk/src/share/classes/sun/security/tools/keytool/Resources.java +++ openjdk/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
@@ -168,6 +168,8 @@ @@ -168,6 +168,8 @@
"keystore password"}, //-storepass "keystore password"}, //-storepass

2
pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
View File

@ -35,7 +35,7 @@ diff --git openjdk.orig/jdk/src/share/classes/sun/security/util/ECUtil.java open
+++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java +++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java
@@ -41,6 +41,9 @@ @@ -41,6 +41,9 @@
public class ECUtil { public final class ECUtil {
+ /* Are we debugging ? */ + /* Are we debugging ? */
+ private static final Debug debug = Debug.getInstance("ecc"); + private static final Debug debug = Debug.getInstance("ecc");

2
sources
View File

@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b02-4curve.tar.xz) = 03a1ff7a7da3fa565dd06de6f638121fc9c36c8f3e1639a73869034782969445310ff8d33674a03c72d84a089600e5cfd8dafa04f6c3dad34c0f0c750c32408d SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b03-4curve.tar.xz) = bb4922e4fe244dd4a64767c5ddd5ab8f888265b006ddf0ec1e5038f8ab8bb5d0c4a88780db50c7fd02926b38c5f3dbf39cc28a96b0a153736d52c2b9b2f9bb88