From d2f0a9b979ef9b1037427cec05cecacc5a02d23c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Aug 2023 22:27:04 +0700
Subject: [PATCH 1/2] libcap: fix bootstrap on environment with go and
 pam-devel

new package: pam-cap
---
 srcpkgs/libcap/template | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 4a963cd15dbdf..463c02d7e7adc 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,27 +1,35 @@
 # Template file for 'libcap'
 pkgname=libcap
 version=2.69
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-makefile
-make_install_args="SBINDIR=/usr/bin exec_prefix=/usr
- LIBDIR=/usr/lib PKGCONFIGDIR=/usr/lib/pkgconfig RAISE_SETFCAP=no"
+make_build_args="PAM_CAP=no GOLANG=no"
 make_use_env=yes
 make_check_target="test"
 short_desc="POSIX.1e capabilities suite"
 maintainer="skmpz <dem.procopiou@gmail.com>"
-license="GPL-2.0-only"
+license="GPL-2.0-only, BSD-3-Clause"
 homepage="https://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/libcap-${version}.tar.xz"
 checksum=f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb
 
 if [ "$CROSS_BUILD" ]; then
-	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-elif [ "$CHROOT_READY" ]; then
+	make_build_args+=" CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+fi
+
+if [ "$CHROOT_READY" ]; then
 	hostmakedepends="gperf"
 fi
 
+make_install_args="${make_build_args} SBINDIR=/usr/bin exec_prefix=/usr
+ LIBDIR=/usr/lib PKGCONFIGDIR=/usr/lib/pkgconfig RAISE_SETFCAP=no"
+
+post_install() {
+	vlicense License
+}
+
 libcap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 1512e0fed3e3e20ac4caf1a17ef8d9bad7c8469b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Aug 2023 22:32:42 +0700
Subject: [PATCH 2/2] libarchive: disable libb2

libb2 isn't in bootstrap chain as of it's.
---
 srcpkgs/libarchive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index bcd2d9fea7e3e..f4885ebc033c5 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
  $(vopt_with expat) $(vopt_with lzo lzo2) $(vopt_with lz4)
  $(vopt_with ssl openssl) $(vopt_with zstd) --without-xml2
- --without-nettle --disable-rpath"
+ --without-libb2 --without-nettle --disable-rpath"
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)