[acquire/acquire_common_defs.h] Fix ARM64 definition ; [*Dockerfile*] Rename for syntax highlighting ; add more bsd dependencies

Author: SamuelMarks

Dockerfile.alpine

@@ -83,7 +83,7 @@ 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 Dockerfile.alpine --tag libacquire
+docker build . -f alpine.Dockerfile --tag libacquire
 docker run libacquire
 ```
 

README.md

@@ -540,9 +540,15 @@ else ()
     set(gen_header_files "")
     set(gen_source_files "")
     foreach (header_file #${_Header_Files} ${Header_Files}
-            "acquire_checksums.h" "acquire_common_defs.h" "acquire_download.h"
-            "acquire_extract.h" "acquire_fileutils.h" "acquire_net_common.h"
-            "acquire_string_extras.h" "acquire_url_utils.h")
+            "acquire_checksums.h"
+            "acquire_common_defs.h"
+            "acquire_crc32c.h"
+            "acquire_download.h"
+            "acquire_extract.h"
+            "acquire_fileutils.h"
+            "acquire_net_common.h"
+            "acquire_string_extras.h"
+            "acquire_url_utils.h")
         get_filename_component(name_no_ext "${header_file}" NAME_WLE)
         set(gen_header_file "${CMAKE_BINARY_DIR}/gen/gen_${name_no_ext}.h")
         set(gen_source_file "${CMAKE_BINARY_DIR}/gen/gen_${name_no_ext}.c")

acquire/CMakeLists.txt

@@ -20,9 +20,6 @@ extern "C" {
 #endif
 #include "acquire_config.h"
 #include "acquire_string_extras.h"
-#ifdef USE_LIBRHASH
-#include "acquire_librhash.h"
-#endif /* USE_LIBRHASH */
 
 extern LIBACQUIRE_LIB_EXPORT bool crc32c(const char *, const char *);
 

acquire/acquire_checksums.h

@@ -87,7 +87,7 @@ extern "C" {
 #define NAME_MAX 4096
 #endif /* ! NAME_MAX */
 
-#if !defined(_AMD64_) && !defined(_X86_) && defined(_ARM_)
+#if !defined(_AMD64_) && !defined(_X86_) && !defined(_ARM_)
 #if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) ||           \
     defined(__x86_64) || defined(_M_X64) || defined(_M_AMD64)
 #define _AMD64_

acquire/acquire_common_defs.h

@@ -15,18 +15,20 @@ extern "C" {
 #include "acquire_common_defs.h"
 
 /**
- * Check if a file represented by URL is already downloaded locally and matches the checksum.
+ * Check if a file represented by URL is already downloaded locally and matches
+ * the checksum.
  *
  * @param url URL or filename
  * @param checksum checksum enum type, e.g., LIBACQUIRE_SHA256
  * @param hash expected hash string to verify
- * @param target_location directory to check in (if NULL, defaults to ".downloads")
+ * @param target_location directory to check in (if NULL, defaults to
+ * ".downloads")
  * @return true if already downloaded and checksum verifies, else false
  */
 extern LIBACQUIRE_LIB_EXPORT bool is_downloaded(const char *url,
-                                         enum Checksum checksum,
-                                         const char *hash,
-                                         const char *target_location);
+                                                enum Checksum checksum,
+                                                const char *hash,
+                                                const char *target_location);
 
 #ifdef LIBACQUIRE_IMPLEMENTATION
 
@@ -37,7 +39,8 @@ const char *get_download_dir() { return ".downloads"; }
 
 /**
  * Implementation of is_downloaded.
- * Uses fileutils functions for existence checks and checksum functions for verification.
+ * Uses fileutils functions for existence checks and checksum functions for
+ * verification.
  */
 bool is_downloaded(const char *url, enum Checksum checksum, const char *hash,
                    const char *target_location) {

acquire/acquire_net_common.h

@@ -0,0 +1,26 @@
+FROM alpine
+
+RUN apk add --no-cache \
+    bsd-compat-headers \
+    cmake \
+    curl-dev \
+    gcc \
+    libarchive-dev \
+    libbsd-dev \
+    rhash-dev \
+    linux-headers \
+    make \
+    musl-dev \
+    openssl-dev \
+    pkgconf
+
+COPY . /libacquire
+
+WORKDIR /libacquire/build
+
+RUN cmake -DCMAKE_BUILD_TYPE="Debug" .. && \
+    cmake --build .
+
+CMD ctest .
+
+ENTRYPOINT ["/libacquire/build/acquire", "--version"]

alpine.Dockerfile

@@ -5,7 +5,14 @@ ADD 'https://github.com/Kitware/CMake/releases/download/v3.21.4/cmake-3.21.4-lin
 RUN sh /tmp/cmake.sh --prefix='/usr/local' --skip-license
 
 RUN apt-get update -qq && \
-    apt-get install -y gcc make pkg-config libc-dev libssl-dev libcurl4-openssl-dev
+    apt-get install -y \
+      gcc \
+      libc-dev \
+      libcurl4-openssl-dev \
+      librhash-dev \
+      libssl-dev \
+      make \
+      pkg-config
 
 COPY . /libacquire