From 9835d1934b50514a1f3526153adfa91ddb3fab43 Mon Sep 17 00:00:00 2001
From: Andrew Hughes <gnu.andrew@redhat.com>
Date: Sat, 11 Jan 2025 20:27:10 +0000
Subject: [PATCH] Update to 8u442-b06 (GA)

- Update release notes for 8u442-b06.
- Switch to GA mode for final release

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

diff --git a/.gitignore b/.gitignore
index ed19d31..f6d3ce1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -302,3 +302,4 @@
 /shenandoah8u432-b06.tar.xz
 /shenandoah8u442-b01.tar.xz
 /shenandoah8u442-b05.tar.xz
+/shenandoah8u442-b06.tar.xz
diff --git a/NEWS b/NEWS
index 048ef3b..e685e92 100644
--- a/NEWS
+++ b/NEWS
@@ -18,14 +18,40 @@ Live versions of these release notes can be found at:
   - JDK-8239312: [macOS] javax/swing/JFrame/NSTexturedJFrame/NSTexturedJFrame.java
   - JDK-8260380: Upgrade to LittleCMS 2.12
   - JDK-8315731: Open source several Swing Text related tests
+  - JDK-8335428: Enhanced Building of Processes
+  - JDK-8335912, JDK-8337499: Add an operation mode to the jar command when extracting to not overwriting existing files
+  - JDK-8336564: Enhance mask blit functionality redux
   - JDK-8338402: GHA: some of bundles may not get removed
   - JDK-8339133: [8u] Profiler crashes at guarantee(is_result_safe || is_in_asgct()): unsafe access to zombie method
+  - JDK-8339180: Enhanced Building of Processes: Follow-on Issue
   - JDK-8339394: Bump update version of OpenJDK: 8u442
   - JDK-8339882: Replace ThreadLocalStorage::thread with Thread::current_or_null in jdk8 backport of JDK-8183925
   - JDK-8340815: Add SECURITY.md file
   - JDK-8342822: jdk8u432-b06 does not compile on AIX
   - JDK-8342841: [8u] Separate jdk_security_infra tests from jdk_tier1
 
+Notes on individual issues:
+===========================
+
+core-libs/java.util.jar:
+
+JDK-8335912/JDK-8337499: Add an operation mode to the jar command when extracting to not overwriting existing files
+===================================================================================================================
+In previous OpenJDK releases, when the jar tool extracted files from
+an archive, it would overwrite any existing files with the same name
+in the target directory. With this release, a new option ('-k' or
+'--keep-old-files') may be specified so that existing files are not
+overwritten.
+
+The option may be specified in short or long option form, as in the
+following examples:
+
+* jar xkf foo.jar
+* jar --extract --keep-old-files --file foo.jar
+
+By default, the old behaviour remains in place and files will be
+overwritten.
+
 New in release OpenJDK 8u432 (2024-10-15):
 ===========================================
 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 62c9217..ec3885c 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -312,7 +312,7 @@
 # Define version of OpenJDK 8 used
 %global project openjdk
 %global repo shenandoah-jdk8u
-%global openjdk_revision 8u442-b05
+%global openjdk_revision 8u442-b06
 %global shenandoah_revision shenandoah%{openjdk_revision}
 # Define IcedTea version used for SystemTap tapsets and desktop files
 %global icedteaver      3.15.0
@@ -359,9 +359,9 @@
 # eg jdk8u60-b27 -> b27
 %global buildver        %(VERSION=%{version_tag}; echo ${VERSION##*-})
 # rpmrelease numbering must start at 2 to be later than the 9.0 RPM
-%global rpmrelease      3
+%global rpmrelease      2
 # Settings used by the portable build
-%global portablerelease 2
+%global portablerelease 1
 # Portable suffix differs between RHEL and CentOS
 %if 0%{?centos} == 0
 %global portablesuffix el8
@@ -374,7 +374,7 @@
 # Release will be (where N is usually a number starting at 1):
 # - 0.N%%{?extraver}%%{?dist} for EA releases,
 # - N%%{?extraver}{?dist} for GA releases
-%global is_ga           0
+%global is_ga           1
 %if %{is_ga}
 %global milestone          fcs
 %global milestone_version  %{nil}
@@ -2959,6 +2959,12 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Fri Jan 17 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.442.b06-2
+- Update to 8u442-b06 (GA)
+- Update release notes for 8u442-b06.
+- Switch to GA mode for final release
+- Resolves: RHEL-73554
+
 * Thu Jan 16 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.442.b05-0.3.ea
 - Add zero_arches to the portable_build_arches now that the portable build bundles libffi
 - Temporarily workaround libffi.so not being in lib/%%{archinstall} by copying it
diff --git a/sources b/sources
index 31385bd..d9f4afd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (shenandoah8u442-b05.tar.xz) = 6c9c347f1dd72c29b6d74725420ed7f0c667137cb1136076a71192d831ba6ee3868b5cd29f3e8c1f2ba29f5aa7c5bfa7ade2054d1716d03b729b0c7a0c309af3
+SHA512 (shenandoah8u442-b06.tar.xz) = 8980111d5dd4d37ae41d0dac9d48d5829dba845dc2986f0660a12c17ae2bf1f7f405bab8db9b7637073b837d8e25b5530f039adfbb2f597864b791a6ba565c4d