Update to 0.11.6

This commit is contained in:
Kalev Lember 2018-05-02 14:16:11 +02:00
parent 14c8c6d878
commit ba7221883c
4 changed files with 7 additions and 41 deletions

1
.gitignore vendored
View File

@ -41,3 +41,4 @@
/flatpak-0.11.3.tar.xz /flatpak-0.11.3.tar.xz
/flatpak-0.11.4.tar.xz /flatpak-0.11.4.tar.xz
/flatpak-0.11.5.tar.xz /flatpak-0.11.5.tar.xz
/flatpak-0.11.6.tar.xz

View File

@ -1,36 +0,0 @@
From 72cad276323914503c3271aa0670d309c1124125 Mon Sep 17 00:00:00 2001
From: Matthew Leeds <matthew.leeds@endlessm.com>
Date: Tue, 1 May 2018 09:18:03 -0700
Subject: [PATCH] lib: Don't try to use a NULL FlatpakRemoteState
In flatpak_remote_ref_new(), the state parameter is optional, so check
if it's NULL before trying to use it in
flatpak_remote_state_lookup_sparse_cache(). This prevents a seg fault
when GNOME Software is installing a .flatpakref file.
Fixes https://github.com/flatpak/flatpak/issues/1632
Closes: #1635
Approved by: pwithnall
---
lib/flatpak-remote-ref.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/flatpak-remote-ref.c b/lib/flatpak-remote-ref.c
index 0a4c1e4d..3573fa6d 100644
--- a/lib/flatpak-remote-ref.c
+++ b/lib/flatpak-remote-ref.c
@@ -350,7 +350,9 @@ flatpak_remote_ref_new (FlatpakCollectionRef *coll_ref,
if (metadata)
metadata_bytes = g_bytes_new (metadata, strlen (metadata));
- sparse = flatpak_remote_state_lookup_sparse_cache (state, full_ref, NULL);
+ if (state)
+ sparse = flatpak_remote_state_lookup_sparse_cache (state, full_ref, NULL);
+
if (sparse)
{
g_variant_lookup (sparse, "eol", "&s", &eol);
--
2.17.0

View File

@ -2,16 +2,14 @@
%global ostree_version 2017.14 %global ostree_version 2017.14
Name: flatpak Name: flatpak
Version: 0.11.5 Version: 0.11.6
Release: 2%{?dist} Release: 1%{?dist}
Summary: Application deployment framework for desktop apps Summary: Application deployment framework for desktop apps
License: LGPLv2+ License: LGPLv2+
URL: http://flatpak.org/ 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
Patch0: 0001-lib-Don-t-try-to-use-a-NULL-FlatpakRemoteState.patch
BuildRequires: pkgconfig(appstream-glib) BuildRequires: pkgconfig(appstream-glib)
BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.40.0 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.40.0
@ -150,6 +148,9 @@ flatpak remote-list --system &> /dev/null || :
%changelog %changelog
* Wed May 02 2018 Kalev Lember <klember@redhat.com> - 0.11.6-1
- Update to 0.11.6
* Wed May 02 2018 Kalev Lember <klember@redhat.com> - 0.11.5-2 * Wed May 02 2018 Kalev Lember <klember@redhat.com> - 0.11.5-2
- Backport a fix for a gnome-software crash installing .flatpakref files - Backport a fix for a gnome-software crash installing .flatpakref files

View File

@ -1 +1 @@
SHA512 (flatpak-0.11.5.tar.xz) = 807f948fb79b54398f15ebf9b5c8676aaedcd509163fed294ce2e396715f69a117e9a813cfe5e56ff9c709a11f45f653e71f3e83b5901bf319506a6b647a4c09 SHA512 (flatpak-0.11.6.tar.xz) = a63d3a0af27412b196b87aaffd4cd4cdfa2af1d854a1f8b2d8d669eaf32dfb65534610dbc63f0df1ad2d8234d1d29b7cc9c51cc2cc849c81b49f80c9659f5569