Date: Thursday, February 17, 2022 @ 23:37:09 Author: heftig Revision: 437630
22.07.4-1 Modified: accountsservice/trunk/PKGBUILD Deleted: accountsservice/trunk/0001-build-Properly-apply-modes-in-meson_post_install.py.patch ----------------------------------------------------------------+ 0001-build-Properly-apply-modes-in-meson_post_install.py.patch | 38 ---------- PKGBUILD | 16 +--- 2 files changed, 5 insertions(+), 49 deletions(-) Deleted: 0001-build-Properly-apply-modes-in-meson_post_install.py.patch =================================================================== --- 0001-build-Properly-apply-modes-in-meson_post_install.py.patch 2022-02-17 23:36:33 UTC (rev 437629) +++ 0001-build-Properly-apply-modes-in-meson_post_install.py.patch 2022-02-17 23:37:09 UTC (rev 437630) @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <[email protected]> -Date: Sat, 29 Jan 2022 00:32:33 +0000 -Subject: [PATCH] build: Properly apply modes in meson_post_install.py - -In our environment, the default umask is `0o022` so the `g+w` permission -is missing from the packaged `icons` directory. - -Manipulate the umask to match the modes we want. - -We can't just use `0` for everything because `makedirs` always uses -`0o777` for parent directories [since Python 3.7][1]. We also want to -keep `/var/lib` at `0o755`. - -[1]: https://bugs.python.org/issue19930 - -Part-Of: https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/88 ---- - meson_post_install.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/meson_post_install.py b/meson_post_install.py -index 5cc2dc49b541..d8c3dd1ff81a 100644 ---- a/meson_post_install.py -+++ b/meson_post_install.py -@@ -9,10 +9,12 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1]) - # FIXME: meson will not track the creation of these directories - # https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39 - dst_dirs = [ -+ (os.path.join(localstatedir, 'lib'), 0o755), - (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775), - (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700), - ] - - for (dst_dir, dst_dir_mode) in dst_dirs: - if not os.path.exists(dst_dir): -+ os.umask(0o777 & ~dst_dir_mode) - os.makedirs(dst_dir, mode=dst_dir_mode) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-02-17 23:36:33 UTC (rev 437629) +++ PKGBUILD 2022-02-17 23:37:09 UTC (rev 437630) @@ -2,8 +2,8 @@ # Contributor: Ionut Biru <[email protected]> pkgname=accountsservice -pkgver=22.04.62 -pkgrel=2 +pkgver=22.07.4 +pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" url="https://gitlab.freedesktop.org/accountsservice/accountsservice"; arch=(x86_64) @@ -11,11 +11,9 @@ depends=(glib2 polkit systemd shadow libxcrypt) makedepends=(gtk-doc gobject-introspection git meson docbook-xsl xmlto vala) checkdepends=(python-gobject python-dbusmock) -_commit=b92982be695700537bf80c5e9aa518820adbb7b6 # tags/22.04.62^0 -source=("git+https://gitlab.freedesktop.org/accountsservice/accountsservice.git#commit=$_commit"; - 0001-build-Properly-apply-modes-in-meson_post_install.py.patch) -sha256sums=('SKIP' - '284b6564c352984a46b63f04eb964fcc7c18b7f89e45648a1bf7b2a90f68b6ff') +_commit=9b773f11b537dd236ef4bd1f5a7658f9898c6efd # tags/22.07.4 +source=("git+https://gitlab.freedesktop.org/accountsservice/accountsservice.git#commit=$_commit";) +sha256sums=('SKIP') pkgver() { cd $pkgname @@ -25,10 +23,6 @@ prepare() { cd $pkgname - - # Fix permissions to match the ones the daemon sets - # https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/88 - git apply -3 ../0001-build-Properly-apply-modes-in-meson_post_install.py.patch } build() {
