Vendor libarchive and use SwiftPM to build

Package.swift

@@ -1,7 +1,17 @@
 // swift-tools-version:5.10
 
+import Foundation
 import PackageDescription
 
+let swiftlyTarget: Target = .executableTarget(
+    name: "Swiftly",
+    dependencies: [
+        .product(name: "ArgumentParser", package: "swift-argument-parser"),
+        .target(name: "SwiftlyCore"),
+        .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
+    ]
+)
+
 let ghApiCacheResources = (1...16).map { Resource.embedInCode("gh-api-cache/swift-tags-page\($0).json") }
 let ghApiCacheExcludedResources = (17...27).map { "gh-api-cache/swift-tags-page\($0).json" }
 
@@ -26,16 +36,7 @@ let package = Package(
         .package(url: "https://github.com/nicklockwood/SwiftFormat", exact: "0.49.18"),
     ],
     targets: [
-        .executableTarget(
-            name: "Swiftly",
-            dependencies: [
-                .product(name: "ArgumentParser", package: "swift-argument-parser"),
-                .target(name: "SwiftlyCore"),
-                .target(name: "LinuxPlatform", condition: .when(platforms: [.linux])),
-                .target(name: "MacOSPlatform", condition: .when(platforms: [.macOS])),
-                .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
-            ]
-        ),
+        swiftlyTarget,
         .target(
             name: "SwiftlyCore",
             dependencies: [
@@ -67,29 +68,6 @@ let package = Package(
             ],
             path: "Tools/generate-docs-reference"
         ),
-        .target(
-            name: "LinuxPlatform",
-            dependencies: [
-                "SwiftlyCore",
-                "CLibArchive",
-            ],
-            linkerSettings: [
-                .linkedLibrary("z"),
-            ]
-        ),
-        .target(
-            name: "MacOSPlatform",
-            dependencies: [
-                "SwiftlyCore",
-            ]
-        ),
-        .systemLibrary(
-            name: "CLibArchive",
-            pkgConfig: "libarchive",
-            providers: [
-                .apt(["libarchive-dev"]),
-            ]
-        ),
         .testTarget(
             name: "SwiftlyTests",
             dependencies: ["Swiftly"],
@@ -100,3 +78,31 @@ let package = Package(
         ),
     ]
 )
+
+#if os(Linux)
+
+package.dependencies.append(.package(path: "libarchive"))
+package.targets.append(
+    .target(
+        name: "LinuxPlatform",
+        dependencies: [
+            .target(name: "SwiftlyCore"),
+            .product(name: "archive-devel", package: "libarchive"),
+        ]
+    )
+)
+swiftlyTarget.dependencies.append(.target(name: "LinuxPlatform"))
+
+#elseif os(macOS)
+
+package.targets.append(
+    .target(
+        name: "MacOSPlatform",
+        dependencies: [
+            "SwiftlyCore",
+        ]
+    )
+)
+swiftlyTarget.dependencies.append(.target(name: "MacOSPlatform"))
+
+#endif

Sources/LinuxPlatform/Extract.swift

@@ -1,4 +1,4 @@
-import CLibArchive
+import CArchive
 import Foundation
 
 // The code in this file consists mainly of a Swift port of the "Complete Extractor" example included in the libarchive

docker/install-test-ubi9.dockerfile

@@ -1,5 +1,5 @@
 ARG base_image=redhat/ubi9:latest
 FROM $base_image
 
-RUN yum install --allowerasing -y curl gcc-c++ gpg
+RUN yum install --allowerasing -y curl gpg
 RUN echo 'export PATH="$HOME/.local/bin:$PATH"' >> $HOME/.profile

docker/test-amazonlinux2.dockerfile

@@ -7,11 +7,6 @@ ARG ubuntu_version
 # dependencies
 RUN yum install -y \
     curl \
-    gcc \
-    gcc-c++ \
-    make \
     gpg
-COPY ./scripts/install-libarchive.sh /
-RUN /install-libarchive.sh
 
 RUN curl -L https://swift.org/keys/all-keys.asc | gpg --import

docker/test-ubi9.dockerfile

@@ -7,11 +7,6 @@ ARG ubuntu_version
 # dependencies
 RUN yum install -y --allowerasing \
     curl \
-    gcc \
-    gcc-c++ \
-    make \
     gpg
-COPY ./scripts/install-libarchive.sh /
-RUN /install-libarchive.sh
 
 RUN curl -L https://swift.org/keys/all-keys.asc | gpg --import

docker/test.dockerfile

@@ -13,8 +13,6 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US.UTF-8
 
 # dependencies
-RUN apt-get update --fix-missing && apt-get install -y curl build-essential gpg
-COPY ./scripts/install-libarchive.sh /
-RUN /install-libarchive.sh
+RUN apt-get update --fix-missing && apt-get install -y gpg curl
 
 RUN curl -L https://swift.org/keys/all-keys.asc | gpg --import

libarchive/.cirrus.yml

@@ -0,0 +1,44 @@
+env:
+  CIRRUS_CLONE_DEPTH: 1
+  ARCH: amd64
+
+FreeBSD_task:
+  matrix:
+    env:
+      BS: autotools
+    env:
+      BS: cmake
+  matrix:
+    freebsd_instance:
+      image_family: freebsd-14-0
+    freebsd_instance:
+      image_family: freebsd-13-2
+  prepare_script:
+  - ./build/ci/cirrus_ci/ci.sh prepare
+  configure_script:
+  - env CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./build/ci/build.sh -a autogen
+  - env CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./build/ci/build.sh -a configure
+  build_script:
+  - env MAKE_ARGS="-j 2" ./build/ci/build.sh -a build
+  test_script:
+  - env SKIP_TEST_RESTORE_ATIME=1 MAKE_ARGS="-j 2" ./build/ci/build.sh -a test
+  - ./build/ci/cirrus_ci/ci.sh test
+  install_script:
+  - env MAKE_ARGS="-j 2" ./build/ci/build.sh -a install
+
+Windows_Cygwin_task:
+  windows_container:
+    image: cirrusci/windowsservercore:2019
+    os_version: 2019
+  env:
+    BE: cygwin-gcc
+  prepare_script:
+  - build\ci\cirrus_ci\ci.cmd prepare
+  configure_script:
+  - build\ci\cirrus_ci\ci.cmd configure
+  build_script:
+  - build\ci\cirrus_ci\ci.cmd build
+  test_script:
+  - build\ci\cirrus_ci\ci.cmd test
+  install_script:
+  - build\ci\cirrus_ci\ci.cmd install

libarchive/.editorconfig

@@ -0,0 +1,18 @@
+# To use this config on you editor, follow the instructions at:
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = tab
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.sh]
+indent_style = space
+indent_size = 4
+
+[CMakeLists.txt]
+indent_style = space
+indent_size = 2

libarchive/.gitattributes

@@ -0,0 +1,4 @@
+.git*            export-ignore
+
+*.sh             crlf=input
+config.rpath     crlf=input

libarchive/.github/dependabot.yml

@@ -0,0 +1,17 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "CI"
+    groups:
+      all-actions:
+        patterns:
+          - "*"