Update to 1.3.3 (#1699338)

This commit is contained in:
David King 2019-04-26 13:58:08 +01:00
parent eedcdf86b8
commit 40544a97aa
4 changed files with 7 additions and 32 deletions

1
.gitignore vendored
View File

@ -66,3 +66,4 @@
/flatpak-1.3.0.tar.xz /flatpak-1.3.0.tar.xz
/flatpak-1.3.1.tar.xz /flatpak-1.3.1.tar.xz
/flatpak-1.3.2.tar.xz /flatpak-1.3.2.tar.xz
/flatpak-1.3.3.tar.xz

View File

@ -1,28 +0,0 @@
From 9647c954c34b3547ff260c4a02d2f7ed5ef47ff7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 14 Apr 2019 23:38:39 -0400
Subject: [PATCH] Fix a system-helper crash
As seen in https://github.com/flatpak/flatpak/issues/2829,
the system-helper crashes while trying to access an as
parameter as s. Looking at the likely culprits for this,
I find that the permission check for Deploy has an off-by-one
error where it tries to get the installation, but
passes the offset for the previous_ids parameter.
---
system-helper/flatpak-system-helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/system-helper/flatpak-system-helper.c b/system-helper/flatpak-system-helper.c
index 59cc65c5b..b8deab755 100644
--- a/system-helper/flatpak-system-helper.c
+++ b/system-helper/flatpak-system-helper.c
@@ -1885,7 +1885,7 @@ flatpak_authorize_method_handler (GDBusInterfaceSkeleton *interface,
g_variant_get_child (parameters, 1, "u", &flags);
g_variant_get_child (parameters, 2, "&s", &ref);
g_variant_get_child (parameters, 3, "&s", &origin);
- g_variant_get_child (parameters, 5, "&s", &installation);
+ g_variant_get_child (parameters, 6, "&s", &installation);
/* For metadata updates, redirect to the metadata-update action which
* should basically always be allowed */

View File

@ -2,8 +2,8 @@
%global ostree_version 2018.9 %global ostree_version 2018.9
Name: flatpak Name: flatpak
Version: 1.3.2 Version: 1.3.3
Release: 2%{?dist} Release: 1%{?dist}
Summary: Application deployment framework for desktop apps Summary: Application deployment framework for desktop apps
License: LGPLv2+ License: LGPLv2+
@ -11,7 +11,6 @@ URL: http://flatpak.org/
Source0: https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz Source0: https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz
# Add Fedora flatpak repositories # Add Fedora flatpak repositories
Source1: flatpak-add-fedora-repos.service Source1: flatpak-add-fedora-repos.service
Patch0: flatpak-1.3.2-system-helper.patch
BuildRequires: pkgconfig(appstream-glib) BuildRequires: pkgconfig(appstream-glib)
BuildRequires: pkgconfig(dconf) BuildRequires: pkgconfig(dconf)
@ -245,6 +244,9 @@ fi
%changelog %changelog
* Fri Apr 26 2019 David King <amigadave@amigadave.com> - 1.3.3-1
- Update to 1.3.3 (#1699338)
* Wed Apr 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.2-2 * Wed Apr 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.2-2
- Fixup selinux requires - Fixup selinux requires

View File

@ -1 +1 @@
SHA512 (flatpak-1.3.2.tar.xz) = f65b6ef2e231a1ad7039defcaa5109a167eaa65870f6876e119b4e6923155b2628e7b539cd2337f03ded5ccda4ea274039cd5ce93cf85cab8d434b89bcc08c10 SHA512 (flatpak-1.3.3.tar.xz) = 4f414874a46b6e499d20df6ad6a8f66484bee94bd8e02743b15ff0c3a3e906e96115872d4096802d5b0b6c2a06a0e2d653b53b05fca6dc285b9d932ecb06a34f