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

Browse Source 
July and October 2021 CPU

OBS-URL: https://build.opensuse.org/request/show/928755
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openj9?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2021-11-02 18:19:00 +00:00 committed by Git OBS Bridge
commit f0b051f1dc
12 changed files with 58 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
162e6f729733666e22726ce5326f5982bb030330.zip
View File

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

3
299b6a2d28cf992edf57ca43b67ed6d6917675bf.zip Normal file
View File

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

3
2a5e26881428745325f8ebc14e1abd34edb9bd81.zip
View File

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

3
8860d39588d2d66201a71dd205443b7fd8182acd.zip Normal file
View File

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

3
b4cc246d9d2362346bc567861e6e0e536da3f390.zip
View File

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

3
e1e72c497688c765183573526f7418a6fe891e93.zip Normal file
View File

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

3
icedtea-sound-1.0.1.tar.xz
View File

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

23
java-1_8_0-openj9.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Tue Nov 2 11:29:15 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Update to OpenJDK 8u312 build 07 with OpenJ9 0.29.0 virtual
machine
* including Oracle July 2021 and October 2021 CPU changes
(bsc#1188564, bsc#1188565, bsc#1188566, bsc#1191901,
bsc#1191909, bsc#1191910, bsc#1191911, bsc#1191912,
bsc#1191913, bsc#1191903, bsc#1191904, bsc#1191914,
bsc#1191906)
* OpenJ9 changes, see
https://www.eclipse.org/openj9/docs/version0.29
- Remove the unneeded icedtea-sound provider
- Removed patches:
* jdk-gcc-warnings.patch
* maybe-uninitialized.patch
* omr-no-return-in-nonvoid-function.patch
+ integrated upstream
-------------------------------------------------------------------
Fri Jun 18 10:15:55 UTC 2021 - Fridrich Strba <fstrba@suse.com>
@ -23,8 +42,8 @@ Fri May 14 08:55:58 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Update to OpenJDK 8u292 build 10 with OpenJ9 0.26.0 virtual
machine
* including Oracle April 2021 CPU changes (bsc#1185055 and
bsc#1185056)
* including Oracle April 2021 CPU changes (bsc#1185055,
CVE-2021-2163 and bsc#1185056, CVE-2021-2161)
* OpenJ9 changes, see
https://www.eclipse.org/openj9/docs/version0.26
- Added patch:

100
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 292
%global buildver b10
%global updatever 312
%global buildver b07
%global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk8/archive
%global root_revision 2a5e26881428745325f8ebc14e1abd34edb9bd81
%global root_branch openj9-0.26.0
%global root_revision 8860d39588d2d66201a71dd205443b7fd8182acd
%global root_branch v0.29.0-release
%global omr_repository https://github.com/eclipse/openj9-omr/archive
%global omr_revision 162e6f729733666e22726ce5326f5982bb030330
%global omr_branch v0.26.0-release
%global omr_revision 299b6a2d28cf992edf57ca43b67ed6d6917675bf
%global omr_branch v0.29.0-release
%global openj9_repository https://github.com/eclipse/openj9/archive
%global openj9_revision b4cc246d9d2362346bc567861e6e0e536da3f390
%global openj9_branch v0.26.0-release
%global openj9_tag openj9-0.26.0
%global icedtea_sound_version 1.0.1
%global openj9_revision e1e72c497688c765183573526f7418a6fe891e93
%global openj9_branch v0.29.0-release
%global openj9_tag openj9-0.29.0
%global freemarker_version 2.3.29
# priority must be 6 digits in total
%global priority 1801
@ -60,11 +59,6 @@
# real file made by update-ca-certificates
%global javacacerts %{_var}/lib/ca-certificates/java-cacerts
# turn zero on non jit arches by default
%if 0%{?suse_version} >= 1140
%global with_pulseaudio 1
%else
%global with_pulseaudio 0
%endif
%ifarch x86_64
%global archinstall amd64
%endif
@ -101,8 +95,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
# Pulseaudio plugin
Source3: http://icedtea.classpath.org/download/source/icedtea-sound-%{icedtea_sound_version}.tar.xz
# 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
@ -122,20 +114,13 @@ Patch1: java-atk-wrapper-security.patch
Patch2: multiple-pkcs11-library-init.patch
# Disable doclint for compatibility
Patch3: disable-doclint-by-default.patch
# gcc warnings compiling various libraries files
Patch4: jdk-gcc-warnings.patch
# Patches for system libraries
Patch201: system-libjpeg.patch
Patch202: system-libpng.patch
Patch203: system-lcms.patch
Patch205: link-with-as-needed.patch
Patch210: openj9-no-werror.patch
Patch211: omr-no-return-in-nonvoid-function.patch
Patch212: maybe-uninitialized.patch
Patch300: alternative-path-to-tzdb_dat.patch
BuildRequires: alsa-lib-devel
BuildRequires: autoconf
BuildRequires: automake
@ -146,7 +131,6 @@ BuildRequires: desktop-file-utils
BuildRequires: fdupes
BuildRequires: fontconfig
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
BuildRequires: giflib-devel
BuildRequires: gtk2-devel
BuildRequires: java-ca-certificates
@ -210,6 +194,13 @@ Provides: jre1.6.x
Provides: jre1.7.x
Provides: jre1.8.x
ExclusiveArch: x86_64 ppc64le s390x aarch64
%if 0%{?suse_version} >= 1550
BuildRequires: gcc7
BuildRequires: gcc7-c++
%else
BuildRequires: gcc >= 7
BuildRequires: gcc-c++ >= 7
%endif
%if %{bootcycle}
BuildRequires: java-devel >= 1.7
BuildConflicts: java >= 9
@ -218,11 +209,6 @@ BuildConflicts: java-headless >= 9
%else
BuildRequires: %{name}-devel
%endif
# pulse audio requirements
%if %{with_pulseaudio}
BuildRequires: libpulse-devel >= 0.9.11
BuildRequires: pulseaudio >= 0.9.11
%endif
%description
The OpenJDK 8 with Eclipse OpenJ9 virtual machine. Eclipse OpenJ9
@ -345,9 +331,6 @@ this package unless you really need to.
%prep
%setup -q -n openj9-openjdk-jdk8-%{root_revision} -a 1 -a 2
%if %{with_pulseaudio}
%setup -q -D -n openj9-openjdk-jdk8-%{root_revision} -T -a 3
%endif
# Set up the build tree using the subrepository tarballs
pwd
@ -356,10 +339,6 @@ mv openj9-%{openj9_revision} openj9
cp openj9/LICENSE LICENSE.openj9
%if %{with_pulseaudio}
mv icedtea-sound-%{icedtea_sound_version} icedtea-sound
%endif
# Remove libraries that are linked
rm -rvf jdk/src/share/native/java/util/zip/zlib-*
find jdk/src/share/native/sun/awt/image/jpeg ! -name imageioJPEG.c ! -name jpegdecoder.c -type f -delete
@ -374,13 +353,10 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
%patch205 -p1
%patch210
%patch211
%patch212 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch300 -p1
@ -414,6 +390,12 @@ EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing"
%endif
bash configure \
%if 0%{?suse_version} >= 1550
CPP=cpp-7 \
CXX=g++-7 \
CC=gcc-7 \
NM=gcc-nm-7 \
%endif
--disable-zip-debug-info \
--with-milestone="fcs" \
--with-update-version=%{updatever} \
@ -432,20 +414,14 @@ bash configure \
--with-boot-jdk=%{_sysconfdir}/alternatives/java_sdk \
--with-freemarker-jar=%{SOURCE9}
# The combination of FULL_DEBUG_SYMBOLS=0 and ALT_OBJCOPY=/does_not_exist
# disables FDS for all build configs and reverts to pre-FDS make logic.
# STRIP_POLICY=none says don't do any stripping. DEBUG_BINARIES=true says
# ignore all the other logic about which debug options and just do '-g'.
make \
JAVAC_FLAGS=-g \
LOG=trace \
DEBUG_BINARIES=true \
FULL_DEBUG_SYMBOLS=0 \
ZIP_DEBUGINFO_FILES=0 \
STRIP_POLICY=none \
POST_STRIP_CMD=true \
ALT_OBJCOPY=/does_not_exist \
LOG=debug \
HAS_AUTOCONF=1 \
STRIP_POLICY=no_strip \
POST_STRIP_CMD="" \
WARNINGS_ARE_ERRORS="-Wno-error" \
CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \
%{imagestarget} docs
# remove redundant *diz and *debuginfo files
@ -462,25 +438,6 @@ if [ -f %{imagesdir}/j2sdk-image/jre/lib/security/cacerts ]; then
rm %{imagesdir}/j2sdk-image/jre/lib/security/cacerts
fi
%if %{with_pulseaudio}
# Build the pulseaudio plugin
pushd icedtea-sound
%configure \
--with-jdk-home=$JAVA_HOME \
--disable-docs
make %{?_smp_mflags}
cp icedtea-sound.jar $JAVA_HOME/jre/lib/ext/
cp build/native/libicedtea-sound.so $JAVA_HOME/jre/lib/%{archinstall}/
echo "#Config file to enable PulseAudio support" > $JAVA_HOME/jre/lib/pulseaudio.properties
echo "" >> $JAVA_HOME/jre/lib/pulseaudio.properties
echo "javax.sound.sampled.Clip=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider" >> $JAVA_HOME/jre/lib/pulseaudio.properties
echo "javax.sound.sampled.Port=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider" >> $JAVA_HOME/jre/lib/pulseaudio.properties
echo "javax.sound.sampled.SourceDataLine=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider" >> $JAVA_HOME/jre/lib/pulseaudio.properties
echo "javax.sound.sampled.TargetDataLine=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider" >> $JAVA_HOME/jre/lib/pulseaudio.properties
echo "" >> $JAVA_HOME/jre/lib/pulseaudio.properties
popd
%endif
# Check unlimited policy has been used
$JAVA_HOME/bin/javac -d . %{SOURCE14}
$JAVA_HOME/bin/java TestCryptoLevel
@ -618,7 +575,6 @@ find %{buildroot}%{_jvmdir}/%{jredir} -type f -o -type l \
#see https://bugzilla.redhat.com/show_bug.cgi?id=875408
NOT_HEADLESS=\
"%{_jvmdir}/%{jredir}/lib/%{archinstall}/libjsoundalsa.so
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libicedtea-sound.so
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libsplashscreen.so
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libawt_xawt.so
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libjawt.so"

90
jdk-gcc-warnings.patch
View File

@ -1,90 +0,0 @@
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp 2020-01-22 11:12:33.000000000 +0100
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp 2020-01-27 17:06:13.010809355 +0100
@@ -288,7 +288,7 @@
{ e_##name, #name, /*debug only*/ \
cspec, ix }
-const band_init all_band_inits[] = {
+const band_init all_band_inits[BAND_LIMIT+1] = {
//BAND_INIT(archive_magic, BYTE1_spec, 0),
//BAND_INIT(archive_header, UNSIGNED5_spec, 0),
//BAND_INIT(band_headers, BYTE1_spec, 0),
@@ -448,14 +448,8 @@
BAND_INIT(file_modtime, DELTA5_spec, 0),
BAND_INIT(file_options, UNSIGNED5_spec, 0),
//BAND_INIT(file_bits, BYTE1_spec, 0),
-#ifndef PRODUCT
- { 0, 0, 0, 0 }
-#else
- { 0, 0 }
-#endif
+ { 0, NULL, 0, 0 }
};
-#define NUM_BAND_INITS \
- (sizeof(all_band_inits)/sizeof(all_band_inits[0]))
band* band::makeBands(unpacker* u) {
band* tmp_all_bands = U_NEW(band, BAND_LIMIT);
--- a/jdk/src/share/native/sun/java2d/opengl/OGLContext.c 2020-01-22 11:12:33.000000000 +0100
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLContext.c 2020-01-27 17:06:13.010809355 +0100
@@ -38,6 +38,8 @@
#include "GraphicsPrimitiveMgr.h"
#include "Region.h"
+#include "jvm.h"
+
/**
* The following methods are implemented in the windowing system (i.e. GLX
* and WGL) source files.
--- a/jdk/src/solaris/native/sun/awt/awt_Font.c 2020-01-22 11:12:33.000000000 +0100
+++ b/jdk/src/solaris/native/sun/awt/awt_Font.c 2020-01-27 17:06:13.010809355 +0100
@@ -454,6 +454,7 @@
int32_t i, size;
char *fontsetname = NULL;
char *nativename = NULL;
+ Boolean doFree = FALSE;
jobjectArray componentFonts = NULL;
jobject peer = NULL;
jobject fontDescriptor = NULL;
@@ -493,8 +494,10 @@
if (!JNU_IsNull(env, fontDescriptorName)) {
nativename = (char *) JNU_GetStringPlatformChars(env, fontDescriptorName, NULL);
+ doFree = TRUE;
} else {
nativename = "";
+ doFree = FALSE;
}
fdata->flist[i].xlfd = malloc(strlen(nativename)
@@ -502,7 +505,7 @@
jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10,
nativename, size * 10);
- if (nativename != NULL && nativename != "")
+ if (nativename != NULL && doFree)
JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename);
/*
--- a/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2020-01-22 11:12:33.000000000 +0100
+++ b/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2020-01-27 17:06:13.010809355 +0100
@@ -545,7 +545,7 @@
xsdo->cData = xsdo->configData->color_data;
XShared_initSurface(env, xsdo, depth, width, height, drawable);
- xsdo->xrPic = NULL;
+ xsdo->xrPic = None;
#endif /* !HEADLESS */
}
--- a/jdk/src/solaris/native/sun/xawt/XToolkit.c 2020-01-22 11:12:33.000000000 +0100
+++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c 2020-01-27 17:06:13.010809355 +0100
@@ -723,7 +723,7 @@
if (pollFds[0].revents) {
// Events in X pipe
update_poll_timeout(TIMEOUT_EVENTS);
- PRINT2("performPoll(): TIMEOUT_EVENTS curPollTimeout = %ld \n", curPollTimeout);
+ PRINT2("performPoll(): TIMEOUT_EVENTS curPollTimeout = %d \n", curPollTimeout);
}
return TRUE;

81
maybe-uninitialized.patch
View File

@ -1,81 +0,0 @@
--- a/openj9/openj9/runtime/gc_structs/MixedObjectIterator.hpp
+++ b/openj9/runtime/gc_structs/MixedObjectIterator.hpp
@@ -234,7 +234,7 @@ public:
/**
* @param vm[in] pointer to the JVM
*/
- GC_MixedObjectIterator (OMR_VM *omrVM)
+ GC_MixedObjectIterator(OMR_VM *omrVM)
: _slotObject(GC_SlotObject(omrVM, NULL))
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
, _compressObjectReferences(OMRVM_COMPRESS_OBJECT_REFERENCES(omrVM))
@@ -251,20 +251,11 @@ public:
* @param vm[in] pointer to the JVM
* @param objectPtr[in] the object to be processed
*/
- GC_MixedObjectIterator (OMR_VM *omrVM, J9Object *objectPtr)
- : _slotObject(GC_SlotObject(omrVM, NULL))
-#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
- , _compressObjectReferences(OMRVM_COMPRESS_OBJECT_REFERENCES(omrVM))
-#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
- , _objectPtr(NULL)
- , _scanPtr(NULL)
- , _endPtr(NULL)
- , _descriptionPtr(NULL)
- , _description(0)
- , _descriptionIndex(0)
- {
+ GC_MixedObjectIterator(OMR_VM *omrVM, J9Object *objectPtr)
+ : GC_MixedObjectIterator(omrVM)
+ {
initialize(omrVM, objectPtr);
- }
+ }
};
#endif /* MIXEDOBJECTITERATOR_HPP_ */
--- a/openj9/openj9/runtime/gc_structs/PointerArrayIterator.hpp
+++ b/openj9/runtime/gc_structs/PointerArrayIterator.hpp
@@ -58,14 +58,12 @@ public:
* @param objectPtr the array object to be processed
*/
GC_PointerArrayIterator(J9JavaVM *javaVM, J9Object *objectPtr)
- : _contiguousArrayIterator(javaVM->omrVM)
- , _pointerArrayletIterator(javaVM)
+ : GC_PointerArrayIterator(javaVM)
{
initialize(javaVM, objectPtr);
}
GC_PointerArrayIterator(J9JavaVM *javaVM)
- /* It is unnecessary to initialize one of those iterators */
: _contiguousArrayIterator(javaVM->omrVM)
, _pointerArrayletIterator(javaVM)
{
--- a/openj9/openj9/runtime/gc_structs/PointerContiguousArrayIterator.hpp
+++ b/openj9/runtime/gc_structs/PointerContiguousArrayIterator.hpp
@@ -96,7 +96,10 @@ public:
}
GC_PointerContiguousArrayIterator(OMR_VM *omrVM)
- : _slotObject(GC_SlotObject(omrVM, NULL))
+ : _arrayPtr(NULL)
+ , _slotObject(GC_SlotObject(omrVM, NULL))
+ , _scanPtr(NULL)
+ , _endPtr(NULL)
#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
, _compressObjectReferences(OMRVM_COMPRESS_OBJECT_REFERENCES(omrVM))
#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
@@ -108,11 +111,7 @@ public:
* @param objectPtr the array object to be processed
*/
GC_PointerContiguousArrayIterator(OMR_VM *omrVM, J9Object *objectPtr)
- : _slotObject(GC_SlotObject(omrVM, NULL))
-#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS)
- , _compressObjectReferences(OMRVM_COMPRESS_OBJECT_REFERENCES(omrVM))
-#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */
- , _omrVM(omrVM)
+ : GC_PointerContiguousArrayIterator(omrVM)
{
initialize(objectPtr);
}

11
omr-no-return-in-nonvoid-function.patch
View File

@ -1,11 +0,0 @@
--- omr/compiler/z/env/OMRCPU.cpp
+++ omr/compiler/z/env/OMRCPU.cpp
@@ -586,6 +586,8 @@ OMR::Z::CPU::setSupportsMiscellaneousInstructionExtensions2Facility(bool value)
{
_flags.reset(S390SupportsMIE2);
}
+
+ return value;
}
bool