From dbc577c750f94d3f20062436f4734f305f68dd70 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 21 2016 11:16:06 +0000 Subject: import java-1.7.0-openjdk-1.7.0.95-2.6.4.0.el7_2 --- diff --git a/.gitignore b/.gitignore index 3068d9a..0e7f713 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/class-rewriter.tar.gz -SOURCES/openjdk-icedtea-2.6.2.tar.xz +SOURCES/openjdk-icedtea-2.6.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 d6e16b8..d18c6cd 100644 --- a/.java-1.7.0-openjdk.metadata +++ b/.java-1.7.0-openjdk.metadata @@ -1,4 +1,4 @@ fcc167de17354efb6e52cb387eb3e7dbb0316b53 SOURCES/class-rewriter.tar.gz -c81a0c6165fab2c5fbb80b63a818a50ec5c436d3 SOURCES/openjdk-icedtea-2.6.2.tar.xz +874db7bfc0de8c75cd8eed6da43f818c0080ae45 SOURCES/openjdk-icedtea-2.6.4.tar.xz fb72b6b1f4735ad9b5799d0b5058b0b1dec67b17 SOURCES/pulseaudio.tar.gz becc037bf0eb13b5f0ebcdd94b58ebfe6336b7a0 SOURCES/systemtap-tapset-2014-03-19.tar.xz diff --git a/SOURCES/8072932or8074489.patch b/SOURCES/8072932or8074489.patch deleted file mode 100644 index 5941153..0000000 --- a/SOURCES/8072932or8074489.patch +++ /dev/null @@ -1,22 +0,0 @@ - -# HG changeset patch -# User kevinw -# Date 1425476514 0 -# Node ID 444ae429c77be53df0b35483d9cf6ce17118e197 -# Parent 569ad82d3904f66d372edfd58532f4e1b1b0b20a -8072932: Test fails with java.security.AccessControlException: access denied ("java.security.SecurityPermission" "getDomainCombiner") -Reviewed-by: jbachorik - -diff -r 569ad82d3904 -r 444ae429c77b src/share/classes/java/security/ProtectionDomain.java ---- openjdk/jdk/src/share/classes/java/security/ProtectionDomain.java Mon Mar 02 18:38:00 2015 +0000 -+++ openjdk/jdk/src/share/classes/java/security/ProtectionDomain.java Wed Mar 04 13:41:54 2015 +0000 -@@ -88,7 +88,7 @@ - } - - private static AccessControlContext getCombinedACC(AccessControlContext context, AccessControlContext stack) { -- AccessControlContext acc = new AccessControlContext(context, stack.getDomainCombiner(), true); -+ AccessControlContext acc = new AccessControlContext(context, stack.getCombiner(), true); - - return new AccessControlContext(stack.getContext(), acc).optimize(); - } - diff --git a/SOURCES/fsg.sh b/SOURCES/fsg.sh index c338e51..b5513eb 100644 --- a/SOURCES/fsg.sh +++ b/SOURCES/fsg.sh @@ -1,5 +1,15 @@ #!/bin/sh +if [ "x$1" = "xhelp" ] ; then + echo "PR2124 - the path to the PR2124 patch to apply (optional; downloaded if unavailable)" + exit 1; +fi + +if [ "x${TMPDIR}" = "x" ]; then + echo "Using default temporary directory of /tmp"; + TMPDIR=/tmp +fi + echo "Further liberating OpenJDK..." # PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x) @@ -110,4 +120,13 @@ 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 +if [ "x$PR2124" = "x" ] ; then +# get pr2124.patch (from http://icedtea.classpath.org//hg/icedtea7) +# Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2124) + wget -O ${TMPDIR}/pr2124.patch http://icedtea.classpath.org/hg/icedtea7/raw-file/tip/patches/pr2124.patch + patch -Np0 < ${TMPDIR}/pr2124.patch + rm -vf ${TMPDIR}/pr2124.patch +else + echo "Applying ${PR2124}" + patch -Np0 < $PR2124 +fi; diff --git a/SPECS/java-1.7.0-openjdk.spec b/SPECS/java-1.7.0-openjdk.spec index d9564da..ca5a928 100644 --- a/SPECS/java-1.7.0-openjdk.spec +++ b/SPECS/java-1.7.0-openjdk.spec @@ -5,7 +5,7 @@ # conflicting) files in the -debuginfo package %undefine _missing_build_ids_terminate_build -%global icedtea_version 2.6.2 +%global icedtea_version 2.6.4 %global hg_tag icedtea-{icedtea_version} %global aarch64 aarch64 arm64 armv8 @@ -126,7 +126,7 @@ # Standard JPackage naming and versioning defines. %global origin openjdk -%global updatever 91 +%global updatever 95 %global buildver 00 # Keep priority on 7digits in case updatever>9 %global priority 17000%{updatever} @@ -168,7 +168,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: %{icedtea_version}.3%{?dist} +Release: %{icedtea_version}.0%{?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 @@ -185,20 +185,9 @@ Group: Development/Languages License: ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and LGPL+ and LGPLv2 and MPLv1.0 and MPLv1.1 and Public Domain and W3C 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.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} -# hg clone $REPO/jaxp/ openjdk/jaxp -r %{hg_tag} -# hg clone $REPO/jaxws/ openjdk/jaxws -r %{hg_tag} -# hg clone $REPO/jdk/ openjdk/jdk -r %{hg_tag} -# hg clone $REPO/langtools/ openjdk/langtools -r %{hg_tag} -# find openjdk -name ".hg" -exec rm -rf '{}' \; -# sh /git/java-1.7.0-openjdk/rhel-7.1/fsg.sh -# tar cJf openjdk-icedtea-%{icedtea_version}.tar.xz openjdk +# Source from upstream IcedTea 2.x project. To regenerate, use +# VERSION=icedtea-${icedtea_version} FILE_NAME_ROOT=openjdk-${VERSION} +# REPO_ROOT= generate_source_tarball.sh Source0: openjdk-icedtea-%{icedtea_version}.tar.xz # README file @@ -282,7 +271,6 @@ Patch300: pulse-soundproperties.patch Patch400: rh1022017.patch # Temporary patches -Patch500: 8072932or8074489.patch # End of tmp patches BuildRequires: autoconf @@ -521,8 +509,6 @@ cp %{SOURCE2} . %if %{with_systemtap} %endif -%patch500 - # Remove libraries that are linked sh %{SOURCE10} @@ -814,9 +800,8 @@ sh %{SOURCE11} ${JAVA_HOME} rm -rf $RPM_BUILD_ROOT STRIP_KEEP_SYMTAB=libjvm* -# there used to be and link to soundfont -# will be replaced by fix of http://mail.openjdk.java.net/pipermail/sound-dev/2015-October/000352.html -# once done, and have to go to fedora first. Removed from rhel7 for now +# There used to be a link to the soundfont. +# This is now obsolete following the inclusion of 8140620/PR2710 pushd %{buildoutputdir}/j2sdk-image @@ -1203,7 +1188,9 @@ if [ "$1" -gt 1 ]; then sum=$(md5sum "${javasecurity}" | cut -d' ' -f1) # This is the md5sum of an unmodified java.security file if [ "${sum}" = '567d9244d9ef1ac0e557d05eb0892413' -o \ - "${sum}" = '034a9bfa527cbdf58f021ce0e47e22db' ]; then + "${sum}" = '034a9bfa527cbdf58f021ce0e47e22db' -o \ + "${sum}" = 'f8a8bd04adae13e632e30622061d4b9f' -o \ + "${sum}" = '9b517554fffe801f6894dfa0e8169cb1' ]; then if [ -f "${javasecurity}.rpmnew" ]; then mv -f "${javasecurity}.rpmnew" "${javasecurity}" fi @@ -1555,7 +1542,14 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog -* Tue Oct 20 2015 Jiri Vanek - 1:1.7.0.91-2.6.2.3 +* Tue Jan 19 2016 Andrew Hughes - 1:1.7.0.95-2.6.4.0 +- Bump to 2.6.4 and u95b00. +- Backport tarball creation script from OpenJDK 8 RPMs and update fsg.sh to work with it. +- Drop 8072932or8074489 patch as applied upstream in u91b01. +- Add MD5 checksums for last two version of the java.security file. +- Resolves: rhbz#1295768 + +* Tue Oct 20 2015 Jiri Vanek - 1:1.7.0.91-2.6.2.3 - added and applied patch500 8072932or8074489.patch to fix tck failure - Resolves: rhbz#1271923