Use a simple backport for PRPR2462/8074839, Don't backport the crc check for pack.gz. It's not tested well upstream.

java-1.8.0-openjdk.spec

@@ -737,7 +737,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 11.%{buildver}%{?dist}
+Release: 12.%{buildver}%{?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
@@ -842,8 +842,7 @@ Patch202: system-libpng.patch
 Patch203: system-lcms.patch
 # PR2462: Backport "8074839: Resolve disabled warnings for libunpack and the unpack200 binary"
 # This fixes printf warnings that lead to build failure with -Werror=format-security from optflags
-Patch502: pr2462-01.patch
+Patch502: pr2462.patch
-Patch503: pr2462-02.patch
 # S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux
 Patch605: soundFontPatch.patch
 # S8148351, PR2842: Only display resolved symlink for compiler, do not change path
@@ -1139,7 +1138,6 @@ sh %{SOURCE12}
 %patch605
 
 %patch502
-%patch503
 %patch504
 %patch505
 %patch506
@@ -1713,6 +1711,10 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Mon Feb 29 2016 Omair Majid <omajid@redhat.com> - 1:1.8.0.72-12.b15
+- Use a simple backport for PRPR2462/8074839.
+- Don't backport the crc check for pack.gz. It's not tested well upstream.
+
 * Mon Feb 29 2016 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.72-5.b16
 - Fix regression introduced on s390 by large code cache change.
 - Update to u72b16.

pr2462-01.patch

@@ -1,200 +0,0 @@
-# HG changeset patch
-# User kizune
-# Date 1403186822 -14400
-#      Thu Jun 19 18:07:02 2014 +0400
-# Node ID ad88ac6bac57e540e87fdb5d9ad15528b1beee11
-# Parent  f0137fa5ba5298a73f14ae508463dc7e890a70a5
-8000650, PR2462: unpack200.exe should check gzip crc
-Reviewed-by: ksrini
-
-diff -r f0137fa5ba52 -r ad88ac6bac57 src/share/native/com/sun/java/util/jar/pack/main.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp	Thu Apr 23 13:48:02 2015 -0400
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp	Thu Jun 19 18:07:02 2014 +0400
-@@ -62,6 +62,13 @@
-     return unpacker::run(argc, argv);
- }
- 
-+// Dealing with big-endian arch
-+#ifdef _BIG_ENDIAN
-+#define SWAP_INT(a) (((a>>24)&0xff) | ((a<<8)&0xff0000) | ((a>>8)&0xff00) | ((a<<24)&0xff000000))
-+#else
-+#define SWAP_INT(a) (a)
-+#endif
-+
- // Single-threaded, implementation, not reentrant.
- // Includes a weak error check against MT access.
- #ifndef THREAD_SELF
-@@ -385,6 +392,7 @@
-       u.start();
-     }
-   } else {
-+    u.gzcrc = 0;
-     u.start(peek, sizeof(peek));
-   }
- 
-@@ -425,7 +433,23 @@
-     status = 1;
-   }
- 
--  if (u.infileptr != null) {
-+  if (!u.aborting() && u.infileptr != null) {
-+    if (u.gzcrc != 0) {
-+      // Read the CRC information from the gzip container
-+      fseek(u.infileptr, -8, SEEK_END);
-+      uint filecrc;
-+      fread(&filecrc, sizeof(filecrc), 1, u.infileptr);
-+      if (u.gzcrc != SWAP_INT(filecrc)) { // CRC error
-+        if (strcmp(destination_file, "-") != 0) {
-+          // Output is not stdout, remove it, it's broken
-+          if (u.jarout != null)
-+            u.jarout->closeJarFile(false);
-+          remove(destination_file);
-+        }
-+        // Print out the error and exit with return code != 0
-+        u.abort("CRC error, invalid compressed data.");
-+      }
-+    }
-     fclose(u.infileptr);
-     u.infileptr = null;
-   }
-diff -r f0137fa5ba52 -r ad88ac6bac57 src/share/native/com/sun/java/util/jar/pack/unpack.h
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h	Thu Apr 23 13:48:02 2015 -0400
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h	Thu Jun 19 18:07:02 2014 +0400
-@@ -171,6 +171,7 @@
-   bytes inbytes;    // direct
-   gunzip* gzin;     // gunzip filter, if any
-   jar*  jarout;     // output JAR file
-+  uint  gzcrc;      // CRC gathered from gzip content
- 
- #ifndef PRODUCT
-   int   nowrite;
-diff -r f0137fa5ba52 -r ad88ac6bac57 src/share/native/com/sun/java/util/jar/pack/zip.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Thu Apr 23 13:48:02 2015 -0400
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Thu Jun 19 18:07:02 2014 +0400
-@@ -551,6 +551,7 @@
-       break;
-     }
-     int nr = readlen - zs.avail_out;
-+    u->gzcrc = crc32(u->gzcrc, (const unsigned char *)bufptr, nr);
-     numread += nr;
-     bufptr += nr;
-     assert(numread <= maxlen);
-@@ -589,6 +590,7 @@
-   zstream = NEW(z_stream, 1);
-   u->gzin = this;
-   u->read_input_fn = read_input_via_gzip;
-+  u->gzcrc = crc32(0L, Z_NULL, 0);
- }
- 
- void gunzip::start(int magic) {
-diff -r f0137fa5ba52 -r ad88ac6bac57 test/tools/pack200/PackChecksum.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ openjdk/jdk/test/tools/pack200/PackChecksum.java	Thu Jun 19 18:07:02 2014 +0400
-@@ -0,0 +1,107 @@
-+/*
-+ * Copyright (c) 2014, 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.
-+ *
-+ * 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.
-+ */
-+import java.io.File;
-+import java.io.FileOutputStream;
-+import java.io.IOException;
-+import java.io.RandomAccessFile;
-+import java.util.ArrayList;
-+import java.util.List;
-+import java.util.jar.JarEntry;
-+import java.util.jar.JarOutputStream;
-+
-+/*
-+ * @test
-+ * @bug 8000650
-+ * @summary unpack200.exe should check gzip crc
-+ * @compile -XDignore.symbol.file Utils.java PackChecksum.java
-+ * @run main PackChecksum
-+ * @author kizune
-+ */
-+public class PackChecksum {
-+
-+    public static void main(String... args) throws Exception {
-+        testChecksum();
-+    }
-+
-+    static void testChecksum() throws Exception {
-+
-+        // Create a fresh .jar file
-+        File testFile = new File("src_tools.jar");
-+        File testPack = new File("src_tools.pack.gz");
-+        generateJar(testFile);
-+        List<String> cmdsList = new ArrayList<>();
-+
-+        // Create .pack file
-+        cmdsList.add(Utils.getPack200Cmd());
-+        cmdsList.add(testPack.getName());
-+        cmdsList.add(testFile.getName());
-+        Utils.runExec(cmdsList);
-+
-+        // Mess up with the checksum of the packed file
-+        RandomAccessFile raf = new RandomAccessFile(testPack, "rw");
-+        raf.seek(raf.length() - 8);
-+        int val = raf.readInt();
-+        val = Integer.MAX_VALUE - val;
-+        raf.seek(raf.length() - 8);
-+        raf.writeInt(val);
-+        raf.close();
-+
-+        File dstFile = new File("dst_tools.jar");
-+        cmdsList.clear();
-+        cmdsList.add(Utils.getUnpack200Cmd());
-+        cmdsList.add(testPack.getName());
-+        cmdsList.add(dstFile.getName());
-+
-+        boolean passed = false;
-+        try {
-+            Utils.runExec(cmdsList);
-+        } catch (RuntimeException re) {
-+            // unpack200 should exit with non-zero exit code
-+            passed = true;
-+        }
-+
-+        // tidy up
-+        if (testFile.exists()) testFile.delete();
-+        if (testPack.exists()) testPack.delete();
-+        if (dstFile.exists()) dstFile.delete();
-+        if (!passed) {
-+            throw new Exception("File with incorrect CRC unpacked without the error.");
-+        }
-+    }
-+
-+    static void generateJar(File result) throws IOException {
-+        if (result.exists()) {
-+            result.delete();
-+        }
-+
-+        try (JarOutputStream output = new JarOutputStream(new FileOutputStream(result)); ) {
-+            for (int i = 0 ; i < 100 ; i++) {
-+                JarEntry e = new JarEntry("F-" + i + ".txt");
-+                output.putNextEntry(e);
-+            }
-+            output.flush();
-+            output.close();
-+        }
-+    }
-+
-+}

pr2462.patch

@@ -1,15 +1,15 @@
 # HG changeset patch
 # User mikael
-# Date 1435336416 -3600
+# Date 1426870964 25200
-#      Fri Jun 26 17:33:36 2015 +0100
+#      Fri Mar 20 10:02:44 2015 -0700
-# Node ID d64c0a9b8b5a43c1b7ba88a871f001fc6b44a3d4
+# Node ID ee13ce369705a700b867f8c77423580b7b22cc13
-# Parent  ad88ac6bac57e540e87fdb5d9ad15528b1beee11
+# Parent  7847ccfb240b35ed0dd328f0404b713b20e0905a
-8074839, PR2462: Resolve disabled warnings for libunpack and the unpack200 binary
+8074839: Resolve disabled warnings for libunpack and the unpack200 binary
 Reviewed-by: dholmes, ksrini
 
-diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack/bytes.h
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h	Thu Jun 19 18:07:02 2014 +0400
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h	Fri Jun 26 17:33:36 2015 +0100
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
 @@ -63,7 +63,7 @@
      bytes res;
      res.ptr = ptr + beg;
@@ -19,9 +19,9 @@ diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack
      return res;
    }
    // building C strings inside byte buffers:
-diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack/jni.cpp
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp	Thu Jun 19 18:07:02 2014 +0400
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp	Fri Jun 26 17:33:36 2015 +0100
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
 @@ -292,7 +292,7 @@
  
    if (uPtr->aborting()) {
@@ -48,10 +48,10 @@ diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack
    const char* prop  = env->GetStringUTFChars(pProp, JNI_FALSE);
    CHECK_EXCEPTION_RETURN_VALUE(prop, false);
    const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
-diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack/main.cpp
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp	Thu Jun 19 18:07:02 2014 +0400
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp	Fri Jun 26 17:33:36 2015 +0100
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
-@@ -149,31 +149,28 @@
+@@ -142,31 +142,28 @@
    return progname;
  }
  
@@ -101,9 +101,9 @@ diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack
    }
  }
  
-diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp	Thu Jun 19 18:07:02 2014 +0400
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp	Fri Jun 26 17:33:36 2015 +0100
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
 @@ -222,9 +222,9 @@
    }
  
@@ -170,7 +170,7 @@ diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack
  
    initGroupIndexes();
    // Initialize hashTab to a generous power-of-two size.
-@@ -3676,21 +3677,22 @@
+@@ -3677,21 +3678,22 @@
  
  unpacker* debug_u;
  
