From f514b9df39406e44c2fd3eb8f94136e26a7118c6 Mon Sep 17 00:00:00 2001
From: kurth4cker <kurth4cker@tutanota.com>
Date: Mon, 14 Nov 2022 21:44:25 +0300
Subject: [PATCH 1/3] put libarchive-3.6.1: NEEDS useflag work

---
 system/extra/libarchive/ympbuild | 44 ++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 system/extra/libarchive/ympbuild

diff --git a/system/extra/libarchive/ympbuild b/system/extra/libarchive/ympbuild
new file mode 100644
index 00000000..e4d1d52c
--- /dev/null
+++ b/system/extra/libarchive/ympbuild
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+name=libarchive
+version=3.6.1
+release=1
+url='https://www.libarchive.org'
+description='Multi-format archive and compression library'
+email='kurth4cker@tutanota.com'
+maintainer='kurth4cker'
+source=("https://www.libarchive.org/downloads/libarchive-${version}.tar.xz")
+md5sums=('9465f7995649c9ea84854a7fd8c76f30')
+license=('BSD')
+group=(system.extra)
+
+uses=(bzip2 lzma)
+depends=(openssl zlib)
+bzip2_depends=(bzip2)
+lzma_depends=(xz-utils)
+
+cd $name-$version
+
+setup() {
+    ./configure --prefix=/usr \
+	--libdir=/usr/lib64 \
+	--enable-static \
+	--enable-shared \
+	--without-nettle \
+	--without-xml2 \
+	--without-expat \
+	--without-zstd \
+	--without-lz4 \
+	--without-libb2 \
+	--without-iconv \
+	--without-cng \
+	$(use_opt bzip2 --with-bz2lib --without-bz2lib) \
+	$(use_opt lzma --with-lzma --without-lzma) \
+	--disable-acl \
+	--enable-xattr
+}
+build() {
+    make -j$(nproc)
+}
+package() {
+    make -j$(nproc) install
+}

From 75a031fd2e81a4f91c73b7a413d4cce039338eba Mon Sep 17 00:00:00 2001
From: kurth4cker <kurth4cker@tutanota.com>
Date: Tue, 15 Nov 2022 18:00:08 +0300
Subject: [PATCH 2/3] libarchive: add useflags and dependencies

---
 system/extra/libarchive/ympbuild | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/system/extra/libarchive/ympbuild b/system/extra/libarchive/ympbuild
index e4d1d52c..2ddc0b6e 100644
--- a/system/extra/libarchive/ympbuild
+++ b/system/extra/libarchive/ympbuild
@@ -11,10 +11,18 @@ md5sums=('9465f7995649c9ea84854a7fd8c76f30')
 license=('BSD')
 group=(system.extra)
 
-uses=(bzip2 lzma)
+uses=(bzip2 lzma iconv acl)
+uses_extra=(blake2 expat lz4 lzo nettle zstd)
 depends=(openssl zlib)
 bzip2_depends=(bzip2)
 lzma_depends=(xz-utils)
+acl_depends=(acl)
+blake2_depends=(libb2)
+expat_depends=(expat)
+lz4_depends=(lz4)
+lzo_depends=(lzo)
+nettle_depends=(nettle)
+zstd_depends=(zstd)
 
 cd $name-$version
 
@@ -23,18 +31,17 @@ setup() {
 	--libdir=/usr/lib64 \
 	--enable-static \
 	--enable-shared \
-	--without-nettle \
-	--without-xml2 \
-	--without-expat \
-	--without-zstd \
-	--without-lz4 \
-	--without-libb2 \
-	--without-iconv \
-	--without-cng \
+	--enable-xattr \
+	$(use_opt iconv --with-iconv --without-iconv) \
 	$(use_opt bzip2 --with-bz2lib --without-bz2lib) \
 	$(use_opt lzma --with-lzma --without-lzma) \
-	--disable-acl \
-	--enable-xattr
+	$(use_opt acl --enable-acl --disable-acl) \
+	$(use_opt nettle --with-nettle --without-nettle) \
+	$(use_opt expat --without-xml2 --with-xml2) \
+	$(use_opt zstd --with-zstd --without-zstd) \
+	$(use_opt lz4 --with_lz4 --without-lz4) \
+	$(use_opt blake2 --with-libb2 --without-libb2) \
+	--without-cng
 }
 build() {
     make -j$(nproc)

From f655929419f30e523ff90e76f67c7f945ddaa81f Mon Sep 17 00:00:00 2001
From: kurth4cker <kurth4cker@tutanota.com>
Date: Tue, 15 Nov 2022 15:23:23 +0300
Subject: [PATCH 3/3] bzip2: fix soname error

---
 system/extra/bzip2/makefile.patch | 16 ++++++++++++++++
 system/extra/bzip2/ympbuild       |  5 ++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 system/extra/bzip2/makefile.patch

diff --git a/system/extra/bzip2/makefile.patch b/system/extra/bzip2/makefile.patch
new file mode 100644
index 00000000..a54c9fb6
--- /dev/null
+++ b/system/extra/bzip2/makefile.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile b/Makefile
+index fb0f230..3c101bd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -35,10 +35,8 @@ OBJS= blocksort.o  \
+       bzlib.o
+ 
+ all: $(OBJS)
+-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
++	$(CC) -shared -o libbz2.so.1.0.8 $(OBJS)
+ 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
+-	rm -f libbz2.so.1.0
+-	ln -s libbz2.so.1.0.8 libbz2.so.1.0
+ 
+ clean: 
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared
diff --git a/system/extra/bzip2/ympbuild b/system/extra/bzip2/ympbuild
index 29fc0da9..e7b96410 100644
--- a/system/extra/bzip2/ympbuild
+++ b/system/extra/bzip2/ympbuild
@@ -16,6 +16,8 @@ setup(){
     mkdir -p $name-shared
     cp *.c *.h $name-shared
     cp Makefile-libbz2_so $name-shared/Makefile
+    cd $name-shared
+    patch -Np1 < ../../makefile.patch
 }
 build(){
     export CFLAGS="-Winline -D_FILE_OFFSET_BITS=64 ${CFLAGS}"
@@ -31,9 +33,10 @@ package(){
     ln -sf bzip2 "${DESTDIR}"/usr/bin/bzcat
 
     install -m755 libbz2.a "${DESTDIR}"/usr/lib64/
-    install -m755 $name-shared/libbz2.so* "${DESTDIR}"/usr/lib64
+    install -m755 $name-shared/libbz2.so.${version} "${DESTDIR}"/usr/lib64
     ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/libbz2.so
     ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/libbz2.so.1
+    ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/libbz2.so.1.0
 
     install -m644 bzlib.h "${DESTDIR}"/usr/include/