#3 Update of the package to OpenJDK 13
Merged 2 months ago by pmikova. Opened 2 months ago by pmikova.

file modified
+2

@@ -1,3 +1,5 @@

  /jdk-jdk12-jdk-12+33.tar.xz

  /systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz

  /jdk-updates-jdk12u-jdk-12.0.1+12.tar.xz

+ /jdk-jdk13-jdk-13+27.tar.xz

+ /jdk-jdk13-jdk-13+28.tar.xz

file modified
+42 -9

@@ -205,12 +205,12 @@

  %endif

  

  # New Version-String scheme-style defines

- %global majorver 12

- %global securityver 1

+ %global majorver 13

+ %global securityver 0

  # buildjdkver is usually same as %%{majorver},

  # but in time of bootstrap of next jdk, it is majorver-1, 

  # and this it is better to change it here, on single place

- %global buildjdkver 11

+ %global buildjdkver 12

  # Used via new version scheme. JDK 11 was

  # GA'ed in March 2019 => 19.3

  %global vendor_version_string 19.3

@@ -224,7 +224,8 @@

  %global origin_nice     OpenJDK

  %global top_level_dir_name   %{origin}

  %global minorver        0

- %global buildver        12

+ %global buildver        28

+ %global rpmrelease      1

  # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit

  %if %is_system_jdk

  %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )

@@ -236,6 +237,23 @@

  

  %global javaver         %{majorver}

  

+ # Define milestone (EA for pre-releases, GA for releases)

+ # Release will be (where N is usually a number starting at 1):

+ # - 0.N%%{?extraver}%%{?dist} for EA releases,

+ # - N%%{?extraver}{?dist} for GA releases

+ %global is_ga           0

+ %if %{is_ga}

+ %global ea_designator ""

+ %global ea_designator_zip ""

+ %global extraver %{nil}

+ %global eaprefix %{nil}

+ %else

+ %global ea_designator ea

+ %global ea_designator_zip -%{ea_designator}

+ %global extraver .%{ea_designator}

+ %global eaprefix 0.

+ %endif

+ 

  # parametrized macros are order-sensitive

  %global compatiblename  java-%{majorver}-%{origin}

  %global fullversion     %{compatiblename}-%{version}-%{release}

@@ -689,6 +707,7 @@

  %ifarch %{jit_arches}

  %ifnarch s390x

  %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jhsdb

+ %{_mandir}/man1/jhsdb-%{uniquesuffix -- %{?1}}.1.gz

  %endif

  %endif

  %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jinfo

