updated to u161, patces cleanup will follow

.gitignore

@@ -96,3 +96,13 @@
 /aarch64-port-jdk8u-aarch64-jdk8u151-b12.tar.xz
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u151-b12.tar.xz
 /systemtap-tapset-3.6.0pre02.tar.xz
+/aarch64-port-jdk8u-aarch64-jdk8u161-b12.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u161-b12.tar.xz
+/aarch64-port-jdk8u-aarch64-jdk8u151-b13.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u151-b13.tar.xz
+/aarch64-port-jdk8u-aarch64-jdk8u152-b16.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u152-b16.tar.xz
+/aarch64-port-jdk8u-aarch64-jdk8u161-b13.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u161-b13.tar.xz
+/aarch64-port-jdk8u-aarch64-jdk8u161-b14.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u161-b14.tar.xz

8145913-pr3466-rh1498309.patch

@@ -10,7 +10,7 @@ Reviewed-by: aph, goetz
 diff --git a/src/cpu/ppc/vm/assembler_ppc.hpp b/src/cpu/ppc/vm/assembler_ppc.hpp
 --- openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
 +++ openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
-@@ -1179,6 +1179,8 @@
+@@ -1180,6 +1180,8 @@
    inline void mullw_( Register d, Register a, Register b);
    inline void mulhw(  Register d, Register a, Register b);
    inline void mulhw_( Register d, Register a, Register b);
@@ -306,10 +306,11 @@ diff --git a/src/cpu/ppc/vm/sharedRuntime_ppc.cpp b/src/cpu/ppc/vm/sharedRuntime
 diff --git a/src/cpu/ppc/vm/stubGenerator_ppc.cpp b/src/cpu/ppc/vm/stubGenerator_ppc.cpp
 --- openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
 +++ openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
-@@ -2094,6 +2094,14 @@
+@@ -2518,6 +2518,15 @@
      generate_safefetch("SafeFetchN", sizeof(intptr_t), &StubRoutines::_safefetchN_entry,
                                                         &StubRoutines::_safefetchN_fault_pc,
                                                         &StubRoutines::_safefetchN_continuation_pc);
++
 +    if (UseMontgomeryMultiplyIntrinsic) {
 +      StubRoutines::_montgomeryMultiply
 +        = CAST_FROM_FN_PTR(address, SharedRuntime::montgomery_multiply);
@@ -318,9 +319,9 @@ diff --git a/src/cpu/ppc/vm/stubGenerator_ppc.cpp b/src/cpu/ppc/vm/stubGenerator
 +      StubRoutines::_montgomerySquare
 +        = CAST_FROM_FN_PTR(address, SharedRuntime::montgomery_square);
 +    }
-   }
  
-  public:
+     if (UseAESIntrinsics) {
+       StubRoutines::_aescrypt_encryptBlock = generate_aescrypt_encryptBlock();
 diff --git a/src/cpu/ppc/vm/templateInterpreter_ppc.cpp b/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
 --- openjdk/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
 +++ openjdk/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
@@ -352,7 +353,7 @@ diff --git a/src/cpu/ppc/vm/templateInterpreter_ppc.cpp b/src/cpu/ppc/vm/templat
 diff --git a/src/cpu/ppc/vm/vm_version_ppc.cpp b/src/cpu/ppc/vm/vm_version_ppc.cpp
 --- openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
 +++ openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
-@@ -177,6 +177,12 @@
+@@ -201,6 +201,12 @@
      FLAG_SET_DEFAULT(UseSHA512Intrinsics, false);
    }
  
@@ -368,7 +369,7 @@ diff --git a/src/cpu/ppc/vm/vm_version_ppc.cpp b/src/cpu/ppc/vm/vm_version_ppc.c
 diff --git a/src/share/vm/opto/library_call.cpp b/src/share/vm/opto/library_call.cpp
 --- openjdk/hotspot/src/share/vm/opto/library_call.cpp
 +++ openjdk/hotspot/src/share/vm/opto/library_call.cpp
-@@ -6031,11 +6031,21 @@
+@@ -6205,11 +6205,21 @@
      Node* n_start = array_element_address(n, intcon(0), n_elem);
      Node* m_start = array_element_address(m, intcon(0), m_elem);
  
@@ -395,7 +396,7 @@ diff --git a/src/share/vm/opto/library_call.cpp b/src/share/vm/opto/library_call
      set_result(m);
    }
  
