From 77370804409ac64e63e6e34bf12d5f4398a29a4b Mon Sep 17 00:00:00 2001
From: Luka Vandervelden <lukc@upyum.com>
Date: Wed, 4 Sep 2019 16:38:09 +0200
Subject: [PATCH 1/5] lzo: recipe added

---
 lzo/recipe.spec | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 lzo/recipe.spec

diff --git a/lzo/recipe.spec b/lzo/recipe.spec
new file mode 100644
index 0000000..4b433d8
--- /dev/null
+++ b/lzo/recipe.spec
@@ -0,0 +1,3 @@
+name: lzo
+version: 2.10
+sources: http://www.oberhumer.com/opensource/lzo/download/lzo-%{version}.tar.gz

From 1f109133ba5fdcb617e5fdd912a515197d9b5ef2 Mon Sep 17 00:00:00 2001
From: Luka Vandervelden <lukc@upyum.com>
Date: Wed, 4 Sep 2019 16:38:26 +0200
Subject: [PATCH 2/5] xz: recipe added

---
 xz/recipe.spec | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 xz/recipe.spec

diff --git a/xz/recipe.spec b/xz/recipe.spec
new file mode 100644
index 0000000..212af24
--- /dev/null
+++ b/xz/recipe.spec
@@ -0,0 +1,3 @@
+name: xz
+version: 5.2.4
+sources: https://tukaani.org/xz/xz-%{version}.tar.xz

From 388fc77877fd2820da9beeea9b135d2da6a37439 Mon Sep 17 00:00:00 2001
From: Luka Vandervelden <lukc@upyum.com>
Date: Wed, 4 Sep 2019 16:39:10 +0200
Subject: [PATCH 3/5] bzip2: prefix updated

---
 bzip2/recipe.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bzip2/recipe.spec b/bzip2/recipe.spec
index c057750..c266dab 100644
--- a/bzip2/recipe.spec
+++ b/bzip2/recipe.spec
@@ -1,9 +1,9 @@
 name: bzip2
 version: 1.0.6
-release: 1
+release: 2
 sources: https://downloads.sourceforge.net/project/bzip2/bzip2-%{version}.tar.gz
 options:
-	- make install: PREFIX='%{pkg}/usr'
+	- make install: PREFIX='%{pkg}%{prefix}'
 
 @configure
 	sed -i.orig -e '/^CFLAGS=/s/.*/CFLAGS = -O2 -fPIC/' bzip2-%{version}/Makefile

From a6ab3d7b94100df562f4009c04317247cc7dfc24 Mon Sep 17 00:00:00 2001
From: Luka Vandervelden <lukc@upyum.com>
Date: Wed, 4 Sep 2019 16:40:25 +0200
Subject: [PATCH 4/5] libarchive: static executables, executables split

---
 libarchive/recipe.spec | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/libarchive/recipe.spec b/libarchive/recipe.spec
index 3ccf7ba..e3d123e 100644
--- a/libarchive/recipe.spec
+++ b/libarchive/recipe.spec
@@ -1,4 +1,35 @@
 name: libarchive
 version: 3.3.3
-release: 1
+release: 2
 sources: https://www.libarchive.org/downloads/libarchive-%{version}.tar.gz
+build-dependencies: xz-dev, zlib-dev, bzip2-dev, lzo-dev
+dependencies: xz, zlib, bzip2, lzo
+
+options:
+	- configure: --with-zlib --with-lzo2 --with-lzma --with-bz2lib --without-zstd --without-cng --without-nettle --without-openssl --without-expat --without-xml2 --enable-posix-regex-lib=libc LDFLAGS="-L%{prefix}/lib -static"
+
+@build
+	cd %{name}-%{version}
+	make
+
+	for i in tar cpio cat; do
+		${CC:-cc} -static -o bsd${i} \
+			${i}/*.o \
+			.libs/libarchive.a .libs/libarchive_fe.a \
+			-llzma -lz -llzo2 -lbz2
+	done
+
+# FIXME: We’ll want to use those as default `tar`, `cpio` and `zcat`
+#        implementations in the future.
+%split bsdtar
+	files: %{prefix}/bin/bsdtar
+	dependencies: libarchive
+
+%split bsdcpio
+	files: %{prefix}/bin/bsdcpio
+	dependencies: libarchive
+
+%split bsdcat
+	files: %{prefix}/bin/bsdcat
+	dependencies: libarchive
+

From 4987f1d0a23c9a671a514fdc1a98a7377d81fc5b Mon Sep 17 00:00:00 2001
From: Luka Vandervelden <lukc@upyum.com>
Date: Wed, 4 Sep 2019 16:42:56 +0200
Subject: [PATCH 5/5] package: recipe update

---
 package/recipe.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/recipe.spec b/package/recipe.spec
index edbd13c..6c296d7 100644
--- a/package/recipe.spec
+++ b/package/recipe.spec
@@ -1,6 +1,6 @@
 name: package
 version: 0.7.0
-release: 1
+release: 2
 sources:
 	- https://git.karchnu.fr/WeirdOS/package/archive/%{version}.tar.gz -> %{name}-%{version}.tar.gz
 	- config.cfg
@@ -10,7 +10,7 @@ build-dependencies: crystal, spec-parser
 # FIXME: bsdtar should be split out so that we depend only on it.
 # Busybox is required mostly for `wget`.
 # abuild and zsh are required for assemble-apk.
-dependencies: gc, libevent, pcre, libarchive, busybox, zsh, abuild, gnutar
+dependencies: gc, libevent, pcre, bsdtar, busybox, zsh, abuild, gnutar
 
 dirname: package
 @configure