From 1554af78c01e6707db97b443dbe2f2ccbd572d48 Mon Sep 17 00:00:00 2001
From: Achill Gilgenast <achill@achill.org>
Date: Sat, 16 Aug 2025 09:56:49 +0200
Subject: [PATCH] main/postmarketos-base: allow to use doas for different users
 than root

The user is already able to log in as root and allowing to directly log
into other users allows stuff like running as postgres user.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6936>
---
 main/postmarketos-base/APKBUILD                               | 4 ++--
 main/postmarketos-base/rootfs-etc-doas.d-10-postmarketos.conf | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD
index a701b2ab6..3c1fbc646 100644
--- a/main/postmarketos-base/APKBUILD
+++ b/main/postmarketos-base/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=postmarketos-base
-pkgver=46
+pkgver=47
 pkgrel=0
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://postmarketos.org"
@@ -217,7 +217,7 @@ release() {
 
 sha512sums="
 e529f5cef1f31481b577f99b8917704f2cfefb963d98bf40a14b017938e55a00134d2033f81d2cb0b8489c5e9b4a92fdc0a788013f1adb4cd46d9580c9988186  rootfs-etc-sudoers
-ab09e67203bb82226b0c9e600c8bc231a5c0111977b80edb355e55be101d008ac3c06798c263f0ca50e203758e1bfbf25767ad12f2654d082fb007c0411bbd1f  rootfs-etc-doas.d-10-postmarketos.conf
+49cff0dbf37fc3c3ca30709be3bc4bbac9b2c05d1f88356922c6ab849e1fe893da7eca92b42a4095cfa00fe475470a711a93bfa60f1cedfde9c890a6dcc61de9  rootfs-etc-doas.d-10-postmarketos.conf
 1d2975e7e2745020f88fac639021cc9a47b477fb0390c3e146a070d98faab32c3f1c7bd1121f45a26be97301ab65c736ae0a4905d28a7251919a1994895f9c8d  rootfs-etc-ssh-sshd_config.d-50-postmarketos-ui-policy.conf
 224d58717f7f95851c91914753f4aefaf8964a2e62350ed898783c295c509cdadd85c325ee00baceb21ff2763ca2f4c7b1478a5638eb7d86836f91336b739376  rootfs-etc-apk-config
 e0d2d48b82a03239a4c0a00acaf83e00d397c23a8d7c71053d4e2a383357c22dcedef9e81b0e12a1d7514e1fdbe0bb3eb82613d18b29034a7ce5447f13c84a53  rootfs-etc-conf.d-swapfile
diff --git a/main/postmarketos-base/rootfs-etc-doas.d-10-postmarketos.conf b/main/postmarketos-base/rootfs-etc-doas.d-10-postmarketos.conf
index 4345021e7..78b70f4a4 100644
--- a/main/postmarketos-base/rootfs-etc-doas.d-10-postmarketos.conf
+++ b/main/postmarketos-base/rootfs-etc-doas.d-10-postmarketos.conf
@@ -1,2 +1,2 @@
-permit persist keepenv :wheel as root
+permit persist keepenv :wheel
 permit nopass keepenv root