[arch-commits] Commit in bubblewrap/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Jan Steffens]

    Date: Thursday, February 24, 2022 @ 19:44:59
  Author: heftig
Revision: 438087

archrelease: copy trunk to extra-x86_64

Added:
  bubblewrap/repos/extra-x86_64/PKGBUILD
    (from rev 438085, bubblewrap/trunk/PKGBUILD)
Deleted:
  bubblewrap/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |  103 +++++++++++++++++++++++++++----------------------------------
 1 file changed, 46 insertions(+), 57 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-24 19:44:58 UTC (rev 438086)
+++ PKGBUILD	2022-02-24 19:44:59 UTC (rev 438087)
@@ -1,57 +0,0 @@
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-
-pkgname=(bubblewrap bubblewrap-suid)
-pkgver=0.5.0
-pkgrel=1
-pkgdesc='Unprivileged sandboxing tool'
-url='https://github.com/projectatomic/bubblewrap'
-arch=(x86_64)
-license=(GPL)
-depends=(glibc libcap)
-makedepends=(libxslt docbook-xsl git)
-_commit=b84704bb64eac3011f84346c79651c7c1234712c  # tags/v0.5.0^0
-source=(git+$url#commit=$_commit)
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgbase
-  git describe | sed 's/^v//'
-}
-
-prepare() {
-  cd $pkgbase
-  NOCONFIGURE=1 ./autogen.sh
-
-  cd "$srcdir"
-  cp -r ${pkgbase}{,-none}
-  cp -r ${pkgbase}{,-setuid}
-}
-
-_build() {
-  pushd ${pkgbase}-$1
-  ./configure --prefix=/usr \
-    --with-priv-mode=$1
-  make
-  popd
-}
-
-_install() {
-  make -C "$srcdir/${pkgbase}-$1" DESTDIR="$pkgdir" install
-}
-
-build() {
-  _build none
-  _build setuid
-}
-
-package_bubblewrap() {
-  _install none
-}
-
-package_bubblewrap-suid() {
-  pkgdesc+=" (setuid variant)"
-  provides=("bubblewrap=$pkgver-$pkgrel")
-  conflicts=(bubblewrap)
-
-  _install setuid
-}

Copied: bubblewrap/repos/extra-x86_64/PKGBUILD (from rev 438085, bubblewrap/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-02-24 19:44:59 UTC (rev 438087)
@@ -0,0 +1,46 @@
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgbase=bubblewrap
+pkgname=(bubblewrap bubblewrap-suid)
+pkgver=0.6.0
+pkgrel=1
+pkgdesc='Unprivileged sandboxing tool'
+url='https://github.com/projectatomic/bubblewrap'
+arch=(x86_64)
+license=(GPL)
+depends=(glibc libcap)
+makedepends=(libxslt docbook-xsl git meson bash-completion)
+_commit=b480c5fd0d383ac5d45b6390bd4b48068de6dd6b  # tags/v0.6.0^0
+source=(git+$url#commit=$_commit)
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgbase
+  git describe --tags | sed 's/^v//;s/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgbase
+}
+
+build() {
+  arch-meson $pkgbase build -D selinux=disabled
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package_bubblewrap() {
+  meson install -C build --destdir "$pkgdir"
+}
+
+package_bubblewrap-suid() {
+  pkgdesc+=" (setuid variant)"
+  provides=("bubblewrap=$pkgver-$pkgrel")
+  conflicts=(bubblewrap)
+
+  meson install -C build --destdir "$pkgdir"
+  chmod u+s "$pkgdir/usr/bin/bwrap"
+}