Update to jdk-22.0.2+9 (GA)
- Update release notes with features of JDK 22 - Remove 21u FIPS patch and disable use until we are ready for the 25 version Related: RHEL-100678
This commit is contained in:
parent
9d0f623319
commit
82db2fdb6f
1
.gitignore
vendored
1
.gitignore
vendored
@ -38,3 +38,4 @@
|
|||||||
/openjdk-21.0.8+2-ea.tar.xz
|
/openjdk-21.0.8+2-ea.tar.xz
|
||||||
/openjdk-21.0.8+8-ea.tar.xz
|
/openjdk-21.0.8+8-ea.tar.xz
|
||||||
/openjdk-21.0.8+9.tar.xz
|
/openjdk-21.0.8+9.tar.xz
|
||||||
|
/openjdk-22.0.2+9.tar.xz
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -310,10 +310,10 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
# New Version-String scheme-style defines
|
# New Version-String scheme-style defines
|
||||||
%global featurever 21
|
%global featurever 22
|
||||||
%global fakefeaturever 25
|
%global fakefeaturever 25
|
||||||
%global interimver 0
|
%global interimver 0
|
||||||
%global updatever 8
|
%global updatever 2
|
||||||
%global patchver 0
|
%global patchver 0
|
||||||
# We don't add any LTS designator for STS packages (Fedora and EPEL).
|
# We don't add any LTS designator for STS packages (Fedora and EPEL).
|
||||||
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
|
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
|
||||||
@ -374,7 +374,7 @@
|
|||||||
%global buildver 9
|
%global buildver 9
|
||||||
%global rpmrelease 1
|
%global rpmrelease 1
|
||||||
# Settings used by the portable build
|
# Settings used by the portable build
|
||||||
%global portablerelease 1
|
%global portablerelease 2
|
||||||
# Portable suffix differs between RHEL and CentOS
|
# Portable suffix differs between RHEL and CentOS
|
||||||
%if 0%{?centos} == 0
|
%if 0%{?centos} == 0
|
||||||
%global portablesuffix %{?pkgos:el7_9}%{!?pkgos:el8}
|
%global portablesuffix %{?pkgos:el7_9}%{!?pkgos:el8}
|
||||||
@ -1296,7 +1296,7 @@ Source30: 0008-Tools.gmk-Use-update-repository-on-RHEL-rather-than-.patch
|
|||||||
############################################
|
############################################
|
||||||
|
|
||||||
# Crypto policy and FIPS support patches
|
# Crypto policy and FIPS support patches
|
||||||
# Patch is generated from the fips-21u tree at https://github.com/rh-openjdk/jdk/tree/fips-21u
|
# Patch is generated from the fips-25u tree at https://github.com/rh-openjdk/jdk/tree/fips-25u
|
||||||
# as follows: git diff %%{vcstag} src make test > fips-21u-$(git show -s --format=%h HEAD).patch
|
# as follows: git diff %%{vcstag} src make test > fips-21u-$(git show -s --format=%h HEAD).patch
|
||||||
# Diff is limited to src and make subdirectories to exclude .github changes
|
# Diff is limited to src and make subdirectories to exclude .github changes
|
||||||
# Fixes currently included:
|
# Fixes currently included:
|
||||||
@ -1331,7 +1331,7 @@ Source30: 0008-Tools.gmk-Use-update-repository-on-RHEL-rather-than-.patch
|
|||||||
# test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java: fixed jtreg main class
|
# test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java: fixed jtreg main class
|
||||||
# RH1940064: Enable XML Signature provider in FIPS mode
|
# 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]
|
# RH2173781: Avoid calling C_GetInfo() too early, before cryptoki is initialized [now part of JDK-8301553 upstream]
|
||||||
Patch1001: fips-%{featurever}u-%{fipsver}.patch
|
# Disabled until 25: Patch1001: fips-%{featurever}u-%{fipsver}.patch
|
||||||
|
|
||||||
#############################################
|
#############################################
|
||||||
#
|
#
|
||||||
@ -1824,7 +1824,8 @@ sh %{SOURCE12} %{top_level_dir_name}
|
|||||||
# rpmbuild.
|
# rpmbuild.
|
||||||
pushd %{top_level_dir_name}
|
pushd %{top_level_dir_name}
|
||||||
# Add crypto policy and FIPS support
|
# Add crypto policy and FIPS support
|
||||||
%patch -P1001 -p1
|
# Disabled until 25
|
||||||
|
#%patch -P1001 -p1
|
||||||
popd # openjdk
|
popd # openjdk
|
||||||
|
|
||||||
# The OpenJDK version file includes the current
|
# The OpenJDK version file includes the current
|
||||||
@ -2473,6 +2474,12 @@ exit 0
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Sep 23 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:22.0.2.0.9-1
|
||||||
|
- Update to jdk-22.0.2+9 (GA)
|
||||||
|
- Update release notes with features of JDK 22
|
||||||
|
- Remove 21u FIPS patch and disable use until we are ready for the 25 version
|
||||||
|
- Related: RHEL-100678
|
||||||
|
|
||||||
* Mon Aug 25 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.9-1
|
* Mon Aug 25 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.9-1
|
||||||
- Create java-25-openjdk package based on java-21-openjdk
|
- Create java-25-openjdk package based on java-21-openjdk
|
||||||
- Introduce fakefeaturever to pretend we are java-25-openjdk ahead of time
|
- Introduce fakefeaturever to pretend we are java-25-openjdk ahead of time
|
||||||
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
|
SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
|
||||||
SHA512 (openjdk-21.0.8+9.tar.xz) = 81be6d151fdca910fbee9ea1a93b20af037d2dbafeb12fa368a6091096a22dcf997cf419bebe0261f016ce0fe1e74acd4fca54ca0840a3d69ad76ae7a1336e4c
|
SHA512 (openjdk-22.0.2+9.tar.xz) = 960746381f56cb516a2298f75dbf877554b59e73752dc29b040b8629b153174d2ea2f612d3479b511aaac293e4d336c798a58fd1ba4d2b9d5933899f64d04313
|
||||||
|
Loading…
Reference in New Issue
Block a user