[cmake/FindLibAcquire.cmake] Upgrade deps - After 2 years they merged my https://github.com/kuba--/zip/pull/212 so just use their master ; upgrade miniz also ; [acquire/acquire_wininet.h] Use (void) to indicate function takes no param ; [README.md] Update with build intricacies ; improve grammar ; add to "See also"

Author: SamuelMarks

README.md

@@ -7,13 +7,13 @@ libacquire
 
 The core for your package manager, minus the dependency graph components. Features: **download**, **verify**, and **extract**.
 
-By default—for HTTP, HTTPS, and FTP—this uses `libfetch` on FreeBSD; `wininet` on Windows; and `libcurl` everywhere else. Override with `-DUSE_LIBCURL` or  `-DUSE_LIBFETCH`.
+By default—for HTTP, HTTPS, and FTP—this uses `libfetch` on FreeBSD; `wininet` on Windows; and `libcurl` everywhere else. Override with `-DUSE_LIBCURL` or `-DUSE_LIBFETCH`.
 
 By default—for MD5, SHA256, SHA512—this uses `wincrypt` on Windows; and `OpenSSL` everywhere else. _Note that on macOS this uses the builtin `CommonCrypto/CommonDigest.h` header, and on OpenBSD it uses `LibreSSL`; however in both of these cases it's the OpenSSL API with different headers._ Override with `-DUSE_OPENSSL`.
 
 By default—for crc32c—this uses `rhash` if available (also giving access to: CRC32, MD4, MD5, SHA1, SHA256, SHA512, SHA3, AICH, ED2K, DC++ TTH, BitTorrent BTIH, Tiger, GOST R 34.11-94, GOST R 34.11-2012, RIPEMD-160, HAS-160, EDON-R, and Whirlpool); otherwise uses included crc32c implementation. Override with `-DUSE_CRC32C`.
 
-By default—for decompression—this uses `compressapi.h` on Windows; then, in order of precedence tries: libarchive, zlib, or downloads miniz.
+By default—for decompression—this uses `compressapi.h` on Windows; then, in order of precedence tries: libarchive; zlib; or downloads miniz.
 
 Supports:
 
@@ -36,7 +36,7 @@ Supports:
 
 Dynamically links to shared libraries, defaulting to what's already installed on your OS by default.
 
-If your OS doesn't have the dependency, an optimised dependency free version will be `add_library`'d and depended upon.
+If your OS doesn't have the dependency, an optimised dependency-free version will be `add_library`'d and depended upon.
 
 *† default on that OS*
 
