[PR PATCH] file: actually build with seccomp.

[PR PATCH] file: actually build with seccomp.

[ericonr]

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

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages file
https://github.com/void-linux/void-packages/pull/31638

file: actually build with seccomp.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/31638.patch is attached

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

From df6eee3d95b6da0c60ceaaf77d7f98a2524bce70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 23 Jun 2021 15:45:24 -0300
Subject: [PATCH] file: actually build with seccomp.

---
 srcpkgs/file/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/file/template b/srcpkgs/file/template
index 0154e0bc138d..b53d4331bf22 100644
--- a/srcpkgs/file/template
+++ b/srcpkgs/file/template
@@ -1,7 +1,7 @@
 # Template file for 'file'
 pkgname=file
 version=5.40
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--enable-static"
@@ -19,6 +19,9 @@ if [ -z "$CHROOT_READY" ]; then
 	# If we're bootstrap from host with libseccomp installed
 	# bootstrap will fail to install shlib required by file.
 	configure_args+=" --disable-libseccomp"
+else
+	configure_args+=" --enable-libseccomp"
+	makedepends+=" libseccomp-devel"
 fi
 
 if [ "$CROSS_BUILD" ]; then

Re: [PR PATCH] [Updated] file: actually build with seccomp.

[ericonr]

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

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

https://github.com/ericonr/void-packages file
https://github.com/void-linux/void-packages/pull/31638

file: actually build with seccomp.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/31638.patch is attached

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

From 74900c667736d5333350e11ba644bb331c65e070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 23 Jun 2021 15:45:24 -0300
Subject: [PATCH] file: add build option for seccomp.

file(1) is known to fail in arbitrary ways when seccomp is enabled, and
it's used as a build tool by us. To minimize the potential impact, make
it an off by default build option.

The build option also allows us to re-organize the template logic, since
--disable-seccomp will now be in configure_args by default.
---
 srcpkgs/file/template | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/file/template b/srcpkgs/file/template
index 0154e0bc138d..a3213b20ecc4 100644
--- a/srcpkgs/file/template
+++ b/srcpkgs/file/template
@@ -1,11 +1,11 @@
 # Template file for 'file'
 pkgname=file
 version=5.40
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
-configure_args="--enable-static"
-makedepends="zlib-devel"
+configure_args="--enable-static $(vopt_enable libseccomp)"
+makedepends="zlib-devel $(vopt_if libseccomp libseccomp-devel)"
 short_desc="File type identification utility"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-2-Clause"
@@ -13,12 +13,16 @@ homepage="http://www.darwinsys.com/file/"
 distfiles="https://astron.com/pub/file/file-${version}.tar.gz"
 checksum=167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57
 
+build_options="libseccomp"
+
 if [ -z "$CHROOT_READY" ]; then
-	# libseccomp's default=auto
-	# and libseccomp is not bootstrap
-	# If we're bootstrap from host with libseccomp installed
+	# libseccomp's default=auto and
+	# libseccomp is not bootstrap
+	# If we're bootstraping from host with libseccomp installed,
 	# bootstrap will fail to install shlib required by file.
-	configure_args+=" --disable-libseccomp"
+	if [ "$build_option_libseccomp" ]; then
+		msg_error "libseccomp can't be enabled when bootstrapping\n"
+	fi
 fi
 
 if [ "$CROSS_BUILD" ]; then
@@ -26,7 +30,6 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="file"
 fi
 
-
 post_install() {
 	vlicense COPYING
 }

Re: [PR PATCH] [Merged]: file: actually build with seccomp.

[ericonr]

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

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

file: actually build with seccomp.
https://github.com/void-linux/void-packages/pull/31638

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->