diff --git a/.gitignore b/.gitignore index fa8b7ea..384b786 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ +SOURCES/aarch64-icedtea-2.6pre17.tar.bz2 SOURCES/class-rewriter.tar.gz -SOURCES/jdk7u60_b30_aarch64_360d11d249a6.tar.bz2 -SOURCES/openjdk-icedtea-2.5.3.tar.xz +SOURCES/openjdk-icedtea-2.5.4.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 da7f801..e84f240 100644 --- a/.java-1.7.0-openjdk.metadata +++ b/.java-1.7.0-openjdk.metadata @@ -1,5 +1,5 @@ +3d16547126f4f62b6855dfa49a924ba507b94332 SOURCES/aarch64-icedtea-2.6pre17.tar.bz2 fcc167de17354efb6e52cb387eb3e7dbb0316b53 SOURCES/class-rewriter.tar.gz -4c5096dd9e822c7e483d5610d8ccce3498c328c8 SOURCES/jdk7u60_b30_aarch64_360d11d249a6.tar.bz2 -16c5b96046e0ba59701d4486c232551ec21d43f0 SOURCES/openjdk-icedtea-2.5.3.tar.xz +0b15203f0e516b09783df9a06e5ee17183e3e54c SOURCES/openjdk-icedtea-2.5.4.tar.xz fb72b6b1f4735ad9b5799d0b5058b0b1dec67b17 SOURCES/pulseaudio.tar.gz becc037bf0eb13b5f0ebcdd94b58ebfe6336b7a0 SOURCES/systemtap-tapset-2014-03-19.tar.xz diff --git a/SOURCES/PStack-808293-aarch64.patch b/SOURCES/PStack-808293-aarch64.patch deleted file mode 100644 index dcf4331..0000000 --- a/SOURCES/PStack-808293-aarch64.patch +++ /dev/null @@ -1,30 +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, 2013, 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 -@@ -158,10 +160,19 @@ - } - } - } -+ 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 (concurrentLocks) { diff --git a/SOURCES/abrt_friendly_hs_log_jdk7.patch b/SOURCES/abrt_friendly_hs_log_jdk7.patch index 6e0afa6..dba02bd 100644 --- a/SOURCES/abrt_friendly_hs_log_jdk7.patch +++ b/SOURCES/abrt_friendly_hs_log_jdk7.patch @@ -10,7 +10,7 @@ size_t len = strlen(cwd); @@ -938,6 +939,24 @@ os::file_separator(), os::current_process_id()); - fd = open(buffer, O_RDWR | O_CREAT | O_TRUNC, 0666); + fd = open(buffer, O_RDWR | O_CREAT | O_EXCL, 0666); } + */ + @@ -26,7 +26,7 @@ + jio_snprintf(buffer, sizeof(buffer), "%s%sjvm-%u%shs_error.log", + tmpdir, os::file_separator(), os::current_process_id(), + os::file_separator()); -+ fd = open(buffer, O_WRONLY | O_CREAT | O_TRUNC, 0444); // read-only file ++ fd = open(buffer, O_WRONLY | O_CREAT | O_EXCL, 0444); // read-only file + } + } + } diff --git a/SOURCES/fsg.sh b/SOURCES/fsg.sh index 838e585..c338e51 100644 --- a/SOURCES/fsg.sh +++ b/SOURCES/fsg.sh @@ -107,3 +107,7 @@ rm -rvf openjdk/jdk/test/com/sun/servicetag echo "Removing EC source code we don't build" rm -rvf openjdk/jdk/src/share/native/sun/security/ec/impl + +# Requires IcedTea patch PR2124 (not included) +echo "Syncing EC list with NSS" +patch -Np0 < pr2124.patch diff --git a/SPECS/java-1.7.0-openjdk.spec b/SPECS/java-1.7.0-openjdk.spec index c89815c..a66e484 100644 --- a/SPECS/java-1.7.0-openjdk.spec +++ b/SPECS/java-1.7.0-openjdk.spec @@ -13,11 +13,11 @@ # conflicting) files in the -debuginfo package %undefine _missing_build_ids_terminate_build -%global icedtea_version 2.5.3 +%global icedtea_version 2.5.4 %global hg_tag icedtea-{icedtea_version} -%global aarch64_rev 360d11d249a6 -%global aarch64_tag jdk7u60_b30_aarch64_%{aarch64_rev} +%global aarch64_rev 4d25046abb67 +%global aarch64_tag icedtea-2.6pre17 %global aarch64 aarch64 arm64 armv8 #sometimes we need to distinguish big and little endian PPC64 @@ -136,8 +136,8 @@ # Standard JPackage naming and versioning defines. %global origin openjdk -%global updatever 71 -%global buildver 14 +%global updatever 75 +%global buildver 13 # Keep priority on 6digits in case updatever>9 %global priority 1700%{updatever} %global javaver 1.7.0 @@ -178,7 +178,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: %{icedtea_version}.1%{?dist} +Release: %{icedtea_version}.2%{?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 @@ -198,7 +198,7 @@ URL: http://openjdk.java.net/ #head #REPO=http://icedtea.classpath.org/hg/icedtea7-forest #current release -#REPO=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4 +#REPO=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5 # hg clone $REPO/ openjdk -r %{hg_tag} # hg clone $REPO/corba/ openjdk/corba -r %{hg_tag} # hg clone $REPO/hotspot/ openjdk/hotspot -r %{hg_tag} @@ -210,8 +210,8 @@ URL: http://openjdk.java.net/ # sh /git/java-1.7.0-openjdk/rhel-7.0/fsg.sh # tar cJf openjdk-icedtea-%{icedtea_version}.tar.xz openjdk Source0: openjdk-icedtea-%{icedtea_version}.tar.xz -# wget http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot/archive/%{aarch64_tag}.tar.bz2 -Source1: %{aarch64_tag}.tar.bz2 +# wget -v -O %{aarch64_tag}.tar.bz2 http://hg.openjdk.java.net/aarch64-port/jdk7u/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 @@ -300,11 +300,8 @@ Patch400: rh1022017.patch #Workaround RH902004 Patch403: PStack-808293.patch -Patch4030: PStack-808293-aarch64.patch # End of tmp patches - - BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -537,9 +534,6 @@ popd # Remove libraries that are linked sh %{SOURCE10} -# Copy jaxp, jaf and jaxws drops -mkdir drops/ - # Extract the rewriter (to rewrite rhino classes) tar xzf %{SOURCE5} @@ -580,16 +574,9 @@ tar xzf %{SOURCE9} %endif %patch106 -%ifnarch %{aarch64} -#friendly hserror is not applicable in head, needs to be revisited %patch200 -%endif -%ifarch %{aarch64} -%patch4030 -%else %patch403 -%endif %build # How many cpu's do we have? @@ -671,9 +658,6 @@ make \ 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" \ @@ -708,9 +692,6 @@ make \ 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" \ @@ -1160,6 +1141,22 @@ exit 0 # FIXME: identical binaries are copied, not linked. This needs to be # fixed upstream. %post headless +# 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. +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 [ -f "${javasecurity}.rpmnew" ]; then + mv -f "${javasecurity}.rpmnew" "${javasecurity}" + fi + fi +fi + %ifarch %{jit_arches} #see https://bugzilla.redhat.com/show_bug.cgi?id=513605 %{jrebindir}/java -Xshare:dump >/dev/null 2>/dev/null @@ -1506,6 +1503,34 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Fri Jan 16 2015 Severin Gehwolf - 1:1.7.0.75-2.5.4.2 +- Replace unmodified java.security file via headless post scriptlet. +- Resolves: rhbz#1180297 + +* Sun Jan 11 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.1 +- Fix versions in recent changelog entries +- Resolves: rhbz#1180297 + +* Sun Jan 11 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.1 +- Fix macro expansion in changelog +- Resolves: rhbz#1180297 + +* Fri Jan 09 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.1 +- Fix elliptic curve list as part of fsg.sh +- Enable abrt_friendly_hs_log_jdk7.patch on all archs +- Resolves: rhbz#1180297 + +* Fri Jan 09 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.0 +- Bump to 2.5.4 using OpenJDK 7u75 b13. +- Bump AArch64 port to 2.6.0pre17. +- Remove AArch64-specific patches, following rebase on 2.6.x. +- Fix abrt_friendly_hs_log_jdk7.patch to apply again. +- Resolves: rhbz#1180297 + +* Sat Oct 04 2014 Andrew Hughes - 1:1.7.0.71-2.5.3.1.1 +- Update aarch64 to jdk7u60_b04_aarch64_834 and add HS security patches. +- Resolves: rhbz#1148893 + * 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. @@ -1726,7 +1751,7 @@ exit 0 - Intorduced source11 remove-buildids.sh * Fri May 17 2013 Omair Majid - 1.7.0.19-2.3.9.12.el7 -- Replace %{name} with %{uniquesuffix} where it's used as a unique suffix. +- Replace %%{name} with %%{uniquesuffix} where it's used as a unique suffix. * Thu May 16 2013 Jiri Vanek - added variable arm_arches as restriction to some cases of not jit_arches