rpm/gnome-software
SHA256
1
0
Fork 0
forked from pool/gnome-software
Code Pull Requests Activity

Accepting request 562585 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/562585
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-software?expand=0&rev=49
This commit is contained in:
Dominique Leuenberger 2018-01-16 08:28:25 +00:00 committed by Git OBS Bridge
commit 9dcc914538
5 changed files with 26 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-software-3.26.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f74fd5fb222c99d4fcb91500cea0c62a0eb8022700bdea51acecb41c63f8e48
size 5113344

3
gnome-software-3.26.4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:86e2d303af02268be245527638bd1dc59be55733df6d5df94735acf9534000f0
size 5114468

20
gnome-software.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Mon Jan 8 15:53:22 UTC 2018 - zaitor@opensuse.org
- Update to version 3.26.4:
+ Fix crashes in the repos plugin due to missing locking.
+ Work around Firefox deleting rpm/deb files downloaded to /tmp
when closing.
+ Do not require the user to keep clicking 'More reviews' after
each click.
+ Fix a critical when updating (flatpak) packages live.
+ fwupd: Prepend the vendor name to the device name if not
included.
+ Improve SPDX ID parsing when working out if it is 'free'.
+ packagekit: Do not crash when getting an invalid ID from
PackageKit.
+ Do not crash when closing the source dialog while it is
loading.
+ Updated translations.
- Drop gs-add-locking-to-the-repos-plugin.patch: Fixed upstream.
-------------------------------------------------------------------
Sun Nov 26 12:27:37 UTC 2017 - zaitor@opensuse.org

7
gnome-software.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gnome-software
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,15 +18,14 @@
%define gs_plugin_api 11
Name: gnome-software
Version: 3.26.3
Version: 3.26.4
Release: 0
Summary: GNOME Software Store
License: GPL-2.0+
Group: System/GUI/GNOME
Url: https://wiki.gnome.org/Design/Apps/Software
Source0: http://download.gnome.org/sources/gnome-software/3.26/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gs-add-locking-to-the-repos-plugin.patch rh#1516536 zaitor@opensuse.org -- Add locking to the repos plugin
Patch0: gs-add-locking-to-the-repos-plugin.patch
BuildRequires: gtk-doc
BuildRequires: intltool >= 0.35.0
BuildRequires: meson

64
gs-add-locking-to-the-repos-plugin.patch
View File

@ -1,64 +0,0 @@
From d39f372902875f2cd762df2489e761053e94c883 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Wed, 22 Nov 2017 23:17:58 +0100
Subject: Add locking to the repos plugin
... so that we don't modify the priv->urls hash table concurrently from
multiple threads.
https://bugzilla.redhat.com/show_bug.cgi?id=1516536
---
plugins/repos/gs-plugin-repos.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/plugins/repos/gs-plugin-repos.c b/plugins/repos/gs-plugin-repos.c
index 321f05c..468a6f3 100644
--- a/plugins/repos/gs-plugin-repos.c
+++ b/plugins/repos/gs-plugin-repos.c
@@ -26,6 +26,7 @@
struct GsPluginData {
GHashTable *urls; /* origin : url */
GFileMonitor *monitor;
+ GMutex mutex;
gchar *reposdir;
gboolean valid;
};
@@ -35,6 +36,8 @@ gs_plugin_initialize (GsPlugin *plugin)
{
GsPluginData *priv = gs_plugin_alloc_data (plugin, sizeof(GsPluginData));
+ g_mutex_init (&priv->mutex);
+
/* for debugging and the self tests */
priv->reposdir = g_strdup (g_getenv ("GS_SELF_TEST_REPOS_DIR"));
if (priv->reposdir == NULL)
@@ -62,8 +65,10 @@ gs_plugin_destroy (GsPlugin *plugin)
g_hash_table_unref (priv->urls);
if (priv->monitor != NULL)
g_object_unref (priv->monitor);
+ g_mutex_clear (&priv->mutex);
}
+/* mutex must be held */
static gboolean
gs_plugin_repos_setup (GsPlugin *plugin, GCancellable *cancellable, GError **error)
{
@@ -145,6 +150,7 @@ gs_plugin_setup (GsPlugin *plugin, GCancellable *cancellable, GError **error)
{
GsPluginData *priv = gs_plugin_get_data (plugin);
g_autoptr(GFile) file = g_file_new_for_path (priv->reposdir);
+ g_autoptr(GMutexLocker) locker = g_mutex_locker_new (&priv->mutex);
/* watch for changes */
priv->monitor = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, cancellable, error);
@@ -168,6 +174,7 @@ gs_plugin_refine_app (GsPlugin *plugin,
{
GsPluginData *priv = gs_plugin_get_data (plugin);
const gchar *tmp;
+ g_autoptr(GMutexLocker) locker = g_mutex_locker_new (&priv->mutex);
/* not required */
if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_ORIGIN_HOSTNAME) == 0)
--
cgit v0.12