Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8305815: Update Libpng to 1.6.39 #373

Closed
wants to merge 1 commit into from

Conversation

martinuy
Copy link
Contributor

@martinuy martinuy commented Sep 14, 2023

Hi all,

This pull request contains a backport of commit c1f759e9d01d646eac69442452151b0467eab306 from the openjdk/jdk11u-dev repository.

This backport is a follow up fix of JDK-8295685.

This backport applied cleanly, except for the changes to the THIRD_PARTY_README files that are specific to 8u.

Thanks!


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/373/head:pull/373
$ git checkout pull/373

Update a local copy of the PR:
$ git checkout pull/373
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/373/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 373

View PR using the GUI difftool:
$ git pr show -t 373

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/373.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 14, 2023

👋 Welcome back mbalao! A progress list of the required criteria for merging this PR into pr/372 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport c1f759e9d01d646eac69442452151b0467eab306 8305815: Update Libpng to 1.6.39 Sep 14, 2023
@openjdk
Copy link

openjdk bot commented Sep 14, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Sep 14, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 14, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Sep 15, 2023

@martinuy Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@martinuy
Copy link
Contributor Author

Thanks @phohensee for your review. I had to rebase after 3fa3cfa in PR 372. Nothing was changed as part of this.

@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8305815
git fetch https://git.openjdk.org/jdk8u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Sep 19, 2023

@martinuy this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8305815
git fetch https://git.openjdk.org/jdk8u-dev.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Sep 19, 2023
@openjdk
Copy link

openjdk bot commented Sep 19, 2023

@martinuy Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@openjdk
Copy link

openjdk bot commented Sep 19, 2023

@martinuy This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8305815: Update Libpng to 1.6.39

Reviewed-by: phh, andrew

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 7 new commits pushed to the master branch:

  • 961ab46: 8283441: C2: segmentation fault in ciMethodBlocks::make_block_at(int)
  • a9e2be4: Merge
  • 05254ef: Merge
  • e74d29d: 8295894: Remove SECOM certificate that is expiring in September 2023
  • 0ee1400: Merge
  • 599bb77: 8225687: Newly added sspi.cpp in JDK-6722928 still contains some small errors
  • ee4caa8: 8029995: accept yes/no for boolean krb5.conf settings

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Sep 19, 2023
Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The GHA failure looks unrelated to me, but please check it out.

@martinuy
Copy link
Contributor Author

The macOS x64 failure (build release) shown in the GHA looks unrelated to me as it happened while compiling hotspot. This backport is not related in any meaningful way to hotspot code.

@phohensee
Copy link
Member

Then you're good to go. I saw the same failure on a few other PRs.

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Approved for 8u.

@martinuy
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 26, 2023

Going to push as commit f4260a4.
Since your change was applied there have been 7 commits pushed to the master branch:

  • 961ab46: 8283441: C2: segmentation fault in ciMethodBlocks::make_block_at(int)
  • a9e2be4: Merge
  • 05254ef: Merge
  • e74d29d: 8295894: Remove SECOM certificate that is expiring in September 2023
  • 0ee1400: Merge
  • 599bb77: 8225687: Newly added sspi.cpp in JDK-6722928 still contains some small errors
  • ee4caa8: 8029995: accept yes/no for boolean krb5.conf settings

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 26, 2023
@openjdk openjdk bot closed this Sep 26, 2023
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Sep 26, 2023
@openjdk openjdk bot removed the rfr Pull request is ready for review label Sep 26, 2023
@openjdk
Copy link

openjdk bot commented Sep 26, 2023

@martinuy Pushed as commit f4260a4.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
3 participants