.gitignore

@@ -1,2 +1,2 @@
-SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u392-b08.tar.xz
+SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u382-b05-4curve.tar.xz
 SOURCES/tapsets-icedtea-3.15.0.tar.xz

.java-1.8.0-openjdk.metadata

@@ -1,2 +1,2 @@
-2ca27b0d535c9dcf71679cad14be5660d0554f82 SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u392-b08.tar.xz
+5da51f425a78dbdcb00909544cac3385db461e54 SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u382-b05-4curve.tar.xz
 7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz

SOURCES/java-1.8.0-openjdk-portable.specfile

@@ -265,22 +265,11 @@
 
 # New Version-String scheme-style defines
 %global majorver 8
-# Define version of OpenJDK 8 used
-%global project openjdk
-%global repo shenandoah-jdk8u
-%global openjdk_revision jdk8u392-b08
-%global shenandoah_revision shenandoah-%{openjdk_revision}
-# Define IcedTea version used for SystemTap tapsets and desktop file
-%global icedteaver      3.15.0
-# Define current Git revision for the FIPS support patches
-%global fipsver 6d1aade0648
-# Define current Git revision for the cacerts patch
-%global cacertsver 8139f2361c2
 
 # Standard JPackage naming and versioning defines
 %global origin          openjdk
 %global origin_nice     OpenJDK
-%global top_level_dir_name   %{shenandoah_revision}
+%global top_level_dir_name   %{origin}
 
 # Settings for local security configuration
 %global security_file %{top_level_dir_name}/jdk/src/share/lib/security/java.security-%{_target_os}
@@ -299,22 +288,38 @@
 %global oj_vendor_bug_url  https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{component}&version=%{fedora}
 %else
 %if 0%{?rhel}
-%global oj_vendor_bug_url https://access.redhat.com/support/cases/
+%global oj_vendor_bug_url  https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%20%{rhel}&component=%{component}
 %else
 %global oj_vendor_bug_url  https://bugzilla.redhat.com/enter_bug.cgi
 %endif
 %endif
 %endif
 
+# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
+%global shenandoah_project      openjdk
+%global shenandoah_repo         shenandoah-jdk8u
+%global openjdk_revision        jdk8u382-b05
+%global shenandoah_revision     shenandoah-%{openjdk_revision}
+# Define old aarch64/jdk8u tree variables for compatibility
+%global project         %{shenandoah_project}
+%global repo            %{shenandoah_repo}
+%global revision        %{shenandoah_revision}
+# Define IcedTea version used for SystemTap tapsets and desktop file
+%global icedteaver      3.15.0
+# Define current Git revision for the FIPS support patches
+%global fipsver 6d1aade0648
+# Define current Git revision for the cacerts patch
+%global cacertsver 8139f2361c2
+
 # e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 -> aarch64-shenandoah-jdk8u212-b04
