diff --git a/.gitignore b/.gitignore index 77504d6..3ff013b 100644 --- a/.gitignore +++ b/.gitignore @@ -312,3 +312,4 @@ /cockpit-336.1.tar.xz /cockpit-336.2.tar.xz /cockpit-337.tar.xz +/cockpit-338.tar.xz diff --git a/cockpit.spec b/cockpit.spec index 53ea271..5dd83e6 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -49,8 +49,8 @@ Summary: Web Console for Linux servers License: LGPL-2.1-or-later URL: https://cockpit-project.org/ -Version: 337 -Release: 1%{?dist} +Version: 338 +Release: 2%{?dist} Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz %if 0%{?fedora} >= 41 || 0%{?rhel} @@ -245,6 +245,7 @@ It offers network configuration, log inspection, diagnostic reports, SELinux troubleshooting, interactive command-line sessions, and more. %files +%license COPYING %{_docdir}/cockpit/AUTHORS %{_docdir}/cockpit/COPYING %{_docdir}/cockpit/README.md @@ -262,6 +263,7 @@ The Cockpit bridge component installed server side and runs commands on the system on behalf of the web based user interface. %files bridge -f base.list +%license COPYING %doc %{_mandir}/man1/cockpit-bridge.1.gz %{_bindir}/cockpit-bridge %{_libexecdir}/cockpit-askpass @@ -277,6 +279,7 @@ deploy Cockpit on their machines as well as helps developers who want to embed or extend Cockpit. %files doc +%license COPYING %exclude %{_docdir}/cockpit/AUTHORS %exclude %{_docdir}/cockpit/COPYING %exclude %{_docdir}/cockpit/README.md @@ -311,12 +314,12 @@ Provides: cockpit-selinux = %{version}-%{release} Provides: cockpit-sosreport = %{version}-%{release} %endif -Provides: bundled(npm(@patternfly/patternfly)) = 6.1.0 -Provides: bundled(npm(@patternfly/react-core)) = 6.1.0 -Provides: bundled(npm(@patternfly/react-icons)) = 6.1.0 -Provides: bundled(npm(@patternfly/react-styles)) = 6.1.0 -Provides: bundled(npm(@patternfly/react-table)) = 6.1.0 -Provides: bundled(npm(@patternfly/react-tokens)) = 6.1.0 +Provides: bundled(npm(@patternfly/patternfly)) = 6.2.3 +Provides: bundled(npm(@patternfly/react-core)) = 6.2.2 +Provides: bundled(npm(@patternfly/react-icons)) = 6.2.2 +Provides: bundled(npm(@patternfly/react-styles)) = 6.2.2 +Provides: bundled(npm(@patternfly/react-table)) = 6.2.2 +Provides: bundled(npm(@patternfly/react-tokens)) = 6.2.2 Provides: bundled(npm(@xterm/addon-canvas)) = 0.7.0 Provides: bundled(npm(@xterm/xterm)) = 5.5.0 Provides: bundled(npm(argparse)) = 1.0.10 @@ -324,7 +327,7 @@ 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.2 -Provides: bundled(npm(focus-trap)) = 7.6.2 +Provides: bundled(npm(focus-trap)) = 7.6.4 Provides: bundled(npm(js-tokens)) = 4.0.0 Provides: bundled(npm(json-stable-stringify-without-jsonify)) = 1.0.1 Provides: bundled(npm(lodash)) = 4.17.21 @@ -347,6 +350,7 @@ Provides: bundled(npm(uuid)) = 11.1.0 This package contains the Cockpit shell and system configuration interfaces. %files system -f system.list +%license COPYING %dir %{_datadir}/cockpit/shell/images %package ws @@ -354,8 +358,7 @@ Summary: Cockpit Web Service Requires: glib-networking Requires: openssl Requires: glib2 >= 2.50.0 -Requires: (selinux-policy >= %{_selinux_policy_version} if selinux-policy-%{selinuxtype}) -Requires(post): (policycoreutils if selinux-policy-%{selinuxtype}) +Requires: (%{name}-ws-selinux = %{version}-%{release} if selinux-policy-base) Recommends: sscg >= 2.3 Recommends: system-logos Suggests: sssd-dbus >= 2.6.2 @@ -373,6 +376,7 @@ If sssd-dbus is installed, you can enable client certificate/smart card authentication via sssd/FreeIPA. %files ws -f static.list +%license COPYING %doc %{_mandir}/man1/cockpit-desktop.1.gz %doc %{_mandir}/man5/cockpit.conf.5.gz %doc %{_mandir}/man8/cockpit-ws.8.gz @@ -415,22 +419,8 @@ authentication via sssd/FreeIPA. %{_libexecdir}/cockpit-certificate-helper %{_libexecdir}/cockpit-session %{_datadir}/cockpit/branding -%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 -%{_mandir}/man8/%{name}_session_selinux.8cockpit.* -%{_mandir}/man8/%{name}_ws_selinux.8cockpit.* -%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} - -%pre ws -if %{_sbindir}/selinuxenabled 2>/dev/null; then - %selinux_relabel_pre -s %{selinuxtype} -fi %post ws -if [ -x %{_sbindir}/selinuxenabled ]; then - %selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 - %selinux_relabel_post -s %{selinuxtype} -fi - # set up dynamic motd/issue symlinks on first-time install; don't bring them back on upgrades if admin removed them # disable root login on first-time install; so existing installations aren't changed if [ "$1" = 1 ]; then @@ -474,12 +464,37 @@ fi %systemd_preun cockpit.socket cockpit.service %postun ws -if [ -x %{_sbindir}/selinuxenabled ]; then - %selinux_modules_uninstall -s %{selinuxtype} %{name} - %selinux_relabel_post -s %{selinuxtype} -fi %systemd_postun_with_restart cockpit.socket cockpit.service +%package ws-selinux +Summary: SELinux security policy for cockpit-ws +# older -ws contained the SELinux policy, now split out +Conflicts: %{name}-ws < 337-1.2025 +Requires(post): selinux-policy-%{selinuxtype} >= %{_selinux_policy_version} +Requires(post): libselinux-utils +Requires(post): policycoreutils + +%description ws-selinux +SELinux policy module for the cockpit-ws package. + +%files ws-selinux +%license COPYING +%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 +%{_mandir}/man8/%{name}_session_selinux.8cockpit.* +%{_mandir}/man8/%{name}_ws_selinux.8cockpit.* +%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} + +%pre ws-selinux +%selinux_relabel_pre -s %{selinuxtype} + +%post ws-selinux +%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 +%selinux_relabel_post -s %{selinuxtype} + +%postun ws-selinux +%selinux_modules_uninstall -s %{selinuxtype} %{name} +%selinux_relabel_post -s %{selinuxtype} + # ------------------------------------------------------------------------------- # Sub-packages that are part of cockpit-system in RHEL/CentOS, but separate in Fedora @@ -496,6 +511,7 @@ BuildArch: noarch The Cockpit component for configuring kernel crash dumping. %files kdump -f kdump.list +%license COPYING %{_datadir}/metainfo/org.cockpit_project.cockpit_kdump.metainfo.xml %package sosreport @@ -510,6 +526,7 @@ The Cockpit component for creating diagnostic reports with the sosreport tool. %files sosreport -f sosreport.list +%license COPYING %{_datadir}/metainfo/org.cockpit_project.cockpit_sosreport.metainfo.xml %{_datadir}/icons/hicolor/64x64/apps/cockpit-sosreport.png @@ -526,6 +543,7 @@ BuildArch: noarch The Cockpit component for managing networking. This package uses NetworkManager. %files networkmanager -f networkmanager.list +%license COPYING %{_datadir}/metainfo/org.cockpit_project.cockpit_networkmanager.metainfo.xml %endif @@ -544,6 +562,7 @@ This package contains the Cockpit user interface integration with the utility setroubleshoot to diagnose and resolve SELinux issues. %files selinux -f selinux.list +%license COPYING %{_datadir}/metainfo/org.cockpit_project.cockpit_selinux.metainfo.xml %endif @@ -571,6 +590,7 @@ BuildArch: noarch The Cockpit component for managing storage. This package uses udisks. %files -n cockpit-storaged -f storaged.list +%license COPYING %{_datadir}/metainfo/org.cockpit_project.cockpit_storaged.metainfo.xml %post storaged @@ -594,9 +614,14 @@ The Cockpit components for installing OS updates and Cockpit add-ons, via PackageKit. %files -n cockpit-packagekit -f packagekit.list +%license COPYING # The changelog is automatically generated and merged %changelog +* Wed May 07 2025 Packit - 338-1 +- Translation updates +- Bug fixes + * Wed Apr 23 2025 Packit - 337-1 - Upgraded to Patternfly 6 - Support dnf needs-restarting diff --git a/sources b/sources index 36302bc..3297a31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-337.tar.xz) = 04e1a029becd7ce5b07f1381f3c83ad484a616b2d9426b3d8f6df19e29e4197e1039a4de9527ff0f17a079f4667a5369c3d5686849fb825d1e683026b021a4e2 +SHA512 (cockpit-338.tar.xz) = 2276223ebca33b85c3c8899feda22867e82c55a835cfc695cf201f548cc67c0b61a77f8edcb8979f4310f5a378c3e3d313ba29fd33d9aaa6583a7f51ac183390