@@ -197,7 +197,7 @@ diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack
    case CONSTANT_Signature:
      if (value.b.ptr == null)
        return ref(0)->string();
-@@ -3710,26 +3712,28 @@
+@@ -3711,26 +3713,28 @@
      break;
    default:
      if (nrefs == 0) {
@@ -235,10 +235,10 @@ diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack
  }
  
  void print_cp_entries(int beg, int end) {
-diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack/unpack.h
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h	Thu Jun 19 18:07:02 2014 +0400
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h	Fri Jun 26 17:33:36 2015 +0100
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
-@@ -210,7 +210,7 @@
+@@ -209,7 +209,7 @@
    byte*     rp;          // read pointer (< rplimit <= input.limit())
    byte*     rplimit;     // how much of the input block has been read?
    julong    bytes_read;
@@ -247,9 +247,9 @@ diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack
  
    // callback to read at least one byte, up to available input
    typedef jlong (*read_input_fn_t)(unpacker* self, void* buf, jlong minlen, jlong maxlen);
-diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack/utils.cpp
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp	Thu Jun 19 18:07:02 2014 +0400
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp	Fri Jun 26 17:33:36 2015 +0100
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
 @@ -81,7 +81,7 @@
  int assert_failed(const char* p) {
    char message[1<<12];
@@ -259,9 +259,9 @@ diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack
    breakpoint();
    unpack_abort(message);
    return 0;
-diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack/zip.cpp
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Thu Jun 19 18:07:02 2014 +0400
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Fri Jun 26 17:33:36 2015 +0100
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
 @@ -84,7 +84,7 @@
  }
  
@@ -286,18 +286,9 @@ diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack
  
    PRINTCR((2, "writing zip comment\n"));
    // Write the comment.
-@@ -590,7 +590,7 @@
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
-   zstream = NEW(z_stream, 1);
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
-   u->gzin = this;
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
-   u->read_input_fn = read_input_via_gzip;
--  u->gzcrc = crc32(0L, Z_NULL, 0);
-+  u->gzcrc = crc32(0, Z_NULL, 0);
- }
- 
- void gunzip::start(int magic) {
-diff -r ad88ac6bac57 -r d64c0a9b8b5a src/share/native/com/sun/java/util/jar/pack/zip.h
---- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h	Thu Jun 19 18:07:02 2014 +0400
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h	Fri Jun 26 17:33:36 2015 +0100
 @@ -68,8 +68,8 @@
    }