From 41018aa9510f085ba7bb87fee952d0d6eaa3bd17 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 4 Sep 2018 16:45:58 +0200
Subject: [PATCH] moved to +28

---
 .gitignore                          |  1 +
 README.md                           |  1 +
 RHBZ-1565658-system-nss-SunEC.patch |  9 +++++++--
 java-11-openjdk.spec                | 22 +++++++++++++++++-----
 sources                             |  2 +-
 update_package.sh                   |  2 +-
 6 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index ba53645..26b9264 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
 /shenandoah-jdk11-b516c8c7a0a4.tar.xz
 /shenandoah-jdk11-shenandoah-jdk-11+22.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11+28.tar.xz
diff --git a/README.md b/README.md
index 46f788b..00cae68 100644
--- a/README.md
+++ b/README.md
@@ -6,3 +6,4 @@ JDK11 is last LTS release of Java platform. It is bringing many cool improvement
 See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html
 See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf
 
+https://fedoraproject.org/wiki/Changes/java-11-openjdk-TechPreview
diff --git a/RHBZ-1565658-system-nss-SunEC.patch b/RHBZ-1565658-system-nss-SunEC.patch
index 26df349..42ce7cd 100644
--- a/RHBZ-1565658-system-nss-SunEC.patch
+++ b/RHBZ-1565658-system-nss-SunEC.patch
@@ -94,8 +94,13 @@ diff --git a/make/lib/Lib-jdk.crypto.ec.gmk b/make/lib/Lib-jdk.crypto.ec.gmk
    $(eval $(call SetupJdkLibrary, BUILD_LIBSUNEC, \
        NAME := sunec, \
        TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-@@ -58,6 +64,7 @@
-       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
+@@ -47,9 +52,11 @@
+       CXXFLAGS := $(BUILD_LIBSUNEC_CXXFLAGS_JDKLIB), \
+       DISABLED_WARNINGS_gcc := sign-compare implicit-fallthrough, \
+       DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \
+-      LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
++      LDFLAGS := $(subst -Xlinker --as-needed,, \
++                 $(subst -Wl$(COMMA)--as-needed,, $(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK), \
        LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
        LIBS := $(LIBCXX), \
 +      LIBS_linux := -lc $(NSS_LIBS), \
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index a9e3ec7..9974e76 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -196,7 +196,7 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global minorver        0
-%global buildver        22
+%global buildver        28
 # priority must be 7 digits in total
 # setting to 1, so debug ones can have 0
 %global priority        00000%{minorver}1
@@ -499,7 +499,9 @@ exit 0
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/unpack200
 %dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
+%ifarch %{jit_arches}
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
+%endif
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jrt-fs.jar
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/modules
@@ -546,12 +548,9 @@ exit 0
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libunpack.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libverify.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libzip.so
-# Zero does not have JFR
-%ifarch %{jit_arches}
 %dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/default.jfc
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc
-%endif
 %{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
 %{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1*
 %{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
@@ -835,7 +834,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
 
 Name:    java-%{javaver}-%{origin}
 Version: %{newjavaver}.%{buildver}
-Release: 7%{?dist}
+Release: 2%{?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
@@ -1724,6 +1723,19 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Thu Sep 4 2018 Jiri Vanek <jvanek@redhat.com> - 1:11.0.ea.28-2
+- jfr/*jfc files listed for all arches
+- lib/classlist do not exists s390, ifarch-ed via jit_arches out
+
+* Fri Aug 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.ea.28-1
+- Update to latest upstream build jdk11+28, the first release
+  candidate.
+
+* Wed Aug 29 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.ea.22-8
+- Adjust system NSS patch, RHBZ-1565658-system-nss-SunEC.patch, so
+  as to filter -Wl,--as-needed from linker flags. Fixes FTBFS issue.
+  Resolves: RHBZ#1623437
+
 * Thu Aug 23 2018 Jiri Vanek <jvanek@redhat.com> - 1:11.0.ea.22-6
 - dissabled accessibility, fixed provides for main package's debug variant
 
diff --git a/sources b/sources
index 210f6a4..104c218 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
-SHA512 (shenandoah-jdk11-shenandoah-jdk-11+22.tar.xz) = 26b21be95d7302a4cf4afc63a0edc59ba3829303985654b5b6148a54f0bd6a36685463ccca86ed68f7498bfd8e7bec270e67210747e15b2d44105f4f00e48aa6
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11+28.tar.xz) = 4ca6a69cb1b67dd6749861de5f49e50a43c9c7a6100d4b55c722960fec90bb280dc995be7d76e9b2d4519ce0d8fef54c25be8e9b33b80d6c6ec9130ef166e4ee
diff --git a/update_package.sh b/update_package.sh
index ced9ef2..7b47a26 100644
--- a/update_package.sh
+++ b/update_package.sh
@@ -35,7 +35,7 @@ fi
 export PROJECT_NAME="shenandoah"
 export REPO_NAME="jdk11"
 # warning, clonning without shenadnaoh suffix, you will clone pure jdk - thus without shenandaoh GC
-export VERSION="shenandoah-jdk-11+22"
+export VERSION="shenandoah-jdk-11+28"
 export COMPRESSION=xz
 # unset tapsets overrides
 export OPENJDK_URL=""