rpm/java-1_8_0-openj9
SHA256
1
0
Fork 0
forked from pool/java-1_8_0-openj9
Code Pull Requests Activity

Accepting request 988553 from Java:Factory

Browse Source 
April 2022 CPU

OBS-URL: https://build.opensuse.org/request/show/988553
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openj9?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger 2022-07-13 11:44:54 +00:00 committed by Git OBS Bridge
commit d62e454aec
10 changed files with 49 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
0b8b8af39a5f1f2fe0629050343adeed2f48bfd7.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1010f9c6965fbb7064552196d1b06a7990ccd82af70d07abc3332669efa68eae
size 126215399

3
9a84ec34ed321967cdbe67b29ddcd732b591d051.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:122f6fc146e36191da167f4f33abbfca02f974f8acee81a323e2988e771dc536
size 27990342

3
9dccbe076db9055f4020bae78513f52c02572ba4.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9fc5faabb0415d77698786aae49ee6545eea96fa240d602c5eb4057eac1f1e32
size 27607470

3
ab24b6666596140516d3f240486aa1c84a726775.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5ef24809ee60389cdb63b3df3cb8d265466bd02c01530e5b1f4cacf629d4d0de
size 10935643

3
c1d9a7af7c130f57867717a12ee9dfdbad4ecc10.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7c632b9594a00931fc1b22379d3266ba74f818f3efe9d13941ae62c5a0c98621
size 126350461

3
dac962a283adbd3508fa1af3ae892e10903f0ef1.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0a6d195f0967c04a259959267e71d45f498f0ec113517e7bdbc35afcaeedaa84
size 10918222

1
java-1_8_0-openj9-rpmlintrc Normal file
View File

@ -0,0 +1 @@
addFilter("executable-stack")

