Update to today's git snapshot

This commit is contained in:
Kalev Lember 2016-08-05 18:38:44 +02:00
parent 894da7f6f3
commit e7acc55c33
4 changed files with 12 additions and 56 deletions

1
.gitignore vendored
View File

@ -56,3 +56,4 @@ PackageKit-0.6.7.tar.bz2
/PackageKit-1.1.1.tar.xz
/PackageKit-1.1.2.tar.xz
/PackageKit-1.1.3.tar.xz
/PackageKit-1.1.4-20160805.tar.xz

View File

@ -1,47 +0,0 @@
From 3c121a4f86d01d27399f0c2bbace6df03800a1d1 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Mon, 25 Jul 2016 10:43:53 +0200
Subject: [PATCH] engine: Don't crash when emitting PropertiesChanged for NULL
values
When emitting PropertiesChanged, avoid putting NULL values into the
changed_properties array (and then subsequently crashing for the NULL).
Instead, use the invalidate_properties array that only lists the changed
property names, avoiding issues with NULL GVariants.
https://bugzilla.redhat.com/show_bug.cgi?id=1359479
---
src/pk-engine.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/pk-engine.c b/src/pk-engine.c
index f7ced65..f731f3a 100644
--- a/src/pk-engine.c
+++ b/src/pk-engine.c
@@ -251,11 +251,18 @@ pk_engine_emit_offline_property_changed (PkEngine *engine,
/* build the dict */
g_variant_builder_init (&invalidated_builder, G_VARIANT_TYPE ("as"));
- g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY);
- g_variant_builder_add (&builder,
- "{sv}",
- property_name,
- property_value);
+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
+
+ if (property_value == NULL) {
+ g_variant_builder_add (&invalidated_builder,
+ "s",
+ property_name);
+ } else {
+ g_variant_builder_add (&builder,
+ "{sv}",
+ property_name,
+ property_value);
+ }
g_dbus_connection_emit_signal (engine->priv->connection,
NULL,
PK_DBUS_PATH,
--
2.7.4

View File

@ -1,22 +1,21 @@
%global _changelog_trimtime %(date +%s -d "1 year ago")
%define gitdate 20141015
%global gitdate 20160805
%global glib2_version 2.46.0
%global libhif_version 0.2.3
Summary: Package management service
Name: PackageKit
Version: 1.1.3
Release: 2%{?dist}
Version: 1.1.4
Release: 0.1.%{gitdate}%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.freedesktop.org/software/PackageKit/
Source0: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz
#Source0: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz
Source0: %{name}-%{version}-%{gitdate}.tar.xz
# Fedora-specific: set Vendor.conf up for Fedora.
Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch
# Backported from upstream
Patch1: 0001-engine-Don-t-crash-when-emitting-PropertiesChanged-f.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: xmlto
@ -150,9 +149,9 @@ A simple helper that offers to install new packages on the command line
using PackageKit.
%prep
%setup -q
#setup -q
%setup -q -n %{name}-%{version}-%{gitdate}
%patch0 -p1 -b .fedora
%patch1 -p1
%build
%configure \
@ -280,6 +279,9 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
%{_datadir}/vala/vapi/packagekit-glib2.vapi
%changelog
* Fri Aug 05 2016 Kalev Lember <klember@redhat.com> - 1.1.4-0.1.20160805
- Update to today's git snapshot
* Wed Jul 27 2016 Kalev Lember <klember@redhat.com> - 1.1.3-2
- engine: Don't crash when emitting PropertiesChanged for NULL values
(#1359479)

View File

@ -1 +1 @@
bf5e150b1bfc964f39ac7f6b3faf3c81 PackageKit-1.1.3.tar.xz
3dc899370870b6b90711aee60ae8a0a1 PackageKit-1.1.4-20160805.tar.xz