rpm/libsecret
SHA256
1
0
Fork 0
forked from pool/libsecret
Code Pull Requests Activity

Accepting request 920820 from GNOME:Factory

Browse Source 
- Add libsecret-handle-UnknownObject.patch: some Secret Service
  API backend implementations (like keepassxc) throws
  UnknownObject instead of UnknownMethod, this patch handles it.
  (bsc#1190499, glgo#GNOME/libsecret!94) (forwarded request 920800 from AZhou)

OBS-URL: https://build.opensuse.org/request/show/920820
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libsecret?expand=0&rev=29
This commit is contained in:
Dominique Leuenberger 2021-09-26 19:48:11 +00:00 committed by Git OBS Bridge
commit a16c28ba4c
3 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libsecret-handle-UnknownObject.patch Normal file
View File

@ -0,0 +1,30 @@
From d620c79d83acc1bae0bbd7153a691f952b74ca31 Mon Sep 17 00:00:00 2001
From: Slava Aseev <ptrnine@altlinux.org>
Date: Mon, 16 Aug 2021 19:25:56 +0300
Subject: [PATCH] Create default collection after DBus.Error.UnknownObject
Some Secret Service API backend implementations (like keepassxc)
throws UnknownObject (instead of UnknownMethod as gnome-keyring do)
after creating an item in the non-existent
/org/freedesktop/secrets/aliases/default.
---
libsecret/secret-methods.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libsecret/secret-methods.c b/libsecret/secret-methods.c
index c4decf8..b9b696e 100644
--- a/libsecret/secret-methods.c
+++ b/libsecret/secret-methods.c
@@ -1050,7 +1050,8 @@ on_store_create (GObject *source,
if (!store->created_collection &&
(g_error_matches (error, SECRET_ERROR, SECRET_ERROR_NO_SUCH_OBJECT) ||
- g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD)) &&
+ g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD) ||
+ g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_OBJECT)) &&
g_strcmp0 (store->collection_path, SECRET_ALIAS_PREFIX "default") == 0) {
properties = _secret_collection_properties_new (_("Default keyring"));
secret_service_create_collection_dbus_path (service, properties, "default",
--
GitLab

14
libsecret.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 22 06:23:46 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com>
- Add libsecret-handle-UnknownObject.patch: some Secret Service
API backend implementations (like keepassxc) throws
UnknownObject instead of UnknownMethod, this patch handles it.
(bsc#1190499, glgo#GNOME/libsecret!94)
-------------------------------------------------------------------
Thu Sep 16 02:01:38 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
- Remove obsolete translation-update-upstream support
(jsc#SLE-21105).
-------------------------------------------------------------------
Sat Oct 10 16:57:04 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>

7
libsecret.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libsecret
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -26,6 +26,8 @@ URL: https://wiki.gnome.org/Projects/Libsecret
Source0: https://download.gnome.org/sources/libsecret/0.20/%{name}-%{version}.tar.xz
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM libsecret-handle-UnknownObject.patch bsc#1190499, glgo#GNOME/libsecret!94 alynx.zhou@suse.com -- handle UnknownObject which is thrown by some implementations
Patch0: libsecret-handle-UnknownObject.patch
## SLE-only patches start at 1000
# PATCH-FIX-SLE libsecret-bsc932232-use-libgcrypt-allocators.patch bsc#932232 hpj@suse.com -- use libgcrypt allocators for FIPS mode
Patch1000: libsecret-bsc932232-use-libgcrypt-allocators.patch
@ -37,7 +39,6 @@ BuildRequires: gtk-doc
BuildRequires: libgcrypt-devel >= 1.2.2
BuildRequires: meson >= 0.50
BuildRequires: pkgconfig
BuildRequires: translation-update-upstream
BuildRequires: vala >= 0.17.2.12
BuildRequires: xsltproc
BuildRequires: pkgconfig(gio-2.0)
@ -92,10 +93,10 @@ secrets. It communicates with the "Secret Service" using DBus.
%prep
%setup -q
%patch0 -p1
%if 0%{?sle_version}
%patch1000 -p1
%endif
translation-update-upstream
%build
%meson \