aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2021-12-19 22:38:33 +0100
committerJakub Jirutka <jakub@jirutka.cz>2021-12-20 00:40:38 +0100
commit1553c1797978727785b3a4c616351d0ad46f342b (patch)
tree1755cc0febc9baee8e01cad569b875b7e6c4725e
parent9aa67f974b72ff85515fedaf5f6b18dcbdc55bc1 (diff)
downloadaports-1553c1797978727785b3a4c616351d0ad46f342b.tar.gz
aports-1553c1797978727785b3a4c616351d0ad46f342b.tar.bz2
aports-1553c1797978727785b3a4c616351d0ad46f342b.tar.xz
community/shadow: rename subpackage -uidmap to -subids
-rw-r--r--community/buildah/APKBUILD4
-rw-r--r--community/img/APKBUILD4
-rw-r--r--community/lxcfs/APKBUILD4
-rw-r--r--community/podman/APKBUILD4
-rw-r--r--community/shadow/APKBUILD6
-rw-r--r--testing/lxd/APKBUILD4
6 files changed, 14 insertions, 12 deletions
diff --git a/community/buildah/APKBUILD b/community/buildah/APKBUILD
index 4f221e02c7..de1c58f76b 100644
--- a/community/buildah/APKBUILD
+++ b/community/buildah/APKBUILD
@@ -3,12 +3,12 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=buildah
pkgver=1.23.1
-pkgrel=0
+pkgrel=1
pkgdesc="tool that facilitates building OCI container images"
url="https://github.com/containers/buildah"
license="Apache-2.0"
arch="all"
-depends="crun shadow-uidmap fuse-overlayfs slirp4netns containers-common"
+depends="crun shadow-subids fuse-overlayfs slirp4netns containers-common"
makedepends="go go-md2man lvm2-dev gpgme-dev libseccomp-dev btrfs-progs-dev bash"
subpackages="$pkgname-doc"
options="!check" # tests require root privileges
diff --git a/community/img/APKBUILD b/community/img/APKBUILD
index 9aece303c4..95dc79a80e 100644
--- a/community/img/APKBUILD
+++ b/community/img/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Lucas Ramage <ramage.lucas@protonmail.com>
pkgname=img
pkgver=0.5.11
-pkgrel=2
+pkgrel=3
pkgdesc="Standalone, daemon-less, unprivileged Dockerfile and OCI compatible container image builder"
url="https://github.com/genuinetools/img"
arch="x86_64"
license="MIT"
options="!check chmod-clean"
-depends="runc shadow-uidmap"
+depends="runc shadow-subids"
makedepends="bash go libseccomp-dev"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/genuinetools/img/archive/v$pkgver.tar.gz"
diff --git a/community/lxcfs/APKBUILD b/community/lxcfs/APKBUILD
index 4252960df2..e729b2021c 100644
--- a/community/lxcfs/APKBUILD
+++ b/community/lxcfs/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=lxcfs
pkgver=4.0.11
-pkgrel=0
+pkgrel=1
pkgdesc="FUSE filesystem for LXC"
url="https://linuxcontainers.org/lxcfs"
arch="all"
license="Apache-2.0"
-depends="shadow-uidmap uidmapshift"
+depends="shadow-subids uidmapshift"
makedepends="fuse-dev linux-headers help2man"
subpackages="$pkgname-doc $pkgname-openrc"
source="https://linuxcontainers.org/downloads/lxcfs/lxcfs-$pkgver.tar.gz
diff --git a/community/podman/APKBUILD b/community/podman/APKBUILD
index c8e2e75a4b..61245e7b54 100644
--- a/community/podman/APKBUILD
+++ b/community/podman/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=podman
pkgver=3.4.4
-pkgrel=0
+pkgrel=1
pkgdesc="Simple management tool for pods, containers and images"
url="https://podman.io/"
license="Apache-2.0"
@@ -15,7 +15,7 @@ depends="
iptables
ip6tables
slirp4netns
- shadow-uidmap
+ shadow-subids
fuse-overlayfs
containers-common
"
diff --git a/community/shadow/APKBUILD b/community/shadow/APKBUILD
index 6eb0810b68..720e2db0b1 100644
--- a/community/shadow/APKBUILD
+++ b/community/shadow/APKBUILD
@@ -14,7 +14,7 @@ subpackages="
$pkgname-dev
$pkgname-libs
$pkgname-doc
- $pkgname-uidmap
+ $pkgname-subids
"
source="https://github.com/shadow-maint/shadow/releases/download/v$pkgver/shadow-$pkgver.tar.xz
useradd-defaults.patch
@@ -101,8 +101,10 @@ package() {
install -m644 /dev/null etc/subgid
}
-uidmap() {
+subids() {
pkgdesc="Utilities for using subordinate UIDs and GIDs"
+ depends=""
+ provides="$pkgname-uidmap=$pkgver-r$pkgrel" # for backward compatibility (Alpine <3.16)
amove bin/getsubids
amove usr/bin/new*idmap
diff --git a/testing/lxd/APKBUILD b/testing/lxd/APKBUILD
index f2c7f2d794..ff1734f9d1 100644
--- a/testing/lxd/APKBUILD
+++ b/testing/lxd/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=lxd
pkgver=4.21
-pkgrel=1
+pkgrel=2
pkgdesc="a container hypervisor and a new user experience for LXC"
url="https://linuxcontainers.org/lxd/"
arch="all !mips !mips64"
@@ -16,7 +16,7 @@ depends="
squashfs-tools
rsync
dqlite
- shadow-uidmap
+ shadow-subids
lxc
ip6tables
dnsmasq