diff --git a/.gitignore b/.gitignore index 93272c4..ed01364 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/class-rewriter.tar.gz -SOURCES/openjdk-icedtea-2.6.10.tar.xz +SOURCES/openjdk-icedtea-2.6.11.tar.xz SOURCES/pulseaudio.tar.gz SOURCES/systemtap-tapset-2.6.10.tar.xz diff --git a/.java-1.7.0-openjdk.metadata b/.java-1.7.0-openjdk.metadata index dffe924..bb63efa 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 -b0b9dd34ac08e01b48cea8d5bcd8364dbd670b7f SOURCES/openjdk-icedtea-2.6.10.tar.xz +95c24dd3e362771287e45fb70a87f9adc0d0ad9e SOURCES/openjdk-icedtea-2.6.11.tar.xz fb72b6b1f4735ad9b5799d0b5058b0b1dec67b17 SOURCES/pulseaudio.tar.gz 626624100f67db3d98f1f48ea1a7558e44642aea SOURCES/systemtap-tapset-2.6.10.tar.xz diff --git a/SOURCES/7177216-pr3398-rh1446700.patch b/SOURCES/7177216-pr3398-rh1446700.patch deleted file mode 100644 index e0691d8..0000000 --- a/SOURCES/7177216-pr3398-rh1446700.patch +++ /dev/null @@ -1,42 +0,0 @@ -# HG changeset patch -# User asaha -# Date 1496853156 -3600 -# Wed Jun 07 17:32:36 2017 +0100 -# Node ID a1b7baf74b49a4a0889b331980d60a7e3699f583 -# Parent 59204456ee2f82d6d6b84d2e40f78a42c85fa0ec -7177216, PR3398, RH1446700: native2ascii changes file permissions of input file -Reviewed-by: sherman, alanb - -diff --git a/src/share/classes/sun/tools/native2ascii/Main.java b/src/share/classes/sun/tools/native2ascii/Main.java ---- openjdk/jdk/src/share/classes/sun/tools/native2ascii/Main.java -+++ openjdk/jdk/src/share/classes/sun/tools/native2ascii/Main.java -@@ -71,7 +71,6 @@ - import java.nio.charset.CharsetEncoder; - import java.nio.charset.Charset; - import java.nio.charset.IllegalCharsetNameException; --import java.nio.file.Files; - import java.io.UnsupportedEncodingException; - import java.nio.charset.UnsupportedCharsetException; - import sun.tools.native2ascii.A2NFilter; -@@ -241,7 +240,9 @@ - if (tempDir == null) - tempDir = new File(System.getProperty("user.dir")); - -- tempFile = Files.createTempFile(tempDir.toPath(), "_N2A", ".TMP").toFile(); -+ tempFile = File.createTempFile("_N2A", -+ ".TMP", -+ tempDir); - tempFile.deleteOnExit(); - - try { -@@ -291,7 +292,9 @@ - File tempDir = f.getParentFile(); - if (tempDir == null) - tempDir = new File(System.getProperty("user.dir")); -- tempFile = Files.createTempFile(tempDir.toPath(), "_N2A", ".TMP").toFile(); -+ tempFile = File.createTempFile("_N2A", -+ ".TMP", -+ tempDir); - tempFile.deleteOnExit(); - - try { diff --git a/SOURCES/8185716.patch b/SOURCES/8185716.patch new file mode 100644 index 0000000..67d0e0f --- /dev/null +++ b/SOURCES/8185716.patch @@ -0,0 +1,42 @@ +diff --git a/src/cpu/ppc/vm/ppc.ad b/src/cpu/ppc/vm/ppc.ad +--- openjdk/hotspot/src/cpu/ppc/vm/ppc.ad ++++ openjdk/hotspot/src/cpu/ppc/vm/ppc.ad +@@ -3498,6 +3498,14 @@ + __ cmplwi(Rcrx, Rsrc1, Isrc2); + %} + ++ enc_class enc_cmpldi(flagsReg crx, iRegIsrc src1, uimmL16 src2) %{ ++ // TODO: PPC port $archOpcode(ppc64Opcode_cmpli); ++ MacroAssembler _masm(&cbuf); ++ Register Rsrc1 = reg_to_register_object($src1$$reg); ++ ConditionRegister Rcrx = reg_to_ConditionRegister_object($crx$$reg); ++ __ cmpldi(Rcrx, Rsrc1, $src2$$constant); ++ %} ++ + enc_class enc_btst_reg(iRegIsrc src1, iRegIsrc src2) %{ + // TODO: PPC port $archOpcode(ppc64Opcode_and_); + +@@ -11361,10 +11369,7 @@ + match(Set crx (CmpUL src1 src2)); + format %{ "CMPLD $crx, $src1, $src2" %} + size(4); +- ins_encode %{ +- // TODO: PPC port $archOpcode(ppc64Opcode_cmpl); +- __ cmpld($crx$$CondRegister, $src1$$Register, $src2$$Register); +- %} ++ ins_encode( enc_cmpld(crx, src1, src2) ); + ins_pipe(pipe_class_compare); + %} + +@@ -11372,10 +11377,7 @@ + match(Set crx (CmpUL src1 src2)); + format %{ "CMPLDI $crx, $src1, $src2" %} + size(4); +- ins_encode %{ +- // TODO: PPC port $archOpcode(ppc64Opcode_cmpli); +- __ cmpldi($crx$$CondRegister, $src1$$Register, $src2$$constant); +- %} ++ ins_encode( enc_cmpldi(crx, src1, src2) ); + ins_pipe(pipe_class_compare); + %} + diff --git a/SOURCES/java-1.7.0-openjdk-java-access-bridge-security.patch b/SOURCES/java-1.7.0-openjdk-java-access-bridge-security.patch index 6b4224b..7c13bfb 100644 --- a/SOURCES/java-1.7.0-openjdk-java-access-bridge-security.patch +++ b/SOURCES/java-1.7.0-openjdk-java-access-bridge-security.patch @@ -1,24 +1,21 @@ ---- openjdk/jdk/src/share/lib/security/java.security-linux.orig +diff --git a/src/share/lib/security/java.security-linux b/src/share/lib/security/java.security-linux +--- openjdk/jdk/src/share/lib/security/java.security-linux +++ openjdk/jdk/src/share/lib/security/java.security-linux -@@ -154,7 +154,9 @@ - com.sun.org.apache.xml.internal.security.,\ +@@ -158,6 +158,8 @@ + com.sun.org.apache.xml.internal.utils.,\ com.sun.org.glassfish.,\ - org.jcp.xml.dsig.internal.,\ -- oracle.jrockit.jfr. -+ oracle.jrockit.jfr.,\ + oracle.jrockit.jfr.,\ + org.GNOME.Accessibility.,\ -+ org.GNOME.Bonobo. ++ org.GNOME.Bonobo.,\ + org.jcp.xml.dsig.internal. # # List of comma-separated packages that start with or equal this string - # will cause a security exception to be thrown when -@@ -192,7 +194,9 @@ - com.sun.org.apache.xml.internal.security.,\ +@@ -200,6 +202,8 @@ + com.sun.org.apache.xml.internal.utils.,\ com.sun.org.glassfish.,\ - org.jcp.xml.dsig.internal.,\ -- oracle.jrockit.jfr. -+ oracle.jrockit.jfr.,\ + oracle.jrockit.jfr.,\ + org.GNOME.Accessibility.,\ -+ org.GNOME.Bonobo. ++ org.GNOME.Bonobo.,\ + org.jcp.xml.dsig.internal. # # Determines whether this properties file can be appended to - # or overridden on the command line via -Djava.security.properties diff --git a/SPECS/java-1.7.0-openjdk.spec b/SPECS/java-1.7.0-openjdk.spec index e110997..34a694c 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.10 +%global icedtea_version 2.6.11 %global hg_tag icedtea-{icedtea_version} %global aarch64 aarch64 arm64 armv8 @@ -154,8 +154,8 @@ # Standard JPackage naming and versioning defines. %global origin openjdk -%global updatever 141 -%global buildver 02 +%global updatever 151 +%global buildver 00 # Keep priority on 7digits in case updatever>9 %global priority 1700%{updatever} %global javaver 1.7.0 @@ -194,7 +194,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: %{icedtea_version}.5%{?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 @@ -304,8 +304,8 @@ Patch400: rh1022017.patch Patch500: pr2809.patch # PR3393, RH1273760: Support using RSAandMGF1 with the SHA hash algorithms in the PKCS11 provider (will appear in 2.7.0) Patch501: pr3393-rh1273760.patch -# S7177216, PR3398, RH1446700: native2ascii changes file permissions of input file (will appear in 2.6.11) -Patch502: 7177216-pr3398-rh1446700.patch +# S8185716: OpenJDK 7 PPC64 port uses a different ins_encode format in ppc.ad +Patch502: 8185716.patch # End of tmp patches @@ -1467,6 +1467,16 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Wed Aug 02 2017 Andrew Hughes - 1:1.7.0.151-2.6.11.1 +- Apply fix for 8185716 so ppc uses correct ins_encode format +- Resolves: rhbz#1466509 + +* Wed Aug 02 2017 Andrew Hughes - 1:1.7.0.151-2.6.11.1 +- Bump to 2.6.11 and u151b00. +- Update java-access-bridge-security.patch to apply against 2.6.11. +- Drop 7177216 merge fix which is applied upstream. +- Resolves: rhbz#1466509 + * Tue Jun 13 2017 Jiri Vanek - 1:1.7.0.141-2.6.10.5 - make to use latest c-j-c and so fix persisting issues with java.security and other configfiles - aligned with this change, applied repackReproduciblePolycies.sh