search

niXman / mingw-builds

Scripts for building the 32 and 64-bit MinGW-W64 compilers for Windows
Other
295 stars 107 forks source link

Update zlib to 1.2.13 #619

Closed starg2 closed 2 years ago

starg2 commented 2 years ago

With a security fix.

JohannesKauffmann commented 2 years ago

I just hit this issue; currently it tries to pull 1.2.12 from an URL which doesn't exist anymore.

While it is good that this is updated to the latest version, maybe it would be better to change the URL to the GitHub releases URL so that the script can still pull older versions, in case the URL changes again. Because AFAICS, zlib.net does not provide older releases, and currently the script breaks with a 404.

https://github.com/madler/zlib/archive/refs/tags/v1.2.12.tar.gz vs: https://github.com/madler/zlib/archive/refs/tags/v1.2.13.tar.gz Both work.

However, this works: https://zlib.net/zlib-1.2.13.tar.gz while this doesn't anymore: https://zlib.net/zlib-1.2.12.tar.gz

niXman commented 2 years ago

@JohannesKauffmann PR are welcome! ;)

JohannesKauffmann commented 2 years ago

See #620.

niXman commented 2 years ago

@JohannesKauffmann I see, merged!

this PR was merged too with conflict resolved manually. thank you @starg2 !

starg2 commented 2 years ago

@niXman Hmm..., it looks like you've merged niXman:develop into starg2:update-zlib rather than the other way around?

niXman commented 2 years ago

ohh, you are right! so what should I do next? =)

JohannesKauffmann commented 2 years ago

I'd reset this branch to 5b9824aff30ba604a59f640c45b456e7bb5ad3a4, then interactive rebase on develop while resolving the conflicts. Then this can be merged into master, and the commit will be on top of current develop HEAD.

starg2 commented 2 years ago

@niXman I have rebased starg2:update-zlib so you can simply merge it and everything will be ok.

niXman commented 2 years ago

done, thanks!