From 952bfa78b2313ed915b78deccce3329b2b81692e Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Sun, 9 Aug 2020 21:19:31 +0000 Subject: [PATCH] Update to shenandoah-jdk-11.0.9+1 (EA) Switch to EA mode for 11.0.9 pre-release builds. Drop JDK-8247874 backport now applied upstream. JDK-8245832 increases the set of static libraries, so try and include them all with a wildcard. --- .gitignore | 1 + java-11-openjdk.spec | 32 ++++++-------------- jdk8247874-fix_ampersand_in_vm_bug_url.patch | 25 --------------- sources | 2 +- 4 files changed, 12 insertions(+), 48 deletions(-) delete mode 100644 jdk8247874-fix_ampersand_in_vm_bug_url.patch diff --git a/.gitignore b/.gitignore index f8be2c0..112fc16 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ /shenandoah-jdk11-shenandoah-jdk-11.0.8+8-4curve.tar.xz /shenandoah-jdk11-shenandoah-jdk-11.0.8+9-4curve.tar.xz /shenandoah-jdk11-shenandoah-jdk-11.0.8+10-4curve.tar.xz +/shenandoah-jdk11-shenandoah-jdk-11.0.9+1-4curve.tar.xz diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 267eedd..b5b4c63 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -210,7 +210,7 @@ # Used via new version scheme. JDK 11 was # GA'ed in September 2018 => 18.9 %global vendor_version_string 18.9 -%global securityver 8 +%global securityver 9 # buildjdkver is usually same as %%{majorver}, # but in time of bootstrap of next jdk, it is majorver-1, # and this it is better to change it here, on single place @@ -232,7 +232,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 10 +%global buildver 1 %global rpmrelease 1 #%%global tagsuffix "" # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit @@ -250,7 +250,7 @@ # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, # - N%%{?extraver}{?dist} for GA releases -%global is_ga 1 +%global is_ga 0 %if %{is_ga} %global ea_designator "" %global ea_designator_zip "" @@ -833,22 +833,7 @@ exit 0 } %define files_static_libs() %{expand: -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2pkcs11.a -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2pcsc.a -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libnio.a -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libprefs.a -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjava.a -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjli.a -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libnet.a -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjimage.a -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjaas.a -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libfdlibm.a -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2gss.a -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsunec.a -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjsig.a -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libextnet.a -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libverify.a -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libzip.a +%{_jvmdir}/%{sdkdir -- %{?1}}/lib/lib*.a } %define files_javadoc() %{expand: @@ -1140,8 +1125,6 @@ Patch8: s390-8214206_fix.patch # able to be removed once that release is out # and used by this RPM. ############################################# -# JDK-8247874: Replacement in VersionProps.java.template not working when --with-vendor-bug-url contains '&' -Patch9: jdk8247874-fix_ampersand_in_vm_bug_url.patch ############################################# # @@ -1399,7 +1382,6 @@ pushd %{top_level_dir_name} %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 popd # openjdk %patch1000 @@ -1968,6 +1950,12 @@ require "copy_jdk_configs.lua" %changelog +* Sun Aug 09 2020 Andrew Hughes - 1:11.0.9.1-0.1.ea +- Update to shenandoah-jdk-11.0.9+1 (EA) +- Switch to EA mode for 11.0.9 pre-release builds. +- Drop JDK-8247874 backport now applied upstream. +- JDK-8245832 increases the set of static libraries, so try and include them all with a wildcard. + * Tue Jul 28 2020 Severin Gehwolf - 1:11.0.8.10-1 - Disable LTO as this breaks the build. See RHBZ#1861401. diff --git a/jdk8247874-fix_ampersand_in_vm_bug_url.patch b/jdk8247874-fix_ampersand_in_vm_bug_url.patch deleted file mode 100644 index c2d746b..0000000 --- a/jdk8247874-fix_ampersand_in_vm_bug_url.patch +++ /dev/null @@ -1,25 +0,0 @@ -# HG changeset patch -# User sgehwolf -# Date 1592560575 -7200 -# Fri Jun 19 11:56:15 2020 +0200 -# Node ID c523ff594ec50a45cb157cffc93c17e0414c066a -# Parent c17f1a4da248acfe3c1285fe332aea245eb84bb4 -8247874: Replacement in VersionProps.java.template not working when --with-vendor-bug-url contains '&' -Summary: Backports parts of 8223319: Add copyright footer to specs and man pages -Reviewed-by: andrew, phh - -diff --git openjdk.orig/make/common/TextFileProcessing.gmk openjdk/make/common/TextFileProcessing.gmk ---- openjdk.orig/make/common/TextFileProcessing.gmk -+++ openjdk/make/common/TextFileProcessing.gmk -@@ -155,9 +155,10 @@ - # Convert the REPLACEMENTS syntax ( A => B ; C => D ; ...) to a sed command - # line (-e "s/A/B/g" -e "s/C/D/g" ...), basically by replacing '=>' with '/' - # and ';' with '/g" -e "s/', and adjusting for edge cases. -+ # '&' has special meaning in sed so needs to be escaped. - $1_REPLACEMENTS_COMMAND_LINE := $(SED) -e 's$$($1_SEP)$$(subst $$(SPACE);$$(SPACE),$$($1_SEP)g' \ - -e 's$$($1_SEP),$$(subst $$(SPACE)=>$$(SPACE),$$($1_SEP),$$(subst $$(SPACE)=>$$(SPACE);$$(SPACE),$$($1_SEP)$$($1_SEP)g' \ -- -e 's$$($1_SEP),$$(strip $$($1_REPLACEMENTS)))))$$($1_SEP)g' -+ -e 's$$($1_SEP),$$(subst &,\&,$$(strip $$($1_REPLACEMENTS))))))$$($1_SEP)g' - else - # We don't have any replacements, just pipe the file through cat. - $1_REPLACEMENTS_COMMAND_LINE := $(CAT) diff --git a/sources b/sources index 8453ed9..441b5b9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671 -SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.8+10-4curve.tar.xz) = a78914b08fd4b935665a808bd383afa8ee8517454779df0aa1f2d83984cb230b5edff2d7826daaadc0891d3463e49911d90614523d6a42ad430b367a2e33093f +SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.9+1-4curve.tar.xz) = 85a9b5d2a26b1a70bab7a58950238d8b24c050a26ffc6a7b14143cd656840e4aba5a609501a214d4aa5660e8a398dd7886c41a4bce561555b1611e5f547a6dc8