[PR #420] [MERGED] Maintenance: update vendored minizip code to the version distributed with zlib v1.3 #489

New issue

Closed

opened 2026-05-05 12:17:14 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 12:17:14 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/jmcnamara/libxlsxwriter/pull/420
Author: @jayaddison
Created: 11/18/2023
Status: ✅ Merged
Merged: 11/18/2023
Merged by: @jmcnamara

Base: main ← Head: maintenance/update-zlib-1.3

📝 Commits (2)

e7f863c Raw copy of minizip source files from zlib v1.3 release
4e2c9cb Manually re-apply libxlsxwriter customizations to minizip

📊 Changes

15 files changed (+765 additions, -1053 deletions)

View changed files

📝 third_party/minizip/Makefile.orig (+8 -4)
📝 third_party/minizip/MiniZip64_Changes.txt (+1 -1)
📝 third_party/minizip/configure.ac (+1 -1)
📝 third_party/minizip/crypt.h (+13 -16)
📝 third_party/minizip/ioapi.c (+31 -56)
📝 third_party/minizip/ioapi.h (+25 -27)
📝 third_party/minizip/iowin32.c (+29 -45)
📝 third_party/minizip/iowin32.h (+4 -4)
📝 third_party/minizip/miniunz.c (+29 -56)
📝 third_party/minizip/minizip.c (+38 -49)
📝 third_party/minizip/mztools.c (+1 -7)
📝 third_party/minizip/unzip.c (+202 -342)
📝 third_party/minizip/unzip.h (+74 -74)
📝 third_party/minizip/zip.c (+154 -218)
📝 third_party/minizip/zip.h (+155 -153)

📄 Description

Updates the vendored copy of minizip within libxlsxwriter to the version distributed with version 1.3 of zlib with a few libxlsxwriter customizations retained / re-applied.

I have run the tests (make test) and valgrind checks (make test_valgrind) on a system where minizip is not available as a system-provided library (to make sure that the vendored copy of the code was in use) and these passed.

Abbreviated output from the tests is included below:

$ make test
...
RESULTS: 430 tests (430 ok, 0 failed, 0 skipped) ran in 40.4 ms
...
=============================================================== 759 passed in 8.08s ===============================================================

A small number of warnings were emitted by the valgrind checks; mostly string validation errors (length limits exceeded, unacceptable-null values, and placeholder-count mismatches), and it exited with code 0.

Resolves #419.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/jmcnamara/libxlsxwriter/pull/420 **Author:** [@jayaddison](https://github.com/jayaddison) **Created:** 11/18/2023 **Status:** ✅ Merged **Merged:** 11/18/2023 **Merged by:** [@jmcnamara](https://github.com/jmcnamara) **Base:** `main` ← **Head:** `maintenance/update-zlib-1.3` --- ### 📝 Commits (2) - [`e7f863c`](https://github.com/jmcnamara/libxlsxwriter/commit/e7f863c2b8e05271241db3afe9ace10d5fa45f6d) Raw copy of minizip source files from zlib v1.3 release - [`4e2c9cb`](https://github.com/jmcnamara/libxlsxwriter/commit/4e2c9cb2623be13281b225713c9faff7b8226572) Manually re-apply libxlsxwriter customizations to minizip ### 📊 Changes **15 files changed** (+765 additions, -1053 deletions) <details> <summary>View changed files</summary> 📝 `third_party/minizip/Makefile.orig` (+8 -4) 📝 `third_party/minizip/MiniZip64_Changes.txt` (+1 -1) 📝 `third_party/minizip/configure.ac` (+1 -1) 📝 `third_party/minizip/crypt.h` (+13 -16) 📝 `third_party/minizip/ioapi.c` (+31 -56) 📝 `third_party/minizip/ioapi.h` (+25 -27) 📝 `third_party/minizip/iowin32.c` (+29 -45) 📝 `third_party/minizip/iowin32.h` (+4 -4) 📝 `third_party/minizip/miniunz.c` (+29 -56) 📝 `third_party/minizip/minizip.c` (+38 -49) 📝 `third_party/minizip/mztools.c` (+1 -7) 📝 `third_party/minizip/unzip.c` (+202 -342) 📝 `third_party/minizip/unzip.h` (+74 -74) 📝 `third_party/minizip/zip.c` (+154 -218) 📝 `third_party/minizip/zip.h` (+155 -153) </details> ### 📄 Description Updates the vendored copy of `minizip` within `libxlsxwriter` to the version [distributed with version 1.3 of `zlib`](https://github.com/madler/zlib/tree/09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851/contrib/minizip) with a few `libxlsxwriter` customizations retained / re-applied. I have run the tests (`make test`) and valgrind checks (`make test_valgrind`) on a system where `minizip` is not available as a system-provided library (to make sure that the vendored copy of the code was in use) and these passed. Abbreviated output from the tests is included below: ``` $ make test ... RESULTS: 430 tests (430 ok, 0 failed, 0 skipped) ran in 40.4 ms ... =============================================================== 759 passed in 8.08s =============================================================== ``` A small number of warnings were emitted by the valgrind checks; mostly string validation errors (length limits exceeded, unacceptable-null values, and placeholder-count mismatches), and it exited with code 0. Resolves #419. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>