[arch-commits] Commit in accountsservice/repos/extra-x86_64 (4 files)
Jan Steffens
heftig at gemini.archlinux.org
Sat Jan 29 00:53:03 UTC 2022
Date: Saturday, January 29, 2022 @ 00:53:03
Author: heftig
Revision: 435330
archrelease: copy trunk to extra-x86_64
Added:
accountsservice/repos/extra-x86_64/0001-build-Properly-apply-modes-in-meson_post_install.py.patch
(from rev 435329, accountsservice/trunk/0001-build-Properly-apply-modes-in-meson_post_install.py.patch)
accountsservice/repos/extra-x86_64/PKGBUILD
(from rev 435329, accountsservice/trunk/PKGBUILD)
Deleted:
accountsservice/repos/extra-x86_64/PKGBUILD
accountsservice/repos/extra-x86_64/dirmode.diff
----------------------------------------------------------------+
0001-build-Properly-apply-modes-in-meson_post_install.py.patch | 38 +++
PKGBUILD | 111 +++++-----
dirmode.diff | 20 -
3 files changed, 94 insertions(+), 75 deletions(-)
Copied: accountsservice/repos/extra-x86_64/0001-build-Properly-apply-modes-in-meson_post_install.py.patch (from rev 435329, accountsservice/trunk/0001-build-Properly-apply-modes-in-meson_post_install.py.patch)
===================================================================
--- 0001-build-Properly-apply-modes-in-meson_post_install.py.patch (rev 0)
+++ 0001-build-Properly-apply-modes-in-meson_post_install.py.patch 2022-01-29 00:53:03 UTC (rev 435330)
@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+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)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-01-29 00:51:48 UTC (rev 435329)
+++ PKGBUILD 2022-01-29 00:53:03 UTC (rev 435330)
@@ -1,55 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=accountsservice
-pkgver=22.04.62
-pkgrel=1
-pkgdesc="D-Bus interface for user account query and manipulation"
-url="https://gitlab.freedesktop.org/accountsservice/accountsservice"
-arch=(x86_64)
-license=(GPL3)
-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"
- dirmode.diff)
-sha256sums=('SKIP'
- 'abb66aa011ac72a28b2e766f5d713028143fb3b642fb7e3ae81bea1b70c9ec26')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-
-prepare() {
- cd $pkgname
-
- # Fix permissions to match the ones the daemon sets
- git apply -3 ../dirmode.diff
-}
-
-build() {
- local meson_options=(
- -D admin_group=wheel
- -D docbook=true
- -D gtk_doc=true
- )
-
- arch-meson $pkgname build "${meson_options[@]}"
- meson compile -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-package() {
- depends+=(libg{lib,object,io}-2.0.so libsystemd.so libcrypt.so)
- provides+=(libaccountsservice.so)
-
- meson install -C build --destdir "$pkgdir"
-}
-
-# vim:set sw=2 et:
Copied: accountsservice/repos/extra-x86_64/PKGBUILD (from rev 435329, accountsservice/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-01-29 00:53:03 UTC (rev 435330)
@@ -0,0 +1,56 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=accountsservice
+pkgver=22.04.62
+pkgrel=2
+pkgdesc="D-Bus interface for user account query and manipulation"
+url="https://gitlab.freedesktop.org/accountsservice/accountsservice"
+arch=(x86_64)
+license=(GPL3)
+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')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+
+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() {
+ local meson_options=(
+ -D admin_group=wheel
+ -D docbook=true
+ -D gtk_doc=true
+ )
+
+ arch-meson $pkgname build "${meson_options[@]}"
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+package() {
+ depends+=(libg{lib,object,io}-2.0.so libsystemd.so libcrypt.so)
+ provides+=(libaccountsservice.so)
+
+ meson install -C build --destdir "$pkgdir"
+}
+
+# vim:set sw=2 et:
Deleted: dirmode.diff
===================================================================
--- dirmode.diff 2022-01-29 00:51:48 UTC (rev 435329)
+++ dirmode.diff 2022-01-29 00:53:03 UTC (rev 435330)
@@ -1,20 +0,0 @@
- meson_post_install.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git c/meson_post_install.py i/meson_post_install.py
-index 5cc2dc4..76348a2 100644
---- c/meson_post_install.py
-+++ i/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', 'AccountsService'), 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)
More information about the arch-commits
mailing list