From 71dd54844475b5317cdaf1238d220e243bc484d2 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 15 2015 11:53:00 +0000 Subject: import java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1 --- diff --git a/.gitignore b/.gitignore index 17a8cb5..01a5736 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -SOURCES/aarch64-icedtea-2.6pre21.tar.bz2 SOURCES/class-rewriter.tar.gz -SOURCES/openjdk-icedtea-2.5.5.tar.xz +SOURCES/openjdk-icedtea-2.6.1.tar.xz SOURCES/pulseaudio.tar.gz SOURCES/systemtap-tapset-2014-03-19.tar.xz diff --git a/.java-1.7.0-openjdk.metadata b/.java-1.7.0-openjdk.metadata index 2bcc0b9..0abe120 100644 --- a/.java-1.7.0-openjdk.metadata +++ b/.java-1.7.0-openjdk.metadata @@ -1,5 +1,4 @@ -7a7a7c29d2f7b7d0e18d394e737e878715642fb1 SOURCES/aarch64-icedtea-2.6pre21.tar.bz2 fcc167de17354efb6e52cb387eb3e7dbb0316b53 SOURCES/class-rewriter.tar.gz -8722f1b2887b45b8930a872710c62470e506d376 SOURCES/openjdk-icedtea-2.5.5.tar.xz +504c0744a7be09bf618e2a0719eda3c3182f8844 SOURCES/openjdk-icedtea-2.6.1.tar.xz fb72b6b1f4735ad9b5799d0b5058b0b1dec67b17 SOURCES/pulseaudio.tar.gz becc037bf0eb13b5f0ebcdd94b58ebfe6336b7a0 SOURCES/systemtap-tapset-2014-03-19.tar.xz diff --git a/SOURCES/PStack-808293.patch b/SOURCES/PStack-808293.patch deleted file mode 100644 index 4637403..0000000 --- a/SOURCES/PStack-808293.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java 2012-04-06 02:26:33.322164601 +0200 -+++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java 2012-04-06 02:26:57.958514071 +0200 -@@ -1,5 +1,6 @@ - /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2012, Red Hat Inc. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -84,7 +85,8 @@ - out.print("----------------- "); - out.print(th); - out.println(" -----------------"); -- while (f != null) { -+ int maxStack = 256; -+ while (f != null && maxStack-- > 0) { - ClosestSymbol sym = f.closestSymbolToPC(); - Address pc = f.pc(); - out.print(pc + "\t"); -@@ -158,10 +160,19 @@ - printUnknown(out); - } - } -+ Address oldPC = f.pc(); -+ Address oldFP = f.localVariableBase(); - f = f.sender(th); -+ if (f != null -+ && oldPC.equals(f.pc()) -+ && oldFP.equals(f.localVariableBase())) { -+ // We didn't make any progress -+ f = null; -+ } - } - } catch (Exception exp) { -- exp.printStackTrace(); -+ // exp.printStackTrace(); -+ out.println("bad stack: " + exp); - // continue, may be we can do a better job for other threads - } - if (isJava && concurrentLocks) { diff --git a/SOURCES/remove-intree-libraries.sh b/SOURCES/remove-intree-libraries.sh index 237049a..20f0352 100644 --- a/SOURCES/remove-intree-libraries.sh +++ b/SOURCES/remove-intree-libraries.sh @@ -4,6 +4,8 @@ ZIP_SRC=openjdk/jdk/src/share/native/java/util/zip/zlib-* JPEG_SRC=openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpeg-6b GIF_SRC=openjdk/jdk/src/share/native/sun/awt/giflib PNG_SRC=openjdk/jdk/src/share/native/sun/awt/libpng +LCMS_SRC=openjdk/jdk/src/share/native/sun/java2d/cmm/lcms +PCSC_SRC=openjdk/jdk/src/solaris/native/sun/security/smartcardio/MUSCLE echo "Removing built-in libs (they will be linked)" @@ -20,51 +22,7 @@ if [ ! -f ${JPEG_SRC}/jdhuff.c ]; then # some file that sound definitely exist exit 1 fi -rm -vf ${JPEG_SRC}/jcomapi.c -rm -vf ${JPEG_SRC}/jdapimin.c -rm -vf ${JPEG_SRC}/jdapistd.c -rm -vf ${JPEG_SRC}/jdcoefct.c -rm -vf ${JPEG_SRC}/jdcolor.c -rm -vf ${JPEG_SRC}/jddctmgr.c -rm -vf ${JPEG_SRC}/jdhuff.c -rm -vf ${JPEG_SRC}/jdinput.c -rm -vf ${JPEG_SRC}/jdmainct. -rm -vf ${JPEG_SRC}/jdmarker.c -rm -vf ${JPEG_SRC}/jdmaster.c -rm -vf ${JPEG_SRC}/jdmerge.c -rm -vf ${JPEG_SRC}/jdphuff.c -rm -vf ${JPEG_SRC}/jdpostct.c -rm -vf ${JPEG_SRC}/jdsample.c -rm -vf ${JPEG_SRC}/jerror.c -rm -vf ${JPEG_SRC}/jidctflt.c -rm -vf ${JPEG_SRC}/jidctfst.c -rm -vf ${JPEG_SRC}/jidctint.c -rm -vf ${JPEG_SRC}/jidctred.c -rm -vf ${JPEG_SRC}/jmemmgr.c -rm -vf ${JPEG_SRC}/jmemnobs.c -rm -vf ${JPEG_SRC}/jquant1.c -rm -vf ${JPEG_SRC}/jquant2.c -rm -vf ${JPEG_SRC}/jutils.c -rm -vf ${JPEG_SRC}/jcapimin.c -rm -vf ${JPEG_SRC}/jcapistd.c -rm -vf ${JPEG_SRC}/jccoefct.c -rm -vf ${JPEG_SRC}/jccolor.c -rm -vf ${JPEG_SRC}/jcdctmgr.c -rm -vf ${JPEG_SRC}/jchuff.c -rm -vf ${JPEG_SRC}/jcinit.c -rm -vf ${JPEG_SRC}/jcmainct.c -rm -vf ${JPEG_SRC}/jcmarker.c -rm -vf ${JPEG_SRC}/jcmaster.c -rm -vf ${JPEG_SRC}/jcparam.c -rm -vf ${JPEG_SRC}/jcphuff.c -rm -vf ${JPEG_SRC}/jcprepct.c -rm -vf ${JPEG_SRC}/jcsample.c -rm -vf ${JPEG_SRC}/jctrans.c -rm -vf ${JPEG_SRC}/jdtrans.c -rm -vf ${JPEG_SRC}/jfdctflt.c -rm -vf ${JPEG_SRC}/jfdctfst.c -rm -vf ${JPEG_SRC}/jfdctint.c -rm -vf ${JPEG_SRC}/README +rm -rvf ${JPEG_SRC} echo "Removing giflib" if [ ! -d ${GIF_SRC} ]; then @@ -80,3 +38,51 @@ if [ ! -d ${PNG_SRC} ]; then fi rm -rvf ${PNG_SRC} +echo "Removing lcms" +if [ ! -d ${LCMS_SRC} ]; then + echo "${LCMS_SRC} does not exist. Refusing to proceed." + exit 1 +fi +rm -vf ${LCMS_SRC}/cmscam02.c +rm -vf ${LCMS_SRC}/cmscgats.c +rm -vf ${LCMS_SRC}/cmscnvrt.c +rm -vf ${LCMS_SRC}/cmserr.c +rm -vf ${LCMS_SRC}/cmsgamma.c +rm -vf ${LCMS_SRC}/cmsgmt.c +rm -vf ${LCMS_SRC}/cmsintrp.c +rm -vf ${LCMS_SRC}/cmsio0.c +rm -vf ${LCMS_SRC}/cmsio1.c +rm -vf ${LCMS_SRC}/cmslut.c +rm -vf ${LCMS_SRC}/cmsmd5.c +rm -vf ${LCMS_SRC}/cmsmtrx.c +rm -vf ${LCMS_SRC}/cmsnamed.c +rm -vf ${LCMS_SRC}/cmsopt.c +rm -vf ${LCMS_SRC}/cmspack.c +rm -vf ${LCMS_SRC}/cmspcs.c +rm -vf ${LCMS_SRC}/cmsplugin.c +rm -vf ${LCMS_SRC}/cmsps2.c +rm -vf ${LCMS_SRC}/cmssamp.c +rm -vf ${LCMS_SRC}/cmssm.c +rm -vf ${LCMS_SRC}/cmstypes.c +rm -vf ${LCMS_SRC}/cmsvirt.c +rm -vf ${LCMS_SRC}/cmswtpnt.c +rm -vf ${LCMS_SRC}/cmsxform.c +rm -vf ${LCMS_SRC}/lcms2.h +rm -vf ${LCMS_SRC}/lcms2_internal.h +rm -vf ${LCMS_SRC}/lcms2_plugin.h + +echo "Removing libpcsc headers" +if [ ! -d ${PCSC_SRC} ]; then + echo "${PCSC_SRC} does not exist. Refusing to proceed." + exit 1 +fi +rm -rvf ${PCSC_SRC} + +echo "Removing SunEC sources" +rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDHKeyAgreement.java +rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDSASignature.java +rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java +rm -vf openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java +rm -vf openjdk/jdk/src/share/classes/sun/security/ec/SunECEntries.java +rm -rvf openjdk/jdk/src/share/native/sun/security/ec +rm -rvf openjdk/jdk/make/sun/security/ec diff --git a/SOURCES/rh1191652-hotspot.patch b/SOURCES/rh1191652-hotspot.patch deleted file mode 100644 index d52f7bd..0000000 --- a/SOURCES/rh1191652-hotspot.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -r bbda609c9d24 make/defs.make ---- openjdk/hotspot/make/defs.make Tue Jan 27 00:46:17 2015 +0000 -+++ openjdk/hotspot/make/defs.make Fri Feb 13 09:49:46 2015 +0000 -@@ -304,6 +304,13 @@ - LIBARCH/arm = arm - LIBARCH/zero = $(ZERO_LIBARCH) - -+ # Override LIBARCH for ppc64le -+ ifeq ($(ARCH), ppc64) -+ ifeq ($(OPENJDK_TARGET_CPU_ENDIAN), little) -+ LIBARCH = ppc64le -+ endif -+ endif -+ - LP64_ARCH = sparcv9 amd64 ia64 ppc64 zero - endif - -diff -r bbda609c9d24 src/os/linux/vm/os_linux.cpp ---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue Jan 27 00:46:17 2015 +0000 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Fri Feb 13 09:49:46 2015 +0000 -@@ -301,7 +301,11 @@ - #elif defined(PPC32) - static char cpu_arch[] = "ppc"; - #elif defined(PPC64) -+#if defined(VM_LITTLE_ENDIAN) -+static char cpu_arch[] = "ppc64le"; -+#else - static char cpu_arch[] = "ppc64"; -+#endif - #elif defined(SPARC) - # ifdef _LP64 - static char cpu_arch[] = "sparcv9"; diff --git a/SOURCES/rh1191652-jdk.patch b/SOURCES/rh1191652-jdk.patch deleted file mode 100644 index d858525..0000000 --- a/SOURCES/rh1191652-jdk.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -r e1bfd77b6e1a make/common/Defs-linux.gmk ---- openjdk/jdk/make/common/Defs-linux.gmk Tue Jan 27 02:53:44 2015 +0000 -+++ openjdk/jdk/make/common/Defs-linux.gmk Fri Feb 13 12:42:28 2015 +0000 -@@ -199,16 +199,9 @@ - CFLAGS_REQUIRED_mips += - CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN - CFLAGS_REQUIRED_ppc += -m32 -fsigned-char -D_BIG_ENDIAN --ifeq ($(ARCH),ppc64) -- ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big) -- CFLAGS_REQUIRED_ppc64 += -m64 -D_BIG_ENDIAN -- LDFLAGS_COMMON_ppc64 += -m64 -L/lib64 -Wl,-melf64ppc -- else ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),little) -- CFLAGS_REQUIRED_ppc64 += -D_LITTLE_ENDIAN -DABI_ELFv2 -- else -- $(error Expected big/little for ARCH=ppc64, got OPENJDK_TARGET_CPU_ENDIAN=$(OPENJDK_TARGET_CPU_ENDIAN)) -- endif --endif -+CFLAGS_REQUIRED_ppc64 += -m64 -D_BIG_ENDIAN -+LDFLAGS_COMMON_ppc64 += -m64 -L/lib64 -Wl,-melf64ppc -+CFLAGS_REQUIRED_ppc64le += -D_LITTLE_ENDIAN -DABI_ELFv2 - CFLAGS_REQUIRED_s390 += - CFLAGS_REQUIRED_s390x += -m64 - CFLAGS_REQUIRED_sh += -mieee -diff -r e1bfd77b6e1a make/common/shared/Platform.gmk ---- openjdk/jdk/make/common/shared/Platform.gmk Tue Jan 27 02:53:44 2015 +0000 -+++ openjdk/jdk/make/common/shared/Platform.gmk Fri Feb 13 12:42:28 2015 +0000 -@@ -217,7 +217,6 @@ - else ifeq ($(ARCH), ppc64le) - ARCH_DATA_MODEL=64 - OPENJDK_TARGET_CPU_ENDIAN=little -- ARCH := ppc64 - else - # Most archs are 32-bit - ifndef ARCH_DATA_MODEL -diff -r e1bfd77b6e1a make/javax/sound/SoundDefs.gmk ---- openjdk/jdk/make/javax/sound/SoundDefs.gmk Tue Jan 27 02:53:44 2015 +0000 -+++ openjdk/jdk/make/javax/sound/SoundDefs.gmk Fri Feb 13 12:42:28 2015 +0000 -@@ -110,6 +110,10 @@ - CPPFLAGS += -DX_ARCH=X_PPC64 - endif # ARCH ppc64 - -+ ifeq ($(ARCH), ppc64le) -+ CPPFLAGS += -DX_ARCH=X_PPC64LE -+ endif # ARCH ppc64le -+ - ifeq ($(ARCH), s390) - CPPFLAGS += -DX_ARCH=X_S390 - endif # ARCH s390 -diff -r e1bfd77b6e1a src/share/native/com/sun/media/sound/SoundDefs.h ---- openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Tue Jan 27 02:53:44 2015 +0000 -+++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h Fri Feb 13 12:42:28 2015 +0000 -@@ -52,6 +52,7 @@ - #define X_S390X 15 - #define X_SH 16 - #define X_AARCH64 17 -+#define X_PPC64LE 18 - - // ********************************** - // Make sure you set X_PLATFORM and X_ARCH defines correctly. -diff -r e1bfd77b6e1a src/solaris/bin/ppc64le/jvm.cfg ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/solaris/bin/ppc64le/jvm.cfg Fri Feb 13 12:42:28 2015 +0000 -@@ -0,0 +1,33 @@ -+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# -+# List of JVMs that can be used as an option to java, javac, etc. -+# Order is important -- first in this list is the default JVM. -+# NOTE that this both this file and its format are UNSUPPORTED and -+# WILL GO AWAY in a future release. -+# -+# You may also select a JVM in an arbitrary location with the -+# "-XXaltjvm=" option, but that too is unsupported -+# and may not be available in a future release. -+# -+-server KNOWN diff --git a/SOURCES/rh1201393.patch b/SOURCES/rh1201393.patch deleted file mode 100644 index 66590fb..0000000 --- a/SOURCES/rh1201393.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -r 878d6bf3d038 src/cpu/ppc/vm/interpreter_ppc.cpp ---- openjdk/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Tue Feb 03 11:32:50 2015 +0100 -+++ openjdk/hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Wed Apr 22 11:36:38 2015 +0200 -@@ -475,7 +475,7 @@ - - // This is not a leaf but we have a JavaFrameAnchor now and we will - // check (create) exceptions afterward so this is ok. -- __ call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_AbstractMethodError)); -+ __ call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_AbstractMethodError), R16_thread); - - // Pop the C frame and restore LR. - __ pop_frame(); -diff -r 878d6bf3d038 src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp ---- openjdk/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp Tue Feb 03 11:32:50 2015 +0100 -+++ openjdk/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp Wed Apr 22 11:36:38 2015 +0200 -@@ -302,6 +302,7 @@ - goto report_and_die; - } - -+ CodeBlob *cb = NULL; - // Handle signal from NativeJump::patch_verified_entry(). - if (( TrapBasedNotEntrantChecks && sig == SIGTRAP && nativeInstruction_at(pc)->is_sigtrap_zombie_not_entrant()) || - (!TrapBasedNotEntrantChecks && sig == SIGILL && nativeInstruction_at(pc)->is_sigill_zombie_not_entrant())) { -@@ -316,7 +317,10 @@ - // especially when we try to read from the safepoint polling page. So the check - // (address)info->si_addr == os::get_standard_polling_page() - // doesn't work for us. We use: -- ((NativeInstruction*)pc)->is_safepoint_poll()) { -+ ((NativeInstruction*)pc)->is_safepoint_poll() && -+ CodeCache::contains((void*) pc) && -+ ((cb = CodeCache::find_blob(pc)) != NULL) && -+ cb->is_nmethod()) { - if (TraceTraps) - tty->print_cr("trap: safepoint_poll at " INTPTR_FORMAT " (SIGSEGV)", pc); - stub = SharedRuntime::get_poll_stub(pc); diff --git a/SPECS/java-1.7.0-openjdk.spec b/SPECS/java-1.7.0-openjdk.spec index 5890ab0..8b61cf3 100644 --- a/SPECS/java-1.7.0-openjdk.spec +++ b/SPECS/java-1.7.0-openjdk.spec @@ -5,12 +5,9 @@ # conflicting) files in the -debuginfo package %undefine _missing_build_ids_terminate_build -%global icedtea_version 2.5.5 +%global icedtea_version 2.6.1 %global hg_tag icedtea-{icedtea_version} -%global aarch64_rev 1939c010fd37 -%global aarch64_tag icedtea-2.6pre21 - %global aarch64 aarch64 arm64 armv8 #sometimes we need to distinguish big and little endian PPC64 %global ppc64le ppc64le @@ -128,8 +125,8 @@ # Standard JPackage naming and versioning defines. %global origin openjdk -%global updatever 79 -%global buildver 14 +%global updatever 85 +%global buildver 01 # Keep priority on 7digits in case updatever>9 %global priority 17000%{updatever} %global javaver 1.7.0 @@ -202,8 +199,6 @@ URL: http://openjdk.java.net/ # sh /git/java-1.7.0-openjdk/rhel-7.1/fsg.sh # tar cJf openjdk-icedtea-%{icedtea_version}.tar.xz openjdk Source0: openjdk-icedtea-%{icedtea_version}.tar.xz -# wget -v -O %{aarch64_tag}.tar.bz2 http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/archive/%{aarch64_rev}.tar.bz2 -Source1: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/archive/%{aarch64_rev}.tar.bz2#/aarch64-%{aarch64_tag}.tar.bz2 # README file # This source is under maintainer's/java-team's control @@ -287,17 +282,6 @@ Patch400: rh1022017.patch # Temporary patches -#Workaround RH902004 -Patch403: PStack-808293.patch - -# Use ppc64le as arch name on ppc64le, not ppc64 -# Remove when we move to IcedTea 2.6.x -Patch404: rh1191652-hotspot.patch -Patch405: rh1191652-jdk.patch - -# RH1201393; remove when we move to 2.5.6/2.6.x -Patch406: rh1201393.patch - # End of tmp patches BuildRequires: autoconf @@ -316,12 +300,11 @@ BuildRequires: libXtst-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: wget -BuildRequires: libxslt BuildRequires: xorg-x11-proto-devel BuildRequires: ant BuildRequires: libXinerama-devel BuildRequires: rhino -BuildRequires: redhat-lsb +BuildRequires: redhat-lsb-core BuildRequires: zip BuildRequires: fontconfig BuildRequires: xorg-x11-fonts-Type1 @@ -336,9 +319,12 @@ BuildRequires: xorg-x11-utils BuildRequires: nss-devel # Required for NIO2 BuildRequires: libattr-devel -# Build requirements for SunEC system NSS support -#BuildRequires: nss-softokn-freebl-devel >= 3.16.1 -BuildRequires: python +# Required for smartcard support +BuildRequires: pcsc-lite-devel +# Required for SCTP support +BuildRequires: lksctp-tools-devel +# Required for fallback native proxy support +BuildRequires: GConf2-devel # PulseAudio build requirements. %if %{with_pulseaudio} BuildRequires: pulseaudio-libs-devel >= 0.9.11 @@ -511,14 +497,6 @@ if [ $prioritylength -ne 7 ] ; then fi cp %{SOURCE2} . -%ifarch %{aarch64} -pushd openjdk -rm -r hotspot -tar xf %{SOURCE1} -mv hotspot-%{aarch64_rev} hotspot -popd -%endif - # OpenJDK patches %patch100 @@ -579,15 +557,6 @@ tar xzf %{SOURCE9} %patch106 %patch200 -%patch403 -# HotSpot ppc64le patch is applied upstream -# on AArch64/2.6.x HotSpot. -%ifnarch %{aarch64} -%patch404 -%endif -%patch405 -%patch406 - %build # How many cpu's do we have? export NUM_PROC=`/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :` @@ -727,6 +696,7 @@ make \ STRIP_POLICY="no_strip" \ JAVAC_WARNINGS_FATAL="false" \ INSTALL_LOCATION=%{_jvmdir}/%{sdkdir} \ + SYSTEM_GSETTINGS="true" \ BUILD_JAXP=false BUILD_JAXWS=false BUILD_LANGTOOLS=false BUILD_JDK=false BUILD_CORBA=false \ ALT_JDK_IMPORT_PATH=${JDK_TO_BUILD_WITH} ALT_OUTPUTDIR=${PWD}/bootstrap \ %{debugbuild} @@ -766,6 +736,7 @@ make \ STRIP_POLICY="no_strip" \ JAVAC_WARNINGS_FATAL="false" \ INSTALL_LOCATION=%{_jvmdir}/%{sdkdir} \ + SYSTEM_GSETTINGS="true" \ %{debugbuild} popd >& /dev/null @@ -1202,13 +1173,14 @@ exit 0 # The pretrans lua scriptlet prevents an unmodified java.security # from being replaced via an update. It gets created as # java.security.rpmnew instead. This invalidates the patch of -# JDK-8061210 of the January 2015 CPU. We fix this via a -# post scriptlet which runs on updates. +# JDK-8061210 of the January 2015 CPU or JDK-8043201 of the +# July 2015 CPU. We fix this via a post scriptlet which runs on updates. if [ "$1" -gt 1 ]; then javasecurity="%{_jvmdir}/%{uniquesuffix}/jre/lib/security/java.security" sum=$(md5sum "${javasecurity}" | cut -d' ' -f1) # This is the md5sum of an unmodified java.security file - if [ "${sum}" = '567d9244d9ef1ac0e557d05eb0892413' ]; then + if [ "${sum}" = '567d9244d9ef1ac0e557d05eb0892413' -o \ + "${sum}" = '034a9bfa527cbdf58f021ce0e47e22db' ]; then if [ -f "${javasecurity}.rpmnew" ]; then mv -f "${javasecurity}.rpmnew" "${javasecurity}" fi @@ -1216,9 +1188,12 @@ if [ "$1" -gt 1 ]; then fi %ifarch %{jit_arches} +# MetaspaceShared::generate_vtable_methods not implemented for PPC JIT +%ifnarch %{power64} #see https://bugzilla.redhat.com/show_bug.cgi?id=513605 %{jrebindir}/java -Xshare:dump >/dev/null 2>/dev/null %endif +%endif ext=.gz alternatives \ @@ -1561,6 +1536,40 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Sat Jul 11 2015 Andrew Hughes - 1:1.7.0.85-2.6.1.2 +- Bump upstream tarball to u25b01 to fix issue with 8075374 backport. +- Resolves: rhbz#1235158 + +* Thu Jul 09 2015 Andrew Hughes - 1:1.7.0.85-2.6.1.1 +- Update OpenJDK tarball so correct version is used. +- Resolves: rhbz#1235158 + +* Thu Jul 09 2015 Andrew Hughes - 1:1.7.0.85-2.6.1.0 +- Add additional java.security md5sum from January CPU +- Resolves: rhbz#1235158 + +* Thu Jul 09 2015 Andrew Hughes - 1:1.7.0.85-2.6.1.0 +- Bump to 2.6.1 and u85b00. +- Resolves: rhbz#1235158 + +* Wed Jul 08 2015 Andrew Hughes - 1:1.7.0.80-2.6.0.1 +- Pass SYSTEM_GSETTINGS="true" to the OpenJDK build to explicitly enable the GSettings API. +- Resolves: rhbz#1235158 + +* Wed Jul 08 2015 Andrew Hughes - 1:1.7.0.80-2.6.0.0 +- Add GConf2-devel dependency for native proxy fallback support. +- Remove libxslt dependency pulled in from IcedTea builds. +- Reduce redhat-lsb dependency to redhat-lsb-core (lsb_release) +- Resolves: rhbz#1235158 + +* Wed Jul 08 2015 Andrew Hughes - 1:1.7.0.80-2.6.0.0 +- Bump to 2.6.0 and u80b32. +- Drop upstreamed patches and separate AArch64 HotSpot. +- Add dependencies on pcsc-lite-devel (PR2496) and lksctp-tools-devel (PR2446) +- Only run -Xshare:dump on JIT archs other than power64 as port lacks support +- Update remove-intree-libraries script to cover LCMS and PCSC headers and SunEC. +- Resolves: rhbz#1235158 + * Fri Apr 24 2015 Andrew Hughes - 1:1.7.0.79-2.5.5.2 - Fix crash on ppc64le when running Apache Oozie - Resolves: rhbz#1220273