-@@ -6085,11 +6095,22 @@
+@@ -6263,11 +6273,22 @@
      Node* n_start = array_element_address(n, intcon(0), n_elem);
      Node* m_start = array_element_address(m, intcon(0), m_elem);
  
@@ -426,7 +427,7 @@ diff --git a/src/share/vm/opto/library_call.cpp b/src/share/vm/opto/library_call
 diff --git a/src/share/vm/opto/runtime.cpp b/src/share/vm/opto/runtime.cpp
 --- openjdk/hotspot/src/share/vm/opto/runtime.cpp
 +++ openjdk/hotspot/src/share/vm/opto/runtime.cpp
-@@ -1005,12 +1005,20 @@
+@@ -1031,12 +1031,20 @@
    // create input type (domain)
    int num_args      = 7;
    int argcnt = num_args;
@@ -448,7 +449,7 @@ diff --git a/src/share/vm/opto/runtime.cpp b/src/share/vm/opto/runtime.cpp
    fields[argp++] = TypeLong::LONG;      // inv
    fields[argp++] = Type::HALF;
    fields[argp++] = TypePtr::NOTNULL;    // result
-@@ -1029,11 +1037,19 @@
+@@ -1055,11 +1063,19 @@
    // create input type (domain)
    int num_args      = 6;
    int argcnt = num_args;

java-1.8.0-openjdk-remove-intree-libraries.sh

@@ -99,6 +99,7 @@ if [ ! -d ${LCMS_SRC} ]; then
 fi
 # temporary change to move bundled LCMS
 if [ ! true ]; then
+rm -vf ${LCMS_SRC}/cmsalpha.c
 rm -vf ${LCMS_SRC}/cmscam02.c
 rm -vf ${LCMS_SRC}/cmscgats.c
 rm -vf ${LCMS_SRC}/cmscnvrt.c

java-1.8.0-openjdk.spec

@@ -204,7 +204,7 @@
 # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
 %global project         aarch64-port
 %global repo            jdk8u
-%global revision        aarch64-jdk8u151-b12
+%global revision        aarch64-jdk8u161-b14
 # eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60  (dont forget spec escape % by %%)
 %global whole_update    %(VERSION=%{revision}; echo ${VERSION%%-*})
 # eg  jdk8u60 -> 60 or aarch64-jdk8u60 -> 60
@@ -937,7 +937,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%{?1}
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 2.%{buildver}%{?dist}
+Release: 0.%{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
@@ -2156,6 +2156,8 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Wed Jan 24 2017 jvanek <jvanek@redhat.com> - 1:1.8.0.161-0.b14
+
 * Mon Nov 13 2017 jvanek <jvanek@redhat.com> - 1:1.8.0.151-1.b12
 - added ownership of etc dirs
 - sysconfdir/.java/.systemPrefs

java-atk-wrapper-security.patch

@@ -1,9 +1,9 @@
 --- jdk8/jdk/src/share/lib/security/java.security-linux.orig
 +++ jdk8/jdk/src/share/lib/security/java.security-linux
-@@ -211,7 +211,9 @@
+@@ -223,7 +223,9 @@
-                jdk.internal.,\
                 jdk.nashorn.internal.,\
                 jdk.nashorn.tools.,\
+                jdk.xml.internal.,\
 -               com.sun.activation.registries.
 +               com.sun.activation.registries.,\
 +               org.GNOME.Accessibility.,\
@@ -11,10 +11,10 @@
  
  #
  # List of comma-separated packages that start with or equal this string
-@@ -258,7 +260,9 @@
+@@ -273,7 +275,9 @@
-                    jdk.internal.,\
                     jdk.nashorn.internal.,\
                     jdk.nashorn.tools.,\
+                    jdk.xml.internal.,\
 -                   com.sun.activation.registries.
 +                   com.sun.activation.registries.,\
 +                   org.GNOME.Accessibility.,\
@@ -22,4 +22,3 @@
  
  #
  # Determines whether this properties file can be appended to
-

pr1834-rh1022017.patch

@@ -1,6 +1,6 @@
-diff --git a/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
+diff --git a/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
---- openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
+--- openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
++++ openjdk/jdk/src/share/classes/sun/security/ssl/EllipticCurvesExtension.java
 @@ -168,20 +168,10 @@
                      "contains no supported elliptic curves");
              }

rh1163501.patch

