From 34535b076823e23f0dd6c3c9869448cb13639345d76631940a315538339c0fb7 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 20 Aug 2024 11:40:25 +0000 Subject: [PATCH] [info=f835006e9afc7659147184888f3c7c636dafba209ff3e9f09232a62ce8de7ca8] OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=203 --- 0005-cockpit-ws-user-remove-default-deps.patch | 11 +++++++++++ _scmsync.obsinfo | 6 +++--- build.specials.obscpio | 2 +- cockpit.changes | 5 +++++ cockpit.spec | 2 ++ 5 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 0005-cockpit-ws-user-remove-default-deps.patch diff --git a/0005-cockpit-ws-user-remove-default-deps.patch b/0005-cockpit-ws-user-remove-default-deps.patch new file mode 100644 index 0000000..c44d77e --- /dev/null +++ b/0005-cockpit-ws-user-remove-default-deps.patch @@ -0,0 +1,11 @@ +--- pkg/src/systemd/cockpit-ws-user.service ++++ pkg/src/systemd/cockpit-ws-user.service +@@ -1,6 +1,8 @@ + [Unit] + Description=Dynamic user for cockpit-ws + Documentation=man:cockpit-ws(8) ++# avoid dependency loop with basic.target/sockets.target shutdown ++DefaultDependencies=no + BindsTo=cockpit.service + + [Service] diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 79bd3f5..c715cf9 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1724075556 -commit: b82fac98a6409773233e34d824c92ddf1c46b0c0c1a12714e18c91189accf633 +mtime: 1724152616 +commit: f835006e9afc7659147184888f3c7c636dafba209ff3e9f09232a62ce8de7ca8 url: https://src.opensuse.org/cockpit/cockpit.git -revision: b82fac98a6409773233e34d824c92ddf1c46b0c0c1a12714e18c91189accf633 +revision: f835006e9afc7659147184888f3c7c636dafba209ff3e9f09232a62ce8de7ca8 diff --git a/build.specials.obscpio b/build.specials.obscpio index 91229d6..ffa5d95 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1745e11342f43850d2fd1edd956c35e88eeb9c907a475a0b7774041edae690b +oid sha256:aab16949ebd19215f60495d702c443f3b3889021216dc1091388ff8f42114856 size 256 diff --git a/cockpit.changes b/cockpit.changes index 25f25be..0743dde 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 20 11:44:33 UTC 2024 - Alice Brooks + +- add 0005-cockpit-ws-user-remove-default-deps.patch (bsc#1229146) + ------------------------------------------------------------------- Mon Aug 12 13:47:26 UTC 2024 - Luna D Dragon diff --git a/cockpit.spec b/cockpit.spec index 72ee320..74d56d4 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -72,6 +72,7 @@ Patch102: 0002-selinux-temporary-remove-setroubleshoot-section.patch Patch103: 0004-leap-gnu18-removal.patch Patch104: selinux_libdir.patch Patch105: fix-libexecdir.patch +Patch106: 0005-cockpit-ws-user-remove-default-deps.patch %define build_all 1 %if 0%{?rhel} == 8 && 0%{?epel} == 0 && !0%{?build_all} @@ -227,6 +228,7 @@ BuildRequires: python3-tox-current-env %patch -P 3 -p1 %patch -P 4 -p1 %patch -P 5 -p1 +%patch -P 106 -p1 # SLE Micro specific patches %if 0%{?is_smo}