From 76db28404c3774febb51e6b9c21cd2dfc7dcfbe7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 21 2019 12:43:37 +0000 Subject: import java-1.7.0-openjdk-1.7.0.241-2.6.20.0.el7_7 --- diff --git a/.gitignore b/.gitignore index 9127a62..5a621c8 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.20.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..98a939a 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 +92051eebd78e1deffcabe511810d6b499355ca52 SOURCES/openjdk-icedtea-2.6.20.tar.xz fb72b6b1f4735ad9b5799d0b5058b0b1dec67b17 SOURCES/pulseaudio.tar.gz 38b74f261642b087ada2dc4063bf2b468d865b0e SOURCES/systemtap-tapset-2.6.19.tar.xz 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 ed2b83c..c1c2a5b 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.20 %global icedtea_snapshot %{nil} %global hg_tag icedtea-%{icedtea_version}%{icedtea_snapshot} @@ -165,7 +165,7 @@ # Standard JPackage naming and versioning defines. %global origin openjdk %global top_level_dir_name %{origin} -%global updatever 231 +%global updatever 241 %global buildver 01 # Keep priority on 7digits in case updatever>9 %global priority 1700%{updatever} @@ -211,7 +211,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: %{icedtea_version}%{icedtea_snapshot}.2%{?dist} +Release: %{icedtea_version}%{icedtea_snapshot}.0%{?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,9 +323,6 @@ 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) @@ -579,9 +576,6 @@ cp %{SOURCE2} . %patch501 # End of temporary fixes -# ECC fix -%patch400 - # Add systemtap patches if enabled %if %{with_systemtap} %endif @@ -1506,6 +1500,11 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Tue Oct 15 2019 Andrew Hughes - 1:1.7.0.241-2.6.20.0 +- Bump to 2.6.20 and OpenJDK 7u241-b01. +- Drop PR1834/RH1022017 which is now handled by JDK-8228825 upstream. +- Resolves: rhbz#1753423 + * Tue Jul 16 2019 Andrew Hughes - 1:1.7.0.231-2.6.19.2 - Add missing hyphen in tapset filename. - Resolves: rhbz#1724452