[aarch64-port-dev ] [RFR] 8u151 Upstream Sync

[Andrew Hughes]

On 1 November 2017 at 15:43, Andrew Hughes <gnu.andrew at redhat.com> wrote:
> Hi,
>
> OpenJDK 8 was recently updated with a security update, u151.
>
> This webrev syncs our version of u151 in the aarch64/jdk8u repositories
> with the version released upstream in jdk8u, tagging the result as
> aarch64-jdk8u151-b13.
>
> http://cr.openjdk.java.net/~andrew/aarch64-8/u151.upstream/
>
> To illustrate the actual changes, the merge changesets for each repository
> are also included:
>
> http://cr.openjdk.java.net/~andrew/aarch64-8/u151.upstream/corba/merge.changeset
> http://cr.openjdk.java.net/~andrew/aarch64-8/u151.upstream/jaxp/merge.changeset
> http://cr.openjdk.java.net/~andrew/aarch64-8/u151.upstream/jaxws/merge.changeset
> http://cr.openjdk.java.net/~andrew/aarch64-8/u151.upstream/jdk/merge.changeset
> http://cr.openjdk.java.net/~andrew/aarch64-8/u151.upstream/hotspot/merge.changeset
> http://cr.openjdk.java.net/~andrew/aarch64-8/u151.upstream/langtools/merge.changeset
> http://cr.openjdk.java.net/~andrew/aarch64-8/u151.upstream/nashorn/merge.changeset
> http://cr.openjdk.java.net/~andrew/aarch64-8/u151.upstream/root/merge.changeset
>
> Changes between aarch64-jdk8u151-b12 and: aarch64-jdk8u151-b13:
>   - S8075484: SocketInputStream.socketRead0 can hang even with soTimeout set
>   - S8177837: need to upgrade install tools
>   - S8186674: Remove JDK-8174109 from CPU Aug 21 week builds
>
> 8174109 was applied, reverted (8186674 above) and then re-applied in
> a slightly different form by Oracle. During the CPU, we were supplied with
> the first version rather than the second, which didn't build, and so we fixed
> it locally. Due to this, the jdk merge also includes some changes to
> sync files with the upstream version (primarily the
> restoration of src/share/classes/sun/misc/JavaObjectInputStreamAccess.java,
> which was deleted in the version of 8174109 provided by Oracle).
> We also rollback the remnants of a version of 8154015 that wasn't included
> upstream (documentation changes to
> src/share/classes/sun/security/validator/Validator.java and addition of
> getTimestamp() to
> src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java)
> The merge also brings in test changes we dropped from our version to
> be on the safe side.
>
> After these changes, comparisons of the aarch64/jdk8u repositories with
> 8u151 from upstream show only AArch64 changes.
>
> diffstat:
> Checking root
>  b/.hgtags                                |   13 +++++++++++++
>  b/THIRD_PARTY_README                     |    4 ++--
>  b/common/autoconf/generated-configure.sh |    2 +-
>  3 files changed, 16 insertions(+), 3 deletions(-)
> Checking corba
>  b/.hgtags |   13 +++++++++++++
>  1 file changed, 13 insertions(+)
> Checking jaxp
>  b/.hgtags |   13 +++++++++++++
>  1 file changed, 13 insertions(+)
> Checking jaxws
>  b/.hgtags |   13 +++++++++++++
>  1 file changed, 13 insertions(+)
> Checking langtools
>  b/.hgtags |   13 +++++++++++++
>  1 file changed, 13 insertions(+)
> Checking nashorn
>  b/.hgtags |   13 +++++++++++++
>  1 file changed, 13 insertions(+)
> Checking jdk
>  b/.hgtags
>    |   13 ++
>  b/src/aix/native/java/net/aix_close.c
>    |   19 +--
>  b/src/share/classes/java/io/ObjectInputStream.java
>    |   12 +-
>  b/src/share/classes/java/util/HashMap.java                               |    2
>  b/src/share/classes/sun/misc/JavaOISAccess.java
>    |   10 -
>  b/src/share/classes/sun/misc/JavaObjectInputStreamAccess.java
>    |   41 +++++++
>  b/src/share/classes/sun/misc/SharedSecrets.java
>    |   11 +
>  b/src/share/classes/sun/rmi/server/MarshalInputStream.java               |    2
>  b/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java |    4
>  b/src/share/classes/sun/security/validator/Validator.java
>    |   23 ++-
>  b/src/solaris/native/java/net/SocketInputStream.c
>    |   53 ++++++++-
>  b/src/solaris/native/java/net/bsd_close.c
>    |   13 +-
>  b/src/solaris/native/java/net/linux_close.c
>    |   18 +--
>  b/src/solaris/native/java/net/net_util_md.c
>    |   18 +++
>  b/src/solaris/native/java/net/net_util_md.h
>    |    6 -
>  b/test/java/io/Serializable/serialFilter/SerialFilterTest.java
>    |   10 +
>  b/test/sun/security/krb5/auto/KDC.java
>    |    6 -
>  b/test/sun/security/krb5/auto/TicketSName.java
>    |   58 ++++++++++
>  18 files changed, 255 insertions(+), 64 deletions(-)
> Checking hotspot
>  b/.hgtags |   13 +++++++++++++
>  1 file changed, 13 insertions(+)
>
> Ok to push?
>
> Thanks,
> --
> Andrew :)
>
> Senior Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
>
> Web Site: http://fuseyism.com
> Twitter: https://twitter.com/gnu_andrew_java
> PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net)
> Fingerprint = 5132 579D D154 0ED2 3E04  C5A0 CFDA 0F9B 3596 4222

Ping?
-- 
Andrew :)

Senior Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Web Site: http://fuseyism.com
Twitter: https://twitter.com/gnu_andrew_java
PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net)
Fingerprint = 5132 579D D154 0ED2 3E04  C5A0 CFDA 0F9B 3596 4222