Merge branch 'upstream-zlib' into update-zlib

* upstream-zlib:
  zlib 2022-10-12 (04f42cec)

Fixes: #25576