summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-07-11 08:08:26 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-07-11 08:08:26 +0000
commitefef6c311ef71270a29b54cdcbe9e73f61e05014 (patch)
tree429596632715fd2c0797305815961fc67a10818c
parent2bfd6c5e1eb8712500a456686fe4fec0a4b124a9 (diff)
parentb0715d7aac673ce92cc3a558e6aa0543452763e7 (diff)
downloadpackages-efef6c311ef71270a29b54cdcbe9e73f61e05014.tar.gz
packages-efef6c311ef71270a29b54cdcbe9e73f61e05014.tar.bz2
packages-efef6c311ef71270a29b54cdcbe9e73f61e05014.tar.xz
packages-efef6c311ef71270a29b54cdcbe9e73f61e05014.zip
Merge nosuid bwrap into master
system/bubblewrap: add non-setuid variant See merge request adelie/packages!280
-rw-r--r--system/bubblewrap/APKBUILD12
1 files changed, 11 insertions, 1 deletions
diff --git a/system/bubblewrap/APKBUILD b/system/bubblewrap/APKBUILD
index 1589504a6..8823c4db2 100644
--- a/system/bubblewrap/APKBUILD
+++ b/system/bubblewrap/APKBUILD
@@ -10,7 +10,8 @@ options="!check suid" # requires suid to already be set in order to check
license="LGPL-2.0+"
makedepends="autoconf automake libcap-dev docbook-xsl"
checkdepends="sudo"
-subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
+subpackages="$pkgname-nosuid $pkgname-doc
+ $pkgname-bash-completion:bashcomp:noarch"
source="bubblewrap-$pkgver.tar.gz::https://github.com/projectatomic/bubblewrap/archive/v$pkgver.tar.gz
realpath-workaround.patch
musl-fixes.patch
@@ -54,6 +55,15 @@ package() {
make install DESTDIR="$pkgdir"
}
+nosuid() {
+ pkgdesc="$pkgdesc (non-setuid binary)"
+
+ mkdir -p "$subpkgdir"/usr/bin
+ cp "$pkgdir"/usr/bin/bwrap \
+ "$subpkgdir"/usr/bin/bwrap.nosuid
+ chmod -s "$subpkgdir"/usr/bin/bwrap.nosuid
+}
+
bashcomp() {
pkgdesc="Bash completions for $pkgname"
depends=""