From d30d552aeb160b7c29be108d2124832b30505307 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Wed, 4 Oct 2017 19:03:21 +0200
Subject: [PATCH] - updated to
 aarch64-shenandoah-jdk8u144-b02-shenandoah-merge-2017-10-02 (from
 aarch64-port/jdk8u-shenandoah) of hotspot

---
 .gitignore              |  1 +
 bug1484079.patch        | 11 +++++++++++
 java-1.8.0-openjdk.spec | 14 ++++++++++++--
 sources                 |  2 +-
 update_package.sh       |  2 +-
 5 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 bug1484079.patch

diff --git a/.gitignore b/.gitignore
index 1be7b07..97d782d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,3 +92,4 @@
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u141-b16.tar.xz
 /aarch64-port-jdk8u-aarch64-jdk8u144-b01.tar.xz
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u144-b01.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u144-b02-shenandoah-merge-2017-10-02.tar.xz
diff --git a/bug1484079.patch b/bug1484079.patch
new file mode 100644
index 0000000..2cb1239
--- /dev/null
+++ b/bug1484079.patch
@@ -0,0 +1,11 @@
+diff -r e96c4a40fdf9 src/solaris/native/sun/awt/fontpath.c
+--- openjdk/jdk/src/solaris/native/sun/awt/fontpath.c	Wed Aug 23 14:14:49 2017 -0400
++++ openjdk/jdk/src/solaris/native/sun/awt/fontpath.c	Thu Aug 24 12:14:41 2017 -0400
+@@ -1239,6 +1239,7 @@
+                 && (strcmp((char*)fontformat, "TrueType") != 0)
+ #if defined(__linux__) || defined(_AIX)
+                 && (strcmp((char*)fontformat, "Type 1") != 0)
++                && (strcmp((char*)fontformat, "CFF") != 0)
+ #endif
+              ) {
+                 continue;
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 33c09cf..1f1791f 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -933,7 +933,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%{?1}
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 6.%{buildver}%{?dist}
+Release: 7.%{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
@@ -959,7 +959,7 @@ URL:      http://openjdk.java.net/
 Source0: %{project}-%{repo}-%{revision}.tar.xz
 
 # Shenandoah HotSpot
-Source1: aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u144-b01.tar.xz
+Source1: aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u144-b02-shenandoah-merge-2017-10-02.tar.xz
 
 # Custom README for -src subpackage
 Source2:  README.src
@@ -1105,6 +1105,8 @@ Patch533: rh1367357.patch
 Patch534: always_assumemp.patch
 # PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
 Patch539: pr2888.patch
+# test patch for rhbz#1484079
+Patch540: bug1484079.patch
 
 # Non-OpenJDK fixes
 Patch1000: enableCommentedOutSystemNss.patch
@@ -1497,6 +1499,7 @@ sh %{SOURCE12}
 %patch525
 %patch533
 %patch539
+%patch540
 
 # RHEL-only patches
 %if ! 0%{?fedora} && 0%{?rhel} <= 7
@@ -2126,6 +2129,13 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Wed Oct 04 2017 jvanek <jvanek@redhat.com> - 1:1.8.0.144-7.b01
+- updated to aarch64-shenandoah-jdk8u144-b02-shenandoah-merge-2017-10-02 (from aarch64-port/jdk8u-shenandoah) of hotspot
+- used aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u144-b02-shenandoah-merge-2017-10-02.tar.xz as new sources for hotspot
+
+* Fri Sep 15 2017 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.144-6.b01
+- added patch540, bug1484079.patch
+
 * Fri Sep 08 2017 Troy Dawson <tdawson@redhat.com> - 1:1.8.0.144-6.b01
 - Cleanup spec file conditionals
 
diff --git a/sources b/sources
index 467a662..15bfc44 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (systemtap-tapset-3.4.0pre01.tar.xz) = 4446fa20f88bbce53b583484bf06cb2b476c9372beb898dc2b7739eaa5c98b9979fbd72e12474fb344833d831a19366b82216ee03b452411745e6cd3527faa4e
 SHA512 (aarch64-port-jdk8u-aarch64-jdk8u144-b01.tar.xz) = dbad1a2a4b58606d2aaaf2124b917362b883b1a5f43eb06c33f8c9b5e5de7cfb00926d39efb6b10fd59792d140302640f8ec2d6b45839e80e3f42a3d027932ad
-SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u144-b01.tar.xz) = 8330d8864f860c54705ec72caefd8e02a0d75bc435ec3c8b10a4c96825155d0473617caa7dde45042211f3c1151042d419853eed3514032e8d71333ed14eebc1
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u144-b02-shenandoah-merge-2017-10-02.tar.xz) = f5ab210f1e83b5588aed0c671b2d17ae85c3f52b0b9fdd1394c63393b3206dae0c3d0dc5f4e62f7de68dbcffc72776969e5c2e04d51dba604925fa4bfef105e2
diff --git a/update_package.sh b/update_package.sh
index db067ca..9dec8fb 100755
--- a/update_package.sh
+++ b/update_package.sh
@@ -109,7 +109,7 @@ if [ "x$VERSION" = "xtip" ] ; then
     VERSION="tip"
 else
 	#hardcoding version for anything else except tip
-    VERSION="aarch64-shenandoah-jdk8u144-b01"
+    VERSION="aarch64-shenandoah-jdk8u144-b02-shenandoah-merge-2017-10-02"
 fi
 MAIN_REPO_NAME=$REPO_NAME
 REPO_NAME=jdk8u-shenandoah