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
8295530: Update Zlib Data Compression Library to Version 1.2.13 #277
Conversation
Signed-off-by: Stewart X Addison <sxa@redhat.com>
👋 Welcome back sxa! A progress list of the required criteria for merging this PR into |
This backport pull request has now been updated with issue from the original commit. |
Webrevs
|
@sxa 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. |
(Note to anyone reading the previous automated comment - the force push only changed the ChangeLog_Java file which was changed on my local file system but hadn't been pushed so shouldn't invalidate anything else above) |
@sxa Please enable testing on your fork. See |
Done - and seems to have passed :-) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changes made to zlib.md
in the 11u patch need to be made to THIRD_PARTY_README
in 8u.
There are currently multiple identical copies of this file across the old subrepositories. I would suggest just updating the top-level one. I'll open a separate bug & PR to remove the duplicates which I don't think are helpful any more.
$ grep 'zlib' $(find -name 'THIRD_PARTY_README')
./THIRD_PARTY_README:%% This notice is provided with respect to zlib v1.2.11, which may be included
./corba/THIRD_PARTY_README:%% This notice is provided with respect to zlib v1.2.11, which may be included
./hotspot/THIRD_PARTY_README:%% This notice is provided with respect to zlib v1.2.11, which may be included
./jaxp/THIRD_PARTY_README:%% This notice is provided with respect to zlib v1.2.11, which may be included
./jaxws/THIRD_PARTY_README:%% This notice is provided with respect to zlib v1.2.11, which may be included
./jdk/THIRD_PARTY_README:%% This notice is provided with respect to zlib v1.2.11, which may be included
./langtools/THIRD_PARTY_README:%% This notice is provided with respect to zlib v1.2.11, which may be included
./nashorn/THIRD_PARTY_README:%% This notice is provided with respect to zlib v1.2.11, which may be included
Signed-off-by: Stewart X Addison <sxa@redhat.com>
Thanks - top level one updated to match the current contents at https://www.zlib.net/zlib_license.html (including the initial line containing the version number to be consistent with how it was before). The rest of the text matches what's in |
Signed-off-by: Stewart X Addison <sxa@redhat.com>
Is there still sufficient runway to get this into 8u372? |
I was wondering what your intention was here when I first reviewed it. Integrating this PR will include it in 8u382. We're still taking critical fixes and regression patches for 8u372 for the next few weeks (https://wiki.openjdk.org/display/jdk8u/Main), directly against https://github.com/openjdk/jdk8u Does this qualify? It's quite a large change to be making at that stage and I'd prefer it went into 8u382. |
Patch now looks good, by the way. I'm just holding off until we decide whether this is the right tree to push to. |
+1 It seems |
The CVE referenced in the description was raised by a customer about JDK17 where it was flagged by the BDBA scanner |
I tend to agree it would be better to do this across all JDKs at the same time, but, as explained in e-mail, I'll let Severin have the final ok on this. If we do move it to 8u372, just close this PR and open the same changes against openjdk/jdk8u instead. |
I'm thinking this should be fine for 8u382 in July. Which platforms does in-tree zlib affect, Windows only? |
For Eclipse Temurin we're using |
Based on the above discussions targetting 8u382 sounds good to me, so are ok to get this tagged appropriately so it can be integrated? (I don't have author privileges so can't tag it myself) |
Also verified with the tier 1 suites on AIX and Solaris x64 and SPARC with this patch on top of the jdk8u codebase which has an additional fix in. No new regressions introduced. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks OK. I've tagged the bug and let @gnu-andrew approve it. Once that's done feel free to integrate.
@sxa This change now passes all automated pre-integration checks. After integration, the commit message for the final commit will be:
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 13 new commits pushed to the
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. As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@gnu-andrew, @jerboaa) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
@gnu-andrew Are you happy to add the fix yes tag to the bug for this to go into 8u382? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry for the delay in getting back to this, I was away last week.
I'm happier with it being for 8u382 and will approve. Patch itself looks fine with the THIRD_PARTY_README
changes now included.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry for the delay in getting back to this, I was away last week.
I'm happier with it being for 8u382 and will approve. Patch itself looks fine with the THIRD_PARTY_README
changes now included.
Bug approved. If you want to do |
/integrate |
/sponsor |
Going to push as commit 5dc33f2.
Your commit was automatically rebased without conflicts. |
As per openjdk/jdk11u-dev#1788 which backported this to 11.
Backporting zlib 1.2.13 due to https://nvd.nist.gov/vuln/detail/CVE-2022-37434 (9.8 CVSS score)
As per the JDK11u change this makes the zlib directory in the source identical to the one for JDK17u so I do not anticipate any problems.
I've run a test build on one Linux/mac/windows version and will run the same set of tier1 testing that I did on the 11 PR, plus some others. I'll probably try to run on some other platforms before requesting an integrate, but I'll also need a sponsor to add the appropriate tags to JDK-8295530 so I'm opening this now.
This is the first time I've backported to 8 with skara - I'm assuming the process is now the same as 11. If not, please let me know and I will adjust accordingly.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/277/head:pull/277
$ git checkout pull/277
Update a local copy of the PR:
$ git checkout pull/277
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/277/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 277
View PR using the GUI difftool:
$ git pr show -t 277
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/277.diff