Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cockpit for openSUSE:Factory checked
in at 2025-04-30 19:02:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cockpit (Old)
and /work/SRC/openSUSE:Factory/.cockpit.new.30101 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cockpit"
Wed Apr 30 19:02:39 2025 rev:59 rq:1273359 version:334.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2025-04-20
19:50:50.526061114 +0200
+++ /work/SRC/openSUSE:Factory/.cockpit.new.30101/cockpit.changes
2025-04-30 19:02:45.242253259 +0200
@@ -1,0 +2,8 @@
+Mon Apr 28 07:43:52 UTC 2025 - Luna D Dragon <luna.dra...@suse.com>
+
+- Update 0007-Remove-DynamicUser-setting-as-these-conflict-with-re.patch
+ Update the patch to set ProtectHome and PrivateTmp to yes as it is implied
+ when DynamicUser is enabled. The patch is also now only applied on leap 15
+ where it is relevant
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cockpit.spec ++++++
--- /var/tmp/diff_new_pack.4YmSGA/_old 2025-04-30 19:02:48.630394541 +0200
+++ /var/tmp/diff_new_pack.4YmSGA/_new 2025-04-30 19:02:48.642395042 +0200
@@ -215,7 +215,6 @@
%patch -P 4 -p1
%patch -P 5 -p1
%patch -P 106 -p1
-%patch -P 108 -p1
%patch -P 109 -p1
# SLE Micro specific patches
@@ -232,6 +231,7 @@
%patch -P 103 -p1
%patch -P 104 -p1
%patch -P 105 -p1
+%patch -P 108 -p1
%else
%patch -P 107 -p1
%endif
@@ -562,11 +562,13 @@
# for cockpit-desktop
Suggests: python3
Obsoletes: cockpit-tests < 331
+%if 0%{?suse_version} == 1500
Provides: group(cockpit-wsinstance-socket)
Provides: group(cockpit-session-socket)
Provides: user(cockpit-wsinstance-socket)
Provides: user(cockpit-session-socket)
Provides: user(cockpit-systemd-service)
+%endif
# prevent hard python3 dependency for cockpit-desktop, it falls back to other
browsers
%global __requires_exclude_from ^%{_libexecdir}/cockpit-client$
@@ -626,10 +628,15 @@
%{_libexecdir}/cockpit-desktop
%{_libexecdir}/cockpit-certificate-ensure
%{_libexecdir}/cockpit-certificate-helper
+%if 0%{?suse_version} == 1500
%{?suse_version:%verify(not mode) }%attr(4750, root,
cockpit-wsinstance-socket) %{_libexecdir}/cockpit-session
+%else
+%{_libexecdir}/cockpit-session
+%endif
%{_datadir}/cockpit/branding
%pre ws
+%if 0%{?suse_version} == 1500
# HACK: old RPM and even Fedora's current RPM don't properly support sysusers
# https://github.com/rpm-software-management/rpm/issues/3073
getent group cockpit-wsinstance-socket >/dev/null || groupadd -r
cockpit-wsinstance-socket
@@ -637,6 +644,7 @@
getent passwd cockpit-wsinstance-socket >/dev/null || useradd -r -g
cockpit-wsinstance-socket -d /nonexisting -s /sbin/nologin -c "User for
cockpit-ws instances" cockpit-wsinstance-socket
getent passwd cockpit-session-socket >/dev/null || useradd -r -g
cockpit-session-socket -d /nonexisting -s /sbin/nologin -c "User for
cockpit-session instances" cockpit-session-socket
getent passwd cockpit-systemd-service >/dev/null || useradd -r -g
cockpit-wsinstance-socket -d /nonexisting -s /sbin/nologin -c "User for
cockpit.service" cockpit-systemd-service
+%endif
%if 0%{?suse_version} > 1500
# Prepare for migration to /usr/lib; save any old .rpmsave
++++++ 0007-Remove-DynamicUser-setting-as-these-conflict-with-re.patch ++++++
--- /var/tmp/diff_new_pack.4YmSGA/_old 2025-04-30 19:02:48.974408887 +0200
+++ /var/tmp/diff_new_pack.4YmSGA/_new 2025-04-30 19:02:48.994409721 +0200
@@ -1,58 +1,65 @@
-From 730d204ff5a1f0382c3edffe51ce62c890cf86f2 Mon Sep 17 00:00:00 2001
+From 3f0d624c5af89fc9ebe81d92351d8ac8e7583997 Mon Sep 17 00:00:00 2001
From: Alice Brooks <alice.bro...@suse.com>
-Date: Thu, 30 Jan 2025 10:45:46 +0000
-Subject: [PATCH 1/1] Remove DynamicUser setting as these conflict with real
- users
+Date: Mon, 28 Apr 2025 12:40:31 +0530
+Subject: [PATCH] Remove DynamicUser setting as these conflict with real users
Real users are having to be created due to Leap15.6's nsswitch not
containing systemd, so dynamic users cannot be resolved inter
service due to this we must manually create the users postinstall
+
+Co-authored-by: Luna D Dragon <luna.dra...@suse.com>
---
- src/systemd/cockpit-wsinstance-http.service.in | 2 +-
- src/systemd/cockpit-wsinstance-ht...@.service.in | 2 +-
- src/systemd/cockpit.service.in | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
+ src/systemd/cockpit-wsinstance-http.service.in | 4 +++-
+ src/systemd/cockpit-wsinstance-ht...@.service.in | 4 +++-
+ src/systemd/cockpit.service.in | 4 +++-
+ 3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/systemd/cockpit-wsinstance-http.service.in
b/src/systemd/cockpit-wsinstance-http.service.in
-index 539b90345..17ab21df1 100644
+index 539b90345..dfc9f3b1b 100644
--- a/src/systemd/cockpit-wsinstance-http.service.in
+++ b/src/systemd/cockpit-wsinstance-http.service.in
-@@ -7,7 +7,7 @@ After=cockpit-session.socket
+@@ -7,7 +7,9 @@ After=cockpit-session.socket
[Service]
ExecStart=@libexecdir@/cockpit-ws --no-tls --port=0
-DynamicUser=yes
+DynamicUser=no
++PrivateTmp=yes
++ProtectHome=yes
Group=cockpit-session-socket
PrivateDevices=yes
diff --git a/src/systemd/cockpit-wsinstance-ht...@.service.in
b/src/systemd/cockpit-wsinstance-ht...@.service.in
-index f66c9f874..db53247c0 100644
+index f66c9f874..3c07bb9a7 100644
--- a/src/systemd/cockpit-wsinstance-ht...@.service.in
+++ b/src/systemd/cockpit-wsinstance-ht...@.service.in
-@@ -8,7 +8,7 @@ After=cockpit-session.socket
+@@ -8,7 +8,9 @@ After=cockpit-session.socket
[Service]
Slice=system-cockpithttps.slice
ExecStart=@libexecdir@/cockpit-ws --for-tls-proxy --port=0
-DynamicUser=yes
+DynamicUser=no
++PrivateTmp=yes
++ProtectHome=yes
Group=cockpit-session-socket
PrivateDevices=yes
diff --git a/src/systemd/cockpit.service.in b/src/systemd/cockpit.service.in
-index 97adda221..ec50118aa 100644
+index 97adda221..4b496fd3a 100644
--- a/src/systemd/cockpit.service.in
+++ b/src/systemd/cockpit.service.in
-@@ -10,7 +10,7 @@ After=cockpit-wsinstance-http.socket
cockpit-wsinstance-https-factory.socket
+@@ -10,7 +10,9 @@ After=cockpit-wsinstance-http.socket
cockpit-wsinstance-https-factory.socket
RuntimeDirectory=cockpit/tls
ExecStartPre=+@libexecdir@/cockpit-certificate-ensure --for-cockpit-tls
ExecStart=@libexecdir@/cockpit-tls
-DynamicUser=yes
+DynamicUser=no
++PrivateTmp=yes
++ProtectHome=yes
# otherwise systemd uses 'cockpit' even if it exists as a normal user account
User=cockpit-systemd-service
Group=cockpit-wsinstance-socket
--
-2.48.1
+2.49.0
++++++ _scmsync.obsinfo ++++++
--- /var/tmp/diff_new_pack.4YmSGA/_old 2025-04-30 19:02:49.206418561 +0200
+++ /var/tmp/diff_new_pack.4YmSGA/_new 2025-04-30 19:02:49.262420896 +0200
@@ -1,6 +1,6 @@
-mtime: 1744870665
-commit: 543c8ccf1e6492a931a74dfbf73696511772f9210d5ed2a7c0f98e60e9cc82b8
+mtime: 1745911446
+commit: 96c15c040c63cdfec9aba88a6099368d4f69528e7720314017cb79466890c527
url: https://src.opensuse.org/cockpit/cockpit.git
-revision: 543c8ccf1e6492a931a74dfbf73696511772f9210d5ed2a7c0f98e60e9cc82b8
+revision: 96c15c040c63cdfec9aba88a6099368d4f69528e7720314017cb79466890c527
projectscmsync: https://src.opensuse.org/cockpit/_ObsPrj.git
++++++ build.specials.obscpio ++++++
--- old/.gitignore 2025-04-17 11:03:00.000000000 +0200
+++ new/.gitignore 2025-04-29 09:48:57.000000000 +0200
@@ -1,2 +1,3 @@
.osc
node_modules.sums
+_build*
\ No newline at end of file
