From c6a07d6a0ae5da9c4ed3ed9c31853b1552b8b471 Mon Sep 17 00:00:00 2001
From: Andrew Hughes <gnu.andrew@redhat.com>
Date: Mon, 10 Aug 2026 20:47:28 +0100
Subject: [PATCH] Update to 8u504-b01 (GA).

- Update release notes for 8u504-b01.
- Bump FreeType version to 2.14.3 following JDK-8385390

** This tarball is embargoed until 2026-08-18 @ 1pm PT. **

Resolves: RHEL-235603
---
 .gitignore              |  1 +
 NEWS                    | 14 ++++++++++++++
 java-1.8.0-openjdk.spec | 13 ++++++++++---
 sources                 |  2 +-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index d85ed76..e52b0ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -478,3 +478,4 @@
 /openjdk8u502-b05-ea.tar.xz
 /openjdk8u502-b07.tar.xz
 /shenandoah8u502-b07.tar.xz
+/shenandoah8u504-b01.tar.xz
diff --git a/NEWS b/NEWS
index 410c364..f4d21f7 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,20 @@ 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 8u504 (2026-08-18):
+===========================================
+Live versions of these release notes can be found at:
+  * https://bit.ly/openjdk8u504
+
+* CVEs
+* Changes
+  - JDK-8382471: Improve Resource Resolving
+  - JDK-8384708: Enhance HTTP Connections
+  - JDK-8385390: Update FreeType to 2.14.3
+  - JDK-8386205: Enhance TLS server
+  - JDK-8388811: [8u] VS2010 build broken by JDK-8374058
+  - JDK-8389477: Bump update version for OpenJDK: 8u504
+
 New in release OpenJDK 8u502 (2026-07-21):
 ===========================================
 Live versions of these release notes can be found at:
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index f49ca80..d9e38cd 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -8,7 +8,7 @@
 # Define version of OpenJDK 8 used
 %global project openjdk
 %global repo shenandoah-jdk8u
-%global openjdk_revision 8u502-b07
+%global openjdk_revision 8u504-b01
 %global shenandoah_revision shenandoah%{openjdk_revision}
 # e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 -> aarch64-shenandoah-jdk8u212-b04
 %global version_tag     %(VERSION=%{shenandoah_revision}; echo ${VERSION%%-shenandoah-merge*})
@@ -18,7 +18,7 @@
 %global updatever       %(VERSION=%{whole_update}; echo ${VERSION##*u})
 # eg jdk8u60-b27 -> b27
 %global buildver        %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global portablerelease 2
+%global portablerelease 1
 %global rpmrelease 1
 
 # Define IcedTea version used for SystemTap tapsets and desktop files
@@ -1719,7 +1719,7 @@ BuildRequires: libpng-devel
 BuildRequires: zlib-devel
 %else
 # Version in jdk/src/share/native/sun/awt/libfreetype/include/freetype/freetype.h
-Provides: bundled(freetype) = 2.14.2
+Provides: bundled(freetype) = 2.14.3
 # Version in jdk/src/share/native/sun/awt/giflib/gif_lib.h
 Provides: bundled(giflib) = 6.1.2
 # Version in jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h
@@ -2961,6 +2961,13 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Mon Aug 10 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.504.b01-1.1
+- Update to 8u504-b01 (GA).
+- Update release notes for 8u504-b01.
+- Bump FreeType version to 2.14.3 following JDK-8385390
+- ** This tarball is embargoed until 2026-08-18 @ 1pm PT. **
+- Resolves: RHEL-235603
+
 * Mon Jul 27 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.502.b07-2.1
 - Add CVEs to NEWS file
 - Related: RHEL-188852
diff --git a/sources b/sources
index 0e97e7d..cb94ac5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (shenandoah8u502-b07.tar.xz) = e6742755e5052c8420865d08cbdbb368ecf2568d1f76784258832c1481edd33e19f9099e0554a649283bf0e27c41c5faaab493735d87ff28ebad2dde4bdb5f17
+SHA512 (shenandoah8u504-b01.tar.xz) = 7f21cba021834606dae284b8c0e3ef7174c18a72dfc2465c1ecbda8c7075b4fc4d05434b045c09dcab7c06391508f0e520bdab2887a79884f7b5b8774362ddbc