@@ -1,26 +1,3 @@
-diff --git a/src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java b/src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java
---- openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java
-+++ openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java
-@@ -1,5 +1,6 @@
- /*
-  * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2014 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
-@@ -74,10 +75,10 @@
-     private static void checkKeySize(int keysize)
-             throws InvalidParameterException {
- 
--        if ((keysize < 512) || (keysize > 2048) || ((keysize & 0x3F) != 0)) {
-+        if ((keysize < 512) || (keysize > 4096) || ((keysize & 0x3F) != 0)) {
-             throw new InvalidParameterException(
-                     "DH key size must be multiple of 64, and can only range " +
--                    "from 512 to 2048 (inclusive). " +
-+                    "from 512 to 4096 (inclusive). " +
-                     "The specific key size " + keysize + " is not supported");
-         }
-     }
 diff --git a/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java b/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
 --- openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
 +++ openjdk/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
@@ -31,43 +8,28 @@ diff --git a/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
-@@ -61,11 +62,11 @@
+@@ -61,13 +62,13 @@
  
      private static void checkKeySize(int keysize)
              throws InvalidParameterException {
--            if ((keysize != 2048) &&
+-        boolean supported = ((keysize == 2048) || (keysize == 3072) ||
-+            if ((keysize != 2048) && (keysize != 4096) &&
++        boolean supported = ((keysize == 2048) || (keysize == 3072) || (keysize == 4096) ||
-             ((keysize < 512) || (keysize > 1024) || (keysize % 64 != 0))) {
+             ((keysize >= 512) && (keysize <= 1024) && ((keysize & 0x3F) == 0)));
+ 
+         if (!supported) {
              throw new InvalidParameterException(
                      "DH key size must be multiple of 64 and range " +
--                    "from 512 to 1024 (inclusive), or 2048. " +
+-                    "from 512 to 1024 (inclusive), or 2048, 3072. " +
-+                    "from 512 to 1024 (inclusive), or 2048, or 4096. " +
++                    "from 512 to 1024 (inclusive), or 2048, 3072, 4096. " +
                      "The specific key size " + keysize + " is not supported");
          }
      }
-diff --git a/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java b/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
---- openjdk/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
-@@ -292,11 +292,11 @@
-                     // this restriction is in the spec for DSA
-                     // since we currently use DSA parameters for DH as well,
-                     // it also applies to DH if no parameters are specified
--                    if ((keySize != 2048) &&
-+                    if ((keySize != 2048) && (keySize != 4096) &&
-                         ((keySize > 1024) || ((keySize & 0x3f) != 0))) {
-                         throw new InvalidAlgorithmParameterException(algorithm +
-                             " key must be multiples of 64 if less than 1024 bits" +
--                            ", or 2048 bits. " +
-+                            ", or 2048 bits, or 4096 bits. " +
-                             "The specific key size " +
-                             keySize + " is not supported");
-                     }
 diff --git a/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java b/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
 --- openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
 +++ openjdk/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java
 @@ -1,5 +1,6 @@
  /*
-  * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+  * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
 + * Copyright (c) 2014 Red Hat Inc.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
@@ -101,3 +63,4 @@ diff --git a/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java b/t
          System.out.println("OK");
      }
  
+

sources

@@ -1,3 +1,3 @@
 SHA512 (systemtap-tapset-3.6.0pre02.tar.xz) = d59858bbe9e927bdf47711e3c71c88f93567596aea3e1736b33b436a7a2cb38af25a9b4b4224ca513454b3f2d0371d14e753176c1810d9745a7e4af8edae7fb8
-SHA512 (aarch64-port-jdk8u-aarch64-jdk8u151-b12.tar.xz) = ef8bf4485755ec1c6d229a75dff65cfa17d74b0405f047f7f456bf2004feb985e5558eb66f9ff761aad45b945b0cd47647b41e0be13eb8096ab6e10fae2f47cc
+SHA512 (aarch64-port-jdk8u-aarch64-jdk8u161-b14.tar.xz) = f60836acdf2a38961e1f8299b4c5274f0201a0e365c37f107e8793640f691e6fef9a03daa0172aa192eddab6db86e9ea904aa0da2abd4d5a75aa147af59d715e
-SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u151-b12.tar.xz) = d43fc639ab2a784c4914e32459715bc1eaa891c7a2ee05b911f4955e281cb4b4533e170bbfc593942ee793768526329a3955e592bf4a0be691e56dd9f2f89eca
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u161-b14.tar.xz) = da15dbe6c02233d5c172cf862090f335e499fde97dd3a93cd15d6011b7f27864b1af3c58d3677bcf2aef763c3ca60bc97c2223990133ec4d073e5a93fb969053