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 995891 from Java:Factory

Browse Source 
July 2022 CPU

OBS-URL: https://build.opensuse.org/request/show/995891
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openj9?expand=0&rev=15
This commit is contained in:
Dominique Leuenberger
2022-08-16 15:07:32 +00:00
committed by Git OBS Bridge
parent d62e454aec 30d1ddfad6
commit e111d20a1e
12 changed files with 90 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
04a55b45b3a0d75813335fda0fb8703819690ee7.zip Normal file
View File

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

3
0b8b8af39a5f1f2fe0629050343adeed2f48bfd7.zip
View File

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

3
9a84ec34ed321967cdbe67b29ddcd732b591d051.zip
View File

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

3
ab24b6666596140516d3f240486aa1c84a726775.zip
View File

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

3
b58aa2708c095efadf522f67aaef9f7de2a7cbc7.zip Normal file
View File

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

3
f2d89babf53797cf7884ec3eead7014d52cc2f63.zip Normal file
View File

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

3
freemarker-2.3.29-sources.jar
View File

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

3
freemarker-2.3.29.jar
View File

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

18
java-1_8_0-openj9.changes
View File

@@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue Aug 16 06:39:22 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Update to OpenJDK 8u345 build 01 with OpenJ9 0.33.0 virtual
machine
* Including Oracle July 2022 CPU changes
CVE-2022-21540 (bsc#1201694), CVE-2022-21541 (bsc#1201692),
CVE-2022-34169 (bsc#1201684)
* OpenJ9 changes, see
https://www.eclipse.org/openj9/docs/version0.33
- Modified template patch:
* openj9-nogit.patch.in
+ The git commit hash code became more generic, so redo the
template patch
- Added patch:
* openj9-no-narrowing.patch
+ Fix narrowing conversion error
-------------------------------------------------------------------
Tue Jul 12 07:06:17 UTC 2022 - Fridrich Strba <fstrba@suse.com>

30
java-1_8_0-openj9.spec
View File

@@ -26,19 +26,18 @@
%global abs2rel perl -e %{script}
%global syslibdir %{_libdir}
# Standard JPackage naming and versioning defines.
%global updatever 332
%global buildver b09
%global updatever 345
%global buildver b01
%global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk8/archive
%global root_revision 0b8b8af39a5f1f2fe0629050343adeed2f48bfd7
%global root_branch v0.32.0-release
%global root_revision f2d89babf53797cf7884ec3eead7014d52cc2f63
%global root_branch v0.33.0-release
%global omr_repository https://github.com/eclipse/openj9-omr/archive
%global omr_revision ab24b6666596140516d3f240486aa1c84a726775
%global omr_branch v0.32.0-release
%global omr_revision b58aa2708c095efadf522f67aaef9f7de2a7cbc7
%global omr_branch v0.33.0-release
%global openj9_repository https://github.com/eclipse/openj9/archive
%global openj9_revision 9a84ec34ed321967cdbe67b29ddcd732b591d051
%global openj9_branch v0.32.0-release
%global openj9_tag openj9-0.32.0
%global freemarker_version 2.3.29
%global openj9_revision 04a55b45b3a0d75813335fda0fb8703819690ee7
%global openj9_branch v0.33.0-release
%global openj9_tag openj9-0.33.0
# priority must be 6 digits in total
%global priority 1801
%global javaver 1.8.0
@@ -95,10 +94,6 @@ URL: https://www.eclipse.org/openj9/
Source0: %{root_repository}/%{root_revision}.zip
Source1: %{omr_repository}/%{omr_revision}.zip
Source2: %{openj9_repository}/%{openj9_revision}.zip
# Use the freemarker jar from maven central
Source9: https://repo1.maven.org/maven2/org/freemarker/freemarker/%{freemarker_version}/freemarker-%{freemarker_version}.jar
# Package also the sources
Source10: https://repo1.maven.org/maven2/org/freemarker/freemarker/%{freemarker_version}/freemarker-%{freemarker_version}-sources.jar
# Desktop files. Adapated from IcedTea.
Source11: jconsole.desktop.in
Source12: policytool.desktop.in
@@ -117,6 +112,8 @@ Patch2: multiple-pkcs11-library-init.patch
Patch3: disable-doclint-by-default.patch
# Allow building with newer libdwarf
Patch4: libdwarf-fix.patch
# Fix narrowing conversion error
Patch5: openj9-no-narrowing.patch
# Patches for system libraries
Patch201: system-libjpeg.patch
Patch202: system-libpng.patch
@@ -361,6 +358,7 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch300 -p1
@@ -370,6 +368,7 @@ cat %{SOURCE100} \
| sed "s/@OPENJ9_TAG@/%{openj9_tag}/g" \
| sed "s/@OPENJ9OMR_SHA@/%{omr_revision}/g" \
| sed "s/@OPENJDK_SHA@/%{root_revision}/g" \
| sed "s/@OPENSSL_SHA@//g" \
| patch -p1 -u -l
# Prepare desktop files
@@ -418,8 +417,7 @@ bash configure \
--with-openssl=system \
--with-stdc++lib=dynamic \
--with-native-debug-symbols=internal \
--with-boot-jdk=%{_sysconfdir}/alternatives/java_sdk \
--with-freemarker-jar=%{SOURCE9}
--with-boot-jdk=%{_sysconfdir}/alternatives/java_sdk
make \
JAVAC_FLAGS=-g \

21
openj9-no-narrowing.patch Normal file
View File

@@ -0,0 +1,21 @@
--- a/openj9/runtime/compiler/env/j9methodServer.cpp
+++ b/openj9/runtime/compiler/env/j9methodServer.cpp
@@ -2634,7 +2634,7 @@ TR_ResolvedRelocatableJ9JITServerMethod::validateMethodFieldAttributes(const TR_
return equal;
}
-TR_J9ServerMethod::TR_J9ServerMethod(TR_FrontEnd * fe, TR_Memory * trMemory, J9Class * aClazz, uintptr_t cpIndex)
+TR_J9ServerMethod::TR_J9ServerMethod(TR_FrontEnd * fe, TR_Memory * trMemory, J9Class * aClazz, int32_t cpIndex)
: TR_J9Method()
{
TR_ASSERT(cpIndex != -1, "cpIndex shouldn't be -1");
--- a/openj9/runtime/compiler/env/j9methodServer.hpp
+++ b/openj9/runtime/compiler/env/j9methodServer.hpp
@@ -326,6 +326,6 @@ protected:
class TR_J9ServerMethod : public TR_J9Method
{
public:
- TR_J9ServerMethod(TR_FrontEnd *trvm, TR_Memory *, J9Class * aClazz, uintptr_t cpIndex);
+ TR_J9ServerMethod(TR_FrontEnd *trvm, TR_Memory *, J9Class * aClazz, int32_t cpIndex);
};
#endif // J9METHODSERVER_H

54
openj9-nogit.patch.in
View File

@@ -1,41 +1,43 @@
diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
index 0fc7435813..b461bbcbe0 100644
--- a/closed/OpenJ9.gmk
+++ b/closed/OpenJ9.gmk
@@ -30,20 +30,20 @@ ifeq (,$(BUILD_ID))
BUILD_ID := 000000
endif
@@ -38,11 +38,11 @@ VersionPairs :=
# ----------
# $1 - repository display name
# $2 - variable name
-# $3 - root directory of git repository
+# $3 - variable value
# $4 - 'required' for a required repository, anything else for an optional one
GetVersion = $(eval $(call GetVersionHelper,$(strip $1),$(strip $2),$(strip $3),$(strip $4)))
define GetVersionHelper
- $2 := $$(if $(wildcard $3),$$(shell $(GIT) -C $3 rev-parse --short HEAD))
+ $2 := $3
ifneq (,$$($2))
VersionLabelWidth := $(shell $(ECHO) "$1" | $(AWK) "{ width = length; print (width > $(VersionLabelWidth) ? width : $(VersionLabelWidth)) }")
VersionPairs += "$1" "$$($2)"
@@ -58,17 +58,17 @@ define ShowVersions
@$(PRINTF) " %-$(VersionLabelWidth)s - %s\n" $(VersionPairs)
endef # ShowVersions
-OPENJDK_SHA := $(shell $(GIT) -C $(TOPDIR) rev-parse --short HEAD)
+OPENJDK_SHA := @OPENJDK_SHA@
ifeq (,$(OPENJDK_SHA))
$(error Could not determine OpenJDK SHA)
endif
-OPENJ9_SHA := $(shell $(GIT) -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)
+OPENJ9_SHA := @OPENJ9_SHA@
ifeq (,$(OPENJ9_SHA))
$(error Could not determine OpenJ9 SHA)
endif
-$(call GetVersion, openjdk, OPENJDK_SHA, $(TOPDIR), required)
-$(call GetVersion, openj9, OPENJ9_SHA, $(OPENJ9_TOPDIR), required)
-$(call GetVersion, omr, OPENJ9OMR_SHA, $(OPENJ9OMR_TOPDIR), required)
-$(call GetVersion, openssl, OPENSSL_SHA, $(OPENSSL_DIR))
+$(call GetVersion, openjdk, OPENJDK_SHA, @OPENJDK_SHA@, required)
+$(call GetVersion, openj9, OPENJ9_SHA, @OPENJ9_SHA@, required)
+$(call GetVersion, omr, OPENJ9OMR_SHA, @OPENJ9OMR_SHA@, required)
+$(call GetVersion, openssl, OPENSSL_SHA, @OPENSSL_SHA@ )
# 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 := @OPENJ9_TAG@
ifeq (,$(OPENJ9_TAG))
ifneq (,$(OPENJ9_TAG))
OPENJ9_VERSION_STRING := $(OPENJ9_TAG)
else
- OPENJ9_BRANCH := $(shell $(GIT) -C $(OPENJ9_TOPDIR) rev-parse --abbrev-ref HEAD)
+ OPENJ9_BRANCH := @OPENJ9_BRANCH@
ifeq (,$(OPENJ9_BRANCH))
$(error Could not determine OpenJ9 branch)
endif
@@ -52,7 +51,7 @@ else
OPENJ9_VERSION_STRING := $(OPENJ9_TAG)
endif
-OPENJ9OMR_SHA := $(shell $(GIT) -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)
+OPENJ9OMR_SHA := @OPENJ9OMR_SHA@
ifeq (,$(OPENJ9OMR_SHA))
$(error Could not determine OMR SHA)
endif
diff --git a/closed/make/Main.gmk b/closed/make/Main.gmk
index d73fff3230..d17eea56b8 100644
--- a/closed/make/Main.gmk