.cockpit.metadata

@@ -1 +1,2 @@
-47390db1a6dc68a023b1b632cde27709387708b9 SOURCES/cockpit-300.4.tar.xz
+2e5a8bc37de3a932441898410b3a42fa1310d28b SOURCES/cockpit-310.4.tar.xz
+a37e1d6ad4b1b25729682c54ab7e4dcdcfd894a7 SOURCES/cockpit.css.gz

.gitignore

@@ -1 +1,2 @@
-SOURCES/cockpit-300.4.tar.xz
+SOURCES/cockpit-310.4.tar.xz
+SOURCES/cockpit.css.gz

SPECS/cockpit.spec

@@ -49,24 +49,16 @@ Summary:        Web Console for Linux servers
 License:        LGPL-2.1-or-later
 URL:            https://cockpit-project.org/
 
-Version:        300.4
+Version:        310.4
 Release:        1%{?dist}
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
-
+Source1:        cockpit.css.gz
-%if 0%{?fedora} >= 38 || 0%{?rhel} >= 9
-%define cockpit_enable_python 1
-%endif
-
-%if !%{defined cockpit_enable_python}
-%define cockpit_enable_python 0
-%endif
 
 # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
 # and cockpit-appstream (building optional packages like cockpit-{pcp})
 # This split does not apply to EPEL/COPR nor packit c8s builds, only to our own
 # image-prepare rhel-8-Y builds (which will disable build_all).
 # In Fedora ELN/RHEL 9+ there is just one source package, which ships rpms in both BaseOS and AppStream
-%define build_all 1
 %if 0%{?rhel} == 8 && 0%{?epel} == 0 && !0%{?build_all}
 
 %if "%{name}" == "cockpit"
