Revert Update Harfbuzz to 7.0.1 #683
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
3319f31 is already in the v0.40.0-release branch. |
Port the following to resolve CVE-2023-25193 harfbuzz/harfbuzz@8708b9e harfbuzz/harfbuzz@64fa5cd harfbuzz/harfbuzz@c67c008 harfbuzz/harfbuzz@7ec1c41 harfbuzz/harfbuzz@c15efde harfbuzz/harfbuzz@42681bd harfbuzz/harfbuzz@0c70bc7 harfbuzz/harfbuzz@b29fbd1 Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
|
Keith said, you can see the changes are missing when comparing against the 0.38 release branch. I cherry picked the change and added it. |
You're right: The v0.40.0-release branch is currently at 20e0e53 and $ git merge-base --is-ancestor 3319f3173433e376e3d799b0dbb7ba8e0d70398d 20e0e5315796df31dbe6c69e5681b0a4d240ed2c && echo yes
yesI think that change was lost via a merge that accepted 1a36154 verbatim. |
|
Jenkins compile aix jdk11 depends eclipse-openj9/openj9#v0.40.0-release eclipse-openj9/openj9-omr#v0.40.0-release |
|
jdk_imageio testing at https://openj9-jenkins.osuosl.org/view/Test/job/Grinder/2584/ |
keithc-ca
approved these changes
Jul 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue eclipse-openj9/openj9#17759