From 86976d11e92efe26e999358e6dcda6e6dec2f02f Mon Sep 17 00:00:00 2001
From: Mid Favila <midfavila@sdf.org>
Date: Sat, 23 Oct 2021 03:13:06 +0000
Subject: [PATCH] Add an unzip shim for libarchive.

---
 core-mod/core/libarchive/build       |  3 +--
 core-mod/core/libarchive/checksums   |  1 +
 core-mod/core/libarchive/files/unzip |  3 +++
 core-mod/core/libarchive/sources     |  1 +
 ports/libarchive/build               | 13 -------------
 ports/libarchive/checksums           |  1 -
 ports/libarchive/depends             |  3 ---
 ports/libarchive/sources             |  1 -
 ports/libarchive/version             |  1 -
 9 files changed, 6 insertions(+), 21 deletions(-)
 create mode 100755 core-mod/core/libarchive/files/unzip
 delete mode 100755 ports/libarchive/build
 delete mode 100644 ports/libarchive/checksums
 delete mode 100644 ports/libarchive/depends
 delete mode 100644 ports/libarchive/sources
 delete mode 100644 ports/libarchive/version

diff --git a/core-mod/core/libarchive/build b/core-mod/core/libarchive/build
index 0714f57..901c304 100755
--- a/core-mod/core/libarchive/build
+++ b/core-mod/core/libarchive/build
@@ -13,6 +13,5 @@ make DESTDIR="$1" install
 ln -s bsdcat  "$1/usr/bin/cat"
 ln -s bsdcpio "$1/usr/bin/cpio"
 ln -s bsdtar  "$1/usr/bin/tar"
+install -Dm644 unzip "$1/usr/bin/unzip"
 
-printf '/bin/sh -e\n\nbsdtar xf "${1}"' > "$1/usr/bin/unzip"
-chmod +x "$1/usr/bin/unzip"
diff --git a/core-mod/core/libarchive/checksums b/core-mod/core/libarchive/checksums
index bb4b516..468b17c 100644
--- a/core-mod/core/libarchive/checksums
+++ b/core-mod/core/libarchive/checksums
@@ -1 +1,2 @@
+7ad2f7c52468b4596791f94472afc307275ff9bc62bd418f256ef9cd007be0ce
 f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0
diff --git a/core-mod/core/libarchive/files/unzip b/core-mod/core/libarchive/files/unzip
new file mode 100755
index 0000000..a4b034b
--- /dev/null
+++ b/core-mod/core/libarchive/files/unzip
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+tar xf "${1}"
diff --git a/core-mod/core/libarchive/sources b/core-mod/core/libarchive/sources
index e8d70f1..6f89a4f 100644
--- a/core-mod/core/libarchive/sources
+++ b/core-mod/core/libarchive/sources
@@ -1 +1,2 @@
+files/unzip
 https://github.com/libarchive/libarchive/releases/download/v3.5.2/libarchive-3.5.2.tar.xz
diff --git a/ports/libarchive/build b/ports/libarchive/build
deleted file mode 100755
index 8924e33..0000000
--- a/ports/libarchive/build
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-./configure          \
-   --prefix=/usr     \
-   --without-nettle  \
-   --without-openssl \
-   --without-xml2    \
-   --without-expat
-
-make
-make DESTDIR="$1" install
-
-ln -s bsdtar  "$1/usr/bin/tar"
diff --git a/ports/libarchive/checksums b/ports/libarchive/checksums
deleted file mode 100644
index c5ca63f..0000000
--- a/ports/libarchive/checksums
+++ /dev/null
@@ -1 +0,0 @@
-0e17d3a8d0b206018693b27f08029b598f6ef03600c2b5d10c94ce58692e299b
diff --git a/ports/libarchive/depends b/ports/libarchive/depends
deleted file mode 100644
index e57c894..0000000
--- a/ports/libarchive/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-bzip2
-xz
-zlib
diff --git a/ports/libarchive/sources b/ports/libarchive/sources
deleted file mode 100644
index 294adc8..0000000
--- a/ports/libarchive/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/libarchive/libarchive/releases/download/3.5.1/libarchive-3.5.1.tar.xz
diff --git a/ports/libarchive/version b/ports/libarchive/version
deleted file mode 100644
index 591d5e4..0000000
--- a/ports/libarchive/version
+++ /dev/null
@@ -1 +0,0 @@
-3.5.1 1