From 42fba479836063e65a45e1b1606e46c2669ce998 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Thu, 24 Aug 2017 13:48:29 +0200 Subject: [PATCH 1/4] Add patch to not correctly close the inhibitor FD --- 0001-linux-Correctly-close-inhibitor-FD.patch | 44 +++++++++++++++++++ upower.spec | 7 ++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 0001-linux-Correctly-close-inhibitor-FD.patch diff --git a/0001-linux-Correctly-close-inhibitor-FD.patch b/0001-linux-Correctly-close-inhibitor-FD.patch new file mode 100644 index 0000000..d1c37c1 --- /dev/null +++ b/0001-linux-Correctly-close-inhibitor-FD.patch @@ -0,0 +1,44 @@ +From 502c63b54944064dfd5f5cc4463bfb3d457a95c0 Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Thu, 3 Aug 2017 17:12:50 +0200 +Subject: [PATCH] linux: Correctly close inhibitor FD + +The unref of the FD list for the inhibitor was missing which means that +the FD was leaked and the lock was never released. This means that for +each suspend/resume cycle a new inhibitor would be added. + +Signed-off-by: Richard Hughes +--- + src/linux/up-backend.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c +index c5f8fd9..e7684a2 100644 +--- a/src/linux/up-backend.c ++++ b/src/linux/up-backend.c +@@ -475,7 +475,7 @@ static void + up_backend_inhibitor_lock_take (UpBackend *backend) + { + GVariant *out, *input; +- GUnixFDList *fds; ++ GUnixFDList *fds = NULL; + GError *error = NULL; + + if (backend->priv->logind_inhibitor_fd > -1) { +@@ -505,11 +505,13 @@ up_backend_inhibitor_lock_take (UpBackend *backend) + if (g_unix_fd_list_get_length (fds) != 1) { + g_warning ("Unexpected values returned by logind's 'Inhibit'"); + g_variant_unref (out); ++ g_object_unref (fds); + return; + } + + backend->priv->logind_inhibitor_fd = g_unix_fd_list_get (fds, 0, NULL); + g_variant_unref (out); ++ g_object_unref (fds); + + g_debug ("Acquired inhibitor lock (%i)", backend->priv->logind_inhibitor_fd); + } +-- +2.13.5 + diff --git a/upower.spec b/upower.spec index ed05c9a..bae05c4 100644 --- a/upower.spec +++ b/upower.spec @@ -1,12 +1,14 @@ Summary: Power Management Service Name: upower Version: 0.99.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://upower.freedesktop.org/ Source0: http://upower.freedesktop.org/releases/upower-%{version}.tar.xz +Patch0: 0001-linux-Correctly-close-inhibitor-FD.patch + BuildRequires: sqlite-devel BuildRequires: libtool BuildRequires: intltool @@ -109,6 +111,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_datadir}/gtk-doc/html/UPower/* %changelog +* Thu Aug 24 2017 Benjamin Berg - 0.99.5-4 +- Add patch to not correctly close the inhibitor FD + * Thu Aug 03 2017 Fedora Release Engineering - 0.99.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 7764adb2415bc8b1857b1518709af82d011ad72f Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 11 Sep 2017 16:19:33 +0100 Subject: [PATCH 2/4] New upstream release --- .gitignore | 1 + 0001-linux-Correctly-close-inhibitor-FD.patch | 44 ------------------- sources | 2 +- upower.spec | 12 +++-- 4 files changed, 10 insertions(+), 49 deletions(-) delete mode 100644 0001-linux-Correctly-close-inhibitor-FD.patch diff --git a/.gitignore b/.gitignore index 49c0fd0..de70df9 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ upower-0.9.5.tar.bz2 /upower-0.99.3.tar.xz /upower-0.99.4.tar.xz /upower-0.99.5.tar.xz +/upower-0.99.6.tar.xz diff --git a/0001-linux-Correctly-close-inhibitor-FD.patch b/0001-linux-Correctly-close-inhibitor-FD.patch deleted file mode 100644 index d1c37c1..0000000 --- a/0001-linux-Correctly-close-inhibitor-FD.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 502c63b54944064dfd5f5cc4463bfb3d457a95c0 Mon Sep 17 00:00:00 2001 -From: Benjamin Berg -Date: Thu, 3 Aug 2017 17:12:50 +0200 -Subject: [PATCH] linux: Correctly close inhibitor FD - -The unref of the FD list for the inhibitor was missing which means that -the FD was leaked and the lock was never released. This means that for -each suspend/resume cycle a new inhibitor would be added. - -Signed-off-by: Richard Hughes ---- - src/linux/up-backend.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c -index c5f8fd9..e7684a2 100644 ---- a/src/linux/up-backend.c -+++ b/src/linux/up-backend.c -@@ -475,7 +475,7 @@ static void - up_backend_inhibitor_lock_take (UpBackend *backend) - { - GVariant *out, *input; -- GUnixFDList *fds; -+ GUnixFDList *fds = NULL; - GError *error = NULL; - - if (backend->priv->logind_inhibitor_fd > -1) { -@@ -505,11 +505,13 @@ up_backend_inhibitor_lock_take (UpBackend *backend) - if (g_unix_fd_list_get_length (fds) != 1) { - g_warning ("Unexpected values returned by logind's 'Inhibit'"); - g_variant_unref (out); -+ g_object_unref (fds); - return; - } - - backend->priv->logind_inhibitor_fd = g_unix_fd_list_get (fds, 0, NULL); - g_variant_unref (out); -+ g_object_unref (fds); - - g_debug ("Acquired inhibitor lock (%i)", backend->priv->logind_inhibitor_fd); - } --- -2.13.5 - diff --git a/sources b/sources index b3d1564..efb3296 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (upower-0.99.5.tar.xz) = 2fb06bea69455f538146576665e36c5b91eb18b119fa77e29d383fcb2a86ea58650b82e258f157d03c40147ecb12ea545997199580f0e24847ac6ea04d46e5ea +SHA512 (upower-0.99.6.tar.xz) = 7e7256491ecb5d3f04abf41f05a761b79761c8868a1aedadfc5085c3b9cf15f6099c1494596e6a24b0951511bc7cac074e93ebb2b84abb9fb7a4374483052d3f diff --git a/upower.spec b/upower.spec index bae05c4..0569e88 100644 --- a/upower.spec +++ b/upower.spec @@ -1,14 +1,12 @@ Summary: Power Management Service Name: upower -Version: 0.99.5 -Release: 4%{?dist} +Version: 0.99.6 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://upower.freedesktop.org/ Source0: http://upower.freedesktop.org/releases/upower-%{version}.tar.xz -Patch0: 0001-linux-Correctly-close-inhibitor-FD.patch - BuildRequires: sqlite-devel BuildRequires: libtool BuildRequires: intltool @@ -111,6 +109,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_datadir}/gtk-doc/html/UPower/* %changelog +* Mon Sep 11 2017 Richard Hughes - 0.99.6-1 +- New upstream release +- Detect joysticks as gaming input devices +- Fix crash when '@' is present in the device name +- Grab the model name from device if unavailable from battery + * Thu Aug 24 2017 Benjamin Berg - 0.99.5-4 - Add patch to not correctly close the inhibitor FD From 96de6900175601cc060ef6fcfc1de4cd8485a95b Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 28 Nov 2017 12:42:27 +0100 Subject: [PATCH 3/4] + upower-0.99.7-1 Update to 0.99.7 Add Bluetooth LE battery support Fix critical action after resume from hibernate --- .gitignore | 1 + sources | 2 +- upower.spec | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index de70df9..2eee468 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ upower-0.9.5.tar.bz2 /upower-0.99.4.tar.xz /upower-0.99.5.tar.xz /upower-0.99.6.tar.xz +/upower-0.99.7.tar.xz diff --git a/sources b/sources index efb3296..9a5c555 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (upower-0.99.6.tar.xz) = 7e7256491ecb5d3f04abf41f05a761b79761c8868a1aedadfc5085c3b9cf15f6099c1494596e6a24b0951511bc7cac074e93ebb2b84abb9fb7a4374483052d3f +SHA512 (upower-0.99.7.tar.xz) = a1ad200e715284eae815580bba3faad480f7f13401f6ff1a2e7446172796a2413990ce2b553de713ddc530849b2dff1f0ddc12fbd2fd9b55510bbb644d2340a4 diff --git a/upower.spec b/upower.spec index 0569e88..dac701d 100644 --- a/upower.spec +++ b/upower.spec @@ -1,6 +1,6 @@ Summary: Power Management Service Name: upower -Version: 0.99.6 +Version: 0.99.7 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -109,6 +109,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_datadir}/gtk-doc/html/UPower/* %changelog +* Tue Nov 28 2017 Bastien Nocera - 0.99.7-1 ++ upower-0.99.7-1 +- Update to 0.99.7 +- Add Bluetooth LE battery support +- Fix critical action after resume from hibernate + * Mon Sep 11 2017 Richard Hughes - 0.99.6-1 - New upstream release - Detect joysticks as gaming input devices From e4340baf2e0b53f62443ca25fdd3d499f0c01ea1 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 19 Jun 2018 15:45:56 +0200 Subject: [PATCH 4/4] + upower-0.99.8-1 Update to 0.99.8 --- .gitignore | 1 + sources | 2 +- upower.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2eee468..f8ff88c 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ upower-0.9.5.tar.bz2 /upower-0.99.5.tar.xz /upower-0.99.6.tar.xz /upower-0.99.7.tar.xz +/upower-0.99.8.tar.xz diff --git a/sources b/sources index 9a5c555..275704c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (upower-0.99.7.tar.xz) = a1ad200e715284eae815580bba3faad480f7f13401f6ff1a2e7446172796a2413990ce2b553de713ddc530849b2dff1f0ddc12fbd2fd9b55510bbb644d2340a4 +SHA512 (upower-0.99.8.tar.xz) = dfd2960cae382195dfc7a703a02af298d9de55bc626cde2a1f97e7983842191ba9d99eb2044190214e792539e7d6c9d8e00b5aed17e5e86b04544e9ab90278b1 diff --git a/upower.spec b/upower.spec index dac701d..e3e7026 100644 --- a/upower.spec +++ b/upower.spec @@ -1,11 +1,11 @@ Summary: Power Management Service Name: upower -Version: 0.99.7 +Version: 0.99.8 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://upower.freedesktop.org/ -Source0: http://upower.freedesktop.org/releases/upower-%{version}.tar.xz +Source0: https://gitlab.freedesktop.org/upower/upower/uploads/9125ab7ee96fdc4ecc68cfefb50c1cab/%{name}-%{version}.tar.xz BuildRequires: sqlite-devel BuildRequires: libtool @@ -109,6 +109,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_datadir}/gtk-doc/html/UPower/* %changelog +* Tue Jun 19 2018 Bastien Nocera - 0.99.8-1 ++ upower-0.99.8-1 +- Update to 0.99.8 + * Tue Nov 28 2017 Bastien Nocera - 0.99.7-1 + upower-0.99.7-1 - Update to 0.99.7