-%global version_tag     %(VERSION=%{shenandoah_revision}; echo ${VERSION%%-shenandoah-merge*})
+%global version_tag     %(VERSION=%{revision}; echo ${VERSION%%-shenandoah-merge*})
 # eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60  (dont forget spec escape % by %%)
 %global whole_update    %(VERSION=%{version_tag}; echo ${VERSION%%-*})
 # eg  jdk8u60 -> 60 or aarch64-jdk8u60 -> 60
 %global updatever       %(VERSION=%{whole_update}; echo ${VERSION##*u})
 # eg jdk8u60-b27 -> b27
 %global buildver        %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease      1
+%global rpmrelease      2
 # Define milestone (EA for pre-releases, GA ("fcs") for releases)
 # Release will be (where N is usually a number starting at 1):
 # - 0.N%%{?extraver}%%{?dist} for EA releases,
@@ -432,10 +437,10 @@ URL:      http://openjdk.java.net/
 # OpenJDK 8u, the aarch64 port and Shenandoah
 # To regenerate, use:
 # VERSION=%%{shenandoah_revision}
-# FILE_NAME_ROOT=%%{project}-%%{repo}-${VERSION}
+# FILE_NAME_ROOT=%%{shenandoah_project}-%%{shenandoah_repo}-${VERSION}
 # REPO_ROOT=<path to checked-out repository> generate_source_tarball.sh
-# where the source is obtained from http://github.com/%%{project}/%%{repo}
+# where the source is obtained from http://hg.openjdk.java.net/%%{project}/%%{repo}
-Source0: %{project}-%{repo}-%{shenandoah_revision}.tar.xz
+Source0: %{shenandoah_project}-%{shenandoah_repo}-%{shenandoah_revision}-4curve.tar.xz
 
 # Custom README for -src subpackage
 Source2:  README.md
@@ -598,8 +603,6 @@ Patch204: jdk8042159-allow_using_system_installed_lcms2-jdk.patch
 Patch581: jdk8257794-remove_broken_assert.patch
 # JDK-8186464, RH1433262: ZipFile cannot read some InfoZip ZIP64 zip files
 Patch12: jdk8186464-rh1433262-zip64_failure.patch
-# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
-Patch2000: jdk8312489-max_sig_default_increase.patch
 
 #############################################
 #
@@ -707,7 +710,7 @@ Provides: bundled(lcms2) = 2.10.0
 # Version in jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h
 Provides: bundled(libjpeg) = 6b
 # Version in jdk/src/share/native/sun/awt/libpng/png.h
-Provides: bundled(libpng) = 1.6.39
+Provides: bundled(libpng) = 1.6.37
 # We link statically against libstdc++ to increase portability
 BuildRequires: libstdc++-static
 %endif
@@ -811,7 +814,6 @@ if [ $prioritylength -ne 7 ] ; then
 fi
 # For old patches
 ln -s %{top_level_dir_name} jdk8
-ln -s %{top_level_dir_name} openjdk
 
 cp %{SOURCE2} .
 
@@ -870,8 +872,6 @@ pushd %{top_level_dir_name}
 %patch1000 -p1
 # system cacerts support
 %patch539 -p1
-# JDK-8312489 backport, proposed for 8u402: https://github.com/openjdk/jdk8u-dev/pull/381
-%patch2000 -p1
 popd
 
 # RPM-only fixes
@@ -1501,29 +1501,14 @@ done
 %{_jvmdir}/%{miscportablearchive}.sha256sum
 
 %changelog
-* Wed Oct 11 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.392.b08-1
-- Update to shenandoah-jdk8u392-b08 (GA)
-- Update release notes for shenandoah-8u392-b08.
-- Regenerate PR2462 patch following JDK-8315135
-- Bump version of bundled libpng to 1.6.39
-- Add backport of JDK-8312489 heading upstream for 8u402 (see OPENJDK-2095)
-- ** This tarball is embargoed until 2023-10-17 @ 1pm PT. **
-
-* Fri Sep 29 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.392.b01-1
-- Update to shenandoah-jdk8u392-b01 (GA)
-- Update release notes for shenandoah-8u392-b01.
-- Update generate_tarball.sh to be closer to upstream vanilla script inc. no more ECC removal
-- Update bug URL for RHEL to point to the Red Hat customer portal
-- Change top_level_dir_name to use the VCS tag, matching new upstream release style tarball
-
 * Fri Jul 14 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.382.b05-2
 - Re-enable SystemTap support and perform only substitutions possible without final NVR available
 - Include tapsets in the miscellaneous tarball
 - Drop unused globals for tapset installation
 
 * Fri Jul 14 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.382.b05-1
-- Update to shenandoah-jdk8u382-b05 (GA)
+- Update to shenandoah-jdk8u372-b05 (GA)
-- Update release notes for shenandoah-8u382-b05.
+- Update release notes for shenandoah-8u372-b05.
 - ** This tarball is embargoed until 2023-07-18 @ 1pm PT. **
 
 * Fri Jul 07 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.382.b04-0.1.ea

SOURCES/jdk8312489-max_sig_default_increase.patch

@@ -1,48 +0,0 @@
-commit c38a36f124a7eb28920cc367cb01b67d973a55c0
-Author: Andrew John Hughes <andrew@openjdk.org>
-Date:   Wed Oct 11 01:42:03 2023 +0100
-
-    Backport e47a84f23dd2608c6f5748093eefe301fb5bf750
-
-diff --git a/jdk/src/share/classes/java/util/jar/JarFile.java b/jdk/src/share/classes/java/util/jar/JarFile.java
-index a26dcc4a1c7..ac2e1c9d6a8 100644
---- a/jdk/src/share/classes/java/util/jar/JarFile.java
-+++ b/jdk/src/share/classes/java/util/jar/JarFile.java
-@@ -436,7 +436,9 @@ class JarFile extends ZipFile {
-                 throw new IOException("Unsupported size: " + uncompressedSize +
-                         " for JarEntry " + ze.getName() +
-                         ". Allowed max size: " +
--                        SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes");
-+                        SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes. " +
-+                        "You can use the jdk.jar.maxSignatureFileSize " +
-+                        "system property to increase the default value.");
-             }
-             int len = (int)uncompressedSize;
-             byte[] b = IOUtils.readAllBytes(is);
-diff --git a/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java b/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java
-index c335e964f63..afdfa406b92 100644
---- a/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java
-+++ b/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java
-@@ -855,16 +855,16 @@ public class SignatureFileVerifier {
-          * the maximum allowed number of bytes for the signature-related files
-          * in a JAR file.
-          */
--        Integer tmp = AccessController.doPrivileged(new GetIntegerAction(
--                "jdk.jar.maxSignatureFileSize", 8000000));
-+        int tmp = AccessController.doPrivileged(new GetIntegerAction(
-+                "jdk.jar.maxSignatureFileSize", 16000000));
-         if (tmp < 0 || tmp > MAX_ARRAY_SIZE) {
-             if (debug != null) {
--                debug.println("Default signature file size 8000000 bytes " +
--                        "is used as the specified size for the " +
--                        "jdk.jar.maxSignatureFileSize system property " +
-+                debug.println("The default signature file size of 16000000 bytes " +
-+                        "will be used for the jdk.jar.maxSignatureFileSize " +
-+                        "system property since the specified value " +
-                         "is out of range: " + tmp);
-             }
--            tmp = 8000000;
-+            tmp = 16000000;
-         }
-         return tmp;
-     }

SOURCES/pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch

@@ -7,11 +7,10 @@
 8074839: Resolve disabled warnings for libunpack and the unpack200 binary
 Reviewed-by: dholmes, ksrini
 
-diff --git openjdk.orig/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
+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
-index bdaf95a2f6a..60c5b4f2a69 100644
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
---- openjdk.orig/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
-@@ -63,7 +63,7 @@ struct bytes {
+@@ -63,7 +63,7 @@
      bytes res;
      res.ptr = ptr + beg;
      res.len = end - beg;
@@ -20,11 +19,10 @@ index bdaf95a2f6a..60c5b4f2a69 100644
      return res;
    }
    // building C strings inside byte buffers:
-diff --git openjdk.orig/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
+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
-index 5fbc7261fb3..4c002e779d8 100644
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
---- openjdk.orig/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
-@@ -292,7 +292,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_getUnusedInput(JNIEnv *env, jobject
+@@ -292,7 +292,7 @@
  
    if (uPtr->aborting()) {
      THROW_IOE(uPtr->get_abort_message());
@@ -33,16 +31,16 @@ index 5fbc7261fb3..4c002e779d8 100644
    }
  
    // We have fetched all the files.
-@@ -312,7 +312,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
+@@ -310,7 +310,7 @@
-   // There's no need to create a new unpacker here if we don't already have one
+ JNIEXPORT jlong JNICALL
-   // just to immediatly free it afterwards.
+ Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
-   unpacker* uPtr = get_unpacker(env, pObj, /* noCreate= */ true);
+   unpacker* uPtr = get_unpacker(env, pObj, false);
 -  CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
 +  CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0);
    size_t consumed = uPtr->input_consumed();
-   // free_unpacker() will set the unpacker field on 'pObj' to null
    free_unpacker(env, pObj, uPtr);
-@@ -323,6 +323,7 @@ JNIEXPORT jboolean JNICALL
+   return consumed;
+@@ -320,6 +320,7 @@
  Java_com_sun_java_util_jar_pack_NativeUnpack_setOption(JNIEnv *env, jobject pObj,
                                         jstring pProp, jstring pValue) {
    unpacker*   uPtr  = get_unpacker(env, pObj);
@@ -50,11 +48,10 @@ index 5fbc7261fb3..4c002e779d8 100644
    const char* prop  = env->GetStringUTFChars(pProp, JNI_FALSE);
    CHECK_EXCEPTION_RETURN_VALUE(prop, false);
    const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
-diff --git openjdk.orig/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
+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
-index 6fbc43a18ae..722c8baaff0 100644
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
---- openjdk.orig/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
-@@ -142,31 +142,28 @@ static const char* nbasename(const char* progname) {
+@@ -142,31 +142,28 @@
    return progname;
  }
  
@@ -104,11 +101,10 @@ index 6fbc43a18ae..722c8baaff0 100644
    }
  }
  
-diff --git openjdk.orig/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
+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
-index 56f391b1e87..f0a25f8cd20 100644
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
---- openjdk.orig/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
-@@ -225,9 +225,9 @@ struct entry {
+@@ -222,9 +222,9 @@
    }
  
  #ifdef PRODUCT
@@ -120,7 +116,7 @@ index 56f391b1e87..f0a25f8cd20 100644
  #endif
  };
  
-@@ -718,13 +718,13 @@ void unpacker::read_file_header() {
+@@ -715,13 +715,13 @@
    // Now we can size the whole archive.
    // Read everything else into a mega-buffer.
    rp = hdr.rp;
@@ -138,7 +134,7 @@ index 56f391b1e87..f0a25f8cd20 100644
        abort("EOF reading fixed input buffer");
        return;
      }
-@@ -738,7 +738,7 @@ void unpacker::read_file_header() {
+@@ -735,7 +735,7 @@
        return;
      }
      input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)),
