Hello community,
here is the log from the commit of package java-1_8_0-openjdk for
openSUSE:Factory checked in at 2016-06-14 23:05:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_8_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_8_0-openjdk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes
2016-04-03 23:04:27.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/java-1_8_0-openjdk.changes
2016-06-14 23:05:28.000000000 +0200
@@ -1,0 +2,413 @@
+Fri Jun 3 09:01:23 UTC 2016 - [email protected]
+
+- Added patch:
+ * disable-doclint-by-default-patch
+ - Disable Doclint while building javadoc by default. OpenJDK 8
+ adds and enables doclint by default. This catches issues in
+ javadoc comments. It is too strict, breaks javadoc compilation
+ and, in general, breaks the build for old code known to build
+ with previous versions of OpenJDK.
+- Cycle make on i586 in order to prevent some random build errors
+ that are not easily reproduceable and thus fixable.
+
+-------------------------------------------------------------------
+Tue May 31 06:47:43 UTC 2016 - [email protected]
+
+- Added patch:
+ * java-1_8_0-openjdk-gcc6.patch
+ + Fix build with gcc 6.1
+- Add -fno-delete-null-pointer-checks -fno-lifetime-dse to try to
+ avoid some crashes
+
+-------------------------------------------------------------------
+Thu Apr 28 08:19:17 UTC 2016 - [email protected]
+
+- Upgrade to version jdk8u91 (icedtea 3.0.1, bsc#976340)
+- Icedtea changes from 2.6.5
+ * Security fixes
+ - S8129952, CVE-2016-0686: Ensure thread consistency
+ - S8132051, CVE-2016-0687: Better byte behavior
+ - S8138593, CVE-2016-0695: Make DSA more fair
+ - S8139008: Better state table management
+ - S8143167, CVE-2016-3425: Better buffering of XML strings
+ - S8143945, CVE-2016-3426: Better GCM validation
+ - S8144430, CVE-2016-3427: Improve JMX connections
+ - S8146494: Better ligature substitution
+ - S8146498: Better device table adjustments
+ * Import of OpenJDK 8 u91 build 14
+ - S8002116: This JdbReadTwiceTest.sh gets an exit 1
+ - S8007890: [TESTBUG] JcmdWithNMTDisabled.java fails when
+ invoked with NMT explicitly turned on
+ - S8036132: Tab characters in test/com/sun/jdi files
+ - S8038963: com/sun/jdi tests fail because cygwin's ps sometimes
+ misses processes
+ - S8044419: TEST_BUG: com/sun/jdi/JdbReadTwiceTest.sh fails when
+ run under root
+ - S8059661: Test SoftReference and OOM behavior
+ - S8067422: Lambda method names are unnecessarily unstable
+ - S8073735: [TEST_BUG] compiler/loopopts/CountedLoopProblem.java
+ got OOME
+ - S8074146: [TEST_BUG] jdb has succeded to read an unreadable
+ file
+ - S8130212: Thread::current() might access freed memory on
+ Solaris
+ - S8132890: Text Overlapping on Dot Matrix Printers
+ - S8134297: NPE in GSSNameElement nameType check
+ - S8134650: Xsl transformation gives different results in 8u66
+ - S8134828: Scrollbar thumb disappears with Nimbus L&F
+ - S8138589: Correct limits on unlimited cryptography
+ - S8138811: Construction of static protection domains
+ - S8140268: Generate link to specification license for JavaDoc
+ API documentation
+ - S8141229: [Parfait] Null pointer dereference in cmsstrcasecmp
+ of cmserr.c
+ - S8143002: [Parfait] JNI exception pending in fontpath.c:1300
+ - S8143959: Certificates requiring blacklisting
+ - S8146477: [TEST_BUG] ClientJSSEServerJSSE.java failing again
+ - S8146518: Zero interpreter broken with better byte behaviour
+ - S8146967: [TEST_BUG]
javax/security/auth/SubjectDomainCombiner/Optimize.java
+ should use 4-args ProtectionDomain constructor
+ - S8147567: InterpreterRuntime::post_field_access not updated
+ for boolean in JDK-8132051
+ - S8148446: (tz) Support tzdata2016a
+ - S8148475: Missing SA Bytecode updates.
+ - S8148487: PPC64: Better byte behavior
+ - S8148522: Backout JDK-8138811 from 2016 Apr CPU repo
+ - S8149170: Better byte behavior for native arguments
+ - S8149367: PolicyQualifierInfo/index_Ctor JCk test fails with
+ IOE: Invalid encoding for PolicyQualifierInfo
+ - S8150012: Better byte behavior for reflection
+ - S8150790: 8u75 L10n resource file translation update
+ * Backports
+ - S8148752, PR2943: Compiled StringBuilder code throws
+ StringIndexOutOfBoundsException
+ - S8154210: Zero: Better byte behaviour
+ - S8154413: AArch64: Better byte behaviour
+ - S4890063, PR2304, RH1214835: HPROF: default text truncated
+ when using doe=n option
+ - S6425769, PR2859: Allow specifying an address to bind JMX
+ remote connector
+ - S8000650, PR2462: unpack200.exe should check gzip crc
+ - S8031668, PR2842: TOOLCHAIN_FIND_COMPILER unexpectedly
+ resolves symbolic links
+ - S8035341: Allow using a system installed libpng
+ - S8038392: Generating prelink cache breaks JAVA 'jinfo' utility
+ normal behavior
+ - S8042159: Allow using a system-installed lcms2
+ - S8042806: Splashscreen uses libjpeg-internal macros
+ - S8043805: Allow using a system-installed libjpeg
+ - S8044235: src.zip should include all sources
+ - S8074839, PR2462: Resolve disabled warnings for libunpack and
+ the unpack200 binary
+ - S8074859, PR1937: Turn on warnings as error
+ - S8087218, PR2740: Constant fold loads from final instance
+ fields in VM anonymous classes
+ - S8139932, PR2739: Typo in makefile changes for 8043805 [Allow
+ using a system-installed libjpeg]
+ - S8140483, PR2740: Atomic*FieldUpdaters final fields should be
+ trusted
+ - S8140620, PR2769: Find and load default.sf2 as the default
+ soundbank on Linux
+ - S8145096, PR2854: Undefined behaviour in HotSpot
+ - S8145982, PR2859: JMXInterfaceBindingTest is failing
+ intermittently
+ - S8146015, PR2859: JMXInterfaceBindingTest is failing
+ intermittently for IPv6 addresses
+ - S8148351, PR2842: Only display resolved symlink for compiler,
+ do not change path
+ - S8150954, PR2866, RH1176206: AWT Robot not compatible with
+ GNOME Shell
+ * Bug fixes
+ - PR2933: Support ccache 3.2 and later
+ - PR2934: SunEC provider throwing KeyException with current NSS
+ - S8041658: Use of -fdevirtualize on macroAssembler_x86.o
+ (via -O2) with gcc 4.9.0 creates broken VM
+ - PR94: empty install target in Makefile.am
+ - PR729: GTKLookAndFeel should be the system look&feel on all
+ GNU/Linux desktops
+ - PR1275: Provide option to turn off downloading of tarballs
+ - PR1281, RH513605: Updating/Installing OpenJDK should recreate
+ the shared class-data archive
+ - PR1289: Allow JARs to be optionally compressed by setting
+ COMPRESS_JARS
+ - PR1291: Ensure unlimited crypto policy is in place.
+ - PR1325: Only add classes to rt-source-files.txt if actually
+ needed
+ - PR1341: Remove Rhino support
+ - PR1346: Filter out -j option to make
+ - PR1347: Update list of checked JDKs
+ - PR1348: java -version output is broken
+ - PR1357: Make XRender mandatory
+ - PR1359: Check for /usr/lib64 JVMs and generic JPackage
+ alternative
+ - PR1364: Replace hgforest support
+ - PR1367: Support using the system installation of LCMS
+ - PR1368: Ensure debug data is available for all libraries and
+ binaries without redundant files
+ - PR1369: Remove outdated bootstrap configure tests or make them
+ fail on error
+ - PR1377: Forwardport javac detection / usability test from
+ IcedTea 2.x
+ - PR1379: Add build support for Zero AArch64
+ - PR1413: Undefined reference to libz during link of unpack200
+ - PR1741: Break PulseAudio provider out into IcedTea-Sound
+ - PR1766: Expand architecture support
+ - PR1774: Support GIF lib v5
+ - PR1774: Correct #ifdef to #if
+ - PR1796: make fails with "computed checksum did NOT match"
+ - PR1806: Support Debian/Ubuntu 7 & 8 OpenJDK Installs as Boot
+ JDK
+ - PR1812: Unable to locate HotSpot checksum when downloading
+ - PR1813: HotSpot URL should be used with --enable-hg
+ - PR1815: Split download/extraction rules for OpenJDK so they
+ can run in parallel
+ - PR1829: Support AM_MAINTAINER_MODE
+ - PR1834, RH1022017: Report elliptic curves supported by NSS,
+ not the SunEC library
+ - PR1845: jstack.stp in OpenJDK8 is broken
+ - PR1869: Avoid x86 workaround when running Zero rather than a
+ JIT
+ - PR1889: Allow tarball checksumming to be disabled
+ - PR1935: HotSpot extraction needs to depend on the tarball
+ being downloaded
+ - PR1937: Add configure option for -Werror
+ - PR1938: Zero broken by enforced use of -Werror
+ - PR1942: Bug reports lack IcedTea version & distribution
+ packaging information
+ - PR1950: Add build support for Zero SH
+ - PR1965, G498288: Allow builds on PaX kernels
+ - PR1968: Move to new OpenJDK bug URL format
+ - PR1975: SystemTap probes for the garbage collector.
+ - PR1977: Support using the system installation of Zlib
+ - PR1979: Support using the system installation of libjpeg
+ - PR1980: Support using the system installation of giflib
+ - PR1981: Support using the system installation of libpng
+ - PR1983: Support using the system installation of NSS with the
+ SunEC provider
+ - PR1994: make dist broken
+ - PR2001: Synchronise HEAD tarball paths with release branch
+ paths
+ - PR2066: Unset OS before running OpenJDK build
+ - PR2095, RH1163501: 2048-bit DH upper bound too small for
+ Fedora infrastructure
+ - PR2126: Synchronise elliptic curves in
+ sun.security.ec.NamedCurve with those listed by NSS
+ - PR2127: SunEC provider crashes when built using system NSS
+ - PR2199: Support giflib 5.1.0
+ - PR2212: DGifCloseFile call should check the return value, not
++++ 216 more lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes
++++ and
/work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/java-1_8_0-openjdk.changes
Old:
----
094308b2ca1c.tar.bz2
1c71899e8566.tar.bz2
223b64a19e94.tar.bz2
3fbef9f4cddf.tar.bz2
43c11664317a.tar.bz2
PStack-808293.patch
TestCryptoLevel.java
aarch64-misc.patch
b6ee21a35619.tar.bz2
c44179bce874.tar.bz2
c6f67bea4466.tar.bz2
config.guess
config.sub
e8dc6eb11c76.tar.bz2
include-all-srcs.patch
jconsole.desktop.in
link-with-as-needed.patch
memory-limits.patch
multiple-pkcs11-library-init.patch
nss.cfg
policytool.desktop.in
ppc64le-8036767.patch
s390-java-opts.patch
s390-size_t.patch
system-lcms.patch
system-libjpeg.patch
system-libpng.patch
systemtap-tapset.tar.gz
zero-dummy.patch
New:
----
corba.tar.xz
hotspot.tar.xz
icedtea-3.0.1-sunec.patch
icedtea-3.0.1.tar.xz
java-1_8_0-openjdk-gcc6.patch
java-1_8_0-openjdk-suse-desktop-files.patch
jaxp.tar.xz
jaxws.tar.xz
jdk.tar.xz
langtools.tar.xz
nashorn.tar.xz
openjdk.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_8_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.72dIvf/_old 2016-06-14 23:05:32.000000000 +0200
+++ /var/tmp/diff_new_pack.72dIvf/_new 2016-06-14 23:05:32.000000000 +0200
@@ -18,9 +18,9 @@
%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
%global jit_arches %ix86 x86_64 ppc64 ppc64le %aarch64
-%global debug 0
-%global bootcycle 1
-%global buildoutputdir build
+%global icedtea_version 3.0.1
+%global icedtea_sound_version 1.0.1
+%global buildoutputdir openjdk.build/
# Convert an absolute path to a relative path. Each symbolic link is
# specified relative to the directory in which it is installed so that
# it will resolve properly within chrooted installations.
@@ -29,25 +29,10 @@
%global syslibdir %{_libdir}
%global archname %{name}
# Standard JPackage naming and versioning defines.
-%global updatever 77
-%global buildver b03
-%global root_project jdk8u
-%global root_repository jdk8u
-%global root_revision 3fbef9f4cddf
-%global corba_revision e8dc6eb11c76
-%global hotspot_revision 223b64a19e94
-%global jaxp_revision 1c71899e8566
-%global jaxws_revision c6f67bea4466
-%global jdk_revision c44179bce874
-%global langtools_revision 094308b2ca1c
-%global nashorn_revision b6ee21a35619
-%global aarch64_project aarch64-port
-%global aarch64_repository jdk8u
-%global aarch64_hotspot_revision 43c11664317a
-%global icedtea_sound_version 1.0.1
# priority must be 6 digits in total
%global priority 1805
%global javaver 1.8.0
+%global updatever 91
# Standard JPackage directories and symbolic links.
%global sdklnk java-%{javaver}-openjdk
%global archname %{sdklnk}
@@ -73,6 +58,11 @@
%else
%global with_pulseaudio 0
%endif
+%if 0%{?suse_version} >= 1220
+%global with_system_lcms 1
+%else
+%global with_system_lcms 0
+%endif
%ifarch x86_64
%global archinstall amd64
%endif
@@ -114,18 +104,6 @@
%ifnarch %{jit_arches}
%global archinstall %{_arch}
%endif
-%if %{debug}
-%global debugbuild slowdebug
-%else
-%global debugbuild release
-%endif
-%if %{bootcycle}
-%global imagesdir bootcycle-build/images
-%global imagestarget bootcycle-images
-%else
-%global imagesdir images
-%global imagestarget images
-%endif
%ifnarch %{jit_arches}
%global _with_zero 1
%endif
@@ -140,6 +118,11 @@
%if 0%{?__isa_bits}
%global bits %{__isa_bits}
%endif
+%if 0%{?suse_version} >= 1330
+%global with_sunec 1
+%else
+%global with_sunec 0
+%endif
%bcond_with zero
# Turn on/off some features depending on openSUSE version
%if 0%{?suse_version} >= 1130
@@ -152,10 +135,6 @@
%global with_systemtap 0
%endif
%if %{with_systemtap}
-%global tapsetroot %{_datadir}/systemtap
-%global tapsetdir %{tapsetroot}/tapset/%{_build_cpu}
-%endif
-%if %{with_systemtap}
# Where to install systemtap tapset (links)
# We would like these to be in a package specific subdir,
# but currently systemtap doesn't support that, so we have to
@@ -174,72 +153,38 @@
License: Apache-1.1 and Apache-2.0 and GPL-1.0+ and GPL-2.0 and
GPL-2.0-with-classpath-exception and LGPL-2.0 and MPL-1.0 and MPL-1.1 and
SUSE-Public-Domain and W3C
Group: Development/Languages/Java
Url: http://openjdk.java.net/
-# Sources from upstream OpenJDK8 project.
-Source0:
http://hg.openjdk.java.net/%{root_project}/%{root_repository}/archive/%{root_revision}.tar.bz2
-Source1:
http://hg.openjdk.java.net/%{root_project}/%{root_repository}/corba/archive/%{corba_revision}.tar.bz2
-Source2:
http://hg.openjdk.java.net/%{root_project}/%{root_repository}/hotspot/archive/%{hotspot_revision}.tar.bz2
-Source3:
http://hg.openjdk.java.net/%{root_project}/%{root_repository}/jaxp/archive/%{jaxp_revision}.tar.bz2
-Source4:
http://hg.openjdk.java.net/%{root_project}/%{root_repository}/jaxws/archive/%{jaxws_revision}.tar.bz2
-Source5:
http://hg.openjdk.java.net/%{root_project}/%{root_repository}/jdk/archive/%{jdk_revision}.tar.bz2
-Source6:
http://hg.openjdk.java.net/%{root_project}/%{root_repository}/langtools/archive/%{langtools_revision}.tar.bz2
-Source7:
http://hg.openjdk.java.net/%{root_project}/%{root_repository}/nashorn/archive/%{nashorn_revision}.tar.bz2
-# Hotspot version from aarch64-port repository (using the _tip_ of the
http://hg.openjdk.java.net/%{aarch64_project}/%{aarch64_repository}/hotspot)
-Source8:
http://hg.openjdk.java.net/%{aarch64_project}/%{aarch64_repository}/hotspot/archive/%{aarch64_hotspot_revision}.tar.bz2
-# Pulseaudio plugin
-Source9:
http://icedtea.classpath.org/download/source/icedtea-sound-%{icedtea_sound_version}.tar.xz
-# Systemtap tapsets. Zipped up to keep it small.
-Source10: systemtap-tapset.tar.gz
-# Desktop files. Adapated from IcedTea.
-Source11: jconsole.desktop.in
-Source12: policytool.desktop.in
-# nss configuration file
-Source13: nss.cfg
-# Ensure we aren't using the limited crypto policy
-Source14: TestCryptoLevel.java
-# New versions of config files with aarch64 support. This is not upstream yet.
-Source100: config.guess
-Source101: config.sub
+Source0:
http://icedtea.classpath.org/download/source/icedtea-%{icedtea_version}.tar.xz
+Source1:
http://icedtea.classpath.org/download/source/icedtea-sound-%{icedtea_sound_version}.tar.xz
+Source2:
http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/openjdk.tar.xz
+Source3:
http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/corba.tar.xz
+Source4:
http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/jaxp.tar.xz
+Source5:
http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/jaxws.tar.xz
+Source6:
http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/jdk.tar.xz
+Source7:
http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/langtools.tar.xz
+Source8:
http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/hotspot.tar.xz
+Source9:
http://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/nashorn.tar.xz
# RPM/distribution specific patches
# RHBZ 1015432
Patch2: 1015432.patch
# Restrict access to java-atk-wrapper classes
Patch3: java-atk-wrapper-security.patch
-# RHBZ 808293
-Patch4: PStack-808293.patch
-# Allow multiple initialization of PKCS11 libraries
-Patch5: multiple-pkcs11-library-init.patch
-# Disable doclint for compatibility
-Patch6: disable-doclint-by-default.patch
-# Include all sources in src.zip
-Patch7: include-all-srcs.patch
# Fix expression compares a char* pointer with a string literal
Patch8: compare-pointer-with-literal.patch
-# Backport stuff from aarch64-port
-Patch9: aarch64-misc.patch
-# From icedtea: Increase default memory limits
-Patch10: memory-limits.patch
# Fix use of unintialized memory in adlc parser
Patch12: adlc-parser.patch
# Fix: implicit-pointer-decl
Patch13: implicit-pointer-decl.patch
# Avoid triggering inactivity timeout while generating javadoc in zero VM
Patch14: zero-javadoc-verbose.patch
-# Fix crash on zero virtual machine built with gcc5
-Patch16: zero-dummy.patch
#
# OpenJDK specific patches
#
-# JVM heap size changes for s390 (thanks to aph)
-Patch100: s390-java-opts.patch
-Patch101: s390-size_t.patch
-# Patch for PPC/PPC64
+# Patch for PPC
Patch103: ppc-zero-hotspot.patch
-Patch104: ppc64le-8036767.patch
-# Patches for system libraries
-Patch201: system-libjpeg.patch
-Patch202: system-libpng.patch
-Patch203: system-lcms.patch
-Patch205: link-with-as-needed.patch
+Patch1000: icedtea-3.0.1-sunec.patch
+Patch1001: java-1_8_0-openjdk-suse-desktop-files.patch
+Patch2000: java-1_8_0-openjdk-gcc6.patch
+Patch2001: disable-doclint-by-default.patch
BuildRequires: alsa-lib-devel
BuildRequires: autoconf
BuildRequires: automake
@@ -252,13 +197,17 @@
BuildRequires: gcc-c++
BuildRequires: giflib-devel
BuildRequires: gtk2-devel
+BuildRequires: java-bootstrap-devel >= 1.7.0
+BuildRequires: libXcomposite-devel
BuildRequires: libjpeg-devel
BuildRequires: liblcms2-devel
BuildRequires: libpng-devel
BuildRequires: libxslt
+BuildRequires: mozilla-nss-devel
BuildRequires: pkgconfig
BuildRequires: unzip
BuildRequires: update-desktop-files
+BuildRequires: wget
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
# Requires rest of java
@@ -308,11 +257,6 @@
BuildRequires: libXt-devel
BuildRequires: libXtst-devel
%endif
-%if %{bootcycle}
-BuildRequires: java-bootstrap-devel >= 1.6.0
-%else
-BuildRequires: java-devel >= %{javaver}
-%endif
# runtime certificates generation available in 11.3+ - bnc#596177
%if 0%{?suse_version} >= 1130
BuildRequires: java-ca-certificates
@@ -444,96 +388,16 @@
this package unless you really need to.
%prep
-%setup -q -n %{root_repository}-%{root_revision}
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 1
-%ifarch %aarch64
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 8
-%else
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 2
-%endif
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 3
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 4
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 5
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 6
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 7
+%setup -q -n icedtea-%{icedtea_version}
+%setup -q -D -n icedtea-%{icedtea_version} -T -a 1
-%if %{with_pulseaudio}
-%setup -q -D -n %{root_repository}-%{root_revision} -T -a 9
-%endif
-
-# Set up the build tree using the subrepository tarballs
-pwd
-mv corba-%{corba_revision} corba
-
-%ifarch %aarch64
-mv hotspot-%{aarch64_hotspot_revision} hotspot
-%else
-mv hotspot-%{hotspot_revision} hotspot
-%endif
-mv jaxp-%{jaxp_revision} jaxp
-mv jaxws-%{jaxws_revision} jaxws
-mv jdk-%{jdk_revision} jdk
-mv langtools-%{langtools_revision} langtools
-mv nashorn-%{nashorn_revision} nashorn
-
-%if %{with_pulseaudio}
-mv icedtea-sound-%{icedtea_sound_version} icedtea-sound
-%endif
-
-# replace outdated configure guess script
-#
-# the configure macro will do this too, but it also passes a few flags not
-# supported by openjdk configure script
-cp %{SOURCE100} common/autoconf/build-aux/
-cp %{SOURCE101} common/autoconf/build-aux/
-
-# 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
-rm -rvf jdk/src/share/native/sun/awt/libpng
-rm -rvf jdk/src/share/native/sun/awt/giflib
-rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/cms*
-rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
-
-%patch201 -p1
-%patch202 -p1
-%patch203 -p1
-%patch205 -p1
-
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch12 -p1
-%patch13 -p1
-
-%if %{with zero}
-%patch14 -p1
-%patch16 -p1
-%endif
-
-%ifarch s390
-%patch100 -p1
-%patch101 -p1
-%endif
-
-%ifarch ppc ppc64 ppc64le
-# PPC fixes
-%patch103 -p1
-%patch104 -p1
-%endif
+%patch1000 -p1
+%patch1001 -p1
# Extract systemtap tapsets
%if %{with_systemtap}
-tar xzf %{SOURCE10}
-
for file in tapset/*.in; do
OUTPUT_FILE=`echo $file | sed -e s:\.in$::g`
@@ -552,14 +416,10 @@
%endif
-# Prepare desktop files
-for file in %{SOURCE11} %{SOURCE12} ; do
- OUTPUT_FILE=`basename $file | sed -e s:\.in$::g`
- sed -e s:@JAVA_HOME@:%{_jvmdir}/%{sdkdir}:g $file > $OUTPUT_FILE
- sed -i -e s:@VERSION@:%{javaver}.%{_arch}:g $OUTPUT_FILE
-done
-
%build
+export LANG=C
+unset JAVA_HOME
+
# How many cpu's do we have?
export NUM_PROC=`%{_bindir}/getconf _NPROCESSORS_ONLN 2> /dev/null || :`
export NUM_PROC=${NUM_PROC:-1}
@@ -570,75 +430,96 @@
export ZLIB_LIBS="-L/%{_lib} -lz"
%endif
-# Build IcedTea and OpenJDK.
+CFLAGS=$(rpm -E '%{optflags}' | sed 's/-Wall\>//')
+%if 0%{?suse_version} >= 1330
+CFLAGS+=" -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse"
+%endif
+export CFLAGS
+export CXXFLAGS=${CFLAGS}
+%if %{with_sunec}
+export NSS_SOFTOKN_CFLAGS="`pkg-config --cflags nss` -I`pwd`"
+export NSS_SOFTOKN_LIBS="-L%{_libdir} -lnssdbm3 -lsoftokn3 -lssl3 -lsmime3
-lnss3 -lnssutil3 -lfreebl -L%{_libdir}/nspr -lplds4 -lplc4 -lnspr4"
+export NSS_CFLAGS="$NSS_SOFTOKN_CFLAGS"
+export NSS_LIBS="$NSS_SOFTOKN_LIBS"
+%endif
-%ifarch s390x sparc64 alpha ppc64 ppc64le %aarch64
-export ARCH_DATA_MODEL=64
+sh autogen.sh
+%configure \
+%if %{with_sunec}
+ --enable-sunec \
+%endif
+ --enable-bootstrap \
+ --disable-infinality \
+ --disable-downloading \
+ --with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
+%ifnarch %arm %aarch64
+ --with-parallel-jobs="${NUM_PROC}" \
%endif
+ --with-pkgversion="suse-%{release}-%{_arch}" \
+ --with-jdk-home="%{_sysconfdir}/alternatives/java_sdk" \
+%if %{with_systemtap}
+ --enable-systemtap \
+%endif
+%if %{with zero}
+ --enable-zero \
+%endif
+%if 0%{?suse_version} <= 1110
+ --disable-system-gio \
+ --disable-system-gconf \
+%endif
+%if %{with_system_lcms}
+ --enable-system-lcms \
+%else
+ --disable-system-lcms \
+%endif
+ --with-openjdk-src-zip=%{SOURCE2} \
+ --with-corba-src-zip=%{SOURCE3} \
+ --with-jaxp-src-zip=%{SOURCE4} \
+ --with-jaxws-src-zip=%{SOURCE5} \
+ --with-jdk-src-zip=%{SOURCE6} \
+ --with-langtools-src-zip=%{SOURCE7} \
+ --with-hotspot-src-zip=%{SOURCE8} \
+ --with-nashorn-src-zip=%{SOURCE9}
+
+make patch %{?_smp_mflags}
+
+patch -p0 -i %{PATCH2}
+patch -p0 -i %{PATCH3}
+patch -p0 -i %{PATCH8}
+patch -p0 -i %{PATCH12}
+patch -p0 -i %{PATCH13}
-%ifarch alpha
-export CFLAGS="$CFLAGS -mieee"
+%if %{with zero}
+patch -p0 -i %{PATCH14}
%endif
-(cd common/autoconf
- bash ./autogen.sh
-)
+%ifarch ppc ppc64 ppc64le
+# PPC fixes
+patch -p0 -i %{PATCH103}
+%endif
-mkdir -p %{buildoutputdir}
+patch -p0 -i %{PATCH2000}
+patch -p0 -i %{PATCH2001}
-pushd %{buildoutputdir}
+(cd openjdk/common/autoconf
+ bash ./autogen.sh
+)
-bash ../configure \
-%if %{with zero}
- --with-jvm-variants=zero \
-%endif
- --disable-zip-debug-info \
- --with-milestone="fcs" \
- --with-update-version=%{updatever} \
- --with-build-number=%{buildver} \
- --with-debug-level=%{debugbuild} \
- --enable-unlimited-crypto \
- --with-zlib=system \
- --with-libjpeg=system \
- --with-giflib=system \
- --with-libpng=system \
- --with-lcms=system \
- --with-stdc++lib=dynamic \
-%ifnarch %arm
- --with-num-cores="$NUM_PROC" \
+%if 0%{?suse_version} >= 1330
+%ifarch %ix86
+for i in {1..10}; do make %{?_smp_mflags} && break; done
+%else
+make %{?_smp_mflags}
%endif
-%if 0%{?suse_version} >= 1120
- --with-extra-cflags="-fno-devirtualize" \
- --with-extra-cxxflags="-fno-devirtualize" \
+%else
+make %{?_smp_mflags}
%endif
- --with-boot-jdk=%{_sysconfdir}/alternatives/java_sdk
-
-# 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 \
- 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 \
- %{imagestarget} docs
-
-# remove redundant *diz and *debuginfo files
-find %{imagesdir}/j2sdk-image -iname '*.diz' -exec rm {} \;
-find %{imagesdir}/j2sdk-image -iname '*.debuginfo' -exec rm {} \;
-popd >& /dev/null
-
-export JAVA_HOME=$(pwd)/%{buildoutputdir}/%{imagesdir}/j2sdk-image
+export JAVA_HOME=$(pwd)/%{buildoutputdir}images/j2sdk-image
# cacerts are generated in runtime in openSUSE
-if [ -f %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/lib/security/cacerts ];
then
- rm %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/lib/security/cacerts
+if [ -f %{buildoutputdir}images/j2sdk-image/jre/lib/security/cacerts ]; then
+ rm -f %{buildoutputdir}images/j2sdk-image/jre/lib/security/cacerts
fi
%if 0%{?suse_version} < 1130
@@ -648,14 +529,14 @@
ALIAS=$(basename ${PEM} .pem)
awk '/-----BEGIN CERTIFICATE-----/,/-----END CERTIFICATE-----/{ print $0;
}' ${PEM} > ${ALIAS}.pem
- yes | $JAVA_HOME/jre/bin/keytool -import -alias ${ALIAS} -keystore
%{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/lib/security/cacerts -storepass
'changeit' -file ${ALIAS}.pem || :
+ yes | $JAVA_HOME/jre/bin/keytool -import -alias ${ALIAS} -keystore
%{buildoutputdir}images/j2sdk-image/jre/lib/security/cacerts -storepass
'changeit' -file ${ALIAS}.pem || :
rm ${ALIAS}.pem
done
%endif
%if %{with_pulseaudio}
# Build the pulseaudio plugin
-pushd icedtea-sound
+pushd icedtea-sound-%{icedtea_sound_version}
%configure \
--with-jdk-home=$JAVA_HOME \
--disable-docs
@@ -672,10 +553,6 @@
popd
%endif
-# Check unlimited policy has been used
-$JAVA_HOME/bin/javac -d . %{SOURCE14}
-$JAVA_HOME/bin/java TestCryptoLevel
-
# Check debug symbols are present and can identify code
SERVER_JVM="$JAVA_HOME/jre/lib/%{archinstall}/server/libjvm.so"
if [ -f "$SERVER_JVM" ] ; then
@@ -700,7 +577,9 @@
%if %{with_systemtap}
# Install systemtap support files.
install -dm 755 %{buildroot}%{_jvmdir}/%{sdkdir}/tapset
- cp -a tapset/*.stp %{buildroot}%{_jvmdir}/%{sdkdir}/tapset/
+ for i in tapset/*.stp; do
+ cp -a $i %{buildroot}%{_jvmdir}/%{sdkdir}/tapset/$(basename $i
.stp)-1.8.0.stp
+ done
install -d -m 755 %{buildroot}%{tapsetdir}
pushd %{buildroot}%{tapsetdir}
RELATIVE=$(%{abs2rel} %{_jvmdir}/%{sdkdir}/tapset %{tapsetdir})
@@ -708,7 +587,7 @@
popd
%endif
-pushd %{buildoutputdir}/%{imagesdir}/j2sdk-image
+pushd %{buildoutputdir}images/j2sdk-image
# Install main files.
install -d -m 755 %{buildroot}%{_jvmdir}/%{sdkdir}
@@ -777,9 +656,6 @@
popd
-# Install nss.cfg
-install -m 644 %{SOURCE13} %{buildroot}%{_jvmdir}/%{jredir}/lib/security/
-
# Install Javadoc documentation.
install -d -m 755 %{buildroot}%{_javadocdir}
cp -a %{buildoutputdir}/docs %{buildroot}%{_javadocdir}/%{sdklnk}
@@ -787,7 +663,7 @@
# Install icons and menu entries.
for s in 16 24 32 48 ; do
install -D -p -m 644 \
- jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
+ openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
%{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}.png
done
@@ -1137,9 +1013,9 @@
%dir %{_libdir}/jvm-exports
%dir %{_libdir}/jvm-private
-%doc %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION
-%doc %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/LICENSE
-%doc %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/THIRD_PARTY_README
+%doc %{buildoutputdir}images/j2sdk-image/jre/ASSEMBLY_EXCEPTION
+%doc %{buildoutputdir}images/j2sdk-image/jre/LICENSE
+%doc %{buildoutputdir}images/j2sdk-image/jre/THIRD_PARTY_README
%dir %{_jvmdir}/%{sdkdir}
%{_jvmdir}/%{jrelnk}
++++++ 1015432.patch ++++++
--- /var/tmp/diff_new_pack.72dIvf/_old 2016-06-14 23:05:32.000000000 +0200
+++ /var/tmp/diff_new_pack.72dIvf/_new 2016-06-14 23:05:32.000000000 +0200
@@ -1,5 +1,5 @@
---- jdk8/hotspot/src/os/linux/vm/os_linux.cpp Wed Oct 23 15:44:12 2013 -0700
-+++ jdk8/hotspot/src/os/linux/vm/os_linux.cpp Thu Dec 19 16:03:33 2013 +0000
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Wed Oct 23 15:44:12
2013 -0700
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Thu Dec 19 16:03:33
2013 +0000
@@ -4797,9 +4797,19 @@
// size. Add a page for compiler2 recursion in main thread.
// Add in 2*BytesPerWord times page size to account for VM stack during
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.72dIvf/_old 2016-06-14 23:05:32.000000000 +0200
+++ /var/tmp/diff_new_pack.72dIvf/_new 2016-06-14 23:05:32.000000000 +0200
@@ -4,7 +4,7 @@
<size unit="M">2048</size>
</physicalmemory>
<disk>
- <size unit="G">6</size>
+ <size unit="G">20</size>
</disk>
</hardware>
++++++ adlc-parser.patch ++++++
--- /var/tmp/diff_new_pack.72dIvf/_old 2016-06-14 23:05:32.000000000 +0200
+++ /var/tmp/diff_new_pack.72dIvf/_new 2016-06-14 23:05:32.000000000 +0200
@@ -1,5 +1,5 @@
---- jdk8/hotspot/src/share/vm/adlc/formsopt.cpp 2014-07-03
21:56:12.000000000 +0200
-+++ jdk8/hotspot/src/share/vm/adlc/formsopt.cpp 2014-07-14
11:43:21.900408570 +0200
+--- openjdk/hotspot/src/share/vm/adlc/formsopt.cpp 2014-07-03
21:56:12.000000000 +0200
++++ openjdk/hotspot/src/share/vm/adlc/formsopt.cpp 2014-07-14
11:43:21.900408570 +0200
@@ -347,6 +347,7 @@
_return_value = NULL;
_c_return_value = NULL;
++++++ compare-pointer-with-literal.patch ++++++
--- /var/tmp/diff_new_pack.72dIvf/_old 2016-06-14 23:05:32.000000000 +0200
+++ /var/tmp/diff_new_pack.72dIvf/_new 2016-06-14 23:05:32.000000000 +0200
@@ -1,5 +1,5 @@
---- jdk8/jdk/src/solaris/native/sun/awt/awt_Font.c 2014-06-23
01:01:34.000000000 +0200
-+++ jdk8/jdk/src/solaris/native/sun/awt/awt_Font.c 2014-07-08
23:22:33.235559628 +0200
+--- openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c 2014-06-23
01:01:34.000000000 +0200
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c 2014-07-08
23:22:33.235559628 +0200
@@ -502,7 +502,7 @@
jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10,
nativename, size * 10);
++++++ disable-doclint-by-default.patch ++++++
--- /var/tmp/diff_new_pack.72dIvf/_old 2016-06-14 23:05:32.000000000 +0200
+++ /var/tmp/diff_new_pack.72dIvf/_new 2016-06-14 23:05:32.000000000 +0200
@@ -10,8 +10,8 @@
Author: Andrew John Hughes <[email protected]>
Author: Emmanuel Bourg <[email protected]>
---- jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
-+++ jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
+--- openjdk/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
++++ openjdk/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
@@ -811,10 +811,9 @@
doclintOpts.add(opt == null ? DocLint.XMSGS_OPTION :
DocLint.XMSGS_CUSTOM_PREFIX + opt);
}
@@ -26,8 +26,8 @@
return;
}
---- jdk8/langtools/test/tools/javadoc/doclint/DocLintTest.java
-+++ jdk8/langtools/test/tools/javadoc/doclint/DocLintTest.java
+--- openjdk/langtools/test/tools/javadoc/doclint/DocLintTest.java
++++ openjdk/langtools/test/tools/javadoc/doclint/DocLintTest.java
@@ -130,12 +130,12 @@
};
++++++ icedtea-3.0.1-sunec.patch ++++++
--- icedtea-3.0.1/acinclude.m4 2016-04-24 08:37:02.061302798 +0200
+++ icedtea-3.0.1/acinclude.m4 2016-04-25 13:04:21.040872931 +0200
@@ -1959,7 +1959,7 @@
PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes],
[NSS_JAVA_FOUND=no])
if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS;
- SUNEC_LIBS="-lfreebl $NSS_LIBS";
+ SUNEC_LIBS=$NSS_SOFTOKN_LIBS;
elif test "x${NSS_JAVA_FOUND}" = "xyes"; then
SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS";
SUNEC_LIBS=$NSS_JAVA_LIBS;
--- icedtea-3.0.1/configure 2016-04-24 08:37:14.373081753 +0200
+++ icedtea-3.0.1/configure 2016-04-25 13:05:26.851392635 +0200
@@ -7925,7 +7925,7 @@
fi
if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS;
- SUNEC_LIBS="-lfreebl $NSS_LIBS";
+ SUNEC_LIBS=$NSS_SOFTOKN_LIBS;
elif test "x${NSS_JAVA_FOUND}" = "xyes"; then
SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS";
SUNEC_LIBS=$NSS_JAVA_LIBS;
++++++ implicit-pointer-decl.patch ++++++
--- /var/tmp/diff_new_pack.72dIvf/_old 2016-06-14 23:05:32.000000000 +0200
+++ /var/tmp/diff_new_pack.72dIvf/_new 2016-06-14 23:05:32.000000000 +0200
@@ -1,5 +1,5 @@
---- jdk8/jdk/src/share/instrument/JarFacade.c 2014-07-03 00:01:31.000000000
+0200
-+++ jdk8/jdk/src/share/instrument/JarFacade.c 2014-07-15 08:45:35.144295472
+0200
+--- openjdk/jdk/src/share/instrument/JarFacade.c 2014-07-03
00:01:31.000000000 +0200
++++ openjdk/jdk/src/share/instrument/JarFacade.c 2014-07-15
08:45:35.144295472 +0200
@@ -23,14 +23,7 @@
* questions.
*/
++++++ java-1_8_0-openjdk-gcc6.patch ++++++
++++ 2679 lines (skipped)
++++++ java-1_8_0-openjdk-suse-desktop-files.patch ++++++
--- icedtea-3.0.1/jconsole.desktop.in 2016-04-24 08:37:01.989304092 +0200
+++ icedtea-3.0.1/jconsole.desktop.in 2016-04-27 09:46:17.592085490 +0200
@@ -1,10 +1,11 @@
[Desktop Entry]
Name=OpenJDK @JAVA_VER@ Monitoring & Management Console
+GenericName=OpenJDK @JAVA_VER@ Policy Tool
Comment=Monitor and manage OpenJDK applications
Exec=_BINDIR_/jconsole
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Monitor;Java;
+Categories=Development;Profiling;
Version=1.0
--- icedtea-3.0.1/policytool.desktop.in 2016-04-24 08:37:02.001303877 +0200
+++ icedtea-3.0.1/policytool.desktop.in 2016-04-27 09:45:32.061111551 +0200
@@ -1,10 +1,11 @@
[Desktop Entry]
Name=OpenJDK @JAVA_VER@ Policy Tool
+GenericName=OpenJDK @JAVA_VER@ Policy Tool
Comment=Manage OpenJDK policy files
Exec=_BINDIR_/policytool
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-security-tools-PolicyTool
-Categories=Development;Java;
+Categories=System;DesktopSettings;Security;
Version=1.0
++++++ java-atk-wrapper-security.patch ++++++
--- /var/tmp/diff_new_pack.72dIvf/_old 2016-06-14 23:05:32.000000000 +0200
+++ /var/tmp/diff_new_pack.72dIvf/_new 2016-06-14 23:05:32.000000000 +0200
@@ -1,5 +1,5 @@
---- jdk8/jdk/src/share/lib/security/java.security-linux 2014-07-15
23:08:27.000000000 +0200
-+++ jdk8/jdk/src/share/lib/security/java.security-linux 2014-07-18
09:04:45.127566697 +0200
+--- openjdk/jdk/src/share/lib/security/java.security-linux 2014-07-15
23:08:27.000000000 +0200
++++ openjdk/jdk/src/share/lib/security/java.security-linux 2014-07-18
09:04:45.127566697 +0200
@@ -211,7 +211,9 @@
jdk.internal.,\
jdk.nashorn.internal.,\
++++++ ppc-zero-hotspot.patch ++++++
--- /var/tmp/diff_new_pack.72dIvf/_old 2016-06-14 23:05:32.000000000 +0200
+++ /var/tmp/diff_new_pack.72dIvf/_new 2016-06-14 23:05:32.000000000 +0200
@@ -1,6 +1,6 @@
-diff -up jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64
jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
---- jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64
2013-02-22 19:02:06.000000000 +0100
-+++ jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
2013-04-18 16:21:24.897403406 +0200
+diff -up openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64
openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
+--- openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64
2013-02-22 19:02:06.000000000 +0100
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
2013-04-18 16:21:24.897403406 +0200
@@ -32,11 +32,15 @@
//
++++++ zero-javadoc-verbose.patch ++++++
--- /var/tmp/diff_new_pack.72dIvf/_old 2016-06-14 23:05:32.000000000 +0200
+++ /var/tmp/diff_new_pack.72dIvf/_new 2016-06-14 23:05:32.000000000 +0200
@@ -1,7 +1,5 @@
-Index: jdk8u-3e6d3c8810ee/make/Javadoc.gmk
-===================================================================
---- jdk8u-3e6d3c8810ee.orig/make/Javadoc.gmk
-+++ jdk8u-3e6d3c8810ee/make/Javadoc.gmk
+--- openjdk/make/Javadoc.gmk
++++ openjdk/make/Javadoc.gmk
@@ -260,7 +260,6 @@ $(call CopyrightLine,$(COPYRIGHT_URL),$(
# Common javadoc options used by all
COMMON_JAVADOCFLAGS = \
