Date: Monday, March 13, 2023 @ 17:14:09
Author: heftig
Revision: 470773
archrelease: copy trunk to extra-x86_64
Added:
accountsservice/repos/extra-x86_64/PKGBUILD
(from rev 470772, accountsservice/trunk/PKGBUILD)
accountsservice/repos/extra-x86_64/fix-tests.diff
(from rev 470772, accountsservice/trunk/fix-tests.diff)
Deleted:
accountsservice/repos/extra-x86_64/PKGBUILD
accountsservice/repos/extra-x86_64/fix-tests.diff
----------------+
PKGBUILD | 139 ++++++++++++++++++++++++++++++++-----------------------
fix-tests.diff | 32 ++++++------
2 files changed, 99 insertions(+), 72 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-13 17:13:55 UTC (rev 470772)
+++ PKGBUILD 2023-03-13 17:14:09 UTC (rev 470773)
@@ -1,56 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-# Contributor: Ionut Biru <[email protected]>
-
-pkgname=accountsservice
-pkgver=22.08.8
-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)
-options=(debug)
-_commit=1ef3add46983af875adfed5d29954cbfb184f688 # tags/22.08.8^0
-source=("git+https://gitlab.freedesktop.org/accountsservice/accountsservice.git#commit=$_commit";
- fix-tests.diff)
-sha256sums=('SKIP'
- '2da027faae5e477ed9ff57e3fc3cb8cd607073835118a05dd7b86bb7ff7c47fd')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-
-prepare() {
- cd $pkgname
-
- # Tests are broken: https://github.com/martinpitt/python-dbusmock/issues/118
- git apply -3 ../fix-tests.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 470772,
accountsservice/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-03-13 17:14:09 UTC (rev 470773)
@@ -0,0 +1,83 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Contributor: Ionut Biru <[email protected]>
+
+pkgname=accountsservice
+pkgver=22.08.8
+pkgrel=3
+pkgdesc="D-Bus interface for user account query and manipulation"
+url="https://gitlab.freedesktop.org/accountsservice/accountsservice";
+arch=(x86_64)
+license=(GPL3)
+depends=(
+ glib2
+ libxcrypt
+ polkit
+ shadow
+ systemd
+)
+makedepends=(
+ docbook-xsl
+ git
+ gobject-introspection
+ gtk-doc
+ meson
+ vala
+ xmlto
+)
+checkdepends=(
+ python-dbusmock
+ python-gobject
+)
+_commit=1ef3add46983af875adfed5d29954cbfb184f688 # tags/22.08.8^0
+source=(
+
"git+https://gitlab.freedesktop.org/accountsservice/accountsservice.git#commit=$_commit";
+ 0001-user-manager-Prevent-use-after-free-of-request-user.patch
+)
+b2sums=('SKIP'
+
'249ba2e824a600b4f12030d789c531114699ba4b76957e841c89301d192ddaddc71cd2a9b0f0d432164b6e528132b3f6348e7086a778d372daf6d1de5650e0cd')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+
+prepare() {
+ cd $pkgname
+
+ # Fix tests
+ git cherry-pick -n fea3ecdc8e4877eb1960f5ec3ae319a3fd1aea26 \
+ c588aea01bcc20353f8d28a78125e211bdc25097
+
+ # https://bugs.archlinux.org/task/77830
+ #
https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/124
+ git apply -3
../0001-user-manager-Prevent-use-after-free-of-request-user.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+=(
+ libcrypt.so
+ libg{lib,object,io}-2.0.so
+ libsystemd.so
+ )
+ provides+=(libaccountsservice.so)
+
+ meson install -C build --destdir "$pkgdir"
+}
+
+# vim:set sw=2 sts=-1 et:
Deleted: fix-tests.diff
===================================================================
--- fix-tests.diff 2023-03-13 17:13:55 UTC (rev 470772)
+++ fix-tests.diff 2023-03-13 17:14:09 UTC (rev 470773)
@@ -1,16 +0,0 @@
-diff --git i/tests/dbusmock/accounts_service.py
w/tests/dbusmock/accounts_service.py
-index 81692b2..eabe12c 100644
---- i/tests/dbusmock/accounts_service.py
-+++ w/tests/dbusmock/accounts_service.py
-@@ -170,8 +170,9 @@ def CreateUser(self, name, fullname, account_type):
-
- self.users_auto_uids += 1
-
-- return self.AddUser(self.users_auto_uids, name, DEFAULT_USER_PASSWORD, {
-- 'RealName': fullname, 'AccountType': account_type})
-+ return self.AddUser(self.users_auto_uids, name, DEFAULT_USER_PASSWORD,
-+ dbus.Dictionary({'RealName': fullname, 'AccountType': account_type},
-+ signature='sv'))
-
-
- @dbus.service.method(MAIN_IFACE, in_signature='xb')
Copied: accountsservice/repos/extra-x86_64/fix-tests.diff (from rev 470772,
accountsservice/trunk/fix-tests.diff)
===================================================================
--- fix-tests.diff (rev 0)
+++ fix-tests.diff 2023-03-13 17:14:09 UTC (rev 470773)
@@ -0,0 +1,16 @@
+diff --git i/tests/dbusmock/accounts_service.py
w/tests/dbusmock/accounts_service.py
+index 81692b2..eabe12c 100644
+--- i/tests/dbusmock/accounts_service.py
++++ w/tests/dbusmock/accounts_service.py
+@@ -170,8 +170,9 @@ def CreateUser(self, name, fullname, account_type):
+
+ self.users_auto_uids += 1
+
+- return self.AddUser(self.users_auto_uids, name, DEFAULT_USER_PASSWORD, {
+- 'RealName': fullname, 'AccountType': account_type})
++ return self.AddUser(self.users_auto_uids, name, DEFAULT_USER_PASSWORD,
++ dbus.Dictionary({'RealName': fullname, 'AccountType': account_type},
++ signature='sv'))
+
+
+ @dbus.service.method(MAIN_IFACE, in_signature='xb')
