Use el9 portable packages

This commit is contained in:
Eduard Abdullin 2026-08-19 17:56:24 +00:00 committed by root
commit a7195cde0c
5 changed files with 86 additions and 12 deletions

2
.gitignore vendored
View File

@ -1,3 +1,3 @@
SOURCES/nssadapter-0.1.1.tar.xz
SOURCES/openjdk-25.0.4+7.tar.xz
SOURCES/openjdk-25.0.4.1+1.tar.xz
SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz

View File

@ -1,3 +1,3 @@
c37273ae74270c39736b04acd9a1935990d29fe1 SOURCES/nssadapter-0.1.1.tar.xz
9132e9960758327b96ed34e863e2766effe4af9f SOURCES/openjdk-25.0.4+7.tar.xz
67f099c7204fa5230c7fce5db5bf88acd9d489e1 SOURCES/openjdk-25.0.4.1+1.tar.xz
c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz

View File

@ -3,12 +3,39 @@ 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.4.1 (2026-08-18):
=============================================
Live versions of these release notes can be found at:
* https://bit.ly/openjdk25041
* CVEs
- CVE-2026-60589
- CVE-2026-61308
- CVE-2026-70906
- CVE-2026-70907
* Changes
- JDK-8382471: Improve Resource Resolving
- JDK-8384708: Enhance HTTP Connections
- JDK-8386205: Enhance TLS server
- JDK-8386298: Improve font loading
- JDK-8388788: Bump update version for OpenJDK: jdk-25.0.4.1
- JDK-8389945: [25u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 25.0.4.1
New in release OpenJDK 25.0.4 (2026-07-21):
===========================================
Live versions of these release notes can be found at:
* https://bit.ly/openjdk2504
* CVEs
- CVE-2026-46968
- CVE-2026-46917
- CVE-2026-47010
- CVE-2026-47021
- CVE-2026-47027
- CVE-2026-60147
- CVE-2026-47059
- CVE-2026-47063
- CVE-2026-41254
* Changes
- JDK-7184899: Test sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh fail
- JDK-8015444: java/awt/Focus/KeyStrokeTest.java sometimes fails
@ -273,7 +300,6 @@ security-libs/javax.crypto:
JDK-8347938: Add Support for the Latest ML-KEM and ML-DSA Private Key Encodings
===============================================================================
This release of OpenJDK adds support for encoding ML-KEM and ML-DSA
keys to PKCS#8 format using the DER-encoded ASN.1 CHOICE formats
defined in Section 6, "Private Key Format" of RFC 9935 [0] and RFC

View File

@ -2,8 +2,8 @@
%global featurever 25
%global interimver 0
%global updatever 4
%global patchver 0
%global buildver 7
%global patchver 1
%global buildver 1
%global portablerelease 1
%global rpmrelease 0
@ -25,8 +25,16 @@
%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
# Define an optional suffix for the OS this package is built on
%if 0%{?rhel} == 7
%global pkgos rhel7
# The portable package is intended to be built on either RHEL 8
# or CentOS Stream 9; any other OS will automatically get an
# appropriate suffix
%global rhel_buildos 8
%global centos_buildos 9
%if 0%{?centos} == 0 && 0%{?rhel} != 0%{rhel_buildos}
%global pkgos rhel%{?rhel}
%endif
%if 0%{?centos} != 0 && 0%{?centos} != 0%{centos_buildos}
%global pkgos rhel%{?centos}
%endif
# Define milestone (EA for pre-releases, GA for releases)
@ -235,7 +243,7 @@ URL: http://openjdk.java.net/
# Set of architectures for which we have a devkit
# Only used on RHEL
%if 0%{?centos} == 0
%global devkit_arches %{aarch64} %{ppc64le} riscv64 s390x x86_64
%global devkit_arches %{aarch64} %{ppc64le} s390x x86_64
%endif
# By default, we build a slowdebug build during main build on JIT architectures
@ -539,8 +547,14 @@ URL: http://openjdk.java.net/
# Define the architectures on which we build
# On RHEL, this should be the architectures with a devkit
# The exception is riscv64, which was introduced too recently
# for a devkit to exist. In that case, we build without devkit
%if 0%{?centos} == 0
%if 0%{?rhel} >= 10
ExclusiveArch: %{devkit_arches} riscv64
%else
ExclusiveArch: %{devkit_arches}
%endif
%else
ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 riscv64
%endif
@ -861,6 +875,7 @@ The %{origin_nice} %{featurever} miscellany.
# Using the echo macro breaks rpmdev-bumpspec, as it parses the first line of stdout :-(
echo "Preparing %{oj_vendor_version}"
echo "System is RHEL=%{?rhel}%{!?rhel:0}, CentOS=%{?centos}%{!?centos:0}, EPEL=%{?epel}%{!?epel:0}, Fedora=%{?fedora}%{!?fedora:0}"
echo "Portable suffix is %{?pkgos}%{!?pkgos:unset}"
echo "Build JDK version is %{buildjdkver}, bootstrap JDK package is %{bootjdkpkg}"
%if 0%{?stapinstall:1}
@ -1879,6 +1894,24 @@ done
%endif
%changelog
* Fri Aug 07 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.4.1.1-1.0
- Update to jdk-25.0.4.1+1 (GA)
- Update release notes to 25.0.4.1+1
- Make rhel usage in pkgos optional as it may be undefined
- Simplify pkgos conditional to work on RHEL 8
- ** This tarball is embargoed until 2026-08-18 @ 1pm PT. **
* Fri Aug 07 2026 Andrea Bolognani <abologna@redhat.com> - 1:25.0.4.0.7-3.0
- Automatically set pkgos when necessary
- Don't attempt to use devkit on riscv64
- Resolves: OPENJDK-5030
- Resolves: OPENJDK-5031
* Thu Jul 23 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.4.0.7-2.0
- Add CVEs to NEWS file
- Update to tarball with final changeset ID
- Related: OPENJDK-4865
* Thu Jul 16 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.4.0.7-1.0
- Update to jdk-25.0.4+7 (GA)
- Update release notes to 25.0.4+7

View File

@ -7,8 +7,8 @@
%global featurever 25
%global interimver 0
%global updatever 4
%global patchver 0
%global buildver 7
%global patchver 1
%global buildver 1
%global portablerelease 1
%global rpmrelease 1
@ -1871,6 +1871,7 @@ The %{origin_nice} %{featurever} cryptography adapter library.
echo "Preparing %{oj_vendor_version}"
echo "System is RHEL=%{?rhel}%{!?rhel:0}, CentOS=%{?centos}%{!?centos:0}, EPEL=%{?epel}%{!?epel:0}, Fedora=%{?fedora}%{!?fedora:0}"
echo "Portable suffix is %{?pkgos}%{!?pkgos:unset}"
# Using the echo macro breaks rpmdev-bumpspec, as it parses the first line of stdout :-(
%if 0%{?stapinstall:1}
@ -2599,10 +2600,24 @@ exit 0
%endif
%changelog
* Thu Jul 23 2026 Eduard Abdullin <eabdullin@almalinux.org> - 1:25.0.4.0.7-1.1.alma.1
* Wed Aug 19 2026 Eduard Abdullin <eabdullin@almalinux.org> - 1:25.0.4.1.1-1.1.alma.1
- Use el9 portable packages
* Thu Jul 16 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.4.0.7-1.0
* Fri Aug 07 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.4.1.1-1.1
- Update to jdk-25.0.4.1+1 (GA)
- Update release notes to 25.0.4.1+1
- Report pkgos value during build
- Sync the copy of the portable specfile with the latest update
- ** This tarball is embargoed until 2026-08-18 @ 1pm PT. **
- Resolves: RHEL-235632
* Thu Jul 23 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.4.0.7-2.1
- Add CVEs to NEWS file
- Update to tarball with final changeset ID
- Sync the copy of the portable specfile with the latest update
- Related: RHEL-188880
* Thu Jul 16 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.4.0.7-1.1
- Update to jdk-25.0.4+7 (GA)
- Update release notes to 25.0.4+7
- Bump freetype version to 2.14.3 following JDK-8385390