From 6c63cec62584be010b4d69bd13798bfa18c42654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= 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-pam | 1 + srcpkgs/libcap-pam/template | 30 ------------------------------ srcpkgs/libcap-pam/update | 1 - srcpkgs/libcap/template | 33 +++++++++++++++++++++++++++------ 4 files changed, 28 insertions(+), 37 deletions(-) create mode 120000 srcpkgs/libcap-pam delete mode 100644 srcpkgs/libcap-pam/template delete mode 100644 srcpkgs/libcap-pam/update diff --git a/srcpkgs/libcap-pam b/srcpkgs/libcap-pam new file mode 120000 index 00000000000000..4085af640132e1 --- /dev/null +++ b/srcpkgs/libcap-pam @@ -0,0 +1 @@ +libcap \ No newline at end of file diff --git a/srcpkgs/libcap-pam/template b/srcpkgs/libcap-pam/template deleted file mode 100644 index 15ada0f5bd4e24..00000000000000 --- a/srcpkgs/libcap-pam/template +++ /dev/null @@ -1,30 +0,0 @@ -# Template file for 'libcap-pam' -pkgname=libcap-pam -version=2.34 -revision=1 -build_style=gnu-makefile -make_use_env=yes -make_install_args="RAISE_SETFCAP=no" -hostmakedepends="gperf perl pam-devel" -makedepends="pam-devel attr-devel" -short_desc="POSIX.1e capabilities suite - PAM module" -maintainer="Orphaned " -license="GPL-2.0-only" -homepage="http://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=aecdd42015955068d3d94b7caa9590fcb2de5df53ce53c61a21b912bfc0b1611 - -conf_files="/etc/security/capability.conf" - -pre_build() { - vsed -e 's,CC :=,CC ?=,' -i Make.Rules - # Disable tests, as they cause cross-build failure - vsed -e '/test:/,/.sh/d' -e '/tests/d' -i Makefile -} - -do_install() { - vinstall pam_cap/capability.conf 644 etc/security - vmkdir usr/lib/security - mv pam_cap/pam_cap.so ${DESTDIR}/usr/lib/security -} diff --git a/srcpkgs/libcap-pam/update b/srcpkgs/libcap-pam/update deleted file mode 100644 index 75b2b03110e365..00000000000000 --- a/srcpkgs/libcap-pam/update +++ /dev/null @@ -1 +0,0 @@ -pkgname=libcap diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template index 4a963cd15dbdfa..d49141a45a3840 100644 --- a/srcpkgs/libcap/template +++ b/srcpkgs/libcap/template @@ -1,27 +1,39 @@ # 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="GOLANG=no" make_use_env=yes make_check_target="test" short_desc="POSIX.1e capabilities suite" maintainer="skmpz " -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" + makedepends="pam-devel" + make_build_args+=" PAM_CAP=yes" +else + make_build_args+=" PAM_CAP=no" 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" @@ -43,3 +55,12 @@ libcap-progs_package() { vmove usr/share } } + +libcap-pam_package() { + conf_files="/etc/security/capability.conf" + short_desc+=" - PAM module" + pkg_install() { + vinstall pam_cap/capability.conf 644 etc/security + vmove usr/lib/security + } +} From ae4367fed2dbc0014da62abdc0301783a6660dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= 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 bcd2d9fea7e3e8..f4885ebc033c50 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)