zlib/minizip: Update to version 1.2.13, remove zlib from freetype #69395
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
|
Looks good, but indeed it would be better to have zlib and minizip in the same commit, as they're part of the same codebase. |
akien-mga
added
cherrypick:3.x
|
For the record, this is a security update:
|
Security update, fixes CVE-2022-37434 in zlib. Only applications exposing/using `inflateGetHeader()` seem to be affected, which is not our case, so this is not critical for Godot. Remove duplicated copy of zlib in freetype sources to force using the updated version in `thirdparty/zlib/`. Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
akien-mga
changed the title
|
Pushed an update to sync minizip with the zlib 1.2.13 code. The security vulnerability doesn't seem to affect our usage but it's worth patching anyway. I also removed the vendored copy of zlib from |
akien-mga
approved these changes
Jan 7, 2023
|
Thanks! |
|
Cherry-picked for 3.6. |
akien-mga
removed
the
cherrypick:3.x
|
Cherry-picked for 3.5.2. |
akien-mga
removed
the
cherrypick:3.5
akien-mga
added a commit
to akien-mga/godot
that referenced
this pull request
Dec 5, 2024
…nvendored builds This restriction was added to fix godotengine#7373 back then, which was a symbol conflict between FreeType's bundled copy of gzip/zlib, and distro packages. But we also unbundled FreeType's zlib in godotengine#69395 so this is no longer an issue.
akien-mga
added a commit
to akien-mga/godot
that referenced
this pull request
Dec 5, 2024
…nvendored builds This restriction was added to fix godotengine#7373 back then, which was a symbol conflict between FreeType's bundled copy of gzip/zlib, and distro packages. But we also unbundled FreeType's zlib in godotengine#69395 so this is no longer an issue.
akien-mga
added a commit
to akien-mga/godot
that referenced
this pull request
Dec 5, 2024
…nvendored builds This restriction was added to fix godotengine#7373 back then, which was a symbol conflict between FreeType's bundled copy of gzip/zlib, and distro packages. But we also unbundled FreeType's zlib in godotengine#69395 so this is no longer an issue.
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.
I wanted to update zlib and minizip on a single commit, but both seem to act independently from each other.
I plan to update minizip on another PR (it is ready, but unsure if
patchesare done correctly), but if the maintainers demand minizip here too, I will do a force push once it's ready.