@@ -730,6 +749,11 @@

  %{_mandir}/man1/jstatd-%{uniquesuffix -- %{?1}}.1*

  %{_mandir}/man1/rmic-%{uniquesuffix -- %{?1}}.1*

  %{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1*

+ %{_mandir}/man1/jdeprscan-%{uniquesuffix -- %{?1}}.1.gz

+ %{_mandir}/man1/jlink-%{uniquesuffix -- %{?1}}.1.gz

+ %{_mandir}/man1/jmod-%{uniquesuffix -- %{?1}}.1.gz

+ %{_mandir}/man1/jshell-%{uniquesuffix -- %{?1}}.1.gz

+ 

  %if %{with_systemtap}

  %dir %{tapsetroot}

  %dir %{tapsetdirttapset}

@@ -950,7 +974,7 @@

  # This package needs `.rolling` as part of Release so as to not conflict on install with

  # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as

  # java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298

- Release: 2.rolling%{?dist}

+ Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling%{?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

@@ -984,7 +1008,7 @@

  

  # 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-%{majorver}.%{minorver}.%{securityver}+%{buildver}.tar.xz

+ Source0: jdk-jdk%{majorver}-jdk-%{majorver}+%{buildver}.tar.xz

  Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz

  

  # Desktop files. Adapted from IcedTea

@@ -1053,7 +1077,7 @@

  BuildRequires: xorg-x11-proto-devel

  BuildRequires: zip

  BuildRequires: javapackages-filesystem

- BuildRequires: java-%{buildjdkver}-openjdk-devel

+ BuildRequires: java-latest-openjdk-devel

  # Zero-assembler build requirement

  %ifnarch %{jit_arches}

  BuildRequires: libffi-devel

@@ -1371,7 +1395,7 @@

      --with-jobs=1 \

  %endif

      --with-version-build=%{buildver} \

-     --with-version-pre="" \

+     --with-version-pre="%{ea_designator}"\

      --with-version-opt=%{lts_designator} \

      --with-vendor-version-string="%{vendor_version_string}" \

      --with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \

@@ -1594,7 +1618,7 @@

  # 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-%{majorver}.%{minorver}.%{securityver}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip

+ cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}%{ea_designator_zip}+%{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

@@ -1824,6 +1848,15 @@

  

  

  %changelog

+ * Tue Jul 09 2019 Petra Alice Mikova <pmikova@redhat.com> - 1:13.0.0.28-0.1.ea.rolling

+ - updated to jdk 13

+ - adapted pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch

+ - adapted rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch

+ - fixed file listings

+ - included https://src.fedoraproject.org/rpms/java-11-openjdk/pull-request/49:

+ - Include 'ea' designator in Release when appropriate

+ - Handle milestone as variables so we can alter it easily and set the docs zip filename appropriately

+ 

  * Tue May 21 2019 Petra Alice Mikova <pmikova@redhat.com> - 1:12.0.1.12-2.rolling

  - fixed requires/provides for the non-system JDK case (backport of RHBZ#1702324)

  

@@ -1,96 +1,112 @@

- 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),

+ diff -r b7f68ddec66f src/java.base/share/classes/sun/security/ssl/NamedGroup.java

+ --- a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java	Tue Jun 25 10:50:59 2019 +0100

+ +++ b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java	Wed Jul 03 16:36:37 2019 +0200

+ @@ -50,97 +50,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",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -    SECT163_R1(0x0002, "sect163r1", "1.3.132.0.2",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -

+ -    // NIST B-163

+ -    SECT163_R2(0x0003, "sect163r2", "1.3.132.0.15",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -    SECT193_R1(0x0004, "sect193r1", "1.3.132.0.24",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -    SECT193_R2(0x0005, "sect193r2", "1.3.132.0.25",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -

+ -    // NIST K-233

+ -    SECT233_K1(0x0006, "sect233k1", "1.3.132.0.26",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -

+ -    // NIST B-233

+ -    SECT233_R1(0x0007, "sect233r1", "1.3.132.0.27",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -    SECT239_K1(0x0008, "sect239k1", "1.3.132.0.3",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -

+ -    // NIST K-283

+ -    SECT283_K1(0x0009, "sect283k1", "1.3.132.0.16",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -

+ -    // NIST B-283

+ -    SECT283_R1(0x000A, "sect283r1", "1.3.132.0.17",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -

+ -    // NIST K-409

+ -    SECT409_K1(0x000B, "sect409k1", "1.3.132.0.36",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -

+ -    // NIST B-409

+ -    SECT409_R1(0x000C, "sect409r1", "1.3.132.0.37",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -

+ -    // NIST K-571

+ -    SECT571_K1(0x000D, "sect571k1", "1.3.132.0.38",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -

+ -    // NIST B-571

+ -    SECT571_R1(0x000E, "sect571r1", "1.3.132.0.39",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -    SECP160_K1(0x000F, "secp160k1", "1.3.132.0.9",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -    SECP160_R1(0x0010, "secp160r1", "1.3.132.0.8",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -    SECP160_R2(0x0011, "secp160r2", "1.3.132.0.30",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -    SECP192_K1(0x0012, "secp192k1", "1.3.132.0.31",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -

+ -    // NIST P-192

+ -    SECP192_R1(0x0013, "secp192r1", "1.2.840.10045.3.1.1",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -    SECP224_K1(0x0014, "secp224k1", "1.3.132.0.32",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -

+ -    // NIST P-224

+ -    SECP224_R1(0x0015, "secp224r1", "1.3.132.0.33",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -    SECP256_K1(0x0016, "secp256k1", "1.3.132.0.10",

+ -            NamedGroupType.NAMED_GROUP_ECDHE,

+ -            ProtocolVersion.PROTOCOLS_TO_12),

+ -

+      // NIST P-256

+      SECP256_R1(0x0017, "secp256r1", "1.2.840.10045.3.1.7",

+              NamedGroupType.NAMED_GROUP_ECDHE,

+ diff -r b7f68ddec66f src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java

+ --- a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java	Tue Jun 25 10:50:59 2019 +0100

+ +++ b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java	Wed Jul 03 16:36:37 2019 +0200

+ @@ -214,17 +214,6 @@

+                          // Secondary XDH curves

+                          NamedGroup.X448,

   

-          // 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,

+ -                        // Secondary NIST curves

  -                        NamedGroup.SECT283_K1,

  -                        NamedGroup.SECT283_R1,

  -                        NamedGroup.SECT409_K1,

@@ -100,12 +116,13 @@

  -

  -                        // non-NIST curves

  -                        NamedGroup.SECP256_K1,

-  

-                          // FFDHE 2048

+ -

+                          // FFDHE (RFC 7919)

                           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

+                          NamedGroup.FFDHE_3072,

+ diff -r b7f68ddec66f src/java.base/share/classes/sun/security/util/CurveDB.java

+ --- a/src/java.base/share/classes/sun/security/util/CurveDB.java	Tue Jun 25 10:50:59 2019 +0100

+ +++ b/src/java.base/share/classes/sun/security/util/CurveDB.java	Wed Jul 03 16:36:37 2019 +0200

  @@ -168,114 +168,6 @@

           Pattern nameSplitPattern = Pattern.compile(SPLIT_PATTERN);

   

@@ -657,12 +674,12 @@

           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

+ diff -r b7f68ddec66f test/jdk/sun/security/ec/TestEC.java

+ --- a/test/jdk/sun/security/ec/TestEC.java	Tue Jun 25 10:50:59 2019 +0100

+ +++ b/test/jdk/sun/security/ec/TestEC.java	Wed Jul 03 16:36:37 2019 +0200

+ @@ -37,8 +37,8 @@

    * @library ../../../java/security/testlibrary

+   * @library ../../../javax/net/ssl/TLSCommon

    * @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

@@ -671,11 +688,11 @@

    */

   

   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

+ diff -r b7f68ddec66f test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java

+ --- a/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java	Tue Jun 25 10:50:59 2019 +0100

+ +++ b/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java	Wed Jul 03 16:36:37 2019 +0200

  @@ -34,9 +34,9 @@

-   * @library ..

+   * @library /test/lib .. ../../../../javax/net/ssl/TLSCommon

    * @library ../../../../java/security/testlibrary

    * @modules jdk.crypto.cryptoki

  - * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"

@@ -685,3 +702,4 @@

  + * @run main/othervm -Djdk.tls.namedGroups="secp256r1"

    *      ClientJSSEServerJSSE sm policy

    */

+  

@@ -1,10 +1,9 @@

- diff -uNr openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java jdk8/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java

- --- openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java

- +++ openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java

- @@ -883,9 +883,13 @@

-                      return null;

-                  }

-              });

+ diff -r 618ad1237e73 src/java.desktop/share/classes/java/awt/Toolkit.java

+ --- a/src/java.desktop/share/classes/java/awt/Toolkit.java	Thu Jun 13 19:37:49 2019 +0200

+ +++ b/src/java.desktop/share/classes/java/awt/Toolkit.java	Thu Jul 04 10:35:42 2019 +0200

+ @@ -595,7 +595,11 @@

+                  toolkit = new HeadlessToolkit(toolkit);

+              }

               if (!GraphicsEnvironment.isHeadless()) {

  -                loadAssistiveTechnologies();

  +                try {

@@ -15,4 +14,3 @@

               }

           }

           return toolkit;

-      }

file modified
+1 -1

@@ -1,2 +1,2 @@

- SHA512 (jdk-updates-jdk12u-jdk-12.0.1+12.tar.xz) = 356164791873b9ddbbac0eb6281ab4e542b97556f4f5a8748edc93ececf1fcb661aaa9955080b693bfc697dc75be8297acb080c4e1a2e579ca8a8741d0ab1881

+ SHA512 (jdk-jdk13-jdk-13+28.tar.xz) = 4efc6dba5e9e8f4d75aaced5b187d2d9ba74c00f0c1bce7645fcce8a92f697cb5c8f33209d00901f446eaef1f0e34ee51f22b5203fc90deda89a21bcdc980897

  SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d

Adapted patches, spec and uploaded new sources

Please use Release: 0.1.ea.rolling%{?dist}. But since this isn't a GA release yet,
java -version should show that via ea in its output. The build from jdk.java.net reports as:

openjdk version "13-ea" 2019-09-17
OpenJDK Runtime Environment (build 13-ea+28)
OpenJDK 64-Bit Server VM (build 13-ea+28, mixed mode, sharing)

@pmikova Please see https://src.fedoraproject.org/rpms/java-11-openjdk/pull-request/49 which is being discussed for EA release support. Perhaps port this change over and then rebase for the 13+28 update?

Thanks for doing this!

Latest JDK 13 build is 28. See:
https://mail.openjdk.java.net/pipermail/quality-discuss/2019-July/000880.html

sigh yea, I did the changes the day before yesterday, built on my machine over night, and of course, they had to create new tag yesterday -.-'. I will create new tarball and update it.

Please use Release: 0.1.ea.rolling%{?dist}. But since this isn't a GA release yet,
java -version should show that via ea in its output. The build from jdk.java.net reports as:
openjdk version "13-ea" 2019-09-17
OpenJDK Runtime Environment (build 13-ea+28)
OpenJDK 64-Bit Server VM (build 13-ea+28, mixed mode, sharing)

Ok, I will change it, I was following the pattern we used last time in this package, but it is definitely better to be in sync with other OpenJDK rpms.

@pmikova Please see https://src.fedoraproject.org/rpms/java-11-openjdk/pull-request/49 which is being discussed for EA release support. Perhaps port this change over and then rebase for the 13+28 update?
Thanks for doing this!

Will do, thanks for the link and for the review.

2 new commits added

  • Update to 13+28 sources
  • Backported patch related to ea designator from ojdk11
2 months ago

1 new commit added

  • Removed jhsdb manpage for s390x arch
2 months ago

It should be all done. There was a one small fix necessary, the scratch build now passes on rawhide:
https://koji.fedoraproject.org/koji/taskinfo?taskID=36191016

Please take a look, when you got the time :)

Thanks!

Looks good to me. Thanks!

<mock-chroot> sh-5.0# java -version
openjdk version "13-ea" 2019-09-17
OpenJDK Runtime Environment 19.3 (build 13-ea+28)
OpenJDK 64-Bit Server VM 19.3 (build 13-ea+28, mixed mode, sharing)

Note that build 29 is available, and we should update to the new build once this is pushed.

Note that we should only backport to stable branches once we've reached a GA version :)

Looks good to me. Thanks!
<mock-chroot> sh-5.0# java -version
openjdk version "13-ea" 2019-09-17
OpenJDK Runtime Environment 19.3 (build 13-ea+28)
OpenJDK 64-Bit Server VM 19.3 (build 13-ea+28, mixed mode, sharing)

Note that build 29 is available, and we should update to the new build once this is pushed.

Gosh, a never ending story. I will update to 29 (or whatever it will be next) in couple of days.

Note that we should only backport to stable branches once we've reached a GA version :)

Yes, I am aware, this update is only for rawhide for now :)

Thanks!

Pull-Request has been merged by pmikova

2 months ago