diff --git a/.gitignore b/.gitignore
index bc4f6c3..cf6760e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/nssadapter-0.1.0.tar.xz
-SOURCES/openjdk-25.0.2+10.tar.xz
+SOURCES/nssadapter-0.1.1.tar.xz
+SOURCES/openjdk-25.0.3+9.tar.xz
 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
diff --git a/.java-25-openjdk.metadata b/.java-25-openjdk.metadata
index dce35d4..3545e0e 100644
--- a/.java-25-openjdk.metadata
+++ b/.java-25-openjdk.metadata
@@ -1,3 +1,3 @@
-f796f454a7f6eb8df8fc66c842e3fb2e7f5b82e8 SOURCES/nssadapter-0.1.0.tar.xz
-b842f1ba4b1c5b25c36a9ce694a9205d64ebfc15 SOURCES/openjdk-25.0.2+10.tar.xz
+c37273ae74270c39736b04acd9a1935990d29fe1 SOURCES/nssadapter-0.1.1.tar.xz
+79ab310b5a776a2f7cad970b146c0d4ad3df4066 SOURCES/openjdk-25.0.3+9.tar.xz
 c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
diff --git a/SOURCES/NEWS b/SOURCES/NEWS
index 0a054bf..3b1de67 100644
--- a/SOURCES/NEWS
+++ b/SOURCES/NEWS
@@ -3,6 +3,468 @@ 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 25.0.3 (2026-04-21):
+===========================================
+Live versions of these release notes can be found at:
+  * https://bit.ly/openjdk2503
+
+* CVEs
+  - CVE-2026-22007
+  - CVE-2026-22008
+  - CVE-2026-22013
+  - CVE-2026-22016
+  - CVE-2026-22018
+  - CVE-2026-22021
+  - CVE-2026-23865
+  - CVE-2026-34268
+  - CVE-2026-34282
+* Changes
+  - JDK-7191877: TEST_BUG: java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java failing intermittently
+  - JDK-8030957: AIX: Implement OperatingSystemMXBean.getSystemCpuLoad() and .getProcessCpuLoad() on AIX
+  - JDK-8068378: [TEST_BUG]The java/awt/Modal/PrintDialogsTest/PrintDialogsTest.java instruction need to update
+  - JDK-8183336: Better cleanup for jdk/test/java/lang/module/customfs/ModulesInCustomFileSystem.java
+  - JDK-8212084: G1: Implement UseGCOverheadLimit
+  - JDK-8244336: Restrict algorithms at JCE layer
+  - JDK-8246037: Shenandoah: update man pages to mention -XX:+UseShenandoahGC
+  - JDK-8255463: java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java failed with ThreadTimeoutException
+  - JDK-8256289: java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.java failed with "RuntimeException: Wrong focus owner: java.awt.Button[button1,41,36,56x23,label=Button1]"
+  - JDK-8274082: Wrong test name in jtreg run tag for java/awt/print/PrinterJob/SwingUIText.java
+  - JDK-8286258: [Accessibility,macOS,VoiceOver] VoiceOver reads the spinner value wrong and sometime partially
+  - JDK-8286865: vmTestbase/vm/mlvm/meth/stress/jni/nativeAndMH/Test.java fails with Out of space in CodeCache
+  - JDK-8287062: com/sun/jndi/ldap/LdapPoolTimeoutTest.java failed due to different timeout message
+  - JDK-8293484: AArch64: TestUseSHA512IntrinsicsOptionOnSupportedCPU.java fails on CPU with SHA512 feature support
+  - JDK-8299304: Test "java/awt/print/PrinterJob/PageDialogTest.java" fails on macOS 13 x64 because the Page Dialog blocks the Toolkit
+  - JDK-8307495: Specialize atomic bitset functions for aix-ppc
+  - JDK-8313770: jdk/internal/platform/docker/TestSystemMetrics.java fails on Ubuntu
+  - JDK-8316274: javax/swing/ButtonGroup/TestButtonGroupFocusTraversal.java fails in Ubuntu 23.10 with Motif LAF
+  - JDK-8317838: java/nio/channels/Channels/SocketChannelStreams.java running into timeout (aix)
+  - JDK-8318662: Refactor some jdk/java/net/httpclient/http2 tests to JUnit
+  - JDK-8320677: Printer tests use invalid '@run main/manual=yesno
+  - JDK-8333857: Test sun/security/ssl/SSLSessionImpl/ResumeChecksServer.java failed: Existing session was used
+  - JDK-8333871: Check return values of sysinfo
+  - JDK-8334928: Test sun/security/ssl/SSLSocketImpl/ReuseAddr.java failed: java.net.BindException: Address already in use
+  - JDK-8335646: Nimbus : JLabel not painted with LAF defined foreground color on Ubuntu 24.04
+  - JDK-8336695: Update Commons BCEL to Version 6.10.0
+  - JDK-8339791: Refactor MiscUndecorated/ActiveAWTWindowTest.java
+  - JDK-8341039: compiler/cha/TypeProfileFinalMethod.java fails with assertEquals expected: 0 but was: 2
+  - JDK-8342175: MemoryEaterMT fails intermittently with ExceptionInInitializerError
+  - JDK-8342401: [TESTBUG] javax/swing/JSpinner/8223788/JSpinnerButtonFocusTest.java test fails in ubuntu 22.04 on SBR Hosts
+  - JDK-8342640: GenShen: Silently ignoring ShenandoahGCHeuristics considered poor user-experience
+  - JDK-8342659: Test vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java failed: Class nsk.share.jdi.TestClass1 was not unloaded
+  - JDK-8343316: Review and update tests using explicit provider names
+  - JDK-8343340: Swapping checking do not work for MetricsMemoryTester failcount
+  - JDK-8343474: [updates] Customize README.md to specifics of update project
+  - JDK-8344073: Test runtime/cds/appcds/TestParallelGCWithCDS.java#id0 failed
+  - JDK-8346154: [XWayland] Some tests fail intermittently in the CI, but not locally
+  - JDK-8346962: Test CRLReadTimeout.java fails with -Xcomp on a fastdebug build
+  - JDK-8348014: Enhance certificate processing
+  - JDK-8349192: jvmti/scenarios/contention/TC05/tc05t001 fails: ERROR: tc05t001.cpp, 281: (waitedThreadCpuTime - waitThreadCpuTime) < (EXPECTED_ACCURACY * 1000000)
+  - JDK-8352149: Test java/awt/Frame/MultiScreenTest.java fails: Window list is empty
+  - JDK-8353755: Add a helper method to Util - findComponent()
+  - JDK-8354244: Use random data in MinMaxRed_Long data arrays
+  - JDK-8354469: Keytool exposes the password in plain text when command is piped using | grep
+  - JDK-8354894: java/lang/Thread/virtual/Starvation.java timeout on server with high CPUs
+  - JDK-8354937: Cleanup some sparc related coding in os_linux
+  - JDK-8356548: Use ClassFile API instead of ASM to transform classes in tests
+  - JDK-8356868: Not all cgroup parameters are made available
+  - JDK-8357277: Update OpenSSL library for interop tests
+  - JDK-8357380: java/lang/StringBuilder/RacingSBThreads.java times out with C1
+  - JDK-8357390: java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java Test failing on Ubuntu 24.04 Vm Hosts used by Oracle's internal CI system
+  - JDK-8357470: src/java.base/share/classes/sun/security/util/Debug.java implement the test for args.toLowerCase
+  - JDK-8357570: [macOS] os::Bsd::available_memory() might return too low values
+  - JDK-8357591: Re-enable CDS test cases for jvmci after JDK-8345826
+  - JDK-8358058: sun/java2d/OpenGL/DrawImageBg.java Test fails intermittently
+  - JDK-8358159: Empty mode/padding in cipher transformations
+  - JDK-8358529: GenShen: Heuristics do not respond to changes in SoftMaxHeapSize
+  - JDK-8358679: [asan] vmTestbase/nsk/jvmti tests show memory issues
+  - JDK-8358686: CDS and AOT can cause buffer truncation warning even when logging is disabled
+  - JDK-8358735: GenShen: block_start() may be incorrect after class unloading
+  - JDK-8358756: [s390x] Test StartupOutput.java crash due to CodeCache size
+  - JDK-8358801: javac produces class that does not pass verifier.
+  - JDK-8359064: Expose reason for marking nmethod non-entrant to JVMCI client
+  - JDK-8359182: Use @requires instead of SkippedException for MaxPath.java
+  - JDK-8359388: Stricter checking for cipher transformations
+  - JDK-8359418: Test "javax/swing/text/GlyphView/bug4188841.java" failed because the phrase of text pane does not match the instructions
+  - JDK-8359472: JVM crashes when attaching a dynamic agent before JVMTI_PHASE_LIVE
+  - JDK-8359707: Add classfile modification code to RedefineClassHelper
+  - JDK-8359868: Shenandoah: Free threshold heuristic does not use SoftMaxHeapSize
+  - JDK-8359978: Test javax/net/ssl/SSLSocket/Tls13PacketSize.java failed again with java.net.SocketException: An established connection was aborted by the software in your host machine
+  - JDK-8360049: CodeInvalidationReasonTest.java fails with ZGC on AArch64
+  - JDK-8360160: ubuntu-22-04 machine is failing client tests
+  - JDK-8360169: Problem list CodeInvalidationReasonTest.java on linux-riscv64 until JDK-8360168 is fixed
+  - JDK-8360271: String.indexOf intrinsics fail with +EnableX86ECoreOpts and -CompactStrings
+  - JDK-8360395: sun/security/tools/keytool/i18n.java user country is current user location instead of the language
+  - JDK-8360539: DTLS handshakes fails due to improper cookie validation logic
+  - JDK-8360562: sun/security/tools/keytool/i18n.java add an ability to add comment for failures
+  - JDK-8360702: runtime/Thread/AsyncExceptionTest.java timed out
+  - JDK-8360882: Tests throw SkippedException when they should fail
+  - JDK-8361067: Test ExtraButtonDrag.java requires frame.dispose in finally block
+  - JDK-8361106: [TEST] com/sun/net/httpserver/Test9.java fails with java.nio.file.FileSystemException
+  - JDK-8361363: ShenandoahAsserts::print_obj() does not work for forwarded objects and UseCompactObjectHeaders
+  - JDK-8361381: GlyphLayout behavior differs on JDK 11+ compared to JDK 8
+  - JDK-8361492: [IR Framework] Has too restrictive regex for load and store
+  - JDK-8361521: BogusFocusableWindowState.java fails with StackOverflowError on Linux
+  - JDK-8361530: Test javax/swing/GraphicsConfigNotifier/StalePreferredSize.java timed out
+  - JDK-8361613: System.console() should only be available for interactive terminal
+  - JDK-8361894: sun/security/krb5/config/native/TestDynamicStore.java ensure that the test is run with sudo
+  - JDK-8362284: RISC-V: cleanup NativeMovRegMem
+  - JDK-8362979: C2 fails with unexpected node in SuperWord truncation: CmpLTMask, RoundF
+  - JDK-8363950: Incorrect jtreg header in TestLayoutVsICU.java
+  - JDK-8364373: Transform Affine transformations
+  - JDK-8364465: Enhance behavior of some intrinsics
+  - JDK-8364580: Test compiler/vectorization/TestSubwordTruncation.java fails on platforms without RoundF/RoundD
+  - JDK-8364741: [asan] runtime/ErrorHandling/PrintVMInfoAtExitTest.java fails because output differs slightly
+  - JDK-8364756: JFR: Improve slow tests
+  - JDK-8364936: Shenandoah: Switch nmethod entry barriers to conc_instruction_and_data_patch
+  - JDK-8365065: cancelled ForkJoinPool tasks no longer throw CancellationException
+  - JDK-8365184: sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java Re-enable SerialGC flag on debuggee process
+  - JDK-8365305: The ARIA role ‘contentinfo’ is not valid for the element <footer>
+  - JDK-8365398: TEST_BUG: java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java failing intermittently
+  - JDK-8365526: Crash with null Symbol passed to SystemDictionary::resolve_or_null
+  - JDK-8365570: C2 fails assert(false) failed: Unexpected node in SuperWord truncation: CastII
+  - JDK-8365776: Convert JShell tests to use JUnit instead of TestNG
+  - JDK-8365861: test/jdk/sun/security/pkcs11/Provider/ tests skipped without SkippedException
+  - JDK-8365972: JFR: ThreadDump and ClassLoaderStatistics events may cause back to back rotations
+  - JDK-8366082: Improve queue size computation in CPU-time sampler
+  - JDK-8366128: jdk/jdk/nio/zipfs/TestPosix.java::testJarFile uses wrong file
+  - JDK-8366182: Some PKCS11Tests are being skipped when they shouldn't
+  - JDK-8366261: Provide utility methods for sun.security.util.Password
+  - JDK-8366278: Form control element <select> has no associated label
+  - JDK-8366369: Add @requires linux for GTK L&F tests
+  - JDK-8366486: Test jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java is timing out
+  - JDK-8366733: Re-examine older java.text NF, DF, and DFS serialization tests
+  - JDK-8366747: RISC-V: Improve VerifyMethodHandles for method handle linkers
+  - JDK-8366817: test/jdk/javax/net/ssl/TLSCommon/interop/JdkProcServer.java and JdkProcClient.java should not delete logs
+  - JDK-8366874: Test gc/arguments/TestParallelGCErgo.java fails with UseTransparentHugePages
+  - JDK-8366878: Improve flags of compiler/loopopts/superword/TestAlignVectorFuzzer.java
+  - JDK-8366908: Use a different class for testing JDK-8351654
+  - JDK-8366938: Test runtime/handshake/HandshakeTimeoutTest.java crashed
+  - JDK-8366951: Test runtime/logging/StressAsyncUL.java is timing out
+  - JDK-8367135: Test compiler/loopstripmining/CheckLoopStripMining.java needs internal timeouts adjusted
+  - JDK-8367271: Add parsing tests to DateFormat JMH benchmark
+  - JDK-8367278: Test compiler/startup/StartupOutput.java timed out after completion on Windows
+  - JDK-8367302: New test jdk/jfr/event/profiling/TestCPUTimeSampleQueueAutoSizes.java from JDK-8366082 is failing
+  - JDK-8367371: Remove @requires vm.opt.UseLargePages from InternSharedString.java test
+  - JDK-8367372: Test `test/hotspot/jtreg/gc/TestObjectAlignmentCardSize.java` fails on 32 bit systems
+  - JDK-8367463: Improved Arena allocations
+  - JDK-8367583: sun/security/util/AlgorithmConstraints/InvalidCryptoDisabledAlgos.java fails after JDK-8244336
+  - JDK-8367772: Refactor createUI in PassFailJFrame
+  - JDK-8367784: java/awt/Focus/InitialFocusTest/InitialFocusTest1.java failed with Wrong focus owner
+  - JDK-8367862: debug.cpp: Do not print help message for methods ifdef'd out
+  - JDK-8367901: Calendar.roll(hour, 24) returns wrong result
+  - JDK-8367994: test/jdk/sun/security/pkcs11/Signature/ tests pass when they should skip
+  - JDK-8368029: Several tests in httpserver/simpleserver should throw SkipException
+  - JDK-8368182: AOT cache creation fails with class defined by JNI
+  - JDK-8368328: CompactNumberFormat.clone does not produce independent instances
+  - JDK-8368335: Refactor the rest of Locale TestNG based tests to JUnit
+  - JDK-8368498: Use JUnit instead of TestNG for jdk_text tests
+  - JDK-8368500: ContextClassLoader cannot be reset on threads in ForkJoinPool.commonPool()
+  - JDK-8368551: Core dump warning may be confusing
+  - JDK-8368625: com/sun/net/httpserver/ServerStopTerminationTest.java fails intermittently
+  - JDK-8368677: acvp test should throw SkippedException when no ACVP-Server available
+  - JDK-8368683: [process] Increase jtreg debug output maxOutputSize for TreeTest
+  - JDK-8368754: runtime/cds/appcds/SignedJar.java log regex is too strict
+  - JDK-8368787: Error reporting: hs_err files should show instructions when referencing code in nmethods
+  - JDK-8368866: compiler/codecache/stress/UnexpectedDeoptimizationTest.java intermittent timed out
+  - JDK-8368882: NPE during text drawing on machine with JP locale
+  - JDK-8368885: NMT CommandLine tests can check for error better
+  - JDK-8368892: Make JEditorPane/TestBrowserBGColor.java headless
+  - JDK-8369032: Add test to ensure serialized ICC_Profile stores only necessary optional data
+  - JDK-8369050: DecimalFormat Rounding Errors for Fractional Ties Near Zero
+  - JDK-8369227: Virtual thread stuck in PARKED state
+  - JDK-8369255: Assess and remedy any unsafe usage of the Semaphores used by JFR
+  - JDK-8369282: Distrust TLS server certificates anchored by Chunghwa ePKI Root CA
+  - JDK-8369335: Two  sun/java2d/OpenGL tests fail on Windows after JDK-8358058
+  - JDK-8369505: jhsdb jstack cannot handle continuation stub
+  - JDK-8369516: Delete duplicate imaging test
+  - JDK-8369575: Enhance crypto algorithm support
+  - JDK-8369804: TestGenerators.java fails with IllegalArgumentException: bound must be greater than origin
+  - JDK-8369851: Remove darcy author tags from langtools tests
+  - JDK-8369858: Remove darcy author tags from jdk tests
+  - JDK-8369881: C2: Unexpected node in SuperWord truncation: ReverseBytesS, ReverseBytesUS
+  - JDK-8369911: Test sun/java2d/marlin/ClipShapeTest.java#CubicDoDash, #Cubic and #Poly fail intermittent
+  - JDK-8369991: Thread blocking during JFR emergency dump must be in safepoint safe state
+  - JDK-8370036: TestJhsdbJstackWithVirtualThread.java fails when run with -showversion
+  - JDK-8370064: Test runtime/NMT/CheckForProperDetailStackTrace.java fails on Windows when using stripped pdb files
+  - JDK-8370197: Add missing @Override annotations in com.sun.beans package
+  - JDK-8370201: Test serviceability/sa/TestJhsdbJstackWithVirtualThread.java fails due to VM warnings
+  - JDK-8370203: Add jcmd AOT.end_recording diagnostic command
+  - JDK-8370240: [PPC64] jhsdb jstack cannot handle continuation stub
+  - JDK-8370242: JFR: Clear event reference eagerly when using EventStream
+  - JDK-8370244: [PPC64] Several vector tests fail on Power8
+  - JDK-8370325: G1: Disallow GC for TLAB allocation
+  - JDK-8370378: Some compiler tests inadvertently exclude particular platforms
+  - JDK-8370393: Cleanup handling of ancient Windows versions from GetJavaProperties java_props_md
+  - JDK-8370405: C2: mismatched store from MergeStores wrongly scalarized in allocation elimination
+  - JDK-8370492: [Linux] Update cpu shares to cpu.weight mapping function
+  - JDK-8370511: test/jdk/javax/swing/JSlider/bug4382876.java does not release previously pressed keys
+  - JDK-8370529: Enhance Path Factories Redux
+  - JDK-8370572: Cgroups hierarchical memory limit is not honored after JDK-8322420
+  - JDK-8370579: PPC: fix inswri immediate argument order
+  - JDK-8370615: Improve Kerberos credentialing
+  - JDK-8370636: com/sun/jdi/TwoThreadsTest.java should wait for completion of all threads
+  - JDK-8370646: TestLargeUTF8Length.java needs lots of memory
+  - JDK-8370649: Add intermittent tag for gc/shenandoah/generational/TestOldGrowthTriggers.java
+  - JDK-8370708: RISC-V: Add VerifyStackAtCalls
+  - JDK-8370730: Test serviceability/attach/EarlyDynamicLoad/EarlyDynamicLoad.java needs to be resilient about warnings
+  - JDK-8370732: Use WhiteBox.getWhiteBox().fullGC() to provoking gc for nsk/jvmti tests
+  - JDK-8370887: DelayScheduler.replace method may break the 4-ary heap in certain scenarios
+  - JDK-8370905: Update vm.defmeth tests to use virtual threads
+  - JDK-8370942: test/jdk/java/security/Provider/NewInstance.java and /test/jdk/java/security/cert/CertStore/NoLDAP.java may skip without notifying
+  - JDK-8370966: Create regression test for the hierarchical memory limit fix in JDK-8370572
+  - JDK-8370986: Enhance Zip file reading
+  - JDK-8370995: Enhance ZipFile usage
+  - JDK-8371014: Dump JFR recording on CrashOnOutOfMemoryError is incorrectly implemented
+  - JDK-8371103: vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/TestDescription.java failing
+  - JDK-8371262: sun/security/pkcs11/Cipher/KeyWrap tests may silently skip
+  - JDK-8371316: Adjust assertion (GC pause time cannot be smaller than the sum of each phase) in G1GCPhaseTimes::print
+  - JDK-8371349: Update NSS library to 3.117
+  - JDK-8371364: Refactor javax/swing/JFileChooser/FileSizeCheck.java to use Util.findComponent()
+  - JDK-8371365: Update javax/swing/JFileChooser/bug4759934.java to use Util.findComponent()
+  - JDK-8371366: java/net/httpclient/whitebox/RawChannelTestDriver.java fails intermittently in jtreg timeout
+  - JDK-8371368: SIGSEGV in JfrVframeStream::next_vframe() on arm64
+  - JDK-8371383: Test sun/security/tools/jarsigner/DefaultOptions.java failed due to CertificateNotYetValidException
+  - JDK-8371385: compiler/escapeAnalysis/TestRematerializeObjects.java fails in case of -XX:-UseUnalignedAccesses
+  - JDK-8371420: Still sporadic failures of gc/TestAlwaysPreTouchBehavior.java#<gcname> on Linux after JDK-8359104
+  - JDK-8371485: ProblemList awt/Mixing/AWT_Mixing/JTableInGlassPaneOverlapping.java for linux
+  - JDK-8371559: Intermittent timeouts in test javax/net/ssl/Stapling/HttpsUrlConnClient.java
+  - JDK-8371608: Jtreg test  jdk/internal/vm/Continuation/Fuzz.java sometimes fails with (fast)debug binaries
+  - JDK-8371759: Add missing @Override annotations in com.sun.imageio package
+  - JDK-8371769: TestMemoryInvisibleParent.java fails with java.nio.file.AccessDeniedException
+  - JDK-8371830: Enhance certificate chain validation
+  - JDK-8371854: Shenandoah: Simplify WALK_FORWARD_IN_BLOCK_START use
+  - JDK-8371864: GaloisCounterMode.implGCMCrypt0 AVX512/AVX2 intrinsics stubs cause AES-GCM encryption failure for certain payload sizes
+  - JDK-8371895: Lower GCTimeLimit in TestUseGCOverheadLimit.java
+  - JDK-8371935: Enhance key generation
+  - JDK-8371944: AOT configuration is corrupted when app closes System.out
+  - JDK-8371948: TestStackOverflowDuringInit.java fails xss too small on linux-aarch64
+  - JDK-8371966: RISC-V: Incorrect pointer dereference in TemplateInterpreterGenerator::generate_native_entry
+  - JDK-8371967: Add Visual Studio 2026 to build toolchain for Windows
+  - JDK-8371978: tools/jar/ReproducibleJar.java fails on XFS
+  - JDK-8372012: java/nio/file/attribute/BasicFileAttributeView/SetTimesNanos.java should check ability to create links
+  - JDK-8372046: compiler/floatingpoint/TestSubNodeFloatDoubleNegation.java fails IR verification
+  - JDK-8372048: Performance improvement on Linux remote desktop
+  - JDK-8372110: GenShen: Fix erroneous assert
+  - JDK-8372120: Add missing sound keyword to MIDI tests
+  - JDK-8372147: ConnectionFlowControlTest should use HttpResponse.connectionLabel()
+  - JDK-8372321: TestBackToBackSensitive fails intermittently after JDK-8365972
+  - JDK-8372348: Adjust some UL / JFR string deduplication output messages
+  - JDK-8372412: Increase buffer size for ring-buffer events in CollectedHeap
+  - JDK-8372441: JFR: Improve logging of TestBackToBackSensitive
+  - JDK-8372534: Update Libpng to 1.6.51
+  - JDK-8372586: Crashes on ppc64(le) after JDK-8371368
+  - JDK-8372589: VM crashes on init when NonNMethodCodeHeapSize is set too small and UseTransparentHugePages is enabled
+  - JDK-8372591: assert(!current->cont_fastpath() || freeze.check_valid_fast_path()) failed
+  - JDK-8372609: Bug4944439 does not enforce locale correctly
+  - JDK-8372661: Add a null-safe static factory method to "jdk.test.lib.net.SimpleSSLContext"
+  - JDK-8372704: ThreadMXBean.getThreadUserTime may return total time
+  - JDK-8372710: Update ProcessBuilder/Basic regex
+  - JDK-8372733: GHA: Bump to Ubuntu 24.04
+  - JDK-8372756: Mouse additional buttons and horizontal scrolling are broken on XWayland GNOME >= 47 after JDK-8351907
+  - JDK-8372835: WorkQueue::push is missing an acquire-fence
+  - JDK-8372857: Improve debuggability of java/rmi/server/RemoteServer/AddrInUse.java test
+  - JDK-8372860: TestCodeCacheUnloadDuringConcCycle fails on ARM32
+  - JDK-8372977: Unnecessary gthread-2.0 loading
+  - JDK-8372988: Test runtime/Nestmates/membership/TestNestHostErrorWithMultiThread.java failed: Unexpected interrupt
+  - JDK-8373021: aarch64: MacroAssembler::arrays_equals reads out of bounds
+  - JDK-8373101: JdkClient and JdkServer test classes ignore namedGroups field
+  - JDK-8373106: JFR suspend/resume deadlock on macOS in pthreads library
+  - JDK-8373290: Update FreeType to 2.14.1
+  - JDK-8373429: gc/g1/TestCodeCacheUnloadDuringConcCycle fails on various platforms
+  - JDK-8373476: (tz) Update Timezone Data to 2025c
+  - JDK-8373485: JFR Crash during sampling:  assert(jt->has_last_Java_frame()) failed: invariant
+  - JDK-8373525: C2: assert(_base == Long) failed: Not a Long
+  - JDK-8373537: Migrate "test/jdk/com/sun/net/httpserver/" to null-safe "SimpleSSLContext" methods
+  - JDK-8373593: Support latest  VS2026 MSC_VER in abstract_vm_version.cpp
+  - JDK-8373623: Refactor Serialization tests for Records to JUnit
+  - JDK-8373630: r18_tls should not be modified on Windows AArch64
+  - JDK-8373632: Some sound tests failing in CI due to lack of sound key
+  - JDK-8373704: Improve "SocketException: Protocol family unavailable" message
+  - JDK-8373716: Refactor further java/util tests from TestNG to JUnit
+  - JDK-8373727: New XBM images parser regression: only the first line of the bitmap array is parsed
+  - JDK-8373793: TestDynamicStore.java '/manual' disables use of '/timeout'
+  - JDK-8373807: test/jdk/java/net/httpclient/websocket/DummyWebSocketServer.java getURI() uses "localhost"
+  - JDK-8373832: Test java/lang/invoke/TestVHInvokerCaching.java tests nothing
+  - JDK-8373869: Refactor java/net/httpclient/ThrowingPushPromises*.java tests to use JUnit5
+  - JDK-8373931: Test javax/sound/sampled/Clip/AutoCloseTimeCheck.java timed out
+  - JDK-8373946: Synth ProgressBarUI implementation confuses background painting with border painting
+  - JDK-8373984: Check for macos 11 in CGraphicsDevice.m can be removed
+  - JDK-8373998: RISC-V: simple optimization of ConvHF2F
+  - JDK-8374056: RISC-V: Fix argument passing for the RiscvFlushIcache::flush
+  - JDK-8374178: Missing include in systemDictionary.cpp after JDK-8365526
+  - JDK-8374433: java/util/Locale/PreserveTagCase.java does not run any tests
+  - JDK-8374434: Several JShell tests report JUnit discovery warnings
+  - JDK-8374525: RISC-V: Several masked float16 vector operations are not supported
+  - JDK-8374555: No need for visible input warning in s.s.u.Password when not reading from System.in
+  - JDK-8374557: Enhance TLS connection handling
+  - JDK-8374642: EscapeHash macro fails with GNU make 4.3 and 4.4
+  - JDK-8374644: Regression in GZIPInputStream performance after JDK-7036144
+  - JDK-8374711: Hotspot runtime/CommandLine/OptionsValidation/TestOptionsWithRanges fails without printing the option name
+  - JDK-8374872: Cleanup outdated SAP AG copyright header info
+  - JDK-8374875: Improve perfMemory warning about 'Insufficient space for shared memory file'
+  - JDK-8375057: Update HarfBuzz to 12.3.2
+  - JDK-8375063: Update Libpng to 1.6.54
+  - JDK-8375094: RISC-V: Fix client builds after JDK-8368732
+  - JDK-8375231: Refactor util/ServiceLoader tests to use JUnit
+  - JDK-8375232: Refactor util/StringJoiner tests to use JUnit
+  - JDK-8375233: Refactor util/Vector tests to use JUnit
+  - JDK-8375311: Some builds are missing debug helpers
+  - JDK-8375530: PPC64: incorrect quick verify_method_data_pointer check causes poor performance in debug build
+  - JDK-8375549: ConcurrentModificationException if jdk.crypto.disabledAlgorithms has multiple entries with known oid
+  - JDK-8375598: VM crashes with "assert((labs(val) & 0xFFFFFFFF00000000) == 0 || dest == (address)-1) failed: must be 32bit offset or -1" when using too high value for NonNMethodCodeHeapSize
+  - JDK-8375657: RISC-V: Need to check size in SharedRuntime::is_wide_vector
+  - JDK-8375742: Test java/lang/invoke/MethodHandleProxies/Driver.java does not run Unnamed.java
+  - JDK-8375963: [25u] Set designator DEFAULT_PROMOTED_VERSION_PRE=ea in jdk25u-dev
+  - JDK-8375999: com/sun/jndi/ldap/LdapPoolTimeoutTest.java fails sporadically on Windows
+  - JDK-8376572: RISC-V: Interpreter: Load array index as signed int
+  - JDK-8376688: Gtest os.attempt_reserve_memory_between_small_range_fill_hole_vm fails on AIX 7.3
+  - JDK-8376889: Enhance JfrRecorder::on_create_vm_3() assert output
+  - JDK-8377347: jdk/jfr/event/gc/detailed/TestZAllocationStallEvent.java intermittent OOME
+  - JDK-8377509: Add licenses for gcc 14.2.0
+  - JDK-8377526: Update Libpng to 1.6.55
+  - JDK-8377811: [25u] G1: Optional Evacuations may evacuate pinned objects
+  - JDK-8377898: Hotspot build on AIX with unused-functions warning reports some unused functions
+  - JDK-8377905: gcc.md included with every build
+  - JDK-8378113: Add sun/java2d/OpenGL/ScaleParamsOOB.java to the ProblemList.txt file
+  - JDK-8378218: MSYS2 reports cygwin triplet causing bash configure failure
+  - JDK-8378353: [PPC64] StringCoding.countPositives causes errors when the length is not a proper 32 bit int
+  - JDK-8378623: Use unique font names in FormatCharAdvanceTest
+  - JDK-8378631: Update Zlib Data Compression Library to Version 1.3.2
+  - JDK-8378823: AIX build fails after zlib updated by JDK-8378631
+  - JDK-8378853: [25u] Make backport of JDK-8244336 comply with differences in CSR
+  - JDK-8379035: (tz) Update Timezone Data to 2026a
+  - JDK-8379158: Update FreeType to 2.14.2
+  - JDK-8379256: Update GIFlib to 6.1.1
+  - JDK-8380078: Update GIFlib to 6.1.2
+  - JDK-8380959: Update Libpng to 1.6.56
+  - JDK-8382047: Update Libpng to 1.6.57
+  - JDK-8382438: [25u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 25.0.3
+
+Notes on individual issues:
+===========================
+
+security-libs/javax.net.ssl:
+
+JDK-8369282: Distrust TLS server certificates anchored by Chunghwa ePKI Root CA
+===============================================================================
+In accordance with similar plans recently announced by Google and
+Mozilla, the JDK will not trust Transport Layer Security (TLS)
+certificates issued after the 17th of March 2026 which are anchored by
+Chungwa root certificates.
+
+Certificates issued on or before the 17th of March, 2026 will continue
+to be trusted until they expire.
+
+If a server's certificate chain is anchored by an affected
+certificate, attempts to negotiate a TLS session will fail with an
+Exception that indicates the trust anchor is not trusted. For example,
+
+"TLS server certificate issued after 2026-03-17 and anchored by a
+distrusted legacy Chungwa root CA: OU=ePKI Root Certification
+Authority, O="Chunghwa Telecom Co.", Ltd. C=TW"
+
+To check whether a certificate in a JDK keystore is affected by this
+change, you can the `keytool` utility:
+
+keytool -v -list -alias <your_server_alias> -keystore <your_keystore_filename>
+
+If any of the certificates in the chain are affected by this change,
+then you will need to update the certificate or contact the
+organisation responsible for managing the certificate.
+
+These restrictions apply to the following Chungwa root certificates
+included in the JDK:
+
+Alias name: chunghwaepkirootca
+OU=ePKI Root Certification Authority
+O="Chunghwa Telecom Co., Ltd."
+C=TW
+SHA256:A6:F4:DC:63:A2:4B:FD:CF:54:EF:2A:6A:08:2A:0A:72:DE:35:80:3E:2F:F5:FF:52:7A:E5:D8:72:06:DF:D5
+
+Users can, *at their own risk*, remove this restriction by modifying
+the `java.security` configuration file (or override it by using the
+`java.security.properties` system property) so "CHUNGWA_TLS" is no
+longer listed in the `jdk.security.caDistrustPolicies` security
+property.
+
+hotspot/jfr:
+
+JDK-8365972: JFR: ThreadDump and ClassLoaderStatistics events may cause back to back rotations
+==============================================================================================
+In previous OpenJDK releases, the `jdk.ThreadDump` and
+`jdk.ClassLoaderStatistics` events were written at the beginning of a
+new file created by a file rotation.  However, in applications with
+many threads (typically more than a thousand), deep Java stacks
+(typically more than three hundred frames) or many class loaders
+(typically hundreds of thousands), the size of these events alone
+could trigger a further file rotation within one second.  This causes
+other relevant data to be flushed out very quickly (e.g. about fifteen
+seconds if using the default 250MB max file size).  In this release,
+these events are only written when a recording starts and at the end
+of a file rotation.
+
+security-libs/java.security:
+
+JDK-8244336: Restrict algorithms at JCE layer
+=============================================
+A security property named `jdk.crypto.disabledAlgorithms` has been
+added that can be used to disable JCE/JCA cryptographic services. The
+property accepts a comma-separated list of services, specified as
+Service.AlgorithName.  The current list of supported services is
+`Cipher`, `KeyStore`, `MessageDigest` and `Signature`.  Algorithms
+should be drawn from those specified by the Java Security Standard
+Algorithm Names Specification [0].  For example:
+
+jdk.crypto.disabledAlgorithms=Cipher.RSA/ECB/PKCS1Padding, MessageDigest.MD2
+
+would disable the RSA cipher when used with the ECB cipher algorithm
+mode and PKCS #1 algorithm padding, and the MD2 message digest
+algorithm.
+
+The default value for this security property is empty, which means
+that no algorithms are disabled out-of-the-box.  The value of the
+security property specified in `java.security` can be overridden by
+specifying a system property of the same name,
+`jdk.crypto.disabledAlgorithms`.  With the above example in place in
+`java.security`, running `java` as:
+
+$ java -Djdk.crypto.disabledAlgorithms=
+
+would cause these algorithms to be enabled for that run of the Java
+virtual machine.
+
+[0] https://docs.oracle.com/en/java/javase/25/docs/specs/security/standard-names.html
+
+JDK-8354469: Keytool exposes the password in plain text when command is piped using | grep
+==========================================================================================
+The `keytool` and `jarsigner` commands read passwords using the system
+console with echoing disabled to avoid them being displayed on screen.
+However, the system console is usually only available when both the
+standard input and standard output have *not* been redirected.  In
+previous OpenJDK releases, running these tools with input or output
+redirected would cause the password to be echoed to the screen in
+plain text.  With this release, echoing no longer takes place in such
+scenarios when using these tools or the JAAS `TextCallbackHandler`
+API.
+
+hotspot/gc:
+
+JDK-8212084: G1: Implement UseGCOverheadLimit
+=============================================
+In this release, the G1 garbage collector now respects the values of
+`GCTimeLimit` and `GCHeapFreeLimit`.  The garbage collector will throw
+an `OutOfMemoryException` (OOME) when the garbage collection overhead
+is more than `GCTimeLimit` percent (default: 98%) and the free Java
+heap is less than `GCHeapFreeLimit` (default: 2%) for five consecutive
+garbage collections.
+
+This feature is enabled by default.  It may be disabled by specifying
+the `-XX:-UseGCOverheadLimit` option.  The implementation mirrors the
+functionality already provided by the parallel garbage collector,
+though there may be differences in the exact conditions when an OOME
+is triggered, due to differences in the way the collectors calculate
+the collection overhead and free Java heap.
+
 New in release OpenJDK 25.0.2 (2026-01-20):
 ===========================================
 
diff --git a/SOURCES/fips-25u-df044414ef4.patch b/SOURCES/fips-25u-57722aab802.patch
similarity index 87%
rename from SOURCES/fips-25u-df044414ef4.patch
rename to SOURCES/fips-25u-57722aab802.patch
index 8b210e6..19f4a53 100644
--- a/SOURCES/fips-25u-df044414ef4.patch
+++ b/SOURCES/fips-25u-57722aab802.patch
@@ -1,8 +1,8 @@
 diff --git a/src/java.base/share/classes/java/security/Provider.java b/src/java.base/share/classes/java/security/Provider.java
-index de2845fb550..b1e416b90f4 100644
+index de2845fb550..60eeab678ca 100644
 --- a/src/java.base/share/classes/java/security/Provider.java
 +++ b/src/java.base/share/classes/java/security/Provider.java
-@@ -1203,6 +1203,39 @@ public Set<Service> getServices() {
+@@ -1203,6 +1203,34 @@ public Set<Service> getServices() {
          return serviceSet;
      }
  
@@ -10,9 +10,7 @@ index de2845fb550..b1e416b90f4 100644
 +    private static final class RedHatFIPSFilter {
 +        static final boolean IS_ON = Boolean.parseBoolean(
 +                Security.getProperty("__redhat_fips_filter__"));
-+        private static final Set<String> ANY_SERVICE_TYPE = Set.of();
 +        private static final Map<String, Set<String>> ALLOW_LIST = Map.of(
-+                "SunPKCS11-FIPS", ANY_SERVICE_TYPE,
 +                "SUN", Set.of(
 +                        "AlgorithmParameterGenerator",
 +                        "AlgorithmParameters", "CertificateFactory",
@@ -20,21 +18,18 @@ index de2845fb550..b1e416b90f4 100644
 +                        "Configuration", "KeyStore"),
 +                "SunEC", Set.of(
 +                        "AlgorithmParameters", "KeyFactory"),
-+                "SunJSSE", ANY_SERVICE_TYPE,
 +                "SunJCE", Set.of(
 +                        "AlgorithmParameters",
 +                        "AlgorithmParameterGenerator", "KeyFactory",
 +                        "SecretKeyFactory"),
 +                "SunRsaSign", Set.of(
-+                        "KeyFactory", "AlgorithmParameters"),
-+                "XMLDSig", ANY_SERVICE_TYPE
++                        "KeyFactory", "AlgorithmParameters")
 +        );
 +
 +        static boolean isAllowed(String provName, String serviceType) {
 +            Set<String> allowedServiceTypes = ALLOW_LIST.get(provName);
-+            return allowedServiceTypes != null &&
-+                    (allowedServiceTypes == ANY_SERVICE_TYPE ||
-+                            allowedServiceTypes.contains(serviceType));
++            return allowedServiceTypes == null ||
++                    allowedServiceTypes.contains(serviceType);
 +        }
 +    }
 +    /* ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ FIPS PATCH ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
@@ -42,7 +37,7 @@ index de2845fb550..b1e416b90f4 100644
      /**
       * Add a service. If a service of the same type with the same algorithm
       * name exists, and it was added using {@link #putService putService()},
-@@ -1231,6 +1264,15 @@ protected void putService(Service s) {
+@@ -1231,6 +1259,15 @@ protected void putService(Service s) {
                      ("service.getProvider() must match this Provider object");
          }
          String type = s.getType();
diff --git a/SOURCES/java-25-openjdk-portable.specfile b/SOURCES/java-25-openjdk-portable.specfile
index 58faecf..66cb9cf 100644
--- a/SOURCES/java-25-openjdk-portable.specfile
+++ b/SOURCES/java-25-openjdk-portable.specfile
@@ -336,7 +336,7 @@
 # New Version-String scheme-style defines
 %global featurever 25
 %global interimver 0
-%global updatever 2
+%global updatever 3
 %global patchver 0
 # buildjdkver is usually same as %%{featurever},
 # but in time of bootstrap of next jdk, it is featurever-1,
@@ -376,7 +376,7 @@
 # Define IcedTea version used for SystemTap tapsets and desktop file
 %global icedteaver      6.0.0pre00-c848b93a8598
 # Define current Git revision for the FIPS support patches
-%global fipsver df044414ef4
+%global fipsver 57722aab802
 # Define JDK versions
 %global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
 %global javaver         %{featurever}
@@ -390,8 +390,8 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{vcstag}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver        10
-%global rpmrelease      2
+%global buildver        9
+%global rpmrelease      1
 #%%global tagsuffix     %%{nil}
 # 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
@@ -643,37 +643,9 @@ Source18: TestTranslations.java
 # as follows: git diff %%{vcstag} src make test > fips-25u-$(git show -s --format=%h HEAD).patch
 # Diff is limited to src and make subdirectories to exclude .github changes
 # Fixes currently included:
-# PR3183, RH1340845: Follow system wide crypto policy
-# PR3695: Allow use of system crypto policy to be disabled by the user
-# RH1655466: Support RHEL FIPS mode using SunPKCS11 provider
-# RH1818909: No ciphersuites availale for SSLSocket in FIPS mode
-# RH1860986: Disable TLSv1.3 with the NSS-FIPS provider until PKCS#11 v3.0 support is available
-# RH1915071: Always initialise JavaSecuritySystemConfiguratorAccess
-# RH1929465: Improve system FIPS detection
-# RH1995150: Disable non-FIPS crypto in SUN and SunEC security providers
-# RH1996182: Login to the NSS software token in FIPS mode
-# RH1991003: Allow plain key import unless com.redhat.fips.plainKeySupport is set to false
-# RH2021263: Resolve outstanding FIPS issues
-# RH2052819: Fix FIPS reliance on crypto policies
-# RH2052829: Detect NSS at Runtime for FIPS detection
-# RH2052070: Enable AlgorithmParameters and AlgorithmParameterGenerator services in FIPS mode
-# RH2023467: Enable FIPS keys export
-# RH2094027: SunEC runtime permission for FIPS
-# RH2036462: sun.security.pkcs11.wrapper.PKCS11.getInstance breakage
-# RH2090378: Revert to disabling system security properties and FIPS mode support together
-# RH2104724: Avoid import/export of DH private keys
-# RH2092507: P11Key.getEncoded does not work for DH keys in FIPS mode
-# Build the systemconf library on all platforms
-# RH2048582: Support PKCS#12 keystores [now part of JDK-8301553 upstream]
-# RH2020290: Support TLS 1.3 in FIPS mode
-# Add nss.fips.cfg support to OpenJDK tree
-# RH2117972: Extend the support for NSS DBs (PKCS11) in FIPS mode
-# Remove forgotten dead code from RH2020290 and RH2104724
-# OJ1357: Fix issue on FIPS with a SecurityManager in place
-# RH2134669: Add missing attributes when registering services in FIPS mode.
-# test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java: fixed jtreg main class
-# RH1940064: Enable XML Signature provider in FIPS mode
-# RH2173781: Avoid calling C_GetInfo() too early, before cryptoki is initialized [now part of JDK-8301553 upstream]
+# OPENJDK-2108: Internal __redhat_fips__ property
+# OPENJDK-2123: Algorithms lockdown
+# OPENJDK-4559: Red Hat Build of OpenJDK 25 should not restrict all the providers in FIPS
 Patch1001: fips-%{featurever}u-%{fipsver}.patch
 
 #############################################
@@ -689,9 +661,9 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch
 # OpenJDK patches which missed last update
 #
 #############################################
-# JDK-8372534: Update Libpng to 1.6.51
-# Integrated in 25.0.3
-Patch2001: jdk8372534-libpng-1.6.51.patch
+
+# JDK-8375294: (fs) Files.copy can fail with EOPNOTSUPP when copy_file_range not supported
+Patch2001: jdk8375294-handle-EOPNOTSUPP-in-copying.patch
 
 #############################################
 #
@@ -774,19 +746,19 @@ BuildRequires: libpng-devel
 BuildRequires: zlib-devel
 %else
 # Version in src/java.desktop/share/legal/freetype.md
-Provides: bundled(freetype) = 2.13.3
+Provides: bundled(freetype) = 2.14.2
 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
-Provides: bundled(giflib) = 5.2.2
+Provides: bundled(giflib) = 6.1.2
 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
-Provides: bundled(harfbuzz) = 10.4.0
+Provides: bundled(harfbuzz) = 12.3.2
 # Version in src/java.desktop/share/native/liblcms/lcms2.h
 Provides: bundled(lcms2) = 2.17.0
 # Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
 Provides: bundled(libjpeg) = 6b
 # Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
-Provides: bundled(libpng) = 1.6.51
+Provides: bundled(libpng) = 1.6.57
 # Version in src/java.base/share/native/libzip/zlib/zlib.h
-Provides: bundled(zlib) = 1.3.1
+Provides: bundled(zlib) = 1.3.2
 # We link statically against libstdc++ to increase portability
 %ifnarch %{devkit_arches}
 BuildRequires: libstdc++-static
@@ -1005,7 +977,7 @@ sh %{SOURCE12} %{top_level_dir_name}
 pushd %{top_level_dir_name}
 # Add crypto policy and FIPS support
 %patch -P1001 -p1
-# Add libpng update ahead of 25.0.3
+# Add EOPNOTSUPP patch
 %patch -P2001 -p1
 popd # openjdk
 
@@ -1974,9 +1946,40 @@ done
 %endif
 
 %changelog
-* Thu Apr 16 2026 eabdullin <eabdullin@almalinux.org> - 1:25.0.2.0.10-2
+* Wed Apr 22 2026 eabdullin <eabdullin@almalinux.org> - 1:25.0.3.0.9-1
 - Portable build
 
+* Sat Apr 18 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.3.0.9-1
+- Update to jdk-25.0.3+9 (GA)
+- Update release notes to 25.0.3+9
+- Update FIPS patch to 57722aab802 version synced with 25.0.3+8
+- Drop local libpng patches now JDK-8372534, JDK-8375063 & JDK-8377526 are included upstream
+- Drop local HarfBuzz patch now JDK-8375057 is included upstream
+- Bump freetype version to 2.14.2 following JDK-8373290 & JDK-8379158
+- Bump giflib version to 6.1.2 following JDK-8379256 & JDK-8380078
+- Bump libpng version to 1.6.57 following JDK-8380959 & JDK-8382047
+- Bump zlib version to 1.3.2 following JDK-8378631
+- Add JDK-8375294 EOPNOTSUPP patch ahead of 25.0.4
+- ** This tarball is embargoed until 2026-04-21 @ 1pm PT. **
+- Resolves: OPENJDK-4634
+- Resolves: OPENJDK-4656
+- Resolves: OPENJDK-4607
+- Resolves: OPENJDK-4675
+
+* Tue Mar 03 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.2.0.10-3
+- Update FIPS patch to e55ada9353e to include the fix for the too restrictive provider lockdown
+- Fix FIPS issue list to represent the new 25u version
+- Add JDK-8375063 libpng 1.6.54 ahead of 25.0.3
+- Add JDK-8375057 harfbuzz 12.3.2 ahead of 25.0.3
+- Add JDK-8377526 libpng 1.6.55 ahead of 25.0.3
+- Bump libpng version to 1.6.55 following JDK-8375063 & JDK-8377526
+- Bump harfbuzz version to 12.3.2 following JDK-8375057
+- Resolves: OPENJDK-4570
+- Resolves: OPENJDK-4304
+- Resolves: OPENJDK-4524
+- Resolves: OPENJDK-4544
+- Resolves: OPENJDK-4553
+
 * Mon Jan 12 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.2.0.10-2
 - Add JDK-8372534 libpng 1.6.51 ahead of 25.0.3
 - Bump libpng version to 1.6.51 following JDK-8372534
diff --git a/SOURCES/jdk8372534-libpng-1.6.51.patch b/SOURCES/jdk8372534-libpng-1.6.51.patch
deleted file mode 100644
index 20cecc0..0000000
--- a/SOURCES/jdk8372534-libpng-1.6.51.patch
+++ /dev/null
@@ -1,1598 +0,0 @@
-commit cb7fb728d4805ed4e9d62ce31cee7c948f3d5746
-Author: Andrew John Hughes <andrew@openjdk.org>
-Date:   Wed Dec 17 13:51:51 2025 +0000
-
-    8372534: Update Libpng to 1.6.51
-    
-    Backport-of: c7a489db9e4a7d696623fc2155a5504d9d2adb0d
-
-diff --git a/make/modules/java.desktop/lib/ClientLibraries.gmk b/make/modules/java.desktop/lib/ClientLibraries.gmk
-index a69b65180d7..5cb7501b6f4 100644
---- a/make/modules/java.desktop/lib/ClientLibraries.gmk
-+++ b/make/modules/java.desktop/lib/ClientLibraries.gmk
-@@ -236,7 +236,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
-       DISABLED_WARNINGS_gcc_dgif_lib.c := sign-compare, \
-       DISABLED_WARNINGS_gcc_jcmaster.c := implicit-fallthrough, \
-       DISABLED_WARNINGS_gcc_jdphuff.c := shift-negative-value, \
--      DISABLED_WARNINGS_gcc_png.c := maybe-uninitialized unused-function, \
-+      DISABLED_WARNINGS_gcc_png.c := maybe-uninitialized, \
-       DISABLED_WARNINGS_gcc_pngerror.c := maybe-uninitialized, \
-       DISABLED_WARNINGS_gcc_splashscreen_gfx_impl.c := implicit-fallthrough \
-           maybe-uninitialized, \
-@@ -247,7 +247,6 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
-       DISABLED_WARNINGS_clang := deprecated-non-prototype, \
-       DISABLED_WARNINGS_clang_dgif_lib.c := sign-compare, \
-       DISABLED_WARNINGS_clang_gzwrite.c := format-nonliteral, \
--      DISABLED_WARNINGS_clang_png.c := unused-function, \
-       DISABLED_WARNINGS_clang_splashscreen_impl.c := sign-compare \
-           unused-but-set-variable unused-function, \
-       DISABLED_WARNINGS_clang_splashscreen_png.c := \
-diff --git a/src/java.desktop/share/legal/libpng.md b/src/java.desktop/share/legal/libpng.md
-index d43ccf2e8e4..8899491c6c0 100644
---- a/src/java.desktop/share/legal/libpng.md
-+++ b/src/java.desktop/share/legal/libpng.md
-@@ -1,4 +1,4 @@
--## libpng v1.6.47
-+## libpng v1.6.51
- 
- ### libpng License
- <pre>
-@@ -9,7 +9,7 @@ ### libpng License
- PNG Reference Library License version 2
- ---------------------------------------
- 
--Copyright (c) 1995-2025 The PNG Reference Library Authors.
-+Copyright (C) 1995-2025 The PNG Reference Library Authors.
- Copyright (C) 2018-2025 Cosmin Truta
- Copyright (C) 1998-2018 Glenn Randers-Pehrson
- Copyright (C) 1996-1997 Andreas Dilger
-@@ -173,6 +173,7 @@ ### AUTHORS File Information
-  * Lucas Chollet
-  * Magnus Holmgren
-  * Mandar Sahastrabuddhe
-+ * Manfred Schlaegl
-  * Mans Rullgard
-  * Matt Sarett
-  * Mike Klein
-@@ -184,6 +185,7 @@ ### AUTHORS File Information
-  * Samuel Williams
-  * Simon-Pierre Cadieux
-  * Tim Wegner
-+ * Tobias Stoeckmann
-  * Tom Lane
-  * Tom Tanner
-  * Vadim Barkov
-@@ -193,8 +195,9 @@ ### AUTHORS File Information
-     - Zixu Wang (王子旭)
-  * Arm Holdings
-     - Richard Townsend
-- * Google Inc.
-+ * Google LLC
-     - Dan Field
-+    - Dragoș Tiselice
-     - Leon Scroggins III
-     - Matt Sarett
-     - Mike Klein
-@@ -204,6 +207,8 @@ ### AUTHORS File Information
-     - GuXiWei (顾希伟)
-     - JinBo (金波)
-     - ZhangLixia (张利霞)
-+ * Samsung Group
-+    - Filip Wasil
- 
- The build projects, the build scripts, the test scripts, and other
- files in the "projects", "scripts" and "tests" directories, have
-@@ -214,3 +219,4 @@ ### AUTHORS File Information
- other copyright owners, and are released under other open source
- licenses.
- ```
-+
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES b/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
-index 834b5e19277..2478fd0fc08 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
-@@ -6251,6 +6251,59 @@ Version 1.6.47 [February 18, 2025]
-     colorspace precedence rules, due to pre-existing colorspace checks.
-     (Reported by Bob Friesenhahn; fixed by John Bowler)
- 
-+Version 1.6.48 [April 30, 2025]
-+  Fixed the floating-point version of the mDCv setter `png_set_mDCv`.
-+    (Reported by Mohit Bakshi; fixed by John Bowler)
-+  Added #error directives to discourage the inclusion of private
-+    libpng implementation header files in PNG-supporting applications.
-+  Added the CMake build option `PNG_LIBCONF_HEADER`, to be used as an
-+    alternative to `DFA_XTRA`.
-+  Removed the Travis CI configuration files, with heartfelt thanks for
-+    their generous support of our project over the past five years!
-+
-+Version 1.6.49 [June 12, 2025]
-+  Added SIMD-optimized code for the RISC-V Vector Extension (RVV).
-+    (Contributed by Manfred Schlaegl, Dragos Tiselice and Filip Wasil)
-+  Added various fixes and improvements to the build scripts and to
-+    the sample code.
-+
-+Version 1.6.50 [July 1, 2025]
-+  Improved the detection of the RVV Extension on the RISC-V platform.
-+    (Contributed by Filip Wasil)
-+  Replaced inline ASM with C intrinsics in the RVV code.
-+    (Contributed by Filip Wasil)
-+  Fixed a decoder defect in which unknown chunks trailing IDAT, set
-+    to go through the unknown chunk handler, incorrectly triggered
-+    out-of-place IEND errors.
-+    (Contributed by John Bowler)
-+  Fixed the CMake file for cross-platform builds that require `libm`.
-+
-+Version 1.6.51 [November 21, 2025]
-+  Fixed CVE-2025-64505 (moderate severity):
-+    Heap buffer overflow in `png_do_quantize` via malformed palette index.
-+    (Reported by Samsung; analyzed by Fabio Gritti.)
-+  Fixed CVE-2025-64506 (moderate severity):
-+    Heap buffer over-read in `png_write_image_8bit` with 8-bit input and
-+    `convert_to_8bit` enabled.
-+    (Reported by Samsung and <weijinjinnihao@users.noreply.github.com>;
-+    analyzed by Fabio Gritti.)
-+  Fixed CVE-2025-64720 (high severity):
-+    Buffer overflow in `png_image_read_composite` via incorrect palette
-+    premultiplication.
-+    (Reported by Samsung; analyzed by John Bowler.)
-+  Fixed CVE-2025-65018 (high severity):
-+    Heap buffer overflow in `png_combine_row` triggered via
-+    `png_image_finish_read`.
-+    (Reported by <yosiimich@users.noreply.github.com>.)
-+  Fixed a memory leak in `png_set_quantize`.
-+    (Reported by Samsung; analyzed by Fabio Gritti.)
-+  Removed the experimental and incomplete ERROR_NUMBERS code.
-+    (Contributed by Tobias Stoeckmann.)
-+  Improved the RISC-V vector extension support; required RVV 1.0 or newer.
-+    (Contributed by Filip Wasil.)
-+  Added GitHub Actions workflows for automated testing.
-+  Performed various refactorings and cleanups.
-+
- Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
- Subscription is required; visit
- https://lists.sourceforge.net/lists/listinfo/png-mng-implement
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/README b/src/java.desktop/share/native/libsplashscreen/libpng/README
-index 57952fb215a..5ea329ee3da 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/README
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/README
-@@ -1,4 +1,4 @@
--README for libpng version 1.6.47
-+README for libpng version 1.6.51
- ================================
- 
- See the note about version numbers near the top of `png.h`.
-@@ -147,6 +147,7 @@ Files included in this distribution
-     loongarch/    =>  Optimized code for LoongArch LSX
-     mips/         =>  Optimized code for MIPS MSA and MIPS MMI
-     powerpc/      =>  Optimized code for PowerPC VSX
-+    riscv/        =>  Optimized code for the RISC-V platform
-     ci/           =>  Scripts for continuous integration
-     contrib/      =>  External contributions
-         arm-neon/     =>  Optimized code for the ARM-NEON platform
-@@ -162,6 +163,7 @@ Files included in this distribution
-                           programs demonstrating the use of pngusr.dfa
-         pngminus/     =>  Simple pnm2png and png2pnm programs
-         pngsuite/     =>  Test images
-+        riscv-rvv/    =>  Optimized code for the RISC-V Vector platform
-         testpngs/     =>  Test images
-         tools/        =>  Various tools
-         visupng/      =>  VisualPng, a Windows viewer for PNG images
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/png.c b/src/java.desktop/share/native/libsplashscreen/libpng/png.c
-index 7b6de2f8ec3..7d85e7c8d5f 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/png.c
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/png.c
-@@ -42,7 +42,7 @@
- #include "pngpriv.h"
- 
- /* Generate a compiler error if there is an old png.h in the search path. */
--typedef png_libpng_version_1_6_47 Your_png_h_is_not_version_1_6_47;
-+typedef png_libpng_version_1_6_51 Your_png_h_is_not_version_1_6_51;
- 
- /* Sanity check the chunks definitions - PNG_KNOWN_CHUNKS from pngpriv.h and the
-  * corresponding macro definitions.  This causes a compile time failure if
-@@ -137,10 +137,16 @@ png_zalloc,(voidpf png_ptr, uInt items, uInt size),PNG_ALLOCATED)
-    if (png_ptr == NULL)
-       return NULL;
- 
--   if (items >= (~(png_alloc_size_t)0)/size)
-+   /* This check against overflow is vestigial, dating back from
-+    * the old times when png_zalloc used to be an exported function.
-+    * We're still keeping it here for now, as an extra-cautious
-+    * prevention against programming errors inside zlib, although it
-+    * should rather be a debug-time assertion instead.
-+    */
-+   if (size != 0 && items >= (~(png_alloc_size_t)0) / size)
-    {
--      png_warning (png_voidcast(png_structrp, png_ptr),
--          "Potential overflow in png_zalloc()");
-+      png_warning(png_voidcast(png_structrp, png_ptr),
-+                  "Potential overflow in png_zalloc()");
-       return NULL;
-    }
- 
-@@ -267,10 +273,6 @@ png_user_version_check(png_structrp png_ptr, png_const_charp user_png_ver)
-       png_warning(png_ptr, m);
- #endif
- 
--#ifdef PNG_ERROR_NUMBERS_SUPPORTED
--      png_ptr->flags = 0;
--#endif
--
-       return 0;
-    }
- 
-@@ -729,7 +731,7 @@ png_get_io_ptr(png_const_structrp png_ptr)
-  * function of your own because "FILE *" isn't necessarily available.
-  */
- void PNGAPI
--png_init_io(png_structrp png_ptr, png_FILE_p fp)
-+png_init_io(png_structrp png_ptr, FILE *fp)
- {
-    png_debug(1, "in png_init_io");
- 
-@@ -844,7 +846,7 @@ png_get_copyright(png_const_structrp png_ptr)
-    return PNG_STRING_COPYRIGHT
- #else
-    return PNG_STRING_NEWLINE \
--      "libpng version 1.6.47" PNG_STRING_NEWLINE \
-+      "libpng version 1.6.51" PNG_STRING_NEWLINE \
-       "Copyright (c) 2018-2025 Cosmin Truta" PNG_STRING_NEWLINE \
-       "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
-       PNG_STRING_NEWLINE \
-@@ -1520,7 +1522,7 @@ png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
- }
- #endif /* COLORSPACE */
- 
--#ifdef PNG_iCCP_SUPPORTED
-+#ifdef PNG_READ_iCCP_SUPPORTED
- /* Error message generation */
- static char
- png_icc_tag_char(png_uint_32 byte)
-@@ -1596,9 +1598,7 @@ png_icc_profile_error(png_const_structrp png_ptr, png_const_charp name,
- 
-    return 0;
- }
--#endif /* iCCP */
- 
--#ifdef PNG_READ_iCCP_SUPPORTED
- /* Encoded value of D50 as an ICC XYZNumber.  From the ICC 2010 spec the value
-  * is XYZ(0.9642,1.0,0.8249), which scales to:
-  *
-@@ -3998,7 +3998,7 @@ png_image_free_function(png_voidp argument)
- #  ifdef PNG_STDIO_SUPPORTED
-       if (cp->owned_file != 0)
-       {
--         FILE *fp = png_voidcast(FILE*, cp->png_ptr->io_ptr);
-+         FILE *fp = png_voidcast(FILE *, cp->png_ptr->io_ptr);
-          cp->owned_file = 0;
- 
-          /* Ignore errors here. */
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/png.h b/src/java.desktop/share/native/libsplashscreen/libpng/png.h
-index ede12c34fe6..d39ff73552c 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/png.h
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/png.h
-@@ -29,7 +29,7 @@
-  * However, the following notice accompanied the original version of this
-  * file and, per its terms, should not be removed:
-  *
-- * libpng version 1.6.47
-+ * libpng version 1.6.51
-  *
-  * Copyright (c) 2018-2025 Cosmin Truta
-  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
-@@ -43,7 +43,7 @@
-  *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
-  *   libpng versions 0.97, January 1998, through 1.6.35, July 2018:
-  *     Glenn Randers-Pehrson
-- *   libpng versions 1.6.36, December 2018, through 1.6.47, February 2025:
-+ *   libpng versions 1.6.36, December 2018, through 1.6.51, November 2025:
-  *     Cosmin Truta
-  *   See also "Contributing Authors", below.
-  */
-@@ -267,7 +267,7 @@
-  *    ...
-  *    1.5.30                  15    10530  15.so.15.30[.0]
-  *    ...
-- *    1.6.47                  16    10647  16.so.16.47[.0]
-+ *    1.6.51                  16    10651  16.so.16.51[.0]
-  *
-  *    Henceforth the source version will match the shared-library major and
-  *    minor numbers; the shared-library major version number will be used for
-@@ -303,7 +303,7 @@
-  */
- 
- /* Version information for png.h - this should match the version in png.c */
--#define PNG_LIBPNG_VER_STRING "1.6.47"
-+#define PNG_LIBPNG_VER_STRING "1.6.51"
- #define PNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n"
- 
- /* The versions of shared library builds should stay in sync, going forward */
-@@ -314,7 +314,7 @@
- /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
- #define PNG_LIBPNG_VER_MAJOR   1
- #define PNG_LIBPNG_VER_MINOR   6
--#define PNG_LIBPNG_VER_RELEASE 47
-+#define PNG_LIBPNG_VER_RELEASE 51
- 
- /* This should be zero for a public release, or non-zero for a
-  * development version.
-@@ -345,7 +345,7 @@
-  * From version 1.0.1 it is:
-  * XXYYZZ, where XX=major, YY=minor, ZZ=release
-  */
--#define PNG_LIBPNG_VER 10647 /* 1.6.47 */
-+#define PNG_LIBPNG_VER 10651 /* 1.6.51 */
- 
- /* Library configuration: these options cannot be changed after
-  * the library has been built.
-@@ -455,7 +455,7 @@ extern "C" {
- /* This triggers a compiler error in png.c, if png.c and png.h
-  * do not agree upon the version number.
-  */
--typedef char* png_libpng_version_1_6_47;
-+typedef char* png_libpng_version_1_6_51;
- 
- /* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
-  *
-@@ -1599,7 +1599,7 @@ PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr,
- 
- #ifdef PNG_STDIO_SUPPORTED
- /* Initialize the input/output for the PNG file to the default functions. */
--PNG_EXPORT(74, void, png_init_io, (png_structrp png_ptr, png_FILE_p fp));
-+PNG_EXPORT(74, void, png_init_io, (png_structrp png_ptr, FILE *fp));
- #endif
- 
- /* Replace the (error and abort), and warning functions with user
-@@ -3117,7 +3117,7 @@ PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image,
-     */
- 
- PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image,
--   FILE* file));
-+   FILE *file));
-    /* The PNG header is read from the stdio FILE object. */
- #endif /* STDIO */
- 
-@@ -3192,7 +3192,7 @@ PNG_EXPORT(239, int, png_image_write_to_file, (png_imagep image,
- PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
-    int convert_to_8_bit, const void *buffer, png_int_32 row_stride,
-    const void *colormap));
--   /* Write the image to the given (FILE*). */
-+   /* Write the image to the given FILE object. */
- #endif /* SIMPLIFIED_WRITE_STDIO */
- 
- /* With all write APIs if image is in one of the linear formats with 16-bit
-@@ -3332,26 +3332,45 @@ PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,
-  *           selected at run time.
-  */
- #ifdef PNG_SET_OPTION_SUPPORTED
-+
-+/* HARDWARE: ARM Neon SIMD instructions supported */
- #ifdef PNG_ARM_NEON_API_SUPPORTED
--#  define PNG_ARM_NEON   0 /* HARDWARE: ARM Neon SIMD instructions supported */
-+#  define PNG_ARM_NEON 0
- #endif
--#define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */
--#define PNG_SKIP_sRGB_CHECK_PROFILE 4 /* SOFTWARE: Check ICC profile for sRGB */
-+
-+/* SOFTWARE: Force maximum window */
-+#define PNG_MAXIMUM_INFLATE_WINDOW 2
-+
-+/* SOFTWARE: Check ICC profile for sRGB */
-+#define PNG_SKIP_sRGB_CHECK_PROFILE 4
-+
-+/* HARDWARE: MIPS MSA SIMD instructions supported */
- #ifdef PNG_MIPS_MSA_API_SUPPORTED
--#  define PNG_MIPS_MSA   6 /* HARDWARE: MIPS Msa SIMD instructions supported */
-+#  define PNG_MIPS_MSA 6
- #endif
-+
-+/* SOFTWARE: Disable Adler32 check on IDAT */
- #ifdef PNG_DISABLE_ADLER32_CHECK_SUPPORTED
--#  define PNG_IGNORE_ADLER32 8 /* SOFTWARE: disable Adler32 check on IDAT */
-+#  define PNG_IGNORE_ADLER32 8
- #endif
-+
-+/* HARDWARE: PowerPC VSX SIMD instructions supported */
- #ifdef PNG_POWERPC_VSX_API_SUPPORTED
--#  define PNG_POWERPC_VSX   10 /* HARDWARE: PowerPC VSX SIMD instructions
--                                * supported */
-+#  define PNG_POWERPC_VSX 10
- #endif
-+
-+/* HARDWARE: MIPS MMI SIMD instructions supported */
- #ifdef PNG_MIPS_MMI_API_SUPPORTED
--#  define PNG_MIPS_MMI   12 /* HARDWARE: MIPS MMI SIMD instructions supported */
-+#  define PNG_MIPS_MMI 12
-+#endif
-+
-+/* HARDWARE: RISC-V RVV SIMD instructions supported */
-+#ifdef PNG_RISCV_RVV_API_SUPPORTED
-+#  define PNG_RISCV_RVV 14
- #endif
- 
--#define PNG_OPTION_NEXT  14 /* Next option - numbers must be even */
-+/* Next option - numbers must be even */
-+#define PNG_OPTION_NEXT 16
- 
- /* Return values: NOTE: there are four values and 'off' is *not* zero */
- #define PNG_OPTION_UNSET   0 /* Unset - defaults to off */
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
-index 70bca6fa1c9..4bc5f7bb468 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
-@@ -29,7 +29,7 @@
-  * However, the following notice accompanied the original version of this
-  * file and, per its terms, should not be removed:
-  *
-- * libpng version 1.6.47
-+ * libpng version 1.6.51
-  *
-  * Copyright (c) 2018-2025 Cosmin Truta
-  * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
-@@ -248,25 +248,13 @@
-   /* NOTE: PNGCBAPI always defaults to PNGCAPI. */
- 
- #  if defined(PNGAPI) && !defined(PNG_USER_PRIVATEBUILD)
--#     error "PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed"
-+#     error PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed
- #  endif
- 
--#  if (defined(_MSC_VER) && _MSC_VER < 800) ||\
--      (defined(__BORLANDC__) && __BORLANDC__ < 0x500)
--   /* older Borland and MSC
--    * compilers used '__export' and required this to be after
--    * the type.
--    */
--#    ifndef PNG_EXPORT_TYPE
--#      define PNG_EXPORT_TYPE(type) type PNG_IMPEXP
--#    endif
--#    define PNG_DLL_EXPORT __export
--#  else /* newer compiler */
--#    define PNG_DLL_EXPORT __declspec(dllexport)
--#    ifndef PNG_DLL_IMPORT
--#      define PNG_DLL_IMPORT __declspec(dllimport)
--#    endif
--#  endif /* compiler */
-+#  define PNG_DLL_EXPORT __declspec(dllexport)
-+#  ifndef PNG_DLL_IMPORT
-+#    define PNG_DLL_IMPORT __declspec(dllimport)
-+#  endif
- 
- #else /* !Windows */
- #  if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
-@@ -508,7 +496,7 @@
- #if CHAR_BIT == 8 && UCHAR_MAX == 255
-    typedef unsigned char png_byte;
- #else
--#  error "libpng requires 8-bit bytes"
-+#  error libpng requires 8-bit bytes
- #endif
- 
- #if INT_MIN == -32768 && INT_MAX == 32767
-@@ -516,7 +504,7 @@
- #elif SHRT_MIN == -32768 && SHRT_MAX == 32767
-    typedef short png_int_16;
- #else
--#  error "libpng requires a signed 16-bit type"
-+#  error libpng requires a signed 16-bit integer type
- #endif
- 
- #if UINT_MAX == 65535
-@@ -524,7 +512,7 @@
- #elif USHRT_MAX == 65535
-    typedef unsigned short png_uint_16;
- #else
--#  error "libpng requires an unsigned 16-bit type"
-+#  error libpng requires an unsigned 16-bit integer type
- #endif
- 
- #if INT_MIN < -2147483646 && INT_MAX > 2147483646
-@@ -532,7 +520,7 @@
- #elif LONG_MIN < -2147483646 && LONG_MAX > 2147483646
-    typedef long int png_int_32;
- #else
--#  error "libpng requires a signed 32-bit (or more) type"
-+#  error libpng requires a signed 32-bit (or longer) integer type
- #endif
- 
- #if UINT_MAX > 4294967294U
-@@ -540,7 +528,7 @@
- #elif ULONG_MAX > 4294967294U
-    typedef unsigned long int png_uint_32;
- #else
--#  error "libpng requires an unsigned 32-bit (or more) type"
-+#  error libpng requires an unsigned 32-bit (or longer) integer type
- #endif
- 
- /* Prior to 1.6.0, it was possible to disable the use of size_t and ptrdiff_t.
-@@ -621,10 +609,6 @@ typedef const png_fixed_point * png_const_fixed_point_p;
- typedef size_t                * png_size_tp;
- typedef const size_t          * png_const_size_tp;
- 
--#ifdef PNG_STDIO_SUPPORTED
--typedef FILE            * png_FILE_p;
--#endif
--
- #ifdef PNG_FLOATING_POINT_SUPPORTED
- typedef double       * png_doublep;
- typedef const double * png_const_doublep;
-@@ -646,6 +630,15 @@ typedef double          * * png_doublepp;
- /* Pointers to pointers to pointers; i.e., pointer to array */
- typedef char            * * * png_charppp;
- 
-+#ifdef PNG_STDIO_SUPPORTED
-+/* With PNG_STDIO_SUPPORTED it was possible to use I/O streams that were
-+ * not necessarily stdio FILE streams, to allow building Windows applications
-+ * before Win32 and Windows CE applications before WinCE 3.0, but that kind
-+ * of support has long been discontinued.
-+ */
-+typedef FILE            * png_FILE_p; /* [Deprecated] */
-+#endif
-+
- #endif /* PNG_BUILDING_SYMBOL_TABLE */
- 
- #endif /* PNGCONF_H */
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngdebug.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngdebug.h
-index 8eb5400ea9a..6ea2644dfcd 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngdebug.h
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngdebug.h
-@@ -22,14 +22,14 @@
-  * questions.
-  */
- 
--/* pngdebug.h - Debugging macros for libpng, also used in pngtest.c
-+/* pngdebug.h - internal debugging macros for libpng
-  *
-  * This file is available under and governed by the GNU General Public
-  * License version 2 only, as published by the Free Software Foundation.
-  * However, the following notice accompanied the original version of this
-  * file and, per its terms, should not be removed:
-  *
-- * Copyright (c) 2018 Cosmin Truta
-+ * Copyright (c) 2018-2025 Cosmin Truta
-  * Copyright (c) 1998-2002,2004,2006-2013 Glenn Randers-Pehrson
-  * Copyright (c) 1996-1997 Andreas Dilger
-  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-@@ -39,6 +39,10 @@
-  * and license in png.h
-  */
- 
-+#ifndef PNGPRIV_H
-+#  error This file must not be included by applications; please include <png.h>
-+#endif
-+
- /* Define PNG_DEBUG at compile time for debugging information.  Higher
-  * numbers for PNG_DEBUG mean more debugging information.  This has
-  * only been added since version 0.95 so it is not implemented throughout
-@@ -63,9 +67,6 @@
- #define PNGDEBUG_H
- /* These settings control the formatting of messages in png.c and pngerror.c */
- /* Moved to pngdebug.h at 1.5.0 */
--#  ifndef PNG_LITERAL_SHARP
--#    define PNG_LITERAL_SHARP 0x23
--#  endif
- #  ifndef PNG_LITERAL_LEFT_SQUARE_BRACKET
- #    define PNG_LITERAL_LEFT_SQUARE_BRACKET 0x5b
- #  endif
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
-index ea0103331d3..44c86ebfef9 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
-@@ -29,7 +29,7 @@
-  * However, the following notice accompanied the original version of this
-  * file and, per its terms, should not be removed:
-  *
-- * Copyright (c) 2018-2024 Cosmin Truta
-+ * Copyright (c) 2018-2025 Cosmin Truta
-  * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
-  * Copyright (c) 1996-1997 Andreas Dilger
-  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-@@ -68,46 +68,6 @@ PNG_FUNCTION(void,PNGAPI
- png_error,(png_const_structrp png_ptr, png_const_charp error_message),
-     PNG_NORETURN)
- {
--#ifdef PNG_ERROR_NUMBERS_SUPPORTED
--   char msg[16];
--   if (png_ptr != NULL)
--   {
--      if ((png_ptr->flags &
--         (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0)
--      {
--         if (*error_message == PNG_LITERAL_SHARP)
--         {
--            /* Strip "#nnnn " from beginning of error message. */
--            int offset;
--            for (offset = 1; offset<15; offset++)
--               if (error_message[offset] == ' ')
--                  break;
--
--            if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)
--            {
--               int i;
--               for (i = 0; i < offset - 1; i++)
--                  msg[i] = error_message[i + 1];
--               msg[i - 1] = '\0';
--               error_message = msg;
--            }
--
--            else
--               error_message += offset;
--         }
--
--         else
--         {
--            if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)
--            {
--               msg[0] = '0';
--               msg[1] = '\0';
--               error_message = msg;
--            }
--         }
--      }
--   }
--#endif
-    if (png_ptr != NULL && png_ptr->error_fn != NULL)
-       (*(png_ptr->error_fn))(png_constcast(png_structrp,png_ptr),
-           error_message);
-@@ -245,21 +205,6 @@ void PNGAPI
- png_warning(png_const_structrp png_ptr, png_const_charp warning_message)
- {
-    int offset = 0;
--   if (png_ptr != NULL)
--   {
--#ifdef PNG_ERROR_NUMBERS_SUPPORTED
--   if ((png_ptr->flags &
--       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0)
--#endif
--      {
--         if (*warning_message == PNG_LITERAL_SHARP)
--         {
--            for (offset = 1; offset < 15; offset++)
--               if (warning_message[offset] == ' ')
--                  break;
--         }
--      }
--   }
-    if (png_ptr != NULL && png_ptr->warning_fn != NULL)
-       (*(png_ptr->warning_fn))(png_constcast(png_structrp,png_ptr),
-           warning_message + offset);
-@@ -741,42 +686,9 @@ png_default_error,(png_const_structrp png_ptr, png_const_charp error_message),
-     PNG_NORETURN)
- {
- #ifdef PNG_CONSOLE_IO_SUPPORTED
--#ifdef PNG_ERROR_NUMBERS_SUPPORTED
--   /* Check on NULL only added in 1.5.4 */
--   if (error_message != NULL && *error_message == PNG_LITERAL_SHARP)
--   {
--      /* Strip "#nnnn " from beginning of error message. */
--      int offset;
--      char error_number[16];
--      for (offset = 0; offset<15; offset++)
--      {
--         error_number[offset] = error_message[offset + 1];
--         if (error_message[offset] == ' ')
--            break;
--      }
--
--      if ((offset > 1) && (offset < 15))
--      {
--         error_number[offset - 1] = '\0';
--         fprintf(stderr, "libpng error no. %s: %s",
--             error_number, error_message + offset + 1);
--         fprintf(stderr, PNG_STRING_NEWLINE);
--      }
--
--      else
--      {
--         fprintf(stderr, "libpng error: %s, offset=%d",
--             error_message, offset);
--         fprintf(stderr, PNG_STRING_NEWLINE);
--      }
--   }
--   else
--#endif
--   {
--      fprintf(stderr, "libpng error: %s", error_message ? error_message :
--         "undefined");
--      fprintf(stderr, PNG_STRING_NEWLINE);
--   }
-+   fprintf(stderr, "libpng error: %s", error_message ? error_message :
-+      "undefined");
-+   fprintf(stderr, PNG_STRING_NEWLINE);
- #else
-    PNG_UNUSED(error_message) /* Make compiler happy */
- #endif
-@@ -814,40 +726,8 @@ static void /* PRIVATE */
- png_default_warning(png_const_structrp png_ptr, png_const_charp warning_message)
- {
- #ifdef PNG_CONSOLE_IO_SUPPORTED
--#  ifdef PNG_ERROR_NUMBERS_SUPPORTED
--   if (*warning_message == PNG_LITERAL_SHARP)
--   {
--      int offset;
--      char warning_number[16];
--      for (offset = 0; offset < 15; offset++)
--      {
--         warning_number[offset] = warning_message[offset + 1];
--         if (warning_message[offset] == ' ')
--            break;
--      }
--
--      if ((offset > 1) && (offset < 15))
--      {
--         warning_number[offset + 1] = '\0';
--         fprintf(stderr, "libpng warning no. %s: %s",
--             warning_number, warning_message + offset);
--         fprintf(stderr, PNG_STRING_NEWLINE);
--      }
--
--      else
--      {
--         fprintf(stderr, "libpng warning: %s",
--             warning_message);
--         fprintf(stderr, PNG_STRING_NEWLINE);
--      }
--   }
--   else
--#  endif
--
--   {
--      fprintf(stderr, "libpng warning: %s", warning_message);
--      fprintf(stderr, PNG_STRING_NEWLINE);
--   }
-+   fprintf(stderr, "libpng warning: %s", warning_message);
-+   fprintf(stderr, PNG_STRING_NEWLINE);
- #else
-    PNG_UNUSED(warning_message) /* Make compiler happy */
- #endif
-@@ -895,12 +775,8 @@ png_get_error_ptr(png_const_structrp png_ptr)
- void PNGAPI
- png_set_strip_error_numbers(png_structrp png_ptr, png_uint_32 strip_mode)
- {
--   if (png_ptr != NULL)
--   {
--      png_ptr->flags &=
--         ((~(PNG_FLAG_STRIP_ERROR_NUMBERS |
--         PNG_FLAG_STRIP_ERROR_TEXT))&strip_mode);
--   }
-+   PNG_UNUSED(png_ptr)
-+   PNG_UNUSED(strip_mode)
- }
- #endif
- 
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
-index d67adbae247..ed2e7f886f5 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
-@@ -29,7 +29,7 @@
-  * However, the following notice accompanied the original version of this
-  * file and, per its terms, should not be removed:
-  *
-- * Copyright (c) 2018-2024 Cosmin Truta
-+ * Copyright (c) 2018-2025 Cosmin Truta
-  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
-  * Copyright (c) 1996-1997 Andreas Dilger
-  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h b/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h
-index bc6ed3d09c9..c79c6cc780f 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h
-@@ -22,14 +22,14 @@
-  * questions.
-  */
- 
--/* pnginfo.h - header file for PNG reference library
-+/* pnginfo.h - internal structures for libpng
-  *
-  * This file is available under and governed by the GNU General Public
-  * License version 2 only, as published by the Free Software Foundation.
-  * However, the following notice accompanied the original version of this
-  * file and, per its terms, should not be removed:
-  *
-- * Copyright (c) 2018 Cosmin Truta
-+ * Copyright (c) 2018-2025 Cosmin Truta
-  * Copyright (c) 1998-2002,2004,2006-2013,2018 Glenn Randers-Pehrson
-  * Copyright (c) 1996-1997 Andreas Dilger
-  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-@@ -39,43 +39,20 @@
-  * and license in png.h
-  */
- 
-- /* png_info is a structure that holds the information in a PNG file so
-- * that the application can find out the characteristics of the image.
-- * If you are reading the file, this structure will tell you what is
-- * in the PNG file.  If you are writing the file, fill in the information
-- * you want to put into the PNG file, using png_set_*() functions, then
-- * call png_write_info().
-- *
-- * The names chosen should be very close to the PNG specification, so
-- * consult that document for information about the meaning of each field.
-- *
-- * With libpng < 0.95, it was only possible to directly set and read the
-- * the values in the png_info_struct, which meant that the contents and
-- * order of the values had to remain fixed.  With libpng 0.95 and later,
-- * however, there are now functions that abstract the contents of
-- * png_info_struct from the application, so this makes it easier to use
-- * libpng with dynamic libraries, and even makes it possible to use
-- * libraries that don't have all of the libpng ancillary chunk-handing
-- * functionality.  In libpng-1.5.0 this was moved into a separate private
-- * file that is not visible to applications.
-+#ifndef PNGPRIV_H
-+#  error This file must not be included by applications; please include <png.h>
-+#endif
-+
-+/* INTERNAL, PRIVATE definition of a PNG.
-  *
-- * The following members may have allocated storage attached that should be
-- * cleaned up before the structure is discarded: palette, trans, text,
-- * pcal_purpose, pcal_units, pcal_params, hist, iccp_name, iccp_profile,
-- * splt_palettes, scal_unit, row_pointers, and unknowns.   By default, these
-- * are automatically freed when the info structure is deallocated, if they were
-- * allocated internally by libpng.  This behavior can be changed by means
-- * of the png_data_freer() function.
-+ * png_info is a modifiable description of a PNG datastream.  The fields inside
-+ * this structure are accessed through png_get_<CHUNK>() functions and modified
-+ * using png_set_<CHUNK>() functions.
-  *
-- * More allocation details: all the chunk-reading functions that
-- * change these members go through the corresponding png_set_*
-- * functions.  A function to clear these members is available: see
-- * png_free_data().  The png_set_* functions do not depend on being
-- * able to point info structure members to any of the storage they are
-- * passed (they make their own copies), EXCEPT that the png_set_text
-- * functions use the same storage passed to them in the text_ptr or
-- * itxt_ptr structure argument, and the png_set_rows and png_set_unknowns
-- * functions do not make their own copies.
-+ * Some functions in libpng do directly access members of png_info.  However,
-+ * this should be avoided.  png_struct objects contain members which hold
-+ * caches, sometimes optimised, of the values from png_info objects, and
-+ * png_info is not passed to the functions which read and write image data.
-  */
- #ifndef PNGINFO_H
- #define PNGINFO_H
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h b/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
-index 906f855db0e..4cfae474751 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
-@@ -31,7 +31,7 @@
-  * However, the following notice accompanied the original version of this
-  * file and, per its terms, should not be removed:
-  */
--/* libpng version 1.6.47 */
-+/* libpng version 1.6.51 */
- 
- /* Copyright (c) 2018-2025 Cosmin Truta */
- /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c
-index ba9eb4df402..12b71bcbc02 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c
-@@ -29,7 +29,7 @@
-  * However, the following notice accompanied the original version of this
-  * file and, per its terms, should not be removed:
-  *
-- * Copyright (c) 2018 Cosmin Truta
-+ * Copyright (c) 2018-2025 Cosmin Truta
-  * Copyright (c) 1998-2002,2004,2006-2014,2016 Glenn Randers-Pehrson
-  * Copyright (c) 1996-1997 Andreas Dilger
-  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c
-index 86d0c7aaa64..3bfa913000f 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c
-@@ -29,7 +29,7 @@
-  * However, the following notice accompanied the original version of this
-  * file and, per its terms, should not be removed:
-  *
-- * Copyright (c) 2018-2024 Cosmin Truta
-+ * Copyright (c) 2018-2025 Cosmin Truta
-  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
-  * Copyright (c) 1996-1997 Andreas Dilger
-  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-@@ -258,6 +258,14 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
-          png_benign_error(png_ptr, "Too many IDATs found");
-    }
- 
-+   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-+   {
-+      /* These flags must be set consistently for all non-IDAT chunks,
-+       * including the unknown chunks.
-+       */
-+      png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT | PNG_AFTER_IDAT;
-+   }
-+
-    if (chunk_name == png_IHDR)
-    {
-       if (png_ptr->push_length != 13)
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
-index 25bac4b9e69..dcd005efb34 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
-@@ -29,7 +29,7 @@
-  * However, the following notice accompanied the original version of this
-  * file and, per its terms, should not be removed:
-  *
-- * Copyright (c) 2018-2024 Cosmin Truta
-+ * Copyright (c) 2018-2025 Cosmin Truta
-  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
-  * Copyright (c) 1996-1997 Andreas Dilger
-  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-@@ -48,8 +48,20 @@
-  * they should be well aware of the issues that may arise from doing so.
-  */
- 
-+
-+/* pngpriv.h must be included first in each translation unit inside libpng.
-+ * On the other hand, it must not be included at all, directly or indirectly,
-+ * by any application code that uses the libpng API.
-+ */
- #ifndef PNGPRIV_H
--#define PNGPRIV_H
-+#  define PNGPRIV_H
-+#else
-+#  error Duplicate inclusion of pngpriv.h; please check the libpng source files
-+#endif
-+
-+#if defined(PNG_H) || defined(PNGCONF_H) || defined(PNGLCONF_H)
-+#  error This file must not be included by applications; please include <png.h>
-+#endif
- 
- /* Feature Test Macros.  The following are defined here to ensure that correctly
-  * implemented libraries reveal the APIs libpng needs to build and hide those
-@@ -86,7 +98,6 @@
-  */
- #if defined(HAVE_CONFIG_H) && !defined(PNG_NO_CONFIG_H)
- #  include <config.h>
--
-    /* Pick up the definition of 'restrict' from config.h if it was read: */
- #  define PNG_RESTRICT restrict
- #endif
-@@ -96,9 +107,7 @@
-  * are not internal definitions may be required.  This is handled below just
-  * before png.h is included, but load the configuration now if it is available.
-  */
--#ifndef PNGLCONF_H
--#  include "pnglibconf.h"
--#endif
-+#include "pnglibconf.h"
- 
- /* Local renames may change non-exported API functions from png.h */
- #if defined(PNG_PREFIX) && !defined(PNGPREFIX_H)
-@@ -163,6 +172,20 @@
- #  endif
- #endif
- 
-+#ifndef PNG_RISCV_RVV_OPT
-+   /* RISCV_RVV optimizations are being controlled by the compiler settings,
-+    * typically the target compiler will define __riscv but the rvv extension
-+    * availability has to be explicitly stated. This is why if no
-+    * PNG_RISCV_RVV_OPT was defined then a runtime check will be executed.
-+    *
-+    * To enable RISCV_RVV optimizations unconditionally, and compile the
-+    * associated code, pass --enable-riscv-rvv=yes or --enable-riscv-rvv=on
-+    * to configure or put -DPNG_RISCV_RVV_OPT=2 in CPPFLAGS.
-+    */
-+
-+#  define PNG_RISCV_RVV_OPT 0
-+#endif
-+
- #if PNG_ARM_NEON_OPT > 0
-    /* NEON optimizations are to be at least considered by libpng, so enable the
-     * callbacks to do this.
-@@ -308,6 +331,16 @@
- #   define PNG_LOONGARCH_LSX_IMPLEMENTATION 0
- #endif
- 
-+#if PNG_RISCV_RVV_OPT > 0 && __riscv_v >= 1000000
-+#  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_rvv
-+#  ifndef PNG_RISCV_RVV_IMPLEMENTATION
-+      /* Use the intrinsics code by default. */
-+#     define PNG_RISCV_RVV_IMPLEMENTATION 1
-+#  endif
-+#else
-+#  define PNG_RISCV_RVV_IMPLEMENTATION 0
-+#endif /* PNG_RISCV_RVV_OPT > 0 && __riscv_v >= 1000000 */
-+
- /* Is this a build of a DLL where compilation of the object modules requires
-  * different preprocessor settings to those required for a simple library?  If
-  * so PNG_BUILD_DLL must be set.
-@@ -706,7 +739,7 @@
- /* #define PNG_FLAG_KEEP_UNKNOWN_CHUNKS      0x8000U */
- /* #define PNG_FLAG_KEEP_UNSAFE_CHUNKS      0x10000U */
- #define PNG_FLAG_LIBRARY_MISMATCH        0x20000U
--#define PNG_FLAG_STRIP_ERROR_NUMBERS     0x40000U
-+                                  /*     0x40000U    unused */
- #define PNG_FLAG_STRIP_ERROR_TEXT        0x80000U
- #define PNG_FLAG_BENIGN_ERRORS_WARN     0x100000U /* Added to libpng-1.4.0 */
- #define PNG_FLAG_APP_WARNINGS_WARN      0x200000U /* Added to libpng-1.6.0 */
-@@ -1020,17 +1053,15 @@
-  * must match that used in the build, or we must be using pnglibconf.h.prebuilt:
-  */
- #if PNG_ZLIB_VERNUM != 0 && PNG_ZLIB_VERNUM != ZLIB_VERNUM
--#  error ZLIB_VERNUM != PNG_ZLIB_VERNUM \
--      "-I (include path) error: see the notes in pngpriv.h"
--   /* This means that when pnglibconf.h was built the copy of zlib.h that it
--    * used is not the same as the one being used here.  Because the build of
--    * libpng makes decisions to use inflateInit2 and inflateReset2 based on the
--    * zlib version number and because this affects handling of certain broken
--    * PNG files the -I directives must match.
-+#  error The include path of <zlib.h> is incorrect
-+   /* When pnglibconf.h was built, the copy of zlib.h that it used was not the
-+    * same as the one being used here.  Considering how libpng makes decisions
-+    * to use the zlib API based on the zlib version number, the -I options must
-+    * match.
-     *
--    * The most likely explanation is that you passed a -I in CFLAGS. This will
--    * not work; all the preprocessor directives and in particular all the -I
--    * directives must be in CPPFLAGS.
-+    * A possible cause of this mismatch is that you passed an -I option in
-+    * CFLAGS, which is unlikely to work.  All the preprocessor options, and all
-+    * the -I options in particular, should be in CPPFLAGS.
-     */
- #endif
- 
-@@ -1544,6 +1575,23 @@ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_lsx,(png_row_infop
-     row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
- #endif
- 
-+#if PNG_RISCV_RVV_IMPLEMENTATION == 1
-+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_rvv,(png_row_infop
-+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_rvv,(png_row_infop
-+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_rvv,(png_row_infop
-+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_rvv,(png_row_infop
-+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_rvv,(png_row_infop
-+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_rvv,(png_row_infop
-+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_rvv,(png_row_infop
-+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-+#endif
-+
- /* Choose the best filter to use and filter the row data */
- PNG_INTERNAL_FUNCTION(void,png_write_find_filter,(png_structrp png_ptr,
-     png_row_infop row_info),PNG_EMPTY);
-@@ -2156,6 +2204,11 @@ PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_lsx,
-     (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
- #endif
- 
-+#  if PNG_RISCV_RVV_IMPLEMENTATION == 1
-+PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_rvv,
-+   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
-+#endif
-+
- PNG_INTERNAL_FUNCTION(png_uint_32, png_check_keyword, (png_structrp png_ptr,
-    png_const_charp key, png_bytep new_key), PNG_EMPTY);
- 
-@@ -2191,4 +2244,3 @@ PNG_INTERNAL_FUNCTION(int,
- #endif
- 
- #endif /* PNG_VERSION_INFO_ONLY */
--#endif /* PNGPRIV_H */
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
-index 8a6381e1b3e..b53668a09ce 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
-@@ -731,7 +731,12 @@ png_read_end(png_structrp png_ptr, png_inforp info_ptr)
-       png_uint_32 chunk_name = png_ptr->chunk_name;
- 
-       if (chunk_name != png_IDAT)
--         png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
-+      {
-+         /* These flags must be set consistently for all non-IDAT chunks,
-+          * including the unknown chunks.
-+          */
-+         png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT | PNG_AFTER_IDAT;
-+      }
- 
-       if (chunk_name == png_IEND)
-          png_handle_chunk(png_ptr, info_ptr, length);
-@@ -838,7 +843,8 @@ png_read_destroy(png_structrp png_ptr)
- #endif
- 
- #if defined(PNG_READ_EXPAND_SUPPORTED) && \
--    defined(PNG_ARM_NEON_IMPLEMENTATION)
-+    (defined(PNG_ARM_NEON_IMPLEMENTATION) || \
-+     defined(PNG_RISCV_RVV_IMPLEMENTATION))
-    png_free(png_ptr, png_ptr->riffled_palette);
-    png_ptr->riffled_palette = NULL;
- #endif
-@@ -1357,7 +1363,7 @@ png_image_read_header(png_voidp argument)
- 
- #ifdef PNG_STDIO_SUPPORTED
- int PNGAPI
--png_image_begin_read_from_stdio(png_imagep image, FILE* file)
-+png_image_begin_read_from_stdio(png_imagep image, FILE *file)
- {
-    if (image != NULL && image->version == PNG_IMAGE_VERSION)
-    {
-@@ -3152,6 +3158,54 @@ png_image_read_colormapped(png_voidp argument)
-    }
- }
- 
-+/* Row reading for interlaced 16-to-8 bit depth conversion with local buffer. */
-+static int
-+png_image_read_direct_scaled(png_voidp argument)
-+{
-+   png_image_read_control *display = png_voidcast(png_image_read_control*,
-+       argument);
-+   png_imagep image = display->image;
-+   png_structrp png_ptr = image->opaque->png_ptr;
-+   png_bytep local_row = png_voidcast(png_bytep, display->local_row);
-+   png_bytep first_row = png_voidcast(png_bytep, display->first_row);
-+   ptrdiff_t row_bytes = display->row_bytes;
-+   int passes;
-+
-+   /* Handle interlacing. */
-+   switch (png_ptr->interlaced)
-+   {
-+      case PNG_INTERLACE_NONE:
-+         passes = 1;
-+         break;
-+
-+      case PNG_INTERLACE_ADAM7:
-+         passes = PNG_INTERLACE_ADAM7_PASSES;
-+         break;
-+
-+      default:
-+         png_error(png_ptr, "unknown interlace type");
-+   }
-+
-+   /* Read each pass using local_row as intermediate buffer. */
-+   while (--passes >= 0)
-+   {
-+      png_uint_32 y = image->height;
-+      png_bytep output_row = first_row;
-+
-+      for (; y > 0; --y)
-+      {
-+         /* Read into local_row (gets transformed 8-bit data). */
-+         png_read_row(png_ptr, local_row, NULL);
-+
-+         /* Copy from local_row to user buffer. */
-+         memcpy(output_row, local_row, (size_t)row_bytes);
-+         output_row += row_bytes;
-+      }
-+   }
-+
-+   return 1;
-+}
-+
- /* Just the row reading part of png_image_read. */
- static int
- png_image_read_composite(png_voidp argument)
-@@ -3570,6 +3624,7 @@ png_image_read_direct(png_voidp argument)
-    int linear = (format & PNG_FORMAT_FLAG_LINEAR) != 0;
-    int do_local_compose = 0;
-    int do_local_background = 0; /* to avoid double gamma correction bug */
-+   int do_local_scale = 0; /* for interlaced 16-to-8 bit conversion */
-    int passes = 0;
- 
-    /* Add transforms to ensure the correct output format is produced then check
-@@ -3703,8 +3758,16 @@ png_image_read_direct(png_voidp argument)
-             png_set_expand_16(png_ptr);
- 
-          else /* 8-bit output */
-+         {
-             png_set_scale_16(png_ptr);
- 
-+            /* For interlaced images, use local_row buffer to avoid overflow
-+             * in png_combine_row() which writes using IHDR bit-depth.
-+             */
-+            if (png_ptr->interlaced != 0)
-+               do_local_scale = 1;
-+         }
-+
-          change &= ~PNG_FORMAT_FLAG_LINEAR;
-       }
- 
-@@ -3980,6 +4043,24 @@ png_image_read_direct(png_voidp argument)
-       return result;
-    }
- 
-+   else if (do_local_scale != 0)
-+   {
-+      /* For interlaced 16-to-8 conversion, use an intermediate row buffer
-+       * to avoid buffer overflows in png_combine_row. The local_row is sized
-+       * for the transformed (8-bit) output, preventing the overflow that would
-+       * occur if png_combine_row wrote 16-bit data directly to the user buffer.
-+       */
-+      int result;
-+      png_voidp row = png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr));
-+
-+      display->local_row = row;
-+      result = png_safe_execute(image, png_image_read_direct_scaled, display);
-+      display->local_row = NULL;
-+      png_free(png_ptr, row);
-+
-+      return result;
-+   }
-+
-    else
-    {
-       png_alloc_size_t row_bytes = (png_alloc_size_t)display->row_bytes;
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngrio.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrio.c
-index 961d010df42..50a424d0912 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrio.c
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrio.c
-@@ -29,7 +29,7 @@
-  * However, the following notice accompanied the original version of this
-  * file and, per its terms, should not be removed:
-  *
-- * Copyright (c) 2018 Cosmin Truta
-+ * Copyright (c) 2018-2025 Cosmin Truta
-  * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
-  * Copyright (c) 1996-1997 Andreas Dilger
-  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-@@ -85,7 +85,7 @@ png_default_read_data(png_structp png_ptr, png_bytep data, size_t length)
-    /* fread() returns 0 on error, so it is OK to store this in a size_t
-     * instead of an int, which is what fread() actually returns.
-     */
--   check = fread(data, 1, length, png_voidcast(png_FILE_p, png_ptr->io_ptr));
-+   check = fread(data, 1, length, png_voidcast(FILE *, png_ptr->io_ptr));
- 
-    if (check != length)
-       png_error(png_ptr, "Read Error");
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
-index 4f31f8f07bc..a19615f49fe 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
-@@ -29,7 +29,7 @@
-  * However, the following notice accompanied the original version of this
-  * file and, per its terms, should not be removed:
-  *
-- * Copyright (c) 2018-2024 Cosmin Truta
-+ * Copyright (c) 2018-2025 Cosmin Truta
-  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
-  * Copyright (c) 1996-1997 Andreas Dilger
-  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-@@ -57,6 +57,12 @@
- #  endif
- #endif
- 
-+#ifdef PNG_RISCV_RVV_IMPLEMENTATION
-+#  if PNG_RISCV_RVV_IMPLEMENTATION == 1
-+#    define PNG_RISCV_RVV_INTRINSICS_AVAILABLE
-+#  endif
-+#endif
-+
- #ifdef PNG_READ_SUPPORTED
- 
- /* Set the action on getting a CRC error for an ancillary or critical chunk. */
-@@ -524,9 +530,19 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
-    {
-       int i;
- 
-+      /* Initialize the array to index colors.
-+       *
-+       * Ensure quantize_index can fit 256 elements (PNG_MAX_PALETTE_LENGTH)
-+       * rather than num_palette elements. This is to prevent buffer overflows
-+       * caused by malformed PNG files with out-of-range palette indices.
-+       *
-+       * Be careful to avoid leaking memory. Applications are allowed to call
-+       * this function more than once per png_struct.
-+       */
-+      png_free(png_ptr, png_ptr->quantize_index);
-       png_ptr->quantize_index = (png_bytep)png_malloc(png_ptr,
--          (png_alloc_size_t)num_palette);
--      for (i = 0; i < num_palette; i++)
-+          PNG_MAX_PALETTE_LENGTH);
-+      for (i = 0; i < PNG_MAX_PALETTE_LENGTH; i++)
-          png_ptr->quantize_index[i] = (png_byte)i;
-    }
- 
-@@ -538,15 +554,14 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
-           * Perhaps not the best solution, but good enough.
-           */
- 
--         int i;
-+         png_bytep quantize_sort;
-+         int i, j;
- 
--         /* Initialize an array to sort colors */
--         png_ptr->quantize_sort = (png_bytep)png_malloc(png_ptr,
-+         /* Initialize the local array to sort colors. */
-+         quantize_sort = (png_bytep)png_malloc(png_ptr,
-              (png_alloc_size_t)num_palette);
--
--         /* Initialize the quantize_sort array */
-          for (i = 0; i < num_palette; i++)
--            png_ptr->quantize_sort[i] = (png_byte)i;
-+            quantize_sort[i] = (png_byte)i;
- 
-          /* Find the least used palette entries by starting a
-           * bubble sort, and running it until we have sorted
-@@ -558,19 +573,18 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
-          for (i = num_palette - 1; i >= maximum_colors; i--)
-          {
-             int done; /* To stop early if the list is pre-sorted */
--            int j;
- 
-             done = 1;
-             for (j = 0; j < i; j++)
-             {
--               if (histogram[png_ptr->quantize_sort[j]]
--                   < histogram[png_ptr->quantize_sort[j + 1]])
-+               if (histogram[quantize_sort[j]]
-+                   < histogram[quantize_sort[j + 1]])
-                {
-                   png_byte t;
- 
--                  t = png_ptr->quantize_sort[j];
--                  png_ptr->quantize_sort[j] = png_ptr->quantize_sort[j + 1];
--                  png_ptr->quantize_sort[j + 1] = t;
-+                  t = quantize_sort[j];
-+                  quantize_sort[j] = quantize_sort[j + 1];
-+                  quantize_sort[j + 1] = t;
-                   done = 0;
-                }
-             }
-@@ -582,18 +596,18 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
-          /* Swap the palette around, and set up a table, if necessary */
-          if (full_quantize != 0)
-          {
--            int j = num_palette;
-+            j = num_palette;
- 
-             /* Put all the useful colors within the max, but don't
-              * move the others.
-              */
-             for (i = 0; i < maximum_colors; i++)
-             {
--               if ((int)png_ptr->quantize_sort[i] >= maximum_colors)
-+               if ((int)quantize_sort[i] >= maximum_colors)
-                {
-                   do
-                      j--;
--                  while ((int)png_ptr->quantize_sort[j] >= maximum_colors);
-+                  while ((int)quantize_sort[j] >= maximum_colors);
- 
-                   palette[i] = palette[j];
-                }
-@@ -601,7 +615,7 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
-          }
-          else
-          {
--            int j = num_palette;
-+            j = num_palette;
- 
-             /* Move all the used colors inside the max limit, and
-              * develop a translation table.
-@@ -609,13 +623,13 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
-             for (i = 0; i < maximum_colors; i++)
-             {
-                /* Only move the colors we need to */
--               if ((int)png_ptr->quantize_sort[i] >= maximum_colors)
-+               if ((int)quantize_sort[i] >= maximum_colors)
-                {
-                   png_color tmp_color;
- 
-                   do
-                      j--;
--                  while ((int)png_ptr->quantize_sort[j] >= maximum_colors);
-+                  while ((int)quantize_sort[j] >= maximum_colors);
- 
-                   tmp_color = palette[j];
-                   palette[j] = palette[i];
-@@ -653,8 +667,7 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
-                }
-             }
-          }
--         png_free(png_ptr, png_ptr->quantize_sort);
--         png_ptr->quantize_sort = NULL;
-+         png_free(png_ptr, quantize_sort);
-       }
-       else
-       {
-@@ -1797,19 +1810,51 @@ png_init_read_transformations(png_structrp png_ptr)
-                   }
-                   else /* if (png_ptr->trans_alpha[i] != 0xff) */
-                   {
--                     png_byte v, w;
--
--                     v = png_ptr->gamma_to_1[palette[i].red];
--                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.red);
--                     palette[i].red = png_ptr->gamma_from_1[w];
--
--                     v = png_ptr->gamma_to_1[palette[i].green];
--                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.green);
--                     palette[i].green = png_ptr->gamma_from_1[w];
--
--                     v = png_ptr->gamma_to_1[palette[i].blue];
--                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.blue);
--                     palette[i].blue = png_ptr->gamma_from_1[w];
-+                     if ((png_ptr->flags & PNG_FLAG_OPTIMIZE_ALPHA) != 0)
-+                     {
-+                        /* Premultiply only:
-+                         * component = round((component * alpha) / 255)
-+                         */
-+                        png_uint_32 component;
-+
-+                        component = png_ptr->gamma_to_1[palette[i].red];
-+                        component =
-+                            (component * png_ptr->trans_alpha[i] + 128) / 255;
-+                        palette[i].red = png_ptr->gamma_from_1[component];
-+
-+                        component = png_ptr->gamma_to_1[palette[i].green];
-+                        component =
-+                            (component * png_ptr->trans_alpha[i] + 128) / 255;
-+                        palette[i].green = png_ptr->gamma_from_1[component];
-+
-+                        component = png_ptr->gamma_to_1[palette[i].blue];
-+                        component =
-+                            (component * png_ptr->trans_alpha[i] + 128) / 255;
-+                        palette[i].blue = png_ptr->gamma_from_1[component];
-+                     }
-+                     else
-+                     {
-+                        /* Composite with background color:
-+                         * component =
-+                         *    alpha * component + (1 - alpha) * background
-+                         */
-+                        png_byte v, w;
-+
-+                        v = png_ptr->gamma_to_1[palette[i].red];
-+                        png_composite(w, v,
-+                            png_ptr->trans_alpha[i], back_1.red);
-+                        palette[i].red = png_ptr->gamma_from_1[w];
-+
-+                        v = png_ptr->gamma_to_1[palette[i].green];
-+                        png_composite(w, v,
-+                            png_ptr->trans_alpha[i], back_1.green);
-+                        palette[i].green = png_ptr->gamma_from_1[w];
-+
-+                        v = png_ptr->gamma_to_1[palette[i].blue];
-+                        png_composite(w, v,
-+                            png_ptr->trans_alpha[i], back_1.blue);
-+                        palette[i].blue = png_ptr->gamma_from_1[w];
-+                     }
-                   }
-                }
-                else
-@@ -5032,13 +5077,8 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
- 
- #ifdef PNG_READ_QUANTIZE_SUPPORTED
-    if ((png_ptr->transformations & PNG_QUANTIZE) != 0)
--   {
-       png_do_quantize(row_info, png_ptr->row_buf + 1,
-           png_ptr->palette_lookup, png_ptr->quantize_index);
--
--      if (row_info->rowbytes == 0)
--         png_error(png_ptr, "png_do_quantize returned rowbytes=0");
--   }
- #endif /* READ_QUANTIZE */
- 
- #ifdef PNG_READ_EXPAND_16_SUPPORTED
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
-index 6cf466d182a..07d53cb2c76 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
-@@ -29,7 +29,7 @@
-  * However, the following notice accompanied the original version of this
-  * file and, per its terms, should not be removed:
-  *
-- * Copyright (c) 2018-2024 Cosmin Truta
-+ * Copyright (c) 2018-2025 Cosmin Truta
-  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
-  * Copyright (c) 1996-1997 Andreas Dilger
-  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-@@ -2441,10 +2441,6 @@ png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-    }
- #endif
- 
--   /* TODO: this doesn't work and shouldn't be necessary. */
--   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
--      png_ptr->mode |= PNG_AFTER_IDAT;
--
-    buffer = png_read_buffer(png_ptr, length+1);
- 
-    if (buffer == NULL)
-@@ -2515,10 +2511,6 @@ png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-    }
- #endif
- 
--   /* TODO: should not be necessary. */
--   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
--      png_ptr->mode |= PNG_AFTER_IDAT;
--
-    /* Note, "length" is sufficient here; we won't be adding
-     * a null terminator later.  The limit check in png_handle_chunk should be
-     * sufficient.
-@@ -2635,10 +2627,6 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-    }
- #endif
- 
--   /* TODO: should not be necessary. */
--   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
--      png_ptr->mode |= PNG_AFTER_IDAT;
--
-    buffer = png_read_buffer(png_ptr, length+1);
- 
-    if (buffer == NULL)
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
-index 1bfd292bd46..0b2844f1864 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
-@@ -329,17 +329,14 @@ png_set_mDCV(png_const_structrp png_ptr, png_inforp info_ptr,
-     double maxDL, double minDL)
- {
-    png_set_mDCV_fixed(png_ptr, info_ptr,
--      /* The ITU approach is to scale by 50,000, not 100,000 so just divide
--       * the input values by 2 and use png_fixed:
--       */
--      png_fixed(png_ptr, white_x / 2, "png_set_mDCV(white(x))"),
--      png_fixed(png_ptr, white_y / 2, "png_set_mDCV(white(y))"),
--      png_fixed(png_ptr, red_x / 2, "png_set_mDCV(red(x))"),
--      png_fixed(png_ptr, red_y / 2, "png_set_mDCV(red(y))"),
--      png_fixed(png_ptr, green_x / 2, "png_set_mDCV(green(x))"),
--      png_fixed(png_ptr, green_y / 2, "png_set_mDCV(green(y))"),
--      png_fixed(png_ptr, blue_x / 2, "png_set_mDCV(blue(x))"),
--      png_fixed(png_ptr, blue_y / 2, "png_set_mDCV(blue(y))"),
-+      png_fixed(png_ptr, white_x, "png_set_mDCV(white(x))"),
-+      png_fixed(png_ptr, white_y, "png_set_mDCV(white(y))"),
-+      png_fixed(png_ptr, red_x, "png_set_mDCV(red(x))"),
-+      png_fixed(png_ptr, red_y, "png_set_mDCV(red(y))"),
-+      png_fixed(png_ptr, green_x, "png_set_mDCV(green(x))"),
-+      png_fixed(png_ptr, green_y, "png_set_mDCV(green(y))"),
-+      png_fixed(png_ptr, blue_x, "png_set_mDCV(blue(x))"),
-+      png_fixed(png_ptr, blue_y, "png_set_mDCV(blue(y))"),
-       png_fixed_ITU(png_ptr, maxDL, "png_set_mDCV(maxDL)"),
-       png_fixed_ITU(png_ptr, minDL, "png_set_mDCV(minDL)"));
- }
-diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h
-index d6c446564d1..8edb4bc393a 100644
---- a/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h
-+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h
-@@ -22,14 +22,14 @@
-  * questions.
-  */
- 
--/* pngstruct.h - header file for PNG reference library
-+/* pngstruct.h - internal structures for libpng
-  *
-  * This file is available under and governed by the GNU General Public
-  * License version 2 only, as published by the Free Software Foundation.
-  * However, the following notice accompanied the original version of this
-  * file and, per its terms, should not be removed:
-  *
-- * Copyright (c) 2018-2022 Cosmin Truta
-+ * Copyright (c) 2018-2025 Cosmin Truta
-  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
-  * Copyright (c) 1996-1997 Andreas Dilger
-  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-@@ -39,11 +39,9 @@
-  * and license in png.h
-  */
- 
--/* The structure that holds the information to read and write PNG files.
-- * The only people who need to care about what is inside of this are the
-- * people who will be modifying the library for their own special needs.
-- * It should NOT be accessed directly by an application.
-- */
-+#ifndef PNGPRIV_H
-+#  error This file must not be included by applications; please include <png.h>
-+#endif
- 
- #ifndef PNGSTRUCT_H
- #define PNGSTRUCT_H
-@@ -406,7 +404,8 @@ struct png_struct_def
- 
- /* New member added in libpng-1.6.36 */
- #if defined(PNG_READ_EXPAND_SUPPORTED) && \
--    defined(PNG_ARM_NEON_IMPLEMENTATION)
-+    (defined(PNG_ARM_NEON_IMPLEMENTATION) || \
-+     defined(PNG_RISCV_RVV_IMPLEMENTATION))
-    png_bytep riffled_palette; /* buffer for accelerated palette expansion */
- #endif
- 
-@@ -435,7 +434,6 @@ struct png_struct_def
- 
- #ifdef PNG_READ_QUANTIZE_SUPPORTED
- /* The following three members were added at version 1.0.14 and 1.2.4 */
--   png_bytep quantize_sort;          /* working sort array */
-    png_bytep index_to_palette;       /* where the original index currently is
-                                         in the palette */
-    png_bytep palette_to_index;       /* which original index points to this
diff --git a/SOURCES/jdk8375294-handle-EOPNOTSUPP-in-copying.patch b/SOURCES/jdk8375294-handle-EOPNOTSUPP-in-copying.patch
new file mode 100644
index 0000000..ea8076a
--- /dev/null
+++ b/SOURCES/jdk8375294-handle-EOPNOTSUPP-in-copying.patch
@@ -0,0 +1,63 @@
+From dbbdc1dffd10608195487fa139e77c4a90c80658 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ji=C5=99=C3=AD=20Van=C4=9Bk?= <jvanek@openjdk.org>
+Date: Wed, 15 Apr 2026 12:54:49 +0000
+Subject: [PATCH] 8375294: (fs) Files.copy can fail with EOPNOTSUPP when
+ copy_file_range not supported
+
+Reviewed-by: andrew
+Backport-of: 30cda00010888b6e9a2bf8cdeaedbb3eb4b6a222
+---
+ src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c    | 5 +++--
+ src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c | 3 ++-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c b/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
+index efbd0ca5684..54d640b03a4 100644
+--- a/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
++++ b/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -63,7 +63,7 @@ Java_sun_nio_ch_FileDispatcherImpl_transferFrom0(JNIEnv *env, jobject this,
+     if (n < 0) {
+         if (errno == EAGAIN)
+             return IOS_UNAVAILABLE;
+-        if (errno == ENOSYS)
++        if (errno == ENOSYS || errno == EOPNOTSUPP)
+             return IOS_UNSUPPORTED_CASE;
+         if ((errno == EBADF || errno == EINVAL || errno == EXDEV) &&
+             ((ssize_t)count >= 0))
+@@ -103,6 +103,7 @@ Java_sun_nio_ch_FileDispatcherImpl_transferTo0(JNIEnv *env, jobject this,
+                 case EINVAL:
+                 case ENOSYS:
+                 case EXDEV:
++                case EOPNOTSUPP:
+                     // ignore and try sendfile()
+                     break;
+                 default:
+diff --git a/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c b/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
+index c90e99dda07..4677411b0ba 100644
+--- a/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
++++ b/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -193,6 +193,7 @@ Java_sun_nio_fs_LinuxNativeDispatcher_directCopy0
+                     case EINVAL:
+                     case ENOSYS:
+                     case EXDEV:
++                    case EOPNOTSUPP:
+                         // ignore and try sendfile()
+                         break;
+                     default:
+-- 
+2.52.0
+
diff --git a/SOURCES/nssadapter-ldflags.patch b/SOURCES/nssadapter-ldflags.patch
deleted file mode 100644
index 04171b2..0000000
--- a/SOURCES/nssadapter-ldflags.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 5175f21..571748a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,12 +13,12 @@ DEVEL_PKGS    = nss nss-softokn
- LIB_DIR       = $(shell pkg-config --variable=libdir nss-softokn)
- SHARED_LIBS   = pthread softokn3 nss3
- STATIC_LIBS   = freebl
--SHR_CFLAGS    = -shared -fPIC -fvisibility=hidden -Wl,--exclude-libs,ALL       \
--                $(addprefix -l,$(SHARED_LIBS))                                 \
-+SHR_CFLAGS    = -shared -fPIC -fvisibility=hidden                              \
-                 $(strip $(shell pkg-config --cflags $(DEVEL_PKGS)))            \
-                 -Wpedantic -Wall -Wextra -Wconversion -Werror
- DBG_CFLAGS    = -Wno-error=unused-variable -Wno-error=unused-parameter -DDEBUG \
-                 -O0 -g
-+SHR_LDFLAGS   = -Wl,--exclude-libs,ALL $(addprefix -l,$(SHARED_LIBS))
- 
- # https://clang.llvm.org/docs/ClangFormatStyleOptions.html
- CLANG_FORMAT_STYLE = {                                                         \
-@@ -53,10 +53,12 @@ endif
- 
- .PHONY: release ## Build the library in RELEASE mode (default)
- release: BLD_CFLAGS = $(SHR_CFLAGS) $(CFLAGS)
-+release: BLD_LDFLAGS = $(SHR_LDFLAGS) $(LDFLAGS)
- release: $(CLEAN_IF_PREVIOUS_BUILD_MODE_IS_DEBUG) $(OUTPUT)
- 
- .PHONY: debug ## Build the library in DEBUG mode
- debug: BLD_CFLAGS = $(SHR_CFLAGS) $(DBG_CFLAGS) $(CFLAGS)
-+debug: BLD_LDFLAGS = $(SHR_LDFLAGS) $(LDFLAGS)
- debug: CREATE_DBG_SENTINEL_IF_NEEDED = touch $(DBG_SENTINEL)
- debug: $(CLEAN_IF_PREVIOUS_BUILD_MODE_IS_RELEASE) $(OUTPUT)
- 
-@@ -73,7 +75,7 @@ $(BIN_DIR):
- 
- $(OUTPUT): $(BIN_DIR) $(SRC_FILES)
- 	@$(CREATE_DBG_SENTINEL_IF_NEEDED)
--	$(CC) $(BLD_CFLAGS) $(filter %.c, $+)                                      \
-+	$(CC) $(BLD_CFLAGS) $(filter %.c, $+) $(BLD_LDFLAGS) \
- 	      $(addprefix $(LIB_DIR)/lib,$(addsuffix .a,$(STATIC_LIBS))) -o $@
- 
-