rpms/java-11-openjdk
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sync JDK-8247874 patch with upstream status in 11.0.9.

Browse Source 
Add missing ChangeLog entry from last series of commits.
This commit is contained in:
Andrew Hughes 2020-06-23 16:35:48 +00:00
parent 5ba186239d
commit f3d7a45b43
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
java-11-openjdk.spec
View File

@ -1111,8 +1111,6 @@ Patch6: rh1566890-CVE_2018_3639-speculative_store_bypass.patch
Patch7: pr3695-toggle_system_crypto_policy.patch
# S390 ambiguous log2_intptr call
Patch8: s390-8214206_fix.patch
# Replacement in VersionProps.java.template not working when --with-vendor-bug-url contains '&'
Patch9: jdk8247874-fix_ampersand_in_vm_bug_url.patch
#############################################
#
@ -1124,6 +1122,18 @@ Patch9: jdk8247874-fix_ampersand_in_vm_bug_url.patch
# and used by this RPM.
#############################################
#############################################
#
# Patches appearing in 11.0.9
#
# This section includes patches which are present
# in the listed OpenJDK 11u release and should be
# 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
#############################################
#
# JDK 9+ only patches
@ -1944,9 +1954,16 @@ require "copy_jdk_configs.lua"
%changelog
* Tue Jun 23 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.8.5-0.2.ea
- Sync JDK-8247874 patch with upstream status in 11.0.9.
- Add missing ChangeLog entry from last series of commits.
* Mon Jun 22 2020 Jayashree Huttanagoudar <jhuttana@redhat.com> - 1:1.0.8.5-0.2.ea
- Added a patch jdk8247874-fix_ampersand_in_vm_bug_url.patch
* Thu Jun 18 2020 Jayashree Huttanagoudar <jhuttana@redhat.com> - 1:1.0.8.5-0.2.ea
- Moved vendor_version_string to better place
* Thu Jun 18 2020 Jiri Vanek <jvanek@redhat.com> - 1:11.0.8.5-0.2.ea
- set vendor property and vendor urls
- made urls to be preconfigured by os

17
jdk8247874-fix_ampersand_in_vm_bug_url.patch
View File

@ -1,8 +1,17 @@
diff --git openjdk.orig/make/common/TextFileProcessing.gmk openjdk/make/common/TextFileProcessing.gmk.bkp
index de6ca5c..04bd9e5 100644
# 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.bkp
@@ -155,9 +155,10 @@ define SetupTextFileProcessingBody
+++ 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.