|
|
|
|
@ -27,7 +27,7 @@
|
|
|
|
|
# Enable static library builds by default.
|
|
|
|
|
%bcond_without staticlibs
|
|
|
|
|
# Build a fresh libjvm.so for use in a copy of the bootstrap JDK
|
|
|
|
|
%bcond_without fresh_libjvm
|
|
|
|
|
%bcond_with fresh_libjvm
|
|
|
|
|
# Build with system libraries
|
|
|
|
|
%bcond_with system_libs
|
|
|
|
|
|
|
|
|
|
@ -322,7 +322,7 @@
|
|
|
|
|
# New Version-String scheme-style defines
|
|
|
|
|
%global featurever 17
|
|
|
|
|
%global interimver 0
|
|
|
|
|
%global updatever 8
|
|
|
|
|
%global updatever 9
|
|
|
|
|
%global patchver 0
|
|
|
|
|
# buildjdkver is usually same as %%{featurever},
|
|
|
|
|
# but in time of bootstrap of next jdk, it is featurever-1,
|
|
|
|
|
@ -351,7 +351,7 @@
|
|
|
|
|
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&version=%{fedora}
|
|
|
|
|
%else
|
|
|
|
|
%if 0%{?rhel}
|
|
|
|
|
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%20%{rhel}&component=%{name}
|
|
|
|
|
%global oj_vendor_bug_url https://access.redhat.com/support/cases/
|
|
|
|
|
%else
|
|
|
|
|
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi
|
|
|
|
|
%endif
|
|
|
|
|
@ -362,14 +362,23 @@
|
|
|
|
|
# Define IcedTea version used for SystemTap tapsets and desktop file
|
|
|
|
|
%global icedteaver 6.0.0pre00-c848b93a8598
|
|
|
|
|
# Define current Git revision for the FIPS support patches
|
|
|
|
|
%global fipsver bf363eecce3
|
|
|
|
|
%global fipsver 51e1d00be4e
|
|
|
|
|
%global javaver %{featurever}
|
|
|
|
|
%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
|
|
|
|
|
|
|
|
|
|
# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
|
|
|
|
|
%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
|
|
|
|
|
|
|
|
|
|
# The tag used to create the OpenJDK tarball
|
|
|
|
|
%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
|
|
|
|
|
|
|
|
|
|
# Standard JPackage naming and versioning defines
|
|
|
|
|
%global origin openjdk
|
|
|
|
|
%global origin_nice OpenJDK
|
|
|
|
|
%global top_level_dir_name %{origin}
|
|
|
|
|
%global top_level_dir_name %{vcstag}
|
|
|
|
|
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
|
|
|
|
%global buildver 7
|
|
|
|
|
%global buildver 9
|
|
|
|
|
# rpmrelease numbering must start at 2 to be later than the 8.6 RPM
|
|
|
|
|
%global rpmrelease 2
|
|
|
|
|
# Settings used by the portable build
|
|
|
|
|
%global portablerelease 1
|
|
|
|
|
@ -388,14 +397,6 @@
|
|
|
|
|
# for techpreview, using 1, so slowdebugs can have 0
|
|
|
|
|
%global priority %( printf '%08d' 1 )
|
|
|
|
|
%endif
|
|
|
|
|
%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
|
|
|
|
|
%global javaver %{featurever}
|
|
|
|
|
|
|
|
|
|
# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
|
|
|
|
|
%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
|
|
|
|
|
|
|
|
|
|
# The tag used to create the OpenJDK tarball
|
|
|
|
|
%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
|
|
|
|
|
|
|
|
|
|
# Define milestone (EA for pre-releases, GA for releases)
|
|
|
|
|
# Release will be (where N is usually a number starting at 1):
|
|
|
|
|
@ -405,7 +406,7 @@
|
|
|
|
|
%if %{is_ga}
|
|
|
|
|
%global build_type GA
|
|
|
|
|
%global ea_designator ""
|
|
|
|
|
%global ea_designator_zip ""
|
|
|
|
|
%global ea_designator_zip %{nil}
|
|
|
|
|
%global extraver %{nil}
|
|
|
|
|
%global eaprefix %{nil}
|
|
|
|
|
%else
|
|
|
|
|
@ -557,12 +558,15 @@ alternatives \\
|
|
|
|
|
--install %{_bindir}/java $key %{jrebindir -- %{?1}}/java $PRIORITY --family %{family} \\
|
|
|
|
|
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\
|
|
|
|
|
--slave %{_bindir}/%{alt_java_name} %{alt_java_name} %{jrebindir -- %{?1}}/%{alt_java_name} \\
|
|
|
|
|
--slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
|
|
|
|
|
--slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
|
|
|
|
|
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- %{?1}}/rmiregistry \\
|
|
|
|
|
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
|
|
|
|
|
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
|
|
|
|
|
--slave %{_mandir}/man1/%{alt_java_name}.1$ext %{alt_java_name}.1$ext \\
|
|
|
|
|
%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1$ext \\
|
|
|
|
|
--slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
|
|
|
|
|
%{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1$ext \\
|
|
|
|
|
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
|
|
|
|
|
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1$ext \\
|
|
|
|
|
--slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \\
|
|
|
|
|
@ -647,7 +651,6 @@ alternatives \\
|
|
|
|
|
--slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\
|
|
|
|
|
--slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\
|
|
|
|
|
--slave %{_bindir}/javap javap %{sdkbindir -- %{?1}}/javap \\
|
|
|
|
|
--slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{?1}}/jcmd \\
|
|
|
|
|
--slave %{_bindir}/jconsole jconsole %{sdkbindir -- %{?1}}/jconsole \\
|
|
|
|
|
--slave %{_bindir}/jdb jdb %{sdkbindir -- %{?1}}/jdb \\
|
|
|
|
|
--slave %{_bindir}/jdeps jdeps %{sdkbindir -- %{?1}}/jdeps \\
|
|
|
|
|
@ -674,8 +677,6 @@ alternatives \\
|
|
|
|
|
%{_mandir}/man1/javadoc-%{uniquesuffix -- %{?1}}.1$ext \\
|
|
|
|
|
--slave %{_mandir}/man1/javap.1$ext javap.1$ext \\
|
|
|
|
|
%{_mandir}/man1/javap-%{uniquesuffix -- %{?1}}.1$ext \\
|
|
|
|
|
--slave %{_mandir}/man1/jcmd.1$ext jcmd.1$ext \\
|
|
|
|
|
%{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1$ext \\
|
|
|
|
|
--slave %{_mandir}/man1/jconsole.1$ext jconsole.1$ext \\
|
|
|
|
|
%{_mandir}/man1/jconsole-%{uniquesuffix -- %{?1}}.1$ext \\
|
|
|
|
|
--slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \\
|
|
|
|
|
@ -813,6 +814,7 @@ exit 0
|
|
|
|
|
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/bin
|
|
|
|
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/java
|
|
|
|
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/%{alt_java_name}
|
|
|
|
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jcmd
|
|
|
|
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/keytool
|
|
|
|
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
|
|
|
|
|
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
|
|
|
|
|
@ -876,6 +878,7 @@ exit 0
|
|
|
|
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc
|
|
|
|
|
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/%{vm_variant}/
|
|
|
|
|
@ -923,13 +926,11 @@ exit 0
|
|
|
|
|
%if %is_system_jdk
|
|
|
|
|
%if %{is_release_build -- %{?1}}
|
|
|
|
|
%ghost %{_bindir}/java
|
|
|
|
|
%ghost %{_bindir}/%{alt_java_name}
|
|
|
|
|
%ghost %{_jvmdir}/jre
|
|
|
|
|
%ghost %{_bindir}/%{alt_java_name}
|
|
|
|
|
%ghost %{_bindir}/jcmd
|
|
|
|
|
%ghost %{_bindir}/keytool
|
|
|
|
|
%ghost %{_bindir}/pack200
|
|
|
|
|
%ghost %{_bindir}/rmid
|
|
|
|
|
%ghost %{_bindir}/rmiregistry
|
|
|
|
|
%ghost %{_bindir}/unpack200
|
|
|
|
|
%ghost %{_jvmdir}/jre-%{origin}
|
|
|
|
|
%ghost %{_jvmdir}/jre-%{javaver}
|
|
|
|
|
%ghost %{_jvmdir}/jre-%{javaver}-%{origin}
|
|
|
|
|
@ -949,7 +950,6 @@ exit 0
|
|
|
|
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javadoc
|
|
|
|
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javap
|
|
|
|
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jconsole
|
|
|
|
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jcmd
|
|
|
|
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdb
|
|
|
|
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeps
|
|
|
|
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeprscan
|
|
|
|
|
@ -986,7 +986,6 @@ exit 0
|
|
|
|
|
%{_mandir}/man1/javadoc-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/javap-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/jconsole-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/jdb-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/jdeps-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
%{_mandir}/man1/jinfo-%{uniquesuffix -- %{?1}}.1*
|
|
|
|
|
@ -1014,7 +1013,6 @@ exit 0
|
|
|
|
|
%if %{is_release_build -- %{?1}}
|
|
|
|
|
%ghost %{_bindir}/javac
|
|
|
|
|
%ghost %{_jvmdir}/java
|
|
|
|
|
%ghost %{_jvmdir}/%{alt_java_name}
|
|
|
|
|
%ghost %{_bindir}/jlink
|
|
|
|
|
%ghost %{_bindir}/jmod
|
|
|
|
|
%ghost %{_bindir}/jhsdb
|
|
|
|
|
@ -1022,15 +1020,16 @@ exit 0
|
|
|
|
|
%ghost %{_bindir}/jarsigner
|
|
|
|
|
%ghost %{_bindir}/javadoc
|
|
|
|
|
%ghost %{_bindir}/javap
|
|
|
|
|
%ghost %{_bindir}/jcmd
|
|
|
|
|
%ghost %{_bindir}/jconsole
|
|
|
|
|
%ghost %{_bindir}/jdb
|
|
|
|
|
%ghost %{_bindir}/jdeps
|
|
|
|
|
%ghost %{_bindir}/jdeprscan
|
|
|
|
|
%ghost %{_bindir}/jfr
|
|
|
|
|
%ghost %{_bindir}/jimage
|
|
|
|
|
%ghost %{_bindir}/jinfo
|
|
|
|
|
%ghost %{_bindir}/jmap
|
|
|
|
|
%ghost %{_bindir}/jps
|
|
|
|
|
%ghost %{_bindir}/jpackage
|
|
|
|
|
%ghost %{_bindir}/jrunscript
|
|
|
|
|
%ghost %{_bindir}/jshell
|
|
|
|
|
%ghost %{_bindir}/jstack
|
|
|
|
|
@ -1125,8 +1124,8 @@ Requires: ca-certificates
|
|
|
|
|
# Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros
|
|
|
|
|
Requires: javapackages-filesystem
|
|
|
|
|
# Require zone-info data provided by tzdata-java sub-package
|
|
|
|
|
# 2022g required as of JDK-8297804
|
|
|
|
|
Requires: tzdata-java >= 2022g
|
|
|
|
|
# 2023c required as of JDK-8305113
|
|
|
|
|
Requires: tzdata-java >= 2023c
|
|
|
|
|
# for support of kernel stream control
|
|
|
|
|
# libsctp.so.1 is being `dlopen`ed on demand
|
|
|
|
|
Requires: lksctp-tools%{?_isa}
|
|
|
|
|
@ -1289,7 +1288,7 @@ URL: http://openjdk.java.net/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# The source tarball, generated using generate_source_tarball.sh
|
|
|
|
|
Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz
|
|
|
|
|
Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_designator_zip}.tar.xz
|
|
|
|
|
|
|
|
|
|
# Use 'icedtea_sync.sh' to update the following
|
|
|
|
|
# They are based on code contained in the IcedTea project (6.x).
|
|
|
|
|
@ -1400,21 +1399,11 @@ Patch1001: fips-17u-%{fipsver}.patch
|
|
|
|
|
|
|
|
|
|
#############################################
|
|
|
|
|
#
|
|
|
|
|
# OpenJDK patches appearing in 17.0.8
|
|
|
|
|
#
|
|
|
|
|
#############################################
|
|
|
|
|
|
|
|
|
|
#############################################
|
|
|
|
|
#
|
|
|
|
|
# Portable build specific patches
|
|
|
|
|
#
|
|
|
|
|
#############################################
|
|
|
|
|
|
|
|
|
|
#############################################
|
|
|
|
|
#
|
|
|
|
|
# OpenJDK patches targetted for 17.0.6
|
|
|
|
|
# OpenJDK patches appearing in 17.0.10
|
|
|
|
|
#
|
|
|
|
|
#############################################
|
|
|
|
|
# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
|
|
|
|
|
Patch2000: jdk8312489-max_sig_default_increase.patch
|
|
|
|
|
|
|
|
|
|
BuildRequires: autoconf
|
|
|
|
|
BuildRequires: automake
|
|
|
|
|
@ -1480,17 +1469,17 @@ BuildRequires: libjpeg-devel
|
|
|
|
|
BuildRequires: libpng-devel
|
|
|
|
|
%else
|
|
|
|
|
# Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
|
|
|
|
|
Provides: bundled(freetype) = 2.12.1
|
|
|
|
|
Provides: bundled(freetype) = 2.13.0
|
|
|
|
|
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
|
|
|
|
|
Provides: bundled(giflib) = 5.2.1
|
|
|
|
|
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
|
|
|
|
|
Provides: bundled(harfbuzz) = 7.0.1
|
|
|
|
|
Provides: bundled(harfbuzz) = 7.2.0
|
|
|
|
|
# Version in src/java.desktop/share/native/liblcms/lcms2.h
|
|
|
|
|
Provides: bundled(lcms2) = 2.15.0
|
|
|
|
|
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
|
|
|
|
|
Provides: bundled(libjpeg) = 6b
|
|
|
|
|
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
|
|
|
|
|
Provides: bundled(libpng) = 1.6.37
|
|
|
|
|
Provides: bundled(libpng) = 1.6.39
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# this is always built, also during debug-only build
|
|
|
|
|
@ -1858,9 +1847,12 @@ pushd %{top_level_dir_name}
|
|
|
|
|
%patch1001 -p1
|
|
|
|
|
# nss.cfg PKCS11 support; must come last as it also alters java.security
|
|
|
|
|
%patch1000 -p1
|
|
|
|
|
# JDK-8312489 backport, coming in 17.0.10
|
|
|
|
|
%patch2000 -p1
|
|
|
|
|
# alt-java support
|
|
|
|
|
%patch600 -p1
|
|
|
|
|
popd # openjdk
|
|
|
|
|
|
|
|
|
|
%patch600
|
|
|
|
|
|
|
|
|
|
# The OpenJDK version file includes the current
|
|
|
|
|
# upstream version information. For some reason,
|
|
|
|
|
@ -2480,6 +2472,43 @@ require "copy_jdk_configs.lua"
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Thu Oct 12 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.9.0.9-1
|
|
|
|
|
- Update to jdk-17.0.9+9 (GA)
|
|
|
|
|
- Sync the copy of the portable specfile with the latest update
|
|
|
|
|
- Re-generate FIPS patch against 17.0.9+1 following backport of JDK-8209398
|
|
|
|
|
- Bump libpng version to 1.6.39 following JDK-8305815
|
|
|
|
|
- Bump HarfBuzz version to 7.2.0 following JDK-8307301
|
|
|
|
|
- Bump freetype version to 2.13.0 following JDK-8306881
|
|
|
|
|
- Update generate_tarball.sh to be closer to upstream vanilla script inc. no more ECC removal
|
|
|
|
|
- Sync generate_tarball.sh with 11u version
|
|
|
|
|
- Update bug URL for RHEL to point to the Red Hat customer portal
|
|
|
|
|
- Change top_level_dir_name to use the VCS tag, matching new upstream release style tarball
|
|
|
|
|
- Use upstream release URL for OpenJDK source
|
|
|
|
|
- Apply all patches using -p1
|
|
|
|
|
- Temporarily turn off 'fresh_libjvm' due to removal of JVM_IsThreadAlive (JDK-8305425)
|
|
|
|
|
- Add missing JFR and jpackage alternative ghosts
|
|
|
|
|
- Move jcmd to the headless package
|
|
|
|
|
- ** This tarball is embargoed until 2023-10-17 @ 1pm PT. **
|
|
|
|
|
- Resolves: RHEL-12204
|
|
|
|
|
- Resolves: RHEL-13670
|
|
|
|
|
- Resolves: RHEL-13680
|
|
|
|
|
- Resolves: RHEL-13689
|
|
|
|
|
- Resolves: RHEL-13708
|
|
|
|
|
- Resolves: RHEL-13658
|
|
|
|
|
|
|
|
|
|
* Mon Sep 04 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.8.1.1-2
|
|
|
|
|
- Bump release number so we are newer than 9.0
|
|
|
|
|
- Related: rhbz#2236591
|
|
|
|
|
|
|
|
|
|
* Sat Sep 02 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.8.1.1-1
|
|
|
|
|
- Update to jdk-17.0.8.1+1 (GA)
|
|
|
|
|
- Update release notes to 17.0.8.1+1
|
|
|
|
|
- Add backport of JDK-8312489 already upstream in 17.0.10 (see OPENJDK-2095)
|
|
|
|
|
- Update openjdk_news script to specify subdirectory last
|
|
|
|
|
- Add missing discover_trees script required by openjdk_news
|
|
|
|
|
- Synchronise runtime and buildtime tzdata requirements
|
|
|
|
|
- Resolves: rhbz#2236591
|
|
|
|
|
|
|
|
|
|
* Wed Jul 19 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.8.0.7-2
|
|
|
|
|
- Bump release number so we are newer than 8.6
|
|
|
|
|
- Related: rhbz#2221106
|
|
|
|
|
|
eabdullin
1 year ago