@@ -72,7 +72,8 @@ If your OS doesn't have the dependency, an optimised dependency free version wil
   | [miniz](https://github.com/richgel999/miniz) with [zip](https://github.com/kuba--/zip) API | `USE_MINIZ` | All that miniz + zip supports; default † fallback
 
 ### Checksum
-Note that most checksum libraries are crypto libraries so working with these APIs isn't required for libacquire:
+
+Note that most checksum libraries are crypto libraries, so working with these APIs isn't required for libacquire:
 
   | API                                                           | Package enable flag | OS support                      |
   ----------------------------------------------------------------| ------------------- |---------------------------------|
@@ -83,8 +84,8 @@ Note that most checksum libraries are crypto libraries so working with these API
 
 `Dockerfile`s are provided for convenience, try them out, e.g., by running:
 ```sh
-docker build . -f alpine.Dockerfile --tag libacquire
-docker run libacquire
+docker build . -f alpine.Dockerfile --tag libacquire:alpine_latest
+docker run libacquire:alpine_latest
 ```
 
 ## Shell script equivalent (UNIX with `grep`, `curl`, and `tar`)
@@ -139,11 +140,23 @@ Want different options for libcurl, OpenSSL, or any of the other dependencies? -
 ### Build
 
 ```bash
-mkdir build && cd build
-cmake ..
-cmake --build .
+$ mkdir build && cd build
+$ cmake ..
+$ cmake --build .
 ```
 
+(alternatively to system search, you can also use vcpkg by explicitly overriding `-DCMAKE_TOOLCHAIN_FILE`)
+
+### Build intricacies
+
+Care is taken, starting with:
+- header only modular functionality in separate .h files
+
+…these are created:
+- amalgamation header with all header content added to one;
+- separate .h and .c files to enable common use-cases;
+- amalgamation header with just prototypes, .c content expected to be contained in a shared library.
+
 ### CLI interface
 
 Generated with `docopt`, use `python -m pip install docopt-c` then:
@@ -154,6 +167,10 @@ $ python -m docopt_c '.docopt' -o 'libacquire/acquire/cli'
 ## See also
 
   - https://github.com/SamuelMarks/curl-simple-https
+  - https://github.com/SamuelMarks/cdd-c
+  - https://verMan.io
+  - https://github.com/offscale/postgres-version-manager-go
+  - ["version-manager-rs" suffixed](https://github.com/orgs/offscale/repositories?q=-version-manager-rs&language=rust) and [verman-schema-rs]
 
 ---
 

acquire/acquire_wininet.h

@@ -35,7 +35,7 @@ extern "C" {
 
 #ifndef DOWNLOAD_DIR_IMPL
 #define DOWNLOAD_DIR_IMPL
-const char *get_download_dir() { return TMPDIR "//.downloads"; }
+const char *get_download_dir(void) { return TMPDIR "//.downloads"; }
 #endif /* !DOWNLOAD_DIR_IMPL */
 
 int download(const char *url, enum Checksum checksum, const char *hash,

cmake/FindLibAcquire.cmake

@@ -125,36 +125,35 @@ message(STATUS "crypt LIBACQUIRE_LIBRARIES = ${LIBACQUIRE_LIBRARIES}")
 #########################
 
 macro (download_extract_miniz download_dir)
-    set(MINIZ_VERSION "2.2.0")
+    set(MINIZ_VERSION "3.0.2")
     set(MINIZ_BASENAME "miniz-${MINIZ_VERSION}.zip")
     get_filename_component(MINIZ_BASENAME_NO_EXT "${MINIZ_BASENAME}" NAME_WLE)
     set(MINIZ_ZIP_FILE "${download_dir}/${MINIZ_BASENAME}")
     if (NOT EXISTS "${MINIZ_ZIP_FILE}")
         file(DOWNLOAD
                 "https://github.com/richgel999/miniz/releases/download/${MINIZ_VERSION}/miniz-${MINIZ_VERSION}.zip"
                 "${MINIZ_ZIP_FILE}"
-                EXPECTED_HASH "SHA256=e4aa5078999c7f7466fa6b8f9848e39ddfff9a4bafc50215764aebe1f13b3841")
-        #file(ARCHIVE_EXTRACT INPUT "${MINIZ_ZIP_FILE}"
-        #        DESTINATION "${download_dir}")
+                EXPECTED_HASH "SHA256=ada38db0b703a56d3dd6d57bf84a9c5d664921d870d8fea4db153979fb5332c5")
+        file(ARCHIVE_EXTRACT INPUT "${MINIZ_ZIP_FILE}"
+                DESTINATION "${download_dir}")
     endif (NOT EXISTS "${MINIZ_ZIP_FILE}")
 
     if (NOT EXISTS "${download_dir}/zip.h")
+        set(KUBA_ZIP_VER "d7a2252")
         file(DOWNLOAD
-                "https://raw.githubusercontent.com/kuba--/zip/5b3f387/src/zip.h"
+                "https://raw.githubusercontent.com/kuba--/zip/${KUBA_ZIP_VER}/src/zip.h"
                 "${download_dir}/zip.h"
-                EXPECTED_HASH "SHA256=f2f9ecb2a5c9d9fa489c278c011aedb4752567b17d41912b57eb148f05774e4e")
+                EXPECTED_HASH "SHA256=3dda9a244fe05a8f003477a6e1dfb6844071d003773ab18a7708b860d8896506")
 
-        # My C89 compatible PR
         file(DOWNLOAD
-                "https://raw.githubusercontent.com/kuba--/zip/42dc4ce/src/zip.c"
+                "https://raw.githubusercontent.com/kuba--/zip/${KUBA_ZIP_VER}/src/zip.c"
                 "${download_dir}/zip.c"
-                EXPECTED_HASH "SHA256=ceafe6f3a7788697eb639ccc17788f2d9618ff6a573b96a6fb9db044eb19a7b7")
+                EXPECTED_HASH "SHA256=cec3b7ef189510255b3b2b80dcfa7fe767c26e01dd14ec0cf0fbf1940e7e86c7")
 
-        # Looks like they changed miniz, but are still on 2.2.0
         file(DOWNLOAD
-                "https://raw.githubusercontent.com/kuba--/zip/5b3f387/src/miniz.h"
+                "https://raw.githubusercontent.com/kuba--/zip/${KUBA_ZIP_VER}/src/miniz.h"
                 "${download_dir}/miniz.h"
-                EXPECTED_HASH "SHA256=ce02b94490b7a24cc24d2426869a04239ff47dd29d133f9a57625afc0f4a0e87")
+                EXPECTED_HASH "SHA256=6f2b1d7d368fecadf21ddf330634dabb250e505834fe1b76394aa5834e6e0869")
     endif (NOT EXISTS "${download_dir}/zip.h")
 
     file(TO_NATIVE_PATH "${MINIZ_ZIP_FILE}" MINIZ_ZIP_FILE)