import UBI java-1.8.0-openjdk-1.8.0.422.b05-2.el8
This commit is contained in:
parent
2262957a9a
commit
6b26ab199a
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
|||||||
SOURCES/shenandoah8u412-b08.tar.xz
|
SOURCES/shenandoah8u422-b05.tar.xz
|
||||||
SOURCES/tapsets-icedtea-3.15.0.tar.xz
|
SOURCES/tapsets-icedtea-3.15.0.tar.xz
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
9cb6b4c557e9a433fe4c16b3996f998335cec8a5 SOURCES/shenandoah8u412-b08.tar.xz
|
e2828a59a56b737f58f33dc21f654e92bdfc085e SOURCES/shenandoah8u422-b05.tar.xz
|
||||||
7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz
|
7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz
|
||||||
|
3006
SOURCES/NEWS
Normal file
3006
SOURCES/NEWS
Normal file
File diff suppressed because it is too large
Load Diff
@ -107,6 +107,8 @@
|
|||||||
%global ssbd_arches x86_64
|
%global ssbd_arches x86_64
|
||||||
# Set of architectures where we verify backtraces with gdb
|
# Set of architectures where we verify backtraces with gdb
|
||||||
%global gdb_arches %{jit_arches} %{zero_arches}
|
%global gdb_arches %{jit_arches} %{zero_arches}
|
||||||
|
# Architecture on which we run Java only tests
|
||||||
|
%global jdk_test_arch x86_64
|
||||||
|
|
||||||
# By default, we build a debug build during main build on JIT architectures
|
# By default, we build a debug build during main build on JIT architectures
|
||||||
%if %{with slowdebug}
|
%if %{with slowdebug}
|
||||||
@ -267,7 +269,7 @@
|
|||||||
# Define version of OpenJDK 8 used
|
# Define version of OpenJDK 8 used
|
||||||
%global project openjdk
|
%global project openjdk
|
||||||
%global repo shenandoah-jdk8u
|
%global repo shenandoah-jdk8u
|
||||||
%global openjdk_revision 8u412-b08
|
%global openjdk_revision 8u422-b05
|
||||||
%global shenandoah_revision shenandoah%{openjdk_revision}
|
%global shenandoah_revision shenandoah%{openjdk_revision}
|
||||||
# Define IcedTea version used for SystemTap tapsets and desktop file
|
# Define IcedTea version used for SystemTap tapsets and desktop file
|
||||||
%global icedteaver 3.15.0
|
%global icedteaver 3.15.0
|
||||||
@ -313,7 +315,7 @@
|
|||||||
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
|
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
|
||||||
# eg jdk8u60-b27 -> b27
|
# eg jdk8u60-b27 -> b27
|
||||||
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
|
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
|
||||||
%global rpmrelease 2
|
%global rpmrelease 1
|
||||||
# Define milestone (EA for pre-releases, GA ("fcs") for releases)
|
# Define milestone (EA for pre-releases, GA ("fcs") for releases)
|
||||||
# Release will be (where N is usually a number starting at 1):
|
# Release will be (where N is usually a number starting at 1):
|
||||||
# - 0.N%%{?extraver}%%{?dist} for EA releases,
|
# - 0.N%%{?extraver}%%{?dist} for EA releases,
|
||||||
@ -475,9 +477,6 @@ Source17: nss.fips.cfg.in
|
|||||||
# Ensure translations are available for new timezones
|
# Ensure translations are available for new timezones
|
||||||
Source18: TestTranslations.java
|
Source18: TestTranslations.java
|
||||||
|
|
||||||
# Disabled in portables
|
|
||||||
#Source20: repackReproduciblePolycies.sh
|
|
||||||
|
|
||||||
# New versions of config files with aarch64 support. This is not upstream yet.
|
# New versions of config files with aarch64 support. This is not upstream yet.
|
||||||
Source100: config.guess
|
Source100: config.guess
|
||||||
Source101: config.sub
|
Source101: config.sub
|
||||||
@ -668,17 +667,15 @@ BuildRequires: nss-devel
|
|||||||
#BuildRequires: crypto-policies
|
#BuildRequires: crypto-policies
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: xorg-x11-proto-devel
|
BuildRequires: xorg-x11-proto-devel
|
||||||
BuildRequires: zip
|
|
||||||
BuildRequires: tar
|
BuildRequires: tar
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
|
BuildRequires: zip
|
||||||
# Require a boot JDK which doesn't fail due to RH1482244
|
# Require a boot JDK which doesn't fail due to RH1482244
|
||||||
BuildRequires: java-%{buildjdkver}-openjdk-devel >= 1.7.0.151-2.6.11.3
|
BuildRequires: java-%{buildjdkver}-openjdk-devel >= 1.7.0.151-2.6.11.3
|
||||||
# Zero-assembler build requirement
|
# Zero-assembler build requirement
|
||||||
%ifarch %{zero_arches}
|
%ifarch %{zero_arches}
|
||||||
BuildRequires: libffi-devel
|
BuildRequires: libffi-devel
|
||||||
%endif
|
%endif
|
||||||
# 2024a required as of JDK-8325150
|
|
||||||
BuildRequires: tzdata-java >= 2024a
|
|
||||||
# Earlier versions have a bug in tree vectorization on PPC
|
# Earlier versions have a bug in tree vectorization on PPC
|
||||||
BuildRequires: gcc >= 4.8.3-8
|
BuildRequires: gcc >= 4.8.3-8
|
||||||
|
|
||||||
@ -693,17 +690,18 @@ BuildRequires: giflib-devel
|
|||||||
BuildRequires: lcms2-devel
|
BuildRequires: lcms2-devel
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
BuildRequires: libpng-devel
|
BuildRequires: libpng-devel
|
||||||
|
BuildRequires: zlib-devel
|
||||||
%else
|
%else
|
||||||
# Version in jdk/src/share/native/java/util/zip/zlib/zlib.h
|
|
||||||
Provides: bundled(zlib) = 1.2.13
|
|
||||||
# Version in jdk/src/share/native/sun/awt/giflib/gif_lib.h
|
# Version in jdk/src/share/native/sun/awt/giflib/gif_lib.h
|
||||||
Provides: bundled(giflib) = 5.2.1
|
Provides: bundled(giflib) = 5.2.1
|
||||||
# Version in jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h
|
# Version in jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h
|
||||||
Provides: bundled(lcms2) = 2.10.0
|
Provides: bundled(lcms2) = 2.11.0
|
||||||
# Version in jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h
|
# Version in jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h
|
||||||
Provides: bundled(libjpeg) = 6b
|
Provides: bundled(libjpeg) = 6b
|
||||||
# Version in jdk/src/share/native/sun/awt/libpng/png.h
|
# Version in jdk/src/share/native/sun/awt/libpng/png.h
|
||||||
Provides: bundled(libpng) = 1.6.39
|
Provides: bundled(libpng) = 1.6.39
|
||||||
|
# Version in jdk/src/share/native/java/util/zip/zlib/zlib.h
|
||||||
|
Provides: bundled(zlib) = 1.2.13
|
||||||
# We link statically against libstdc++ to increase portability
|
# We link statically against libstdc++ to increase portability
|
||||||
BuildRequires: libstdc++-static
|
BuildRequires: libstdc++-static
|
||||||
%endif
|
%endif
|
||||||
@ -865,7 +863,6 @@ sh %{SOURCE12}
|
|||||||
%patch -P105
|
%patch -P105
|
||||||
|
|
||||||
# Upstreamable fixes
|
# Upstreamable fixes
|
||||||
%patch -P502
|
|
||||||
%patch -P512
|
%patch -P512
|
||||||
%patch -P523
|
%patch -P523
|
||||||
%patch -P528
|
%patch -P528
|
||||||
@ -875,6 +872,9 @@ sh %{SOURCE12}
|
|||||||
%patch -P581
|
%patch -P581
|
||||||
%patch -P541
|
%patch -P541
|
||||||
%patch -P12
|
%patch -P12
|
||||||
|
pushd %{top_level_dir_name}
|
||||||
|
%patch -P502 -p1
|
||||||
|
popd
|
||||||
|
|
||||||
pushd %{top_level_dir_name}
|
pushd %{top_level_dir_name}
|
||||||
# Add crypto policy and FIPS support
|
# Add crypto policy and FIPS support
|
||||||
@ -1147,6 +1147,13 @@ function packagejdk() {
|
|||||||
jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
|
jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
|
||||||
jrename=%{jreportablename -- "$nameSuffix"}
|
jrename=%{jreportablename -- "$nameSuffix"}
|
||||||
jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
|
jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
|
||||||
|
|
||||||
|
# Rename directories for packaging
|
||||||
|
mv %{jdkimage} ${jdkname}
|
||||||
|
mv %{jreimage} ${jrename}
|
||||||
|
|
||||||
|
# Release images have external debug symbols
|
||||||
|
if [ "x$suffix" = "x" ] ; then
|
||||||
debugjdkarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
|
debugjdkarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
|
||||||
debugjrearchive=${packagesdir}/%{jreportablearchive -- "${nameSuffix}.debuginfo"}
|
debugjrearchive=${packagesdir}/%{jreportablearchive -- "${nameSuffix}.debuginfo"}
|
||||||
unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
|
unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
|
||||||
@ -1158,12 +1165,6 @@ function packagejdk() {
|
|||||||
miscname=%{miscportablename}
|
miscname=%{miscportablename}
|
||||||
miscarchive=${packagesdir}/%{miscportablearchive}
|
miscarchive=${packagesdir}/%{miscportablearchive}
|
||||||
|
|
||||||
# Rename directories for packaging
|
|
||||||
mv %{jdkimage} ${jdkname}
|
|
||||||
mv %{jreimage} ${jrename}
|
|
||||||
|
|
||||||
# Release images have external debug symbols
|
|
||||||
if [ "x$suffix" = "x" ] ; then
|
|
||||||
# Keep the unstripped version for consumption by RHEL RPMs
|
# Keep the unstripped version for consumption by RHEL RPMs
|
||||||
tar ${tar_opts} ${unstrippedarchive} ${jdkname}
|
tar ${tar_opts} ${unstrippedarchive} ${jdkname}
|
||||||
genchecksum ${unstrippedarchive}
|
genchecksum ${unstrippedarchive}
|
||||||
@ -1288,6 +1289,9 @@ for suffix in %{build_loop} ; do
|
|||||||
|
|
||||||
export JAVA_HOME=$(pwd)/%{installoutputdir -- $suffix}/images/%{jdkimage}
|
export JAVA_HOME=$(pwd)/%{installoutputdir -- $suffix}/images/%{jdkimage}
|
||||||
|
|
||||||
|
# Only test on one architecture (the fastest) for Java only tests
|
||||||
|
%ifarch %{jdk_test_arch}
|
||||||
|
|
||||||
# Check unlimited policy has been used
|
# Check unlimited policy has been used
|
||||||
$JAVA_HOME/bin/javac -d . %{SOURCE13}
|
$JAVA_HOME/bin/javac -d . %{SOURCE13}
|
||||||
$JAVA_HOME/bin/java TestCryptoLevel
|
$JAVA_HOME/bin/java TestCryptoLevel
|
||||||
@ -1299,10 +1303,10 @@ $JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
|
|||||||
# Check system crypto (policy) is active and can be disabled
|
# Check system crypto (policy) is active and can be disabled
|
||||||
# Test takes a single argument - true or false - to state whether system
|
# Test takes a single argument - true or false - to state whether system
|
||||||
# security properties are enabled or not.
|
# security properties are enabled or not.
|
||||||
|
# Portable specific: default is false
|
||||||
$JAVA_HOME/bin/javac -d . %{SOURCE15}
|
$JAVA_HOME/bin/javac -d . %{SOURCE15}
|
||||||
export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
|
export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
|
||||||
export SEC_DEBUG="-Djava.security.debug=properties"
|
export SEC_DEBUG="-Djava.security.debug=properties"
|
||||||
# Portable specific: set false whereas its true for upstream
|
|
||||||
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} false
|
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} false
|
||||||
$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false
|
$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false
|
||||||
|
|
||||||
@ -1310,6 +1314,30 @@ $JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=tru
|
|||||||
$JAVA_HOME/bin/javac -d . %{SOURCE16}
|
$JAVA_HOME/bin/javac -d . %{SOURCE16}
|
||||||
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" %{oj_vendor_url} %{oj_vendor_bug_url}
|
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" %{oj_vendor_url} %{oj_vendor_bug_url}
|
||||||
|
|
||||||
|
# Check translations are available for new timezones
|
||||||
|
$JAVA_HOME/bin/javac -d . %{SOURCE18}
|
||||||
|
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
|
||||||
|
|
||||||
|
# Check src.zip has all sources. See RHBZ#1130490
|
||||||
|
unzip -l $JAVA_HOME/src.zip | grep 'sun.misc.Unsafe'
|
||||||
|
|
||||||
|
# Check class files include useful debugging information
|
||||||
|
$JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from"
|
||||||
|
$JAVA_HOME/bin/javap -l java.lang.Object | grep LineNumberTable
|
||||||
|
$JAVA_HOME/bin/javap -l java.lang.Object | grep LocalVariableTable
|
||||||
|
|
||||||
|
# Check generated class files include useful debugging information
|
||||||
|
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep "Compiled from"
|
||||||
|
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LineNumberTable
|
||||||
|
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
|
||||||
|
|
||||||
|
%else
|
||||||
|
|
||||||
|
# Just run a basic java -version test on other architectures
|
||||||
|
$JAVA_HOME/bin/java -version
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
# Check java launcher has no SSB mitigation
|
# Check java launcher has no SSB mitigation
|
||||||
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
|
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
|
||||||
|
|
||||||
@ -1320,10 +1348,6 @@ nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
|
|||||||
if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
|
if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Check translations are available for new timezones
|
|
||||||
$JAVA_HOME/bin/javac -d . %{SOURCE18}
|
|
||||||
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
|
|
||||||
|
|
||||||
# Release builds strip the debug symbols into external .debuginfo files
|
# Release builds strip the debug symbols into external .debuginfo files
|
||||||
if [ "x$suffix" = "x" ] ; then
|
if [ "x$suffix" = "x" ] ; then
|
||||||
so_suffix="debuginfo"
|
so_suffix="debuginfo"
|
||||||
@ -1397,19 +1421,6 @@ EOF
|
|||||||
grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
|
grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Check src.zip has all sources. See RHBZ#1130490
|
|
||||||
jar -tf $JAVA_HOME/src.zip | grep 'sun.misc.Unsafe'
|
|
||||||
|
|
||||||
# Check class files include useful debugging information
|
|
||||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from"
|
|
||||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep LineNumberTable
|
|
||||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep LocalVariableTable
|
|
||||||
|
|
||||||
# Check generated class files include useful debugging information
|
|
||||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep "Compiled from"
|
|
||||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LineNumberTable
|
|
||||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
|
|
||||||
|
|
||||||
# build cycles check
|
# build cycles check
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -1425,12 +1436,9 @@ for suffix in %{build_loop} ; do
|
|||||||
nameSuffix=`echo "$suffix"| sed s/-/./`
|
nameSuffix=`echo "$suffix"| sed s/-/./`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# These definitions should match those in installjdk
|
# These definitions should match those in packagejdk
|
||||||
jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
|
jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
|
||||||
jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
|
jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
|
||||||
debugjdkarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
|
|
||||||
debugjrearchive=${packagesdir}/%{jreportablearchive -- "${nameSuffix}.debuginfo"}
|
|
||||||
unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
|
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
|
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
|
||||||
|
|
||||||
@ -1440,24 +1448,26 @@ for suffix in %{build_loop} ; do
|
|||||||
mv ${jrearchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
mv ${jrearchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
||||||
|
|
||||||
if [ "x$suffix" = "x" ] ; then
|
if [ "x$suffix" = "x" ] ; then
|
||||||
|
# These definitions should match those in packagejdk
|
||||||
|
debugjdkarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
|
||||||
|
debugjrearchive=${packagesdir}/%{jreportablearchive -- "${nameSuffix}.debuginfo"}
|
||||||
|
unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
|
||||||
|
docarchive=${packagesdir}/%{docportablearchive}
|
||||||
|
miscarchive=${packagesdir}/%{miscportablearchive}
|
||||||
|
|
||||||
mv ${debugjdkarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
mv ${debugjdkarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
||||||
mv ${debugjdkarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
mv ${debugjdkarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
||||||
mv ${debugjrearchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
mv ${debugjrearchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
||||||
mv ${debugjrearchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
mv ${debugjrearchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
||||||
mv ${unstrippedarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
mv ${unstrippedarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
||||||
mv ${unstrippedarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
mv ${unstrippedarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# These definitions should match those in installjdk
|
|
||||||
# Install outside the loop as there are no debug variants
|
|
||||||
docarchive=${packagesdir}/%{docportablearchive}
|
|
||||||
miscarchive=${packagesdir}/%{miscportablearchive}
|
|
||||||
|
|
||||||
mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
||||||
mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
||||||
mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
||||||
mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
||||||
|
fi
|
||||||
|
|
||||||
|
done
|
||||||
|
|
||||||
# To show sha in the build log
|
# To show sha in the build log
|
||||||
for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
|
for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
|
||||||
@ -1465,7 +1475,6 @@ for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
|
|||||||
cat $file ;
|
cat $file ;
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
%if %{include_normal_build}
|
%if %{include_normal_build}
|
||||||
|
|
||||||
%files
|
%files
|
||||||
@ -1474,23 +1483,36 @@ done
|
|||||||
%{_jvmdir}/%{jreportablearchive -- .debuginfo}
|
%{_jvmdir}/%{jreportablearchive -- .debuginfo}
|
||||||
%{_jvmdir}/%{jreportablearchive -- %%{nil}}.sha256sum
|
%{_jvmdir}/%{jreportablearchive -- %%{nil}}.sha256sum
|
||||||
%{_jvmdir}/%{jreportablearchive -- .debuginfo}.sha256sum
|
%{_jvmdir}/%{jreportablearchive -- .debuginfo}.sha256sum
|
||||||
|
|
||||||
%else
|
%else
|
||||||
|
|
||||||
%files
|
%files
|
||||||
# placeholder
|
# placeholder
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{include_normal_build}
|
%if %{include_normal_build}
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_jvmdir}/%{jdkportablearchive -- %%{nil}}
|
%{_jvmdir}/%{jdkportablearchive -- %%{nil}}
|
||||||
%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
|
%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
|
||||||
%{_jvmdir}/%{jdkportablearchive -- %%{nil}}.sha256sum
|
%{_jvmdir}/%{jdkportablearchive -- %%{nil}}.sha256sum
|
||||||
%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
|
%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
|
||||||
%endif
|
|
||||||
|
|
||||||
%files unstripped
|
%files unstripped
|
||||||
%{_jvmdir}/%{jdkportablearchive -- .unstripped}
|
%{_jvmdir}/%{jdkportablearchive -- .unstripped}
|
||||||
%{_jvmdir}/%{jdkportablearchive -- .unstripped}.sha256sum
|
%{_jvmdir}/%{jdkportablearchive -- .unstripped}.sha256sum
|
||||||
|
|
||||||
|
%files docs
|
||||||
|
%{_jvmdir}/%{docportablearchive}
|
||||||
|
%{_jvmdir}/%{docportablearchive}.sha256sum
|
||||||
|
|
||||||
|
%files misc
|
||||||
|
%{_jvmdir}/%{miscportablearchive}
|
||||||
|
%{_jvmdir}/%{miscportablearchive}.sha256sum
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %{include_debug_build}
|
%if %{include_debug_build}
|
||||||
|
|
||||||
%files slowdebug
|
%files slowdebug
|
||||||
@ -1500,6 +1522,7 @@ done
|
|||||||
%files devel-slowdebug
|
%files devel-slowdebug
|
||||||
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}
|
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}
|
||||||
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}.sha256sum
|
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}.sha256sum
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{include_fastdebug_build}
|
%if %{include_fastdebug_build}
|
||||||
@ -1514,15 +1537,29 @@ done
|
|||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files docs
|
|
||||||
%{_jvmdir}/%{docportablearchive}
|
|
||||||
%{_jvmdir}/%{docportablearchive}.sha256sum
|
|
||||||
|
|
||||||
%files misc
|
|
||||||
%{_jvmdir}/%{miscportablearchive}
|
|
||||||
%{_jvmdir}/%{miscportablearchive}.sha256sum
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.422.b05-1.1
|
||||||
|
- Update to shenandoah-jdk8u422-b05 (GA)
|
||||||
|
- Update release notes for shenandoah-8u422-b05.
|
||||||
|
- Rebase PR2462 patch following patched hunk being removed by JDK-8322106
|
||||||
|
- Switch to GA mode.
|
||||||
|
- Limit Java only tests to one architecture using jdk_test_arch
|
||||||
|
- Remove unused policy repacking script repackReproduciblePolycies.sh
|
||||||
|
- Sync README.md with RHEL 8
|
||||||
|
- Add missing build dependency on zlib-devel
|
||||||
|
- Update LCMS version to match JDK-8245400
|
||||||
|
- Move unstripped, misc and doc tarball handling into normal build / no suffix blocks
|
||||||
|
- Drop unneeded tzdata-java build dependency following 11d4d3308dd3334acae563101c007be9db017b83
|
||||||
|
- ** This tarball is embargoed until 2024-07-16 @ 1pm PT. **
|
||||||
|
- Resolves: OPENJDK-3183
|
||||||
|
- Resolves: OPENJDK-3187
|
||||||
|
- Resolves: OPENJDK-3193
|
||||||
|
|
||||||
|
* Tue Jul 09 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.422.b01-0.1.ea
|
||||||
|
- Update to shenandoah-jdk8u422-b01 (EA)
|
||||||
|
- Update release notes for shenandoah-8u422-b01.
|
||||||
|
- Switch to EA mode.
|
||||||
|
|
||||||
* Wed Apr 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b08-2
|
* Wed Apr 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b08-2
|
||||||
- Add CVEs to release notes
|
- Add CVEs to release notes
|
||||||
|
|
||||||
|
@ -7,10 +7,10 @@
|
|||||||
8074839: Resolve disabled warnings for libunpack and the unpack200 binary
|
8074839: Resolve disabled warnings for libunpack and the unpack200 binary
|
||||||
Reviewed-by: dholmes, ksrini
|
Reviewed-by: dholmes, ksrini
|
||||||
|
|
||||||
diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
|
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h b/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
|
||||||
index bdaf95a2f6a..60c5b4f2a69 100644
|
index bdaf95a2f6a..60c5b4f2a69 100644
|
||||||
--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
|
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
|
||||||
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
|
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
|
||||||
@@ -63,7 +63,7 @@ struct bytes {
|
@@ -63,7 +63,7 @@ struct bytes {
|
||||||
bytes res;
|
bytes res;
|
||||||
res.ptr = ptr + beg;
|
res.ptr = ptr + beg;
|
||||||
@ -20,10 +20,10 @@ index bdaf95a2f6a..60c5b4f2a69 100644
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
// building C strings inside byte buffers:
|
// building C strings inside byte buffers:
|
||||||
diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
|
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
|
||||||
index 5fbc7261fb3..4c002e779d8 100644
|
index 5fbc7261fb3..4c002e779d8 100644
|
||||||
--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
|
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
|
||||||
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
|
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
|
||||||
@@ -292,7 +292,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_getUnusedInput(JNIEnv *env, jobject
|
@@ -292,7 +292,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_getUnusedInput(JNIEnv *env, jobject
|
||||||
|
|
||||||
if (uPtr->aborting()) {
|
if (uPtr->aborting()) {
|
||||||
@ -50,10 +50,10 @@ index 5fbc7261fb3..4c002e779d8 100644
|
|||||||
const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE);
|
const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE);
|
||||||
CHECK_EXCEPTION_RETURN_VALUE(prop, false);
|
CHECK_EXCEPTION_RETURN_VALUE(prop, false);
|
||||||
const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
|
const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
|
||||||
diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
|
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
|
||||||
index 6fbc43a18ae..722c8baaff0 100644
|
index 6fbc43a18ae..722c8baaff0 100644
|
||||||
--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
|
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
|
||||||
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
|
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
|
||||||
@@ -142,31 +142,28 @@ static const char* nbasename(const char* progname) {
|
@@ -142,31 +142,28 @@ static const char* nbasename(const char* progname) {
|
||||||
return progname;
|
return progname;
|
||||||
}
|
}
|
||||||
@ -104,10 +104,10 @@ index 6fbc43a18ae..722c8baaff0 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
|
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
|
||||||
index 56f391b1e87..f0a25f8cd20 100644
|
index a585535c513..8df3fade499 100644
|
||||||
--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
|
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
|
||||||
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
|
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
|
||||||
@@ -225,9 +225,9 @@ struct entry {
|
@@ -225,9 +225,9 @@ struct entry {
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -120,7 +120,7 @@ index 56f391b1e87..f0a25f8cd20 100644
|
|||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -718,13 +718,13 @@ void unpacker::read_file_header() {
|
@@ -719,13 +719,13 @@ void unpacker::read_file_header() {
|
||||||
// Now we can size the whole archive.
|
// Now we can size the whole archive.
|
||||||
// Read everything else into a mega-buffer.
|
// Read everything else into a mega-buffer.
|
||||||
rp = hdr.rp;
|
rp = hdr.rp;
|
||||||
@ -138,7 +138,7 @@ index 56f391b1e87..f0a25f8cd20 100644
|
|||||||
abort("EOF reading fixed input buffer");
|
abort("EOF reading fixed input buffer");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -738,7 +738,7 @@ void unpacker::read_file_header() {
|
@@ -739,7 +739,7 @@ void unpacker::read_file_header() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)),
|
input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)),
|
||||||
@ -147,7 +147,7 @@ index 56f391b1e87..f0a25f8cd20 100644
|
|||||||
CHECK;
|
CHECK;
|
||||||
assert(input.limit()[0] == 0);
|
assert(input.limit()[0] == 0);
|
||||||
// Move all the bytes we read initially into the real buffer.
|
// Move all the bytes we read initially into the real buffer.
|
||||||
@@ -961,13 +961,13 @@ void cpool::init(unpacker* u_, int counts[CONSTANT_Limit]) {
|
@@ -962,13 +962,13 @@ void cpool::init(unpacker* u_, int counts[CONSTANT_Limit]) {
|
||||||
nentries = next_entry;
|
nentries = next_entry;
|
||||||
|
|
||||||
// place a limit on future CP growth:
|
// place a limit on future CP growth:
|
||||||
@ -163,18 +163,7 @@ index 56f391b1e87..f0a25f8cd20 100644
|
|||||||
|
|
||||||
// Note that this CP does not include "empty" entries
|
// Note that this CP does not include "empty" entries
|
||||||
// for longs and doubles. Those are introduced when
|
// for longs and doubles. Those are introduced when
|
||||||
@@ -985,8 +985,9 @@ void cpool::init(unpacker* u_, int counts[CONSTANT_Limit]) {
|
@@ -3694,21 +3694,22 @@ void cpool::computeOutputIndexes() {
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize *all* our entries once
|
|
||||||
- for (int i = 0 ; i < maxentries ; i++)
|
|
||||||
+ for (uint i = 0 ; i < maxentries ; i++) {
|
|
||||||
entries[i].outputIndex = REQUESTED_NONE;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
initGroupIndexes();
|
|
||||||
// Initialize hashTab to a generous power-of-two size.
|
|
||||||
@@ -3681,21 +3682,22 @@ void cpool::computeOutputIndexes() {
|
|
||||||
|
|
||||||
unpacker* debug_u;
|
unpacker* debug_u;
|
||||||
|
|
||||||
@ -201,7 +190,7 @@ index 56f391b1e87..f0a25f8cd20 100644
|
|||||||
case CONSTANT_Signature:
|
case CONSTANT_Signature:
|
||||||
if (value.b.ptr == null)
|
if (value.b.ptr == null)
|
||||||
return ref(0)->string();
|
return ref(0)->string();
|
||||||
@@ -3715,26 +3717,28 @@ char* entry::string() {
|
@@ -3728,26 +3729,28 @@ char* entry::string() {
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (nrefs == 0) {
|
if (nrefs == 0) {
|
||||||
@ -239,10 +228,10 @@ index 56f391b1e87..f0a25f8cd20 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
void print_cp_entries(int beg, int end) {
|
void print_cp_entries(int beg, int end) {
|
||||||
diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
|
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
|
||||||
index cec7a88b24e..ed5f3336a59 100644
|
index 4ec595333c4..aad0c971ef2 100644
|
||||||
--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
|
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
|
||||||
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
|
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
|
||||||
@@ -209,7 +209,7 @@ struct unpacker {
|
@@ -209,7 +209,7 @@ struct unpacker {
|
||||||
byte* rp; // read pointer (< rplimit <= input.limit())
|
byte* rp; // read pointer (< rplimit <= input.limit())
|
||||||
byte* rplimit; // how much of the input block has been read?
|
byte* rplimit; // how much of the input block has been read?
|
||||||
@ -252,10 +241,10 @@ index cec7a88b24e..ed5f3336a59 100644
|
|||||||
|
|
||||||
// callback to read at least one byte, up to available input
|
// callback to read at least one byte, up to available input
|
||||||
typedef jlong (*read_input_fn_t)(unpacker* self, void* buf, jlong minlen, jlong maxlen);
|
typedef jlong (*read_input_fn_t)(unpacker* self, void* buf, jlong minlen, jlong maxlen);
|
||||||
diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
|
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
|
||||||
index e5197e1a3f1..40a10055ea5 100644
|
index da39a589545..1281d8b25c8 100644
|
||||||
--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
|
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
|
||||||
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
|
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
|
||||||
@@ -81,7 +81,7 @@ void breakpoint() { } // hook for debugger
|
@@ -81,7 +81,7 @@ void breakpoint() { } // hook for debugger
|
||||||
int assert_failed(const char* p) {
|
int assert_failed(const char* p) {
|
||||||
char message[1<<12];
|
char message[1<<12];
|
||||||
@ -265,10 +254,10 @@ index e5197e1a3f1..40a10055ea5 100644
|
|||||||
breakpoint();
|
breakpoint();
|
||||||
unpack_abort(message);
|
unpack_abort(message);
|
||||||
return 0;
|
return 0;
|
||||||
diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
|
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
|
||||||
index f58c94956c0..343da3e183b 100644
|
index f58c94956c0..343da3e183b 100644
|
||||||
--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
|
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
|
||||||
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
|
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
|
||||||
@@ -84,7 +84,7 @@ void jar::init(unpacker* u_) {
|
@@ -84,7 +84,7 @@ void jar::init(unpacker* u_) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -293,10 +282,10 @@ index f58c94956c0..343da3e183b 100644
|
|||||||
|
|
||||||
PRINTCR((2, "writing zip comment\n"));
|
PRINTCR((2, "writing zip comment\n"));
|
||||||
// Write the comment.
|
// Write the comment.
|
||||||
diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
|
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h b/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
|
||||||
index 14ffc9d65bd..9877f6f68ca 100644
|
index 14ffc9d65bd..9877f6f68ca 100644
|
||||||
--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
|
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
|
||||||
+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
|
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
|
||||||
@@ -68,8 +68,8 @@ struct jar {
|
@@ -68,8 +68,8 @@ struct jar {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -133,6 +133,8 @@
|
|||||||
%global gdb_arches %{jit_arches} %{zero_arches}
|
%global gdb_arches %{jit_arches} %{zero_arches}
|
||||||
# Set of architectures for which we have a portable build
|
# Set of architectures for which we have a portable build
|
||||||
%global portable_build_arches %{aarch64} %{ix86} %{power64} s390x x86_64
|
%global portable_build_arches %{aarch64} %{ix86} %{power64} s390x x86_64
|
||||||
|
# Architecture on which we run Java only tests
|
||||||
|
%global jdk_test_arch x86_64
|
||||||
|
|
||||||
# By default, we build a debug build during main build on JIT architectures
|
# By default, we build a debug build during main build on JIT architectures
|
||||||
%if %{with slowdebug}
|
%if %{with slowdebug}
|
||||||
@ -297,7 +299,7 @@
|
|||||||
# Define version of OpenJDK 8 used
|
# Define version of OpenJDK 8 used
|
||||||
%global project openjdk
|
%global project openjdk
|
||||||
%global repo shenandoah-jdk8u
|
%global repo shenandoah-jdk8u
|
||||||
%global openjdk_revision 8u412-b08
|
%global openjdk_revision 8u422-b05
|
||||||
%global shenandoah_revision shenandoah%{openjdk_revision}
|
%global shenandoah_revision shenandoah%{openjdk_revision}
|
||||||
# Define IcedTea version used for SystemTap tapsets and desktop files
|
# Define IcedTea version used for SystemTap tapsets and desktop files
|
||||||
%global icedteaver 3.15.0
|
%global icedteaver 3.15.0
|
||||||
@ -343,9 +345,10 @@
|
|||||||
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
|
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
|
||||||
# eg jdk8u60-b27 -> b27
|
# eg jdk8u60-b27 -> b27
|
||||||
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
|
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
|
||||||
|
# rpmrelease numbering must start at 2 to be later than the 8.6 RPM
|
||||||
%global rpmrelease 2
|
%global rpmrelease 2
|
||||||
# Settings used by the portable build
|
# Settings used by the portable build
|
||||||
%global portablerelease 2
|
%global portablerelease 1
|
||||||
%global portablesuffix el8
|
%global portablesuffix el8
|
||||||
%global portablebuilddir /builddir/build/BUILD
|
%global portablebuilddir /builddir/build/BUILD
|
||||||
|
|
||||||
@ -1147,8 +1150,7 @@ Requires: ca-certificates
|
|||||||
# Require javapackages-filesystem for ownership of /usr/lib/jvm/
|
# Require javapackages-filesystem for ownership of /usr/lib/jvm/
|
||||||
Requires: javapackages-filesystem
|
Requires: javapackages-filesystem
|
||||||
# 2024a required as of JDK-8325150
|
# 2024a required as of JDK-8325150
|
||||||
# Use 2023d until 2024a is in the buildroot
|
Requires: tzdata-java >= 2024a
|
||||||
Requires: tzdata-java >= 2023d
|
|
||||||
# for support of kernel stream control
|
# for support of kernel stream control
|
||||||
# libsctp.so.1 is being `dlopen`ed on demand
|
# libsctp.so.1 is being `dlopen`ed on demand
|
||||||
Requires: lksctp-tools%{?_isa}
|
Requires: lksctp-tools%{?_isa}
|
||||||
@ -1330,7 +1332,7 @@ Source10: policytool.desktop.in
|
|||||||
Source11: nss.cfg.in
|
Source11: nss.cfg.in
|
||||||
|
|
||||||
# Removed libraries that we link instead
|
# Removed libraries that we link instead
|
||||||
Source12: %{name}-remove-intree-libraries.sh
|
Source12: remove-intree-libraries.sh
|
||||||
|
|
||||||
# Ensure we aren't using the limited crypto policy
|
# Ensure we aren't using the limited crypto policy
|
||||||
Source13: TestCryptoLevel.java
|
Source13: TestCryptoLevel.java
|
||||||
@ -1350,8 +1352,6 @@ Source17: nss.fips.cfg.in
|
|||||||
# Ensure translations are available for new timezones
|
# Ensure translations are available for new timezones
|
||||||
Source18: TestTranslations.java
|
Source18: TestTranslations.java
|
||||||
|
|
||||||
Source21: repackReproduciblePolycies.sh
|
|
||||||
|
|
||||||
# New versions of config files with aarch64 support. This is not upstream yet.
|
# New versions of config files with aarch64 support. This is not upstream yet.
|
||||||
Source100: config.guess
|
Source100: config.guess
|
||||||
Source101: config.sub
|
Source101: config.sub
|
||||||
@ -1359,6 +1359,10 @@ Source101: config.sub
|
|||||||
# Include portable spec and instructions on how to rebuild
|
# Include portable spec and instructions on how to rebuild
|
||||||
Source19: README.md
|
Source19: README.md
|
||||||
Source20: java-1.%{majorver}.0-openjdk-portable.specfile
|
Source20: java-1.%{majorver}.0-openjdk-portable.specfile
|
||||||
|
Source21: NEWS
|
||||||
|
|
||||||
|
# Repack export policy JARs with reproducible timestamps
|
||||||
|
Source22: repack_reproducible_policies.sh
|
||||||
|
|
||||||
# Setup variables to reference correct sources
|
# Setup variables to reference correct sources
|
||||||
%global releasezip %{_jvmdir}/%{name}-portable-%{version}-%{prelease}.portable.unstripped.jdk.%{_arch}.tar.xz
|
%global releasezip %{_jvmdir}/%{name}-portable-%{version}-%{prelease}.portable.unstripped.jdk.%{_arch}.tar.xz
|
||||||
@ -1553,8 +1557,9 @@ BuildRequires: nss-devel
|
|||||||
BuildRequires: crypto-policies
|
BuildRequires: crypto-policies
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: xorg-x11-proto-devel
|
BuildRequires: xorg-x11-proto-devel
|
||||||
BuildRequires: zip
|
BuildRequires: tar
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
|
BuildRequires: zip
|
||||||
# For definitions and macros like jvmdir
|
# For definitions and macros like jvmdir
|
||||||
BuildRequires: javapackages-filesystem
|
BuildRequires: javapackages-filesystem
|
||||||
%if %{include_normal_build}
|
%if %{include_normal_build}
|
||||||
@ -1573,8 +1578,7 @@ BuildRequires: java-1.%{majorver}.0-openjdk-portable-misc = %{epoch}:%{version}-
|
|||||||
BuildRequires: libffi-devel
|
BuildRequires: libffi-devel
|
||||||
%endif
|
%endif
|
||||||
# 2024a required as of JDK-8325150
|
# 2024a required as of JDK-8325150
|
||||||
# Use 2023d until 2024a is in the buildroot
|
BuildRequires: tzdata-java >= 2024a
|
||||||
BuildRequires: tzdata-java >= 2023d
|
|
||||||
# Earlier versions have a bug in tree vectorization on PPC
|
# Earlier versions have a bug in tree vectorization on PPC
|
||||||
BuildRequires: gcc >= 4.8.3-8
|
BuildRequires: gcc >= 4.8.3-8
|
||||||
|
|
||||||
@ -1587,17 +1591,18 @@ BuildRequires: giflib-devel
|
|||||||
BuildRequires: lcms2-devel
|
BuildRequires: lcms2-devel
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
BuildRequires: libpng-devel
|
BuildRequires: libpng-devel
|
||||||
|
BuildRequires: zlib-devel
|
||||||
%else
|
%else
|
||||||
# Version in jdk/src/share/native/java/util/zip/zlib/zlib.h
|
|
||||||
Provides: bundled(zlib) = 1.2.13
|
|
||||||
# Version in jdk/src/share/native/sun/awt/giflib/gif_lib.h
|
# Version in jdk/src/share/native/sun/awt/giflib/gif_lib.h
|
||||||
Provides: bundled(giflib) = 5.2.1
|
Provides: bundled(giflib) = 5.2.1
|
||||||
# Version in jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h
|
# Version in jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h
|
||||||
Provides: bundled(lcms2) = 2.10.0
|
Provides: bundled(lcms2) = 2.11.0
|
||||||
# Version in jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h
|
# Version in jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h
|
||||||
Provides: bundled(libjpeg) = 6b
|
Provides: bundled(libjpeg) = 6b
|
||||||
# Version in jdk/src/share/native/sun/awt/libpng/png.h
|
# Version in jdk/src/share/native/sun/awt/libpng/png.h
|
||||||
Provides: bundled(libpng) = 1.6.39
|
Provides: bundled(libpng) = 1.6.39
|
||||||
|
# Version in jdk/src/share/native/java/util/zip/zlib/zlib.h
|
||||||
|
Provides: bundled(zlib) = 1.2.13
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# this is always built, also during debug-only build
|
# this is always built, also during debug-only build
|
||||||
@ -1931,7 +1936,6 @@ sh %{SOURCE12}
|
|||||||
%patch -P105
|
%patch -P105
|
||||||
|
|
||||||
# Upstreamable fixes
|
# Upstreamable fixes
|
||||||
%patch -P502
|
|
||||||
%patch -P512
|
%patch -P512
|
||||||
%patch -P523
|
%patch -P523
|
||||||
%patch -P528
|
%patch -P528
|
||||||
@ -1941,6 +1945,9 @@ sh %{SOURCE12}
|
|||||||
%patch -P581
|
%patch -P581
|
||||||
%patch -P541
|
%patch -P541
|
||||||
%patch -P12
|
%patch -P12
|
||||||
|
pushd %{top_level_dir_name}
|
||||||
|
%patch -P502 -p1
|
||||||
|
popd
|
||||||
|
|
||||||
pushd %{top_level_dir_name}
|
pushd %{top_level_dir_name}
|
||||||
# Add crypto policy and FIPS support
|
# Add crypto policy and FIPS support
|
||||||
@ -2076,6 +2083,9 @@ for suffix in %{build_loop} ; do
|
|||||||
|
|
||||||
export JAVA_HOME=$(pwd)/%{installoutputdir -- $suffix}
|
export JAVA_HOME=$(pwd)/%{installoutputdir -- $suffix}
|
||||||
|
|
||||||
|
# Only test on one architecture (the fastest) for Java only tests
|
||||||
|
%ifarch %{jdk_test_arch}
|
||||||
|
|
||||||
# Check unlimited policy has been used
|
# Check unlimited policy has been used
|
||||||
$JAVA_HOME/bin/javac -d . %{SOURCE13}
|
$JAVA_HOME/bin/javac -d . %{SOURCE13}
|
||||||
$JAVA_HOME/bin/java TestCryptoLevel
|
$JAVA_HOME/bin/java TestCryptoLevel
|
||||||
@ -2093,6 +2103,34 @@ export SEC_DEBUG="-Djava.security.debug=properties"
|
|||||||
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} true
|
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} true
|
||||||
$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false
|
$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false
|
||||||
|
|
||||||
|
# Check correct vendor values have been set
|
||||||
|
$JAVA_HOME/bin/javac -d . %{SOURCE16}
|
||||||
|
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" %{oj_vendor_url} %{oj_vendor_bug_url}
|
||||||
|
|
||||||
|
# Check translations are available for new timezones
|
||||||
|
$JAVA_HOME/bin/javac -d . %{SOURCE18}
|
||||||
|
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
|
||||||
|
|
||||||
|
# Check src.zip has all sources. See RHBZ#1130490
|
||||||
|
unzip -l $JAVA_HOME/src.zip | grep 'sun.misc.Unsafe'
|
||||||
|
|
||||||
|
# Check class files include useful debugging information
|
||||||
|
$JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from"
|
||||||
|
$JAVA_HOME/bin/javap -l java.lang.Object | grep LineNumberTable
|
||||||
|
$JAVA_HOME/bin/javap -l java.lang.Object | grep LocalVariableTable
|
||||||
|
|
||||||
|
# Check generated class files include useful debugging information
|
||||||
|
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep "Compiled from"
|
||||||
|
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LineNumberTable
|
||||||
|
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
|
||||||
|
|
||||||
|
%else
|
||||||
|
|
||||||
|
# Just run a basic java -version test on other architectures
|
||||||
|
$JAVA_HOME/bin/java -version
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
# Check java launcher has no SSB mitigation
|
# Check java launcher has no SSB mitigation
|
||||||
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
|
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
|
||||||
|
|
||||||
@ -2103,14 +2141,6 @@ nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
|
|||||||
if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
|
if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Check correct vendor values have been set
|
|
||||||
$JAVA_HOME/bin/javac -d . %{SOURCE16}
|
|
||||||
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" %{oj_vendor_url} %{oj_vendor_bug_url}
|
|
||||||
|
|
||||||
# Check translations are available for new timezones
|
|
||||||
$JAVA_HOME/bin/javac -d . %{SOURCE18}
|
|
||||||
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
|
|
||||||
|
|
||||||
# Check debug symbols are present and can identify code
|
# Check debug symbols are present and can identify code
|
||||||
find "$JAVA_HOME" -iname '*.so' -print0 | while read -d $'\0' lib
|
find "$JAVA_HOME" -iname '*.so' -print0 | while read -d $'\0' lib
|
||||||
do
|
do
|
||||||
@ -2177,19 +2207,6 @@ EOF
|
|||||||
grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
|
grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Check src.zip has all sources. See RHBZ#1130490
|
|
||||||
unzip -l $JAVA_HOME/src.zip | grep 'sun.misc.Unsafe'
|
|
||||||
|
|
||||||
# Check class files include useful debugging information
|
|
||||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from"
|
|
||||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep LineNumberTable
|
|
||||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep LocalVariableTable
|
|
||||||
|
|
||||||
# Check generated class files include useful debugging information
|
|
||||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep "Compiled from"
|
|
||||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LineNumberTable
|
|
||||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
|
|
||||||
|
|
||||||
# build cycles check
|
# build cycles check
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -2335,7 +2352,7 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/demo \
|
|||||||
popd
|
popd
|
||||||
|
|
||||||
|
|
||||||
bash %{SOURCE21} $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix} %{javaver}
|
bash %{SOURCE22} $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix} %{javaver}
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1183793
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1183793
|
||||||
touch -t 201401010000 $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/lib/security/java.security
|
touch -t 201401010000 $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/lib/security/java.security
|
||||||
|
|
||||||
@ -2654,6 +2671,31 @@ cjc.mainProgram(args)
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.422.b05-1.1
|
||||||
|
- Update to shenandoah-jdk8u422-b05 (GA)
|
||||||
|
- Update release notes for shenandoah-8u422-b05.
|
||||||
|
- Rebase PR2462 patch following patched hunk being removed by JDK-8322106
|
||||||
|
- Switch to GA mode.
|
||||||
|
- Sync the copy of the portable specfile with the latest update
|
||||||
|
- Actually require tzdata 2024a now it is available in the buildroot
|
||||||
|
- Add missing build dependencies on zlib-devel and tar
|
||||||
|
- Update LCMS version to match JDK-8245400
|
||||||
|
- ** This tarball is embargoed until 2024-07-16 @ 1pm PT. **
|
||||||
|
- Resolves: RHEL-46866
|
||||||
|
- Resolves: RHEL-47001
|
||||||
|
|
||||||
|
* Tue Jul 09 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.422.b01-0.1.ea
|
||||||
|
- Update to shenandoah-jdk8u422-b01 (EA)
|
||||||
|
- Update release notes for shenandoah-8u422-b01.
|
||||||
|
- Switch to EA mode.
|
||||||
|
- Sync the copy of the portable specfile with the latest update
|
||||||
|
- Restore NEWS file and rename remove-intree-libraries.sh so portable can be rebuilt
|
||||||
|
- Document policy repacking script and rename to correct spelling and style
|
||||||
|
- Limit Java only tests to one architecture using jdk_test_arch
|
||||||
|
- Related: RHEL-46866
|
||||||
|
- Resolves: RHEL-47067
|
||||||
|
- Resolves: RHEL-47087
|
||||||
|
|
||||||
* Mon Apr 08 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b08-2
|
* Mon Apr 08 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b08-2
|
||||||
- Update to shenandoah-jdk8u412-b08 (GA)
|
- Update to shenandoah-jdk8u412-b08 (GA)
|
||||||
- Update release notes for shenandoah-8u412-b08.
|
- Update release notes for shenandoah-8u412-b08.
|
||||||
|
Loading…
Reference in New Issue
Block a user