14
java-1_8_0-openj9.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue Jul 12 07:06:17 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Update to OpenJDK 8u332 build 09 with OpenJ9 0.32.0 virtual
machine
* Fixes bsc#1198935, CVE-2021-41041: unverified methods can be
invoked using MethodHandles
* Including Oracle April 2022 CPU fixes
CVE-2022-21426 (bsc#1198672), CVE-2022-21434 (bsc#1198674),
CVE-2022-21443 (bsc#1198675), CVE-2022-21476 (bsc#1198671),
CVE-2022-21496 (bsc#1198673)
* OpenJ9 changes, see
https://www.eclipse.org/openj9/docs/version0.32
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 28 09:47:15 UTC 2022 - Fridrich Strba <fstrba@suse.com> Mon Feb 28 09:47:15 UTC 2022 - Fridrich Strba <fstrba@suse.com>

25
java-1_8_0-openj9.spec
View File

@ -26,18 +26,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 322 %global updatever 332
%global buildver b04 %global buildver b09
%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 c1d9a7af7c130f57867717a12ee9dfdbad4ecc10 %global root_revision 0b8b8af39a5f1f2fe0629050343adeed2f48bfd7
%global root_branch v0.30.0-release %global root_branch v0.32.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 dac962a283adbd3508fa1af3ae892e10903f0ef1 %global omr_revision ab24b6666596140516d3f240486aa1c84a726775
%global omr_branch v0.30.0-release %global omr_branch v0.32.0-release
%global openj9_repository https://github.com/eclipse/openj9/archive %global openj9_repository https://github.com/eclipse/openj9/archive
%global openj9_revision 9dccbe076db9055f4020bae78513f52c02572ba4 %global openj9_revision 9a84ec34ed321967cdbe67b29ddcd732b591d051
%global openj9_branch v0.30.0-release %global openj9_branch v0.32.0-release
%global openj9_tag openj9-0.30.0 %global openj9_tag openj9-0.32.0
%global freemarker_version 2.3.29 %global freemarker_version 2.3.29
# priority must be 6 digits in total # priority must be 6 digits in total
%global priority 1801 %global priority 1801
@ -107,6 +107,7 @@ 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
Source1000: %{name}-rpmlintrc
# RPM/distribution specific patches # RPM/distribution specific patches
# Restrict access to java-atk-wrapper classes # Restrict access to java-atk-wrapper classes
Patch1: java-atk-wrapper-security.patch Patch1: java-atk-wrapper-security.patch
@ -196,7 +197,7 @@ Provides: jre1.6.x
Provides: jre1.7.x Provides: jre1.7.x
Provides: jre1.8.x Provides: jre1.8.x
ExclusiveArch: x86_64 ppc64le s390x aarch64 ExclusiveArch: x86_64 ppc64le s390x aarch64
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} < 1500
BuildRequires: gcc7 BuildRequires: gcc7
BuildRequires: gcc7-c++ BuildRequires: gcc7-c++
%else %else
@ -393,12 +394,14 @@ EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing"
%endif %endif
bash configure \ bash configure \
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} < 1500
CPP=cpp-7 \ CPP=cpp-7 \
CXX=g++-7 \ CXX=g++-7 \
CC=gcc-7 \ CC=gcc-7 \
NM=gcc-nm-7 \ NM=gcc-nm-7 \
%endif %endif
--disable-warnings-as-errors-omr \
--disable-warnings-as-errors-openj9 \
--enable-demos \ --enable-demos \
--disable-zip-debug-info \ --disable-zip-debug-info \
--with-milestone="fcs" \ --with-milestone="fcs" \

22
openj9-nogit.patch.in
View File

@ -1,52 +1,52 @@
diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
index 27dcc77dd3..163077bb7d 100644 index 0fc7435813..b461bbcbe0 100644
--- a/closed/OpenJ9.gmk --- a/closed/OpenJ9.gmk
+++ b/closed/OpenJ9.gmk +++ b/closed/OpenJ9.gmk
@@ -30,20 +30,20 @@ ifeq (,$(BUILD_ID)) @@ -30,20 +30,20 @@ ifeq (,$(BUILD_ID))
BUILD_ID := 000000 BUILD_ID := 000000
endif endif
-OPENJDK_SHA := $(shell git -C $(TOPDIR) rev-parse --short HEAD) -OPENJDK_SHA := $(shell $(GIT) -C $(TOPDIR) rev-parse --short HEAD)
+OPENJDK_SHA := @OPENJDK_SHA@ +OPENJDK_SHA := @OPENJDK_SHA@
ifeq (,$(OPENJDK_SHA)) ifeq (,$(OPENJDK_SHA))
$(error Could not determine OpenJDK SHA) $(error Could not determine OpenJDK SHA)
endif endif
-OPENJ9_SHA := $(shell git -C $(OPENJ9_TOPDIR) rev-parse --short HEAD) -OPENJ9_SHA := $(shell $(GIT) -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)
+OPENJ9_SHA := @OPENJ9_SHA@ +OPENJ9_SHA := @OPENJ9_SHA@
ifeq (,$(OPENJ9_SHA)) ifeq (,$(OPENJ9_SHA))
$(error Could not determine OpenJ9 SHA) $(error Could not determine OpenJ9 SHA)
endif endif
# Find OpenJ9 tag associated with current commit (suppressing stderr in case there is no such tag). # Find OpenJ9 tag associated with current commit (suppressing stderr in case there is no such tag).
-OPENJ9_TAG := $(shell git -C $(OPENJ9_TOPDIR) describe --exact-match HEAD 2>/dev/null) -OPENJ9_TAG := $(shell $(GIT) -C $(OPENJ9_TOPDIR) describe --exact-match HEAD 2>/dev/null)
+OPENJ9_TAG := @OPENJ9_TAG@ +OPENJ9_TAG := @OPENJ9_TAG@
ifeq (,$(OPENJ9_TAG)) ifeq (,$(OPENJ9_TAG))
- OPENJ9_BRANCH := $(shell git -C $(OPENJ9_TOPDIR) rev-parse --abbrev-ref HEAD) - OPENJ9_BRANCH := $(shell $(GIT) -C $(OPENJ9_TOPDIR) rev-parse --abbrev-ref HEAD)
+ OPENJ9_BRANCH := @OPENJ9_BRANCH@ + OPENJ9_BRANCH := @OPENJ9_BRANCH@
ifeq (,$(OPENJ9_BRANCH)) ifeq (,$(OPENJ9_BRANCH))
$(error Could not determine OpenJ9 branch) $(error Could not determine OpenJ9 branch)
endif endif
@@ -52,7 +52,7 @@ else @@ -52,7 +51,7 @@ else
OPENJ9_VERSION_STRING := $(OPENJ9_TAG) OPENJ9_VERSION_STRING := $(OPENJ9_TAG)
endif endif
-OPENJ9OMR_SHA := $(shell git -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD) -OPENJ9OMR_SHA := $(shell $(GIT) -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)
+OPENJ9OMR_SHA := @OPENJ9OMR_SHA@ +OPENJ9OMR_SHA := @OPENJ9OMR_SHA@
ifeq (,$(OPENJ9OMR_SHA)) ifeq (,$(OPENJ9OMR_SHA))
$(error Could not determine OMR SHA) $(error Could not determine OMR SHA)
endif endif
diff --git a/closed/make/Main.gmk b/closed/make/Main.gmk diff --git a/closed/make/Main.gmk b/closed/make/Main.gmk
index ab2310f3b0..1c7386d939 100644 index d73fff3230..d17eea56b8 100644
--- a/closed/make/Main.gmk --- a/closed/make/Main.gmk
+++ b/closed/make/Main.gmk +++ b/closed/make/Main.gmk
@@ -35,9 +35,9 @@ clean-j9vm : @@ -35,9 +35,9 @@ clean-j9vm :
# Override definition from MakeBase.gmk for OpenJ9. # Override definition from MakeBase.gmk for OpenJ9.
define GetSourceTips define GetSourceTips
$(PRINTF) "%s:%s\n" \ $(PRINTF) "%s:%s\n" \
- OpenJDK "$(shell git -C $(TOPDIR) rev-parse --short HEAD)" \ - OpenJDK "$(shell $(GIT) -C $(TOPDIR) rev-parse --short HEAD)" \
- OpenJ9 "$(shell git -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)" \ - OpenJ9 "$(shell $(GIT) -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)" \
- OMR "$(shell git -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)" \ - OMR "$(shell $(GIT) -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)" \
+ OpenJDK "@OPENJDK_SHA@" \ + OpenJDK "@OPENJDK_SHA@" \
+ OpenJ9 "@OPENJ9_SHA@" \ + OpenJ9 "@OPENJ9_SHA@" \
+ OMR "@OPENJ9OMR_SHA@" \ + OMR "@OPENJ9OMR_SHA@" \