8324632: Update Zlib Data Compression Library to Version 1.3.1 #511

fitzsim · 2024-06-04T14:12:53Z

8315117: Update Zlib Data Compression Library to Version 1.3
8326351: Update the Zlib version in THIRD_PARTY_README to 1.3.1

Backport-of: 6aa721649d870354a79c3508343b14222e0edcfb

I am filing this pull request now mainly to register that I am working on this backport. Some of the sanity checks have already failed on package download issues; I will try re-running them and otherwise investigating how to fix them.

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
JDK-8326351 needs maintainer approval
JDK-8324632 needs maintainer approval
JDK-8315117 needs maintainer approval

Issues

JDK-8324632: Update Zlib Data Compression Library to Version 1.3.1 (Enhancement - P4 - Approved)
JDK-8315117: Update Zlib Data Compression Library to Version 1.3 (Enhancement - P4 - Approved)
JDK-8326351: Update the Zlib version in open/src/java.base/share/legal/zlib.md to 1.3.1 (Bug - P4 - Approved)

Reviewers

Severin Gehwolf (@jerboaa - Reviewer)
Andrew John Hughes (@gnu-andrew - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 511

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

Using diff file

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

Webrev

Link to Webrev Comment

8315117: Update Zlib Data Compression Library to Version 1.3 8326351: Update the Zlib version in THIRD_PARTY_README to 1.3.1 Backport-of: 6aa721649d870354a79c3508343b14222e0edcfb

bridgekeeper · 2024-06-04T14:13:14Z

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

fitzsim · 2024-06-04T14:25:59Z

Other than path differences and license changes in zlib.md in 11 versus THIRD_PARTY_README in 8, the changes applied cleanly.

fitzsim · 2024-06-04T14:31:04Z

I guess the Debian s390x and ppc64le sanity check jobs could be updated from buster to bullseye, since these URLs 404:

http://httpredir.debian.org/debian/dists/buster/main/binary-s390x/Packages
http://httpredir.debian.org/debian/dists/buster/main/binary-ppc64el/Packages

whereas these exist:

http://httpredir.debian.org/debian/dists/bullseye/main/binary-s390x/Packages.gz
http://httpredir.debian.org/debian/dists/bullseye/main/binary-ppc64el/Packages.gz

fitzsim · 2024-06-04T15:07:08Z

For the Windows x86 failures, this URL 404s:

https://debian.fmi.uni-sofia.bg/~aangelov/VS2010Express1.iso

This seems like a good substitute:

https://archive.org/download/vs-2010-express-1/VS2010Express1.iso

I confirmed the SHA256 hash matches the value expected by the environment variable in the script, a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b.

fitzsim · 2024-06-04T15:10:05Z

The archive.org download is slow, and 700 MiB is a lot to pull from archive.org on every job run. So caching this file somewhere closer (network-wise) to the builder would be nice. However, from my reading about GHA caches, they are per-branch, so the file would be redownloaded once per pull request anyway.

fitzsim · 2024-06-04T15:31:48Z

The same new missing/out-of-date certificate failure happened on Linux x64 (jdk/tier1), Linux x86 (jdk/tier1), Windows x64 (jdk/tier1), and macOS x64 (jdk/tier1), but this seems unrelated to the backport:

security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliasonerarootcav1

zzambers · 2024-06-04T16:01:07Z

For the Windows x86 failures, this URL 404s:

https://debian.fmi.uni-sofia.bg/~aangelov/VS2010Express1.iso

This seems like a good substitute:

https://archive.org/download/vs-2010-express-1/VS2010Express1.iso

I confirmed the SHA256 hash matches the value expected by the environment variable in the script, a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b.

It used to be web.archive.org, but that one was not reliable and caused failures from time to time. So I have changed it in JDK-8301122 to link found in winetricks. But that one seems dead now.. :(

fitzsim · 2024-06-04T16:08:39Z

Darn, I forgot to change the PR title to "Backport 6aa721649d870354a79c3508343b14222e0edcfb"; I just changed it now. I will see if the bot notices and adds the "backport" tag, otherwise I will look into the SKARA backport command, or look at labelling it manually.

fitzsim · 2024-06-04T16:16:01Z

/backport

openjdk · 2024-06-04T16:22:51Z

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

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

8324632: Update Zlib Data Compression Library to Version 1.3.1
8315117: Update Zlib Data Compression Library to Version 1.3
8326351: Update the Zlib version in open/src/java.base/share/legal/zlib.md to 1.3.1

Reviewed-by: sgehwolf, 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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 (@jerboaa, @gnu-andrew) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

openjdk · 2024-06-04T16:23:57Z

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

fitzsim · 2024-06-04T16:28:16Z

/approval 8324632 request This is an almost-clean backport from 11 and passes jdk_tier1 zip tests.

fitzsim · 2024-06-04T16:29:12Z

/approval 8315117 request This is an almost-clean backport from 11 and passes jdk_tier1 zip tests.

fitzsim · 2024-06-04T16:29:45Z

/approval 8326351 request This is an almost-clean backport from 11 and passes jdk_tier1 zip tests.

mlbridge · 2024-06-04T16:34:43Z

Webrevs

openjdk · 2024-06-04T16:38:43Z

@fitzsim To use the /backport command, you need to be in the OpenJDK census and your GitHub account needs to be linked with your OpenJDK username (how to associate your GitHub account with your OpenJDK username).

openjdk · 2024-06-04T16:49:44Z

@fitzsim
8324632: The approval request has been created successfully.

openjdk · 2024-06-04T16:51:14Z

@fitzsim
8315117: The approval request has been created successfully.

openjdk · 2024-06-04T16:52:40Z

@fitzsim
8326351: The approval request has been created successfully.

jerboaa

For JDK 8 there are other THIRD_PARTY_README files which would need the same treatment as the top-level-one:

$ find -name THIRD_PARTY_README | grep -v build/
./jaxp/THIRD_PARTY_README
./corba/THIRD_PARTY_README
./nashorn/THIRD_PARTY_README
./langtools/THIRD_PARTY_README
./hotspot/THIRD_PARTY_README
./jaxws/THIRD_PARTY_README
./THIRD_PARTY_README
./jdk/THIRD_PARTY_README

I'd suggest to fix the top level one and then apply the same patch to others. Note that the previous update of zlib to 1.2.13 didn't include the other THIRD_PARTY_README changes.

jerboaa · 2024-06-05T12:04:32Z

THIRD_PARTY_README

@@ -3043,14 +3043,14 @@ performance, or use of this material.

 -------------------------------------------------------------------------------

-%% This notice is provided with respect to zlib v1.2.13, which may be included 
+%% This notice is provided with respect to zlib v1.3.1, which may be included 


There is a trailing space after included. Please remove.

Done. There is trailing whitespace throughout the THIRD_PARTY_README files, which I left alone, but given that I was changing this line anyway, it is a good opportunity to remove this occurrence.

jerboaa · 2024-06-05T12:09:31Z

THIRD_PARTY_README

 with JRE 8, JDK 8, and OpenJDK 8.

 --- begin of LICENSE ---

-  version 1.2.13, October 13th, 2022
+  version 1.3.1, October 13th, 2022


1.3.1 got released on January 22, 2024. We should use that date.

Fix pushed.

fitzsim · 2024-06-05T13:05:49Z

Note that the previous update of zlib to 1.2.13 didn't include the other THIRD_PARTY_README changes.

Darn, that's why I missed it; I grep'd for "1.2.13", sorry. Will fix.

…DME files

jerboaa · 2024-06-05T16:13:42Z

OK, thank you for filing that. Has it been seen on master, 21, etc., or just 8?

JDK head (currently 23) and probably all earlier releases.

jerboaa · 2024-06-05T16:14:48Z

Hmm, the "rfr" label is still there; I will watch to make sure the bot removes that....

My understanding of the rfr label is that it's mirroring the GH comments to the mailing lists. That's it.

jerboaa · 2024-06-11T08:33:05Z

@fitzsim Please merge master. This should have some of the test failures fixed and probably will only have sslroot* cacerts issues left. Tracked in https://bugs.openjdk.org/browse/JDK-8333788 Thanks!

jerboaa · 2024-06-11T08:33:46Z

/approve yes

openjdk · 2024-06-11T08:34:56Z

@jerboaa
8324632: The approval request has been approved.
8315117: The approval request has been approved.
8326351: The approval request has been approved.

fitzsim · 2024-06-11T11:30:29Z

/integrate

openjdk · 2024-06-11T11:31:50Z

@fitzsim
Your change (at version ab03543) is now ready to be sponsored by a Committer.

fitzsim · 2024-06-11T11:41:35Z

Oh, misinterpreted "merge master" as a request to integrate; will try to get the tests rerun later today.

fitzsim · 2024-06-11T11:43:07Z

OK, merged master, tests are running.

fitzsim · 2024-06-11T13:01:26Z

Please merge master. This should have some of the test failures fixed and probably will only have sslroot* cacerts issues left. Tracked in https://bugs.openjdk.org/browse/JDK-8333788 Thanks!

Correct, only sslroot* cacerts issues left. I was thinking of volunteering for JDK-8333788 (replaced by JDK-8333640) but it looks like it is being taken care of by someone with relationships with the certificate authorities.

fitzsim · 2024-06-11T14:05:02Z

/integrate

fitzsim · 2024-06-11T14:05:59Z

Looks like the bot removed the sponsor label post-merge; I re-issued the integrate command.

openjdk · 2024-06-11T14:06:25Z

@fitzsim
Your change (at version aaef805) is now ready to be sponsored by a Committer.

gnu-andrew

Backport looks good. Thanks for duplicating the change to all the THIRD_PARTY_README files. It appears only the one in jdk makes the final image, so once this change is in, I'll check that they are all actually the same and remove the duplicates to spare future changes this duplication.

In 9, they were removed by JDK-8169925 which replaced them with the .md legal files. They made some sense in 8u when there were multiple Mercurial subrepositories but everything has been in one Git repository for over two years now.

gnu-andrew · 2024-06-12T19:27:00Z

@fitzsim To use the /backport command, you need to be in the OpenJDK census and your GitHub account needs to be linked with your OpenJDK username (how to associate your GitHub account with your OpenJDK username).

This command is used on commits to automatically generate a backport. You don't need it if you have already created the backport yourself. It is unlikely to work for 8u anyway, due to the different paths.

gnu-andrew · 2024-06-12T19:27:23Z

/approval 8324632 request This is an almost-clean backport from 11 and passes jdk_tier1 zip tests.

You should be able to leave out the bug ID and just issue this once.
e.g. #390 (comment)

gnu-andrew · 2024-06-12T19:31:21Z

/sponsor

openjdk · 2024-06-12T19:32:01Z

Going to push as commit 0357abb.

openjdk · 2024-06-12T19:32:11Z

@gnu-andrew @fitzsim Pushed as commit 0357abb.

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

8324632: Update Zlib Data Compression Library to Version 1.3.1

6fb3445

8315117: Update Zlib Data Compression Library to Version 1.3 8326351: Update the Zlib version in THIRD_PARTY_README to 1.3.1 Backport-of: 6aa721649d870354a79c3508343b14222e0edcfb

fitzsim changed the title ~~8324632: Update Zlib Data Compression Library to Version 1.3.1~~ Backport 6aa721649d870354a79c3508343b14222e0edcfb Jun 4, 2024

openjdk bot changed the title ~~Backport 6aa721649d870354a79c3508343b14222e0edcfb~~ 8324632: Update Zlib Data Compression Library to Version 1.3.1 Jun 4, 2024

openjdk bot added the backport label Jun 4, 2024

openjdk bot added the rfr Pull request is ready for review label Jun 4, 2024

openjdk bot added the approval label Jun 4, 2024

jerboaa suggested changes Jun 5, 2024

View reviewed changes

fitzsim added 3 commits June 5, 2024 09:08

THIRD_PARTY_README: Fix zlib 1.3.1 release date

7f6c5f2

Remove trailing space in zlib THIRD_PARTY_README notices

bc9b797

Update zlib version and release date in non-top-level THIRD_PARTY_REA…

59eaaed

…DME files

openjdk bot added ready Pull request is ready to be integrated and removed approval labels Jun 11, 2024

openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 11, 2024

Merge branch 'openjdk:master' into backport-zlib-1.3.1-update

aaef805

openjdk bot removed the sponsor Pull request is ready to be sponsored label Jun 11, 2024

openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 11, 2024

gnu-andrew approved these changes Jun 12, 2024

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jun 12, 2024

openjdk bot closed this Jun 12, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jun 12, 2024

8324632: Update Zlib Data Compression Library to Version 1.3.1 #511

8324632: Update Zlib Data Compression Library to Version 1.3.1 #511

Conversation

fitzsim commented Jun 4, 2024 • edited by openjdk bot Loading

Progress

Issues

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Jun 4, 2024

fitzsim commented Jun 4, 2024 • edited Loading

fitzsim commented Jun 4, 2024

fitzsim commented Jun 4, 2024

fitzsim commented Jun 4, 2024

fitzsim commented Jun 4, 2024

zzambers commented Jun 4, 2024

fitzsim commented Jun 4, 2024

fitzsim commented Jun 4, 2024

openjdk bot commented Jun 4, 2024 • edited Loading

openjdk bot commented Jun 4, 2024

fitzsim commented Jun 4, 2024

fitzsim commented Jun 4, 2024

fitzsim commented Jun 4, 2024

mlbridge bot commented Jun 4, 2024 • edited Loading

Webrevs

openjdk bot commented Jun 4, 2024

openjdk bot commented Jun 4, 2024

openjdk bot commented Jun 4, 2024

openjdk bot commented Jun 4, 2024

jerboaa left a comment • edited Loading

Choose a reason for hiding this comment

jerboaa Jun 5, 2024

Choose a reason for hiding this comment

fitzsim Jun 5, 2024

Choose a reason for hiding this comment

jerboaa Jun 5, 2024

Choose a reason for hiding this comment

fitzsim Jun 5, 2024

Choose a reason for hiding this comment

fitzsim commented Jun 5, 2024

jerboaa commented Jun 5, 2024

jerboaa commented Jun 5, 2024

jerboaa commented Jun 11, 2024

jerboaa commented Jun 11, 2024

openjdk bot commented Jun 11, 2024

fitzsim commented Jun 11, 2024

openjdk bot commented Jun 11, 2024

fitzsim commented Jun 11, 2024

fitzsim commented Jun 11, 2024

fitzsim commented Jun 11, 2024

fitzsim commented Jun 11, 2024

fitzsim commented Jun 11, 2024

openjdk bot commented Jun 11, 2024

gnu-andrew left a comment

Choose a reason for hiding this comment

gnu-andrew commented Jun 12, 2024

gnu-andrew commented Jun 12, 2024 • edited Loading

gnu-andrew commented Jun 12, 2024

openjdk bot commented Jun 12, 2024

openjdk bot commented Jun 12, 2024

fitzsim commented Jun 4, 2024 •

edited by openjdk bot

Loading

fitzsim commented Jun 4, 2024 •

edited

Loading

openjdk bot commented Jun 4, 2024 •

edited

Loading

mlbridge bot commented Jun 4, 2024 •

edited

Loading

jerboaa left a comment •

edited

Loading

gnu-andrew commented Jun 12, 2024 •

edited

Loading