diff --git a/.gitignore b/.gitignore index 2738064..fa8b7ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ SOURCES/class-rewriter.tar.gz SOURCES/jdk7u60_b30_aarch64_360d11d249a6.tar.bz2 -SOURCES/openjdk-icedtea-2.5.1.tar.xz +SOURCES/openjdk-icedtea-2.5.3.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 e6271bb..da7f801 100644 --- a/.java-1.7.0-openjdk.metadata +++ b/.java-1.7.0-openjdk.metadata @@ -1,5 +1,5 @@ fcc167de17354efb6e52cb387eb3e7dbb0316b53 SOURCES/class-rewriter.tar.gz 4c5096dd9e822c7e483d5610d8ccce3498c328c8 SOURCES/jdk7u60_b30_aarch64_360d11d249a6.tar.bz2 -56d3fdd00752d13bf23bfd8a1d97040ba843248e SOURCES/openjdk-icedtea-2.5.1.tar.xz +16c5b96046e0ba59701d4486c232551ec21d43f0 SOURCES/openjdk-icedtea-2.5.3.tar.xz fb72b6b1f4735ad9b5799d0b5058b0b1dec67b17 SOURCES/pulseaudio.tar.gz becc037bf0eb13b5f0ebcdd94b58ebfe6336b7a0 SOURCES/systemtap-tapset-2014-03-19.tar.xz diff --git a/SOURCES/gtk3ToBeReverted.patch b/SOURCES/gtk3ToBeReverted.patch deleted file mode 100644 index 0f0f08b..0000000 --- a/SOURCES/gtk3ToBeReverted.patch +++ /dev/null @@ -1,25 +0,0 @@ - -# HG changeset patch -# User andrew -# Date 1402501898 -3600 -# Node ID cadc17b7e20ead881dd17a08f0df12da9dfae612 -# Parent d26cf395f1f04d8e14f4f82e619079e1f598719d -PR729: GTKLookAndFeel should be the system look&feel on all GNU/Linux desktops -Summary: Return GTKLookAndFeel as the system look&feel on local GNU/Linux systems - -diff -r d26cf395f1f0 -r cadc17b7e20e src/share/classes/javax/swing/UIManager.java ---- openjdk/jdk/src/share/classes/javax/swing/UIManager.java Tue Jun 10 22:37:03 2014 +0100 -+++ openjdk/jdk/src/share/classes/javax/swing/UIManager.java Wed Jun 11 16:51:38 2014 +0100 -@@ -606,8 +606,9 @@ - } else { - String desktop = AccessController.doPrivileged(new GetPropertyAction("sun.desktop")); - Toolkit toolkit = Toolkit.getDefaultToolkit(); -- if ("gnome".equals(desktop) && -- toolkit instanceof SunToolkit && -+ boolean gtkDesktop = "gnome".equals(desktop) || -+ (osType == OSInfo.OSType.LINUX && SwingUtilities2.isLocalDisplay()); -+ if (gtkDesktop && toolkit instanceof SunToolkit && - ((SunToolkit) toolkit).isNativeGTKAvailable()) { - // May be set on Linux and Solaris boxs. - return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel"; - diff --git a/SOURCES/pr1864_smartcardIO.patch b/SOURCES/pr1864_smartcardIO.patch deleted file mode 100644 index cd9389c..0000000 --- a/SOURCES/pr1864_smartcardIO.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- openjdk/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c -+++ openjdk/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c -@@ -79,7 +79,6 @@ - - #ifndef USE_SYSTEM_PCSC - void *findFunction(JNIEnv *env, void *hModule, char *functionName) { -- return NULL; - void *fAddress = dlsym(hModule, functionName); - if (fAddress == NULL) { - char errorMessage[256]; diff --git a/SPECS/java-1.7.0-openjdk.spec b/SPECS/java-1.7.0-openjdk.spec index 55fc90e..c89815c 100644 --- a/SPECS/java-1.7.0-openjdk.spec +++ b/SPECS/java-1.7.0-openjdk.spec @@ -1,11 +1,19 @@ # If debug is 1, OpenJDK is built with all debug info present. %global debug 0 +# If hsbootstrap is 1, build HotSpot alone first and use that in the bootstrap JDK +# This avoids issues where HotSpot is broken in the bootstrap JDK +%ifarch ppc +%global hsbootstrap 1 +%else +%global hsbootstrap 0 +%endif + # we remove the build id notes explicitly to avoid generating (potentially # conflicting) files in the -debuginfo package %undefine _missing_build_ids_terminate_build -%global icedtea_version 2.5.1 +%global icedtea_version 2.5.3 %global hg_tag icedtea-{icedtea_version} %global aarch64_rev 360d11d249a6 @@ -128,8 +136,8 @@ # Standard JPackage naming and versioning defines. %global origin openjdk -%global updatever 65 -%global buildver 17 +%global updatever 71 +%global buildver 14 # Keep priority on 6digits in case updatever>9 %global priority 1700%{updatever} %global javaver 1.7.0 @@ -170,7 +178,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: %{icedtea_version}.2%{?dist} +Release: %{icedtea_version}.1%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -293,8 +301,6 @@ Patch400: rh1022017.patch #Workaround RH902004 Patch403: PStack-808293.patch Patch4030: PStack-808293-aarch64.patch -Patch404: gtk3ToBeReverted.patch -Patch405: pr1864_smartcardIO.patch # End of tmp patches @@ -585,10 +591,6 @@ tar xzf %{SOURCE9} %patch403 %endif -%patch404 -R -%patch405 - - %build # How many cpu's do we have? export NUM_PROC=`/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :` @@ -642,7 +644,6 @@ export JDK_TO_BUILD_WITH=/usr/lib/jvm/java-1.7.0-openjdk pushd openjdk >& /dev/null -export ALT_DROPS_DIR=$PWD/../drops export ALT_BOOTDIR="$JDK_TO_BUILD_WITH" # Save old umask as jdk_generic_profile overwrites it @@ -657,6 +658,47 @@ source jdk/make/jdk_generic_profile.sh # Restore old umask umask $oldumask +%if %{hsbootstrap} + +mkdir bootstrap + +make \ + DISABLE_INTREE_EC=true \ + UNLIMITED_CRYPTO=true \ + ANT="/usr/bin/ant" \ + DISTRO_NAME="Red Hat Enterprise Linux 7" \ + DISTRO_PACKAGE_VERSION="rhel-%{release}-%{_arch} u%{updatever}-b%{buildver}" \ + JDK_UPDATE_VERSION=`printf "%02d" %{updatever}` \ + JDK_BUILD_NUMBER=b`printf "%02d" %{buildver}` \ + JRE_RELEASE_VERSION=%{javaver}_`printf "%02d" %{updatever}`-b`printf "%02d" %{buildver}` \ +%ifarch %{aarch64} + HOTSPOT_BUILD_VERSION="aarch64_%{aarch64_rev}" \ +%endif + MILESTONE="fcs" \ + ALT_PARALLEL_COMPILE_JOBS="$NUM_PROC" \ + HOTSPOT_BUILD_JOBS="$NUM_PROC" \ + STATIC_CXX="false" \ + RHINO_JAR="$PWD/../rhino/rhino.jar" \ + GENSRCDIR="$PWD/generated.build" \ + FT2_CFLAGS="`pkg-config --cflags freetype2` " \ + FT2_LIBS="`pkg-config --libs freetype2` " \ + DEBUG_CLASSFILES="true" \ + DEBUG_BINARIES="true" \ + STRIP_POLICY="no_strip" \ + JAVAC_WARNINGS_FATAL="false" \ + INSTALL_LOCATION=%{_jvmdir}/%{sdkdir} \ + 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} + +cp -dR ${JDK_TO_BUILD_WITH}-* bootstrap-vm +rm -vf bootstrap-vm/jre/lib/%{archinstall}/server/libjvm.so +cp -av bootstrap/hotspot/outputdir/linux_%{archinstall}*/product/libjvm.so bootstrap-vm/jre/lib/%{archinstall}/server + +export ALT_BOOTDIR=${PWD}/bootstrap-vm + +%endif + make \ DISABLE_INTREE_EC=true \ UNLIMITED_CRYPTO=true \ @@ -1464,6 +1506,12 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Thu Oct 02 2014 Andrew Hughes - 1:1.7.0.65-2.5.3.1 +- Bump to 2.5.3 for latest security fixes. +- Remove obsolete patches. +- Add hsbootstrap option to pre-build HotSpot when required. +- Resolves: rhbz#1148893 + * Mon Jul 14 2014 Jiri Vanek - 1.7.0.65-2.5.1.2 - added and applied fix for samrtcard io patch405, pr1864_smartcardIO.patch - Resolves: rhbz#1115876