@@ -147,7 +143,7 @@ index 56f391b1e87..f0a25f8cd20 100644
      CHECK;
      assert(input.limit()[0] == 0);
      // Move all the bytes we read initially into the real buffer.
-@@ -961,13 +961,13 @@ void cpool::init(unpacker* u_, int counts[CONSTANT_Limit]) {
+@@ -958,13 +958,13 @@
    nentries = next_entry;
  
    // place a limit on future CP growth:
@@ -163,7 +159,7 @@ index 56f391b1e87..f0a25f8cd20 100644
  
    // Note that this CP does not include "empty" entries
    // for longs and doubles.  Those are introduced when
-@@ -985,8 +985,9 @@ void cpool::init(unpacker* u_, int counts[CONSTANT_Limit]) {
+@@ -982,8 +982,9 @@
    }
  
    // Initialize *all* our entries once
@@ -174,7 +170,7 @@ index 56f391b1e87..f0a25f8cd20 100644
  
    initGroupIndexes();
    // Initialize hashTab to a generous power-of-two size.
-@@ -3681,21 +3682,22 @@ void cpool::computeOutputIndexes() {
+@@ -3677,21 +3678,22 @@
  
  unpacker* debug_u;
  
@@ -201,7 +197,7 @@ index 56f391b1e87..f0a25f8cd20 100644
    case CONSTANT_Signature:
      if (value.b.ptr == null)
        return ref(0)->string();
-@@ -3715,26 +3717,28 @@ char* entry::string() {
+@@ -3711,26 +3713,28 @@
      break;
    default:
      if (nrefs == 0) {
@@ -239,11 +235,10 @@ index 56f391b1e87..f0a25f8cd20 100644
  }
  
  void print_cp_entries(int beg, int end) {
-diff --git openjdk.orig/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
+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
-index cec7a88b24e..ed5f3336a59 100644
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
---- openjdk.orig/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
-@@ -209,7 +209,7 @@ struct unpacker {
+@@ -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;
@@ -252,11 +247,10 @@ index cec7a88b24e..ed5f3336a59 100644
  
    // 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 --git openjdk.orig/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
+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
-index e5197e1a3f1..40a10055ea5 100644
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
---- openjdk.orig/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
-@@ -81,7 +81,7 @@ void breakpoint() { }  // hook for debugger
+@@ -81,7 +81,7 @@
  int assert_failed(const char* p) {
    char message[1<<12];
    sprintf(message, "@assert failed: %s\n", p);
@@ -265,11 +259,10 @@ index e5197e1a3f1..40a10055ea5 100644
    breakpoint();
    unpack_abort(message);
    return 0;
-diff --git openjdk.orig/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
+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
-index f58c94956c0..343da3e183b 100644
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
---- openjdk.orig/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
-@@ -84,7 +84,7 @@ void jar::init(unpacker* u_) {
+@@ -84,7 +84,7 @@
  }
  
  // Write data to the ZIP output stream.
@@ -278,7 +271,7 @@ index f58c94956c0..343da3e183b 100644
    while (len > 0) {
      int rc = (int)fwrite(buff, 1, len, jarfp);
      if (rc <= 0) {
-@@ -323,12 +323,12 @@ void jar::write_central_directory() {
+@@ -323,12 +323,12 @@
      // Total number of disks (int)
      header64[36] = (ushort)SWAP_BYTES(1);
      header64[37] = 0;
@@ -293,11 +286,10 @@ index f58c94956c0..343da3e183b 100644
  
    PRINTCR((2, "writing zip comment\n"));
    // Write the comment.
-diff --git openjdk.orig/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
+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
-index 14ffc9d65bd..9877f6f68ca 100644
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
---- openjdk.orig/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
-@@ -68,8 +68,8 @@ struct jar {
+@@ -68,8 +68,8 @@
    }
  
    // Private Methods