From 3386d370ece3c3dc9d2cfe66874c89409aa8312d Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 6 Dec 2024 09:40:21 +0300 Subject: [PATCH] import cockpit-330-1.el10 --- .cockpit.metadata | 2 +- .gitignore | 2 +- SPECS/cockpit.spec | 57 ++++++++++++++++++++++++++-------------------- 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/.cockpit.metadata b/.cockpit.metadata index 8814a36..fdb58f0 100644 --- a/.cockpit.metadata +++ b/.cockpit.metadata @@ -1 +1 @@ -b2c3a4068b0e57a6366de6dc5ca46ef6e32305c2 SOURCES/cockpit-328.tar.xz +0297f3b9f1219f8b6ca929068dbd3d9b620e6898 SOURCES/cockpit-330.tar.xz diff --git a/.gitignore b/.gitignore index 49976e2..3284e4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cockpit-328.tar.xz +SOURCES/cockpit-330.tar.xz diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index 5da2443..a525a28 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -49,7 +49,7 @@ Summary: Web Console for Linux servers License: LGPL-2.1-or-later URL: https://cockpit-project.org/ -Version: 328 +Version: 330 Release: 1%{?dist} Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz @@ -328,19 +328,19 @@ Recommends: (reportd if abrt) %endif Provides: bundled(npm(@patternfly/patternfly)) = 5.4.2 -Provides: bundled(npm(@patternfly/react-core)) = 5.4.2 -Provides: bundled(npm(@patternfly/react-icons)) = 5.4.0 -Provides: bundled(npm(@patternfly/react-styles)) = 5.4.0 -Provides: bundled(npm(@patternfly/react-table)) = 5.4.2 -Provides: bundled(npm(@patternfly/react-tokens)) = 5.4.0 +Provides: bundled(npm(@patternfly/react-core)) = 5.4.10 +Provides: bundled(npm(@patternfly/react-icons)) = 5.4.2 +Provides: bundled(npm(@patternfly/react-styles)) = 5.4.1 +Provides: bundled(npm(@patternfly/react-table)) = 5.4.11 +Provides: bundled(npm(@patternfly/react-tokens)) = 5.4.1 Provides: bundled(npm(@xterm/addon-canvas)) = 0.7.0 Provides: bundled(npm(@xterm/xterm)) = 5.5.0 Provides: bundled(npm(argparse)) = 1.0.10 -Provides: bundled(npm(attr-accept)) = 2.2.4 +Provides: bundled(npm(attr-accept)) = 2.2.5 Provides: bundled(npm(autolinker)) = 3.16.2 Provides: bundled(npm(dequal)) = 2.0.3 -Provides: bundled(npm(file-selector)) = 2.1.0 -Provides: bundled(npm(focus-trap)) = 7.5.4 +Provides: bundled(npm(file-selector)) = 2.1.2 +Provides: bundled(npm(focus-trap)) = 7.6.2 Provides: bundled(npm(js-sha1)) = 0.7.0 Provides: bundled(npm(js-sha256)) = 0.11.0 Provides: bundled(npm(js-tokens)) = 4.0.0 @@ -350,7 +350,7 @@ Provides: bundled(npm(loose-envify)) = 1.4.0 Provides: bundled(npm(object-assign)) = 4.1.1 Provides: bundled(npm(prop-types)) = 15.8.1 Provides: bundled(npm(react-dom)) = 18.3.1 -Provides: bundled(npm(react-dropzone)) = 14.3.2 +Provides: bundled(npm(react-dropzone)) = 14.3.5 Provides: bundled(npm(react-is)) = 16.13.1 Provides: bundled(npm(react)) = 18.3.1 Provides: bundled(npm(remarkable)) = 2.0.1 @@ -359,7 +359,7 @@ Provides: bundled(npm(sprintf-js)) = 1.0.3 Provides: bundled(npm(tabbable)) = 6.2.0 Provides: bundled(npm(throttle-debounce)) = 5.0.2 Provides: bundled(npm(tslib)) = 2.8.1 -Provides: bundled(npm(uuid)) = 11.0.2 +Provides: bundled(npm(uuid)) = 11.0.3 %description system This package contains the Cockpit shell and system configuration interfaces. @@ -409,16 +409,18 @@ authentication via sssd/FreeIPA. %{_unitdir}/cockpit.service %{_unitdir}/cockpit-motd.service %{_unitdir}/cockpit.socket -%{_unitdir}/cockpit-ws-user.service +%{_unitdir}/cockpit-session-socket-user.service +%{_unitdir}/cockpit-session.socket +%{_unitdir}/cockpit-session@.service %{_unitdir}/cockpit-wsinstance-http.socket %{_unitdir}/cockpit-wsinstance-http.service %{_unitdir}/cockpit-wsinstance-https-factory.socket %{_unitdir}/cockpit-wsinstance-https-factory@.service %{_unitdir}/cockpit-wsinstance-https@.socket %{_unitdir}/cockpit-wsinstance-https@.service +%{_unitdir}/cockpit-wsinstance-socket-user.service %{_unitdir}/system-cockpithttps.slice %{_prefix}/%{__lib}/tmpfiles.d/cockpit-ws.conf -%{_sysusersdir}/cockpit-wsinstance.conf %{pamdir}/pam_ssh_add.so %{pamdir}/pam_cockpit_cert.so %{_libexecdir}/cockpit-ws @@ -429,7 +431,7 @@ authentication via sssd/FreeIPA. %{_libexecdir}/cockpit-desktop %{_libexecdir}/cockpit-certificate-ensure %{_libexecdir}/cockpit-certificate-helper -%attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session +%{_libexecdir}/cockpit-session %{_datadir}/cockpit/branding %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 %{_mandir}/man8/%{name}_session_selinux.8cockpit.* @@ -437,11 +439,6 @@ authentication via sssd/FreeIPA. %ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} %pre ws -# 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 >/dev/null || groupadd -r cockpit-wsinstance -getent passwd cockpit-wsinstance >/dev/null || useradd -r -g cockpit-wsinstance -d /nonexisting -s /sbin/nologin -c "User for cockpit-ws instances" cockpit-wsinstance - if %{_sbindir}/selinuxenabled 2>/dev/null; then %selinux_relabel_pre -s %{selinuxtype} fi @@ -476,6 +473,11 @@ if test -f %{_sysconfdir}/pam.d/cockpit && grep -q pam_cockpit_cert %{_sysconfd echo '**** WARNING:' fi +# remove obsolete system user on upgrade (replaced with DynamicUser in version 330) +if getent passwd cockpit-wsinstance >/dev/null; then + userdel cockpit-wsinstance +fi + %preun ws %systemd_preun cockpit.socket cockpit.service @@ -592,8 +594,6 @@ These files are not required for running Cockpit. %files -n cockpit-tests -f tests.list %{pamdir}/mock-pam-conv-mod.so -%{_unitdir}/cockpit-session.socket -%{_unitdir}/cockpit-session@.service %package -n cockpit-packagekit Summary: Cockpit user interface for packages @@ -612,13 +612,20 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Wed Dec 04 2024 Packit - 330-1 +- Web server: Increased sandboxing, setuid removal, bootc support +- Development: New install mode using systemd-sysext +- ws container: Move to Fedora 41 + +* Mon Nov 25 2024 Packit - 329.1-1 +- cockpit.js: Put back cockpit.{resolve,reject}() to fix subscription-manager-cockpit + +* Wed Nov 20 2024 Packit - 329-1 +- Shell: Extra warnings when connecting to remote hosts + * Wed Nov 06 2024 Packit - 328-1 - Bug fixes and performance improvements -* Tue Oct 29 2024 Troy Dawson - 327-2 -- Bump release for October 2024 mass rebuild: - Resolves: RHEL-64018 - * Wed Oct 23 2024 Packit - 327-1 - Connect to similar servers without Cockpit installed