diff --git a/.gitignore b/.gitignore index 9127a62..054b83c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/class-rewriter.tar.gz -SOURCES/openjdk-icedtea-2.6.19.tar.xz +SOURCES/openjdk-icedtea-2.6.21.tar.xz SOURCES/pulseaudio.tar.gz SOURCES/systemtap-tapset-2.6.19.tar.xz diff --git a/.java-1.7.0-openjdk.metadata b/.java-1.7.0-openjdk.metadata index 69e44f3..fa93d7d 100644 --- a/.java-1.7.0-openjdk.metadata +++ b/.java-1.7.0-openjdk.metadata @@ -1,4 +1,4 @@ fcc167de17354efb6e52cb387eb3e7dbb0316b53 SOURCES/class-rewriter.tar.gz -c2e2b8d2db547950595444dcf045f361fd11669e SOURCES/openjdk-icedtea-2.6.19.tar.xz +aa153c4c505c67e6ece3f97a1c2836de3214b37d SOURCES/openjdk-icedtea-2.6.21.tar.xz fb72b6b1f4735ad9b5799d0b5058b0b1dec67b17 SOURCES/pulseaudio.tar.gz 38b74f261642b087ada2dc4063bf2b468d865b0e SOURCES/systemtap-tapset-2.6.19.tar.xz diff --git a/SOURCES/jdk8226318-rh1738637-class_lookup_crash.patch b/SOURCES/jdk8226318-rh1738637-class_lookup_crash.patch deleted file mode 100644 index 7e3823e..0000000 --- a/SOURCES/jdk8226318-rh1738637-class_lookup_crash.patch +++ /dev/null @@ -1,29 +0,0 @@ -# HG changeset patch -# User mbalao -# Date 1560878590 10800 -# Tue Jun 18 14:23:10 2019 -0300 -# Node ID d790adc3bb57a28b26502814839a9308112a35a0 -# Parent c066fa11f8ede0ab75742aba76823341d8e36e87 -8226318: Class Loader Dependencies improvements -Reviewed-by: adinn - -diff --git openjdk.orig/hotspot/src/share/vm/classfile/classLoaderDependencies.cpp openjdk/hotspot/src/share/vm/classfile/classLoaderDependencies.cpp ---- openjdk.orig/hotspot/src/share/vm/classfile/classLoaderDependencies.cpp -+++ openjdk/hotspot/src/share/vm/classfile/classLoaderDependencies.cpp -@@ -76,6 +76,7 @@ - - // Must handle over GC points - assert (last != NULL, "dependencies should be initialized"); -+ objArrayHandle head_handle(THREAD, list_head); - objArrayHandle last_handle(THREAD, last); - - // Create a new dependency node with fields for (class_loader, next) -@@ -86,7 +87,7 @@ - objArrayHandle new_dependency(THREAD, deps); - - // Add the dependency under lock -- ClassLoaderDependencies::locked_add(objArrayHandle(THREAD, list_head), -+ ClassLoaderDependencies::locked_add(head_handle, - last_handle, - new_dependency, - THREAD); diff --git a/SOURCES/pr1834-rh1022017-reduce_ellipticcurvesextension_to_provide_only_three_nss_supported_nist_curves_23_24_25.patch b/SOURCES/pr1834-rh1022017-reduce_ellipticcurvesextension_to_provide_only_three_nss_supported_nist_curves_23_24_25.patch deleted file mode 100644 index 8165340..0000000 --- a/SOURCES/pr1834-rh1022017-reduce_ellipticcurvesextension_to_provide_only_three_nss_supported_nist_curves_23_24_25.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java ---- openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java -+++ openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java -@@ -168,20 +168,10 @@ - "contains no supported elliptic curves"); - } - } else { // default curves -- int[] ids; -- if (requireFips) { -- ids = new int[] { -- // only NIST curves in FIPS mode -- 23, 24, 25, 9, 10, 11, 12, 13, 14, -- }; -- } else { -- ids = new int[] { -- // NIST curves first -- 23, 24, 25, 9, 10, 11, 12, 13, 14, -- // non-NIST curves -- 22, -- }; -- } -+ int[] ids = new int[] { -+ // NSS currently only supports these three NIST curves -+ 23, 24, 25 -+ }; - - idList = new ArrayList<>(ids.length); - for (int curveId : ids) { diff --git a/SPECS/java-1.7.0-openjdk.spec b/SPECS/java-1.7.0-openjdk.spec index c419dea..1032941 100644 --- a/SPECS/java-1.7.0-openjdk.spec +++ b/SPECS/java-1.7.0-openjdk.spec @@ -10,7 +10,7 @@ # conflicting) files in the -debuginfo package %undefine _missing_build_ids_terminate_build -%global icedtea_version 2.6.19 +%global icedtea_version 2.6.21 %global icedtea_snapshot %{nil} %global hg_tag icedtea-%{icedtea_version}%{icedtea_snapshot} @@ -165,8 +165,8 @@ # Standard JPackage naming and versioning defines. %global origin openjdk %global top_level_dir_name %{origin} -%global updatever 231 -%global buildver 01 +%global updatever 251 +%global buildver 02 # Keep priority on 7digits in case updatever>9 %global priority 1700%{updatever} %global javaver 1.7.0 @@ -211,7 +211,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: %{icedtea_version}%{icedtea_snapshot}.3%{?dist} +Release: %{icedtea_version}%{icedtea_snapshot}.1%{?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 @@ -323,17 +323,12 @@ Patch200: rh1648241-abrt_friendly_hs_log_jdk7.patch # mixer Patch300: rh1649760-make_alsa_based_mixer_default_when_pulseaudio_build.patch -# Make the curves reported by Java's SSL implementation match those of NSS -Patch400: pr1834-rh1022017-reduce_ellipticcurvesextension_to_provide_only_three_nss_supported_nist_curves_23_24_25.patch - # Temporary patches # 8076221, PR2809: Backport "8076221: Disable RC4 cipher suites" (will appear in 2.7.0) Patch500: jdk8076221-pr2809-disable_rc4_cipher_suites.patch # PR3393, RH1273760: Support using RSAandMGF1 with the SHA hash algorithms in the PKCS11 provider (will appear in 2.7.0) Patch501: pr3393-rh1273760-support_rsaandmgf1_with_sha_in_pkcs11.patch -# JDK-8226318, RH1738637: Fix crash in Class.forName (will appear in 7u241/2.6.20) -Patch502: jdk8226318-rh1738637-class_lookup_crash.patch # End of tmp patches BuildRequires: autoconf @@ -579,12 +574,8 @@ cp %{SOURCE2} . # Temporary fixes %patch500 %patch501 -%patch502 # End of temporary fixes -# ECC fix -%patch400 - # Add systemtap patches if enabled %if %{with_systemtap} %endif @@ -1509,6 +1500,16 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Thu Feb 06 2020 Andrew Hughes - 1:1.7.0.251-2.6.21.1 +- Bump to 2.6.21 and OpenJDK 7u251-b02. +- Resolves: rhbz#1785753 + +* Tue Oct 15 2019 Andrew Hughes - 1:1.7.0.241-2.6.20.1 +- Bump to 2.6.20 and OpenJDK 7u241-b01. +- Drop PR1834/RH1022017 which is now handled by JDK-8228825 upstream. +- Drop JDK-8226318/RH1738637 which is now included upstream. +- Resolves: rhbz#1753423 + * Fri Aug 23 2019 Andrew Hughes - 1:1.7.0.231-2.6.19.3 - Fix crash in Class.forName0 - Resolves: rhbz#1738637