From 7381f438683619f400fdff99765fdae562dbbbef Mon Sep 17 00:00:00 2001
From: Thomas Fitzsimmons <fitzsim@redhat.com>
Date: Wed, 26 Jun 2024 13:10:01 -0400
Subject: [PATCH] Add upstream patch that removes illegal RLO Unicode
 characters

- Related: RHEL-52734
---
 ...-unpaired-RLO-Unicode-characters-in-.patch | 37 +++++++++++++++++++
 java-17-openjdk.spec                          |  8 +++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch

diff --git a/0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch b/0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch
new file mode 100644
index 0000000..fcba27c
--- /dev/null
+++ b/0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch
@@ -0,0 +1,37 @@
+From 859dda14f3f0d90294899812f5d34ea2e952a3df Mon Sep 17 00:00:00 2001
+From: Thomas Fitzsimmons <fitzsim@redhat.com>
+Date: Wed, 26 Jun 2024 10:47:13 +0000
+Subject: [PATCH] 8332174: Remove 2 (unpaired) RLO Unicode characters in
+ ff_Adlm.xml
+
+Reviewed-by: andrew
+Backport-of: d5363bc509d4996529420b453a99e982c843da1c
+---
+ make/data/cldr/common/main/ff_Adlm.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/make/data/cldr/common/main/ff_Adlm.xml b/make/data/cldr/common/main/ff_Adlm.xml
+index 02feba420c8..05bb2c6db95 100644
+--- a/make/data/cldr/common/main/ff_Adlm.xml
++++ b/make/data/cldr/common/main/ff_Adlm.xml
+@@ -272,7 +272,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
+ 			<territory type="BS">𞤄𞤢𞤸𞤢𞤥𞤢𞥄𞤧</territory>
+ 			<territory type="BT">𞤄𞤵𞥅𞤼𞤢𞥄𞤲</territory>
+ 			<territory type="BV">𞤅𞤵𞤪𞤭𞥅𞤪𞤫 𞤄𞤵𞥅𞤾𞤫𞥅</territory>
+-			<territory type="BW">‮𞤄𞤮𞤼𞤧𞤵𞤱𞤢𞥄𞤲𞤢</territory>
++			<territory type="BW">𞤄𞤮𞤼𞤧𞤵𞤱𞤢𞥄𞤲𞤢</territory>
+ 			<territory type="BY">𞤄𞤫𞤤𞤢𞤪𞤵𞥅𞤧</territory>
+ 			<territory type="BZ">𞤄𞤫𞤤𞤭𞥅𞥁</territory>
+ 			<territory type="CA">𞤑𞤢𞤲𞤢𞤣𞤢𞥄</territory>
+@@ -2245,7 +2245,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
+ 				<exemplarCity>𞤐𞤵𞥅𞤳</exemplarCity>
+ 			</zone>
+ 			<zone type="America/Scoresbysund">
+-				<exemplarCity>‮𞤋𞤼𞥆𞤮𞤳𞤮𞤪𞤼𞤮𞥅𞤪𞤥𞤭𞥅𞤼</exemplarCity>
++				<exemplarCity>𞤋𞤼𞥆𞤮𞤳𞤮𞤪𞤼𞤮𞥅𞤪𞤥𞤭𞥅𞤼</exemplarCity>
+ 			</zone>
+ 			<zone type="America/Danmarkshavn">
+ 				<exemplarCity>𞤁𞤢𞥄𞤲𞤥𞤢𞤪𞤳𞥃𞤢𞥄𞤾𞤲</exemplarCity>
+-- 
+2.44.0
+
diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index d47880f..4e369a6 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -1410,10 +1410,14 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d
 
 #############################################
 #
-# OpenJDK patches appearing in 17.0.10
+# OpenJDK patches which missed last update
 #
 #############################################
 
+# https://github.com/openjdk/jdk17u-dev/commit/859dda14f3f0d90294899812f5d34ea2e952a3df
+# Remove after next upstream update.
+Patch7: 0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch
+
 # Currently empty
 
 BuildRequires: autoconf
@@ -1872,6 +1876,7 @@ pushd %{top_level_dir_name}
 # rpmbuild.
 %patch -P1 -p1
 %patch -P6 -p1
+%patch -P7 -p1
 # Add crypto policy and FIPS support
 %patch -P1001 -p1
 # nss.cfg PKCS11 support; must come last as it also alters java.security
@@ -2542,6 +2547,7 @@ cjc.mainProgram(args)
 - Delete fips-17u-d63771ea660.patch
 - Add fips-17u-e893be00150.patch
 - Update fipsver to e893be00150
+- Add upstream patch that removes illegal RLO Unicode characters (JDK-8332174)
 - Related: RHEL-52734
 
 * Wed Jul 31 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.11.0.9-2