Hello community,
here is the log from the commit of package upower for openSUSE:Factory checked
in at 2018-06-08 23:10:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/upower (Old)
and /work/SRC/openSUSE:Factory/.upower.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "upower"
Fri Jun 8 23:10:03 2018 rev:61 rq:614184 version:0.99.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/upower/upower.changes 2018-06-02
11:47:59.225157607 +0200
+++ /work/SRC/openSUSE:Factory/.upower.new/upower.changes 2018-06-08
23:10:22.607089538 +0200
@@ -1,0 +2,8 @@
+Tue Jun 5 07:37:22 UTC 2018 - bjorn....@gmail.com
+
+- Add upower-fix-crash-logind-doesnt-return-error.patch: Fix crash
+ if logind doesn't return an error.
+- Add upower-fix-memory-leak.patch: Fix memory leak if logind
+ returns an error.
+
+-------------------------------------------------------------------
New:
----
upower-fix-crash-logind-doesnt-return-error.patch
upower-fix-memory-leak.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ upower.spec ++++++
--- /var/tmp/diff_new_pack.x2AuCH/_old 2018-06-08 23:10:25.870971693 +0200
+++ /var/tmp/diff_new_pack.x2AuCH/_new 2018-06-08 23:10:25.874971549 +0200
@@ -34,6 +34,10 @@
Patch0: upower-hibernate-insteadof-hybridsleep.patch
# PATCH-FIX-UPSTREAM upower-fix-ios-crash.patch fdo#105625 nov...@mirell.de --
Fix endless crash loop freezing the system with AppleTV attached
Patch1: upower-fix-ios-crash.patch
+# PATCH-FIX-UPSTREAM upower-fix-crash-logind-doesnt-return-error.patch -- Fix
crash if logind doesn't return an error
+Patch2: upower-fix-crash-logind-doesnt-return-error.patch
+# PATCH-FIX-UPSTREAM upower-fix-memory-leak.patch -- Fix memory leak if logind
returns an error
+Patch3: upower-fix-memory-leak.patch
BuildRequires: gobject-introspection-devel >= 0.9.9
BuildRequires: gtk-doc >= 1.11
BuildRequires: intltool
@@ -105,6 +109,8 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%configure\
++++++ upower-fix-crash-logind-doesnt-return-error.patch ++++++
>From c68daf665f2a5f09179cdf19fa9bcc0bf935b8ec Mon Sep 17 00:00:00 2001
From: Bastien Nocera <had...@hadess.net>
Date: Thu, 12 Apr 2018 22:32:13 +0200
Subject: [PATCH] linux: Fix crash if logind doesn't return an error
For example, when using an incomplete mock logind.
---
src/linux/up-backend.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c
index e668dc8..60ca58f 100644
--- a/src/linux/up-backend.c
+++ b/src/linux/up-backend.c
@@ -668,7 +668,8 @@ up_backend_inhibitor_lock_take (UpBackend *backend)
NULL,
&error);
if (out == NULL) {
- g_warning ("Could not acquire inhibitor lock: %s",
error->message);
+ g_warning ("Could not acquire inhibitor lock: %s",
+ error ? error->message : "Unknown reason");
return;
}
--
libgit2 0.27.1
++++++ upower-fix-memory-leak.patch ++++++
>From 17dba403e7e82754ce8356dcc8c34f48418885bb Mon Sep 17 00:00:00 2001
From: Bastien Nocera <had...@hadess.net>
Date: Thu, 12 Apr 2018 22:34:04 +0200
Subject: [PATCH] linux: Fix memory leak if logind returns an error
---
src/linux/up-backend.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c
index 60ca58f..3126c58 100644
--- a/src/linux/up-backend.c
+++ b/src/linux/up-backend.c
@@ -670,6 +670,7 @@ up_backend_inhibitor_lock_take (UpBackend *backend)
if (out == NULL) {
g_warning ("Could not acquire inhibitor lock: %s",
error ? error->message : "Unknown reason");
+ g_clear_error (&error);
return;
}
--
libgit2 0.27.1
