From 26a95abd03b0f2229647d43e0d3069a7e1d40c28 Mon Sep 17 00:00:00 2001
From: AlmaLinux RelEng Bot <eabdullin@almalinux.org>
Date: Tue, 19 May 2026 18:58:35 -0400
Subject: [PATCH] import UBI upower-1.90.10-2.el10

---
 .gitignore                                    |  2 +-
 ...-device-supply-fix-the-resource-leak.patch | 42 +++++++++++++++++++
 sources                                       |  2 +-
 upower.spec                                   | 31 ++++++++++++--
 4 files changed, 71 insertions(+), 6 deletions(-)
 create mode 100644 0001-linux-up-device-supply-fix-the-resource-leak.patch

diff --git a/.gitignore b/.gitignore
index 33a8cb1..b90e053 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-upower-v1.90.9.tar.bz2
+upower-v1.90.10.tar.bz2
diff --git a/0001-linux-up-device-supply-fix-the-resource-leak.patch b/0001-linux-up-device-supply-fix-the-resource-leak.patch
new file mode 100644
index 0000000..eac96f2
--- /dev/null
+++ b/0001-linux-up-device-supply-fix-the-resource-leak.patch
@@ -0,0 +1,42 @@
+From c5df437cc15580f617a7eb8f8e3e572c742624fa Mon Sep 17 00:00:00 2001
+From: Kate Hsuan <hpa@redhat.com>
+Date: Thu, 27 Nov 2025 17:17:10 +0800
+Subject: [PATCH] linux: up-device-supply: fix the resource leak
+
+1. free the udev parent node automatically.
+2. free new_model_name variable in the same scope.
+---
+ src/linux/up-device-supply.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c
+index 889367f..ae4e696 100644
+--- a/src/linux/up-device-supply.c
++++ b/src/linux/up-device-supply.c
+@@ -331,7 +331,9 @@ static void
+ up_device_supply_sibling_discovered_guess_type (UpDevice *device,
+ 						GObject  *sibling)
+ {
+-	GUdevDevice *input, *native_device, *parent_device, *parent_sibling;
++	GUdevDevice *input, *native_device;
++	g_autoptr (GUdevDevice) parent_device = NULL;
++	g_autoptr (GUdevDevice) parent_sibling = NULL;
+ 	UpDeviceKind cur_type, new_type;
+ 	gboolean is_same_parent = FALSE;
+ 	char *new_model_name;
+@@ -492,9 +494,10 @@ up_device_supply_sibling_discovered_guess_type (UpDevice *device,
+ 				      "type", new_type,
+ 				      "model", new_model_name,
+ 				      NULL);
+-			g_free (new_model_name);
+-		} else
++		} else {
+ 			g_object_set (device, "type", new_type, NULL);
++		}
++		g_free (new_model_name);
+ 	}
+ }
+ 
+-- 
+2.51.1
+
diff --git a/sources b/sources
index d2899f5..725b805 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (upower-v1.90.9.tar.bz2) = 7308e03125a5a888242253f9260f68283f5b53677c08dbc4d7e4d48cc6f600f50f8ab161d100f152138208d5119acddc90f0f19742aa8cca58e3a0ec54975110
+SHA512 (upower-v1.90.10.tar.bz2) = f7bfb4c4301b6155a17c6b1baf12947503037bb8f8827ab7993ade39ef1aaece64bc08318c73600f62cd5b2ff7d372cc58652045efa803fff5951abd466a3d63
diff --git a/upower.spec b/upower.spec
index e55b41d..6baf2dc 100644
--- a/upower.spec
+++ b/upower.spec
@@ -1,8 +1,8 @@
 ## START: Set by rpmautospec
-## (rpmautospec version 0.6.5)
+## (rpmautospec version 0.8.1)
 ## RPMAUTOSPEC: autorelease, autochangelog
 %define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 1;
+    release_number = 2;
     base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
     print(release_number + base_release_number - 1);
 }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
@@ -10,7 +10,7 @@
 
 Summary:        Power Management Service
 Name:           upower
-Version:        1.90.9
+Version:        1.90.10
 Release:        %autorelease
 License:        GPL-2.0-or-later
 URL:            http://upower.freedesktop.org/
@@ -37,6 +37,7 @@ Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       udev
 
 # Patches
+Patch0001:      0001-linux-up-device-supply-fix-the-resource-leak.patch
 
 %description
 UPower (formerly DeviceKit-power) provides a daemon, API and command
@@ -66,6 +67,13 @@ BuildArch: noarch
 %description devel-docs
 Developer documentation for for libupower-glib.
 
+%package tests
+Summary: Test files for Upower
+Requires: %{name}%{?_isa} = %{version}-%{release}
+ 
+%description tests
+Test files for Upower
+
 %prep
 %autosetup -n %{name}-v%{version} -p1 -S git
 
@@ -81,6 +89,9 @@ Developer documentation for for libupower-glib.
 %install
 %meson_install
 
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/installed-tests
+mv $RPM_BUILD_ROOT%{_libexecdir}/upower $RPM_BUILD_ROOT%{_libexecdir}/installed-tests
+
 %find_lang upower
 
 %ldconfig_scriptlets
@@ -104,7 +115,7 @@ Developer documentation for for libupower-glib.
 %ghost %dir %{_localstatedir}/lib/upower
 %dir %{_sysconfdir}/UPower
 %config %{_sysconfdir}/UPower/UPower.conf
-%{_bindir}/*
+%{_bindir}/upower
 %{_libexecdir}/*
 %{_mandir}/man1/*
 %{_mandir}/man7/*
@@ -134,8 +145,20 @@ Developer documentation for for libupower-glib.
 %dir %{_datadir}/gtk-doc/html/UPower
 %{_datadir}/gtk-doc/html/UPower/*
 
+%files tests
+%{_libexecdir}/installed-tests/upower
+%dir %{_datadir}/installed-tests/
+%dir %{_datadir}/installed-tests/upower/
+%{_datadir}/installed-tests/upower/upower-integration.test
+
 %changelog
 ## START: Generated by rpmautospec
+* Fri Nov 28 2025 Kate Hsuan <hpa@redhat.com> - 1.90.10-2
+- The resource leak fixes
+
+* Wed Nov 26 2025 Kate Hsuan <hpa@redhat.com> - 1.90.10-1
+- Update to the upstream version 1.90.10
+
 * Tue Apr 15 2025 Kate Hsuan <hpa@redhat.com> - 1.90.9-1
 - Update to the upstream version 1.90.9
 - Fix unstable OnBattery status