Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package java-11-openj9 for openSUSE:Factory checked in at 2022-08-16 17:07:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-11-openj9 (Old) and /work/SRC/openSUSE:Factory/.java-11-openj9.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-11-openj9" Tue Aug 16 17:07:37 2022 rev:12 rq:995922 version:11.0.16.0 Changes: -------- --- /work/SRC/openSUSE:Factory/java-11-openj9/java-11-openj9.changes 2022-07-13 13:45:08.398010681 +0200 +++ /work/SRC/openSUSE:Factory/.java-11-openj9.new.1521/java-11-openj9.changes 2022-08-16 17:07:41.319868224 +0200 @@ -1,0 +2,17 @@ +Tue Aug 16 06:49:48 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Update to OpenJDK 11.0.16 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 + +------------------------------------------------------------------- Old: ---- 9a84ec34ed321967cdbe67b29ddcd732b591d051.zip ab24b6666596140516d3f240486aa1c84a726775.zip b7b5b42ea6d2e5b9db86bbe51de5d61a64d0e49d.zip freemarker-2.3.29-sources.jar freemarker-2.3.29.jar New: ---- 04a55b45b3a0d75813335fda0fb8703819690ee7.zip ab74d97849ab351ca860cab2f6b213f16700a092.zip b58aa2708c095efadf522f67aaef9f7de2a7cbc7.zip openj9-no-narrowing.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-11-openj9.spec ++++++ --- /var/tmp/diff_new_pack.z05X4T/_old 2022-08-16 17:07:44.223876907 +0200 +++ /var/tmp/diff_new_pack.z05X4T/_new 2022-08-16 17:07:44.227876920 +0200 @@ -33,21 +33,20 @@ # Standard JPackage naming and versioning defines. %global featurever 11 %global interimver 0 -%global updatever 15 +%global updatever 16 %global patchver 0 -%global datever 2022-04-19 -%global buildver 10 +%global datever 2022-07-19 +%global buildver 8 %global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk11/archive -%global root_revision b7b5b42ea6d2e5b9db86bbe51de5d61a64d0e49d -%global root_branch v0.32.0-release +%global root_revision ab74d97849ab351ca860cab2f6b213f16700a092 +%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 # JavaEE modules %global java_atk_wrapper_version 0.33.2 %global java_activation_repository activation @@ -112,10 +111,6 @@ 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 -Source3: https://repo1.maven.org/maven2/org/freemarker/freemarker/%{freemarker_version}/freemarker-%{freemarker_version}.jar -# Package also the sources -Source4: https://repo1.maven.org/maven2/org/freemarker/freemarker/%{freemarker_version}/freemarker-%{freemarker_version}-sources.jar # Accessibility support Source8: https://download.gnome.org/sources/java-atk-wrapper/0.33/java-atk-wrapper-%{java_atk_wrapper_version}.tar.xz # Desktop files. Adapted from IcedTea. @@ -152,6 +147,8 @@ Patch4: libdwarf-fix.patch # Allow multiple initialization of PKCS11 libraries Patch5: multiple-pkcs11-library-init.patch +# Fix narrowing conversion error +Patch6: openj9-no-narrowing.patch # Fix: implicit-pointer-decl Patch13: implicit-pointer-decl.patch # @@ -438,6 +435,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %patch13 -p1 %if %{with_system_pcsc} @@ -521,8 +519,7 @@ --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \ --with-extra-cflags="$EXTRA_CFLAGS" \ --disable-javac-server \ - --enable-demos \ - --with-freemarker-jar=%{SOURCE3} + --enable-demos make \ LOG=trace \ @@ -1022,6 +1019,9 @@ %{_jvmprivdir}/* %{_jvmdir}/%{sdkdir}/bin/java +%ifnarch aarch64 +%{_jvmdir}/%{sdkdir}/bin/jitserver +%endif %{_jvmdir}/%{sdkdir}/bin/jjs %{_jvmdir}/%{sdkdir}/bin/keytool %{_jvmdir}/%{sdkdir}/bin/pack200 @@ -1035,6 +1035,9 @@ %{_jvmdir}/%{sdkdir}/conf/net.properties %{_jvmdir}/%{sdkdir}/conf/security/java.policy %{_jvmdir}/%{sdkdir}/conf/security/java.security +%ifarch x86_64 +%{_jvmdir}/%{sdkdir}/conf/security/nss.fips.cfg +%endif %{_jvmdir}/%{sdkdir}/conf/security/policy/limited/default_local.policy %{_jvmdir}/%{sdkdir}/conf/security/policy/limited/default_US_export.policy %{_jvmdir}/%{sdkdir}/conf/security/policy/limited/exempt_local.policy ++++++ openj9-no-narrowing.patch ++++++ --- 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 ++++++ openj9-nogit.patch.in ++++++ --- /var/tmp/diff_new_pack.z05X4T/_old 2022-08-16 17:07:44.411877470 +0200 +++ /var/tmp/diff_new_pack.z05X4T/_new 2022-08-16 17:07:44.415877482 +0200 @@ -1,43 +1,43 @@ -diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk -index 8b7990a0cb..8559b989a0 100644 --- a/closed/OpenJ9.gmk +++ b/closed/OpenJ9.gmk -@@ -32,20 +32,20 @@ ifeq (,$(BUILD_ID)) - BUILD_ID := 000000 - endif +@@ -40,11 +40,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)" +@@ -60,17 +60,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 -@@ -54,7 +54,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/custom/ReleaseFile.gmk b/closed/custom/ReleaseFile.gmk -index 8512c7702f..767b199992 100644 --- a/closed/custom/ReleaseFile.gmk +++ b/closed/custom/ReleaseFile.gmk @@ -18,6 +18,6 @@
