From 22ea8f3a915408de82e7ddc44c1a276b19df535c Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 15 Aug 2023 07:26:17 +0200 Subject: [PATCH 1/3] Rebuild for Fedora 38 Signed-off-by: Tomas Hrcka --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1710937..4643761 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # uresourced -The uresourced package \ No newline at end of file +The uresourced package + From c8614d9c53219eaf1697ca221db276235cd88a04 Mon Sep 17 00:00:00 2001 From: Pavel Solovev Date: Fri, 28 Apr 2023 17:17:19 +0300 Subject: [PATCH 2/3] FTBFS fix (rhbz#2171746) - Convert licence tag to SPDX --- uresourced-remove-unneeded-directive.patch | 26 ++++++++++++++++++++++ uresourced.spec | 17 +++++++------- 2 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 uresourced-remove-unneeded-directive.patch diff --git a/uresourced-remove-unneeded-directive.patch b/uresourced-remove-unneeded-directive.patch new file mode 100644 index 0000000..e32c4b9 --- /dev/null +++ b/uresourced-remove-unneeded-directive.patch @@ -0,0 +1,26 @@ +From af9cac5b78507c58f72ab6e389583755f50cdc5f Mon Sep 17 00:00:00 2001 +From: Luca Boccassi +Date: Wed, 16 Nov 2022 12:03:56 +0000 +Subject: [PATCH] user unit: remove ProtectSystem= + +In a user unit ProtectSystem= cannot work without PrivateUsers=yes, +as mounts can only be done in a user namespace when not running as root. +In the future this will be implicit, so remove it to avoid unintended +sandboxing from being enabled. +--- + data/user/uresourced.service.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/user/uresourced.service.in b/data/user/uresourced.service.in +index 09212a2..0be14e8 100644 +--- a/data/user/uresourced.service.in ++++ b/data/user/uresourced.service.in +@@ -20,5 +20,4 @@ ExecStart=@libexecdir@/uresourced --user + TimeoutStopSec=5s + + +-ProtectSystem=strict + RestrictAddressFamilies=AF_UNIX +-- +GitLab + diff --git a/uresourced.spec b/uresourced.spec index f44af3a..6d0be40 100644 --- a/uresourced.spec +++ b/uresourced.spec @@ -3,17 +3,18 @@ Version: 0.5.3 Release: %autorelease Summary: Dynamically allocate resources to the active user -License: LGPLv2+ +License: LGPL-2.1-or-later URL: https://gitlab.freedesktop.org/benzea/uresourced -Source0: https://gitlab.freedesktop.org/benzea/uresourced/-/archive/v%{version}/%{name}-v%{version}.tar.bz2 +Source0: %{url}/-/archive/v%{version}/%{name}-v%{version}.tar.bz2 +Patch0: %{url}/-/commit/af9cac5b78507c58f72ab6e389583755f50cdc5f.patch#/uresourced-remove-unneeded-directive.patch -BuildRequires: git -BuildRequires: pipewire-devel -BuildRequires: systemd-devel -BuildRequires: systemd-rpm-macros -BuildRequires: meson BuildRequires: gcc +BuildRequires: meson BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(libpipewire-0.3) +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(systemd) +BuildRequires: systemd-rpm-macros %description This daemon dynamically assigns a resource allocation to the active @@ -22,7 +23,7 @@ using systemd (e.g. GNOME), then the memory allocation will be used to protect the sessions core processes (session.slice). %prep -%autosetup -S git -n %{name}-v%{version} +%autosetup -n %{name}-v%{version} -p1 %build %meson -Dappmanagement=true From 8212fdb2a50b9cce89a8fc7ad4240fb5fafeda8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:13:04 +0000 Subject: [PATCH 3/3] Update to 0.5.4 Resolves: #2258599, #2253895, #2250086, #2217123, #2193292 --- .gitignore | 1 + sources | 2 +- uresourced-remove-unneeded-directive.patch | 26 ---------------------- uresourced.spec | 3 +-- 4 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 uresourced-remove-unneeded-directive.patch diff --git a/.gitignore b/.gitignore index 8246599..9fff2cb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /uresourced-v0.5.1.tar.bz2 /uresourced-v0.5.2.tar.bz2 /uresourced-v0.5.3.tar.bz2 +/uresourced-v0.5.4.tar.bz2 diff --git a/sources b/sources index b3638b9..6eaafcf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uresourced-v0.5.3.tar.bz2) = 6947c31b9190ad48fbd5b7aefa4538feeac177403762dcb6c283e3292894790f9938fa9ef10d29c4c93650a14558173689a97c3c62ae07af3ed1d50dc66eea93 +SHA512 (uresourced-v0.5.4.tar.bz2) = c9c6499968aeeb4cb0e7a72d12b3778f4460d0f278e592feca1deb5d54c91dd19a27f8741c34b5e3d142e72b10a945e86b45c3ecd2864b45f1dd2acad319fb66 diff --git a/uresourced-remove-unneeded-directive.patch b/uresourced-remove-unneeded-directive.patch deleted file mode 100644 index e32c4b9..0000000 --- a/uresourced-remove-unneeded-directive.patch +++ /dev/null @@ -1,26 +0,0 @@ -From af9cac5b78507c58f72ab6e389583755f50cdc5f Mon Sep 17 00:00:00 2001 -From: Luca Boccassi -Date: Wed, 16 Nov 2022 12:03:56 +0000 -Subject: [PATCH] user unit: remove ProtectSystem= - -In a user unit ProtectSystem= cannot work without PrivateUsers=yes, -as mounts can only be done in a user namespace when not running as root. -In the future this will be implicit, so remove it to avoid unintended -sandboxing from being enabled. ---- - data/user/uresourced.service.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/data/user/uresourced.service.in b/data/user/uresourced.service.in -index 09212a2..0be14e8 100644 ---- a/data/user/uresourced.service.in -+++ b/data/user/uresourced.service.in -@@ -20,5 +20,4 @@ ExecStart=@libexecdir@/uresourced --user - TimeoutStopSec=5s - - --ProtectSystem=strict - RestrictAddressFamilies=AF_UNIX --- -GitLab - diff --git a/uresourced.spec b/uresourced.spec index 6d0be40..82cb9d0 100644 --- a/uresourced.spec +++ b/uresourced.spec @@ -1,12 +1,11 @@ Name: uresourced -Version: 0.5.3 +Version: 0.5.4 Release: %autorelease Summary: Dynamically allocate resources to the active user License: LGPL-2.1-or-later URL: https://gitlab.freedesktop.org/benzea/uresourced Source0: %{url}/-/archive/v%{version}/%{name}-v%{version}.tar.bz2 -Patch0: %{url}/-/commit/af9cac5b78507c58f72ab6e389583755f50cdc5f.patch#/uresourced-remove-unneeded-directive.patch BuildRequires: gcc BuildRequires: meson