aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2021-11-19 23:02:54 +0100
committerBart Ribbers <bribbers@disroot.org>2021-11-20 12:11:37 +0100
commitff54831613633cfc8b319ecc1b41c81cbb19d38c (patch)
treeb6d5926f4f3d05562328c6b48ffcabff7daf9c33
parent1482116edf87c2abb40119dc8e84794fb8a3f09b (diff)
downloadaports-ff54831613633cfc8b319ecc1b41c81cbb19d38c.tar.gz
aports-ff54831613633cfc8b319ecc1b41c81cbb19d38c.tar.bz2
aports-ff54831613633cfc8b319ecc1b41c81cbb19d38c.tar.xz
community/polkit: make sure we create the polkitd user before installing -common
Otherwise the default polkit rules get installed with the wrong uid and gid, causing problems where polkit asks for the root user password instead of your own user The regular polkit and polkit-elogind will pull in polkit-common anyway, so no need to create the user there too
-rw-r--r--community/polkit/APKBUILD4
-rw-r--r--community/polkit/polkit-common.pre-install (renamed from community/polkit/polkit.pre-install)0
l---------community/polkit/polkit-common.pre-upgrade1
l---------community/polkit/polkit-elogind.pre-install1
l---------community/polkit/polkit.pre-upgrade1
5 files changed, 3 insertions, 4 deletions
diff --git a/community/polkit/APKBUILD b/community/polkit/APKBUILD
index 50dbf218042..0ca4b4299c5 100644
--- a/community/polkit/APKBUILD
+++ b/community/polkit/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=polkit
pkgver=0.119
-pkgrel=5
+pkgrel=6
pkgdesc="Application development toolkit for controlling system-wide privileges"
url="https://www.freedesktop.org/wiki/Software/polkit/"
arch="all !mips !mips64 !s390x !riscv64" # Rust
@@ -28,7 +28,7 @@ makedepends="
"
pkgusers="polkitd"
pkggroups="polkitd"
-install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname-elogind.pre-install"
+install="$pkgname-common.pre-install $pkgname-common.pre-upgrade"
subpackages="
$pkgname-dev
$pkgname-libs
diff --git a/community/polkit/polkit.pre-install b/community/polkit/polkit-common.pre-install
index 7c4e3eff881..7c4e3eff881 100644
--- a/community/polkit/polkit.pre-install
+++ b/community/polkit/polkit-common.pre-install
diff --git a/community/polkit/polkit-common.pre-upgrade b/community/polkit/polkit-common.pre-upgrade
new file mode 120000
index 00000000000..dd70cc4615b
--- /dev/null
+++ b/community/polkit/polkit-common.pre-upgrade
@@ -0,0 +1 @@
+polkit-common.pre-install \ No newline at end of file
diff --git a/community/polkit/polkit-elogind.pre-install b/community/polkit/polkit-elogind.pre-install
deleted file mode 120000
index df3972187eb..00000000000
--- a/community/polkit/polkit-elogind.pre-install
+++ /dev/null
@@ -1 +0,0 @@
-polkit.pre-install \ No newline at end of file
diff --git a/community/polkit/polkit.pre-upgrade b/community/polkit/polkit.pre-upgrade
deleted file mode 120000
index df3972187eb..00000000000
--- a/community/polkit/polkit.pre-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-polkit.pre-install \ No newline at end of file