diff --git a/.gitignore b/.gitignore index 76939d7..5a0db04 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/openjdk-jdk11u-jdk-11.0.21+9.tar.xz +SOURCES/openjdk-jdk11u-jdk-11.0.22+7.tar.xz SOURCES/tapsets-icedtea-3.15.0.tar.xz diff --git a/.java-11-openjdk.metadata b/.java-11-openjdk.metadata index 09ddccd..929d41f 100644 --- a/.java-11-openjdk.metadata +++ b/.java-11-openjdk.metadata @@ -1,2 +1,2 @@ -ddc652d12c849ca56ef68be500ec71bfe88a5a29 SOURCES/openjdk-jdk11u-jdk-11.0.21+9.tar.xz +7694237019564cbd5568e24ffae9754308d13b29 SOURCES/openjdk-jdk11u-jdk-11.0.22+7.tar.xz 7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz diff --git a/SOURCES/NEWS b/SOURCES/NEWS index cbea3a2..66f7e86 100644 --- a/SOURCES/NEWS +++ b/SOURCES/NEWS @@ -3,6 +3,293 @@ Key: JDK-X - https://bugs.openjdk.java.net/browse/JDK-X CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release OpenJDK 11.0.22 (2024-11-16): +============================================ +Live versions of these release notes can be found at: + * https://bit.ly/openjdk11022 + +* CVEs + - CVE-2024-20918 + - CVE-2024-20919 + - CVE-2024-20921 + - CVE-2024-20926 + - CVE-2024-20945 + - CVE-2024-20952 +* Security fixes + - JDK-8308204: Enhanced certificate processing + - JDK-8314284: Enhance Nashorn performance + - JDK-8314295: Enhance verification of verifier + - JDK-8314307: Improve loop handling + - JDK-8314468: Improve Compiler loops + - JDK-8316976: Improve signature handling + - JDK-8317547: Enhance TLS connection support +* Other changes + - JDK-6381945: (cal) Japanese calendar unit test system should avoid multiple static imports + - JDK-6445283: ProgressMonitorInputStream not large file aware (>2GB) + - JDK-8026393: jarsigner never shows a warning in badKeyUsage case + - JDK-8041447: Test javax/swing/dnd/7171812/bug7171812.java fails with java.lang.RuntimeException: Test failed, scroll on drag doesn't work + - JDK-8053479: (dc) DatagramChannel.read() throws exception instead of discarding data when buffer too small + - JDK-8067250: [mlvm] vm/mlvm/mixed/stress/regression/b6969574 fails and perf regression + - JDK-8153090: TAB key cannot change input focus after the radio button in the Color Selection dialog + - JDK-8168408: Test java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java fails intermittentently on windows + - JDK-8183374: Refactor java/lang/Runtime shell tests to java + - JDK-8185531: [TESTBUG] Improve test configuration for shared strings + - JDK-8195589: T6587786.java failed after JDK-8189997 + - JDK-8197825: [Test] Intermittent timeout with javax/swing JColorChooser Test + - JDK-8205467: javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java possible deadlock + - JDK-8207166: jdk/jshell/JdiHangingLaunchExecutionControlTest.java - launch timeout + - JDK-8210168: JCK test .vm.classfmt.ins.code__002.code__00201m1.code__00201m1 hangs with -noverify + - JDK-8210265: Crash in HSpaceCounters::update_used() + - JDK-8211045: [Testbug] Fix for 8144279 didn't define a test case! + - JDK-8212997: [TESTBUG] Remove defmeth tests for class file versions 50 and 51 + - JDK-8213898: CDS dumping of springboot asserts in G1ArchiveAllocator::alloc_new_region + - JDK-8214694: cleanup rawtypes warnings in open jndi tests + - JDK-8217329: JTREG: Clean up, remove unused imports in gc folder + - JDK-8218178: vmTestbase/vm/mlvm/mixed/stress/regression/b6969574/INDIFY_Test.java fails with -Xcomp + - JDK-8220083: Remove hard-coded 127.0.0.1 loopback address in JDK networking tests + - JDK-8221396: Clean up serviceability/sa/TestUniverse.java + - JDK-8223145: Replace wildcard address with loopback or local host in tests - part 1 + - JDK-8223788: [macos] JSpinner buttons in JColorChooser dialog may capture focus using TAB Key. + - JDK-8224035: Replace wildcard address with loopback or local host in tests - part 9 + - JDK-8224204: Replace wildcard address with loopback or local host in tests - part 10 + - JDK-8226825: Replace wildcard address with loopback or local host in tests - part 19 + - JDK-8230435: Replace wildcard address with loopback or local host in tests - part 22 + - JDK-8230858: Replace wildcard address with loopback or local host in tests - part 23 + - JDK-8231556: Wrong font ligatures used when 2 versions of same font used + - JDK-8231931: [TESTBUG] serviceability/sa/TestUniverse.java looks for wrong string with Shenandoah + - JDK-8232135: Add diagnostic output to test java/util/ProcessBuilder/Basic.java + - JDK-8232513: java/net/DatagramSocket/PortUnreachable.java still fails intermittently with BindException + - JDK-8232933: Javac inferred type does not conform to equality constraint + - JDK-8233000: Mark vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize test as stress test + - JDK-8233847: (sctp) Flx link-local IPv6 scope handling and test cleanup. + - JDK-8237858: PlainSocketImpl.socketAccept() handles EINTR incorrectly + - JDK-8238740: java/net/httpclient/whitebox/FlowTestDriver.java should not specify a TLS protocol + - JDK-8240235: jdk.test.lib.util.JarUtils updates jar files incorrectly + - JDK-8240604: Rewrite sun/management/jmxremote/bootstrap/CustomLauncherTest.java test to make binaries from source file + - JDK-8240754: Instrument FlowTest.java to provide more debug traces. + - JDK-8242330: Arrays should be cloned in several JAAS Callback classes + - JDK-8244508: JFR: FlightRecorderOptions reset date format + - JDK-8249812: java/net/DatagramSocket/PortUnreachable.java still fails intermittently with SocketTimeoutException + - JDK-8251177: [macosx] The text "big" is truncated in JTabbedPane + - JDK-8252713: jtreg time out of CtrlASCII.java seems to hang the Xserver. + - JDK-8254711: Add java.security.Provider.getService JFR Event + - JDK-8255548: Missing coverage for javax.xml.crypto.dom.DOMCryptoContext + - JDK-8258914: javax/net/ssl/DTLS/RespondToRetransmit.java timed out + - JDK-8259266: com/sun/jdi/JdbOptions.java failed with "RuntimeException: 'prop[boo] = >foo 2<' missing from stdout/stderr" + - JDK-8260035: Deproblemlist few problemlisted test + - JDK-8260431: com/sun/jdi/JdbOptions.java failed with "RuntimeException: 'prop[boo] = >foo<' missing from stdout/stderr" + - JDK-8263530: sun.awt.X11.ListHelper.removeAll() should use clear() + - JDK-8265586: [windows] last button is not shown in AWT Frame with BorderLayout and MenuBar set. + - JDK-8265678: Test java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java fails intermittentently on windows + - JDK-8266249: javax/swing/JPopupMenu/7156657/bug7156657.java fails on macOS + - JDK-8267860: Off-by-one bug when searching arrays in AlpnGreaseTest + - JDK-8268916: Tests for AffirmTrust roots + - JDK-8271519: java/awt/event/SequencedEvent/MultipleContextsFunctionalTest.java failed with "Total [200] - Expected [400]" + - JDK-8273804: Platform.isTieredSupported should handle the no-compiler case + - JDK-8275329: ZGC: vmTestbase/gc/gctests/SoftReference/soft004/soft004.java fails with assert(_phases->length() <= 1000) failed: Too many recored phases? + - JDK-8275333: Print count in "Too many recored phases?" assert + - JDK-8278456: Define jtreg jdk_desktop test group time-based sub-tasks for use by headful testing. + - JDK-8280004: DCmdArgument::parse_value() should handle NULL input + - JDK-8282143: Objects.requireNonNull should be ForceInline + - JDK-8282404: DrawStringWithInfiniteXform.java failed with "RuntimeException: drawString with InfiniteXform transform takes long time" + - JDK-8284331: Add sanity check for signal handler modification warning. + - JDK-8285612: Remove jtreg tag manual=yesno for java/awt/print/PrinterJob/ImagePrinting/ClippedImages.java + - JDK-8285687: Remove jtreg tag manual=yesno for java/awt/print/PrinterJob/PageRangesDlgTest.java + - JDK-8286707: JFR: Don't commit JFR internal jdk.JavaMonitorWait events + - JDK-8288325: [windows] Actual and Preferred Size of AWT Non-resizable frame are different + - JDK-8288415: java/awt/PopupMenu/PopupMenuLocation.java is unstable in MacOS machines + - JDK-8288993: Make AwtFramePackTest generic by removing @requires tag + - JDK-8289077: Add manual tests to open + - JDK-8289238: Refactoring changes to PassFailJFrame Test Framework + - JDK-8289547: Update javax/swing/Popup/TaskbarPositionTest.java + - JDK-8289584: (fs) Print size values in java/nio/file/FileStore/Basic.java when they differ by > 1GiB + - JDK-8289745: JfrStructCopyFailed uses heap words instead of bytes for object sizes + - JDK-8289917: Metadata for regionsRefilled of G1EvacuationStatistics event is wrong + - JDK-8290067: Show stack dimensions in UL logging when attaching threads + - JDK-8290469: Add new positioning options to PassFailJFrame test framework + - JDK-8292407: Improve Weak CAS VarHandle/Unsafe tests resilience under spurious failures + - JDK-8292683: Remove BadKeyUsageTest.java from Problem List + - JDK-8292713: Unsafe.allocateInstance should be intrinsified without UseUnalignedAccesses + - JDK-8293098: GHA: Harmonize GCC version handling for host and cross builds + - JDK-8293107: GHA: Bump to Ubuntu 22.04 + - JDK-8293166: jdk/jfr/jvm/TestDumpOnCrash.java fails on Linux ppc64le and Linux aarch64 + - JDK-8293361: GHA: dump config.log in case of configure failure + - JDK-8293466: libjsig should ignore non-modifying sigaction calls + - JDK-8293811: Provide a reason for PassFailJFrame.forceFail + - JDK-8294281: Allow warnings to be disabled on a per-file basis + - JDK-8294427: Check boxes and radio buttons have rendering issues on Windows in High DPI env + - JDK-8294673: JFR: Add SecurityProviderService#threshold to TestActiveSettingEvent.java + - JDK-8294941: GHA: Cut down cross-compilation sysroots + - JDK-8294956: GHA: qemu-debootstrap is deprecated, use the regular one + - JDK-8295213: Run GHA manually with user-specified make and configure arguments + - JDK-8295885: GHA: Bump gcc versions + - JDK-8296275: Write a test to verify setAccelerator method of JMenuItem + - JDK-8297296: java/awt/Mouse/EnterExitEvents/DragWindowTest.java fails with "No MouseReleased event on label!" + - JDK-8297640: Increase buffer size for buf (insert_features_names) in Abstract_VM_Version::insert_features_names + - JDK-8298905: Test "java/awt/print/PrinterJob/ImagePrinting/PrintARGBImage.java" fails because the frames of instruction does not display + - JDK-8299255: Unexpected round errors in FreetypeFontScaler + - JDK-8299330: Minor improvements in MSYS2 Workflow handling + - JDK-8300259: Add test coverage for processing of pending block files in signed JARs + - JDK-8300272: Improve readability of the test JarWithOneNonDisabledDigestAlg + - JDK-8300405: Screen capture for test JFileChooserSetLocationTest.java, failure case + - JDK-8301065: Handle control characters in java_lang_String::print + - JDK-8301167: Update VerifySignedJar to actually exercise and test verification + - JDK-8301570: Test runtime/jni/nativeStack/ needs to detach the native thread + - JDK-8302017: Allocate BadPaddingException only if it will be thrown + - JDK-8302525: Write a test to check various components send Events while mouse and key are used simultaneously + - JDK-8303607: SunMSCAPI provider leaks memory and keys + - JDK-8306134: Open source some AWT tests relating to Button and a few other classes + - JDK-8306135: Clean up and open source some AWT tests + - JDK-8306280: Open source several choice AWT tests + - JDK-8306372: Open source AWT CardLayout and Checkbox tests + - JDK-8306430: Open source some AWT tests related to TextComponent and Toolkit + - JDK-8306575: Clean up and open source four Dialog related tests + - JDK-8306765: Some client related jtreg problem list entries are malformed + - JDK-8306883: Thread stacksize is reported with wrong units in os::create_thread logging + - JDK-8307079: Update test java/awt/Choice/DragOffNoSelect.java + - JDK-8307165: java/awt/dnd/NoFormatsDropTest/NoFormatsDropTest.java timed out + - JDK-8308592: Framework for CA interoperability testing + - JDK-8308910: Allow executeAndLog to accept running process + - JDK-8309095: Remove UTF-8 character from TaskbarPositionTest.java + - JDK-8310265: (process) jspawnhelper should not use argv[0] + - JDK-8310549: avoid potential leaks in KeystoreImpl.m related to JNU_CHECK_EXCEPTION early returns + - JDK-8311285: report some fontconfig related environment variables in hs_err file + - JDK-8311813: C1: Uninitialized PhiResolver::_loop field + - JDK-8312065: Socket.connect does not timeout when profiling + - JDK-8312126: NullPointerException in CertStore.getCRLs after 8297955 + - JDK-8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar + - JDK-8312535: MidiSystem.getSoundbank() throws unexpected SecurityException + - JDK-8312573: Failure during CompileOnly parsing leads to ShouldNotReachHere + - JDK-8312972: Bump update version for OpenJDK: jdk-11.0.22 + - JDK-8313428: GHA: Bump GCC versions for July 2023 updates + - JDK-8313576: GCC 7 reports compiler warning in bundled freetype 2.13.0 + - JDK-8313626: C2 crash due to unexpected exception control flow + - JDK-8313657: com.sun.jndi.ldap.Connection.cleanup does not close connections on SocketTimeoutErrors + - JDK-8313691: use close after failing os::fdopen in vmError and ciEnv + - JDK-8313707: GHA: Bootstrap sysroots with --variant=minbase + - JDK-8313792: Verify 4th party information in src/jdk.internal.le/share/legal/jline.md + - JDK-8313815: The exception messages printed by jcmd ManagementAgent.start are corrupted on Japanese Windows + - JDK-8314063: The socket is not closed in Connection::createSocket when the handshake failed for LDAP connection + - JDK-8314094: java/lang/ProcessHandle/InfoTest.java fails on Windows when run as user with Administrator privileges + - JDK-8314242: Update applications/scimark/Scimark.java to accept VM flags + - JDK-8314262: GHA: Cut down cross-compilation sysroots deeper + - JDK-8314263: Signed jars triggering Logger finder recursion and StackOverflowError + - JDK-8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev + - JDK-8315020: The macro definition for LoongArch64 zero build is not accurate. + - JDK-8315062: [GHA] get-bootjdk action should return the abolute path + - JDK-8315135: Memory leak in the native implementation of Pack200.Unpacker.unpack() + - JDK-8315214: Do not run sun/tools/jhsdb tests concurrently + - JDK-8315480: [11u] Harmonize GHA cross-compilation block with mainline + - JDK-8315683: Parallelize java/util/concurrent/tck/JSR166TestCase.java + - JDK-8315692: Parallelize gc/stress/TestStressRSetCoarsening.java test + - JDK-8315696: SignedLoggerFinderTest.java test failed + - JDK-8315766: Parallelize gc/stress/TestStressIHOPMultiThread.java test + - JDK-8315770: serviceability/sa/TestJmapCoreMetaspace.java should run with -XX:-VerifyDependencies + - JDK-8315862: [11u] Backport 8227337: javax/management/remote/mandatory/connection/ReconnectTest.java NoSuchObjectException no such object in table + - JDK-8315863: [GHA] Update checkout action to use v4 + - JDK-8315937: Enable parallelism in vmTestbase/nsk/stress/numeric tests + - JDK-8316087: Test SignedLoggerFinderTest.java is still failing + - JDK-8316178: Better diagnostic header for CodeBlobs + - JDK-8316206: Test StretchedFontTest.java fails for Baekmuk font + - JDK-8316380: [11u] Backport 8170089: nsk/jdi/EventSet/resume/resume008: ERROR: suspendCounts don't match for : Common-Cleaner + - JDK-8316514: Better diagnostic header for VtableStub + - JDK-8316710: Exclude java/awt/font/Rotate/RotatedTextTest.java + - JDK-8316746: Top of lock-stack does not match the unlocked object + - JDK-8316906: Clarify TLABWasteTargetPercent flag + - JDK-8317373: Add Telia Root CA v2 + - JDK-8317374: Add Let's Encrypt ISRG Root X2 + - JDK-8317920: JDWP-agent sends broken exception event with onthrow option + - JDK-8317967: Enhance test/jdk/javax/net/ssl/TLSCommon/SSLEngineTestCase.java to handle default cases + - JDK-8318669: Target OS detection in 'test-prebuilt' makefile target is incorrect when running on MSYS2 + - JDK-8318705: [macos] ProblemList java/rmi/registry/multipleRegistries/MultipleRegistries.java + - JDK-8318759: Add four DigiCert root certificates + - JDK-8319187: Add three eMudhra emSign roots + - JDK-8320597: RSA signature verification fails on signed data that does not encode params correctly + - JDK-8323423: [11u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 11.0.22 + +Notes on individual issues: +=========================== + +security-libs/java.security: + +JDK-8254711: New JFR Event: jdk.SecurityProviderService +======================================================= +A new Java Flight Recorder (JFR) event has been added to record +details of calls to the java.security.Provider.getService(String type, +String algorithm) method. + +The event contains three fields: + +* type - the type of service +* algorithm - the algorithm name +* provider - the security provider + +This event is disabled by default. It may be enabled via the usual JFR +configuration files and options. + +JDK-8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar +=============================================================================================================================== +A maximum signature file size property, jdk.jar.maxSignatureFileSize, +was introduced in the 11.0.20 release of OpenJDK by JDK-8300596, with +a default of 8MB. This default proved to be too small for some JAR +files. This release, 11.0.22, increases it to 16MB. + +JDK-8317373: Added Telia Root CA v2 Certificate +=============================================== +The following root certificate has been added to the cacerts +truststore: + +Name: Telia Root CA v2 +Alias Name: teliarootcav2 +Distinguished Name: CN=Telia Root CA v2, O=Telia Finland Oyj, C=FI ``` + +JDK-8317374: Added ISRG Root X2 CA Certificate from Let's Encrypt +================================================================= +The following root certificate has been added to the cacerts +truststore: + +Name: Let's Encrypt +Alias Name: letsencryptisrgx2 +Distinguished Name: CN=ISRG Root X2, O=Internet Security Research Group, C=US + +JDK-8318759: Added Four Root Certificates from DigiCert, Inc. +============================================================= +The following root certificates have been added to the cacerts +truststore: + +Name: DigiCert, Inc. +Alias Name: digicertcseccrootg5 +Distinguished Name: CN=DigiCert CS ECC P384 Root G5, O="DigiCert, Inc.", C=US + +Name: DigiCert, Inc. +Alias Name: digicertcsrsarootg5 +Distinguished Name: CN=DigiCert CS RSA4096 Root G5, O="DigiCert, Inc.", C=US + +Name: DigiCert, Inc. +Alias Name: digicerttlseccrootg5 +Distinguished Name: CN=DigiCert TLS ECC P384 Root G5, O="DigiCert, Inc.", C=US + +Name: DigiCert, Inc. +Alias Name: digicerttlsrsarootg5 +Distinguished Name: CN=DigiCert TLS RSA4096 Root G5, O="DigiCert, Inc.", C=US + +JDK-8319187: Added Three Root Certificates from eMudhra Technologies Limited +============================================================================ +The following root certificates have been added to the cacerts +truststore: + +Name: eMudhra Technologies Limited +Alias Name: emsignrootcag1 +Distinguished Name: CN=emSign Root CA - G1, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN + +Name: eMudhra Technologies Limited +Alias Name: emsigneccrootcag3 +Distinguished Name: CN=emSign ECC Root CA - G3, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN + +Name: eMudhra Technologies Limited +Alias Name: emsignrootcag2 +Distinguished Name: CN=emSign Root CA - G2, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN + New in release OpenJDK 11.0.21 (2023-10-17): ============================================ Live versions of these release notes can be found at: diff --git a/SOURCES/jdk8312489-max_sig_default_increase.patch b/SOURCES/jdk8312489-max_sig_default_increase.patch deleted file mode 100644 index e0c4eeb..0000000 --- a/SOURCES/jdk8312489-max_sig_default_increase.patch +++ /dev/null @@ -1,50 +0,0 @@ -commit 50074a04e62f91faa080b831d9ce343396ead252 -Author: Andrew John Hughes -Date: Tue Sep 5 20:48:42 2023 +0000 - - 8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar - - Backport-of: e47a84f23dd2608c6f5748093eefe301fb5bf750 - -diff --git a/src/java.base/share/classes/java/util/jar/JarFile.java b/src/java.base/share/classes/java/util/jar/JarFile.java -index cb7e308e0d..cce897c0d3 100644 ---- a/src/java.base/share/classes/java/util/jar/JarFile.java -+++ b/src/java.base/share/classes/java/util/jar/JarFile.java -@@ -809,7 +809,9 @@ class JarFile extends ZipFile { - throw new IOException("Unsupported size: " + uncompressedSize + - " for JarEntry " + ze.getName() + - ". Allowed max size: " + -- SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes"); -+ SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes. " + -+ "You can use the jdk.jar.maxSignatureFileSize " + -+ "system property to increase the default value."); - } - int len = (int)uncompressedSize; - int bytesRead; -diff --git a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java -index cb477fc134..a766b8249f 100644 ---- a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java -+++ b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java -@@ -852,16 +852,16 @@ public class SignatureFileVerifier { - * the maximum allowed number of bytes for the signature-related files - * in a JAR file. - */ -- Integer tmp = GetIntegerAction.privilegedGetProperty( -- "jdk.jar.maxSignatureFileSize", 8000000); -+ int tmp = GetIntegerAction.privilegedGetProperty( -+ "jdk.jar.maxSignatureFileSize", 16000000); - if (tmp < 0 || tmp > MAX_ARRAY_SIZE) { - if (debug != null) { -- debug.println("Default signature file size 8000000 bytes " + -- "is used as the specified size for the " + -- "jdk.jar.maxSignatureFileSize system property " + -+ debug.println("The default signature file size of 16000000 bytes " + -+ "will be used for the jdk.jar.maxSignatureFileSize " + -+ "system property since the specified value " + - "is out of range: " + tmp); - } -- tmp = 8000000; -+ tmp = 16000000; - } - return tmp; - } diff --git a/SPECS/java-11-openjdk.spec b/SPECS/java-11-openjdk.spec index 76cdf84..184116f 100644 --- a/SPECS/java-11-openjdk.spec +++ b/SPECS/java-11-openjdk.spec @@ -276,7 +276,7 @@ # New Version-String scheme-style defines %global featurever 11 %global interimver 0 -%global updatever 21 +%global updatever 22 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -327,7 +327,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 9 +%global buildver 7 %global rpmrelease 1 #%%global tagsuffix %%{nil} # priority must be 7 digits in total @@ -874,8 +874,8 @@ Provides: java-%{javaver}%1 = %{epoch}:%{version}-%{release} %if %is_system_jdk Provides: java-%{origin}%1 = %{epoch}:%{version}-%{release} Provides: jre-%{origin}%1 = %{epoch}:%{version}-%{release} -Provides: java%1 = %{epoch}:%{version}-%{release} -Provides: jre%1 = %{epoch}:%{version}-%{release} +Provides: java%1 = %{epoch}:%{javaver} +Provides: jre%1 = %{epoch}:%{javaver} %endif } @@ -923,8 +923,8 @@ Provides: java-%{javaver}-headless%1 = %{epoch}:%{version}-%{release} %if %is_system_jdk Provides: java-%{origin}-headless%1 = %{epoch}:%{version}-%{release} Provides: jre-%{origin}-headless%1 = %{epoch}:%{version}-%{release} -Provides: jre-headless%1 = %{epoch}:%{version}-%{release} -Provides: java-headless%1 = %{epoch}:%{version}-%{release} +Provides: jre-headless%1 = %{epoch}:%{javaver} +Provides: java-headless%1 = %{epoch}:%{javaver} %endif } @@ -949,8 +949,8 @@ Provides: java-%{javaver}-%{origin}-devel%1 = %{epoch}:%{version}-%{release} %if %is_system_jdk Provides: java-devel-%{origin}%1 = %{epoch}:%{version}-%{release} Provides: java-sdk-%{origin}%1 = %{epoch}:%{version}-%{release} -Provides: java-devel%1 = %{epoch}:%{version}-%{release} -Provides: java-sdk%1 = %{epoch}:%{version}-%{release} +Provides: java-devel%1 = %{epoch}:%{javaver} +Provides: java-sdk%1 = %{epoch}:%{javaver} %endif } @@ -1133,26 +1133,14 @@ Patch7: jdk8009550-rh910107-search_for_versioned_libpcsclite.patch ############################################# # -# Patches appearing in 11.0.21 +# Patches appearing in the next release # # This section includes patches which are present -# in the listed OpenJDK 8u release and should be +# in the listed OpenJDK 11u release and should be # able to be removed once that release is out # and used by this RPM. ############################################# -############################################# -# -# Patches appearing in 11.0.22 -# -# This section includes patches which are present -# in the listed OpenJDK 8u release and should be -# able to be removed once that release is out -# and used by this RPM. -############################################# -# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar -Patch2000: jdk8312489-max_sig_default_increase.patch - BuildRequires: autoconf BuildRequires: automake BuildRequires: alsa-lib-devel @@ -1166,13 +1154,6 @@ BuildRequires: freetype-devel BuildRequires: giflib-devel BuildRequires: gcc-c++ BuildRequires: gdb -%ifarch %{arm} -BuildRequires: devtoolset-7-build -BuildRequires: devtoolset-7-binutils -BuildRequires: devtoolset-7-gcc -BuildRequires: devtoolset-7-gcc-c++ -BuildRequires: devtoolset-7-gdb -%endif BuildRequires: gtk2-devel # LCMS on rhel7 is older then LCMS in intree JDK BuildRequires: lcms2-devel @@ -1494,8 +1475,6 @@ pushd %{top_level_dir_name} %patch1000 -p1 # Allow PCSC library to work with the versioned so %patch7 -p1 -# JDK-8312489 backport, coming in 11.0.22 -%patch2000 -p1 # alt-java %patch600 -p1 popd # openjdk @@ -1548,10 +1527,6 @@ sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg %build -%ifarch %{arm} -%{?enable_devtoolset7:%{enable_devtoolset7}} -%endif - # How many CPU's do we have? export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :) export NUM_PROC=${NUM_PROC:-1} @@ -2261,6 +2236,24 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed Jan 10 2024 Andrew Hughes - 1:11.0.22.0.7-1 +- Update to jdk-11.0.22+7 (GA) +- Update release notes to 11.0.22+7 +- Switch to GA mode for release +- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. ** +- Resolves: RHEL-20966 + +* Mon Jan 08 2024 Andrew Hughes - 1:11.0.22.0.6-0.1.ea +- Update to jdk-11.0.22+6 (EA) +- Update release notes to 11.0.22+6 +- Switch to EA mode +- Drop local copy of JDK-8312489 which is now included upstream +- Resolves: RHEL-21031 + +* Sat Dec 16 2023 Andrew Hughes - 1:11.0.21.0.9-2 +- Restore %%{epoch}:%%{javaver} versioning to jre, java, jre-headless, java-headless, java-devel & java-sdk +- Resolves: RHEL-19642 + * Fri Oct 13 2023 Andrew Hughes - 1:11.0.21.0.9-1 - Update to jdk-11.0.21+9 (GA) - Update release notes to 11.0.21+9