diff --git a/.cockpit.metadata b/.cockpit.metadata index a911134..568533c 100644 --- a/.cockpit.metadata +++ b/.cockpit.metadata @@ -1 +1 @@ -f6ef6cb2c7e67bee98efc3e6dd0cbede1ebde6dd SOURCES/cockpit-323.tar.xz +7d878fc49bc746bfaf1b193c96d3423041457036 SOURCES/cockpit-327.tar.xz diff --git a/.gitignore b/.gitignore index 89a9b25..6a15a0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cockpit-323.tar.xz +SOURCES/cockpit-327.tar.xz diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index fe053b2..d430a4f 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: 323 +Version: 327 Release: 1%{?dist} Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz @@ -57,14 +57,6 @@ Source0: https://github.com/cockpit-project/cockpit/releases/download/%{v ExcludeArch: %{ix86} %endif -# pcp stopped building on ix86 in Fedora 40+, and broke hard on 39: https://bugzilla.redhat.com/show_bug.cgi?id=2284431 -%define build_pcp 1 -%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 -%ifarch %ix86 -%define build_pcp 0 -%endif -%endif - %define enable_multihost 1 %if 0%{?fedora} >= 41 || 0%{?rhel} >= 10 %define enable_multihost 0 @@ -84,7 +76,6 @@ BuildRequires: autoconf automake BuildRequires: make BuildRequires: python3-devel BuildRequires: gettext >= 0.21 -BuildRequires: libssh-devel >= 0.8.5 BuildRequires: openssl-devel BuildRequires: gnutls-devel >= 3.4.3 BuildRequires: zlib-devel @@ -98,19 +89,10 @@ BuildRequires: glib2-devel >= 2.50.0 BuildRequires: systemd-devel >= 235 %if 0%{?suse_version} BuildRequires: distribution-release -%if %{build_pcp} -BuildRequires: libpcp-devel -BuildRequires: pcp-devel -BuildRequires: libpcp3 -BuildRequires: libpcp_import1 -%endif BuildRequires: openssh BuildRequires: distribution-logos BuildRequires: wallpaper-branding %else -%if %{build_pcp} -BuildRequires: pcp-libs-devel -%endif BuildRequires: openssh-clients BuildRequires: docbook-style-xsl %endif @@ -133,7 +115,7 @@ Requires: cockpit-system # Optional components Recommends: (cockpit-storaged if udisks2) Recommends: (cockpit-packagekit if dnf) -Suggests: cockpit-pcp +Suggests: python3-pcp %if 0%{?rhel} == 0 Recommends: (cockpit-networkmanager if NetworkManager) @@ -167,9 +149,6 @@ BuildRequires: python3-tox-current-env --docdir=%_defaultdocdir/%{name} \ %endif --with-pamdir='%{pamdir}' \ -%if %{build_pcp} == 0 - --disable-pcp \ -%endif %if %{enable_multihost} --enable-multihost \ %endif @@ -198,12 +177,6 @@ echo '%dir %{_datadir}/cockpit/base1' >> base.list find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list echo '%{_sysconfdir}/cockpit/machines.d' >> base.list echo %{buildroot}%{_datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy >> base.list -echo '%{_libexecdir}/cockpit-ssh' >> base.list - -%if %{build_pcp} -echo '%dir %{_datadir}/cockpit/pcp' > pcp.list -find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list -%endif echo '%dir %{_datadir}/cockpit/shell' >> system.list find %{buildroot}%{_datadir}/cockpit/shell -type f >> system.list @@ -260,11 +233,11 @@ rm -rf %{buildroot}/usr/src/debug # On RHEL kdump, networkmanager, selinux, and sosreport are part of the system package %if 0%{?rhel} cat kdump.list sosreport.list networkmanager.list selinux.list >> system.list -rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml -rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-kdump.metainfo.xml -rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml -rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-networkmanager.metainfo.xml -rm -f %{buildroot}%{_datadir}/pixmaps/cockpit-sosreport.png +rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit_project.cockpit_sosreport.metainfo.xml +rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit_project.cockpit_kdump.metainfo.xml +rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit_project.cockpit_selinux.metainfo.xml +rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit_project.cockpit_networkmanager.metainfo.xml +rm -f %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/cockpit-sosreport.png %endif # ------------------------------------------------------------------------------- @@ -281,15 +254,14 @@ troubleshooting, interactive command-line sessions, and more. %{_docdir}/cockpit/AUTHORS %{_docdir}/cockpit/COPYING %{_docdir}/cockpit/README.md -%{_datadir}/metainfo/cockpit.appdata.xml -%{_datadir}/pixmaps/cockpit.png +%{_datadir}/metainfo/org.cockpit_project.cockpit.appdata.xml +%{_datadir}/icons/hicolor/128x128/apps/cockpit.png %doc %{_mandir}/man1/cockpit.1.gz %package bridge Summary: Cockpit bridge server-side component Requires: glib-networking -Provides: cockpit-ssh = %{version}-%{release} # 233 dropped jquery.js, pages started to bundle it (commit 049e8b8dce) Conflicts: cockpit-dashboard < 233 Conflicts: cockpit-networkmanager < 233 @@ -297,6 +269,7 @@ Conflicts: cockpit-storaged < 233 Conflicts: cockpit-system < 233 Conflicts: cockpit-tests < 233 Conflicts: cockpit-docker < 233 +Obsoletes: cockpit-pcp < 326 %description bridge The Cockpit bridge component installed server side and runs commands on the @@ -346,6 +319,7 @@ Recommends: PackageKit Recommends: setroubleshoot-server >= 3.3.3 Recommends: /usr/bin/kdumpctl Suggests: NetworkManager-team +Suggests: python3-pcp Provides: cockpit-kdump = %{version}-%{release} Provides: cockpit-networkmanager = %{version}-%{release} Provides: cockpit-selinux = %{version}-%{release} @@ -355,20 +329,20 @@ Provides: cockpit-sosreport = %{version}-%{release} Recommends: (reportd if abrt) %endif -Provides: bundled(npm(@patternfly/patternfly)) = 5.3.1 -Provides: bundled(npm(@patternfly/react-core)) = 5.3.4 -Provides: bundled(npm(@patternfly/react-icons)) = 5.3.2 -Provides: bundled(npm(@patternfly/react-styles)) = 5.3.1 -Provides: bundled(npm(@patternfly/react-table)) = 5.3.4 -Provides: bundled(npm(@patternfly/react-tokens)) = 5.3.1 +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(@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.2 +Provides: bundled(npm(attr-accept)) = 2.2.4 Provides: bundled(npm(autolinker)) = 3.16.2 Provides: bundled(npm(dequal)) = 2.0.3 Provides: bundled(npm(file-selector)) = 0.6.0 -Provides: bundled(npm(focus-trap)) = 7.5.2 +Provides: bundled(npm(focus-trap)) = 7.5.4 Provides: bundled(npm(js-sha1)) = 0.7.0 Provides: bundled(npm(js-sha256)) = 0.11.0 Provides: bundled(npm(js-tokens)) = 4.0.0 @@ -378,7 +352,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.2.3 +Provides: bundled(npm(react-dropzone)) = 14.2.10 Provides: bundled(npm(react-is)) = 16.13.1 Provides: bundled(npm(react)) = 18.3.1 Provides: bundled(npm(remarkable)) = 2.0.1 @@ -386,7 +360,7 @@ Provides: bundled(npm(scheduler)) = 0.23.2 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.6.3 +Provides: bundled(npm(tslib)) = 2.8.0 Provides: bundled(npm(uuid)) = 10.0.0 %description system @@ -530,7 +504,7 @@ BuildArch: noarch The Cockpit component for configuring kernel crash dumping. %files kdump -f kdump.list -%{_datadir}/metainfo/org.cockpit-project.cockpit-kdump.metainfo.xml +%{_datadir}/metainfo/org.cockpit_project.cockpit_kdump.metainfo.xml %package sosreport Summary: Cockpit user interface for diagnostic reports @@ -544,8 +518,8 @@ The Cockpit component for creating diagnostic reports with the sosreport tool. %files sosreport -f sosreport.list -%{_datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml -%{_datadir}/pixmaps/cockpit-sosreport.png +%{_datadir}/metainfo/org.cockpit_project.cockpit_sosreport.metainfo.xml +%{_datadir}/icons/hicolor/64x64/apps/cockpit-sosreport.png %package networkmanager Summary: Cockpit user interface for networking, using NetworkManager @@ -560,7 +534,7 @@ BuildArch: noarch The Cockpit component for managing networking. This package uses NetworkManager. %files networkmanager -f networkmanager.list -%{_datadir}/metainfo/org.cockpit-project.cockpit-networkmanager.metainfo.xml +%{_datadir}/metainfo/org.cockpit_project.cockpit_networkmanager.metainfo.xml %endif @@ -578,7 +552,7 @@ This package contains the Cockpit user interface integration with the utility setroubleshoot to diagnose and resolve SELinux issues. %files selinux -f selinux.list -%{_datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml +%{_datadir}/metainfo/org.cockpit_project.cockpit_selinux.metainfo.xml %endif @@ -605,7 +579,7 @@ BuildArch: noarch The Cockpit component for managing storage. This package uses udisks. %files -n cockpit-storaged -f storaged.list -%{_datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml +%{_datadir}/metainfo/org.cockpit_project.cockpit_storaged.metainfo.xml %package -n cockpit-tests Summary: Tests for Cockpit @@ -623,25 +597,6 @@ These files are not required for running Cockpit. %{_unitdir}/cockpit-session.socket %{_unitdir}/cockpit-session@.service -%if %{build_pcp} - -%package -n cockpit-pcp -Summary: Cockpit PCP integration -Requires: cockpit-bridge >= %{required_base} -Requires: pcp - -%description -n cockpit-pcp -Cockpit support for reading PCP metrics and loading PCP archives. - -%files -n cockpit-pcp -f pcp.list -%{_libexecdir}/cockpit-pcp -%{_localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit - -%post -n cockpit-pcp -systemctl reload-or-try-restart pmlogger - -%endif - %package -n cockpit-packagekit Summary: Cockpit user interface for packages BuildArch: noarch @@ -659,6 +614,22 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Wed Oct 23 2024 Packit - 327-1 +- Connect to similar servers without Cockpit installed + +* Wed Oct 09 2024 Packit - 326-1 +- cockpit-pcp package is now obsolete +- cockpit/ws container: Connect to servers without installed Cockpit +- cockpit/ws container: Support host specific SSH keys +- Storage: Support for Stratis filesystem sizes and limits + +* Wed Sep 25 2024 Packit - 325-1 +- storage: Expose Stratis virtual filesystem sizes +- client: Properly handle unknown SSH host keys + +* Wed Sep 04 2024 Packit - 324-1 +- Bug fixes and performance improvements + * Tue Aug 20 2024 Packit - 323-1 - metrics: Install valkey instead of redis on RHEL/CentOS 10 - login: Prevent multiple logins in a single browser session