New upstream release

This commit is contained in:
Richard Hughes 2015-05-28 10:26:03 +01:00
parent 56f1ad5ef7
commit fc9f444a61
4 changed files with 11 additions and 46 deletions

1
.gitignore vendored
View File

@ -20,3 +20,4 @@ upower-0.9.5.tar.bz2
/upower-0.99.0.tar.xz
/upower-0.99.1.tar.xz
/upower-0.99.2.tar.xz
/upower-0.99.3.tar.xz

View File

@ -1,40 +0,0 @@
From 2510148b16a71504dff3880c8af416fd85a2885d Mon Sep 17 00:00:00 2001
From: Vlad Orlov <monsta@inbox.ru>
Date: Fri, 13 Mar 2015 13:17:31 +0100
Subject: [PATCH 5/5] lib: Fix crash on uninitialized variant
Initialize the GVariant* pointers, so that they aren't uninitialized when
jumping to "out:" and unref'ing them.
https://bugs.freedesktop.org/show_bug.cgi?id=89476
https://bugs.debian.org/774546
https://bugs.launchpad.net/ubuntu-mate/+bug/1428337
---
libupower-glib/up-device.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libupower-glib/up-device.c b/libupower-glib/up-device.c
index 9f6e0e1..f053f3d 100644
--- a/libupower-glib/up-device.c
+++ b/libupower-glib/up-device.c
@@ -422,7 +422,7 @@ GPtrArray *
up_device_get_history_sync (UpDevice *device, const gchar *type, guint timespec, guint resolution, GCancellable *cancellable, GError **error)
{
GError *error_local = NULL;
- GVariant *gva;
+ GVariant *gva = NULL;
guint i;
GPtrArray *array = NULL;
gboolean ret;
@@ -502,7 +502,7 @@ GPtrArray *
up_device_get_statistics_sync (UpDevice *device, const gchar *type, GCancellable *cancellable, GError **error)
{
GError *error_local = NULL;
- GVariant *gva;
+ GVariant *gva = NULL;
guint i;
GPtrArray *array = NULL;
gboolean ret;
--
1.9.3

View File

@ -1 +1 @@
93119fcb617a75ff9cd44999179ec217 upower-0.99.2.tar.xz
a9c95d0545bc23d784642c11e157cfbf upower-0.99.3.tar.xz

View File

@ -1,15 +1,12 @@
Summary: Power Management Service
Name: upower
Version: 0.99.2
Release: 4%{?dist}
Version: 0.99.3
Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://upower.freedesktop.org/
Source0: http://upower.freedesktop.org/releases/upower-%{version}.tar.xz
## upstream fixes
Patch5: 0005-lib-Fix-crash-on-uninitialized-variant.patch
BuildRequires: sqlite-devel
BuildRequires: libtool
BuildRequires: intltool
@ -113,6 +110,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_datadir}/gtk-doc/html/UPower/*
%changelog
* Thu May 28 2015 Richard Hughes <rhughes@redhat.com> - 0.99.3-1
- New upstream release
- Fix several crashes
- Properly detect bluetooth mice and keyboards that are HID devices
- Support Logitech Unifying in Linux 3.19
- Work-around broken battery on the Onda v975w
* Wed Mar 18 2015 Rex Dieter <rdieter@fedoraproject.org> - 0.99.2-4
- pull in upstream crash fix (#1128390)
- use %%autosetup