diff -Nru cockpit-292/build.js cockpit-294.1/build.js --- cockpit-292/build.js 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/build.js 2023-06-15 11:09:27.000000000 +0000 @@ -153,7 +153,9 @@ } }, - ...args.rsync ? [cockpitRsyncEsbuildPlugin({ source: "dist/" + (args.onlydir || '') })] : [], + ...(args.rsync || process.env.RSYNC) + ? [cockpitRsyncEsbuildPlugin({ source: "dist/" + (args.onlydir || '') })] + : [], ]; if (useWasm) { diff -Nru cockpit-292/configure cockpit-294.1/configure --- cockpit-292/configure 2023-05-15 13:23:39.000000000 +0000 +++ cockpit-294.1/configure 2023-06-15 11:09:29.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for Cockpit 292. +# Generated by GNU Autoconf 2.71 for Cockpit 294.1. # # Report bugs to . # @@ -610,8 +610,8 @@ # Identity of this package. PACKAGE_NAME='Cockpit' PACKAGE_TARNAME='cockpit' -PACKAGE_VERSION='292' -PACKAGE_STRING='Cockpit 292' +PACKAGE_VERSION='294.1' +PACKAGE_STRING='Cockpit 294.1' PACKAGE_BUGREPORT='devel@lists.cockpit-project.org' PACKAGE_URL='https://cockpit-project.org/' @@ -1410,7 +1410,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Cockpit 292 to adapt to many kinds of systems. +\`configure' configures Cockpit 294.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1477,7 +1477,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Cockpit 292:";; + short | recursive ) echo "Configuration of Cockpit 294.1:";; esac cat <<\_ACEOF @@ -1651,7 +1651,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Cockpit configure 292 +Cockpit configure 294.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1869,7 +1869,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Cockpit $as_me 292, which was +It was created by Cockpit $as_me 294.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3146,7 +3146,7 @@ # Define the identity of the package. PACKAGE='cockpit' - VERSION='292' + VERSION='294.1' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -7956,7 +7956,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Cockpit $as_me 292, which was +This file was extended by Cockpit $as_me 294.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8025,7 +8025,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -Cockpit config.status 292 +Cockpit config.status 294.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -Nru cockpit-292/containers/flatpak/Makefile.am cockpit-294.1/containers/flatpak/Makefile.am --- cockpit-292/containers/flatpak/Makefile.am 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/containers/flatpak/Makefile.am 2023-06-15 11:09:27.000000000 +0000 @@ -1,16 +1,23 @@ build-for-flatpak: cockpit-ws -install-for-flatpak: \ - install-cockpitwsPROGRAMS \ - install-dist_client_metainfoDATA \ - install-dist_defaultbrandingDATA \ - install-dist_applicationsDATA \ - install-dist_cockpitclientDATA \ - install-dist_cockpitclientSCRIPTS \ - install-dist_dbusservicesDATA \ - install-dist_scalableiconDATA \ - install-dist_symboliciconDATA \ - $(NULL) +INSTALL_FLATPAK_TARGETS = \ + install-cockpitwsPROGRAMS \ + install-dist_client_metainfoDATA \ + install-dist_defaultbrandingDATA \ + install-dist_applicationsDATA \ + install-dist_cockpitclientDATA \ + install-dist_cockpitclientSCRIPTS \ + install-dist_dbusservicesDATA \ + install-dist_scalableiconDATA \ + install-dist_symboliciconDATA \ + install-cockpit-client-symlink \ + $(NULL) + +if WITH_PYBRIDGE +INSTALL_FLATPAK_TARGETS += install-python install-bundles +endif + +install-for-flatpak: $(INSTALL_FLATPAK_TARGETS) appstream-util validate --nonet src/client/org.cockpit_project.CockpitClient.metainfo.xml if test -s "${DOWNSTREAM_RELEASES_XML}"; then \ $(top_srcdir)/tools/patch-metainfo \ @@ -18,6 +25,5 @@ "${DOWNSTREAM_RELEASES_XML}"; \ fi appstream-util validate --nonet $(DESTDIR)$(datadir)/metainfo/org.cockpit_project.CockpitClient.metainfo.xml - mkdir -p $(DESTDIR)/$(bindir) - ln -sfTv $(cockpitclientdir)/cockpit-client $(DESTDIR)/$(bindir)/cockpit-client - cp -rT dist/static $(pkgdatadir)/static + cp -rT dist/static $(DESTDIR)$(pkgdatadir)/static + rm -rf $(DESTDIR)$(pkgdatadir)/apps $(DESTDIR)$(pkgdatadir)/playground diff -Nru cockpit-292/debian/changelog cockpit-294.1/debian/changelog --- cockpit-292/debian/changelog 2023-05-23 04:14:56.000000000 +0000 +++ cockpit-294.1/debian/changelog 2023-06-21 05:27:11.000000000 +0000 @@ -1,8 +1,29 @@ -cockpit (292-1~bpo23.04.1) lunar-backports; urgency=medium +cockpit (294.1-1~bpo23.04.1) lunar-backports; urgency=medium * No-change backport to lunar - -- Martin Pitt Tue, 23 May 2023 04:14:56 +0000 + -- Martin Pitt Wed, 21 Jun 2023 05:27:11 +0000 + +cockpit (294.1-1) unstable; urgency=medium + + * New upstream bug fix release: + - Multiple major fixes for the "remote python bridge" use case + - Fix FTBFS on most of our architectures. + + -- Martin Pitt Thu, 15 Jun 2023 11:19:37 +0000 + +cockpit (294-1) unstable; urgency=medium + + * New upstream release: + - Introduce Python bridge on Fedora Rawhide and Debian unstable + + -- Martin Pitt Wed, 14 Jun 2023 11:56:31 +0000 + +cockpit (293-1) experimental; urgency=medium + + * New upstream bug fix release. + + -- Martin Pitt Fri, 02 Jun 2023 05:11:05 +0000 cockpit (292-1) experimental; urgency=medium diff -Nru cockpit-292/debian/cockpit-ws.lintian-overrides cockpit-294.1/debian/cockpit-ws.lintian-overrides --- cockpit-292/debian/cockpit-ws.lintian-overrides 2023-03-30 05:12:46.000000000 +0000 +++ cockpit-294.1/debian/cockpit-ws.lintian-overrides 2023-06-14 11:56:00.000000000 +0000 @@ -1,2 +1,3 @@ # this is just an empty stub to avoid breaking existing PAM files cockpit-ws: shared-library-lacks-prerequisites *security/pam_cockpit_cert.so* +cockpit-ws: font-in-non-font-package *usr/share/cockpit/static/fonts/* diff -Nru cockpit-292/debian/control cockpit-294.1/debian/control --- cockpit-292/debian/control 2023-03-30 05:12:46.000000000 +0000 +++ cockpit-294.1/debian/control 2023-06-14 11:56:00.000000000 +0000 @@ -5,6 +5,7 @@ Uploaders: Michael Biebl , Martin Pitt , Build-Depends: debhelper-compat (= 13), + dh-python, gettext (>= 0.19.7), gettext (>= 0.21) | appstream, libssh-dev (>= 0.8.5), @@ -25,8 +26,14 @@ xmlto, docbook-xsl, glib-networking, - openssh-client , python3, + python3-pip, + python3-setuptools, + python3-wheel, + openssh-client , + procps , + python3-pytest-asyncio , + python3-pytest-timeout , Standards-Version: 4.6.2 Homepage: https://cockpit-project.org/ Vcs-Git: https://salsa.debian.org/utopia-team/cockpit.git @@ -58,7 +65,9 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, + ${python3:Depends}, glib-networking +Recommends: openssh-client Provides: cockpit-ssh Breaks: cockpit-ws (<< 181.x), Replaces: cockpit-dashboard (<< 170.x), cockpit-ws (<< 181.x) diff -Nru cockpit-292/debian/gbp.conf cockpit-294.1/debian/gbp.conf --- cockpit-292/debian/gbp.conf 2023-04-12 07:41:19.000000000 +0000 +++ cockpit-294.1/debian/gbp.conf 2023-06-14 11:51:32.000000000 +0000 @@ -1,4 +1,4 @@ [DEFAULT] pristine-tar = True patch-numbers = False -debian-branch = experimental +debian-branch = master diff -Nru cockpit-292/debian/rules cockpit-294.1/debian/rules --- cockpit-292/debian/rules 2023-05-10 08:18:07.000000000 +0000 +++ cockpit-294.1/debian/rules 2023-06-15 11:19:15.000000000 +0000 @@ -2,6 +2,13 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +# Keep the older C bridge on stable releases +# also keep it on Ubuntu until testCockpitDesktop gets fixed +C_BRIDGE = $(filter $(shell . /etc/os-release; echo $${VERSION_ID:-unstable}),11 22.04 22.10 23.04) +ifeq ($(C_BRIDGE),) +CONFIG_OPTIONS += --enable-pybridge +endif + # riscv is an emulated architecture for now, and too slow to run expensive unit tests # hppa's threading is absurdly slow (#981127) SLOW_ARCHES = $(filter $(shell dpkg-architecture -qDEB_BUILD_ARCH),riscv64 hppa) @@ -10,7 +17,7 @@ endif %: - dh $@ --buildsystem=autoconf + dh $@ --buildsystem=autoconf --with=python3 override_dh_auto_configure: dh_auto_configure -- \ @@ -19,6 +26,15 @@ --with-pamdir=/lib/$(DEB_HOST_MULTIARCH)/security \ --libexecdir=/usr/lib/cockpit $(CONFIG_OPTIONS) +# HACK: Debian's pip breaks --prefix: https://bugs.debian.org/1035546 +# redirect /usr/local to /usr, as merging the trees after install is brittle +execute_before_dh_auto_install: + mkdir -p debian/tmp/usr; ln -s . debian/tmp/usr/local + +# undo the pip hack +execute_after_dh_auto_install: + rm debian/tmp/usr/local + # avoid trying to start cockpit-motd.service and cockpit-wsinstance-*.socket etc. override_dh_installsystemd: dh_installsystemd -p cockpit-ws cockpit.socket @@ -42,4 +58,22 @@ rm debian/tmp/usr/share/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml dh_install -Xusr/src/debug +ifeq ($(C_BRIDGE),) + dh_install -p cockpit-bridge debian/tmp/usr/lib/python* +endif + make install-tests DESTDIR=debian/cockpit-tests + +execute_after_dh_install-indep: + # avoid dh_missing failure +ifeq ($(C_BRIDGE),) + rm -r debian/tmp/usr/lib/python* +endif + +# run pytests *after* installation, so that we can make sure that we installed the right files +execute_after_dh_install-arch: +ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS))) +ifeq ($(C_BRIDGE),) + pytest -vv -k 'not test_descriptions' -opythonpath=$$(ls -d debian/cockpit-bridge/usr/lib/python3*/dist-packages) +endif +endif Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/apps.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/apps.css.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/apps.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/apps.js.gz differ diff -Nru cockpit-292/dist/apps/apps.js.LEGAL.txt cockpit-294.1/dist/apps/apps.js.LEGAL.txt --- cockpit-292/dist/apps/apps.js.LEGAL.txt 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/apps/apps.js.LEGAL.txt 2023-06-15 11:09:31.000000000 +0000 @@ -41,6 +41,6 @@ focus-trap/dist/focus-trap.esm.js: /*! - * focus-trap 7.4.0 + * focus-trap 7.4.1 * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE */ diff -Nru cockpit-292/dist/apps/index.html cockpit-294.1/dist/apps/index.html --- cockpit-292/dist/apps/index.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/apps/index.html 2023-06-15 11:09:31.000000000 +0000 @@ -21,15 +21,15 @@ Applications - - + + - +
Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.cs.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.cs.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.de.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.de.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.es.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.es.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.fi.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.fi.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.fr.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.fr.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.he.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.he.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.it.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.it.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.ja.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.ja.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.ka.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.ka.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.ko.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.ko.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.nb_NO.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.nb_NO.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.nl.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.nl.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.pl.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.pl.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.pt_BR.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.pt_BR.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.ru.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.ru.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.sk.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.sk.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.sv.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.sv.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.tr.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.tr.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.uk.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.uk.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/apps/po.zh_CN.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/apps/po.zh_CN.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/cockpit.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/cockpit.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.cs.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.cs.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.de.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.de.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.es.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.es.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.fi.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.fi.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.fr.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.fr.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.he.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.he.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.it.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.it.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.ja.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.ja.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.ka.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.ka.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.ko.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.ko.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.nb_NO.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.nb_NO.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.nl.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.nl.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.pl.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.pl.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.pt_BR.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.pt_BR.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.ru.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.ru.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.sk.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.sk.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.sv.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.sv.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.tr.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.tr.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.uk.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.uk.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/base1/po.zh_CN.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/base1/po.zh_CN.js.gz differ diff -Nru cockpit-292/dist/kdump/index.html cockpit-294.1/dist/kdump/index.html --- cockpit-292/dist/kdump/index.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/kdump/index.html 2023-06-15 11:09:31.000000000 +0000 @@ -19,19 +19,19 @@ --> - + Kernel dump - - + + - + - +
Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/kdump.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/kdump.css.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/kdump.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/kdump.js.gz differ diff -Nru cockpit-292/dist/kdump/kdump.js.LEGAL.txt cockpit-294.1/dist/kdump/kdump.js.LEGAL.txt --- cockpit-292/dist/kdump/kdump.js.LEGAL.txt 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/kdump/kdump.js.LEGAL.txt 2023-06-15 11:09:31.000000000 +0000 @@ -41,6 +41,6 @@ focus-trap/dist/focus-trap.esm.js: /*! - * focus-trap 7.4.0 + * focus-trap 7.4.1 * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE */ diff -Nru cockpit-292/dist/kdump/manifest.json cockpit-294.1/dist/kdump/manifest.json --- cockpit-292/dist/kdump/manifest.json 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/kdump/manifest.json 2023-06-15 11:09:31.000000000 +0000 @@ -1,4 +1,7 @@ { + "conditions": [ + {"path-exists": "/usr/sbin/kexec"} + ], "tools": { "index": { "label": "Kernel dump", Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.cs.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.cs.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.de.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.de.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.es.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.es.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.fi.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.fi.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.fr.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.fr.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.he.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.he.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.it.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.it.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.ja.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.ja.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.ka.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.ka.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.ko.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.ko.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.nb_NO.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.nb_NO.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.nl.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.nl.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.pl.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.pl.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.pt_BR.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.pt_BR.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.ru.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.ru.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.sk.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.sk.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.sv.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.sv.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.tr.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.tr.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.uk.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.uk.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/kdump/po.zh_CN.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/kdump/po.zh_CN.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/index.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/index.css.gz differ diff -Nru cockpit-292/dist/metrics/index.html cockpit-294.1/dist/metrics/index.html --- cockpit-292/dist/metrics/index.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/metrics/index.html 2023-06-15 11:09:31.000000000 +0000 @@ -17,12 +17,12 @@ --> - Metrics and history - - - + Metrics and history + + + - + @@ -31,7 +31,7 @@ - +
Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/index.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/index.js.gz differ diff -Nru cockpit-292/dist/metrics/index.js.LEGAL.txt cockpit-294.1/dist/metrics/index.js.LEGAL.txt --- cockpit-292/dist/metrics/index.js.LEGAL.txt 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/metrics/index.js.LEGAL.txt 2023-06-15 11:09:31.000000000 +0000 @@ -41,6 +41,6 @@ focus-trap/dist/focus-trap.esm.js: /*! - * focus-trap 7.4.0 + * focus-trap 7.4.1 * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE */ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.cs.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.cs.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.de.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.de.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.es.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.es.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.fi.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.fi.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.fr.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.fr.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.he.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.he.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.it.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.it.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.ja.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.ja.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.ka.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.ka.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.ko.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.ko.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.nb_NO.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.nb_NO.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.nl.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.nl.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.pl.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.pl.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.pt_BR.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.pt_BR.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.ru.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.ru.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.sk.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.sk.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.sv.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.sv.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.tr.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.tr.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.uk.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.uk.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/metrics/po.zh_CN.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/metrics/po.zh_CN.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/firewall.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/firewall.css.gz differ diff -Nru cockpit-292/dist/networkmanager/firewall.html cockpit-294.1/dist/networkmanager/firewall.html --- cockpit-292/dist/networkmanager/firewall.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/networkmanager/firewall.html 2023-06-15 11:09:31.000000000 +0000 @@ -19,10 +19,10 @@ --> - Firewall - + Firewall + - + @@ -30,7 +30,7 @@ - +
Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/firewall.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/firewall.js.gz differ diff -Nru cockpit-292/dist/networkmanager/firewall.js.LEGAL.txt cockpit-294.1/dist/networkmanager/firewall.js.LEGAL.txt --- cockpit-292/dist/networkmanager/firewall.js.LEGAL.txt 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/networkmanager/firewall.js.LEGAL.txt 2023-06-15 11:09:31.000000000 +0000 @@ -41,6 +41,6 @@ focus-trap/dist/focus-trap.esm.js: /*! - * focus-trap 7.4.0 + * focus-trap 7.4.1 * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE */ diff -Nru cockpit-292/dist/networkmanager/index.html cockpit-294.1/dist/networkmanager/index.html --- cockpit-292/dist/networkmanager/index.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/networkmanager/index.html 2023-06-15 11:09:31.000000000 +0000 @@ -21,16 +21,16 @@ Networking - - - + + + - +
diff -Nru cockpit-292/dist/networkmanager/manifest.json cockpit-294.1/dist/networkmanager/manifest.json --- cockpit-292/dist/networkmanager/manifest.json 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/networkmanager/manifest.json 2023-06-15 11:09:31.000000000 +0000 @@ -1,5 +1,8 @@ { "name": "network", + "conditions": [ + {"path-exists": "/usr/share/dbus-1/system.d/org.freedesktop.NetworkManager.conf"} + ], "menu": { "index": { "label": "Networking", Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/networkmanager.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/networkmanager.css.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/networkmanager.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/networkmanager.js.gz differ diff -Nru cockpit-292/dist/networkmanager/networkmanager.js.LEGAL.txt cockpit-294.1/dist/networkmanager/networkmanager.js.LEGAL.txt --- cockpit-292/dist/networkmanager/networkmanager.js.LEGAL.txt 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/networkmanager/networkmanager.js.LEGAL.txt 2023-06-15 11:09:31.000000000 +0000 @@ -41,6 +41,6 @@ focus-trap/dist/focus-trap.esm.js: /*! - * focus-trap 7.4.0 + * focus-trap 7.4.1 * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE */ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.cs.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.cs.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.de.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.de.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.es.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.es.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.fi.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.fi.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.fr.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.fr.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.he.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.he.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.it.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.it.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.ja.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.ja.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.ka.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.ka.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.ko.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.ko.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.nb_NO.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.nb_NO.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.nl.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.nl.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.pl.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.pl.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.pt_BR.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.pt_BR.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.ru.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.ru.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.sk.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.sk.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.sv.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.sv.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.tr.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.tr.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.uk.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.uk.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/networkmanager/po.zh_CN.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/networkmanager/po.zh_CN.js.gz differ diff -Nru cockpit-292/dist/packagekit/index.html cockpit-294.1/dist/packagekit/index.html --- cockpit-292/dist/packagekit/index.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/packagekit/index.html 2023-06-15 11:09:31.000000000 +0000 @@ -20,17 +20,17 @@ - Software updates - + Software updates + - + - +
Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.cs.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.cs.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.de.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.de.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.es.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.es.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.fi.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.fi.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.fr.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.fr.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.he.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.he.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.it.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.it.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.ja.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.ja.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.ka.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.ka.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.ko.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.ko.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.nb_NO.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.nb_NO.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.nl.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.nl.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.pl.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.pl.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.pt_BR.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.pt_BR.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.ru.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.ru.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.sk.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.sk.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.sv.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.sv.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.tr.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.tr.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.uk.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.uk.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/po.zh_CN.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/po.zh_CN.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/updates.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/updates.css.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/packagekit/updates.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/packagekit/updates.js.gz differ diff -Nru cockpit-292/dist/packagekit/updates.js.LEGAL.txt cockpit-294.1/dist/packagekit/updates.js.LEGAL.txt --- cockpit-292/dist/packagekit/updates.js.LEGAL.txt 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/packagekit/updates.js.LEGAL.txt 2023-06-15 11:09:31.000000000 +0000 @@ -41,6 +41,6 @@ focus-trap/dist/focus-trap.esm.js: /*! - * focus-trap 7.4.0 + * focus-trap 7.4.1 * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE */ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/exception.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/exception.css.gz differ diff -Nru cockpit-292/dist/playground/exception.html cockpit-294.1/dist/playground/exception.html --- cockpit-292/dist/playground/exception.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/playground/exception.html 2023-06-15 11:09:31.000000000 +0000 @@ -1,18 +1,18 @@ - + - Javascript exceptions - + + - -
-
-
+ +
+
+

Exception

-

Clicking this button should make a javascript exception happen.

+

Clicking this button should make a javascript exception happen.

Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/exception.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/exception.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/index.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/index.css.gz differ diff -Nru cockpit-292/dist/playground/index.html cockpit-294.1/dist/playground/index.html --- cockpit-292/dist/playground/index.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/playground/index.html 2023-06-15 11:09:31.000000000 +0000 @@ -1,27 +1,27 @@ - + Cockpit Development Playground - - + + - -
-
-
+ +
+
+

Development Playground

-
+

Page Status

- - - - + + + +
Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/index.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/index.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/journal.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/journal.css.gz differ diff -Nru cockpit-292/dist/playground/journal.html cockpit-294.1/dist/playground/journal.html --- cockpit-292/dist/playground/journal.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/playground/journal.html 2023-06-15 11:09:31.000000000 +0000 @@ -1,18 +1,18 @@ - + Cockpit Journal Box - - + + - -
-
-
+ +
+
+
Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/journal.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/journal.js.gz differ diff -Nru cockpit-292/dist/playground/journal.js.LEGAL.txt cockpit-294.1/dist/playground/journal.js.LEGAL.txt --- cockpit-292/dist/playground/journal.js.LEGAL.txt 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/playground/journal.js.LEGAL.txt 2023-06-15 11:09:31.000000000 +0000 @@ -41,6 +41,6 @@ focus-trap/dist/focus-trap.esm.js: /*! - * focus-trap 7.4.0 + * focus-trap 7.4.1 * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE */ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/metrics.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/metrics.css.gz differ diff -Nru cockpit-292/dist/playground/metrics.html cockpit-294.1/dist/playground/metrics.html --- cockpit-292/dist/playground/metrics.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/playground/metrics.html 2023-06-15 11:09:31.000000000 +0000 @@ -1,17 +1,17 @@ - + Cockpit Monitoring - - + + - -
-
-
+ +
+
+

Monitoring

Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/metrics.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/metrics.js.gz differ diff -Nru cockpit-292/dist/playground/notifications-receiver.html cockpit-294.1/dist/playground/notifications-receiver.html --- cockpit-292/dist/playground/notifications-receiver.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/playground/notifications-receiver.html 2023-06-15 11:09:31.000000000 +0000 @@ -1,14 +1,14 @@ - + Notifications Receiver - + - +

Notifications Receiver

/ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/notifications-receiver.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/notifications-receiver.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/pkgs.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/pkgs.css.gz differ diff -Nru cockpit-292/dist/playground/pkgs.html cockpit-294.1/dist/playground/pkgs.html --- cockpit-292/dist/playground/pkgs.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/playground/pkgs.html 2023-06-15 11:09:31.000000000 +0000 @@ -1,16 +1,16 @@ - + Cockpit Packages - + - -
-
-
+ +
+
+
Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/pkgs.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/pkgs.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/plot.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/plot.css.gz differ diff -Nru cockpit-292/dist/playground/plot.html cockpit-294.1/dist/playground/plot.html --- cockpit-292/dist/playground/plot.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/playground/plot.html 2023-06-15 11:09:31.000000000 +0000 @@ -1,14 +1,14 @@ - + Cockpit Plots - - + + - +
Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/plot.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/plot.js.gz differ diff -Nru cockpit-292/dist/playground/plot.js.LEGAL.txt cockpit-294.1/dist/playground/plot.js.LEGAL.txt --- cockpit-292/dist/playground/plot.js.LEGAL.txt 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/playground/plot.js.LEGAL.txt 2023-06-15 11:09:31.000000000 +0000 @@ -41,6 +41,6 @@ focus-trap/dist/focus-trap.esm.js: /*! - * focus-trap 7.4.0 + * focus-trap 7.4.1 * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE */ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.cs.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.cs.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.de.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.de.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.es.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.es.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.fi.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.fi.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.fr.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.fr.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.he.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.he.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.it.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.it.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.ja.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.ja.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.ka.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.ka.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.ko.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.ko.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.nb_NO.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.nb_NO.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.nl.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.nl.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.pl.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.pl.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.pt_BR.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.pt_BR.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.ru.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.ru.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.sk.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.sk.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.sv.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.sv.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.tr.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.tr.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.uk.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.uk.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/po.zh_CN.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/po.zh_CN.js.gz differ diff -Nru cockpit-292/dist/playground/preloaded.html cockpit-294.1/dist/playground/preloaded.html --- cockpit-292/dist/playground/preloaded.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/playground/preloaded.html 2023-06-15 11:09:31.000000000 +0000 @@ -1,14 +1,14 @@ - + Preloaded Page - + - +

Preloaded

Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/preloaded.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/preloaded.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/react-patterns.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/react-patterns.css.gz differ diff -Nru cockpit-292/dist/playground/react-patterns.html cockpit-294.1/dist/playground/react-patterns.html --- cockpit-292/dist/playground/react-patterns.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/playground/react-patterns.html 2023-06-15 11:09:31.000000000 +0000 @@ -1,30 +1,30 @@ - + Cockpit React Patterns Usage - - + + - -
-
-
+ +
+
+

Select file

-
+

Dialogs

- - + +
-
+

Cards

Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/react-patterns.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/react-patterns.js.gz differ diff -Nru cockpit-292/dist/playground/react-patterns.js.LEGAL.txt cockpit-294.1/dist/playground/react-patterns.js.LEGAL.txt --- cockpit-292/dist/playground/react-patterns.js.LEGAL.txt 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/playground/react-patterns.js.LEGAL.txt 2023-06-15 11:09:31.000000000 +0000 @@ -41,6 +41,6 @@ focus-trap/dist/focus-trap.esm.js: /*! - * focus-trap 7.4.0 + * focus-trap 7.4.1 * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE */ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/service.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/service.css.gz differ diff -Nru cockpit-292/dist/playground/service.html cockpit-294.1/dist/playground/service.html --- cockpit-292/dist/playground/service.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/playground/service.html 2023-06-15 11:09:31.000000000 +0000 @@ -1,13 +1,13 @@ - + Cockpit Generic Service Monitor - + - + Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/service.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/service.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/speed.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/speed.css.gz differ diff -Nru cockpit-292/dist/playground/speed.html cockpit-294.1/dist/playground/speed.html --- cockpit-292/dist/playground/speed.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/playground/speed.html 2023-06-15 11:09:31.000000000 +0000 @@ -1,109 +1,109 @@ - + Cockpit Speed Tests - - + + - -
-
-
+ +
+
+

Speed Tests

Exists
- + - + - +
  
  
  
-

+

Echo Tests

- + - + - + - + - - + +
-
+

Read Test

- + - - + +
-
+

Download Test

- + - +
-
+

spawn test

- + - - - +
+

+                            
Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/speed.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/speed.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/test.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/test.css.gz differ diff -Nru cockpit-292/dist/playground/test.html cockpit-294.1/dist/playground/test.html --- cockpit-292/dist/playground/test.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/playground/test.html 2023-06-15 11:09:31.000000000 +0000 @@ -1,42 +1,42 @@ - + Cockpit playground - - + + - -
-
-
- + +
+
+
+ - +

- +
- +
- +
- +

- - - + + +

Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/test.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/test.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/translate.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/translate.css.gz differ diff -Nru cockpit-292/dist/playground/translate.html cockpit-294.1/dist/playground/translate.html --- cockpit-292/dist/playground/translate.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/playground/translate.html 2023-06-15 11:09:31.000000000 +0000 @@ -1,27 +1,27 @@ - + - + Cockpit playground - + - -
-
-
+ +
+
+

HTML translations

-

For translating HTML use these forms:

+

For translating HTML use these forms:

<span translate>Ready</span> - = Ready + = Ready

<span translate translate-context="verb">Ready</span> - = Ready + = Ready

@@ -39,18 +39,18 @@ = Cancel

-

Note that we do not support:

+

Note that we do not support:

  • Interpolation of variables.
  • Pluralization
  • The <translate> element
-
+

Old Glade style

-

The old Glade style is not recommended:

+

The old Glade style is not recommended:

<span translate="yes">Empty</span> @@ -62,7 +62,7 @@ = Empty

-

Note that we do not support:

+

Note that we do not support:

  • Interpolation of variables.
  • Translatable attributes.
  • @@ -70,7 +70,7 @@
  • The <translate> element
-
+

Code Translations

@@ -121,7 +121,7 @@ =

-

Note that we do not support:

+

Note that we do not support:

  • Extraction of single quoted strings.
Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/playground/translate.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/playground/translate.js.gz differ diff -Nru cockpit-292/dist/selinux/index.html cockpit-294.1/dist/selinux/index.html --- cockpit-292/dist/selinux/index.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/selinux/index.html 2023-06-15 11:09:31.000000000 +0000 @@ -19,12 +19,12 @@ --> - + SELinux troubleshoot - - + + - + @@ -32,7 +32,7 @@ - +
diff -Nru cockpit-292/dist/selinux/manifest.json cockpit-294.1/dist/selinux/manifest.json --- cockpit-292/dist/selinux/manifest.json 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/selinux/manifest.json 2023-06-15 11:09:31.000000000 +0000 @@ -1,4 +1,7 @@ { + "conditions": [ + {"path-exists": "/sys/fs/selinux"} + ], "tools": { "index": { "label": "SELinux", Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.cs.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.cs.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.de.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.de.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.es.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.es.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.fi.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.fi.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.fr.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.fr.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.he.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.he.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.it.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.it.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.ja.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.ja.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.ka.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.ka.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.ko.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.ko.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.nb_NO.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.nb_NO.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.nl.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.nl.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.pl.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.pl.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.pt_BR.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.pt_BR.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.ru.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.ru.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.sk.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.sk.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.sv.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.sv.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.tr.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.tr.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.uk.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.uk.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/po.zh_CN.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/po.zh_CN.js.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/selinux.css.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/selinux.css.gz differ Binary files /tmp/tmpoxgva44c/gJZlwToVTi/cockpit-292/dist/selinux/selinux.js.gz and /tmp/tmpoxgva44c/ml0pDxTfzf/cockpit-294.1/dist/selinux/selinux.js.gz differ diff -Nru cockpit-292/dist/selinux/selinux.js.LEGAL.txt cockpit-294.1/dist/selinux/selinux.js.LEGAL.txt --- cockpit-292/dist/selinux/selinux.js.LEGAL.txt 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/selinux/selinux.js.LEGAL.txt 2023-06-15 11:09:31.000000000 +0000 @@ -41,6 +41,6 @@ focus-trap/dist/focus-trap.esm.js: /*! - * focus-trap 7.4.0 + * focus-trap 7.4.1 * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE */ diff -Nru cockpit-292/dist/shell/index.html cockpit-294.1/dist/shell/index.html --- cockpit-292/dist/shell/index.html 2023-05-15 13:23:41.000000000 +0000 +++ cockpit-294.1/dist/shell/index.html 2023-06-15 11:09:31.000000000 +0000 @@ -1,21 +1,21 @@ - + Cockpit - - - - + + + + - +
- - + + -
- +
Certificates - Cockpit will load a certificate from the /etc/cockpit/ws-certs.d - directory. It will use the last file with a .cert or .crt + Cockpit will load a certificate from the /etc/cockpit/ws-certs.d, + directory, or below $XDG_CONFIG_DIRS if set (see + cockpit.conf). + It will use the last file with a .cert or .crt extension in alphabetical order. The file should contain one or more OpenSSL style BEGIN CERTIFICATE blocks for the server certificate and the intermediate certificate authorities. diff -Nru cockpit-292/doc/guide/packages.xml cockpit-294.1/doc/guide/packages.xml --- cockpit-292/doc/guide/packages.xml 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/doc/guide/packages.xml 2023-06-15 11:09:27.000000000 +0000 @@ -289,10 +289,12 @@
Manifest overrides - A file called override.json may be placed next to the manifest, or a file - <package-directory-name>.override.json may be placed into /etc/cockpit/ - or ~/.config/cockpit. - These contain overrides to the information in the manifest in the simple + To change a manifest system-wide, a file <package-directory-name>.override.json + may be placed into /etc/cockpit/, or below $XDG_CONFIG_DIRS + if set (see cockpit.conf). To change it for a particular user only, put the + override into ~/.config/cockpit. + + These override the information in the manifest in the simple JSON Merge Patch format. This can be used to hide or modify menu items of an existing package. diff -Nru cockpit-292/doc/guide/sso.xml cockpit-294.1/doc/guide/sso.xml --- cockpit-292/doc/guide/sso.xml 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/doc/guide/sso.xml 2023-06-15 11:09:27.000000000 +0000 @@ -28,7 +28,8 @@ There must be a valid Kerberos host key for the server in the /etc/krb5.keytab file. Alternatively, if you would like to use a different keytab, you can do so - by placing it in /etc/cockpit/krb5.keytab. It may be necessary to + by placing it in /etc/cockpit/krb5.keytab, or below $XDG_CONFIG_DIRS + if set (see cockpit.conf). It may be necessary to create a kerberos service principal and update the keytab if it is not present. Depending on your domain type different service names are required: diff -Nru cockpit-292/doc/man/cockpit.conf.xml cockpit-294.1/doc/man/cockpit.conf.xml --- cockpit-292/doc/man/cockpit.conf.xml 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/doc/man/cockpit.conf.xml 2023-06-15 11:09:27.000000000 +0000 @@ -38,11 +38,14 @@ DESCRIPTION - Cockpit can be configured via /etc/cockpit/cockpit.conf. This file is not required - and may need to be created manually. The file has a INI file syntax and thus - contains key / value pairs, grouped into topical groups. See the examples below for - details.. - + Cockpit can be configured via /etc/cockpit/cockpit.conf. If $XDG_CONFIG_DIRS + is set, then the first path containing a ../cockpit/cockpit.conf is used + instead. Other configuration files and directories are searched for in the same way. + + + This file is not required and may need to be created manually. The file has a INI file + syntax and thus contains key / value pairs, grouped into topical groups. See the examples + below for details. Note: The port that cockpit listens on cannot be changed in this file. To change the port change the systemd cockpit.socket file. diff -Nru cockpit-292/doc/man/cockpit-tls.xml cockpit-294.1/doc/man/cockpit-tls.xml --- cockpit-292/doc/man/cockpit-tls.xml 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/doc/man/cockpit-tls.xml 2023-06-15 11:09:27.000000000 +0000 @@ -70,7 +70,8 @@ To specify the TLS certificate the web service should use, simply drop a file with the extension .cert in the - /etc/cockpit/ws-certs.d directory. If there are + /etc/cockpit/ws-certs.d directory, or below $XDG_CONFIG_DIRS + if set (see cockpit.conf). If there are multiple files in this directory, then the highest priority one is chosen after sorting. The .cert file should contain at least two diff -Nru cockpit-292/.extra_dist cockpit-294.1/.extra_dist --- cockpit-292/.extra_dist 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/.extra_dist 2023-06-15 11:09:27.000000000 +0000 @@ -125,7 +125,7 @@ pkg/lib/plot.js pkg/lib/polyfills.js pkg/lib/python.js -pkg/lib/qunit-template.html +pkg/lib/qunit-template.html.in pkg/lib/qunit-tests.js pkg/lib/serverTime.js pkg/lib/serverTime.scss @@ -210,6 +210,7 @@ pkg/playground/test.js pkg/playground/translate.html pkg/playground/translate.js +pkg/ruff.toml pkg/selinux/index.html pkg/selinux/manifest.json pkg/selinux/selinux-client.js @@ -297,6 +298,7 @@ pkg/storaged/storaged.jsx pkg/storaged/stratis-details.jsx pkg/storaged/stratis-panel.jsx +pkg/storaged/stratis-utils.js pkg/storaged/stratis2-set-key.py pkg/storaged/stratis3-set-key.py pkg/storaged/swap-tab.jsx @@ -406,6 +408,7 @@ pkg/users/users.scss plans/all.fmf test/README.md +test/__init__.py test/browser/browser.sh test/browser/main.fmf test/browser/run-test.sh @@ -413,13 +416,16 @@ test/common/cdp.py test/common/chromium-cdp-driver.js test/common/firefox-cdp-driver.js +test/common/git-utils.sh test/common/lcov.py test/common/link-patterns.json +test/common/make-bots test/common/netlib.py test/common/packagelib.py -test/common/parent.py test/common/pixel-tests test/common/pixeldiff.html +test/common/pywrap +test/common/ruff.toml test/common/run-tests test/common/storagelib.py test/common/tap-cdp @@ -435,9 +441,11 @@ test/data/expired/combined.cert test/image-prepare test/ostree.install +test/pytest/__init__.py test/pytest/mockpeer.py test/pytest/mocktransport.py test/pytest/pseudo.py +test/pytest/test_beiboot.py test/pytest/test_bridge.py test/pytest/test_browser.py test/pytest/test_code.py @@ -546,7 +554,7 @@ test/verify/files/ssh/id_rsa.pub test/verify/files/test.png test/verify/files/workflow_Cockpit.xml -test/verify/parent.py +test/verify/ruff.toml test/vm.install tools/Makefile-tools.am tools/Makefile.redirect @@ -590,11 +598,9 @@ tools/git-hook-post-commit tools/git-hook-pre-push tools/git-hook-pre-rebase -tools/git-utils.sh tools/glib.supp tools/gnutls.supp tools/libssh.supp -tools/make-bots tools/make-debs tools/make-dist tools/make-rpms @@ -606,13 +612,14 @@ tools/mock-build-env/security/pam_appl.h tools/node-modules tools/npm-release-time -tools/parent.py tools/patch-metainfo tools/polkit.supp tools/termschutz tools/urls-check tools/valgrind.supp tools/vulture-suppressions/cockpit.py +tools/vulture-suppressions/ferny.py +tools/vulture-suppressions/ruff.toml tools/vulture-suppressions/stdlib.py tools/vulture-suppressions/testlib.py tools/webpack-make.js diff -Nru cockpit-292/Makefile.am cockpit-294.1/Makefile.am --- cockpit-292/Makefile.am 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/Makefile.am 2023-06-15 11:09:27.000000000 +0000 @@ -122,7 +122,7 @@ # must be from main, as only that has current and existing images; but testvm.py API is stable # support CI testing against a bots change bots: - tools/make-bots + test/common/make-bots .PHONY: rsync RSYNC_HOST ?= c diff -Nru cockpit-292/Makefile.in cockpit-294.1/Makefile.in --- cockpit-292/Makefile.in 2023-05-15 13:23:39.000000000 +0000 +++ cockpit-294.1/Makefile.in 2023-06-15 11:09:29.000000000 +0000 @@ -159,41 +159,42 @@ wsinstance-start$(EXEEXT) socket-activation-helper$(EXEEXT) \ frob-websocket$(EXEEXT) test-server$(EXEEXT) \ mock-echo$(EXEEXT) mock-auth-command$(EXEEXT) -@ENABLE_DOC_TRUE@am__append_1 = \ +@WITH_PYBRIDGE_TRUE@am__append_1 = install-python install-bundles +@ENABLE_DOC_TRUE@am__append_2 = \ @ENABLE_DOC_TRUE@ $(GUIDE_DOCBOOK) \ @ENABLE_DOC_TRUE@ $(GUIDE_INCLUDES) \ @ENABLE_DOC_TRUE@ $(GUIDE_XSLT) \ @ENABLE_DOC_TRUE@ $(GUIDE_STATIC) \ @ENABLE_DOC_TRUE@ $(NULL) -@ENABLE_DOC_TRUE@am__append_2 = doc/guide/html/index.html -@ENABLE_DOC_TRUE@am__append_3 = clean-guide -@ENABLE_DOC_TRUE@am__append_4 = check-guide -@ENABLE_DOC_TRUE@am__append_5 = install-guide -@ENABLE_DOC_TRUE@am__append_6 = uninstall-guide -@ENABLE_DOC_TRUE@am__append_7 = $(MANPAGES) +@ENABLE_DOC_TRUE@am__append_3 = doc/guide/html/index.html +@ENABLE_DOC_TRUE@am__append_4 = clean-guide +@ENABLE_DOC_TRUE@am__append_5 = check-guide +@ENABLE_DOC_TRUE@am__append_6 = install-guide +@ENABLE_DOC_TRUE@am__append_7 = uninstall-guide @ENABLE_DOC_TRUE@am__append_8 = $(MANPAGES) -@SELINUX_POLICY_ENABLED_TRUE@am__append_9 = \ +@ENABLE_DOC_TRUE@am__append_9 = $(MANPAGES) +@SELINUX_POLICY_ENABLED_TRUE@am__append_10 = \ @SELINUX_POLICY_ENABLED_TRUE@ $(SELINUX_POLICY_FILES) \ @SELINUX_POLICY_ENABLED_TRUE@ $(SELINUX_POLICY_MANPAGES) \ @SELINUX_POLICY_ENABLED_TRUE@ $(NULL) -@SELINUX_POLICY_ENABLED_TRUE@am__append_10 = install-selinux -@SELINUX_POLICY_ENABLED_TRUE@am__append_11 = $(SELINUX_POLICY_MANPAGES) +@SELINUX_POLICY_ENABLED_TRUE@am__append_11 = install-selinux +@SELINUX_POLICY_ENABLED_TRUE@am__append_12 = $(SELINUX_POLICY_MANPAGES) bin_PROGRAMS = $(am__EXEEXT_1) libexec_PROGRAMS = $(am__EXEEXT_11) $(am__EXEEXT_12) \ cockpit-session$(EXEEXT) $(am__EXEEXT_13) cockpit-tls$(EXEEXT) \ cockpit-certificate-ensure$(EXEEXT) \ cockpit-wsinstance-factory$(EXEEXT) sbin_PROGRAMS = -@WITH_PYBRIDGE_TRUE@am__append_12 = install-python +@WITH_PYBRIDGE_TRUE@am__append_13 = install-python # ----------------------------------------------------------------------------- # libcockpit-bridge.a: code used in cockpit-bridge and its tests -@WITH_PYBRIDGE_FALSE@am__append_13 = libcockpit-bridge.a -@WITH_POLKIT_TRUE@@WITH_PYBRIDGE_FALSE@am__append_14 = $(polkit_CFLAGS) -@WITH_POLKIT_TRUE@@WITH_PYBRIDGE_FALSE@am__append_15 = $(polkit_LIBS) -@WITH_POLKIT_TRUE@@WITH_PYBRIDGE_FALSE@am__append_16 = \ +@WITH_PYBRIDGE_FALSE@am__append_14 = libcockpit-bridge.a +@WITH_POLKIT_TRUE@@WITH_PYBRIDGE_FALSE@am__append_15 = $(polkit_CFLAGS) +@WITH_POLKIT_TRUE@@WITH_PYBRIDGE_FALSE@am__append_16 = $(polkit_LIBS) +@WITH_POLKIT_TRUE@@WITH_PYBRIDGE_FALSE@am__append_17 = \ @WITH_POLKIT_TRUE@@WITH_PYBRIDGE_FALSE@ src/bridge/cockpitpolkitagent.c \ @WITH_POLKIT_TRUE@@WITH_PYBRIDGE_FALSE@ src/bridge/cockpitpolkitagent.h \ @WITH_POLKIT_TRUE@@WITH_PYBRIDGE_FALSE@ $(NULL) @@ -201,20 +202,20 @@ # ----------------------------------------------------------------------------- # PROGRAMS -@WITH_PYBRIDGE_FALSE@am__append_17 = cockpit-bridge -@WITH_PYBRIDGE_FALSE@am__append_18 = cockpit-askpass +@WITH_PYBRIDGE_FALSE@am__append_18 = cockpit-bridge +@WITH_PYBRIDGE_FALSE@am__append_19 = cockpit-askpass # ----------------------------------------------------------------------------- # TESTS -@WITH_PYBRIDGE_FALSE@am__append_19 = mock-bridge -@WITH_PYBRIDGE_FALSE@am__append_20 = test-bridge test-connect \ +@WITH_PYBRIDGE_FALSE@am__append_20 = mock-bridge +@WITH_PYBRIDGE_FALSE@am__append_21 = test-bridge test-connect \ @WITH_PYBRIDGE_FALSE@ test-dbus-meta test-fs test-httpstream \ @WITH_PYBRIDGE_FALSE@ test-metrics test-packages \ @WITH_PYBRIDGE_FALSE@ test-packet-channel test-paths test-peer \ @WITH_PYBRIDGE_FALSE@ test-pipe-channel test-process \ @WITH_PYBRIDGE_FALSE@ test-router test-rules test-stream \ @WITH_PYBRIDGE_FALSE@ test-websocketstream -@WITH_PYBRIDGE_FALSE@am__append_21 = \ +@WITH_PYBRIDGE_FALSE@am__append_22 = \ @WITH_PYBRIDGE_FALSE@ src/bridge/mock-resource \ @WITH_PYBRIDGE_FALSE@ src/bridge/mock-pmda.c \ @WITH_PYBRIDGE_FALSE@ src/bridge/mock-pmns \ @@ -224,31 +225,32 @@ @WITH_PYBRIDGE_FALSE@ src/bridge/mock-server.key \ @WITH_PYBRIDGE_FALSE@ $(NULL) -@WITH_POLKIT_TRUE@am__append_22 = $(polkit_DATA) -@ENABLE_PCP_TRUE@am__append_23 = cockpit-pcp -@ENABLE_PCP_TRUE@am__append_24 = libcockpit-pcp.a -@ENABLE_PCP_TRUE@am__append_25 = mock-pmda.so -@ENABLE_PCP_TRUE@am__append_26 = test-pcp test-pcp-archives -@ENABLE_PCP_TRUE@am__append_27 = mock-archives/* -@ENABLE_COCKPIT_CLIENT_TRUE@am__append_28 = install-cockpit-client-symlink -@ENABLE_COCKPIT_CLIENT_TRUE@am__append_29 = src/client/cockpit-client-ssh +@WITH_POLKIT_TRUE@am__append_23 = $(polkit_DATA) +@ENABLE_PCP_TRUE@am__append_24 = cockpit-pcp +@ENABLE_PCP_TRUE@am__append_25 = libcockpit-pcp.a +@ENABLE_PCP_TRUE@am__append_26 = mock-pmda.so +@ENABLE_PCP_TRUE@am__append_27 = test-pcp test-pcp-archives +@ENABLE_PCP_TRUE@am__append_28 = mock-archives/* +@ENABLE_COCKPIT_CLIENT_TRUE@am__append_29 = install-cockpit-client-symlink +@ENABLE_COCKPIT_CLIENT_TRUE@am__append_30 = src/client/cockpit-client-ssh +@ENABLE_COCKPIT_CLIENT_TRUE@@WITH_PYBRIDGE_TRUE@am__append_31 = src/client/cockpit-beiboot pam_PROGRAMS = pam_ssh_add.so$(EXEEXT) pam_cockpit_cert.so$(EXEEXT) # ----------------------------------------------------------------------------- # libcockpit-ssh.a: code used in cockpit-ssh and its tests -@WITH_COCKPIT_SSH_TRUE@am__append_30 = libcockpit-ssh.a +@WITH_COCKPIT_SSH_TRUE@am__append_32 = libcockpit-ssh.a # ----------------------------------------------------------------------------- # cockpit-ssh -@WITH_COCKPIT_SSH_TRUE@am__append_31 = cockpit-ssh +@WITH_COCKPIT_SSH_TRUE@am__append_33 = cockpit-ssh # ----------------------------------------------------------------------------- # mock-ssh -@WITH_COCKPIT_SSH_TRUE@am__append_32 = mock-sshd +@WITH_COCKPIT_SSH_TRUE@am__append_34 = mock-sshd # ----------------------------------------------------------------------------- # Unit tests -@WITH_COCKPIT_SSH_TRUE@am__append_33 = \ +@WITH_COCKPIT_SSH_TRUE@am__append_35 = \ @WITH_COCKPIT_SSH_TRUE@ src/ssh/mock_rsa_key \ @WITH_COCKPIT_SSH_TRUE@ src/ssh/mock_ecdsa_key \ @WITH_COCKPIT_SSH_TRUE@ src/ssh/test_rsa \ @@ -259,15 +261,15 @@ @WITH_COCKPIT_SSH_TRUE@ src/ssh/invalid_known_hosts \ @WITH_COCKPIT_SSH_TRUE@ $(NULL) -@WITH_COCKPIT_SSH_TRUE@am__append_34 = test-sshbridge test-sshoptions -@WITH_COCKPIT_SSH_TRUE@am__append_35 = test_rsa_key -@WITH_COCKPIT_SSH_TRUE@am__append_36 = test_rsa_key +@WITH_COCKPIT_SSH_TRUE@am__append_36 = test-sshbridge test-sshoptions +@WITH_COCKPIT_SSH_TRUE@am__append_37 = test_rsa_key +@WITH_COCKPIT_SSH_TRUE@am__append_38 = test_rsa_key cockpitws_PROGRAMS = cockpit-ws$(EXEEXT) # These are -ws tests but they involve invoking ./cockpit-bridge. -@WITH_PYBRIDGE_FALSE@am__append_37 = test-channelresponse \ +@WITH_PYBRIDGE_FALSE@am__append_39 = test-channelresponse \ @WITH_PYBRIDGE_FALSE@ test-handlers test-webservice -@WITH_COCKPIT_SSH_TRUE@@WITH_PYBRIDGE_FALSE@am__append_38 = test-authssh +@WITH_COCKPIT_SSH_TRUE@@WITH_PYBRIDGE_FALSE@am__append_40 = test-authssh subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/version.m4 \ @@ -975,7 +977,7 @@ wsinstance_start_OBJECTS = $(am_wsinstance_start_OBJECTS) wsinstance_start_DEPENDENCIES = $(am__DEPENDENCIES_7) am__dist_cockpitclient_SCRIPTS_DIST = src/client/cockpit-client \ - src/client/cockpit-client-ssh + src/client/cockpit-client-ssh src/client/cockpit-beiboot am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -1797,20 +1799,20 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ NULL = -CLEANFILES = cockpit-*.tar.xz $(WS_DIR)/rpms $(am__append_8) \ +CLEANFILES = cockpit-*.tar.xz $(WS_DIR)/rpms $(am__append_9) \ dist/shell/*.po src/ws/*.po po/cockpit*.pot $(NULL) \ - $(nodist_metainfo_DATA) $(am__append_22) $(am__append_27) \ - src/common/fail.html.c $(am__append_36) $(systemdgenerated) \ + $(nodist_metainfo_DATA) $(am__append_23) $(am__append_28) \ + src/common/fail.html.c $(am__append_38) $(systemdgenerated) \ $(GDBUS_CODEGEN_GENERATED) $(nodist_appdata_DATA) -dist_noinst_DATA = $(am__append_1) $(am__append_9) -man_MANS = $(am__append_7) $(am__append_11) -noinst_DATA = $(am__append_2) +dist_noinst_DATA = $(am__append_2) $(am__append_10) +man_MANS = $(am__append_8) $(am__append_12) +noinst_DATA = $(am__append_3) # ----------------------------------------------------------------------------- # libcockpit-common.a: code that has other dependencies, like glib or libsystemd -noinst_LIBRARIES = libcockpit-metrics.a $(am__append_13) \ - $(am__append_24) libcockpit-common-nodeps.a \ - libcockpit-common.a libpam_ssh_add.a $(am__append_30) \ +noinst_LIBRARIES = libcockpit-metrics.a $(am__append_14) \ + $(am__append_25) libcockpit-common-nodeps.a \ + libcockpit-common.a libpam_ssh_add.a $(am__append_32) \ libcockpit-tls.a libwebsocket.a libcockpit-ws.a # ----------------------------------------------------------------------------- @@ -1832,7 +1834,7 @@ doc/man/cockpit-ws.xml doc/man/cockpit-tls.xml \ doc/man/cockpit-desktop.xml doc/man/cockpit.conf.xml \ doc/man/pam_ssh_add.xml $(NULL) pkg/users/mock \ - pkg/lib/qunit-template.html pkg/lib/cockpit-po-plugin.js \ + pkg/lib/qunit-template.html.in pkg/lib/cockpit-po-plugin.js \ $(pkg_TESTS) $(metainfo_DATA) $(pixmaps_DATA) $(NULL) build.js \ files.js package.json package-lock.json $(PO_INPUTS) \ po/LINGUAS po/its/polkit.its po/its/polkit.loc $(NULL) \ @@ -1852,12 +1854,12 @@ # We use these to add conditionally-enabled extra rules # automake doesn't like mixing `::` and `if` -CHECK_LOCAL_TARGETS = $(am__append_4) -CLEAN_LOCAL_TARGETS = $(am__append_3) -INSTALL_DATA_LOCAL_TARGETS = $(am__append_5) $(am__append_10) \ - $(am__append_12) -INSTALL_EXEC_HOOK_TARGETS = $(am__append_28) -UNINSTALL_LOCAL_TARGETS = $(am__append_6) +CHECK_LOCAL_TARGETS = $(am__append_5) +CLEAN_LOCAL_TARGETS = $(am__append_4) +INSTALL_DATA_LOCAL_TARGETS = $(am__append_6) install-bundles \ + $(am__append_11) $(am__append_13) +INSTALL_EXEC_HOOK_TARGETS = $(am__append_29) +UNINSTALL_LOCAL_TARGETS = $(am__append_7) uninstall-bundles TEST_CPP = \ -DSRCDIR=\"$(abs_srcdir)\" \ -DBUILDDIR=\"$(abs_builddir)\" \ @@ -1879,15 +1881,15 @@ # ----------------------------------------------------------------------------- # Unit tests -TEST_PROGRAM = $(am__append_20) $(am__append_26) test-authorize \ +TEST_PROGRAM = $(am__append_21) $(am__append_27) test-authorize \ test-base64 test-channel test-config test-frame test-hash \ test-hex test-json test-jsonfds test-locale test-pipe \ test-system test-template test-transport test-unicode \ test-unixsignal test-version test-webcertificate \ - test-webresponse test-webserver test-ssh-add $(am__append_34) \ + test-webresponse test-webserver test-ssh-add $(am__append_36) \ test-cockpit-certificate-ensure test-tls-connection \ test-tls-server test-websocket test-auth test-compat \ - test-creds test-kerberos $(am__append_37) $(am__append_38) + test-creds test-kerberos $(am__append_39) $(am__append_40) TEST_SCRIPT = # ----------------------------------------------------------------------------- @@ -1900,13 +1902,13 @@ dist_check_SCRIPTS = $(dist_TEST_SCRIPT) src/common/mock-stderr # Testing assets should add themselves here (not EXTRA_DIST) -check_DATA = $(am__append_35) +check_DATA = $(am__append_37) # ----------------------------------------------------------------------------- # Unit tests -dist_check_DATA = $(am__append_21) src/common/mock-content \ +dist_check_DATA = $(am__append_22) src/common/mock-content \ src/pam-ssh-add/mock-ssh-agent src/pam-ssh-add/mock-ssh-add \ - src/pam-ssh-add/mock-environment $(NULL) $(am__append_33) \ + src/pam-ssh-add/mock-environment $(NULL) $(am__append_35) \ src/tls/ca/alice-expired.pem src/tls/ca/alice.key \ src/tls/ca/alice.p12 src/tls/ca/alice.pem src/tls/ca/bob.key \ src/tls/ca/bob.p12 src/tls/ca/bob.pem src/tls/ca/ca.conf \ @@ -1941,6 +1943,14 @@ $(NULL) WS_DIR = $(srcdir)/containers/ws +INSTALL_FLATPAK_TARGETS = install-cockpitwsPROGRAMS \ + install-dist_client_metainfoDATA \ + install-dist_defaultbrandingDATA install-dist_applicationsDATA \ + install-dist_cockpitclientDATA \ + install-dist_cockpitclientSCRIPTS \ + install-dist_dbusservicesDATA install-dist_scalableiconDATA \ + install-dist_symboliciconDATA install-cockpit-client-symlink \ + $(NULL) $(am__append_1) @ENABLE_DOC_TRUE@GUIDE_DOCBOOK = doc/guide/cockpit-guide.xml @ENABLE_DOC_TRUE@GUIDE_INCLUDES = \ @ENABLE_DOC_TRUE@ doc/guide/api-cockpit.xml \ @@ -2201,11 +2211,11 @@ @WITH_PYBRIDGE_FALSE@libcockpit_bridge_a_CPPFLAGS = \ @WITH_PYBRIDGE_FALSE@ -DG_LOG_DOMAIN=\"cockpit-bridge\" \ @WITH_PYBRIDGE_FALSE@ $(glib_CFLAGS) $(json_glib_CFLAGS) \ -@WITH_PYBRIDGE_FALSE@ $(AM_CPPFLAGS) $(am__append_14) +@WITH_PYBRIDGE_FALSE@ $(AM_CPPFLAGS) $(am__append_15) @WITH_PYBRIDGE_FALSE@libcockpit_bridge_a_LIBS = libcockpit-bridge.a \ @WITH_PYBRIDGE_FALSE@ $(libcockpit_metrics_a_LIBS) \ @WITH_PYBRIDGE_FALSE@ $(libsystemd_LIBS) $(NULL) \ -@WITH_PYBRIDGE_FALSE@ $(am__append_15) +@WITH_PYBRIDGE_FALSE@ $(am__append_16) @WITH_PYBRIDGE_FALSE@libcockpit_bridge_a_SOURCES = \ @WITH_PYBRIDGE_FALSE@ src/bridge/cockpitconnect.c \ @WITH_PYBRIDGE_FALSE@ src/bridge/cockpitconnect.h \ @@ -2256,7 +2266,7 @@ @WITH_PYBRIDGE_FALSE@ src/bridge/cockpitstream.h \ @WITH_PYBRIDGE_FALSE@ src/bridge/cockpitwebsocketstream.c \ @WITH_PYBRIDGE_FALSE@ src/bridge/cockpitwebsocketstream.h \ -@WITH_PYBRIDGE_FALSE@ $(NULL) $(am__append_16) +@WITH_PYBRIDGE_FALSE@ $(NULL) $(am__append_17) @WITH_PYBRIDGE_FALSE@cockpit_bridge_CPPFLAGS = $(libcockpit_bridge_a_CPPFLAGS) @WITH_PYBRIDGE_FALSE@cockpit_bridge_LDADD = $(libcockpit_bridge_a_LIBS) @WITH_PYBRIDGE_FALSE@cockpit_bridge_SOURCES = src/bridge/bridge.c @@ -2368,7 +2378,7 @@ @ENABLE_PCP_TRUE@test_pcp_archives_SOURCES = src/bridge/test-pcp-archives.c cockpitclientdir = $(libexecdir) dist_cockpitclient_SCRIPTS = src/client/cockpit-client \ - $(am__append_29) + $(am__append_30) $(am__append_31) dist_cockpitclient_DATA = src/client/cockpit-client.ui @ENABLE_COCKPIT_CLIENT_TRUE@dbusservicesdir = $(datadir)/dbus-1/services @ENABLE_COCKPIT_CLIENT_TRUE@dist_dbusservices_DATA = src/client/org.cockpit_project.CockpitClient.service @@ -8680,12 +8690,11 @@ uninstall-pamPROGRAMS uninstall-pixmapsDATA \ uninstall-polkitDATA uninstall-sbinPROGRAMS \ uninstall-selinuxpackagesDATA - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) uninstall-hook + uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 .MAKE: all check check-am install install-am install-data-am \ - install-exec install-exec-am install-strip uninstall-am + install-exec install-exec-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \ check-TESTS check-am check-local clean clean-binPROGRAMS \ @@ -8751,14 +8760,14 @@ uninstall-dist_scientificbrandingDATA \ uninstall-dist_sshmanifestDATA uninstall-dist_symboliciconDATA \ uninstall-dist_systemdunitDATA \ - uninstall-dist_ubuntubrandingDATA uninstall-hook \ - uninstall-libexecPROGRAMS uninstall-libexecSCRIPTS \ - uninstall-local uninstall-man uninstall-man1 uninstall-man5 \ - uninstall-man8 uninstall-nodist_appdataDATA \ - uninstall-nodist_metainfoDATA uninstall-nodist_systemdunitDATA \ - uninstall-nodist_tempconfDATA uninstall-pamPROGRAMS \ - uninstall-pixmapsDATA uninstall-polkitDATA \ - uninstall-sbinPROGRAMS uninstall-selinuxpackagesDATA + uninstall-dist_ubuntubrandingDATA uninstall-libexecPROGRAMS \ + uninstall-libexecSCRIPTS uninstall-local uninstall-man \ + uninstall-man1 uninstall-man5 uninstall-man8 \ + uninstall-nodist_appdataDATA uninstall-nodist_metainfoDATA \ + uninstall-nodist_systemdunitDATA uninstall-nodist_tempconfDATA \ + uninstall-pamPROGRAMS uninstall-pixmapsDATA \ + uninstall-polkitDATA uninstall-sbinPROGRAMS \ + uninstall-selinuxpackagesDATA .PRECIOUS: Makefile @@ -8839,7 +8848,7 @@ # must be from main, as only that has current and existing images; but testvm.py API is stable # support CI testing against a bots change bots: - tools/make-bots + test/common/make-bots .PHONY: rsync RSYNC_HOST ?= c @@ -8868,17 +8877,7 @@ podman run -ti --rm --publish=9001:9090 quay.io/cockpit/ws /bin/bash build-for-flatpak: cockpit-ws -install-for-flatpak: \ - install-cockpitwsPROGRAMS \ - install-dist_client_metainfoDATA \ - install-dist_defaultbrandingDATA \ - install-dist_applicationsDATA \ - install-dist_cockpitclientDATA \ - install-dist_cockpitclientSCRIPTS \ - install-dist_dbusservicesDATA \ - install-dist_scalableiconDATA \ - install-dist_symboliciconDATA \ - $(NULL) +install-for-flatpak: $(INSTALL_FLATPAK_TARGETS) appstream-util validate --nonet src/client/org.cockpit_project.CockpitClient.metainfo.xml if test -s "${DOWNSTREAM_RELEASES_XML}"; then \ $(top_srcdir)/tools/patch-metainfo \ @@ -8886,9 +8885,8 @@ "${DOWNSTREAM_RELEASES_XML}"; \ fi appstream-util validate --nonet $(DESTDIR)$(datadir)/metainfo/org.cockpit_project.CockpitClient.metainfo.xml - mkdir -p $(DESTDIR)/$(bindir) - ln -sfTv $(cockpitclientdir)/cockpit-client $(DESTDIR)/$(bindir)/cockpit-client - cp -rT dist/static $(pkgdatadir)/static + cp -rT dist/static $(DESTDIR)$(pkgdatadir)/static + rm -rf $(DESTDIR)$(pkgdatadir)/apps $(DESTDIR)$(pkgdatadir)/playground @ENABLE_DOC_TRUE@render-doc-images: @ENABLE_DOC_TRUE@ inkscape --without-gui --export-area-page \ @@ -8940,11 +8938,9 @@ # seeing them during ./autogen.sh, but need make to find them at compile time. # We don't run them in the pybridge case since they're part of `pytest`. @WITH_PYBRIDGE_FALSE@-include $(wildcard pkg/Makefile.qunit*) - -install-data-hook:: +install-bundles: cd $(srcdir)/dist; find */* -type f -exec install -D -m 644 '{}' '$(abspath $(DESTDIR)$(datadir))/cockpit/{}' \; - -uninstall-hook: +uninstall-bundles: rm -rf $(DESTDIR)$(datadir)/cockpit # Extract translate attribute, Glade style, angular-gettext HTML translations diff -Nru cockpit-292/package.json cockpit-294.1/package.json --- cockpit-292/package.json 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/package.json 2023-06-15 11:09:27.000000000 +0000 @@ -4,11 +4,12 @@ "type": "module", "private": true, "dependencies": { - "@patternfly/patternfly": "5.0.0-alpha.43", - "@patternfly/react-core": "5.0.0-alpha.83", - "@patternfly/react-icons": "5.0.0-alpha.12", - "@patternfly/react-styles": "5.0.0-alpha.8", - "@patternfly/react-table": "5.0.0-alpha.85", + "@patternfly/patternfly": "5.0.0-alpha.53", + "@patternfly/react-core": "5.0.0-alpha.98", + "@patternfly/react-icons": "5.0.0-alpha.14", + "@patternfly/react-styles": "5.0.0-alpha.10", + "@patternfly/react-table": "5.0.0-alpha.100", + "@patternfly/react-tokens": "5.0.0-alpha.9", "deep-equal": "2.0.5", "js-sha1": "0.6.0", "js-sha256": "0.9.0", diff -Nru cockpit-292/package-lock.json cockpit-294.1/package-lock.json --- cockpit-292/package-lock.json 2023-05-15 13:23:40.000000000 +0000 +++ cockpit-294.1/package-lock.json 2023-06-15 11:09:30.000000000 +0000 @@ -278,19 +278,19 @@ } }, "node_modules/@patternfly/patternfly": { - "version": "5.0.0-alpha.43", - "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-5.0.0-alpha.43.tgz", - "integrity": "sha512-O3tOXGTxNbR8AOAiJUIth/0MAiKniTvM2L//lDisRXst0fP43I7/p0Ba3hU3ECAfMf4MsIe9tt5ZhO5Hz9lpZg==" + "version": "5.0.0-alpha.53", + "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-5.0.0-alpha.53.tgz", + "integrity": "sha512-sy9lk98PLVGjFuJ6li9uIwKc/IXXhjv8Ow0Q/MDOCFrhnj2gWLjMr4uB4d0393mAGfD1vk8KkqF+7tfEDIBjpQ==" }, "node_modules/@patternfly/react-core": { - "version": "5.0.0-alpha.83", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-5.0.0-alpha.83.tgz", - "integrity": "sha512-z2Erly7inGlRXgrJ79AmvQy7JfzqOLKoen+V6ko8zaIQWAluxZdgZppw/PX5fyj3Hi55sBN/GsDV8fD+o/LxbA==", - "dependencies": { - "@patternfly/react-icons": "^5.0.0-alpha.12", - "@patternfly/react-styles": "^5.0.0-alpha.8", - "@patternfly/react-tokens": "^5.0.0-alpha.7", - "focus-trap": "7.4.0", + "version": "5.0.0-alpha.98", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-5.0.0-alpha.98.tgz", + "integrity": "sha512-LouTqxWPtvzK3834i1JW5kTjDoqIWnvbioZaRIJOuL3eGgBYk+ORpoa9EZ8j4r+NQWxeogMFgxzsP9Oe04xjcQ==", + "dependencies": { + "@patternfly/react-icons": "^5.0.0-alpha.14", + "@patternfly/react-styles": "^5.0.0-alpha.10", + "@patternfly/react-tokens": "^5.0.0-alpha.9", + "focus-trap": "7.4.1", "react-dropzone": "^14.2.3", "tslib": "^2.5.0" }, @@ -300,28 +300,28 @@ } }, "node_modules/@patternfly/react-icons": { - "version": "5.0.0-alpha.12", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-5.0.0-alpha.12.tgz", - "integrity": "sha512-VwCGlB+JtpsjHJtqCcfy+CpaE+rAY2si7cd4ufJouybkoBPve/6wuTPA3K3eGtgn5cAIr18IF1Pkfkp2lR18sg==", + "version": "5.0.0-alpha.14", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-5.0.0-alpha.14.tgz", + "integrity": "sha512-+FXETYc+x0xKqktrcgrpxPTZgtaJ6rfpObu/qM4YGuwXkJRIu0OJaoNQTPH9QsxKAeZ+VUh9CnhOcNTRfq9plA==", "peerDependencies": { "react": "^17 || ^18", "react-dom": "^17 || ^18" } }, "node_modules/@patternfly/react-styles": { - "version": "5.0.0-alpha.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-5.0.0-alpha.8.tgz", - "integrity": "sha512-V/jhoKp6pz3c+2N1Yi/Ez/EJIHKEHe4SSCzF5ocGpOfaYlQpDGdttKIF0GSWksXlShYZJ5heKfARuESK9XjqRA==" + "version": "5.0.0-alpha.10", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-5.0.0-alpha.10.tgz", + "integrity": "sha512-SJsLPtTKE1u6YpEAvx+zUre+u9poc/IIIKJ9dk0Jze94HtC/2kI4fhhvm2iQE5Z4rNAPrFlC4fVsvbr7skS3kg==" }, "node_modules/@patternfly/react-table": { - "version": "5.0.0-alpha.85", - "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-5.0.0-alpha.85.tgz", - "integrity": "sha512-rFpHkEwWstAMt4qg7YTWHYODb/NeySSaMhIWdAspvtWVU+hWkD02ejQ0eIlHSghLLKqXNsxICS1TcyDLShuyvw==", - "dependencies": { - "@patternfly/react-core": "^5.0.0-alpha.83", - "@patternfly/react-icons": "^5.0.0-alpha.12", - "@patternfly/react-styles": "^5.0.0-alpha.8", - "@patternfly/react-tokens": "^5.0.0-alpha.7", + "version": "5.0.0-alpha.100", + "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-5.0.0-alpha.100.tgz", + "integrity": "sha512-w3phwe/O8tc5Lxy9KnIXsE5VxanyjwCPeVxWZCWOqWWeiokJoANX5dWI2RdVrDdauQGYohsmYs4+93OYhhSI8A==", + "dependencies": { + "@patternfly/react-core": "^5.0.0-alpha.98", + "@patternfly/react-icons": "^5.0.0-alpha.14", + "@patternfly/react-styles": "^5.0.0-alpha.10", + "@patternfly/react-tokens": "^5.0.0-alpha.9", "lodash": "^4.17.19", "tslib": "^2.5.0" }, @@ -682,9 +682,9 @@ } }, "node_modules/builtins/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", + "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", "dev": true, "peer": true, "dependencies": { @@ -1598,9 +1598,9 @@ } }, "node_modules/eslint-plugin-jsx-a11y/node_modules/axe-core": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz", - "integrity": "sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==", + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.1.tgz", + "integrity": "sha512-sCXXUhA+cljomZ3ZAwb8i1p3oOlkABzPy08ZDAoGcYuvtBPlQ1Ytde129ArXyHWDhfeewq7rlx9F+cUx2SSlkg==", "dev": true, "engines": { "node": ">=4" @@ -1633,9 +1633,9 @@ } }, "node_modules/eslint-plugin-n/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", + "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", "dev": true, "peer": true, "dependencies": { @@ -2068,11 +2068,11 @@ "dev": true }, "node_modules/focus-trap": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.4.0.tgz", - "integrity": "sha512-yI7FwUqU4TVb+7t6PaQ3spT/42r/KLEi8mtdGoQo2li/kFzmu9URmalTvw7xCCJtSOyhBxscvEAmvjeN9iHARg==", + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.4.1.tgz", + "integrity": "sha512-rnXP5ERIjlo1gEZp7hQb4ekYqUxRuSDQeyWvxhahH3/GkWtd8h8g1C8Eu/KGpuvbUWNVeogK0kuzzrM4u2Z9jA==", "dependencies": { - "tabbable": "^6.1.1" + "tabbable": "^6.1.2" } }, "node_modules/for-each": { @@ -2135,12 +2135,13 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", + "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", + "has-proto": "^1.0.1", "has-symbols": "^1.0.3" }, "funding": { @@ -2387,7 +2388,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -2652,9 +2652,9 @@ } }, "node_modules/is-core-module": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz", - "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==", + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz", + "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -3320,9 +3320,9 @@ } }, "node_modules/normalize-package-data/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", + "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -3748,9 +3748,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.12", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.12.tgz", - "integrity": "sha512-NdxGCAZdRrwVI1sy59+Wzrh+pMMHxapGnpfenDVlMEXoOcvt4pGE0JLK9YY2F5dLxcFYA/YbVQKhcGU+FtSYQg==", + "version": "6.0.13", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz", + "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==", "dev": true, "dependencies": { "cssesc": "^3.0.0", @@ -4922,9 +4922,9 @@ } }, "node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz", + "integrity": "sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==" }, "node_modules/type-check": { "version": "0.4.0", diff -Nru cockpit-292/pkg/apps/application-list.jsx cockpit-294.1/pkg/apps/application-list.jsx --- cockpit-292/pkg/apps/application-list.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/apps/application-list.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -143,7 +143,7 @@ -

{_("Applications")}

+

{_("Applications")}

{refresh_progress} diff -Nru cockpit-292/pkg/apps/application.scss cockpit-294.1/pkg/apps/application.scss --- cockpit-292/pkg/apps/application.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/apps/application.scss 2023-06-15 11:09:27.000000000 +0000 @@ -13,11 +13,11 @@ margin-inline-end: 10px; } -.app-list .pf-c-data-list__item-action button { +.app-list .pf-v5-c-data-list__item-action button { min-inline-size: 6rem; } -.app-list .pf-c-data-list__item-content { +.app-list .pf-v5-c-data-list__item-content { /* Vertically align application info to the center */ align-items: center; } diff -Nru cockpit-292/pkg/apps/index.html cockpit-294.1/pkg/apps/index.html --- cockpit-292/pkg/apps/index.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/apps/index.html 2023-06-15 11:09:27.000000000 +0000 @@ -21,15 +21,15 @@ Applications - - + + - +
diff -Nru cockpit-292/pkg/apps/watch-appstream.py cockpit-294.1/pkg/apps/watch-appstream.py --- cockpit-292/pkg/apps/watch-appstream.py 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/apps/watch-appstream.py 2023-06-15 11:09:27.000000000 +0000 @@ -1,10 +1,9 @@ +import gzip +import json import os import sys import traceback - -import gzip import xml.etree.ElementTree as ET -import json # Our own little abstraction on top of inotify. This only supports # watching directories non-recursively, but it also supports watching @@ -104,7 +103,7 @@ return elt.text if elt is not None else None -def convert_description(xml, use_lang=True): +def convert_description(xml, *, use_lang=True): if xml is None: return None @@ -135,16 +134,16 @@ # If we found nothing that matches lang, fall back to default if lang is not None and len(res) == 0: - res = convert_description(xml, False) + res = convert_description(xml, use_lang=False) return res -def convert_cached_icon(dir, origin, xml): +def convert_cached_icon(directory, origin, xml): icon = xml.text def try_size(sz): - path = os.path.join(dir, "..", "icons", origin, sz, icon) + path = os.path.join(directory, "..", "icons", origin, sz, icon) return path if os.path.exists(path) else None return try_size("64x64") or try_size("128x128") @@ -164,7 +163,7 @@ return None -def find_and_convert_icon(dir, origin, xml): +def find_and_convert_icon(directory, origin, xml): if xml is None: return None @@ -173,7 +172,7 @@ if icon is not None: if icon.attrib['type'] == 'cached': - return convert_cached_icon(dir, origin, icon) + return convert_cached_icon(directory, origin, icon) elif icon.attrib['type'] == 'remote': return convert_remote_icon(icon) elif icon.attrib['type'] == 'local': @@ -199,9 +198,9 @@ ables = [] for elt in xml.iter('launchable'): - type = elt.attrib['type'] - if type == "cockpit-manifest": - ables.append({'name': elt.text, 'type': type}) + launchable_type = elt.attrib['type'] + if launchable_type == "cockpit-manifest": + ables.append({'name': elt.text, 'type': launchable_type}) return ables @@ -215,22 +214,22 @@ return urls -def convert_collection_component(dir, origin, xml): - id = element_value(xml, 'id') +def convert_collection_component(directory, origin, xml): + component_id = element_value(xml, 'id') pkgname = element_value(xml, 'pkgname') launchables = convert_launchables(xml) urls = convert_urls(xml) - if not id or not pkgname or len(launchables) == 0: + if not component_id or not pkgname or len(launchables) == 0: return None return { - 'id': id, + 'id': component_id, 'pkgname': pkgname, 'name': element_value(xml, 'name'), 'summary': element_value(xml, 'summary'), 'description': convert_description(element(xml, 'description')), - 'icon': find_and_convert_icon(dir, origin, xml), + 'icon': find_and_convert_icon(directory, origin, xml), 'screenshots': convert_screenshots(element(xml, 'screenshots')), 'launchables': launchables, 'urls': urls @@ -306,9 +305,9 @@ else: comps[comp['id']] = comp for file in self.available_by_file: - for id in self.available_by_file[file]: - comp = self.available_by_file[file][id] - if not comp['id'] in comps: + for comp_id in self.available_by_file[file]: + comp = self.available_by_file[file][comp_id] + if comp['id'] not in comps: comps[comp['id']] = comp else: z = comp.copy() diff -Nru cockpit-292/pkg/kdump/index.html cockpit-294.1/pkg/kdump/index.html --- cockpit-292/pkg/kdump/index.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/kdump/index.html 2023-06-15 11:09:27.000000000 +0000 @@ -19,19 +19,19 @@ --> - + Kernel dump - - + + - + - +
diff -Nru cockpit-292/pkg/kdump/kdump.js cockpit-294.1/pkg/kdump/kdump.js --- cockpit-292/pkg/kdump/kdump.js 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/kdump/kdump.js 2023-06-15 11:09:27.000000000 +0000 @@ -48,7 +48,7 @@ // whether we're actively trying to change the state dataStore.stateChanging = false; - function setServiceState(desiredState) { + function setServiceState(_event, desiredState) { if (dataStore.stateChanging) { console.log("already trying to change state"); return; diff -Nru cockpit-292/pkg/kdump/kdump.scss cockpit-294.1/pkg/kdump/kdump.scss --- cockpit-292/pkg/kdump/kdump.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/kdump/kdump.scss 2023-06-15 11:09:27.000000000 +0000 @@ -24,7 +24,7 @@ } // error details -#kdump-settings-dialog .pf-c-code-block__pre { +#kdump-settings-dialog .pf-v5-c-code-block__pre { max-block-size: 200px; overflow-y: auto; } diff -Nru cockpit-292/pkg/kdump/kdump-view.jsx cockpit-294.1/pkg/kdump/kdump-view.jsx --- cockpit-292/pkg/kdump/kdump-view.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/kdump/kdump-view.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -177,7 +177,7 @@ setDirectory(value)} isRequired /> } @@ -187,18 +187,18 @@ + onChange={(_event, value) => setServer(value)} isRequired /> + onChange={(_event, value) => setExportPath(value)} isRequired /> setDirectory(value)} isRequired /> @@ -209,13 +209,13 @@ + onChange={(_event, value) => setServer(value)} isRequired /> changeSSHKey(value)} validated={validationErrors.sshkey ? "error" : "default"} /> @@ -224,7 +224,7 @@ setDirectory(value)} isRequired /> diff -Nru cockpit-292/pkg/kdump/manifest.json cockpit-294.1/pkg/kdump/manifest.json --- cockpit-292/pkg/kdump/manifest.json 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/kdump/manifest.json 2023-06-15 11:09:27.000000000 +0000 @@ -1,4 +1,7 @@ { + "conditions": [ + {"path-exists": "/usr/sbin/kexec"} + ], "tools": { "index": { "label": "Kernel dump", diff -Nru cockpit-292/pkg/lib/cockpit-components-dialog.jsx cockpit-294.1/pkg/lib/cockpit-components-dialog.jsx --- cockpit-292/pkg/lib/cockpit-components-dialog.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-dialog.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -25,7 +25,6 @@ import { Button } from "@patternfly/react-core/dist/esm/components/Button/index.js"; import { Modal } from "@patternfly/react-core/dist/esm/components/Modal/index.js"; import { Popover } from "@patternfly/react-core/dist/esm/components/Popover/index.js"; -import { Spinner } from "@patternfly/react-core/dist/esm/components/Spinner/index.js"; import { Stack, StackItem } from "@patternfly/react-core/dist/esm/layouts/Stack/index.js"; import { HelpIcon, ExternalLinkAltIcon } from '@patternfly/react-icons'; @@ -44,7 +43,7 @@ * - list of actions, each an object with: * - clicked * Callback function that is expected to return a promise. - * parameter: callback to set the progress text (will be displayed next to spinner) + * parameter: callback to set the progress text * - caption optional, defaults to 'Ok' * - disabled optional, defaults to false * - style defaults to 'secondary', other options: 'primary', 'danger' @@ -70,10 +69,11 @@ this.setState({ action_progress_message: msg, action_progress_cancel: cancel }); } - action_click(handler, e) { + action_click(handler, caption, e) { this.setState({ action_progress_message: '', action_in_progress: true, + action_caption_in_progress: caption, action_canceled: false, }); @@ -144,7 +144,6 @@ cancel_disabled = true; wait_element =
{ this.state.action_progress_message } -
; } else if (this.props.idle_message) { wait_element =
@@ -167,8 +166,9 @@ key={ caption } className="apply" variant={ variant } + isLoading={ this.state.action_in_progress && this.state.action_caption_in_progress == caption } isDanger={ action.danger } - onClick={ this.action_click.bind(this, action.clicked) } + onClick={ this.action_click.bind(this, action.clicked, caption) } isDisabled={ actions_disabled || action.disabled } >{ caption } ); diff -Nru cockpit-292/pkg/lib/cockpit-components-dialog.scss cockpit-294.1/pkg/lib/cockpit-components-dialog.scss --- cockpit-292/pkg/lib/cockpit-components-dialog.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-dialog.scss 2023-06-15 11:09:27.000000000 +0000 @@ -1,8 +1,8 @@ -.pf-c-modal-box__body .scroll { +.pf-v5-c-modal-box__body .scroll { max-block-size: calc(75vh - 10rem); overflow: auto; } .dialog-wait-ct-spinner { - margin-inline-start: var(--pf-global--spacer--sm); + margin-inline-start: var(--pf-v5-global--spacer--sm); } diff -Nru cockpit-292/pkg/lib/cockpit-components-empty-state.css cockpit-294.1/pkg/lib/cockpit-components-empty-state.css --- cockpit-292/pkg/lib/cockpit-components-empty-state.css 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-empty-state.css 2023-06-15 11:09:27.000000000 +0000 @@ -1,3 +1,3 @@ -.pf-c-empty-state .pf-c-button.pf-m-primary.slim { +.pf-v5-c-empty-state .pf-v5-c-button.pf-m-primary.slim { margin: 0; } diff -Nru cockpit-292/pkg/lib/cockpit-components-firewalld-request.jsx cockpit-294.1/pkg/lib/cockpit-components-firewalld-request.jsx --- cockpit-292/pkg/lib/cockpit-components-firewalld-request.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-firewalld-request.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -125,7 +125,7 @@ return null; } else { alert = ( - + diff -Nru cockpit-292/pkg/lib/cockpit-components-firewalld-request.scss cockpit-294.1/pkg/lib/cockpit-components-firewalld-request.scss --- cockpit-292/pkg/lib/cockpit-components-firewalld-request.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-firewalld-request.scss 2023-06-15 11:09:27.000000000 +0000 @@ -1,12 +1,12 @@ -// Required for `pf-u-box-shadow-sm` as inline alert don't have a box shadow +// Required for `pf-v5-u-box-shadow-sm` as inline alert don't have a box shadow @use "../../node_modules/@patternfly/patternfly/utilities/BoxShadow/box-shadow.css"; -.pf-c-page__main-section.ct-no-bottom-padding { - --pf-c-page__main-section--PaddingBottom: 0; +.pf-v5-c-page__main-section.ct-no-bottom-padding { + --pf-v5-c-page__main-section--PaddingBottom: 0; } // embedded into an -.pf-c-toolbar.ct-alert-toolbar { - --pf-c-toolbar--BackgroundColor: transparent; - --pf-c-toolbar--PaddingBottom: 0; +.pf-v5-c-toolbar.ct-alert-toolbar { + --pf-v5-c-toolbar--BackgroundColor: transparent; + --pf-v5-c-toolbar--PaddingBottom: 0; } diff -Nru cockpit-292/pkg/lib/cockpit-components-form-helper.jsx cockpit-294.1/pkg/lib/cockpit-components-form-helper.jsx --- cockpit-292/pkg/lib/cockpit-components-form-helper.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-form-helper.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -28,10 +28,8 @@ if (!(helperText || helperTextInvalid)) return null; - // FIXME: isHidden still adds some padding which is desired so that the form elements don't move when validation text appears - // Fix this seperately to avoid breaking pixe tests return ( - + - {listingDetail &&
+ {listingDetail &&
{listingDetail}
} {this.props.tabRenderers.length && diff -Nru cockpit-292/pkg/lib/cockpit-components-listing-panel.scss cockpit-294.1/pkg/lib/cockpit-components-listing-panel.scss --- cockpit-292/pkg/lib/cockpit-components-listing-panel.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-listing-panel.scss 2023-06-15 11:09:27.000000000 +0000 @@ -5,8 +5,8 @@ &-actions { order: 2; flex-grow: 1; - padding-block: var(--pf-global--spacer--sm); - padding-inline: var(--pf-global--spacer--md) var(--pf-global--spacer--lg); + padding-block: var(--pf-v5-global--spacer--sm); + padding-inline: var(--pf-v5-global--spacer--md) var(--pf-v5-global--spacer--lg); } &-caption { @@ -18,6 +18,7 @@ order: 1; } + // FIXME: https://github.com/patternfly/patternfly-react/pull/9135 .pf-c-tab-content { order: 3; flex-basis: 100%; @@ -25,12 +26,12 @@ &-body { // Don't let PF4 automatically add a border in tables inside the body - --pf-c-table__expandable-row--after--BorderLeftWidth: 0; - --pf-c-table--border-width--base: 0; + --pf-v5-c-table__expandable-row--after--BorderLeftWidth: 0; + --pf-v5-c-table--border-width--base: 0; // Add some sizing to the body - padding-block: var(--pf-global--spacer--md); - padding-inline: var(--pf-global--spacer--lg); + padding-block: var(--pf-v5-global--spacer--md); + padding-inline: var(--pf-v5-global--spacer--lg); inline-size: 100%; // Containing hack part 1 @@ -47,7 +48,7 @@ } .ct-table { - > tbody > .pf-c-table__expandable-row { + > tbody > .pf-v5-c-table__expandable-row { // Don't scroll table's expanded contents vertically. // Instead, rely on page scrolling. // Important for mobile; also useful for desktop. @@ -61,9 +62,9 @@ @media not all and (prefers-reduced-motion: reduce) { // Add expansion animations when prefers-reduced isn't enabled - .ct-table .pf-c-table__expandable-row-content { + .ct-table .pf-v5-c-table__expandable-row-content { // Animation ends at or before 2/3 in most cases; so we extend by 1.5 to compensate - animation: ctListingPanelShow calc(var(--pf-global--TransitionDuration) * 1.5) var(--pf-global--TimingFunction); + animation: ctListingPanelShow calc(var(--pf-v5-global--TransitionDuration) * 1.5) var(--pf-v5-global--TimingFunction); } } diff -Nru cockpit-292/pkg/lib/cockpit-components-logs-panel.jsx cockpit-294.1/pkg/lib/cockpit-components-logs-panel.jsx --- cockpit-292/pkg/lib/cockpit-components-logs-panel.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-logs-panel.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -95,7 +95,7 @@ count > 1 ?
{ident}
- {count} + {count}
:
{ident}
} diff -Nru cockpit-292/pkg/lib/cockpit-components-logs-panel.scss cockpit-294.1/pkg/lib/cockpit-components-logs-panel.scss --- cockpit-292/pkg/lib/cockpit-components-logs-panel.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-logs-panel.scss 2023-06-15 11:09:27.000000000 +0000 @@ -8,8 +8,8 @@ padding-inline: 0; } -.cockpit-log-panel .pf-c-card__header-main > .pf-c-card__title > .pf-c-card__title-text { +.cockpit-log-panel .pf-v5-c-card__header-main > .pf-v5-c-card__title > .pf-v5-c-card__title-text { padding: 0; font-weight: normal; - font-size: var(--pf-global--FontSize--2xl); + font-size: var(--pf-v5-global--FontSize--2xl); } diff -Nru cockpit-292/pkg/lib/cockpit-components-modifications.css cockpit-294.1/pkg/lib/cockpit-components-modifications.css --- cockpit-292/pkg/lib/cockpit-components-modifications.css 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-modifications.css 2023-06-15 11:09:27.000000000 +0000 @@ -16,13 +16,13 @@ } .automation-script-modal .ansible-docs-link > svg { - padding-inline-end: var(--pf-global--spacer--xs); + padding-inline-end: var(--pf-v5-global--spacer--xs); } .green-icon { - color: var(--pf-global--success-color--100); + color: var(--pf-v5-global--success-color--100); } -.pf-c-card.modifications-table .pf-c-card__header { +.pf-v5-c-card.modifications-table .pf-v5-c-card__header { justify-content: space-between; } diff -Nru cockpit-292/pkg/lib/cockpit-components-password.jsx cockpit-294.1/pkg/lib/cockpit-components-password.jsx --- cockpit-292/pkg/lib/cockpit-components-password.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-password.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -98,7 +98,7 @@ labelIcon={password_label_info && @@ -107,7 +107,7 @@ id={idPrefix + "-pw1-group"} fieldId={idPrefix + "-pw1"}> onPasswordChanged(value)} validated={error_password ? "warning" : "default"} />
-
{passwordMessage}
+
{passwordMessage}
{error_password && @@ -132,7 +132,7 @@ id={idPrefix + "-pw2-group"} fieldId={idPrefix + "-pw2"}> { setConfirmPassword(value); change("password_confirm", value) }} /> + value={passwordConfirm} onChange={(_event, value) => { setConfirmPassword(value); change("password_confirm", value) }} /> } diff -Nru cockpit-292/pkg/lib/cockpit-components-password.scss cockpit-294.1/pkg/lib/cockpit-components-password.scss --- cockpit-292/pkg/lib/cockpit-components-password.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-password.scss 2023-06-15 11:09:27.000000000 +0000 @@ -1,7 +1,7 @@ .ct-password-strength-meter { - grid-gap: var(--pf-global--spacer--xs); + grid-gap: var(--pf-v5-global--spacer--xs); - .pf-c-progress__description, .pf-c-progress__status { + .pf-v5-c-progress__description, .pf-v5-c-progress__status { display: none; } } diff -Nru cockpit-292/pkg/lib/cockpit-components-plot.jsx cockpit-294.1/pkg/lib/cockpit-components-plot.jsx --- cockpit-292/pkg/lib/cockpit-components-plot.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-plot.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -258,7 +258,7 @@
{format_range(zoom_state.x_range)}} + toggle={ setIsOpen(isOpen)}>{format_range(zoom_state.x_range)}} dropdownItems={[ { zoom_state.goto_now(); setIsOpen(false) }}> {_("Go to now")} diff -Nru cockpit-292/pkg/lib/cockpit-components-plot.scss cockpit-294.1/pkg/lib/cockpit-components-plot.scss --- cockpit-292/pkg/lib/cockpit-components-plot.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-plot.scss 2023-06-15 11:09:27.000000000 +0000 @@ -13,16 +13,16 @@ ); .ct-plot { - font-family: var(--pf-chart-global--FontFamily); + font-family: var(--pf-v5-chart-global--FontFamily); &-border { - stroke: var(--pf-chart-global--Fill--Color--300); + stroke: var(--pf-v5-chart-global--Fill--Color--300); fill: transparent; shape-rendering: crispedges; } &-title { - font-size: calc(var(--pf-chart-global--FontSize--md) * 1px); + font-size: calc(var(--pf-v5-chart-global--FontSize--md) * 1px); } // Placeholder string to stretch the column, set offscreen @@ -32,19 +32,19 @@ &-axis, &-unit { - font-size: calc(var(--pf-chart-global--FontSize--xs) * 1px); - fill: var(--pf-chart-global--Fill--Color--700); - letter-spacing: var(--pf-chart-global--letter-spacing); + font-size: calc(var(--pf-v5-chart-global--FontSize--xs) * 1px); + fill: var(--pf-v5-chart-global--Fill--Color--700); + letter-spacing: var(--pf-v5-chart-global--letter-spacing); } - .pf-theme-dark &-axis, - .pf-theme-dark &-unit { - fill: var(--pf-chart-global--Fill--Color--400); + .pf-v5-theme-dark &-axis, + .pf-v5-theme-dark &-unit { + fill: var(--pf-v5-chart-global--Fill--Color--400); } &-lines, &-ticks { - stroke: var(--pf-chart-global--Fill--Color--300); + stroke: var(--pf-v5-chart-global--Fill--Color--300); shape-rendering: crispedges; } @@ -56,7 +56,7 @@ } &-paths { - stroke-width: var(--pf-chart-global--stroke--Width--sm); + stroke-width: var(--pf-v5-chart-global--stroke--Width--sm); shape-rendering: geometricprecision; > path { @@ -67,7 +67,7 @@ } .ct-plot-title { - fill: var(--pf-global--Color--100); + fill: var(--pf-v5-global--Color--100); } $plotColorCurrent: 0; @@ -80,7 +80,7 @@ @each $plotColor, $plotColorBackup in $plotColors { $plotColorCurrent: $plotColorCurrent + 1; .ct-plot-paths > path:nth-last-child(#{$plotColorTotal}n + #{$plotColorCurrent}) { - --ct-plot-path-color: var(--pf-chart-color-#{$plotColor}, #{$plotColorBackup}); + --ct-plot-path-color: var(--pf-v5-chart-color-#{$plotColor}, #{$plotColorBackup}); } } diff -Nru cockpit-292/pkg/lib/cockpit-components-shutdown.scss cockpit-294.1/pkg/lib/cockpit-components-shutdown.scss --- cockpit-292/pkg/lib/cockpit-components-shutdown.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-shutdown.scss 2023-06-15 11:09:27.000000000 +0000 @@ -4,7 +4,7 @@ .shutdown-delay-group { // Add spacing between rows for when the flex items wrap - row-gap: var(--pf-global--spacer--sm); + row-gap: var(--pf-v5-global--spacer--sm); .shutdown-time-picker { max-inline-size: 7rem; diff -Nru cockpit-292/pkg/lib/cockpit-components-table.jsx cockpit-294.1/pkg/lib/cockpit-components-table.jsx --- cockpit-292/pkg/lib/cockpit-components-table.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-table.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -211,7 +211,7 @@ setExpanded({ ...expanded, [rowKey]: !expanded[rowKey] }); } }} /> - : ) + : ) : null } {onSelect && diff -Nru cockpit-292/pkg/lib/cockpit-components-table.scss cockpit-294.1/pkg/lib/cockpit-components-table.scss --- cockpit-292/pkg/lib/cockpit-components-table.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-components-table.scss 2023-06-15 11:09:27.000000000 +0000 @@ -3,9 +3,9 @@ .ct-table { &.pf-m-compact { > thead, > tbody { - > tr:not(.pf-c-table__expandable-row) { + > tr:not(.pf-v5-c-table__expandable-row) { // We actually want the normal font size for our lists - --pf-c-table-cell--FontSize: var(--pf-global--FontSize--md); + --pf-v5-c-table-cell--FontSize: var(--pf-v5-global--FontSize--md); } } } @@ -24,9 +24,9 @@ // Push buttons to the right by stretching the heading flex: auto; // Add a bit of minimum margin to the right of the heading - margin-inline-end: var(--pf-global--spacer--md); + margin-inline-end: var(--pf-v5-global--spacer--md); // Set a minimum height of 3rem, so when buttons wrap, there's spacing - min-block-size: var(--pf-global--spacer--2xl); + min-block-size: var(--pf-v5-global--spacer--2xl); // Make sure textual content is aligned to the center display: flex; align-items: center; @@ -34,8 +34,8 @@ &-actions { > * { - margin-block: var(--pf-global--spacer--xs); - margin-inline: var(--pf-global--spacer--sm) 0; + margin-block: var(--pf-v5-global--spacer--xs); + margin-inline: var(--pf-v5-global--spacer--sm) 0; } > :first-child { @@ -60,7 +60,7 @@ } // Fix toggle button alignment - .pf-c-table__toggle { + .pf-v5-c-table__toggle { // Workaround: Chrome sometimes oddly expands the table, // unless a width is set. (This affects panels the most, but not only.) // As the width is smaller than the contents, and this is a table, @@ -77,8 +77,8 @@ // Use PF4 style headings > thead th { - font-size: var(--pf-global--FontSize--sm); - font-weight: var(--pf-global--FontWeight--bold); + font-size: var(--pf-v5-global--FontSize--sm); + font-weight: var(--pf-v5-global--FontWeight--bold); } // Adjust the padding for nested ct-tables in ct-tables @@ -86,18 +86,18 @@ .ct-table { td, th { &:first-child { - --pf-c-table--nested--first-last-child--PaddingLeft: var(--pf-global--spacer--lg); + --pf-v5-c-table--nested--first-last-child--PaddingLeft: var(--pf-v5-global--spacer--lg); } &:last-child { - --pf-c-table--nested--first-last-child--PaddingRight: var(--pf-global--spacer--lg); + --pf-v5-c-table--nested--first-last-child--PaddingRight: var(--pf-v5-global--spacer--lg); } } } } // Special handling for rows with errors -.pf-c-table tbody tr:first-child.error { +.pf-v5-c-table tbody tr:first-child.error { &, tbody.pf-m-expanded > & { background-color: var(--ct-color-list-critical-bg) !important; /* keep red background when expanded */ border-block-start: 1px solid var(--ct-color-list-critical-border); diff -Nru cockpit-292/pkg/lib/cockpit-dark-theme.js cockpit-294.1/pkg/lib/cockpit-dark-theme.js --- cockpit-292/pkg/lib/cockpit-dark-theme.js 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-dark-theme.js 2023-06-15 11:09:27.000000000 +0000 @@ -27,9 +27,9 @@ debug(`Setting cockpit theme to ${dark_mode ? "dark" : "light"}`); if (dark_mode) { - documentElement.classList.add('pf-theme-dark'); + documentElement.classList.add('pf-v5-theme-dark'); } else { - documentElement.classList.remove('pf-theme-dark'); + documentElement.classList.remove('pf-v5-theme-dark'); } } diff -Nru cockpit-292/pkg/lib/cockpit-po-plugin.js cockpit-294.1/pkg/lib/cockpit-po-plugin.js --- cockpit-292/pkg/lib/cockpit-po-plugin.js 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/cockpit-po-plugin.js 2023-06-15 11:09:27.000000000 +0000 @@ -70,7 +70,7 @@ for (const [msgid, translation] of Object.entries(context)) { /* Only include msgids which appear in this source directory */ const references = translation.comments.reference.split(/\s/); - if (!references.some(str => str.startsWith(`pkg/${subdir}`) || str.startsWith(config.src_directory))) + if (!references.some(str => str.startsWith(`pkg/${subdir}`) || str.startsWith(config.src_directory) || str.startsWith(`pkg/lib`))) continue; if (translation.comments.flag?.match(/\bfuzzy\b/)) diff -Nru cockpit-292/pkg/lib/context-menu.scss cockpit-294.1/pkg/lib/context-menu.scss --- cockpit-292/pkg/lib/context-menu.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/context-menu.scss 2023-06-15 11:09:27.000000000 +0000 @@ -5,11 +5,11 @@ */ z-index: 101; /* Move the menu under the mouse */ - transform: translate(calc(-1 * var(--pf-global--spacer--sm)), calc(-1 * var(--pf-global--spacer--sm))); + transform: translate(calc(-1 * var(--pf-v5-global--spacer--sm)), calc(-1 * var(--pf-v5-global--spacer--sm))); - &Option .pf-c-menu__item-text { + &Option .pf-v5-c-menu__item-text { display: flex; - gap: var(--pf-global--spacer--sm); + gap: var(--pf-v5-global--spacer--sm); justify-content: space-between; min-inline-size: 10rem; } diff -Nru cockpit-292/pkg/lib/ct-card.scss cockpit-294.1/pkg/lib/ct-card.scss --- cockpit-292/pkg/lib/ct-card.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/ct-card.scss 2023-06-15 11:09:27.000000000 +0000 @@ -1,55 +1,55 @@ @use "_global-variables.scss" as *; /* Rely on the margin from the Card for spacing */ -.ct-card.pf-c-card .table { +.ct-card.pf-v5-c-card .table { margin-block-end: 0; } // FIXME: Once PF4 provides a property for removing padding: https://github.com/patternfly/patternfly-react/issues/5606 -.ct-card.pf-c-card .pf-c-card__body.contains-list { +.ct-card.pf-v5-c-card .pf-v5-c-card__body.contains-list { padding-inline: 0; padding-block-end: 0; - > .pf-c-table > :last-child > tr:last-child { + > .pf-v5-c-table > :last-child > tr:last-child { border-block-end: none; } // Remove excess padding from compact tables toggles // And adjust the padding to left align the toggles with the card header - > .pf-c-table { - .pf-c-table__toggle { + > .pf-v5-c-table { + .pf-v5-c-table__toggle { padding-inline-start: 0; - > .pf-c-button { - padding-inline-start: var(--pf-global--spacer--lg); + > .pf-v5-c-button { + padding-inline-start: var(--pf-v5-global--spacer--lg); } } } } -.ct-card.pf-c-card .pf-c-card__title-text { +.ct-card.pf-v5-c-card .pf-v5-c-card__title-text { font-weight: normal; - font-size: var(--pf-global--FontSize--2xl); + font-size: var(--pf-v5-global--FontSize--2xl); } // Remove excess top padding from top-level empty state in cards, // as card headers already add enough space -.ct-card > .pf-c-card__body > .pf-c-empty-state { - --pf-c-empty-state__body--MarginTop: 0; - padding-block: 0 var(--pf-global--spacer--md); +.ct-card > .pf-v5-c-card__body > .pf-v5-c-empty-state { + --pf-v5-c-empty-state__body--MarginTop: 0; + padding-block: 0 var(--pf-v5-global--spacer--md); } .ct-cards-grid { --ct-grid-columns: 2; - --pf-l-gallery--GridTemplateColumns: repeat(var(--ct-grid-columns), 1fr); + --pf-v5-l-gallery--GridTemplateColumns: repeat(var(--ct-grid-columns), 1fr); - > .pf-c-card:not(.ct-card-info) { + > .pf-v5-c-card:not(.ct-card-info) { // Extend all non-info cards to be full width; // let ct-card-info fit 1 column of the grid grid-column: 1 / -1; } - @media screen and (max-width: $pf-global--breakpoint--lg) { + @media screen and (max-width: $pf-v5-global--breakpoint--lg) { // Shrink to 1 column when space is constrained --ct-grid-columns: 1; } @@ -57,7 +57,7 @@ // Remove redundant padding from embedded toolbars (handled by header) // Toolbars in card headers are not a common scenario so no need to upstream this -.ct-card.pf-c-card .pf-c-toolbar, -.ct-card.pf-c-card .pf-c-toolbar__content { +.ct-card.pf-v5-c-card .pf-v5-c-toolbar, +.ct-card.pf-v5-c-card .pf-v5-c-toolbar__content { padding: 0; } diff -Nru cockpit-292/pkg/lib/esbuild-test-html-plugin.js cockpit-294.1/pkg/lib/esbuild-test-html-plugin.js --- cockpit-292/pkg/lib/esbuild-test-html-plugin.js 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/esbuild-test-html-plugin.js 2023-06-15 11:09:27.000000000 +0000 @@ -9,7 +9,7 @@ name: 'CockpitTestHtmlPlugin', setup(build) { build.onEnd(async () => { - const data = fs.readFileSync(path.resolve(libdir, "qunit-template.html"), "utf8"); + const data = fs.readFileSync(path.resolve(libdir, "qunit-template.html.in"), "utf8"); testFiles.forEach(file => { const test = path.parse(file).name; const output = _.template(data.toString())({ diff -Nru cockpit-292/pkg/lib/_global-variables.scss cockpit-294.1/pkg/lib/_global-variables.scss --- cockpit-292/pkg/lib/_global-variables.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/_global-variables.scss 2023-06-15 11:09:27.000000000 +0000 @@ -6,9 +6,9 @@ * (This does use the intended content area, but there's a mismatch between content and browser width as we use iframes.) * So redefine grid breakpoints */ -$pf-global--breakpoint--xs: 0 !default; +$pf-v5-global--breakpoint--xs: 0 !default; // Do not override the sm breakpoint as for width < 768px the left nav is hidden -$pf-global--breakpoint--md: 428px !default; -$pf-global--breakpoint--lg: 652px !default; -$pf-global--breakpoint--xl: 860px !default; -$pf-global--breakpoint--2xl: 1110px !default; +$pf-v5-global--breakpoint--md: 428px !default; +$pf-v5-global--breakpoint--lg: 652px !default; +$pf-v5-global--breakpoint--xl: 860px !default; +$pf-v5-global--breakpoint--2xl: 1110px !default; diff -Nru cockpit-292/pkg/lib/inotify.py cockpit-294.1/pkg/lib/inotify.py --- cockpit-292/pkg/lib/inotify.py 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/inotify.py 2023-06-15 11:09:27.000000000 +0000 @@ -16,12 +16,11 @@ # You should have received a copy of the GNU Lesser General Public License # along with Cockpit; If not, see . -import os import ctypes +import os import struct import sys - IN_CLOSE_WRITE = 0x00000008 IN_MOVED_FROM = 0x00000040 IN_MOVED_TO = 0x00000080 diff -Nru cockpit-292/pkg/lib/journal.css cockpit-294.1/pkg/lib/journal.css --- cockpit-292/pkg/lib/journal.css 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/journal.css 2023-06-15 11:09:27.000000000 +0000 @@ -29,20 +29,20 @@ padding: 0; } -.cockpit-log-panel .pf-c-card__body .panel-heading, +.cockpit-log-panel .pf-v5-c-card__body .panel-heading, .cockpit-log-panel .panel-body .panel-heading { border-block-start: 0; background-color: var(--ct-color-bg); - font-weight: var(--pf-global--FontWeight--normal); - padding-block: var(--pf-global--spacer--sm); + font-weight: var(--pf-v5-global--FontWeight--normal); + padding-block: var(--pf-v5-global--spacer--sm); inline-size: auto; color: var(--ct-color-list-text); display: flex; } -.cockpit-log-panel .pf-c-card__body .panel-heading { +.cockpit-log-panel .pf-v5-c-card__body .panel-heading { /* Align sub-heading within a PF4 card to the heading of the card */ - padding-inline-start: var(--pf-global--spacer--lg); + padding-inline-start: var(--pf-v5-global--spacer--lg); } .cockpit-log-panel .panel-body .panel-heading:not(:first-child)::after { @@ -66,7 +66,7 @@ padding-inline: 1rem; display: grid; grid-template-columns: var(--log-icon) var(--log-time) var(--log-message) var(--log-service); - grid-gap: var(--pf-global--spacer--sm); + grid-gap: var(--pf-v5-global--spacer--sm); align-items: baseline; } @@ -101,7 +101,7 @@ .empty-message { inline-size: 100%; - color: var(--pf-global--Color--200); + color: var(--pf-v5-global--Color--200); display: block; padding-block: 0.5rem; padding-inline: 1rem; @@ -111,13 +111,13 @@ .cockpit-log-time, .cockpit-log-service, .cockpit-log-service-reduced { - color: var(--pf-global--Color--200); + color: var(--pf-v5-global--Color--200); } .cockpit-log-time { - color: var(--pf-global--Color--200); + color: var(--pf-v5-global--Color--200); font-family: monospace; - font-size: var(--pf-global--FontSize--xs); + font-size: var(--pf-v5-global--FontSize--xs); justify-self: end; white-space: nowrap; } @@ -134,11 +134,11 @@ .cockpit-log-message, .cockpit-log-service, .cockpit-log-service-reduced { - font-size: var(--pf-global--FontSize--sm); + font-size: var(--pf-v5-global--FontSize--sm); } -.cockpit-log-service-container > .pf-c-badge { - margin-inline-start: var(--pf-global--spacer--xs); +.cockpit-log-service-container > .pf-v5-c-badge { + margin-inline-start: var(--pf-v5-global--spacer--xs); } .cockpit-log-service-container { diff -Nru cockpit-292/pkg/lib/menu-select-widget.scss cockpit-294.1/pkg/lib/menu-select-widget.scss --- cockpit-292/pkg/lib/menu-select-widget.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/menu-select-widget.scss 2023-06-15 11:09:27.000000000 +0000 @@ -3,24 +3,24 @@ // A menu gives us the interaction we want, but the styling is a bit off. // Therefore, we're changing the visuals here locally. // PF4 upstream request for multi-select @ https://github.com/patternfly/patternfly/issues/4027 -.ct-menu-select-widget.pf-c-menu { +.ct-menu-select-widget.pf-v5-c-menu { // Divider is silly between the widgets in this context - .pf-c-divider { + .pf-v5-c-divider { display: none; - + .pf-c-menu__content { + + .pf-v5-c-menu__content { // There should be minimal space between the widgets (replacing the divider) - margin-block-start: var(--pf-global--spacer--sm); + margin-block-start: var(--pf-v5-global--spacer--sm); } } - .pf-c-menu__content { + .pf-v5-c-menu__content { // An overflow multi-select widget needs an outline - border: 1px solid var(--pf-global--BorderColor--100); + border: 1px solid var(--pf-v5-global--BorderColor--100); } // Search should not be inset when there's no border containing it - .pf-c-menu__search { + .pf-v5-c-menu__search { padding: 0; } @@ -29,7 +29,7 @@ // when active but also keep the background color when the list loses // focus (such as when the keyboard or mouse navigates outside, // including initial rendering of the list. - .pf-c-menu__list:not(:focus-within) .pf-m-selected { - background-color: var(--pf-c-menu__list-item--hover--BackgroundColor); + .pf-v5-c-menu__list:not(:focus-within) .pf-m-selected { + background-color: var(--pf-v5-c-menu__list-item--hover--BackgroundColor); } } diff -Nru cockpit-292/pkg/lib/page.scss cockpit-294.1/pkg/lib/page.scss --- cockpit-292/pkg/lib/page.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/page.scss 2023-06-15 11:09:27.000000000 +0000 @@ -5,19 +5,19 @@ /* Globally resize headings */ h1 { - --ct-heading-font-size: var(--pf-global--FontSize--4xl); + --ct-heading-font-size: var(--pf-v5-global--FontSize--4xl); } h2 { - --ct-heading-font-size: var(--pf-global--FontSize--3xl); + --ct-heading-font-size: var(--pf-v5-global--FontSize--3xl); } h3 { - --ct-heading-font-size: var(--pf-global--FontSize--2xl); + --ct-heading-font-size: var(--pf-v5-global--FontSize--2xl); } h4 { - --ct-heading-font-size: var(--pf-global--FontSize--lg); + --ct-heading-font-size: var(--pf-v5-global--FontSize--lg); } // Only apply a custom font size when a heading does NOT have a PF4 class @@ -42,11 +42,11 @@ min-inline-size: 26px; } -.btn.disabled, .pf-c-button.disabled { +.btn.disabled, .pf-v5-c-button.disabled { pointer-events: auto; } -.btn.disabled:hover, .pf-c-button.disabled:hover { +.btn.disabled:hover, .pf-v5-c-button.disabled:hover { z-index: auto; } @@ -83,7 +83,7 @@ --ct-animation-new-background: #fdf4dd; } -.pf-theme-dark { +.pf-v5-theme-dark { --ct-animation-new-background: #353428; } @@ -104,7 +104,7 @@ /* Right align footer idle messages after the buttons */ margin-inline-start: auto; display: flex; - column-gap: var(--pf-global--spacer--sm); + column-gap: var(--pf-v5-global--spacer--sm); align-items: center; } @@ -113,24 +113,24 @@ --ct-color-light-red: #f8cccc; --ct-color-red-hat-red : #e00; - // Blend between --pf-global--palette--black-200 and 300 + // Blend between --pf-v5-global--palette--black-200 and 300 --ct-global--palette--black-250: #e6e6e6; /* Semantic colors */ - --ct-color-fg: var(--pf-global--color--100); - --ct-color-bg: var(--pf-global--BackgroundColor--100); + --ct-color-fg: var(--pf-v5-global--color--100); + --ct-color-bg: var(--pf-v5-global--BackgroundColor--100); --ct-color-text: var(--ct-color-fg); - --ct-color-link : var(--pf-global--active-color--100); - --ct-color-link-visited: var(--pf-global--active-color--100); + --ct-color-link : var(--pf-v5-global--active-color--100); + --ct-color-link-visited: var(--pf-v5-global--active-color--100); - --ct-color-subtle-copy: var(--pf-global--disabled-color--100); + --ct-color-subtle-copy: var(--pf-v5-global--disabled-color--100); // General border color (semantic shortcut, instead of specifying the color directly) - --ct-color-border: var(--pf-global--BorderColor--100); + --ct-color-border: var(--pf-v5-global--BorderColor--100); // Used for highlighting link blocks (with a light background blue) - --ct-color-link-hover-bg : var(--pf-global--palette--light-blue-100); + --ct-color-link-hover-bg : var(--pf-v5-global--palette--light-blue-100); /* Colors used for custom lists */ // as seen in Journal, Listing, Table widgets and pages like Machines, Updates, Services @@ -139,24 +139,24 @@ --ct-color-list-bg : var(--ct-color-bg); --ct-color-list-border : var(--ct-color-border); --ct-color-list-hover-text : var(--ct-color-link); - --ct-color-list-hover-bg : var(--pf-global--BackgroundColor--150); - --ct-color-list-hover-border : var(--pf-global--BackgroundColor--150); - --ct-color-list-hover-icon : var(--pf-global--palette--light-blue-400); + --ct-color-list-hover-bg : var(--pf-v5-global--BackgroundColor--150); + --ct-color-list-hover-border : var(--pf-v5-global--BackgroundColor--150); + --ct-color-list-hover-icon : var(--pf-v5-global--palette--light-blue-400); --ct-color-list-selected-text : var(--ct-color-link); - --ct-color-list-selected-bg : var(--pf-global--BackgroundColor--150); - --ct-color-list-selected-border : var(--pf-global--BackgroundColor--150); - --ct-color-list-active-text : var(--pf-global--palette--blue-500); + --ct-color-list-selected-bg : var(--pf-v5-global--BackgroundColor--150); + --ct-color-list-selected-border : var(--pf-v5-global--BackgroundColor--150); + --ct-color-list-active-text : var(--pf-v5-global--palette--blue-500); --ct-color-list-active-bg : var(--ct-color-bg); --ct-color-list-active-border : var(--ct-color-list-border); - --ct-color-list-critical-bg : var(--pf-global--palette--red-50); + --ct-color-list-critical-bg : var(--pf-v5-global--palette--red-50); --ct-color-list-critical-border : #e6bcbc; // red-500 mixed with white @ 50% - --ct-color-list-critical-alert-text: var(--pf-global--palette--red-200); + --ct-color-list-critical-alert-text: var(--pf-v5-global--palette--red-200); } -.pf-theme-dark { +.pf-v5-theme-dark { --ct-color-list-critical-bg : #261213; // red-100 mixed with black-850 @ 20% - --ct-color-list-critical-border : var(--pf-global--danger-color--200); - --ct-color-list-critical-alert-text: var(--pf-global--palette--red-8888); + --ct-color-list-critical-border : var(--pf-v5-global--danger-color--200); + --ct-color-list-critical-alert-text: var(--pf-v5-global--palette--red-8888); } [hidden] { display: none !important; } @@ -172,22 +172,22 @@ } .ct-icon-info-circle { - color: var(--pf-global--info-color--100); + color: var(--pf-v5-global--info-color--100); } .ct-icon-exclamation-triangle { - color: var(--pf-global--warning-color--100); + color: var(--pf-v5-global--warning-color--100); } .ct-icon-times-circle { - color: var(--pf-global--danger-color--100); + color: var(--pf-v5-global--danger-color--100); } // Action buttons in headers add extra space. Offset that with a negative margin // to compensate, so headings are always the same height regardless of action // buttons or not. -.pf-c-page__main-breadcrumb .pf-c-button { - --offset: calc(-1 * var(--pf-global--spacer--sm)); +.pf-v5-c-page__main-breadcrumb .pf-v5-c-button { + --offset: calc(-1 * var(--pf-v5-global--spacer--sm)); margin-block: var(--offset); } diff -Nru cockpit-292/pkg/lib/patternfly/patternfly-5-cockpit.scss cockpit-294.1/pkg/lib/patternfly/patternfly-5-cockpit.scss --- cockpit-292/pkg/lib/patternfly/patternfly-5-cockpit.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/patternfly/patternfly-5-cockpit.scss 2023-06-15 11:09:27.000000000 +0000 @@ -1,7 +1,7 @@ /* Set fake font and icon path variables */ -$pf-global--font-path: "patternfly-fonts-fake-path"; -$pf-global--fonticon-path: "patternfly-icons-fake-path"; -$pf-global--disable-fontawesome: true !default; // Disable Font Awesome 5 Free +$pf-v5-global--font-path: "patternfly-fonts-fake-path"; +$pf-v5-global--fonticon-path: "patternfly-icons-fake-path"; +$pf-v5-global--disable-fontawesome: true !default; // Disable Font Awesome 5 Free @import "@patternfly/patternfly/patternfly-base.scss"; diff -Nru cockpit-292/pkg/lib/patternfly/patternfly-5-overrides.scss cockpit-294.1/pkg/lib/patternfly/patternfly-5-overrides.scss --- cockpit-292/pkg/lib/patternfly/patternfly-5-overrides.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/patternfly/patternfly-5-overrides.scss 2023-06-15 11:09:27.000000000 +0000 @@ -3,46 +3,46 @@ @use "global-variables" as *; // https://github.com/patternfly/patternfly-react/pull/8953 -.pf-c-input-group__text { - padding-inline: var(--pf-global--spacer--sm); +.pf-v5-c-input-group__text { + padding-inline: var(--pf-v5-global--spacer--sm); } // PF Select is deprecated - no issue reported upstream - this needs to be removed from our codebase // Make select have the expected width -.pf-c-select[data-popper-reference-hidden="false"] { +.pf-v5-c-select[data-popper-reference-hidden="false"] { inline-size: auto; } // https://github.com/patternfly/patternfly/issues/5501 -.pf-theme-dark { - .pf-c-alert.pf-m-custom { - --pf-c-alert--BackgroundColor: var(--pf-global--palette--black-600); - --pf-c-alert__title--Color: var(--pf-global--custom-color--200); +.pf-v5-theme-dark { + .pf-v5-c-alert.pf-m-custom { + --pf-v5-c-alert--BackgroundColor: var(--pf-v5-global--palette--black-600); + --pf-v5-c-alert__title--Color: var(--pf-v5-global--custom-color--200); } } // https://github.com/patternfly/patternfly-react/issues/8993 -.pf-c-about-modal-box__close { - --pf-c-about-modal-box__close--c-button--BackgroundColor: var(--pf-global--BackgroundColor--dark-200); - --pf-c-about-modal-box__close--c-button--hover--BackgroundColor: var(--pf-global--BackgroundColor--dark-400); +.pf-v5-c-about-modal-box__close { + --pf-v5-c-about-modal-box__close--c-button--BackgroundColor: var(--pf-v5-global--BackgroundColor--dark-200); + --pf-v5-c-about-modal-box__close--c-button--hover--BackgroundColor: var(--pf-v5-global--BackgroundColor--dark-400); } /* WORKAROUND: Navigation problems with Tertiary Nav widget on mobile */ /* See: https://github.com/patternfly/patternfly-design/issues/840 */ -/* Helper mod to wrap pf-c-nav__tertiary */ +/* Helper mod to wrap pf-v5-c-nav__tertiary */ .ct-m-nav__tertiary-wrap { - .pf-c-nav__list { + .pf-v5-c-nav__list { flex-wrap: wrap; } - .pf-c-nav__scroll-button { + .pf-v5-c-nav__scroll-button { display: none; } } -/* Helper mod to center pf-c-nav__tertiary when it wraps */ +/* Helper mod to center pf-v5-c-nav__tertiary when it wraps */ .ct-m-nav__tertiary-center { - .pf-c-nav__list { + .pf-v5-c-nav__list { justify-content: center; } } @@ -60,12 +60,12 @@ This disables the large and halfway useless overflow buttons and causes the tabs to wrap around when there isn't enough space. */ -.pf-c-tabs__list { +.pf-v5-c-tabs__list { flex-wrap: wrap; } /* Fix select menu rendering */ -ul.pf-c-select__menu { +ul.pf-v5-c-select__menu { /* Don't get too tall */ max-block-size: min(20rem, 50vh); /* Don't have a horizontal scrollbar */ @@ -76,101 +76,101 @@ /* (This can be seen when the longest text is selected on a non-stretched select) */ /* Upstream: https://github.com/patternfly/patternfly/issues/4387 */ /* Cockpit-Podman: https://github.com/cockpit-project/cockpit-podman/issues/755 */ -select.pf-c-form-control { - --pf-c-form-control--PaddingRight: 41px; - --pf-c-form-control--PaddingLeft: 8px; +select.pf-v5-c-form-control { + --pf-v5-c-form-control--PaddingRight: 41px; + --pf-v5-c-form-control--PaddingLeft: 8px; // Firefox's select text has additional padding (4px) @-moz-document url-prefix() { - --pf-c-form-control--PaddingRight: 37px; - --pf-c-form-control--PaddingLeft: 4px; + --pf-v5-c-form-control--PaddingRight: 37px; + --pf-v5-c-form-control--PaddingLeft: 4px; } } // The default gap between the rows in horizontal lists is too large -.pf-c-description-list.pf-m-horizontal-on-sm, -.pf-c-description-list.pf-m-horizontal { - --pf-c-description-list--RowGap: 1rem; +.pf-v5-c-description-list.pf-m-horizontal-on-sm, +.pf-v5-c-description-list.pf-m-horizontal { + --pf-v5-c-description-list--RowGap: 1rem; } -.pf-c-description-list { +.pf-v5-c-description-list { // When using horizontal ruler inside description list it's just for the spacing - don't show it > hr { border-block-start: none; } } -.pf-c-modal-box.pf-m-align-top { +.pf-v5-c-modal-box.pf-m-align-top { // We utilize custom footers in dialogs // Make sure that the buttons always appear in the next line from the inline alerts - .pf-c-modal-box__footer { + .pf-v5-c-modal-box__footer { flex-wrap: wrap; - row-gap: var(--pf-global--spacer--sm); + row-gap: var(--pf-v5-global--spacer--sm); - > div:not(.pf-c-button):not(.dialog-wait-ct) { + > div:not(.pf-v5-c-button):not(.dialog-wait-ct) { flex: 0 0 100%; } } } -.pf-c-card { +.pf-v5-c-card { // https://github.com/patternfly/patternfly/issues/3959 - --pf-c-card__header-toggle--MarginTop: 0; + --pf-v5-c-card__header-toggle--MarginTop: 0; - .pf-c-card__header:not(.ct-card-expandable-header), - .pf-c-card__header:not(.ct-card-expandable-header) .pf-c-card__header-main { + .pf-v5-c-card__header:not(.ct-card-expandable-header), + .pf-v5-c-card__header:not(.ct-card-expandable-header) .pf-v5-c-card__header-main { // upstream fix (pending): https://github.com/patternfly/patternfly/pull/3714 display: flex; flex-wrap: wrap; - row-gap: var(--pf-global--spacer--sm); + row-gap: var(--pf-v5-global--spacer--sm); justify-content: space-between; } - .pf-c-card__header:not(.ct-card-expandable-header) { - > .pf-c-card__actions { + .pf-v5-c-card__header:not(.ct-card-expandable-header) { + > .pf-v5-c-card__actions { flex-wrap: wrap; - row-gap: var(--pf-global--spacer--sm); + row-gap: var(--pf-v5-global--spacer--sm); // PF4 CardActions act up when using buttons while the title is large of font // https://github.com/patternfly/patternfly/issues/3713 // https://github.com/patternfly/patternfly/issues/4362 margin: unset; - padding-inline: var(--pf-c-card__actions--PaddingLeft) unset; + padding-inline: var(--pf-v5-c-card__actions--PaddingLeft) unset; } } } // Add some spacing to nested form groups - PF4 does not support these yet // https://github.com/patternfly/patternfly-design/issues/1012 -.pf-c-form__group-control { - .pf-c-form__group, .pf-c-form__section { - padding-block-start: var(--pf-global--spacer--md); +.pf-v5-c-form__group-control { + .pf-v5-c-form__group, .pf-v5-c-form__section { + padding-block-start: var(--pf-v5-global--spacer--md); } } // Alerts use elements that have fonts set in other frameworks (including PF3); // generally, this is an H4 that often has a font size and sometimes family set. -// Therefore, it should inherit from the alert font set at the pf-c-alert level. +// Therefore, it should inherit from the alert font set at the pf-v5-c-alert level. // https://github.com/patternfly/patternfly/issues/4206 -.pf-c-alert__title { +.pf-v5-c-alert__title { font-size: inherit; font-family: inherit; } -.pf-c-toolbar { +.pf-v5-c-toolbar { // Make summary content use the same vertical space as the filter toggle, // when possible. // https://github.com/patternfly/patternfly-design/issues/1055 &.ct-compact { - @media screen and (max-width: $pf-global--breakpoint--lg - 1) { + @media screen and (max-width: $pf-v5-global--breakpoint--lg - 1) { display: flex; flex-wrap: wrap; - > .pf-c-toolbar__content:first-child { + > .pf-v5-c-toolbar__content:first-child { flex: auto; } - .pf-c-toolbar__content-section { + .pf-v5-c-toolbar__content-section { inline-size: auto; } } @@ -178,36 +178,36 @@ } // When there is an Alert above the Form add some spacing -.pf-c-modal-box .pf-c-alert + .pf-c-form { - padding-block-start: var(--pf-global--FontSize--sm); +.pf-v5-c-modal-box .pf-v5-c-alert + .pf-v5-c-form { + padding-block-start: var(--pf-v5-global--FontSize--sm); } // HACK: Not possible to specify text, so needs some hacks, see https://github.com/patternfly/patternfly-react/issues/6140 -.pf-c-toolbar__toggle { - .pf-c-button.pf-m-plain { - color: var(--pf-c-button--m-link--Color); +.pf-v5-c-toolbar__toggle { + .pf-v5-c-button.pf-m-plain { + color: var(--pf-v5-c-button--m-link--Color); - .pf-c-button__icon { - margin-inline-end: var(--pf-global--spacer--sm); + .pf-v5-c-button__icon { + margin-inline-end: var(--pf-v5-global--spacer--sm); } } } // Flex should use gap, not a margin hack // https://github.com/patternfly/patternfly/issues/4523 -.pf-l-flex { - gap: var(--pf-l-flex--spacer-base); +.pf-v5-l-flex { + gap: var(--pf-v5-l-flex--spacer-base); // Negate the margin hack used by immediate flex children // (except for nested flex, as we want to mind the gap) - > :not(.pf-l-flex) { - --pf-l-flex--spacer-base: 0; + > :not(.pf-v5-l-flex) { + --pf-v5-l-flex--spacer-base: 0; } // Undo all spacer modification adjustments &[class*="pf-m-space-items-"] { > * { - --pf-l-flex--spacer: 0; + --pf-v5-l-flex--spacer: 0; } } @@ -215,7 +215,7 @@ // (using class attribute matching for handling breakpoint -on- also) @each $size in (none, xs, sm, md, lg, xl, 2xl, 3xl, 4xl) { &[class*="pf-m-space-items-#{$size}"] { - --pf-l-flex--spacer-base: var(--pf-l-flex--spacer--#{$size}); + --pf-v5-l-flex--spacer-base: var(--pf-v5-l-flex--spacer--#{$size}); } } } @@ -225,7 +225,7 @@ // Additionally, it needs to be full width to properly align to the widget the // popover panel describes. // https://github.com/patternfly/patternfly-react/issues/7592 -.pf-c-search-input__menu.pf-c-panel { +.pf-v5-c-search-input__menu.pf-v5-c-panel { position: absolute; inline-size: 100%; } @@ -241,41 +241,41 @@ // linking. // // Nevertheless, Cockpit needs to be adapted for this to work as expected. -.pf-c-breadcrumb__link { +.pf-v5-c-breadcrumb__link { cursor: pointer; } //Page headers are inconsistent with shadows and borders // https://github.com/patternfly/patternfly/issues/5184 -.pf-c-page__main-group, -.pf-c-page__main-nav, -.pf-c-page__main-section.pf-m-light:not(:last-child) { - z-index: var(--pf-c-page--section--m-shadow-bottom--ZIndex); - box-shadow: var(--pf-c-page--section--m-shadow-bottom--BoxShadow); +.pf-v5-c-page__main-group, +.pf-v5-c-page__main-nav, +.pf-v5-c-page__main-section.pf-m-light:not(:last-child) { + z-index: var(--pf-v5-c-page--section--m-shadow-bottom--ZIndex); + box-shadow: var(--pf-v5-c-page--section--m-shadow-bottom--BoxShadow); } // Dark mode fixes for several PF components -.pf-theme-dark { +.pf-v5-theme-dark { // Change background color behind cards // (matches PF surge website; PF doesn't specify otherwise) - .pf-c-page__main-section { - --pf-c-page__main-section--BackgroundColor: var(--pf-global--BackgroundColor--dark-300); + .pf-v5-c-page__main-section { + --pf-v5-c-page__main-section--BackgroundColor: var(--pf-v5-global--BackgroundColor--dark-300); } // Adapt breadcrumb bar to be similar color as PF website // (We use header bars in slightly different ways from PF) // https://github.com/patternfly/patternfly/issues/5301 - .pf-c-page__main-breadcrumb { - --pf-c-page__main-breadcrumb--BackgroundColor: var(--pf-global--BackgroundColor--dark-100); - background-color: var(--pf-global--BackgroundColor--dark-100); + .pf-v5-c-page__main-breadcrumb { + --pf-v5-c-page__main-breadcrumb--BackgroundColor: var(--pf-v5-global--BackgroundColor--dark-100); + background-color: var(--pf-v5-global--BackgroundColor--dark-100); } // Fix input group background and borders // (Looks fixed in PF5, but not in PF4) - .pf-c-text-input-group { - background-color: var(--pf-global--BackgroundColor--400); + .pf-v5-c-text-input-group { + background-color: var(--pf-v5-global--BackgroundColor--400); - .pf-c-text-input-group__text { + .pf-v5-c-text-input-group__text { &::before { border-block-start-color: transparent; border-inline-end-color: transparent; @@ -283,101 +283,101 @@ } &:is(:focus,:hover)::after { - border-block-end-color: var(--pf-global--active-color--100); + border-block-end-color: var(--pf-v5-global--active-color--100); } &:not(:focus):not(:hover)::after { - border-block-end-color: var(--pf-global--BorderColor--400); + border-block-end-color: var(--pf-v5-global--BorderColor--400); } } } // PatternFly doesn't define gold color in dark mode - .pf-c-label { - --pf-c-label--m-gold--BackgroundColor: var(--pf-global--BackgroundColor--300); - --pf-c-label--m-gold__content--Color: var(--pf-global--palette--gold-100); + .pf-v5-c-label { + --pf-v5-c-label--m-gold--BackgroundColor: var(--pf-v5-global--BackgroundColor--300); + --pf-v5-c-label--m-gold__content--Color: var(--pf-v5-global--palette--gold-100); &.pf-m-gold { - --pf-c-label__content--Color: var(--pf-c-label--m-gold__content--Color); + --pf-v5-c-label__content--Color: var(--pf-v5-c-label--m-gold__content--Color); } } // FIXME: https://github.com/patternfly/patternfly/issues/5278 - .pf-c-modal-box .pf-c-table { + .pf-v5-c-modal-box .pf-v5-c-table { background-color: inherit; } } // Fix icons in buttons -.pf-c-button__icon.pf-m-start { - margin-inline: 0 var(--pf-c-button__icon--m-start--MarginRight); +.pf-v5-c-button__icon.pf-m-start { + margin-inline: 0 var(--pf-v5-c-button__icon--m-start--MarginRight); } // RTL fix: Masthead actions should be on the far side -.pf-c-masthead__content { - margin-inline: auto var(--pf-c-masthead__content--MarginLeft); +.pf-v5-c-masthead__content { + margin-inline: auto var(--pf-v5-c-masthead__content--MarginLeft); } // RTL fix: Menu direction should take direction into consideration -.pf-c-dropdown .pf-c-menu.pf-m-align-right, -.pf-c-dropdown__menu.pf-m-align-right { +.pf-v5-c-dropdown .pf-v5-c-menu.pf-m-align-right, +.pf-v5-c-dropdown__menu.pf-m-align-right { inset-inline: auto 0; } // RTL fix: Modal close button -.pf-c-modal { +.pf-v5-c-modal { &-box__header { - padding-inline: var(--pf-c-modal-box__header--PaddingRight) var(--pf-c-modal-box__header--PaddingLeft); + padding-inline: var(--pf-v5-c-modal-box__header--PaddingRight) var(--pf-v5-c-modal-box__header--PaddingLeft); } &-box__close { text-align: end; - inset-inline: auto var(--pf-c-modal-box__close--Right); + inset-inline: auto var(--pf-v5-c-modal-box__close--Right); + * { - margin-inline: 0 var(--pf-c-modal-box__close--sibling--MarginRight); + margin-inline: 0 var(--pf-v5-c-modal-box__close--sibling--MarginRight); } } } // RTL fix: Menu item alignment -.pf-c-menu__item-main { +.pf-v5-c-menu__item-main { text-align: start; } // RTL fix: inline button alignment -.pf-c-button.pf-m-link.pf-m-inline { +.pf-v5-c-button.pf-m-link.pf-m-inline { text-align: start; } // RTL fix: alert icons -.pf-c-alert__icon { - margin-inline: 0 var(--pf-c-alert__icon--MarginRight); +.pf-v5-c-alert__icon { + margin-inline: 0 var(--pf-v5-c-alert__icon--MarginRight); } // RTL fix: card -.pf-c-card__actions { - padding-inline: var(--pf-c-card__actions--PaddingLeft) 0; +.pf-v5-c-card__actions { + padding-inline: var(--pf-v5-c-card__actions--PaddingLeft) 0; } // RTL fix: table -.pf-c-table tr > * { - padding-inline: var(--pf-c-table--cell--PaddingLeft) var(--pf-c-table--cell--PaddingRight); +.pf-v5-c-table tr > * { + padding-inline: var(--pf-v5-c-table--cell--PaddingLeft) var(--pf-v5-c-table--cell--PaddingRight); } // RTL fix: description lists -.pf-c-description-list__term, .pf-c-description-list__description { +.pf-v5-c-description-list__term, .pf-v5-c-description-list__description { text-align: start; } // RTL fix: about modal -.pf-c-about-modal-box__close { - padding-inline: 0 var(--pf-c-about-modal-box__close--PaddingRight); +.pf-v5-c-about-modal-box__close { + padding-inline: 0 var(--pf-v5-c-about-modal-box__close--PaddingRight); } // RTL fix: card toggle -.pf-c-card__header-toggle { - margin-inline: var(--pf-c-card__header-toggle--MarginLeft) var(--pf-c-card__header-toggle--MarginRight); +.pf-v5-c-card__header-toggle { + margin-inline: var(--pf-v5-c-card__header-toggle--MarginLeft) var(--pf-v5-c-card__header-toggle--MarginRight); [dir="rtl"] & { transform: scaleX(-1); @@ -385,46 +385,46 @@ } // RTL fix: Select toggle -.pf-c-select__toggle { - padding-inline: var(--pf-c-select__toggle--PaddingLeft) var(--pf-c-select__toggle--PaddingRight); +.pf-v5-c-select__toggle { + padding-inline: var(--pf-v5-c-select__toggle--PaddingLeft) var(--pf-v5-c-select__toggle--PaddingRight); * + &-arrow { - margin-inline: var(--pf-c-select__toggle-arrow--MarginLeft) var(--pf-c-select__toggle-arrow--MarginRight); + margin-inline: var(--pf-v5-c-select__toggle-arrow--MarginLeft) var(--pf-v5-c-select__toggle-arrow--MarginRight); } - .pf-c-select__toggle-clear { - padding-inline: var(--pf-c-select__toggle-clear--PaddingLeft) var(--pf-c-select__toggle-clear--PaddingRight); + .pf-v5-c-select__toggle-clear { + padding-inline: var(--pf-v5-c-select__toggle-clear--PaddingLeft) var(--pf-v5-c-select__toggle-clear--PaddingRight); } } // RTL fix: Menu item -.pf-c-select__menu-item { - padding-inline: var(--pf-c-select__menu-item--PaddingLeft) var(--pf-c-select__menu-item--PaddingRight); +.pf-v5-c-select__menu-item { + padding-inline: var(--pf-v5-c-select__menu-item--PaddingLeft) var(--pf-v5-c-select__menu-item--PaddingRight); text-align: start; &-icon { - inset-inline: auto var(--pf-c-select__menu-item-icon--Right); + inset-inline: auto var(--pf-v5-c-select__menu-item-icon--Right); } } // RTL fix: Input group padding and icons -.pf-c-text-input-group { +.pf-v5-c-text-input-group { &__text-input { - padding-inline: var(--pf-c-text-input-group__text-input--PaddingLeft) var(--pf-c-text-input-group__text-input--PaddingRight); + padding-inline: var(--pf-v5-c-text-input-group__text-input--PaddingLeft) var(--pf-v5-c-text-input-group__text-input--PaddingRight); } &__icon { - inset-inline: var(--pf-c-text-input-group__icon--Left) 0; + inset-inline: var(--pf-v5-c-text-input-group__icon--Left) 0; } } // RTL fix: List item actions -.pf-c-data-list__item-action { - margin-inline: var(--pf-c-data-list__item-action--MarginLeft) 0; +.pf-v5-c-data-list__item-action { + margin-inline: var(--pf-v5-c-data-list__item-action--MarginLeft) 0; } // RTL fix: Align right utilities in flexes -.pf-l-flex > .pf-m-align-right { +.pf-v5-l-flex > .pf-m-align-right { margin-inline: auto 0; } @@ -438,19 +438,19 @@ } // Flip submit button icons (they're often arrows or direction related) - .pf-c-button > .pf-svg { + .pf-v5-c-button > .pf-v5-svg { transform: scaleX(-1); } // Flip expandable buttons - .pf-c-expandable-section__toggle-icon { + .pf-v5-c-expandable-section__toggle-icon { transform: scaleX(-1); } // Swap image padding in buttons - .pf-c-dropdown__toggle-image { + .pf-v5-c-dropdown__toggle-image { margin-inline-end: unset; - gap: var(--pf-c-dropdown__toggle-image--MarginRight); + gap: var(--pf-v5-c-dropdown__toggle-image--MarginRight); } // PatternFly and us are setting text-align to the left. @@ -462,8 +462,8 @@ } // Swap side of selected nav's blue line - .pf-c-nav__link.pf-m-current { - &, &:hover, &:not(.pf-m-expanded) .pf-c-nav__link { + .pf-v5-c-nav__link.pf-m-current { + &, &:hover, &:not(.pf-m-expanded) .pf-v5-c-nav__link { &::after { inline-size: 100%; transform: scaleX(-1); @@ -473,41 +473,41 @@ // Toolbar content (as seen in the shell) should be left aligned in RTL // See: https://github.com/patternfly/patternfly/issues/3812 - .pf-c-toolbar__content { + .pf-v5-c-toolbar__content { margin-inline: 0 auto; } // Dropdown toggles: Swap image margins to be on left instead - .pf-c-dropdown__toggle { + .pf-v5-c-dropdown__toggle { &-image { - margin-inline: var(--pf-c-dropdown__toggle-image--MarginRight) 0; + margin-inline: var(--pf-v5-c-dropdown__toggle-image--MarginRight) 0; } &-icon { - margin-inline: var(--pf-c-dropdown__toggle-icon--MarginRight) var(--pf-c-dropdown__toggle-icon--MarginLeft); + margin-inline: var(--pf-v5-c-dropdown__toggle-icon--MarginRight) var(--pf-v5-c-dropdown__toggle-icon--MarginLeft); } } // Flip popup directions, part 1 of 2 - .pf-c-dropdown .pf-c-menu.pf-m-align-right, - .pf-c-dropdown__menu.pf-m-align-right { + .pf-v5-c-dropdown .pf-v5-c-menu.pf-m-align-right, + .pf-v5-c-dropdown__menu.pf-m-align-right { inset-inline: 0 unset; } // Flip popup directions, part 2 of 2 - .pf-c-dropdown .pf-c-menu.pf-m-align-left, - .pf-c-dropdown__menu.pf-m-align-left { + .pf-v5-c-dropdown .pf-v5-c-menu.pf-m-align-left, + .pf-v5-c-dropdown__menu.pf-m-align-left { inset-inline: unset 0; } // Another case of aligning to the left instead of start - .pf-c-dropdown__menu-item { + .pf-v5-c-dropdown__menu-item { text-align: start; } // Fix spacing around menu icons - .pf-c-dropdown__menu-item-icon { - margin-inline: 0 var(--pf-c-dropdown__menu-item-icon--MarginRight); + .pf-v5-c-dropdown__menu-item-icon { + margin-inline: 0 var(--pf-v5-c-dropdown__menu-item-icon--MarginRight); } // Flip external icons @@ -516,23 +516,23 @@ } // Fix spacing in link icons - .pf-c-button__icon.pf-m-end { - margin-inline: var(--pf-c-button__icon--m-end--MarginLeft) 0; + .pf-v5-c-button__icon.pf-m-end { + margin-inline: var(--pf-v5-c-button__icon--m-end--MarginLeft) 0; } // Flip breadcrum divider - .pf-c-breadcrumb__item-divider { + .pf-v5-c-breadcrumb__item-divider { transform: scaleX(-1); - margin-inline: 0 var(--pf-c-breadcrumb__item-divider--MarginRight); + margin-inline: 0 var(--pf-v5-c-breadcrumb__item-divider--MarginRight); } } // Drop side padding in mobile mode, -// intended mainly for PF PageSection elements (pf-c-page__main-section). +// intended mainly for PF PageSection elements (pf-v5-c-page__main-section). // It's similar to adding padding={{ default: 'noPadding', sm: 'padding' }}, // except this only affects the sides, not the top and bottom. -@media screen and (max-width: $pf-global--breakpoint--sm) { - .pf-c-page__main > section.pf-c-page__main-section:not(.pf-m-padding) { +@media screen and (max-width: $pf-v5-global--breakpoint--sm) { + .pf-v5-c-page__main > section.pf-v5-c-page__main-section:not(.pf-m-padding) { padding-inline: 0; } } diff -Nru cockpit-292/pkg/lib/python.js cockpit-294.1/pkg/lib/python.js --- cockpit-292/pkg/lib/python.js 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/python.js 2023-06-15 11:09:27.000000000 +0000 @@ -19,8 +19,7 @@ import cockpit from "cockpit"; -// FIXME: eventually convert all images to python 3 -const pyinvoke = ["sh", "-ec", "exec $(which /usr/libexec/platform-python 2>/dev/null || which python3 2>/dev/null || which python) -c \"$@\"", "--"]; +const pyinvoke = ["sh", "-ec", "exec $(command -v /usr/libexec/platform-python || command -v python3) -c \"$@\"", "--"]; export function spawn (script_pieces, args, options) { const script = (typeof script_pieces == "string") diff -Nru cockpit-292/pkg/lib/qunit-template.html cockpit-294.1/pkg/lib/qunit-template.html --- cockpit-292/pkg/lib/qunit-template.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/qunit-template.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ - - - - - - <%= title %> - - - - - -

<%= title %>

-

-

    -
    test markup, will be hidden
    - - - diff -Nru cockpit-292/pkg/lib/qunit-template.html.in cockpit-294.1/pkg/lib/qunit-template.html.in --- cockpit-292/pkg/lib/qunit-template.html.in 1970-01-01 00:00:00.000000000 +0000 +++ cockpit-294.1/pkg/lib/qunit-template.html.in 2023-06-15 11:09:27.000000000 +0000 @@ -0,0 +1,35 @@ + + + + + + <%= title %> + + + + + +

    <%= title %>

    +

    +

      +
      test markup, will be hidden
      + + + diff -Nru cockpit-292/pkg/lib/serverTime.js cockpit-294.1/pkg/lib/serverTime.js --- cockpit-292/pkg/lib/serverTime.js 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/lib/serverTime.js 2023-06-15 11:09:27.000000000 +0000 @@ -567,7 +567,7 @@ change_server(event, i, value)} /> + onChange={(event, value) => change_server(event, i, value)} /> + ); } else { cpu_label = this.state.cpuUsed + '%'; @@ -793,7 +793,7 @@ {diskColumns.map(col => {col})} - + {make_rows(disksUsage, rowWrapperDisks, diskColumns)} @@ -801,7 +801,7 @@ allDisks = ( - + ); } @@ -967,7 +967,7 @@ {_("Write")} - + {make_rows(this.state.topServicesDiskIO, rowWrapperDiskIO, [_("Service"), _("Read"), _("Write")])} } @@ -1496,7 +1496,7 @@ } - onChange={enable => { + onChange={(_event, enable) => { // pmproxy needs pmlogger, auto-disable it setDialogLoggerValue(enable); if (!enable) @@ -1514,7 +1514,7 @@ } isDisabled={ !dialogLoggerValue } - onChange={enable => setDialogProxyValue(enable)} /> + onChange={(_event, enable) => setDialogProxyValue(enable)} /> ); @@ -1982,7 +1982,7 @@ - cockpit.jump("/system")} className="pf-c-breadcrumb__link">{_("Overview")} + cockpit.jump("/system")} className="pf-v5-c-breadcrumb__link">{_("Overview")} {_("Metrics and history")} diff -Nru cockpit-292/pkg/metrics/metrics.scss cockpit-294.1/pkg/metrics/metrics.scss --- cockpit-292/pkg/metrics/metrics.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/metrics/metrics.scss 2023-06-15 11:09:27.000000000 +0000 @@ -11,48 +11,48 @@ @import "@patternfly/patternfly/patternfly-charts-theme-dark.css"; #app { - section.pf-c-page__main-breadcrumb { - padding-block-end: var(--pf-c-page__main-breadcrumb--PaddingTop); + section.pf-v5-c-page__main-breadcrumb { + padding-block-end: var(--pf-v5-c-page__main-breadcrumb--PaddingTop); } } html { - --metrics-heading-time-color: var(--pf-global--BackgroundColor--light-100); - --resource-icon-color-empty: var(--pf-global--palette--black-400); - --resource-icon-color-middle: var(--pf-global--palette--orange-200); - --resource-icon-color-full: var(--pf-global--palette--orange-400); + --metrics-heading-time-color: var(--pf-v5-global--BackgroundColor--light-100); + --resource-icon-color-empty: var(--pf-v5-global--palette--black-400); + --resource-icon-color-middle: var(--pf-v5-global--palette--orange-200); + --resource-icon-color-full: var(--pf-v5-global--palette--orange-400); } -.pf-theme-dark { - --metrics-heading-time-color: var(--pf-global--BackgroundColor--300); +.pf-v5-theme-dark { + --metrics-heading-time-color: var(--pf-v5-global--BackgroundColor--300); --metrics-events-border-color: #000; - --resource-icon-color-empty: var(--pf-global--palette--black-400); - --resource-icon-color-middle: var(--pf-global--palette--orange-500); - --resource-icon-color-full: var(--pf-global--palette--orange-200); + --resource-icon-color-empty: var(--pf-v5-global--palette--black-400); + --resource-icon-color-middle: var(--pf-v5-global--palette--orange-500); + --resource-icon-color-full: var(--pf-v5-global--palette--orange-200); } // Remove doubled-up padding on "main" sections, when two+ sections are used. -.pf-c-page__main-section + .pf-c-page__main-section { +.pf-v5-c-page__main-section + .pf-v5-c-page__main-section { padding-block-start: 0; } // FIXME: More styles from ct-system-overview .current-metrics { --card-width: 200px; - --pf-l-gallery--GridTemplateColumns: repeat(auto-fit, minmax(var(--card-width), 1fr)); + --pf-v5-l-gallery--GridTemplateColumns: repeat(auto-fit, minmax(var(--card-width), 1fr)); // the cards already have padding, align the "top 5" tables with the other content - .pf-c-table { - --pf-c-table--m-compact--cell--first-last-child--PaddingLeft: 0; - --pf-c-table--m-compact--cell--first-last-child--PaddingRight: 0; + .pf-v5-c-table { + --pf-v5-c-table--m-compact--cell--first-last-child--PaddingLeft: 0; + --pf-v5-c-table--m-compact--cell--first-last-child--PaddingRight: 0; tr > * { - --pf-c-table--cell--PaddingTop: var(--pf-global--spacer--xs); - --pf-c-table--cell--PaddingBottom: var(--pf-global--spacer--xs); + --pf-v5-c-table--cell--PaddingTop: var(--pf-v5-global--spacer--xs); + --pf-v5-c-table--cell--PaddingBottom: var(--pf-v5-global--spacer--xs); } } - .pf-c-card { + .pf-v5-c-card { // Make sure the cards do not get taller than 50% of the screen // ...and when they do, they should scroll @media screen and (orientation: landscape) { @@ -61,8 +61,8 @@ } &__title-text { - font-size: var(--pf-global--FontSize--xl); - font-weight: var(--pf-global--FontWeight--normal); + font-size: var(--pf-v5-global--FontSize--xl); + font-weight: var(--pf-v5-global--FontWeight--normal); } // Let the children get flexy @@ -77,8 +77,8 @@ padding-block-start: 0; } - .pf-c-table thead th:not(:first-child), - .pf-c-table tbody td:not(:first-child) { + .pf-v5-c-table thead th:not(:first-child), + .pf-v5-c-table tbody td:not(:first-child) { text-align: end; } } @@ -88,42 +88,42 @@ } .text-color-warning { - color: var(--pf-global--warning-color--200); + color: var(--pf-v5-global--warning-color--200); } .icon-color-warning { - color: var(--pf-global--warning-color--100); + color: var(--pf-v5-global--warning-color--100); } .text-color-critical { - color: var(--pf-global--danger-color--200); + color: var(--pf-v5-global--danger-color--200); } .icon-color-critical { - color: var(--pf-global--danger-color--100); + color: var(--pf-v5-global--danger-color--100); } .progress-stack { display: grid; - padding-block-end: var(--pf-global--spacer--sm); - grid-gap: var(--pf-global--spacer--sm) var(--pf-global--spacer--md); + padding-block-end: var(--pf-v5-global--spacer--sm); + grid-gap: var(--pf-v5-global--spacer--sm) var(--pf-v5-global--spacer--md); &:not(:first-child) { - padding-block-start: var(--pf-global--spacer--sm); + padding-block-start: var(--pf-v5-global--spacer--sm); } } .progress-stack-no-space { display: grid; - padding-block-end: var(--pf-global--spacer--sm); + padding-block-end: var(--pf-v5-global--spacer--sm); grid-gap: 0; &:not(:first-child) { - padding-block-start: var(--pf-global--spacer--sm); + padding-block-start: var(--pf-v5-global--spacer--sm); } // avoid the "x" icon on high CPU usage - .pf-c-progress__status-icon { + .pf-v5-c-progress__status-icon { display: none; } @@ -137,69 +137,69 @@ // Stretch the progress stack and description list so they fill up remaining space. // This pushes the (unflexing) tables to the bottom. .progress-stack, - .pf-c-description-list { + .pf-v5-c-description-list { flex: 1 1 0; align-content: start; } // When progress stack and description list are used sequentially, // give the most space to the latter of the two elements. - .progress-stack + .pf-c-description-list, - .pf-c-description-list + .progress-stack { + .progress-stack + .pf-v5-c-description-list, + .pf-v5-c-description-list + .progress-stack { flex-basis: 100%; } // WebKit is a little wonky with flex sizing; it needs specific instructions here - .pf-c-description-list:first-child { + .pf-v5-c-description-list:first-child { flex-grow: 0; } - .pf-c-description-list__description { - font-size: var(--pf-global--FontSize--sm); + .pf-v5-c-description-list__description { + font-size: var(--pf-v5-global--FontSize--sm); } } // Shrink progress bars and their gap a little - .pf-c-progress { + .pf-v5-c-progress { grid-gap: 0; - --pf-c-progress__bar--Height: var(--pf-global--spacer--xs); + --pf-v5-c-progress__bar--Height: var(--pf-v5-global--spacer--xs); // PF4 uses end; it probably should arguably use last baseline. // (perhaps end may work better for non-text content?) align-items: last baseline; - + .pf-c-progress { + + .pf-v5-c-progress { // Add a tiny gap for sandwiched usage bars (as in CPU) padding-block-start: 1px; } } // Only underline the description - .pf-c-button.pf-m-link.pf-m-inline:hover { + .pf-v5-c-button.pf-m-link.pf-m-inline:hover { text-decoration: none; - .pf-c-progress__description { - text-decoration: var(--pf-c-button--m-link--m-inline--hover--TextDecoration); + .pf-v5-c-progress__description { + text-decoration: var(--pf-v5-c-button--m-link--m-inline--hover--TextDecoration); } } // Match font weight with description list terms - .pf-c-progress__description { - font-weight: var(--pf-global--FontWeight--bold); + .pf-v5-c-progress__description { + font-weight: var(--pf-v5-global--FontWeight--bold); } // Recolor text .pf-m-link { &, &:hover { - .pf-c-progress__measure { - color: var(--pf-global--Color--100); + .pf-v5-c-progress__measure { + color: var(--pf-v5-global--Color--100); } } } // default is way too wide for the cards - .pf-c-description-list { - --pf-c-description-list--m-horizontal__term--width: minmax(0, auto); - --pf-c-description-list--m-horizontal__description--width: minmax(0, auto); + .pf-v5-c-description-list { + --pf-v5-c-description-list--m-horizontal__term--width: minmax(0, auto); + --pf-v5-c-description-list--m-horizontal__description--width: minmax(0, auto); } // Don't wrap network in / out data @@ -209,40 +209,40 @@ .network-nowrap-shrink { td { white-space: nowrap; - font-size: var(--pf-global--FontSize--xs); + font-size: var(--pf-v5-global--FontSize--xs); } } // Shrink percentage column to allow for more service text th[data-label="%"], td[data-label="%"] { - .pf-c-table__text { - --pf-c-table--cell--MinWidth: 0; + .pf-v5-c-table__text { + --pf-v5-c-table--cell--MinWidth: 0; display: inline; } inline-size: 2rem; min-inline-size: 0; } - .pf-m-grid-lg.pf-c-table { + .pf-m-grid-lg.pf-v5-c-table { tbody:first-of-type { border-block-start: none; } - tbody tr:not(.pf-c-table__expandable-row) { - --pf-c-table-tr--responsive--PaddingTop: var(--pf-global--spacer--sm); - --pf-c-table-tr--responsive--PaddingRight: 0; - --pf-c-table-tr--responsive--PaddingBottom: var(--pf-global--spacer--sm); - --pf-c-table-tr--responsive--PaddingLeft: 0; - --pf-c-table-tr--responsive--border-width--base: 1px; + tbody tr:not(.pf-v5-c-table__expandable-row) { + --pf-v5-c-table-tr--responsive--PaddingTop: var(--pf-v5-global--spacer--sm); + --pf-v5-c-table-tr--responsive--PaddingRight: 0; + --pf-v5-c-table-tr--responsive--PaddingBottom: var(--pf-v5-global--spacer--sm); + --pf-v5-c-table-tr--responsive--PaddingLeft: 0; + --pf-v5-c-table-tr--responsive--border-width--base: 1px; &:last-child { border-block-end: none; } > * { - --pf-c-table--cell--responsive--PaddingTop: 0; - --pf-c-table--cell--responsive--PaddingBottom: 0; + --pf-v5-c-table--cell--responsive--PaddingTop: 0; + --pf-v5-c-table--cell--responsive--PaddingBottom: 0; } } } @@ -256,7 +256,7 @@ } } -.pf-c-popover { +.pf-v5-c-popover { thead th:not(:first-child) { text-align: end; } @@ -277,31 +277,31 @@ --card-width: 200px; } - .current-metrics .pf-c-card__body { + .current-metrics .pf-v5-c-card__body { overflow-block: auto; max-block-size: 50vw; } // Trim down the gutter space between cards - .current-metrics.pf-l-gallery.pf-m-gutter { - grid-gap: var(--pf-global--spacer--sm); + .current-metrics.pf-v5-l-gallery.pf-m-gutter { + grid-gap: var(--pf-v5-global--spacer--sm); } // Shave off a few pixels from cards - .pf-c-card__header, .pf-c-card__title, .pf-c-card__body, .pf-c-card__footer { - --pf-c-card--first-child--PaddingTop: var(--pf-global--spacer--sm); - --pf-c-card__title--not--last-child--PaddingBottom: var(--pf-global--spacer--sm); - --pf-c-card--child--PaddingTop: var(--pf-global--spacer--sm); - --pf-c-card--child--PaddingRight: var(--pf-global--spacer--md); - --pf-c-card--child--PaddingBottom: var(--pf-global--spacer--sm); - --pf-c-card--child--PaddingLeft: var(--pf-global--spacer--md); + .pf-v5-c-card__header, .pf-v5-c-card__title, .pf-v5-c-card__body, .pf-v5-c-card__footer { + --pf-v5-c-card--first-child--PaddingTop: var(--pf-v5-global--spacer--sm); + --pf-v5-c-card__title--not--last-child--PaddingBottom: var(--pf-v5-global--spacer--sm); + --pf-v5-c-card--child--PaddingTop: var(--pf-v5-global--spacer--sm); + --pf-v5-c-card--child--PaddingRight: var(--pf-v5-global--spacer--md); + --pf-v5-c-card--child--PaddingBottom: var(--pf-v5-global--spacer--sm); + --pf-v5-c-card--child--PaddingLeft: var(--pf-v5-global--spacer--md); } } // Change progress layout in medium sizes @media (min-width: 460px) and (max-width: 1200px) { // Stack description lists (instead of grid) - .pf-c-description-list__group { + .pf-v5-c-description-list__group { display: block; } } @@ -312,10 +312,10 @@ grid-column: 1 / -1; // Reflow interfaces horizontally, with wrapping - .pf-c-table > tbody { + .pf-v5-c-table > tbody { display: grid; grid-template-columns: repeat(auto-fill, minmax(8rem, 1fr)); - grid-gap: 0 var(--pf-global--spacer--lg); + grid-gap: 0 var(--pf-v5-global--spacer--lg); } } } @@ -323,17 +323,17 @@ $graphs: cpu, memory, disks, network; .metrics { - --cpu-color: var(--pf-chart-color-purple-200); - --cpu-color-extreme: var(--pf-chart-color-purple-300); + --cpu-color: var(--pf-v5-chart-color-purple-200); + --cpu-color-extreme: var(--pf-v5-chart-color-purple-300); - --memory-color: var(--pf-chart-color-green-200); - --memory-color-extreme: var(--pf-chart-color-green-300); + --memory-color: var(--pf-v5-chart-color-green-200); + --memory-color-extreme: var(--pf-v5-chart-color-green-300); - --disks-color: var(--pf-chart-color-gold-300); - --disks-color-extreme: var(--pf-chart-color-gold-400); + --disks-color: var(--pf-v5-chart-color-gold-300); + --disks-color-extreme: var(--pf-v5-chart-color-gold-400); - --network-color: var(--pf-chart-color-black-300); - --network-color-extreme: var(--pf-chart-color-black-400); + --network-color: var(--pf-v5-chart-color-black-300); + --network-color-extreme: var(--pf-v5-chart-color-black-400); --column-size: 10vw; --half-column-size: 8vw; @@ -344,12 +344,12 @@ &-hour-compressed { --data-min-height: 1px; display: flex; - background-color: var(--pf-global--BackgroundColor--light-300); + background-color: var(--pf-v5-global--BackgroundColor--light-300); } &-heading, &-hour:not(.metrics-hour-compressed) .metrics-minute { - background-color: var(--pf-global--BackgroundColor--light-300); + background-color: var(--pf-v5-global--BackgroundColor--light-300); display: flex; } @@ -369,10 +369,10 @@ } } - &-sublabels.pf-c-content { + &-sublabels.pf-v5-c-content { small { - font-size: var(--pf-global--FontSize--xs); - margin-block-end: var(--pf-global--spacer--xs) !important; + font-size: var(--pf-v5-global--FontSize--xs); + margin-block-end: var(--pf-v5-global--spacer--xs) !important; } display: flex; } @@ -410,21 +410,21 @@ &-events { display: flex; - column-gap: var(--pf-global--spacer--sm); + column-gap: var(--pf-v5-global--spacer--sm); flex-basis: calc(100% - var(--graph-column-size)); align-items: baseline; - font-size: var(--pf-global--FontSize--sm); + font-size: var(--pf-v5-global--FontSize--sm); &-expander { min-inline-size: 3rem; } time:first-child { - margin-inline-start: calc(3rem + var(--pf-global--spacer--sm)); + margin-inline-start: calc(3rem + var(--pf-v5-global--spacer--sm)); + .spikes_count { - padding-inline-start: calc(var(--pf-global--spacer--xl) + var(--pf-global--spacer--md)); - color: var(--pf-global--Color--200); + padding-inline-start: calc(var(--pf-v5-global--spacer--xl) + var(--pf-v5-global--spacer--md)); + color: var(--pf-v5-global--Color--200); } } @@ -440,7 +440,7 @@ } > * { - line-height: var(--pf-global--LineHeight--md); + line-height: var(--pf-v5-global--LineHeight--md); } > *:not(.metrics-events-expander):not(:last-child) { @@ -454,7 +454,7 @@ // Just embolden the top level time events button + time { - font-weight: var(--pf-global--FontWeight--bold); + font-weight: var(--pf-v5-global--FontWeight--bold); } // Make messages such as `Loading...` or `No logs found` centered @@ -471,12 +471,12 @@ &-time, &-heading { - padding-inline: var(--pf-c-page__main-section--PaddingLeft) var(--pf-c-page__main-section--PaddingRight); + padding-inline: var(--pf-v5-c-page__main-section--PaddingLeft) var(--pf-v5-c-page__main-section--PaddingRight); } &-time { background: var(--metrics-heading-time-color); - padding-block: var(--pf-global--spacer--md) var(--pf-global--spacer--sm); + padding-block: var(--pf-v5-global--spacer--md) var(--pf-v5-global--spacer--sm); // Time has tabular numbers, but it's not what we want for a heading time { @@ -489,7 +489,7 @@ } &-history { - background-color: var(--pf-global--BackgroundColor--light-300); + background-color: var(--pf-v5-global--BackgroundColor--light-300); padding: 0; } @@ -500,7 +500,7 @@ display: grid; contain: strict; margin-block: 0; - margin-inline: var(--pf-global--spacer--sm); + margin-inline: var(--pf-v5-global--spacer--sm); // Make SVG and generated before/after line position relative to metrics-data position: relative; grid-template-areas: "utilization"; @@ -609,7 +609,7 @@ &-hour { padding-block: 0; - padding-inline: var(--pf-global--spacer--sm); + padding-inline: var(--pf-v5-global--spacer--sm); } &-hour:not(.metrics-hour-compressed) .metrics-minute, @@ -623,7 +623,7 @@ } } - .pf-c-card__body:first-child { + .pf-v5-c-card__body:first-child { padding-block-start: 0; } } @@ -631,7 +631,7 @@ // Graph column labels are the widest part; scale down the labels for narrow widths @media (min-width: 800px) and (max-width: 1200px) { .metrics-label-graph { - font-size: var(--pf-global--FontSize--sm); + font-size: var(--pf-v5-global--FontSize--sm); } } @@ -658,9 +658,9 @@ } .metrics-label-graph-mobile { - padding-inline-start: var(--pf-global--spacer--sm); - padding-block-start: var(--pf-global--spacer--sm); - font-size: var(--pf-global--FontSize--sm); + padding-inline-start: var(--pf-v5-global--spacer--sm); + padding-block-start: var(--pf-v5-global--spacer--sm); + font-size: var(--pf-v5-global--FontSize--sm); } .square { @@ -706,19 +706,19 @@ } // leave some space for the focus rings - .pf-c-switch { + .pf-v5-c-switch { margin-block-end: 10px; } } .cpu-all { - --pf-l-grid--m-gutter--GridGap: var(--pf-global--spacer--xs) var(--pf-global--spacer--md); + --pf-v5-l-grid--m-gutter--GridGap: var(--pf-v5-global--spacer--xs) var(--pf-v5-global--spacer--md); // Mixing font families need to be aligned properly (to the baseline) align-items: baseline; // In monospaced text, "100%" is 4 characters grid-template-columns: 1fr minmax(4ch, auto); - > .pf-l-grid__item { + > .pf-v5-l-grid__item { // Don't use PF's hardcoded 12-column grid grid-column: auto; } @@ -726,7 +726,7 @@ > dd { // TODO: Use tabular numbers instead of monospace, // after new font usage is enabled - font-family: var(--pf-global--FontFamily--monospace); + font-family: var(--pf-v5-global--FontFamily--monospace); // Aligning percentages to the right, especially when monospaced, // makes it easier to see high percentages text-align: end; @@ -748,15 +748,15 @@ -webkit-line-clamp: 3; -webkit-box-orient: vertical; display: webkit-box; /* stylelint-disable-line */ - color: var(--pf-global--active-color--100); + color: var(--pf-v5-global--active-color--100); } // Log warning icon is incorrectly aligned (especially when messages wrap); // this fixes it by realigning and offsetting .cockpit-log-warning { - transform: translateY(calc((var(--pf-global--spacer--md) - 22px) / -2)); + transform: translateY(calc((var(--pf-v5-global--spacer--md) - 22px) / -2)); margin: 0; - margin-inline-end: var(--pf-global--spacer--xs); + margin-inline-end: var(--pf-v5-global--spacer--xs); align-self: baseline; } @@ -768,9 +768,9 @@ margin: 0; } - .pf-c-popover__content { + .pf-v5-c-popover__content { // Remove extra whitespace in the modal - --pf-c-popover--c-button--sibling--PaddingRight: 0; + --pf-v5-c-popover--c-button--sibling--PaddingRight: 0; } } @@ -781,7 +781,7 @@ max-block-size: 65vw; } - .pf-c-popover__content { + .pf-v5-c-popover__content { // Limit the width of the popover in desktop mode max-inline-size: max(30rem, 40vw); } @@ -797,13 +797,13 @@ max-block-size: 100%; min-block-size: 25vh; - .pf-c-popover__content { + .pf-v5-c-popover__content { // Limit the width of the popover in desktop mode max-inline-size: max(100vw); } // As a sheet at the bottom, it doesn't point to anything - .pf-c-popover__arrow { + .pf-v5-c-popover__arrow { display: none; } } diff -Nru cockpit-292/pkg/networkmanager/bond.jsx cockpit-294.1/pkg/networkmanager/bond.jsx --- cockpit-292/pkg/networkmanager/bond.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/networkmanager/bond.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -191,18 +191,18 @@ - + setLinkMonitoringInterval(value)} /> {linkMonitoring == 'mii' && <> - + setLinkUpDelay(value)} /> - + setLinkDownDelay(value)} /> } {linkMonitoring == 'arp' && - + setMonitoringTargets(value)} /> } diff -Nru cockpit-292/pkg/networkmanager/bridge.jsx cockpit-294.1/pkg/networkmanager/bridge.jsx --- cockpit-292/pkg/networkmanager/bridge.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/networkmanager/bridge.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -104,16 +104,16 @@ setStp(s)} label={_("Spanning tree protocol (STP)")} /> {stp && <> - + setPriority(value)} /> - + setForwardDelay(value)} /> - + setHelloTime(value)} /> - + setMaxAge(value)} /> } diff -Nru cockpit-292/pkg/networkmanager/bridgeport.jsx cockpit-294.1/pkg/networkmanager/bridgeport.jsx --- cockpit-292/pkg/networkmanager/bridgeport.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/networkmanager/bridgeport.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -78,10 +78,10 @@ title={_("Bridge port settings")} > - + setPriority(value)} /> - + setPathCost(value)} /> setHairPin(hp)} label={_("Hair pin mode")} /> diff -Nru cockpit-292/pkg/networkmanager/dialogs-common.jsx cockpit-294.1/pkg/networkmanager/dialogs-common.jsx --- cockpit-292/pkg/networkmanager/dialogs-common.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/networkmanager/dialogs-common.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -136,7 +136,7 @@ export const Name = ({ idPrefix, iface, setIface }) => { return ( - + setIface(value)} /> ); }; diff -Nru cockpit-292/pkg/networkmanager/firewall.html cockpit-294.1/pkg/networkmanager/firewall.html --- cockpit-292/pkg/networkmanager/firewall.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/networkmanager/firewall.html 2023-06-15 11:09:27.000000000 +0000 @@ -19,10 +19,10 @@ --> - Firewall - + Firewall + - + @@ -30,7 +30,7 @@ - +
      diff -Nru cockpit-292/pkg/networkmanager/firewall.jsx cockpit-294.1/pkg/networkmanager/firewall.jsx --- cockpit-292/pkg/networkmanager/firewall.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/networkmanager/firewall.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -270,7 +270,7 @@ this.onValueChanged(value)} value={this.state.value} /> @@ -488,7 +488,7 @@ } } - validate(value, event) { + validate(event, value) { let error = ""; let targets = ['tcp', 'custom_tcp_ports', 'tcp_error', 'custom_tcp_value']; if (event.target.id === "udp-ports") @@ -628,7 +628,7 @@ id="add-services-dialog--services" value="services" isChecked={!this.state.custom} - onChange={this.onToggleType} + onChange={(_event, value) => this.onToggleType(value)} label={_("Services")} /> - this.setId(value)} isDisabled={!!this.props.custom_id || this.state.avail_services == null} value={this.state.custom_id} /> - this.setDescription(value)} isDisabled={this.state.avail_services == null} value={this.state.custom_description} /> @@ -892,7 +892,7 @@ label={ _("Range") } /> {this.state.ipRange === "ip-range" && ( <> - this.onChange("ipRangeValue", value)} /> + this.onChange("ipRangeValue", value)} /> {_("IP address with routing prefix. Separate multiple values with a comma. Example: 192.0.2.0/24, 2001:db8::/32")} )} @@ -1054,7 +1054,7 @@ - {_("Networking")} + {_("Networking")} {_("Firewall")} diff -Nru cockpit-292/pkg/networkmanager/firewall-switch.jsx cockpit-294.1/pkg/networkmanager/firewall-switch.jsx --- cockpit-292/pkg/networkmanager/firewall-switch.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/networkmanager/firewall-switch.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -42,7 +42,7 @@ return null; } - onSwitchChanged(value) { + onSwitchChanged(_event, value) { this.setState({ pendingTarget: value }); if (value) diff -Nru cockpit-292/pkg/networkmanager/index.html cockpit-294.1/pkg/networkmanager/index.html --- cockpit-292/pkg/networkmanager/index.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/networkmanager/index.html 2023-06-15 11:09:27.000000000 +0000 @@ -21,16 +21,16 @@ Networking - - - + + + - +
      diff -Nru cockpit-292/pkg/networkmanager/interfaces.js cockpit-294.1/pkg/networkmanager/interfaces.js --- cockpit-292/pkg/networkmanager/interfaces.js 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/networkmanager/interfaces.js 2023-06-15 11:09:27.000000000 +0000 @@ -720,13 +720,25 @@ case 11: return 'vlan'; case 12: return 'adsl'; case 13: return 'bridge'; - case 14: return 'loopback'; + case 14: return 'generic'; case 15: return 'team'; case 16: return 'tun'; case 17: return 'ip_tunnel'; case 18: return 'macvlan'; case 19: return 'vxlan'; case 20: return 'veth'; + case 21: return 'macsec'; + case 22: return 'dummy'; + case 23: return 'ppp'; + case 24: return 'ovs_interface'; + case 25: return 'ovs_port'; + case 26: return 'ovs_bridge'; + case 27: return 'wpan'; + case 28: return '6lowpan'; + case 29: return 'wireguard'; + case 30: return 'wifi_p2p'; + case 31: return 'vrf'; + case 32: return 'loopback'; default: return ''; } } @@ -1620,7 +1632,7 @@ } export function is_interesting_interface(iface) { - return !iface.Device || is_managed(iface.Device); + return !iface.Device || (is_managed(iface.Device) && iface.Device.DeviceType != "loopback"); } export function member_connection_for_interface(group, iface) { diff -Nru cockpit-292/pkg/networkmanager/ip-settings.jsx cockpit-294.1/pkg/networkmanager/ip-settings.jsx --- cockpit-292/pkg/networkmanager/ip-settings.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/networkmanager/ip-settings.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -182,7 +182,7 @@ return ( - setAddresses( + setAddresses( addresses.map((item, index) => i === index ? addressIpv4Helper(value) @@ -190,7 +190,7 @@ ))} /> - setAddresses( + setAddresses( addresses.map((item, index) => i === index ? { ...item, netmask: value } @@ -198,7 +198,7 @@ ))} /> - setAddresses( + setAddresses( addresses.map((item, index) => i === index ? { ...item, gateway: value } @@ -226,7 +226,7 @@ setIgnoreAutoDns(!value)} + onChange={(_event, value) => setIgnoreAutoDns(!value)} label={_("Automatic")} /> }
      ), - props: { className: "pf-c-table__action" } + props: { className: "pf-v5-c-table__action" } }, ], props: { diff -Nru cockpit-292/pkg/networkmanager/network-main.jsx cockpit-294.1/pkg/networkmanager/network-main.jsx --- cockpit-292/pkg/networkmanager/network-main.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/networkmanager/network-main.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -61,7 +61,7 @@ } // Skip loopback - if (iface.Device && iface.Device.DeviceType == 'loopback') + if (iface.Name == "lo" || (iface.Device && iface.Device.DeviceType == 'loopback')) return; // Skip members diff -Nru cockpit-292/pkg/networkmanager/team.jsx cockpit-294.1/pkg/networkmanager/team.jsx --- cockpit-292/pkg/networkmanager/team.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/networkmanager/team.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -189,18 +189,18 @@ {linkWatch == 'ethtool' && <> - + setLinkUpDelay(value)} /> - + setLinkDownDelay(value)} /> } {linkWatch != 'ethtool' && <> - + setPingInterval(value)} /> - setPingTarget(val)} /> + setPingTarget(value)} /> } diff -Nru cockpit-292/pkg/networkmanager/teamport.jsx cockpit-294.1/pkg/networkmanager/teamport.jsx --- cockpit-292/pkg/networkmanager/teamport.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/networkmanager/teamport.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -82,7 +82,7 @@ title={_("Team port settings")} > - + setPriority(value)} /> {teamMode == 'activebackup' ? @@ -91,7 +91,7 @@ : null} {teamMode == 'lacp' ? - + setKey(value)} /> : null} diff -Nru cockpit-292/pkg/networkmanager/vlan.jsx cockpit-294.1/pkg/networkmanager/vlan.jsx --- cockpit-292/pkg/networkmanager/vlan.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/networkmanager/vlan.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -102,7 +102,7 @@ - { + { setVlanId(value); if (iface == (parent + "." + vlanId)) setIface(parent + "." + value); diff -Nru cockpit-292/pkg/packagekit/callTracer.py cockpit-294.1/pkg/packagekit/callTracer.py --- cockpit-292/pkg/packagekit/callTracer.py 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/packagekit/callTracer.py 2023-06-15 11:09:27.000000000 +0000 @@ -1,4 +1,5 @@ import json + from tracer.query import Query q = Query() diff -Nru cockpit-292/pkg/packagekit/index.html cockpit-294.1/pkg/packagekit/index.html --- cockpit-292/pkg/packagekit/index.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/packagekit/index.html 2023-06-15 11:09:27.000000000 +0000 @@ -20,17 +20,17 @@ - Software updates - + Software updates + - + - +
      diff -Nru cockpit-292/pkg/packagekit/updates.jsx cockpit-294.1/pkg/packagekit/updates.jsx --- cockpit-292/pkg/packagekit/updates.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/packagekit/updates.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -37,7 +37,7 @@ import { ExpandableSection } from "@patternfly/react-core/dist/esm/components/ExpandableSection/index.js"; import { Flex, FlexItem } from "@patternfly/react-core/dist/esm/layouts/Flex/index.js"; import { Grid, GridItem } from "@patternfly/react-core/dist/esm/layouts/Grid/index.js"; -import { LabelGroup } from "@patternfly/react-core/dist/esm/components/LabelGroup/index.js"; +import { LabelGroup } from "@patternfly/react-core/dist/esm/components/Label/index.js"; import { Page, PageSection, PageSectionVariants } from "@patternfly/react-core/dist/esm/components/Page/index.js"; import { Progress, ProgressSize } from "@patternfly/react-core/dist/esm/components/Progress/index.js"; import { Spinner } from "@patternfly/react-core/dist/esm/components/Spinner/index.js"; @@ -604,7 +604,7 @@ + className="pf-v5-u-mb-xs" /> {cancelButton} @@ -1484,7 +1484,7 @@ } /> - + {this.state.errorMessages .filter((m, index) => index == 0 || m != this.state.errorMessages[index - 1]) @@ -1500,7 +1500,7 @@ actions={this.state.applyActions} onCancel={ () => PK.call(this.state.applyTransaction, PK.transactionInterface, "Cancel", []) } rebootAfter={this.state.rebootAfterSuccess} - setRebootAfter={ enabled => this.setState({ rebootAfterSuccess: enabled }) } + setRebootAfter={ (_event, enabled) => this.setState({ rebootAfterSuccess: enabled }) } />; case "updateSuccess": { diff -Nru cockpit-292/pkg/packagekit/updates.scss cockpit-294.1/pkg/packagekit/updates.scss --- cockpit-292/pkg/packagekit/updates.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/packagekit/updates.scss 2023-06-15 11:09:27.000000000 +0000 @@ -4,23 +4,23 @@ @import "@patternfly/patternfly/utilities/Spacing/spacing.css"; /* Style the list cards as ct-cards */ -.pf-c-page__main-section .pf-c-card { +.pf-v5-c-page__main-section .pf-v5-c-card { @extend .ct-card; } -.pf-c-table tr:nth-child(1) { +.pf-v5-c-table tr:nth-child(1) { > td, th { - --pf-c-table--cell--PaddingTop: var(--pf-global--spacer--sm); - --pf-c-table--cell--PaddingBottom: var(--pf-global--spacer--sm); + --pf-v5-c-table--cell--PaddingTop: var(--pf-v5-global--spacer--sm); + --pf-v5-c-table--cell--PaddingBottom: var(--pf-v5-global--spacer--sm); - padding-block: var(--pf-c-table--cell--PaddingTop) var(--pf-c-table--cell--PaddingBottom); + padding-block: var(--pf-v5-c-table--cell--PaddingTop) var(--pf-v5-c-table--cell--PaddingBottom); - padding-inline: var(--pf-c-table--cell--PaddingLeft) var(--pf-c-table--cell--PaddingRight); + padding-inline: var(--pf-v5-c-table--cell--PaddingLeft) var(--pf-v5-c-table--cell--PaddingRight); } } -.kpatches-labelgroup ul.pf-c-label-group__list, -.kpatches-labelgroup li.pf-c-label-group__list-item:last-child, { +.kpatches-labelgroup ul.pf-v5-c-label-group__list, +.kpatches-labelgroup li.pf-v5-c-label-group__list-item:last-child, { margin-block-end: 0; } @@ -33,7 +33,7 @@ padding-inline: 0; &--actions { - > .pf-c-button, + > .pf-v5-c-button, > .btn-group { margin-block: 5px 0; margin-inline: 0 5px; @@ -52,13 +52,13 @@ } // Make header's content bold -.pf-c-table tr:nth-child(1) td:nth-child(2) { - font-weight: var(--pf-global--FontWeight--bold); +.pf-v5-c-table tr:nth-child(1) td:nth-child(2) { + font-weight: var(--pf-v5-global--FontWeight--bold); } .ct-table tr { .severity-icon { - margin-inline-end: var(--pf-global--spacer--xs); + margin-inline-end: var(--pf-v5-global--spacer--xs); } td.changelog { @@ -120,19 +120,19 @@ margin-block: 10ex 0; margin-inline: auto; - .pf-l-grid { + .pf-v5-l-grid { align-items: end; } } /* workaround font not supporting tabular numbers yet https://github.com/cockpit-project/cockpit/issues/15090 */ -.pf-c-progress__status { +.pf-v5-c-progress__status { min-inline-size: 3ch; } /* Add some space between the spinner and the text */ .progress-description > svg { - margin-inline-end: var(--pf-global--spacer--sm); + margin-inline-end: var(--pf-v5-global--spacer--sm); } .flow-list-blank-slate { @@ -208,11 +208,11 @@ .auto-update-group { // Add spacing between rows for when the flex items wrap - row-gap: var(--pf-global--spacer--sm); + row-gap: var(--pf-v5-global--spacer--sm); } -.pk-updates .pf-c-description-list + div { - padding-block-start: var(--pf-global--spacer--md); +.pk-updates .pf-v5-c-description-list + div { + padding-block-start: var(--pf-v5-global--spacer--md); } .restart-services-modal-body { @@ -220,7 +220,7 @@ padding-inline: 0; } -.pf-c-content ul { +.pf-v5-c-content ul { list-style-type: none; } @@ -246,30 +246,30 @@ } .update-success-actions > button { - margin-block: var(--pf-global--spacer--xs); - margin-inline: var(--pf-global--spacer--sm) 0; + margin-block: var(--pf-v5-global--spacer--xs); + margin-inline: var(--pf-v5-global--spacer--sm) 0; } .update-success-table-title { - padding-inline-start: var(--pf-global--spacer--sm); + padding-inline-start: var(--pf-v5-global--spacer--sm); } .cockpit-update-warning { - margin-inline-end: var(--pf-global--spacer--md); + margin-inline-end: var(--pf-v5-global--spacer--md); } .cockpit-update-warning-icon { - margin-inline-end: var(--pf-global--spacer--sm); + margin-inline-end: var(--pf-v5-global--spacer--sm); } .cockpit-update-warning-text { - color: var(--pf-global--warning-color--200); + color: var(--pf-v5-global--warning-color--200); } .autoupdates-card-error { - margin-block-end: var(--pf-global--spacer--md); + margin-block-end: var(--pf-v5-global--spacer--md); } .ct-info-circle { - color: var(--pf-global--info-color--100); + color: var(--pf-v5-global--info-color--100); } diff -Nru cockpit-292/pkg/playground/exception.html cockpit-294.1/pkg/playground/exception.html --- cockpit-292/pkg/playground/exception.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/playground/exception.html 2023-06-15 11:09:27.000000000 +0000 @@ -1,18 +1,18 @@ - + - Javascript exceptions - + + - -
      -
      -
      + +
      +
      +

      Exception

      -

      Clicking this button should make a javascript exception happen.

      +

      Clicking this button should make a javascript exception happen.

      diff -Nru cockpit-292/pkg/playground/index.html cockpit-294.1/pkg/playground/index.html --- cockpit-292/pkg/playground/index.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/playground/index.html 2023-06-15 11:09:27.000000000 +0000 @@ -1,27 +1,27 @@ - + Cockpit Development Playground - - + + - -
      -
      -
      + +
      +
      +

      Development Playground

      -
      +

      Page Status

      - - - - + + + +
      diff -Nru cockpit-292/pkg/playground/journal.html cockpit-294.1/pkg/playground/journal.html --- cockpit-292/pkg/playground/journal.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/playground/journal.html 2023-06-15 11:09:27.000000000 +0000 @@ -1,18 +1,18 @@ - + Cockpit Journal Box - - + + - -
      -
      -
      + +
      +
      +
      diff -Nru cockpit-292/pkg/playground/metrics.html cockpit-294.1/pkg/playground/metrics.html --- cockpit-292/pkg/playground/metrics.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/playground/metrics.html 2023-06-15 11:09:27.000000000 +0000 @@ -1,17 +1,17 @@ - + Cockpit Monitoring - - + + - -
      -
      -
      + +
      +
      +

      Monitoring

      diff -Nru cockpit-292/pkg/playground/notifications-receiver.html cockpit-294.1/pkg/playground/notifications-receiver.html --- cockpit-292/pkg/playground/notifications-receiver.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/playground/notifications-receiver.html 2023-06-15 11:09:27.000000000 +0000 @@ -1,14 +1,14 @@ - + Notifications Receiver - + - +

      Notifications Receiver

      / diff -Nru cockpit-292/pkg/playground/pkgs.html cockpit-294.1/pkg/playground/pkgs.html --- cockpit-292/pkg/playground/pkgs.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/playground/pkgs.html 2023-06-15 11:09:27.000000000 +0000 @@ -1,16 +1,16 @@ - + Cockpit Packages - + - -
      -
      -
      + +
      +
      +
      diff -Nru cockpit-292/pkg/playground/plot.html cockpit-294.1/pkg/playground/plot.html --- cockpit-292/pkg/playground/plot.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/playground/plot.html 2023-06-15 11:09:27.000000000 +0000 @@ -1,14 +1,14 @@ - + Cockpit Plots - - + + - +
      diff -Nru cockpit-292/pkg/playground/preloaded.html cockpit-294.1/pkg/playground/preloaded.html --- cockpit-292/pkg/playground/preloaded.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/playground/preloaded.html 2023-06-15 11:09:27.000000000 +0000 @@ -1,14 +1,14 @@ - + Preloaded Page - + - +

      Preloaded

      diff -Nru cockpit-292/pkg/playground/react-patterns.html cockpit-294.1/pkg/playground/react-patterns.html --- cockpit-292/pkg/playground/react-patterns.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/playground/react-patterns.html 2023-06-15 11:09:27.000000000 +0000 @@ -1,30 +1,30 @@ - + Cockpit React Patterns Usage - - + + - -
      -
      -
      + +
      +
      +

      Select file

      -
      +

      Dialogs

      - - + +
      -
      +

      Cards

      diff -Nru cockpit-292/pkg/playground/service.html cockpit-294.1/pkg/playground/service.html --- cockpit-292/pkg/playground/service.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/playground/service.html 2023-06-15 11:09:27.000000000 +0000 @@ -1,13 +1,13 @@ - + Cockpit Generic Service Monitor - + - + diff -Nru cockpit-292/pkg/playground/speed.html cockpit-294.1/pkg/playground/speed.html --- cockpit-292/pkg/playground/speed.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/playground/speed.html 2023-06-15 11:09:27.000000000 +0000 @@ -1,109 +1,109 @@ - + Cockpit Speed Tests - - + + - -
      -
      -
      + +
      +
      +

      Speed Tests

      Exists
      - + - + - +
        
        
        
      -

      +

      Echo Tests

      - + - + - + - + - - + +
      -
      +

      Read Test

      - + - - + +
      -
      +

      Download Test

      - + - +
      -
      +

      spawn test

      - + - - - +
      +
      
      +                            
      diff -Nru cockpit-292/pkg/playground/test.html cockpit-294.1/pkg/playground/test.html --- cockpit-292/pkg/playground/test.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/playground/test.html 2023-06-15 11:09:27.000000000 +0000 @@ -1,42 +1,42 @@ - + Cockpit playground - - + + - -
      -
      -
      - + +
      +
      +
      + - +

      - +
      - +
      - +
      - +

      - - - + + +

      diff -Nru cockpit-292/pkg/playground/test.js cockpit-294.1/pkg/playground/test.js --- cockpit-292/pkg/playground/test.js 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/playground/test.js 2023-06-15 11:09:27.000000000 +0000 @@ -7,7 +7,7 @@ document.addEventListener("DOMContentLoaded", () => { document.getElementById("hammer").addEventListener("click", e => e.target.setAttribute("hidden", "hidden")); - document.querySelector(".cockpit-internal-reauthorize .pf-c-button").addEventListener("click", () => { + document.querySelector(".cockpit-internal-reauthorize .pf-v5-c-button").addEventListener("click", () => { document.querySelector(".cockpit-internal-reauthorize span").textContent = "checking..."; cockpit.script("pkcheck --action-id org.freedesktop.policykit.exec --process $$ -u 2>&1", { superuser: "try" }) .stream(data => console.debug(data)) @@ -19,7 +19,7 @@ }); }); - document.querySelector(".super-channel .pf-c-button").addEventListener("click", () => { + document.querySelector(".super-channel .pf-v5-c-button").addEventListener("click", () => { document.querySelector(".super-channel span").textContent = "checking..."; cockpit.spawn(["id"], { superuser: true }) .then(data => { @@ -32,7 +32,7 @@ }); }); - document.querySelector(".lock-channel .pf-c-button").addEventListener("click", () => { + document.querySelector(".lock-channel .pf-v5-c-button").addEventListener("click", () => { document.querySelector(".lock-channel span").textContent = "locking..."; cockpit.spawn(["flock", "-o", "/tmp/playground-test-lock", "-c", "echo locked; sleep infinity"], { superuser: "try", err: "message" }) diff -Nru cockpit-292/pkg/playground/translate.html cockpit-294.1/pkg/playground/translate.html --- cockpit-292/pkg/playground/translate.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/playground/translate.html 2023-06-15 11:09:27.000000000 +0000 @@ -1,27 +1,27 @@ - + - + Cockpit playground - + - -
      -
      -
      + +
      +
      +

      HTML translations

      -

      For translating HTML use these forms:

      +

      For translating HTML use these forms:

      <span translate>Ready</span> - = Ready + = Ready

      <span translate translate-context="verb">Ready</span> - = Ready + = Ready

      @@ -39,18 +39,18 @@ = Cancel

      -

      Note that we do not support:

      +

      Note that we do not support:

      • Interpolation of variables.
      • Pluralization
      • The <translate> element
      -
      +

      Old Glade style

      -

      The old Glade style is not recommended:

      +

      The old Glade style is not recommended:

      <span translate="yes">Empty</span> @@ -62,7 +62,7 @@ = Empty

      -

      Note that we do not support:

      +

      Note that we do not support:

      • Interpolation of variables.
      • Translatable attributes.
      • @@ -70,7 +70,7 @@
      • The <translate> element
      -
      +

      Code Translations

      @@ -121,7 +121,7 @@ =

      -

      Note that we do not support:

      +

      Note that we do not support:

      • Extraction of single quoted strings.
      diff -Nru cockpit-292/pkg/ruff.toml cockpit-294.1/pkg/ruff.toml --- cockpit-292/pkg/ruff.toml 1970-01-01 00:00:00.000000000 +0000 +++ cockpit-294.1/pkg/ruff.toml 2023-06-15 11:09:27.000000000 +0000 @@ -0,0 +1,7 @@ +extend = "../pyproject.toml" +ignore = [ + "E501", # https://github.com/charliermarsh/ruff/issues/3206#issuecomment-1562681390 + + "EXE001", # Shebang is present but file is not executable + "F821", # Undefined name +] diff -Nru cockpit-292/pkg/selinux/index.html cockpit-294.1/pkg/selinux/index.html --- cockpit-292/pkg/selinux/index.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/selinux/index.html 2023-06-15 11:09:27.000000000 +0000 @@ -19,12 +19,12 @@ --> - + SELinux troubleshoot - - + + - + @@ -32,7 +32,7 @@ - +
      diff -Nru cockpit-292/pkg/selinux/manifest.json cockpit-294.1/pkg/selinux/manifest.json --- cockpit-292/pkg/selinux/manifest.json 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/selinux/manifest.json 2023-06-15 11:09:27.000000000 +0000 @@ -1,4 +1,7 @@ { + "conditions": [ + {"path-exists": "/sys/fs/selinux"} + ], "tools": { "index": { "label": "SELinux", diff -Nru cockpit-292/pkg/selinux/selinux.js cockpit-294.1/pkg/selinux/selinux.js --- cockpit-292/pkg/selinux/selinux.js 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/selinux/selinux.js 2023-06-15 11:09:27.000000000 +0000 @@ -65,7 +65,7 @@ dataStore.selinuxStatusError = undefined; dataStore.render(); }; - const selinuxChangeMode = function(newMode) { + const selinuxChangeMode = function(_event, newMode) { selinuxClient.setEnforcing(newMode).then( function() { dataStore.selinuxStatus.enforcing = newMode; diff -Nru cockpit-292/pkg/selinux/setroubleshoot.scss cockpit-294.1/pkg/selinux/setroubleshoot.scss --- cockpit-292/pkg/selinux/setroubleshoot.scss 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/selinux/setroubleshoot.scss 2023-06-15 11:09:27.000000000 +0000 @@ -20,7 +20,7 @@ @use "ct-card"; @use "page"; -#app .pf-c-card { +#app .pf-v5-c-card { @extend .ct-card; } @@ -37,7 +37,7 @@ } /* Table cells should collapse on mobile */ -.ct-table.pf-c-table tbody > tr > * { +.ct-table.pf-v5-c-table tbody > tr > * { word-break: break-word; } @@ -45,7 +45,7 @@ display: flex; flex-wrap: wrap; justify-content: space-between; - gap: var(--pf-global--spacer--sm) var(--pf-global--spacer--md); + gap: var(--pf-v5-global--spacer--sm) var(--pf-v5-global--spacer--md); > div:first-child { inline-size: 70%; @@ -53,15 +53,15 @@ } + hr { - margin-block-start: var(--pf-global--spacer--sm); + margin-block-start: var(--pf-v5-global--spacer--sm); } - .pf-c-expandable-section__content { + .pf-v5-c-expandable-section__content { margin-block-start: unset; } } .selinux-details textarea { - margin-block-start: var(--pf-global--spacer--xs); + margin-block-start: var(--pf-v5-global--spacer--xs); resize: none; } diff -Nru cockpit-292/pkg/selinux/setroubleshoot-view.jsx cockpit-294.1/pkg/selinux/setroubleshoot-view.jsx --- cockpit-292/pkg/selinux/setroubleshoot-view.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/selinux/setroubleshoot-view.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -361,16 +361,16 @@ ]; // if the alert has level "red", it's critical const criticalAlert = (itm.details && 'level' in itm.details && itm.details.level == "red") - ? + ? : null; const columns = [ { title: criticalAlert }, { title: itm.description } ]; if (itm.count > 1) { - columns.push({ title: {itm.count}, props: { className: "pf-c-table__action" } }); + columns.push({ title: {itm.count}, props: { className: "pf-v5-c-table__action" } }); } else { - columns.push({ title: , props: { className: "pf-c-table__action" } }); + columns.push({ title: , props: { className: "pf-v5-c-table__action" } }); } return ({ props: { key: itm.details ? itm.details.localId : index }, diff -Nru cockpit-292/pkg/shell/base_index.js cockpit-294.1/pkg/shell/base_index.js --- cockpit-292/pkg/shell/base_index.js 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/shell/base_index.js 2023-06-15 11:09:27.000000000 +0000 @@ -221,7 +221,7 @@ // The new iframe is shown before any HTML/CSS is ready and loaded, // explicitly set a dark background so we don't see any white flashes if (dark_mode && frame.contentDocument && frame.contentDocument.documentElement) { - // --pf-global--BackgroundColor--dark-300 + // --pf-v5-global--BackgroundColor--dark-300 const dark_mode_background = '#1b1d21'; frame.contentDocument.documentElement.style.background = dark_mode_background; } else { diff -Nru cockpit-292/pkg/shell/credentials.jsx cockpit-294.1/pkg/shell/credentials.jsx --- cockpit-292/pkg/shell/credentials.jsx 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/shell/credentials.jsx 2023-06-15 11:09:27.000000000 +0000 @@ -133,7 +133,7 @@ title: onToggleKey(currentKeyId, value)} />, + onChange={(_event, value) => onToggleKey(currentKeyId, value)} />, } ], expandedContent, @@ -171,7 +171,7 @@ - {newKeyPathError && + {newKeyPathError && {newKeyPathError} } @@ -260,13 +260,13 @@ } - + setOldPassword(value)} /> - + setNewPassword(value)} /> - + setConfirmPassword(value)} /> @@ -274,7 +274,7 @@ aria-label={_("Password tip")} bodyContent={_("Tip: Make your key password match your login password to automatically authenticate against other systems.")} > -
      diff -Nru cockpit-292/pkg/shell/index.html cockpit-294.1/pkg/shell/index.html --- cockpit-292/pkg/shell/index.html 2023-05-15 13:23:37.000000000 +0000 +++ cockpit-294.1/pkg/shell/index.html 2023-06-15 11:09:27.000000000 +0000 @@ -1,21 +1,21 @@ - + Cockpit - - - - + + + + - +
      - - + + -