Re: [PR PATCH] [Updated] bootstrap fix

Github messages for voidlinux
 help / color / mirror / Atom feed

* Re: [PR PATCH] [Updated] bootstrap fix
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45847@inbox.vuxu.org>
@ 2023-08-31 15:33 ` sgn
  2023-08-31 16:03 ` sgn
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2023-08-31 15:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages bootstrap-fix
https://github.com/void-linux/void-packages/pull/45847

bootstrap fix
new package: pam-cap

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/45847.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bootstrap-fix-45847.patch --]
[-- Type: text/x-diff, Size: 3552 bytes --]

From 9835a90518d7873a13c5330a21ce7b4d6521dd8a 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 | 31 ++++++++++++++++++++++++++-----
 srcpkgs/pam-cap         |  1 +
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/pam-cap

diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 4a963cd15dbdf..1966a907b974f 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,16 +1,14 @@
 # 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_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"
@@ -18,10 +16,24 @@ checksum=f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-elif [ "$CHROOT_READY" ]; then
+fi
+
+if [ "$CHROOT_READY" ]; then
 	hostmakedepends="gperf"
+	makedepends="pam-devel"
+	make_build_args+=" PAM_CAP=yes"
+else
+	make_build_args+=" PAM_CAP=no GOLANG=no USE_GPERF=no"
+	subpackages="libcap-devel libcap-progs"
 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
 	}
 }
+
+pam-cap_package() {
+	short_desc+=" - pam modules"
+	license="BSD-3-Clause, LGPL-2.0-or-later"
+	pkg_install() {
+		vmove usr/lib/security
+		vlicense pam_cap/License
+	}
+}
diff --git a/srcpkgs/pam-cap b/srcpkgs/pam-cap
new file mode 120000
index 0000000000000..4085af640132e
--- /dev/null
+++ b/srcpkgs/pam-cap
@@ -0,0 +1 @@
+libcap
\ No newline at end of file

From 3da143af192cfda2af7d246b1142bea2a7eeb218 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)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] bootstrap fix
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45847@inbox.vuxu.org>
  2023-08-31 15:33 ` [PR PATCH] [Updated] bootstrap fix sgn
@ 2023-08-31 16:03 ` sgn
  2023-08-31 16:54 ` sgn
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2023-08-31 16:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages bootstrap-fix
https://github.com/void-linux/void-packages/pull/45847

bootstrap fix
new package: pam-cap

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/45847.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bootstrap-fix-45847.patch --]
[-- Type: text/x-diff, Size: 2952 bytes --]

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)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] bootstrap fix
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45847@inbox.vuxu.org>
  2023-08-31 15:33 ` [PR PATCH] [Updated] bootstrap fix sgn
  2023-08-31 16:03 ` sgn
@ 2023-08-31 16:54 ` sgn
  2023-09-01 15:04 ` sgn
  2023-09-01 15:04 ` [PR PATCH] [Merged]: " sgn
  4 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2023-08-31 16:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages bootstrap-fix
https://github.com/void-linux/void-packages/pull/45847

bootstrap fix
new package: pam-cap

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/45847.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bootstrap-fix-45847.patch --]
[-- Type: text/x-diff, Size: 5227 bytes --]

From 52d9d3a1db43652ee573dc8d7e83c31c061e9d11 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-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 0000000000000..4085af640132e
--- /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 15ada0f5bd4e2..0000000000000
--- 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 <orphan@voidlinux.org>"
-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 75b2b03110e36..0000000000000
--- a/srcpkgs/libcap-pam/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=libcap
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 4a963cd15dbdf..d49141a45a384 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 <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"
+	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 a27549e359ab96e180adfce39685736a5a44f36f 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)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] bootstrap fix
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45847@inbox.vuxu.org>
                   ` (2 preceding siblings ...)
  2023-08-31 16:54 ` sgn
@ 2023-09-01 15:04 ` sgn
  2023-09-01 15:04 ` [PR PATCH] [Merged]: " sgn
  4 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2023-09-01 15:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages bootstrap-fix
https://github.com/void-linux/void-packages/pull/45847

bootstrap fix
new package: pam-cap

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/45847.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bootstrap-fix-45847.patch --]
[-- Type: text/x-diff, Size: 5227 bytes --]

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?=
 <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-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 0000000000000..4085af640132e
--- /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 15ada0f5bd4e2..0000000000000
--- 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 <orphan@voidlinux.org>"
-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 75b2b03110e36..0000000000000
--- a/srcpkgs/libcap-pam/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=libcap
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 4a963cd15dbdf..d49141a45a384 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 <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"
+	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?=
 <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)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Merged]: bootstrap fix
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45847@inbox.vuxu.org>
                   ` (3 preceding siblings ...)
  2023-09-01 15:04 ` sgn
@ 2023-09-01 15:04 ` sgn
  4 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2023-09-01 15:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1098 bytes --]

There's a merged pull request on the void-packages repository

bootstrap fix
https://github.com/void-linux/void-packages/pull/45847

Description:
new package: pam-cap

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-09-01 15:04 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45847@inbox.vuxu.org>
2023-08-31 15:33 ` [PR PATCH] [Updated] bootstrap fix sgn
2023-08-31 16:03 ` sgn
2023-08-31 16:54 ` sgn
2023-09-01 15:04 ` sgn
2023-09-01 15:04 ` [PR PATCH] [Merged]: " sgn

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).