Accepting request 1068125 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/1068125
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/flatpak?expand=0&rev=78

flatpak-1.14.2.tar.xz

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

flatpak-1.14.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59f0470ccb894d852e4c6fbc1043d8bcc95e38033c5c36f2aa90dd295257eebe
+size 1630824

flatpak-fix-gpg-agent-double-free.patch

@@ -1,28 +0,0 @@
-From d7fb31b54077c676be50a6903090d4627b02b994 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@collabora.com>
-Date: Mon, 6 Feb 2023 16:09:29 +0000
-Subject: [PATCH] run: Avoid double-free of gpgconf stdout stream
-
-g_subprocess_get_stdout_pipe() does not transfer ownership, so the
-stream still belongs to the GSubprocess and we must not unref it.
-
-Fixes: 764e5a4d "Add --socket=gpg-agent"
-Resolves: https://github.com/flatpak/flatpak/issues/5095
-Signed-off-by: Simon McVittie <smcv@collabora.com>
----
- common/flatpak-run.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/common/flatpak-run.c b/common/flatpak-run.c
-index 8d613165e1..3c85f9223f 100644
---- a/common/flatpak-run.c
-+++ b/common/flatpak-run.c
-@@ -608,7 +608,7 @@ flatpak_run_add_gpg_agent_args (FlatpakBwrap *bwrap)
-   g_autofree char * sandbox_agent_socket = NULL;
-   g_autoptr(GError) gpgconf_error = NULL;
-   g_autoptr(GSubprocess) process = NULL;
--  g_autoptr(GInputStream) base_stream = NULL;
-+  GInputStream *base_stream = NULL;
-   g_autoptr(GDataInputStream) data_stream = NULL;
- 
-   process = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE,

flatpak.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Mon Feb 27 14:07:03 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.14.3:
+  + When splitting an upgrade into two steps (download without
+    installing, and then upgrade without allowing further
+    downloads) like GNOME Software does, if an app is marked EOL
+    and superseded by a replacement, don't remove the superseded
+    app in the first step, which would result in the replacement
+    incorrectly not being installed.
+  + Fix a crash when --socket=gpg-agent is used.
+  + Fix a crash when listing apps if one of them is broken or
+    misconfigured.
+  + If an app has invalid syntax in its overrides or metadata,
+    mention the filename in the error message.
+  + Unset $GDK_BACKEND for apps, ensuring GTK apps with
+    --socket=fallback-x11 can work.
+  + Never try to export a parent of reserved directories as a
+    --filesystem, for example /run, which would prevent the app
+    from starting.
+  + Never try to export a --filesystem below /run/flatpak or
+    /run/host, which could similarly prevent the app from starting.
+  + The above change also fixes apps not starting if a --filesystem
+    is a symlink to the root directory.
+  + Show a warning when the --filesystem exists but cannot be
+    shared with the sandbox.
+- Drop flatpak-fix-gpg-agent-double-free.patch: Fixed upstream.
+
 -------------------------------------------------------------------
 Thu Feb 23 08:41:51 UTC 2023 - Alynx Zhou <alynx.zhou@suse.com>
 

flatpak.spec

@@ -34,7 +34,7 @@
 %define support_environment_generators 1
 %endif
 Name:           flatpak
-Version:        1.14.2
+Version:        1.14.3
 Release:        0
 Summary:        OSTree based application bundles management
 License:        LGPL-2.1-or-later
@@ -44,9 +44,9 @@ Source0:        https://github.com/flatpak/flatpak/releases/download/%{version}/
 Source1:        update-system-flatpaks.service
 Source2:        update-system-flatpaks.timer
 Source3:        https://flathub.org/repo/flathub.flatpakrepo
+# PATCH-FEATURE-OPENSUSE polkit_rules_usability.patch -- Make the rules comply with openSUSE expectations
 Patch0:         polkit_rules_usability.patch
-# PATCH-FIX-UPSTREAM flatpak-fix-gpg-agent-double-free.patch bsc#1207434 alynx.zhou@suse.com -- Fix double free in in handling gpg-agent sockets
-Patch1:         flatpak-fix-gpg-agent-double-free.patch
+
 BuildRequires:  bison
 BuildRequires:  bubblewrap >= %{bubblewrap_version}
 BuildRequires:  docbook-xsl-stylesheets