diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2019-08-12 05:46:25 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2019-10-07 05:43:37 +0200 |
| commit | de6249ce221aae4062ea131d4f676f7e3d44af28 (patch) | |
| tree | 42c10fed40bc0fe591c8e38fb136afd433e00bf5 /scripts | |
| parent | 2a792ac7bb1ceda42767c696e2664819b47ffc3b (diff) | |
| download | pacman-de6249ce221aae4062ea131d4f676f7e3d44af28.tar.gz pacman-de6249ce221aae4062ea131d4f676f7e3d44af28.tar.xz | |
Support file with seccomp enabled
Not all compression types can be detected in the seccomp sandbox, so we
need to disable it. This requires either configuring makepkg to know the
sandbox is available, or checking for file >= 5.38 in which the sandbox
option is a no-op even when seccomp is disabled.
- Requires autoconf-archive for autotools version compare macro.
- meson version comparison could be made a lot simpler using meson-git.
Fixes FS#58626
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 1 | ||||
| -rw-r--r-- | scripts/libmakepkg/source/file.sh.in | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index ea72f21e..7b6cd00c 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -182,6 +182,7 @@ edit = sed \ -e 's|@TEMPLATE_DIR[@]|$(TEMPLATE_DIR)|g' \ -e 's|@DEBUGSUFFIX[@]|$(DEBUGSUFFIX)|g' \ -e "s|@INODECMD[@]|$(INODECMD)|g" \ + -e "s|@FILECMD[@]|$(FILECMD)|g" \ -e 's|@SEDINPLACEFLAGS[@]|$(SEDINPLACEFLAGS)|g' \ -e 's|@SEDPATH[@]|$(SEDPATH)|g' \ -e 's|@SCRIPTNAME[@]|$@|g' \ diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in index 8492ba11..f6d79f9e 100644 --- a/scripts/libmakepkg/source/file.sh.in +++ b/scripts/libmakepkg/source/file.sh.in @@ -96,7 +96,7 @@ extract_file() { fi # do not rely on extension for file type - local file_type=$(file -bizL -- "$file") + local file_type=$(@FILECMD@ -bizL -- "$file") local ext=${file##*.} local cmd='' case "$file_type" in |