Date: Sunday, September 8, 2019 @ 09:16:32 Author: arojas Revision: 362036
Fix freezes in Plasma (FS#63614) Modified: ostree/trunk/PKGBUILD Deleted: ostree/trunk/1908.patch ------------+ 1908.patch | 71 ----------------------------------------------------------- PKGBUILD | 14 ++++++----- 2 files changed, 8 insertions(+), 77 deletions(-) Deleted: 1908.patch =================================================================== --- 1908.patch 2019-09-08 01:31:25 UTC (rev 362035) +++ 1908.patch 2019-09-08 09:16:32 UTC (rev 362036) @@ -1,71 +0,0 @@ -From 745d7fd55d3cfce0c121401158ffefbdbecd4644 Mon Sep 17 00:00:00 2001 -From: Dan Nicholson <[email protected]> -Date: Thu, 15 Aug 2019 22:24:54 -0600 -Subject: [PATCH] lib/gpg: Only show gpg-connect-agent stderr on failures - -When listing GPG keys, the temporary GPG homedir will be constructed by -simply copying the remote's trusted keys to the pubring.gpg file. In -that case, no GPG operations spawning gpg-agent will be run. When -gpg-connect-agent is run to cleanup the homedir, it will helpfully print -on stderr that it's starting gpg-agent like so: - -gpg-connect-agent: no running gpg-agent - starting '/usr/bin/gpg-agent' -gpg-connect-agent: waiting for the agent to come up ... (5s) -gpg-connect-agent: connection to agent established - -Send gpg-connect-agent's stderr to a pipe and only send it to the -application's stderr if an error was encountered. - -Fixes: #1907 ---- - src/libotutil/ot-gpg-utils.c | 25 +++++++++++++++++-------- - 1 file changed, 17 insertions(+), 8 deletions(-) - -diff --git a/src/libotutil/ot-gpg-utils.c b/src/libotutil/ot-gpg-utils.c -index cf5ce3ea7..35e854b32 100644 ---- a/src/libotutil/ot-gpg-utils.c -+++ b/src/libotutil/ot-gpg-utils.c -@@ -25,6 +25,7 @@ - - #include <stdlib.h> - -+#include <gio/gunixoutputstream.h> - #include "libglnx.h" - - /* Like glnx_throw_errno_prefix, but takes @gpg_error */ -@@ -445,19 +446,27 @@ ot_gpgme_kill_agent (const char *homedir) - - /* Run gpg-connect-agent killagent /bye */ - g_autoptr(GError) local_error = NULL; -- g_autoptr(GSubprocess) proc = g_subprocess_new(G_SUBPROCESS_FLAGS_STDOUT_SILENCE, -- &local_error, -- "gpg-connect-agent", -- "--homedir", -- homedir, -- "killagent", -- "/bye", -- NULL); -+ GSubprocessFlags flags = G_SUBPROCESS_FLAGS_STDOUT_SILENCE | G_SUBPROCESS_FLAGS_STDERR_PIPE; -+ g_autoptr(GSubprocess) proc = g_subprocess_new (flags, -+ &local_error, -+ "gpg-connect-agent", -+ "--homedir", -+ homedir, -+ "killagent", -+ "/bye", -+ NULL); - if (proc == NULL) { - g_debug ("Spawning gpg-connect-agent failed: %s", local_error->message); - return; - } - if (!g_subprocess_wait_check (proc, NULL, &local_error)) { -+ /* Dump out stderr on failures */ -+ GInputStream *stderr_in = g_subprocess_get_stderr_pipe (proc); -+ g_autoptr(GOutputStream) stderr_out = -+ G_OUTPUT_STREAM (g_unix_output_stream_new (STDERR_FILENO, FALSE)); -+ g_output_stream_splice (stderr_out, stderr_in, G_OUTPUT_STREAM_SPLICE_NONE, -+ NULL, NULL); -+ - g_debug ("Killing GPG agent with gpg-connect-agent failed: %s", - local_error->message); - return; Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-09-08 01:31:25 UTC (rev 362035) +++ PKGBUILD 2019-09-08 09:16:32 UTC (rev 362036) @@ -3,7 +3,7 @@ pkgname=ostree pkgver=2019.3 -pkgrel=2 +pkgrel=3 pkgdesc="Operating system and container binary deployment and upgrades" url="https://ostree.readthedocs.org/en/latest/"; arch=(x86_64) @@ -14,12 +14,10 @@ _commit=b15ed42111c25bd3fcb0d9bdc425f79f771fcece # tags/v2019.3^0 source=("git+https://github.com/ostreedev/ostree#commit=$_commit"; "git+https://github.com/mendsley/bsdiff"; - "git+https://gitlab.gnome.org/GNOME/libglnx.git"; - 1908.patch) + "git+https://gitlab.gnome.org/GNOME/libglnx.git";) sha256sums=('SKIP' 'SKIP' - 'SKIP' - 'f2fadec4f29418a61164b5b50ee9829124e2b6427d820dc064a3597aace55ad9') + 'SKIP') prepare() { cd $pkgname @@ -29,8 +27,12 @@ git config --local submodule.libglnx.url "$srcdir/libglnx" git submodule update - patch -p1 -i "$srcdir/1908.patch" + git cherry-pick -n 522d31b2d4604026f1c0a442887ca9d4b319e9cc +# Fix freezes in Plasma + git cherry-pick -n d14472a7f04d02d392d2754cfb3cec881aadc704 + git cherry-pick -n e49060c207fd201f71316bf174e1b467827abc7a + NOCONFIGURE=1 ./autogen.sh }