@@ -89,6 +81,14 @@ Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{v
 %define disallow_root 1
 %endif
 
+# pcp stopped building on ix86
+%define build_pcp 1
+%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
+%ifarch %ix86
+%define build_pcp 0
+%endif
+%endif
+
 # Ship custom SELinux policy (but not for cockpit-appstream)
 %if "%{name}" == "cockpit"
 %define selinuxtype targeted
@@ -127,15 +127,19 @@ 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
@@ -170,20 +174,6 @@ Suggests: cockpit-selinux
 Requires: subscription-manager-cockpit
 %endif
 
-%if %{cockpit_enable_python}
-BuildRequires:  python3-devel
-BuildRequires:  python3-pip
-%if 0%{?rhel} == 0
-# All of these are only required for running pytest (which we only do on Fedora)
-BuildRequires:  procps-ng
-BuildRequires:  pyproject-rpm-macros
-BuildRequires:  python3-pytest-asyncio
-BuildRequires:  python3-pytest-cov
-BuildRequires:  python3-pytest-timeout
-BuildRequires:  python3-tox-current-env
-%endif
-%endif
-
 %prep
 %setup -q -n cockpit-%{version}
 
@@ -196,22 +186,18 @@ BuildRequires:  python3-tox-current-env
     --docdir=%_defaultdocdir/%{name} \
 %endif
     --with-pamdir='%{pamdir}' \
-%if %{cockpit_enable_python}
-    --enable-pybridge \
-%endif
 %if 0%{?build_basic} == 0
     --disable-ssh \
 %endif
+%if %{build_pcp} == 0
+    --disable-pcp \
+%endif
 
 %make_build
 
 %check
 make -j$(nproc) check
 
-%if %{cockpit_enable_python} && 0%{?rhel} == 0
-%tox
-%endif
-
 %install
 %make_install
 make install-tests DESTDIR=%{buildroot}
@@ -220,6 +206,10 @@ install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit
 rm -f %{buildroot}/%{_libdir}/cockpit/*.so
 install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/
 
+# RHEL 8 specific backwards compat API
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/cockpit/base1/
+ln -s cockpit.css.gz %{buildroot}%{_datadir}/cockpit/base1/patternfly.css.gz
+
 # Build the package lists for resource packages
 # cockpit-bridge is the basic dependency for all cockpit-* packages, so centrally own the page directory
 echo '%dir %{_datadir}/cockpit' > base.list
@@ -227,12 +217,16 @@ 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
+%if 0%{?build_basic}
 echo '%dir %{_datadir}/cockpit/ssh' >> base.list
 find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
+%endif
 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
@@ -276,7 +270,7 @@ find %{buildroot}%{_datadir}/cockpit/static -type f >> static.list
 
 # when not building basic packages, remove their files
 %if 0%{?build_basic} == 0
-for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd users metrics; do
+for pkg in base1 branding motd kdump networkmanager selinux shell sosreport static systemd users metrics; do
     rm -r %{buildroot}/%{_datadir}/cockpit/$pkg
     rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml
 done
@@ -285,7 +279,7 @@ for data in doc man pixmaps polkit-1; do
 done
 rm -r %{buildroot}/%{_prefix}/%{__lib}/tmpfiles.d
 find %{buildroot}/%{_unitdir}/ -type f ! -name 'cockpit-session*' -delete
-for libexec in cockpit-askpass cockpit-beiboot cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-client cockpit-client.ui cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do
+for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-client cockpit-client.ui cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do
     rm -f %{buildroot}/%{_libexecdir}/$libexec
 done
 rm -r %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d
@@ -374,10 +368,6 @@ system on behalf of the web based user interface.
 %doc %{_mandir}/man1/cockpit-bridge.1.gz
 %{_bindir}/cockpit-bridge
 %{_libexecdir}/cockpit-askpass
-%if %{cockpit_enable_python}
-%{python3_sitelib}/%{name}*
-%{_libexecdir}/cockpit-beiboot
-%endif
 
 %package doc
 Summary: Cockpit deployment and developer guide
@@ -426,35 +416,39 @@ Provides: cockpit-sosreport = %{version}-%{release}
 Recommends: (reportd if abrt)
 %endif
 
-Provides: bundled(npm(@patternfly/patternfly)) = 5.0.2
+Provides: bundled(npm(@patternfly/patternfly)) = 5.1.0
-Provides: bundled(npm(@patternfly/react-core)) = 5.0.0
+Provides: bundled(npm(@patternfly/react-core)) = 5.1.2
-Provides: bundled(npm(@patternfly/react-icons)) = 5.0.0
+Provides: bundled(npm(@patternfly/react-icons)) = 5.1.2
-Provides: bundled(npm(@patternfly/react-styles)) = 5.0.0
+Provides: bundled(npm(@patternfly/react-styles)) = 5.1.2
-Provides: bundled(npm(@patternfly/react-table)) = 5.0.0
+Provides: bundled(npm(@patternfly/react-table)) = 5.1.2
-Provides: bundled(npm(@patternfly/react-tokens)) = 5.0.0
+Provides: bundled(npm(@patternfly/react-tokens)) = 5.1.2
 Provides: bundled(npm(argparse)) = 1.0.10
+Provides: bundled(npm(array-buffer-byte-length)) = 1.0.0
 Provides: bundled(npm(attr-accept)) = 2.2.2
 Provides: bundled(npm(autolinker)) = 3.16.2
 Provides: bundled(npm(available-typed-arrays)) = 1.0.5
-Provides: bundled(npm(call-bind)) = 1.0.2
+Provides: bundled(npm(call-bind)) = 1.0.5
-Provides: bundled(npm(deep-equal)) = 2.0.5
+Provides: bundled(npm(date-fns)) = 3.2.0
-Provides: bundled(npm(define-properties)) = 1.2.0
+Provides: bundled(npm(deep-equal)) = 2.2.3
+Provides: bundled(npm(define-data-property)) = 1.1.1
+Provides: bundled(npm(define-properties)) = 1.2.1
 Provides: bundled(npm(es-get-iterator)) = 1.1.3
 Provides: bundled(npm(file-selector)) = 0.6.0
-Provides: bundled(npm(focus-trap)) = 7.4.3
+Provides: bundled(npm(focus-trap)) = 7.5.2
 Provides: bundled(npm(for-each)) = 0.3.3
-Provides: bundled(npm(function-bind)) = 1.1.1
+Provides: bundled(npm(function-bind)) = 1.1.2
 Provides: bundled(npm(functions-have-names)) = 1.2.3
-Provides: bundled(npm(get-intrinsic)) = 1.2.1
+Provides: bundled(npm(get-intrinsic)) = 1.2.2
 Provides: bundled(npm(gopd)) = 1.0.1
 Provides: bundled(npm(has-bigints)) = 1.0.2
-Provides: bundled(npm(has-property-descriptors)) = 1.0.0
+Provides: bundled(npm(has-property-descriptors)) = 1.0.1
 Provides: bundled(npm(has-proto)) = 1.0.1
 Provides: bundled(npm(has-symbols)) = 1.0.3
 Provides: bundled(npm(has-tostringtag)) = 1.0.0
-Provides: bundled(npm(has)) = 1.0.3
+Provides: bundled(npm(hasown)) = 2.0.0
-Provides: bundled(npm(internal-slot)) = 1.0.5
+Provides: bundled(npm(internal-slot)) = 1.0.6
 Provides: bundled(npm(is-arguments)) = 1.1.1
+Provides: bundled(npm(is-array-buffer)) = 3.0.2
 Provides: bundled(npm(is-bigint)) = 1.0.4
 Provides: bundled(npm(is-boolean-object)) = 1.1.2
 Provides: bundled(npm(is-callable)) = 1.2.7
@@ -463,42 +457,46 @@ Provides: bundled(npm(is-map)) = 2.0.2
 Provides: bundled(npm(is-number-object)) = 1.0.7
 Provides: bundled(npm(is-regex)) = 1.1.4
 Provides: bundled(npm(is-set)) = 2.0.2
+Provides: bundled(npm(is-shared-array-buffer)) = 1.0.2
 Provides: bundled(npm(is-string)) = 1.0.7
 Provides: bundled(npm(is-symbol)) = 1.0.4
+Provides: bundled(npm(is-typed-array)) = 1.1.12
 Provides: bundled(npm(is-weakmap)) = 2.0.1
 Provides: bundled(npm(is-weakset)) = 2.0.2
 Provides: bundled(npm(isarray)) = 2.0.5
 Provides: bundled(npm(js-sha1)) = 0.6.0
-Provides: bundled(npm(js-sha256)) = 0.9.0
+Provides: bundled(npm(js-sha256)) = 0.10.1
 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
 Provides: bundled(npm(loose-envify)) = 1.4.0
 Provides: bundled(npm(object-assign)) = 4.1.1
-Provides: bundled(npm(object-inspect)) = 1.12.3
+Provides: bundled(npm(object-inspect)) = 1.13.1
 Provides: bundled(npm(object-is)) = 1.1.5
 Provides: bundled(npm(object-keys)) = 1.1.1
-Provides: bundled(npm(object.assign)) = 4.1.4
+Provides: bundled(npm(object.assign)) = 4.1.5
 Provides: bundled(npm(prop-types)) = 15.8.1
 Provides: bundled(npm(react-dom)) = 18.2.0
 Provides: bundled(npm(react-dropzone)) = 14.2.3
 Provides: bundled(npm(react-is)) = 16.13.1
 Provides: bundled(npm(react)) = 18.2.0
-Provides: bundled(npm(regexp.prototype.flags)) = 1.5.0
+Provides: bundled(npm(regexp.prototype.flags)) = 1.5.1
 Provides: bundled(npm(remarkable)) = 2.0.1
 Provides: bundled(npm(scheduler)) = 0.23.0
+Provides: bundled(npm(set-function-length)) = 1.2.0
+Provides: bundled(npm(set-function-name)) = 2.0.1
 Provides: bundled(npm(side-channel)) = 1.0.4
 Provides: bundled(npm(sprintf-js)) = 1.0.3
 Provides: bundled(npm(stop-iteration-iterator)) = 1.0.0
 Provides: bundled(npm(tabbable)) = 6.2.0
-Provides: bundled(npm(throttle-debounce)) = 2.3.0
+Provides: bundled(npm(throttle-debounce)) = 5.0.0
 Provides: bundled(npm(tslib)) = 2.6.2
-Provides: bundled(npm(uuid)) = 7.0.3
+Provides: bundled(npm(uuid)) = 9.0.1
 Provides: bundled(npm(which-boxed-primitive)) = 1.0.2
 Provides: bundled(npm(which-collection)) = 1.0.1
-Provides: bundled(npm(which-typed-array)) = 1.1.11
+Provides: bundled(npm(which-typed-array)) = 1.1.13
-Provides: bundled(npm(xterm-addon-canvas)) = 0.3.0
+Provides: bundled(npm(xterm-addon-canvas)) = 0.5.0
-Provides: bundled(npm(xterm)) = 5.1.0
+Provides: bundled(npm(xterm)) = 5.3.0
 
 %description system
 This package contains the Cockpit shell and system configuration interfaces.
@@ -516,7 +514,7 @@ Requires(post): (policycoreutils if selinux-policy-%{selinuxtype})
 Conflicts: firewalld < 0.6.0-1
 Recommends: sscg >= 2.3
 Recommends: system-logos
-Suggests: sssd-dbus
+Suggests: sssd-dbus >= 2.6.2
 # for cockpit-desktop
 Suggests: python3
 
@@ -714,6 +712,9 @@ Requires: cockpit-shell >= %{required_base}
 Requires: udisks2 >= 2.9
 Recommends: udisks2-lvm2 >= 2.9
 Recommends: udisks2-iscsi >= 2.9
+%if ! 0%{?rhel}
+Recommends: udisks2-btrfs >= 2.9
+%endif
 Recommends: device-mapper-multipath
 Recommends: clevis-luks
 Requires: %{__python3}
@@ -728,7 +729,6 @@ BuildArch: noarch
 The Cockpit component for managing storage.  This package uses udisks.
 
 %files -n cockpit-storaged -f storaged.list
-%dir %{_datadir}/cockpit/storaged/images
 %{_datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml
 
 %package -n cockpit-tests
@@ -747,6 +747,8 @@ 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}
@@ -762,6 +764,8 @@ Cockpit support for reading PCP metrics and loading PCP archives.
 %post -n cockpit-pcp
 systemctl reload-or-try-restart pmlogger
 
+%endif
+
 %package -n cockpit-packagekit
 Summary: Cockpit user interface for packages
 BuildArch: noarch
@@ -782,22 +786,47 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
-* Mon Dec 18 2023 Martin Pitt <mpitt@redhat.com> - 300.4-1
+* Tue Apr 02 2024 Martin Pitt <mpitt@redhat.com> - 310.4-1
-- client: Provide fallback for GLib.get_user_state_dir() (RHEL-18989)
+- sosreport: Fix command injection with crafted report names [CVE-2024-2947]
-- bridge: Add back menu/tool names to cockpit-bridge --packages (RHEL-19004)
+  (jira#RHEL-30452)
-- bridge: Add back support for x.min.js files (RHEL-19005)
 
-* Wed Sep 27 2023 Martin Pitt <mpitt@redhat.com> - 300.3-1
+* Thu Feb 15 2024 Martin Pitt <mpitt@redhat.com> - 310.3-1
-- Fix crash with large file uploads (RHEL-5341)
+- Translation updates (jira#RHEL-16681)
-- Fix connecting to older bridges, in particular RHEL 8 (RHEL-3537)
+  Lots of bug fixes
 
-* Thu Sep 21 2023 Martin Pitt <mpitt@redhat.com> - 300.2-1
+* Wed Jan 31 2024 Packit <hello@packit.dev> - 310-1
-- Keep administrative access after a page reload (RHEL-5765)
+- Storage: support for btrfs
-- spec: Move to BuildRequires: python3-devel (RHEL-2215)
+- Storage: improved support for swap
-- Lots of test stabilizations
 
-* Thu Sep 07 2023 Martin Pitt <mpitt@redhat.com> - 300.1-1
+* Thu Jan 18 2024 Packit <hello@packit.dev> - 309-1
-- Translation updates (rhbz#2189499)
+- Storage: Introduce btrfs support
+
+* Wed Jan 03 2024 Packit <hello@packit.dev> - 308-1
+- Fix connecting to remote hosts with OpenSSH 0.9.6
+
+* Fri Dec 15 2023 Martin Pitt <mpitt@redhat.com> - 307-1
+- Storage redesign
+
+* Wed Nov 29 2023 Packit <hello@packit.dev> - 306-1
+- Kdump: Add Ansible/shell automation
+
+* Wed Nov 15 2023 Packit <hello@packit.dev> - 305-1
+- Performance and stability improvements
+
+* Wed Nov 01 2023 Packit <hello@packit.dev> - 304-1
+- Bug fixes
+
+* Wed Oct 18 2023 Packit <hello@packit.dev> - 303-1
+- Apps: Warn if appstream data package is missing
+- Shell: Redesign untrusted "add host" dialog
+
+* Thu Oct 05 2023 Packit <hello@packit.dev> - 302-1
+- Storage: Partitions can be resized
+- many bug fixes
+
+* Wed Sep 20 2023 Packit <hello@packit.dev> - 301-1
+- WireGuard support
+- Metrics: link to network interface details
 
 * Wed Sep 06 2023 Packit <hello@packit.dev> - 300-1
 - Celebrating the Nürnberg life release!
@@ -810,17 +839,11 @@ via PackageKit.
 
 * Wed Jul 26 2023 Packit <hello@packit.dev> - 297-1
 - users: allow administrators to change the user shell
-- tools: Enable Python bridge on Fedora 38
+- Enable Python bridge on Fedora 38 and CentOS/RHEL 9
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 296-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
 * Wed Jul 12 2023 Packit <hello@packit.dev> - 296-1
 - Performance and stability improvements
 
-* Wed Jun 28 2023 Python Maint <python-maint@redhat.com> - 295-2
-- Rebuilt for Python 3.12
-
 * Wed Jun 28 2023 Packit <hello@packit.dev> - 295-1
 - Cockpit Client can now connect to servers without Cockpit installed