Closed
Conversation
* Remove CVE-2022-37434.patch since this is now fixed upstream. * Use upstream's new LICENSE file instead of the README file with the license text and a whole lot of other stuff.
Contributor
Author
|
Oops, this duplicates #27226, but without the patch cleanup. Closing (but FYI @BillyONeal in case you want a smaller patch). |
BillyONeal
added a commit
to BillyONeal/vcpkg
that referenced
this pull request
Oct 19, 2022
Member
|
I reviewed this and observe that you also fixed that we weren't installing the correct license, so I replicated that in my PR. Thanks! |
BillyONeal
added a commit
that referenced
this pull request
Oct 25, 2022
…7226) * Don't use external ZLIB_DLL * Update versions * [minizip] Bump to zlib version * Update versions * [libkml] Fix mingw build * [libkml] Modernize * [libkml] Fix minizip dependency * [libkml] No DLL * Update versions * [libkml] Update mingw patch * Update versions * Update versions * [zlib] Update to 1.2.13 This picks up the official fix for CVE-2022-37434. * Cherry pick installing the correct license from #27242 * Update version database. * More version database. * Also update minizip. * Also guard ZLIB_DLL properties for BUILD_SHARED_LIBS. * Version database. * Fix minizip usage. Co-authored-by: Kai Pastor <dg0yt@darc.de>
ooeygui
pushed a commit
to ms-iot/vcpkg
that referenced
this pull request
Jan 20, 2023
…crosoft#27226) * Don't use external ZLIB_DLL * Update versions * [minizip] Bump to zlib version * Update versions * [libkml] Fix mingw build * [libkml] Modernize * [libkml] Fix minizip dependency * [libkml] No DLL * Update versions * [libkml] Update mingw patch * Update versions * Update versions * [zlib] Update to 1.2.13 This picks up the official fix for CVE-2022-37434. * Cherry pick installing the correct license from microsoft#27242 * Update version database. * More version database. * Also update minizip. * Also guard ZLIB_DLL properties for BUILD_SHARED_LIBS. * Version database. * Fix minizip usage. Co-authored-by: Kai Pastor <dg0yt@darc.de>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Describe the pull request
What does your PR fix?
The zlib build currently creates a copyright file with a bunch of extra non-license text. This PR changes this so that only the license text appears in the output copyright file. It also removes a local CVE-2022-37434 patch, since that is fixed upstream in zlib 1.2.13.
Which triplets are supported/not supported? Have you updated the CI baseline?
All.
Does your PR follow the maintainer guide?
Yes.
If you have added/updated a port: Have you run
./vcpkg x-add-version --alland committed the result?Yes.