Jelle van der Waa pushed to branch main at Arch Linux / Packaging / Packages /
supermin
Commits:
216f7be8 by Jelle van der Waa at 2026-01-03T11:25:14+01:00
Disable pacman sandboxing for running with nspawn
In nspawn we can't enable sandboxing as it errors out:
error: restricting filesystem access failed because the Landlock ruleset could
not be applied: Operation not permitted
error: switching to sandbox user 'alpm' failed!
- - - - -
5 changed files:
- .SRCINFO
- PKGBUILD
- REUSE.toml
- − pacman6.patch
- + pacman7.1.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = supermin
pkgdesc = Tool for creating supermin appliances
pkgver = 5.3.5
- pkgrel = 1
+ pkgrel = 2
url = http://people.redhat.com/~rjones/supermin/
arch = x86_64
license = GPL-2.0-or-later
@@ -16,8 +16,10 @@ pkgbase = supermin
conflicts = febootstrap<=3.21
source =
https://download.libguestfs.org/supermin/5.3-development/supermin-5.3.5.tar.gz
source =
https://download.libguestfs.org/supermin/5.3-development/supermin-5.3.5.tar.gz.sig
+ source = pacman7.1.patch
validpgpkeys = F7774FB1AD074A7E8C8767EA91738F73E1B768A0
sha512sums =
e410bafe06805880f0f701e78d743a6e22e9d25e57bd70a020d583dba6d710ba9917d7afc37be714d9bde410c7ff35f4198300b3af0858d761b0b3e07af58dc0
sha512sums = SKIP
+ sha512sums =
36a01e110f72a0a8b2c5fbf636e6c104286dda9343568bf4c38716207ec95406772a32c1202b6999ecca9cf3c9f2b127e266bd734461272542dd79a2d67f95e8
pkgname = supermin
=====================================
PKGBUILD
=====================================
@@ -5,7 +5,7 @@
pkgname=supermin
pkgver=5.3.5
-pkgrel=1
+pkgrel=2
pkgdesc="Tool for creating supermin appliances"
arch=('x86_64')
url="http://people.redhat.com/~rjones/supermin/";
@@ -23,11 +23,17 @@ makedepends=(
)
checkdepends=('hivex')
conflicts=('febootstrap<=3.21')
-source=("https://download.libguestfs.org/${pkgname}/5.3-development/${pkgname}-${pkgver}.tar.gz"{,.sig})
+source=("https://download.libguestfs.org/${pkgname}/5.3-development/${pkgname}-${pkgver}.tar.gz"{,.sig}
pacman7.1.patch)
sha512sums=('e410bafe06805880f0f701e78d743a6e22e9d25e57bd70a020d583dba6d710ba9917d7afc37be714d9bde410c7ff35f4198300b3af0858d761b0b3e07af58dc0'
- 'SKIP')
+ 'SKIP'
+
'36a01e110f72a0a8b2c5fbf636e6c104286dda9343568bf4c38716207ec95406772a32c1202b6999ecca9cf3c9f2b127e266bd734461272542dd79a2d67f95e8')
validpgpkeys=('F7774FB1AD074A7E8C8767EA91738F73E1B768A0') # Richard W.M. Jones
<[email protected]>
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ patch -Np1 -i ${srcdir}/pacman7.1.patch
+}
+
build() {
cd "${pkgname}-${pkgver}"
./configure --prefix=/usr --disable-network-tests
=====================================
REUSE.toml
=====================================
@@ -23,7 +23,7 @@ SPDX-License-Identifier = "0BSD"
[[annotations]]
path = [
- "pacman6.patch",
+ "pacman7.1.patch",
]
SPDX-FileCopyrightText = "supermin contributors"
SPDX-License-Identifier = "GPL-2.0-or-later"
=====================================
pacman6.patch deleted
=====================================
@@ -1,15 +0,0 @@
-diff -upr supermin-5.2.1.orig/src/ph_pacman.ml supermin-5.2.1/src/ph_pacman.ml
---- supermin-5.2.1.orig/src/ph_pacman.ml 2021-02-01 11:30:45.000000000
+0200
-+++ supermin-5.2.1/src/ph_pacman.ml 2021-05-24 18:11:28.002222316 +0300
-@@ -219,7 +219,10 @@ let pacman_download_all_packages pkgs di
- let cmd =
- sprintf "
- umask 0000
-- for f in %s/*.pkg.tar.*; do tar -xf \"$f\" -C %s; done
-+ for f in %s/*.pkg.tar.*; do
-+ [[ $f == *.sig ]] && continue
-+ tar -xf \"$f\" -C %s
-+ done
- "
- (quote tdir) (quote dir) in
- if !settings.debug >= 2 then printf "%s" cmd;
=====================================
pacman7.1.patch
=====================================
@@ -0,0 +1,13 @@
+diff --git a/src/ph_pacman.ml b/src/ph_pacman.ml
+index 25ef4fc..4118a42 100644
+--- a/src/ph_pacman.ml
++++ b/src/ph_pacman.ml
+@@ -183,7 +183,7 @@ let pacman_download_all_packages pkgs dir =
+ umask 0000
+ cd %s
+ mkdir -p var/lib/pacman
+- pacman-conf | grep -v CacheDir > tmp.conf
++ pacman-conf | grep -v CacheDir | sed '/^\\[options\\]$/a DisableSandbox'>
tmp.conf
+ %s %s%s -Syw --noconfirm --cachedir=$(pwd) --root=$(pwd) %s
+ "
+ (quote tdir)
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/supermin/-/commit/216f7be85022fa3a085474eae0c8f7ebabbb187b
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/supermin/-/commit/216f7be85022fa3a085474eae0c8f7ebabbb187b
You're receiving this email because of your account on gitlab.archlinux.org.
