forked from pool/java-1_8_0-openj9
Accepting request 1146348 from Java:Factory
OpenJDK 1.8.0.b402 with OpenJ9 0.43 OBS-URL: https://build.opensuse.org/request/show/1146348 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openj9?expand=0&rev=22
This commit is contained in:
commit
52c25259c0
3
0fa9d9c53243b300211f1e7dabee29164552fe0b.zip
Normal file
3
0fa9d9c53243b300211f1e7dabee29164552fe0b.zip
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:b2a18132ee9afd041561a7e20ff3423e6f7a5df36d65a5a3ec91c763ceadba72
|
||||||
|
size 132920064
|
3
2c3d78b48adf36dbbef5852b95889da5a5ce1279.zip
Normal file
3
2c3d78b48adf36dbbef5852b95889da5a5ce1279.zip
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:362c7d81038da6a47944af999d90a752bb0537faa415e54c7fa8e500f4ef0476
|
||||||
|
size 29046616
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:f1768342a83cf4178cabe156979687c4100195dd7c9da140f7e201bd232eaa14
|
|
||||||
size 29079664
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:76e32d13b55d19a59ef19b5a23c68973a134cc6955b579fc88e78eea7ff7640a
|
|
||||||
size 11108342
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:e66b818ca090a508ff971d52e1c23866f4eef55e24c9d77a606a7c39dfc4487a
|
|
||||||
size 132891225
|
|
3
ea8124dbc1b625da6f607b66d2b657dce90c96c4.zip
Normal file
3
ea8124dbc1b625da6f607b66d2b657dce90c96c4.zip
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:c3a8bdda984f663ca9da0b966b2e3a810ea511617e4f451ea2afc8a3e53f93e4
|
||||||
|
size 11118810
|
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 12 16:01:06 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Update to OpenJDK 8u402 build 06 with OpenJ9 0.43.0 virtual
|
||||||
|
machine
|
||||||
|
- Including Oracle January 2024 CPU changes
|
||||||
|
* CVE-2024-20918 (bsc#1218907), CVE-2024-20919 (bsc#1218903),
|
||||||
|
CVE-2024-20921 (bsc#1218905), CVE-2024-20926 (bsc#1218906),
|
||||||
|
CVE-2024-20945 (bsc#1218909), CVE-2024-20952 (bsc#1218911)
|
||||||
|
* OpenJ9 changes, see
|
||||||
|
https://www.eclipse.org/openj9/docs/version0.43/
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Nov 22 18:19:11 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
Wed Nov 22 18:19:11 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
@ -5,7 +17,7 @@ Wed Nov 22 18:19:11 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
|||||||
machine
|
machine
|
||||||
- Including Oracle October 2023 CPU changes
|
- Including Oracle October 2023 CPU changes
|
||||||
* CVE-2023-22067 (bsc#1216379), CVE-2023-22081 (bsc#1216374)
|
* CVE-2023-22067 (bsc#1216379), CVE-2023-22081 (bsc#1216374)
|
||||||
- Including Openj9 0.41.0 fixes of CVE-2023-5676, bsc#1217214
|
- Including OpenJ9 0.41.0 fixes of CVE-2023-5676, bsc#1217214
|
||||||
* For other OpenJ9 changes, see
|
* For other OpenJ9 changes, see
|
||||||
https://www.eclipse.org/openj9/docs/version0.41
|
https://www.eclipse.org/openj9/docs/version0.41
|
||||||
- Removed patch:
|
- Removed patch:
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package java-1_8_0-openj9
|
# spec file for package java-1_8_0-openj9
|
||||||
#
|
#
|
||||||
# Copyright (c) 2023 SUSE LLC
|
# Copyright (c) 2024 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -16,6 +16,8 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
# ugly hack to prevent spec-cleaner from changing make -> make_build
|
||||||
|
%global make make
|
||||||
%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
|
%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
|
||||||
%global debug 0
|
%global debug 0
|
||||||
%global bootcycle 1
|
%global bootcycle 1
|
||||||
@ -26,18 +28,18 @@
|
|||||||
%global abs2rel perl -e %{script}
|
%global abs2rel perl -e %{script}
|
||||||
%global syslibdir %{_libdir}
|
%global syslibdir %{_libdir}
|
||||||
# Standard JPackage naming and versioning defines.
|
# Standard JPackage naming and versioning defines.
|
||||||
%global updatever 392
|
%global updatever 402
|
||||||
%global buildver b08
|
%global buildver b06
|
||||||
%global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk8/archive
|
%global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk8/archive
|
||||||
%global root_revision b73cbdd342820514352b3a14d6d58fdb4d570a45
|
%global root_revision 0fa9d9c53243b300211f1e7dabee29164552fe0b
|
||||||
%global root_branch v0.41.0-release
|
%global root_branch v0.43.0-release
|
||||||
%global omr_repository https://github.com/eclipse/openj9-omr/archive
|
%global omr_repository https://github.com/eclipse/openj9-omr/archive
|
||||||
%global omr_revision 5eee6ad9d0969d938892cd186056ae66912c7a61
|
%global omr_revision ea8124dbc1b625da6f607b66d2b657dce90c96c4
|
||||||
%global omr_branch v0.41.0-release
|
%global omr_branch v0.43.0-release
|
||||||
%global openj9_repository https://github.com/eclipse/openj9/archive
|
%global openj9_repository https://github.com/eclipse/openj9/archive
|
||||||
%global openj9_revision 461bf3c70bd87f1bc8422214cdb5c6c3a0ae4ff1
|
%global openj9_revision 2c3d78b48adf36dbbef5852b95889da5a5ce1279
|
||||||
%global openj9_branch v0.41.0-release
|
%global openj9_branch v0.43.0-release
|
||||||
%global openj9_tag openj9-0.41.0
|
%global openj9_tag openj9-0.43.0
|
||||||
# priority must be 6 digits in total
|
# priority must be 6 digits in total
|
||||||
%global priority 1801
|
%global priority 1801
|
||||||
%global javaver 1.8.0
|
%global javaver 1.8.0
|
||||||
@ -97,8 +99,6 @@ Source2: %{openj9_repository}/%{openj9_revision}.zip
|
|||||||
# Desktop files. Adapated from IcedTea.
|
# Desktop files. Adapated from IcedTea.
|
||||||
Source11: jconsole.desktop.in
|
Source11: jconsole.desktop.in
|
||||||
Source12: policytool.desktop.in
|
Source12: policytool.desktop.in
|
||||||
# nss configuration file
|
|
||||||
Source13: nss.cfg
|
|
||||||
# Ensure we aren't using the limited crypto policy
|
# Ensure we aren't using the limited crypto policy
|
||||||
Source14: TestCryptoLevel.java
|
Source14: TestCryptoLevel.java
|
||||||
Source100: openj9-nogit.patch.in
|
Source100: openj9-nogit.patch.in
|
||||||
@ -226,7 +226,7 @@ Requires: jpackage-utils
|
|||||||
# Post requires update-alternatives to install tool update-alternatives.
|
# Post requires update-alternatives to install tool update-alternatives.
|
||||||
Requires(post): update-alternatives
|
Requires(post): update-alternatives
|
||||||
# Postun requires update-alternatives to uninstall tool update-alternatives.
|
# Postun requires update-alternatives to uninstall tool update-alternatives.
|
||||||
Requires(postun):update-alternatives
|
Requires(postun): update-alternatives
|
||||||
Recommends: tzdata-java8
|
Recommends: tzdata-java8
|
||||||
# Standard JPackage base provides.
|
# Standard JPackage base provides.
|
||||||
Provides: java-%{javaver}-headless = %{version}-%{release}
|
Provides: java-%{javaver}-headless = %{version}-%{release}
|
||||||
@ -264,7 +264,7 @@ Requires: %{name} = %{version}-%{release}
|
|||||||
# Post requires update-alternatives to install tool update-alternatives.
|
# Post requires update-alternatives to install tool update-alternatives.
|
||||||
Requires(post): update-alternatives
|
Requires(post): update-alternatives
|
||||||
# Postun requires update-alternatives to uninstall tool update-alternatives.
|
# Postun requires update-alternatives to uninstall tool update-alternatives.
|
||||||
Requires(postun):update-alternatives
|
Requires(postun): update-alternatives
|
||||||
# Standard JPackage devel provides.
|
# Standard JPackage devel provides.
|
||||||
Provides: java-%{javaver}-devel = %{version}
|
Provides: java-%{javaver}-devel = %{version}
|
||||||
Provides: java-devel = %{javaver}
|
Provides: java-devel = %{javaver}
|
||||||
@ -305,7 +305,7 @@ Requires: jpackage-utils
|
|||||||
# Post requires update-alternatives to install javadoc alternative.
|
# Post requires update-alternatives to install javadoc alternative.
|
||||||
Requires(post): update-alternatives
|
Requires(post): update-alternatives
|
||||||
# Postun requires update-alternatives to uninstall javadoc alternative.
|
# Postun requires update-alternatives to uninstall javadoc alternative.
|
||||||
Requires(postun):update-alternatives
|
Requires(postun): update-alternatives
|
||||||
# Standard JPackage javadoc provides.
|
# Standard JPackage javadoc provides.
|
||||||
Provides: java-%{javaver}-javadoc = %{version}-%{release}
|
Provides: java-%{javaver}-javadoc = %{version}-%{release}
|
||||||
Provides: java-javadoc = %{version}-%{release}
|
Provides: java-javadoc = %{version}-%{release}
|
||||||
@ -365,14 +365,16 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
|
|||||||
%patch300 -p1
|
%patch300 -p1
|
||||||
|
|
||||||
cat %{SOURCE100} \
|
cat %{SOURCE100} \
|
||||||
| sed "s/@OPENJ9_SHA@/%{openj9_revision}/g" \
|
| sed "s/@OPENJ9_SHA@/`expr substr '%{openj9_revision}' 1 7`/g" \
|
||||||
| sed "s/@OPENJ9_BRANCH@/%{openj9_branch}/g" \
|
| sed "s/@OPENJ9_BRANCH@/%{openj9_branch}/g" \
|
||||||
| sed "s/@OPENJ9_TAG@/%{openj9_tag}/g" \
|
| sed "s/@OPENJ9_TAG@/%{openj9_tag}/g" \
|
||||||
| sed "s/@OPENJ9OMR_SHA@/%{omr_revision}/g" \
|
| sed "s/@OPENJ9OMR_SHA@/`expr substr '%{omr_revision}' 1 7`/g" \
|
||||||
| sed "s/@OPENJDK_SHA@/%{root_revision}/g" \
|
| sed "s/@OPENJDK_SHA@/`expr substr '%{root_revision}' 1 7`/g" \
|
||||||
| sed "s/@OPENSSL_SHA@//g" \
|
|
||||||
| patch -p1 -u -l
|
| patch -p1 -u -l
|
||||||
|
|
||||||
|
sed -i -e "s/<Unknown>/`expr substr '%{omr_revision}' 1 7`/g" \
|
||||||
|
omr/cmake/versions.cmake
|
||||||
|
|
||||||
# Prepare desktop files
|
# Prepare desktop files
|
||||||
for file in %{SOURCE11} %{SOURCE12} ; do
|
for file in %{SOURCE11} %{SOURCE12} ; do
|
||||||
OUTPUT_FILE=`basename $file | sed -e s:\.in$::g`
|
OUTPUT_FILE=`basename $file | sed -e s:\.in$::g`
|
||||||
@ -421,7 +423,7 @@ bash configure \
|
|||||||
--with-native-debug-symbols=internal \
|
--with-native-debug-symbols=internal \
|
||||||
--with-boot-jdk=%{_sysconfdir}/alternatives/java_sdk
|
--with-boot-jdk=%{_sysconfdir}/alternatives/java_sdk
|
||||||
|
|
||||||
make \
|
%{make} \
|
||||||
JAVAC_FLAGS=-g \
|
JAVAC_FLAGS=-g \
|
||||||
LOG=trace \
|
LOG=trace \
|
||||||
DEBUG_BINARIES=true \
|
DEBUG_BINARIES=true \
|
||||||
@ -546,9 +548,6 @@ pushd %{imagesdir}/j2sdk-image
|
|||||||
|
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# Install nss.cfg
|
|
||||||
install -m 644 %{SOURCE13} %{buildroot}%{_jvmdir}/%{jredir}/lib/security/
|
|
||||||
|
|
||||||
# Install Javadoc documentation.
|
# Install Javadoc documentation.
|
||||||
install -d -m 755 %{buildroot}%{_javadocdir}
|
install -d -m 755 %{buildroot}%{_javadocdir}
|
||||||
cp -a build/%{debugbuild}/docs %{buildroot}%{_javadocdir}/%{sdklnk}
|
cp -a build/%{debugbuild}/docs %{buildroot}%{_javadocdir}/%{sdklnk}
|
||||||
@ -899,7 +898,6 @@ fi
|
|||||||
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
|
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
|
||||||
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
|
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
|
||||||
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklisted.certs
|
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklisted.certs
|
||||||
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/nss.cfg
|
|
||||||
%{_mandir}/man1/java-%{sdklnk}.1%{?ext_man}
|
%{_mandir}/man1/java-%{sdklnk}.1%{?ext_man}
|
||||||
%{_mandir}/man1/jjs-%{sdklnk}.1%{?ext_man}
|
%{_mandir}/man1/jjs-%{sdklnk}.1%{?ext_man}
|
||||||
%{_mandir}/man1/keytool-%{sdklnk}.1%{?ext_man}
|
%{_mandir}/man1/keytool-%{sdklnk}.1%{?ext_man}
|
||||||
@ -915,7 +913,7 @@ fi
|
|||||||
%{_jvmdir}/%{jredir}/lib/security/policy/limited/local_policy.jar
|
%{_jvmdir}/%{jredir}/lib/security/policy/limited/local_policy.jar
|
||||||
%{_jvmdir}/%{jredir}/lib/security/policy/unlimited/US_export_policy.jar
|
%{_jvmdir}/%{jredir}/lib/security/policy/unlimited/US_export_policy.jar
|
||||||
%{_jvmdir}/%{jredir}/lib/security/policy/unlimited/local_policy.jar
|
%{_jvmdir}/%{jredir}/lib/security/policy/unlimited/local_policy.jar
|
||||||
%ifarch x86_64
|
%ifnarch %{aarch64}
|
||||||
%{_jvmdir}/%{jredir}/lib/security/nss.fips.cfg
|
%{_jvmdir}/%{jredir}/lib/security/nss.fips.cfg
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user