Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cockpit for openSUSE:Factory checked in at 2022-06-18 22:05:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cockpit (Old) and /work/SRC/openSUSE:Factory/.cockpit.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cockpit" Sat Jun 18 22:05:29 2022 rev:19 rq:983416 version:271 Changes: -------- --- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2022-03-20 20:55:08.390491174 +0100 +++ /work/SRC/openSUSE:Factory/.cockpit.new.1548/cockpit.changes 2022-06-18 22:05:36.991607238 +0200 @@ -1,0 +2,14 @@ +Fri Jun 17 10:09:09 UTC 2022 - Adam Majer <[email protected]> + +- css-overrides.patch: css overrides for better theming support + +------------------------------------------------------------------- +Fri Jun 10 08:22:31 UTC 2022 - Adam Majer <[email protected]> + +- new version 271 + https://cockpit-project.org/blog/cockpit-271.html +- cockpit-redhatfont.diff: not needed, dropped +- 0001-selinux-allow-login-to-read-motd-file.patch, hide-docs.patch, + hide-pcp.patch remove-pwscore.patch: refreshed + +------------------------------------------------------------------- Old: ---- cockpit-251.3.obscpio cockpit-redhatfont.diff New: ---- cockpit-271.obscpio css-overrides.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cockpit.spec ++++++ --- /var/tmp/diff_new_pack.6gaobq/_old 2022-06-18 22:05:39.875611335 +0200 +++ /var/tmp/diff_new_pack.6gaobq/_new 2022-06-18 22:05:39.879611340 +0200 @@ -24,10 +24,6 @@ # # Check first [email protected] # -# Globals that may be defined elsewhere -# * Version 122 -# * wip 1 -# # earliest base that the subpackages work on; the instances of this get computed/updated # by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback @@ -54,7 +50,7 @@ License: LGPL-2.1-or-later URL: https://cockpit-project.org/ -Version: 251.3 +Version: 271 Release: 0 Source0: cockpit-%{version}.tar Source1: cockpit.pam @@ -63,19 +59,21 @@ Source98: package-lock.json Source97: node_modules.spec.inc %include %{_sourcedir}/node_modules.spec.inc -Patch0: cockpit-redhatfont.diff Patch1: 0001-selinux-allow-login-to-read-motd-file.patch Patch2: hide-docs.patch Patch3: suse-microos-branding.patch # SLE Micro specific patches Patch100: remove-pwscore.patch Patch101: hide-pcp.patch +Patch102: css-overrides.patch # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system}) # and cockpit-appstream (building optional packages like cockpit-{pcp}) # This split does not apply to EPEL/COPR. # In Fedora ELN/RHEL 9+ there is just one source package, which ships rpms in both BaseOS and AppStream -%if 0%{?rhel} == 8 && 0%{?epel} == 0 +# We also provide an override mechanism if you want to build all packages. +%define build_all 0 +%if 0%{?rhel} == 8 && 0%{?epel} == 0 && !%{build_all} %if "%{name}" == "cockpit" %define build_basic 1 @@ -90,11 +88,12 @@ %define build_optional 1 %endif -# Ship custom SELinux policy only in Fedora and RHEL-9 onward +# Ship custom SELinux policy (but not for cockpit-appstream) %if 0%{?rhel} >= 9 || 0%{?fedora} || 0%{?suse_version} +%if "%{name}" == "cockpit" %define selinuxtype targeted -%define with_selinux 1 -%define selinux_policy_version %(rpm --quiet -q selinux-policy && rpm -q --queryformat "%{V}-%{R}" selinux-policy || echo 1) +%define selinux_configure_arg --enable-selinux-policy=%{selinuxtype} +%endif %endif BuildRequires: gcc @@ -106,7 +105,13 @@ BuildRequires: autoconf automake BuildRequires: make BuildRequires: /usr/bin/python3 +%if 0%{?rhel} && 0%{?rhel} <= 8 +# RHEL 8's gettext does not yet have metainfo.its BuildRequires: gettext >= 0.19.7 +BuildRequires: libappstream-glib-devel +%else +BuildRequires: gettext >= 0.21 +%endif %if 0%{?build_basic} BuildRequires: libssh-devel >= 0.8.5 %endif @@ -143,11 +148,9 @@ # For documentation BuildRequires: xmlto -%if 0%{?with_selinux} BuildRequires: selinux-policy BuildRequires: selinux-policy-%{selinuxtype} BuildRequires: selinux-policy-devel -%endif # for rebuilding nodejs bits BuildRequires: npm @@ -163,7 +166,7 @@ # Optional components Recommends: (cockpit-storaged if udisks2) -Recommends: cockpit-packagekit +Recommends: (cockpit-packagekit if dnf) Suggests: cockpit-pcp %if 0%{?rhel} == 0 @@ -171,20 +174,11 @@ Suggests: cockpit-selinux %endif %if 0%{?rhel} && 0%{?centos} == 0 -Recommends: subscription-manager-cockpit +Requires: subscription-manager-cockpit %endif %prep -%setup -q -n cockpit-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - -%if 0%{?sle_version} -%patch100 -p1 -%patch101 -p1 -%endif +%autosetup -p1 -n cockpit-%{version} cp %SOURCE1 tools/cockpit.pam # @@ -196,14 +190,13 @@ exec 2>&1 PKG_NAME="Cockpit" -echo %version > .tarball +echo "m4_define(VERSION_NUMBER, %version)" > version.m4 autoreconf -fvi -I tools # %configure \ - --disable-silent-rules \ + %{?selinux_configure_arg} \ --with-cockpit-user=cockpit-ws \ --with-cockpit-ws-instance-user=cockpit-wsinstance \ - --with-selinux-config-type=etc_t \ %if 0%{?suse_version} --docdir=%_defaultdocdir/%{name} \ %endif @@ -212,27 +205,10 @@ --disable-ssh \ %endif -make -j4 %{?extra_flags} all - -%if 0%{?with_selinux} - make -f /usr/share/selinux/devel/Makefile cockpit.pp - bzip2 -9 cockpit.pp -%endif +%make_build %check -# HACK: Fedora koji builders are very slow, unreliable, and inaccessible for debugging; https://github.com/cockpit-project/cockpit/issues/13909 -%if 0%{?fedora} >= 0 -%ifarch s390x -%define testsuite_fail || true -%endif -%endif -# HACK: RHEL i686 builders hang after running all tests; not a supported architecture, so don't bother -%if 0%{?rhel} >= 8 -%ifarch i686 -%define testsuite_skip # -%endif -%endif -%{?testsuite_skip} make -j4 check || { ls -l /dev/std* ; [ -e ./test-suite.log ] && cat ./test-suite.log ; false; } %{?testsuite_fail} +make -j$(nproc) check %install # In obs we get write error: stdout @@ -243,21 +219,22 @@ rm -f %{buildroot}/%{_libdir}/cockpit/*.so install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/ -%if 0%{?with_selinux} - install -D -m 644 %{name}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 - install -D -m 644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_session_selinux.8cockpit - install -D -m 644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_ws_selinux.8cockpit - # create this directory in the build root so that %ghost sees the desired mode - install -d -m 700 %{buildroot}%{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} -%endif - # only ship deprecated PatternFly API for stable releases -%if 0%{?fedora} <= 33 || 0%{?rhel} <= 8 +%if 0%{?rhel} == 8 + if [ -f %{buildroot}/%{_datadir}/cockpit/base1/cockpit.css.gz ]; then ln -s cockpit.css.gz %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css.gz + elif [ -f %{buildroot}/%{_datadir}/cockpit/base1/cockpit.css ]; then + ln -s cockpit.css %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css + else + echo >&2 Neither cockpit.css.gz nor cockpit.css exists. + exit 1 + fi %endif # Build the package lists for resource packages -echo '%dir %{_datadir}/cockpit/base1' > base.list +# cockpit-bridge is the basic dependency for all cockpit-* packages, so centrally own the page directory +echo '%dir %{_datadir}/cockpit' > base.list +echo '%dir %{_datadir}/cockpit/base1' >> base.list echo '%dir %{_datadir}/cockpit/base1/fonts' >> base.list find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list echo '%{_sysconfdir}/cockpit/machines.d' >> base.list @@ -266,10 +243,10 @@ find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list echo '%{_libexecdir}/cockpit-ssh' >> base.list -echo '%dir %{_datadir}/cockpit/pcp' >> pcp.list +echo '%dir %{_datadir}/cockpit/pcp' > pcp.list find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list -echo '%dir %{_datadir}/cockpit/tuned' >> system.list +echo '%dir %{_datadir}/cockpit/tuned' > system.list find %{buildroot}%{_datadir}/cockpit/tuned -type f >> system.list echo '%dir %{_datadir}/cockpit/shell' >> system.list @@ -284,7 +261,7 @@ echo '%dir %{_datadir}/cockpit/metrics' >> system.list find %{buildroot}%{_datadir}/cockpit/metrics -type f >> system.list -echo '%dir %{_datadir}/cockpit/kdump' >> kdump.list +echo '%dir %{_datadir}/cockpit/kdump' > kdump.list find %{buildroot}%{_datadir}/cockpit/kdump -type f >> kdump.list echo '%dir %{_datadir}/cockpit/sosreport' > sosreport.list @@ -296,7 +273,7 @@ echo '%dir %{_datadir}/cockpit/networkmanager' > networkmanager.list find %{buildroot}%{_datadir}/cockpit/networkmanager -type f >> networkmanager.list -echo '%dir %{_datadir}/cockpit/packagekit' >> packagekit.list +echo '%dir %{_datadir}/cockpit/packagekit' > packagekit.list find %{buildroot}%{_datadir}/cockpit/packagekit -type f >> packagekit.list echo '%dir %{_datadir}/cockpit/apps' >> packagekit.list @@ -318,17 +295,17 @@ rm -r %{buildroot}/%{_datadir}/cockpit/$pkg rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml done -for data in doc locale man pixmaps polkit-1; do +for data in doc man pixmaps polkit-1; do rm -r %{buildroot}/%{_datadir}/$data done for lib in systemd tmpfiles.d; do rm -r %{buildroot}/%{_prefix}/%{__lib}/$lib done -for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do +for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-client cockpit-client.ui cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do rm %{buildroot}/%{_libexecdir}/$libexec done rm -r %{buildroot}/%{_libdir}/security %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d -rm %{buildroot}/usr/bin/cockpit-bridge %{buildroot}/usr/sbin/remotectl +rm %{buildroot}/usr/bin/cockpit-bridge rm -f %{buildroot}%{_libexecdir}/cockpit-ssh rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml %endif @@ -385,10 +362,6 @@ mkdir -p %{buildroot}%{_datadir}/cockpit/devel cp -a pkg/lib %{buildroot}%{_datadir}/cockpit/devel -%if 0%{?build_basic} -%find_lang cockpit -%endif - # ------------------------------------------------------------------------------- # Basic Sub-packages @@ -405,7 +378,6 @@ %{_docdir}/cockpit/AUTHORS %{_docdir}/cockpit/COPYING %{_docdir}/cockpit/README.md -%dir %{_datadir}/cockpit %{_datadir}/metainfo/cockpit.appdata.xml %{_datadir}/pixmaps/cockpit.png %doc %{_mandir}/man1/cockpit.1.gz @@ -467,26 +439,22 @@ Provides: cockpit-users = %{version}-%{release} Obsoletes: cockpit-dashboard < %{version}-%{release} %if 0%{?rhel} -Provides: cockpit-networkmanager = %{version}-%{release} Requires: NetworkManager >= 1.6 -Provides: cockpit-kdump = %{version}-%{release} Requires: kexec-tools -Recommends: (sudo or polkit) +Requires: sos +Requires: sudo Recommends: PackageKit -Recommends: NetworkManager-team Recommends: setroubleshoot-server >= 3.3.3 +Suggests: NetworkManager-team +Provides: cockpit-kdump = %{version}-%{release} +Provides: cockpit-networkmanager = %{version}-%{release} Provides: cockpit-selinux = %{version}-%{release} Provides: cockpit-sosreport = %{version}-%{release} -Requires: sos %endif -%if 0%{?fedora} >= 29 -# 0.7.0 (actually) supports task cancellation. -# 0.7.1 fixes tasks never announcing completion. -Recommends: (reportd >= 0.7.1 if abrt) +%if 0%{?fedora} +Recommends: (reportd if abrt) %endif # NPM modules which are also available as packages -Provides: bundled(js-jquery) = 3.5.1 -Provides: bundled(xstatic-bootstrap-datepicker-common) = 1.9.0 Provides: bundled(xstatic-patternfly-common) = 3.59.5 %description system @@ -500,10 +468,8 @@ Requires: glib-networking Requires: openssl Requires: glib2 >= 2.50.0 -%if 0%{?with_selinux} -Requires: (selinux-policy >= %{selinux_policy_version} if selinux-policy-%{selinuxtype}) +Requires: (selinux-policy >= %{_selinux_policy_version} if selinux-policy-%{selinuxtype}) Requires(post): (policycoreutils if selinux-policy-%{selinuxtype}) -%endif Conflicts: firewalld < 0.6.0-1 Recommends: sscg >= 2.3 Recommends: system-logos @@ -513,6 +479,11 @@ Requires: distribution-logos Requires: wallpaper-branding %endif +# for cockpit-desktop +Suggests: python3 + +# prevent hard python3 dependency for cockpit-desktop, it falls back to other browsers +%global __requires_exclude_from ^%{_libexecdir}/cockpit-client$ %description ws The Cockpit Web Service listens on the network, and authenticates users. @@ -520,12 +491,11 @@ If sssd-dbus is installed, you can enable client certificate/smart card authentication via sssd/FreeIPA. -%files ws -f cockpit.lang -f static.list +%files ws -f static.list %doc %{_mandir}/man1/cockpit-desktop.1.gz %doc %{_mandir}/man5/cockpit.conf.5.gz %doc %{_mandir}/man8/cockpit-ws.8.gz %doc %{_mandir}/man8/cockpit-tls.8.gz -%doc %{_mandir}/man8/remotectl.8.gz %doc %{_mandir}/man8/pam_ssh_add.8.gz %dir %{_sysconfdir}/cockpit %config(noreplace) %{_sysconfdir}/cockpit/ws-certs.d @@ -545,32 +515,28 @@ %{_unitdir}/cockpit.socket %{_unitdir}/cockpit-wsinstance-http.socket %{_unitdir}/cockpit-wsinstance-http.service -%{_unitdir}/cockpit-wsinstance-http-redirect.socket -%{_unitdir}/cockpit-wsinstance-http-redirect.service %{_unitdir}/cockpit-wsinstance-https-factory.socket %{_unitdir}/[email protected] %{_unitdir}/[email protected] %{_unitdir}/[email protected] %{_unitdir}/system-cockpithttps.slice %{_prefix}/%{__lib}/tmpfiles.d/cockpit-tempfiles.conf -%{_sbindir}/remotectl %{pamdir}/pam_ssh_add.so %{pamdir}/pam_cockpit_cert.so %{_libexecdir}/cockpit-ws %{_libexecdir}/cockpit-wsinstance-factory %{_libexecdir}/cockpit-tls +%{_libexecdir}/cockpit-client +%{_libexecdir}/cockpit-client.ui %{_libexecdir}/cockpit-desktop %{_libexecdir}/cockpit-certificate-ensure %{_libexecdir}/cockpit-certificate-helper %{?suse_version:%verify(not mode) }%attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session %{_datadir}/cockpit/branding - -%if 0%{?with_selinux} - %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 - %{_mandir}/man8/%{name}_session_selinux.8cockpit.* - %{_mandir}/man8/%{name}_ws_selinux.8cockpit.* - %ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} -%endif +%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 +%{_mandir}/man8/%{name}_session_selinux.8cockpit.* +%{_mandir}/man8/%{name}_ws_selinux.8cockpit.* +%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} %pre ws getent group cockpit-ws >/dev/null || groupadd -r cockpit-ws @@ -578,25 +544,21 @@ getent group cockpit-wsinstance >/dev/null || groupadd -r cockpit-wsinstance getent passwd cockpit-wsinstance >/dev/null || useradd -r -g cockpit-wsinstance -d /nonexisting -s /sbin/nologin -c "User for cockpit-ws instances" cockpit-wsinstance -%if 0%{?with_selinux} if %{_sbindir}/selinuxenabled 2>/dev/null; then %selinux_relabel_pre -s %{selinuxtype} fi -%endif %post ws -%if 0%{?with_selinux} -if %{_sbindir}/selinuxenabled 2>/dev/null; then +if [ -x %{_sbindir}/selinuxenabled ]; then %selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 %selinux_relabel_post -s %{selinuxtype} fi -%endif # set up dynamic motd/issue symlinks on first-time install; don't bring them back on upgrades if admin removed them if [ "$1" = 1 ]; then mkdir -p /etc/motd.d /etc/issue.d - ln -s /run/cockpit/motd /etc/motd.d/cockpit - ln -s /run/cockpit/motd /etc/issue.d/cockpit.issue + ln -s ../../run/cockpit/motd /etc/motd.d/cockpit + ln -s ../../run/cockpit/motd /etc/issue.d/cockpit.issue fi # switch old self-signed cert group from cockpit-wsintance to cockpit-ws on upgrade if [ "$1" = 2 ]; then @@ -624,12 +586,10 @@ %systemd_preun cockpit.socket cockpit.service %postun ws -%if 0%{?with_selinux} -if %{_sbindir}/selinuxenabled 2>/dev/null; then +if [ -x %{_sbindir}/selinuxenabled ]; then %selinux_modules_uninstall -s %{selinuxtype} %{name} %selinux_relabel_post -s %{selinuxtype} fi -%endif %systemd_postun_with_restart cockpit.socket cockpit.service %if 0%{?suse_version} @@ -644,8 +604,8 @@ %package kdump Summary: Cockpit user interface for kernel crash dumping -Requires: cockpit-bridge >= 122 -Requires: cockpit-shell >= 122 +Requires: cockpit-bridge >= 130 +Requires: cockpit-shell >= 130 Requires: kexec-tools BuildArch: noarch @@ -723,10 +683,10 @@ %package -n cockpit-storaged Summary: Cockpit user interface for storage, using udisks -Requires: cockpit-shell >= 186 -Requires: udisks2 >= 2.6 -Recommends: udisks2-lvm2 >= 2.6 -Recommends: udisks2-iscsi >= 2.6 +Requires: cockpit-shell >= 266 +Requires: udisks2 >= 2.9 +Recommends: udisks2-lvm2 >= 2.9 +Recommends: udisks2-iscsi >= 2.9 Recommends: device-mapper-multipath Recommends: clevis-luks Requires: %{__python3} ++++++ 0001-selinux-allow-login-to-read-motd-file.patch ++++++ --- /var/tmp/diff_new_pack.6gaobq/_old 2022-06-18 22:05:39.903611375 +0200 +++ /var/tmp/diff_new_pack.6gaobq/_new 2022-06-18 22:05:39.907611380 +0200 @@ -4,13 +4,13 @@ selinux: allow login to read motd file -diff --git a/selinux/cockpit.te b/selinux/cockpit.te -index 73242aaa1..72db3c1dc 100644 ---- a/selinux/cockpit.te -+++ b/selinux/cockpit.te -@@ -181,3 +181,11 @@ optional_policy(` - optional_policy(` - unconfined_domtrans(cockpit_session_t) +Index: cockpit/selinux/cockpit.te +=================================================================== +--- cockpit.orig/selinux/cockpit.te ++++ cockpit/selinux/cockpit.te +@@ -191,3 +191,11 @@ optional_policy(` + ') + cockpit_read_pid_files(local_login_t) ') + +# login may read motd file through pam ++++++ README.packaging ++++++ --- /var/tmp/diff_new_pack.6gaobq/_old 2022-06-18 22:05:39.935611420 +0200 +++ /var/tmp/diff_new_pack.6gaobq/_new 2022-06-18 22:05:39.943611431 +0200 @@ -37,5 +37,9 @@ if you have any changes that should go upstream, create a new, clean branch and cherry pick *one* commit into it. Upstream wants pull -requests with only one commit +requests with only one commit + +NOTE: ONLY the .spec file should be in the git. + +IDEA: maybe other things should be removed from the git tree then? ++++++ _service ++++++ --- /var/tmp/diff_new_pack.6gaobq/_old 2022-06-18 22:05:39.971611471 +0200 +++ /var/tmp/diff_new_pack.6gaobq/_new 2022-06-18 22:05:39.975611477 +0200 @@ -3,7 +3,7 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="url">http://github.com/cockpit-project/cockpit.git</param> <param name="scm">git</param> - <param name="revision">251.3</param> + <param name="revision">271</param> <param name="submodules">disable</param> </service> <service name="node_modules" mode="manual"> ++++++ cockpit-251.3.obscpio -> cockpit-271.obscpio ++++++ /work/SRC/openSUSE:Factory/cockpit/cockpit-251.3.obscpio /work/SRC/openSUSE:Factory/.cockpit.new.1548/cockpit-271.obscpio differ: char 28, line 1 ++++++ cockpit.obsinfo ++++++ --- /var/tmp/diff_new_pack.6gaobq/_old 2022-06-18 22:05:40.031611556 +0200 +++ /var/tmp/diff_new_pack.6gaobq/_new 2022-06-18 22:05:40.031611556 +0200 @@ -1,6 +1,5 @@ name: cockpit -version: 251.3 -mtime: 1638884630 -commit: 673b84201719fcb02adb8a0688400b93d58f608a - +version: 271 +mtime: 1654679280 +commit: d2d8bc30bc5279b2acc3628616cfb9c4e18c7edd ++++++ css-overrides.patch ++++++ >From 617d236f005538be4a53b4a4cb88aac0ad6bf14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= <[email protected]> Date: Mon, 13 Jun 2022 20:05:21 +0100 Subject: [PATCH] Load custom CSS In order to override Cockpit's default styling, another CSS file is loaded in every HTML page. It works, but as a workaround already discussed with upstream [1]. We will revert this patch when Cockpit provides better technique [2]. For now, it fulfills the requirements of [3]. [1] https://github.com/cockpit-project/cockpit/pull/17437 [2] https://github.com/cockpit-project/cockpit/issues/16359 [3] https://en.opensuse.org/openSUSE:ALP/Workgroups/SysMngmnt --- pkg/apps/index.html | 1 + pkg/kdump/index.html | 1 + pkg/metrics/index.html | 1 + pkg/networkmanager/firewall.html | 1 + pkg/networkmanager/index.html | 1 + pkg/packagekit/index.html | 1 + pkg/playground/index.html | 1 + pkg/playground/journal.html | 1 + pkg/playground/metrics.html | 1 + pkg/playground/plot.html | 1 + pkg/playground/react-patterns.html | 1 + pkg/playground/speed.html | 1 + pkg/playground/test.html | 1 + pkg/selinux/setroubleshoot.html | 1 + pkg/shell/index.html | 1 + pkg/shell/shell.html | 1 + pkg/sosreport/index.html | 1 + pkg/storaged/index.html | 1 + pkg/systemd/hwinfo.html | 1 + pkg/systemd/index.html | 1 + pkg/systemd/logs.html | 1 + pkg/systemd/services.html | 1 + pkg/systemd/terminal.html | 1 + pkg/users/index.html | 1 + src/branding/default/css-overrides.css | 12 ++++++++++++ 25 files changed, 36 insertions(+) create mode 100644 src/branding/default/css-overrides.css diff --git a/pkg/apps/index.html b/pkg/apps/index.html index 176f2eb01..b77cfd6d9 100644 --- a/pkg/apps/index.html +++ b/pkg/apps/index.html @@ -23,6 +23,7 @@ along with Cockpit; If not, see <http://www.gnu.org/licenses/>. <title translate="yes">Applications</title> <meta charset="utf-8"> <link href="apps.css" type="text/css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script type="text/javascript" src="../base1/cockpit.js"></script> <script type="text/javascript" src="../base1/po.js"></script> <script type="text/javascript" src="po.js"></script> diff --git a/pkg/kdump/index.html b/pkg/kdump/index.html index 6c5228ccb..87ca05d74 100644 --- a/pkg/kdump/index.html +++ b/pkg/kdump/index.html @@ -25,6 +25,7 @@ along with Cockpit; If not, see <http://www.gnu.org/licenses/>. <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="stylesheet" href="kdump.css"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script type="text/javascript" src="kdump.js"></script> <script type="text/javascript" src="../base/po.js"></script> diff --git a/pkg/metrics/index.html b/pkg/metrics/index.html index a62d780b5..9d5d104a5 100644 --- a/pkg/metrics/index.html +++ b/pkg/metrics/index.html @@ -23,6 +23,7 @@ along with this package; If not, see <http://www.gnu.org/licenses/>. <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="stylesheet" href="index.css"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script type="text/javascript" src="../base1/cockpit.js"></script> <script type="text/javascript" src="../manifests.js"></script> diff --git a/pkg/networkmanager/firewall.html b/pkg/networkmanager/firewall.html index 016650651..da60cb121 100644 --- a/pkg/networkmanager/firewall.html +++ b/pkg/networkmanager/firewall.html @@ -23,6 +23,7 @@ along with Cockpit; If not, see <http://www.gnu.org/licenses/>. <meta charset="utf-8"> <link href="firewall.css" type="text/css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script src="../base1/cockpit.js"></script> <script src="../base1/po.js"></script> diff --git a/pkg/networkmanager/index.html b/pkg/networkmanager/index.html index ada48b1f1..e44e7cdd1 100644 --- a/pkg/networkmanager/index.html +++ b/pkg/networkmanager/index.html @@ -24,6 +24,7 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link href="network.css" type="text/css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script src="../base1/cockpit.js"></script> <script src="../manifests.js"></script> <script src="../base1/po.js"></script> diff --git a/pkg/packagekit/index.html b/pkg/packagekit/index.html index 9489fe9c4..eafa63726 100644 --- a/pkg/packagekit/index.html +++ b/pkg/packagekit/index.html @@ -24,6 +24,7 @@ along with Cockpit; If not, see <http://www.gnu.org/licenses/>. <meta charset="utf-8"> <link href="updates.css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script src="../base1/cockpit.js"></script> <script src="../base1/po.js"></script> diff --git a/pkg/playground/index.html b/pkg/playground/index.html index bfa507064..f8419f572 100644 --- a/pkg/playground/index.html +++ b/pkg/playground/index.html @@ -5,6 +5,7 @@ <title>Cockpit Development Playground</title> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link href="index.css" type="text/css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script src="../base1/cockpit.js"></script> <script src="../manifests.js"></script> <script src="index.js"></script> diff --git a/pkg/playground/journal.html b/pkg/playground/journal.html index df2743a75..61ce3cd46 100644 --- a/pkg/playground/journal.html +++ b/pkg/playground/journal.html @@ -5,6 +5,7 @@ <title>Cockpit Journal Box</title> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link href="journal.css" type="text/css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script src="../base1/cockpit.js"></script> <script src="journal.js"></script> </head> diff --git a/pkg/playground/metrics.html b/pkg/playground/metrics.html index c16c619c4..7987d0cf5 100644 --- a/pkg/playground/metrics.html +++ b/pkg/playground/metrics.html @@ -5,6 +5,7 @@ <title>Cockpit Monitoring</title> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link href="metrics.css" type="text/css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script src="../base1/cockpit.js"></script> <script src="metrics.js"></script> </head> diff --git a/pkg/playground/plot.html b/pkg/playground/plot.html index f451bef1a..06dad225d 100644 --- a/pkg/playground/plot.html +++ b/pkg/playground/plot.html @@ -5,6 +5,7 @@ <title>Cockpit Plots</title> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link href="plot.css" type="text/css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script src="../base1/cockpit.js"></script> <script src="plot.js"></script> </head> diff --git a/pkg/playground/react-patterns.html b/pkg/playground/react-patterns.html index 0bf888664..3db9e08a2 100644 --- a/pkg/playground/react-patterns.html +++ b/pkg/playground/react-patterns.html @@ -5,6 +5,7 @@ <title>Cockpit React Patterns Usage</title> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link href="react-patterns.css" type="text/css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script src="../base1/cockpit.js"></script> <script src="react-patterns.js"></script> </head> diff --git a/pkg/playground/speed.html b/pkg/playground/speed.html index 86a8cd7a6..0920be9dc 100644 --- a/pkg/playground/speed.html +++ b/pkg/playground/speed.html @@ -5,6 +5,7 @@ <title>Cockpit Speed Tests</title> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link href="speed.css" type="text/css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script src="../base1/cockpit.js"></script> <script src="speed.js"></script> </head> diff --git a/pkg/playground/test.html b/pkg/playground/test.html index 61220e5df..34cd6d738 100644 --- a/pkg/playground/test.html +++ b/pkg/playground/test.html @@ -5,6 +5,7 @@ <title>Cockpit playground</title> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link href="test.css" type="text/css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script src="../base1/cockpit.js"></script> <script src="test.js"></script> </head> diff --git a/pkg/selinux/setroubleshoot.html b/pkg/selinux/setroubleshoot.html index d412acf4a..981dc30bc 100644 --- a/pkg/selinux/setroubleshoot.html +++ b/pkg/selinux/setroubleshoot.html @@ -25,6 +25,7 @@ along with Cockpit; If not, see <http://www.gnu.org/licenses/>. <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="stylesheet" href="selinux.css"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script type="text/javascript" src="../base1/cockpit.js"></script> <script type="text/javascript" src="../base1/po.js"></script> diff --git a/pkg/shell/index.html b/pkg/shell/index.html index 4e7204f48..6c85e2faf 100644 --- a/pkg/shell/index.html +++ b/pkg/shell/index.html @@ -6,6 +6,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link href="index.css" rel="stylesheet"> <link href="../../static/branding.css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script src="../base1/cockpit.js"></script> <script src="../manifests.js"></script> <script src="../*/po.js"></script> diff --git a/pkg/shell/shell.html b/pkg/shell/shell.html index 5c7bcd121..edc8edd99 100644 --- a/pkg/shell/shell.html +++ b/pkg/shell/shell.html @@ -5,6 +5,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link rel="stylesheet" href="index.css"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> </head> <body class="pf-m-redhat-font"> <div class="curtains-ct"> diff --git a/pkg/sosreport/index.html b/pkg/sosreport/index.html index 37c26f81d..7273c108e 100644 --- a/pkg/sosreport/index.html +++ b/pkg/sosreport/index.html @@ -22,6 +22,7 @@ along with Cockpit; If not, see <http://www.gnu.org/licenses/>. <title translate="yes">Diagnostic reports</title> <meta charset="utf-8"> <link href="sosreport.css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script type="text/javascript" src="../base1/cockpit.js"></script> <script type="text/javascript" src="../base1/po.js"></script> <script type="text/javascript" src="po.js"></script> diff --git a/pkg/storaged/index.html b/pkg/storaged/index.html index d56fcb7b5..36953f0d9 100644 --- a/pkg/storaged/index.html +++ b/pkg/storaged/index.html @@ -24,6 +24,7 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link href="storage.css" type="text/css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script src="../base1/cockpit.js"></script> <script src="../base1/po.js"></script> <script src="../manifests.js"></script> diff --git a/pkg/systemd/hwinfo.html b/pkg/systemd/hwinfo.html index ef0fa560d..fb649d358 100644 --- a/pkg/systemd/hwinfo.html +++ b/pkg/systemd/hwinfo.html @@ -4,6 +4,7 @@ <title translate="yes">Hardware information</title> <meta charset="utf-8"> <link href="hwinfo.css" type="text/css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script src="../base1/cockpit.js"></script> <script src="../base1/po.js"></script> <script src="po.js"></script> diff --git a/pkg/systemd/index.html b/pkg/systemd/index.html index bea228152..f4a6983bd 100644 --- a/pkg/systemd/index.html +++ b/pkg/systemd/index.html @@ -7,6 +7,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="stylesheet" href="overview.css"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script type="text/javascript" src="../base1/cockpit.js"></script> <script type="text/javascript" src="../base1/po.js"></script> diff --git a/pkg/systemd/logs.html b/pkg/systemd/logs.html index 1475a96ec..7cd64312b 100644 --- a/pkg/systemd/logs.html +++ b/pkg/systemd/logs.html @@ -23,6 +23,7 @@ along with Cockpit; If not, see <http://www.gnu.org/licenses/>. <title translate>Journal</title> <meta charset="utf-8"> <link href="logs.css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script type="text/javascript" src="../base1/cockpit.js"></script> <script src="../base1/po.js"></script> <script src="po.js"></script> diff --git a/pkg/systemd/services.html b/pkg/systemd/services.html index 038680dcd..c665da6cf 100644 --- a/pkg/systemd/services.html +++ b/pkg/systemd/services.html @@ -5,6 +5,7 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link href="services.css" type="text/css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script src="../base1/cockpit.js"></script> <script src="../base1/po.js"></script> <script src="services.js"></script> diff --git a/pkg/systemd/terminal.html b/pkg/systemd/terminal.html index 536ae4eed..ff5a592d6 100644 --- a/pkg/systemd/terminal.html +++ b/pkg/systemd/terminal.html @@ -5,6 +5,7 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link href="terminal.css" type="text/css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script src="../base1/cockpit.js"></script> <script src="../base1/po.js"></script> <script src="po.js"></script> diff --git a/pkg/users/index.html b/pkg/users/index.html index 6b945a3a9..7060e88fd 100644 --- a/pkg/users/index.html +++ b/pkg/users/index.html @@ -24,6 +24,7 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link href="users.css" type="text/css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> <script src="../base1/cockpit.js"></script> <script src="../base1/po.js"></script> <script src="po.js"></script> diff --git a/pkg/static/css-overrides.css b/pkg/static/css-overrides.css new file mode 100644 index 000000000..f489352af --- /dev/null +++ b/pkg/static/css-overrides.css @@ -0,0 +1,12 @@ +/** + * PLEASE, DO NOT CHANGE THIS FILE. + * + * It is here to avoid 404 errors on openSUSE Cockpit patched version when no + * package for overriding the default style is installed. If a better + * alternative becomes available, it will be removed. + * + * To know more, please follow below links + * + * - https://github.com/cockpit-project/cockpit/pull/17437 + * - https://github.com/cockpit-project/cockpit/issues/16359 + */ -- 2.36.1 ++++++ hide-docs.patch ++++++ --- /var/tmp/diff_new_pack.6gaobq/_old 2022-06-18 22:05:40.059611597 +0200 +++ /var/tmp/diff_new_pack.6gaobq/_new 2022-06-18 22:05:40.063611602 +0200 @@ -13,10 +13,10 @@ pkg/users/manifest.json | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) -diff --git a/pkg/kdump/manifest.json b/pkg/kdump/manifest.json -index 01e5320e83f..116eb96dbdc 100644 ---- a/pkg/kdump/manifest.json -+++ b/pkg/kdump/manifest.json +Index: cockpit/pkg/kdump/manifest.json +=================================================================== +--- cockpit.orig/pkg/kdump/manifest.json ++++ cockpit/pkg/kdump/manifest.json @@ -6,7 +6,7 @@ "tools": { "index": { @@ -26,10 +26,10 @@ { "label": "Configuring kdump", "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-kdump-in-the-web-console_system-management-using-the-rhel-8-web-console"; -diff --git a/pkg/networkmanager/manifest.json b/pkg/networkmanager/manifest.json -index 3e295e9f186..8c7eef6e3b8 100644 ---- a/pkg/networkmanager/manifest.json -+++ b/pkg/networkmanager/manifest.json +Index: cockpit/pkg/networkmanager/manifest.json +=================================================================== +--- cockpit.orig/pkg/networkmanager/manifest.json ++++ cockpit/pkg/networkmanager/manifest.json @@ -8,7 +8,7 @@ "index": { "label": "Networking", @@ -39,10 +39,10 @@ { "label": "Managing networking bonds", "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-network-bonds-using-the-web-console_system-management-using-the-rhel-8-web-console"; -diff --git a/pkg/packagekit/manifest.json b/pkg/packagekit/manifest.json -index e538b4d7044..2204ae26198 100644 ---- a/pkg/packagekit/manifest.json -+++ b/pkg/packagekit/manifest.json +Index: cockpit/pkg/packagekit/manifest.json +=================================================================== +--- cockpit.orig/pkg/packagekit/manifest.json ++++ cockpit/pkg/packagekit/manifest.json @@ -8,7 +8,7 @@ "tools": { "index": { @@ -52,23 +52,10 @@ { "label": "Managing software updates", "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-software-updates-in-the-web-console_system-management-using-the-rhel-8-web-console"; -diff --git a/pkg/shell/indexes.js b/pkg/shell/indexes.js -index adc3c165533..19d912e9bd2 100644 ---- a/pkg/shell/indexes.js -+++ b/pkg/shell/indexes.js -@@ -413,7 +413,7 @@ function MachinesIndex(index_options, machines, loader, mdialogs) { - if (os_release.DOCUMENTATION_URL) - create_item(cockpit.format(_("$0 documentation"), os_release.NAME), os_release.DOCUMENTATION_URL); - -- create_item(_("Web Console"), "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/index";); -+ // create_item(_("Web Console"), "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/index";); - - docs.forEach(e => create_item(_(e.label), e.url)); - -diff --git a/pkg/storaged/manifest.json b/pkg/storaged/manifest.json -index a554051798d..ef3c205222a 100644 ---- a/pkg/storaged/manifest.json -+++ b/pkg/storaged/manifest.json +Index: cockpit/pkg/storaged/manifest.json +=================================================================== +--- cockpit.orig/pkg/storaged/manifest.json ++++ cockpit/pkg/storaged/manifest.json @@ -8,7 +8,7 @@ "index": { "label": "Storage", @@ -78,10 +65,10 @@ { "label": "Managing partitions", "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-partitions-using-the-web-console_system-management-using-the-rhel-8-web-console"; -diff --git a/pkg/systemd/manifest.json b/pkg/systemd/manifest.json -index 0c768360e79..a6e8a9cc17f 100644 ---- a/pkg/systemd/manifest.json -+++ b/pkg/systemd/manifest.json +Index: cockpit/pkg/systemd/manifest.json +=================================================================== +--- cockpit.orig/pkg/systemd/manifest.json ++++ cockpit/pkg/systemd/manifest.json @@ -9,7 +9,7 @@ "index": { "label": "Overview", @@ -109,10 +96,10 @@ { "label": "Reviewing logs", "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/reviewing-logs_system-management-using-the-rhel-8-web-console"; -diff --git a/pkg/users/manifest.json b/pkg/users/manifest.json -index bfb5336770a..ccc408dec19 100644 ---- a/pkg/users/manifest.json -+++ b/pkg/users/manifest.json +Index: cockpit/pkg/users/manifest.json +=================================================================== +--- cockpit.orig/pkg/users/manifest.json ++++ cockpit/pkg/users/manifest.json @@ -7,7 +7,7 @@ "index": { "label": "Accounts", @@ -122,4 +109,21 @@ { "label": "Managing user accounts", "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-user-accounts-in-the-web-console_system-management-using-the-rhel-8-web-console"; +Index: cockpit/pkg/shell/topnav.jsx +=================================================================== +--- cockpit.orig/pkg/shell/topnav.jsx ++++ cockpit/pkg/shell/topnav.jsx +@@ -121,9 +121,9 @@ export class TopNav extends React.Compon + {cockpit.format(_("$0 documentation"), this.state.osRelease.NAME)} + </DropdownItem>); + +- docItems.push(<DropdownItem key="cockpit-doc" href="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/index"; target="blank" rel="noopener noreferrer" icon={<ExternalLinkAltIcon />}> +- {_("Web Console")} +- </DropdownItem>); ++ // docItems.push(<DropdownItem key="cockpit-doc" href="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/index"; target="blank" rel="noopener noreferrer" icon={<ExternalLinkAltIcon />}> ++ // {_("Web Console")} ++ // </DropdownItem>); + + if (docs.length > 0) + docItems.push(<DropdownSeparator key="separator" />); ++++++ hide-pcp.patch ++++++ --- /var/tmp/diff_new_pack.6gaobq/_old 2022-06-18 22:05:40.071611613 +0200 +++ /var/tmp/diff_new_pack.6gaobq/_new 2022-06-18 22:05:40.075611619 +0200 @@ -1,36 +1,22 @@ -diff --git a/pkg/metrics/metrics.jsx b/pkg/metrics/metrics.jsx -index 188aad7..a04b094 100644 ---- a/pkg/metrics/metrics.jsx -+++ b/pkg/metrics/metrics.jsx -@@ -995,6 +995,7 @@ const PCPConfig = ({ buttonVariant, firewalldRequest, needsLogout, setNeedsLogou - return ( - <> - <Button variant={buttonVariant} icon={<CogIcon />} -+ className="pf-u-display-none" - isDisabled={ invalidService(s_pmlogger) || invalidService(s_pmproxy) || invalidService(s_redis) || invalidService(s_redis_server) } - onClick={ () => { - setDialogLoggerValue(runningService(s_pmlogger)); -@@ -1429,7 +1430,7 @@ export const Application = () => { - <PageSection> - <CurrentMetrics /> - </PageSection> -- <PageSection> -+ <PageSection className="pf-u-display-none"> - <MetricsHistory firewalldRequest={setFirewalldRequest} - needsLogout={needsLogout} - setNeedsLogout={setNeedsLogout} /> - - </PageSection> -diff --git a/pkg/metrics/metrics.scss b/pkg/metrics/metrics.scss -index 025a30b..b4763c2 100644 ---- a/pkg/metrics/metrics.scss -+++ b/pkg/metrics/metrics.scss -@@ -2,6 +2,7 @@ - @import "../lib/ct-card.scss"; - @import "@patternfly/patternfly/components/Table/table.scss"; - @import "@patternfly/patternfly/components/Toolbar/toolbar.scss"; -+@import "@patternfly/patternfly/utilities/Display/display.scss"; +Index: cockpit/pkg/metrics/metrics.jsx +=================================================================== +--- cockpit.orig/pkg/metrics/metrics.jsx ++++ cockpit/pkg/metrics/metrics.jsx +@@ -1234,6 +1234,7 @@ const PCPConfig = ({ buttonVariant, fire - #app { - section.pf-c-page__main-breadcrumb { + return ( + <Button variant={buttonVariant} icon={<CogIcon />} ++ className="pf-u-display-none" + isDisabled={ invalidService(s_pmlogger) || invalidService(s_pmproxy) || invalidService(s_redis) || invalidService(s_redis_server) } + onClick={show_dialog}> + { _("Metrics settings") } +@@ -1624,7 +1625,7 @@ export const Application = () => { + <PageSection className="ct-pagesection-mobile"> + <CurrentMetrics /> + </PageSection> +- <PageSection className="ct-pagesection-mobile"> ++ <PageSection className="pf-u-display-none"> + <MetricsHistory firewalldRequest={setFirewalldRequest} + needsLogout={needsLogout} + setNeedsLogout={setNeedsLogout} /> ++++++ node_modules.obscpio ++++++ /work/SRC/openSUSE:Factory/cockpit/node_modules.obscpio /work/SRC/openSUSE:Factory/.cockpit.new.1548/node_modules.obscpio differ: char 48, line 1 ++++++ node_modules.spec.inc ++++++ ++++ 1572 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cockpit/node_modules.spec.inc ++++ and /work/SRC/openSUSE:Factory/.cockpit.new.1548/node_modules.spec.inc ++++++ package-lock.json ++++++ ++++ 19970 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cockpit/package-lock.json ++++ and /work/SRC/openSUSE:Factory/.cockpit.new.1548/package-lock.json ++++++ remove-pwscore.patch ++++++ --- /var/tmp/diff_new_pack.6gaobq/_old 2022-06-18 22:05:40.267611892 +0200 +++ /var/tmp/diff_new_pack.6gaobq/_new 2022-06-18 22:05:40.271611897 +0200 @@ -1,13 +1,13 @@ Remove dependency on /usr/bin/pwscore that is part of libpwquality-tools but we don't ship it in SLES -diff --git a/pkg/lib/cockpit-components-password.jsx b/pkg/lib/cockpit-components-password.jsx -index b97aab9..2241a75 100644 ---- a/pkg/lib/cockpit-components-password.jsx -+++ b/pkg/lib/cockpit-components-password.jsx +Index: cockpit/pkg/lib/cockpit-components-password.jsx +=================================================================== +--- cockpit.orig/pkg/lib/cockpit-components-password.jsx ++++ cockpit/pkg/lib/cockpit-components-password.jsx @@ -18,7 +18,7 @@ */ import cockpit from 'cockpit'; - import React from 'react'; + import React, { useState } from 'react'; -import { FormGroup, Popover, Progress, ProgressSize, ProgressMeasureLocation, TextInput } from '@patternfly/react-core'; +import { FormGroup, Popover, TextInput } from '@patternfly/react-core'; import { HelpIcon } from '@patternfly/react-icons'; @@ -21,7 +21,7 @@ cockpit.spawn('/usr/bin/pwscore', { err: "message" }) .input(password) .done(function(content) { -@@ -42,6 +43,8 @@ export function password_quality(password, force) { +@@ -42,6 +43,8 @@ export function password_quality(passwor else resolve({ value: 0 }); }); @@ -30,15 +30,32 @@ }); } -@@ -53,6 +56,7 @@ export const PasswordFormFields = ({ - error_password, error_password_confirm, - idPrefix, change +@@ -53,13 +56,12 @@ export const PasswordFormFields = ({ }) => { + const [password, setPassword] = useState(undefined); + const [passwordConfirm, setConfirmPassword] = useState(undefined); +- const [passwordStrength, setPasswordStrength] = useState(""); +- const [passwordMessage, setPasswordMessage] = useState(""); + + function onPasswordChanged(value) { + setPassword(value); + change("password", value); + ++ /* + if (value) { + password_quality(value) + .catch(ex => { +@@ -73,7 +75,9 @@ export const PasswordFormFields = ({ + setPasswordStrength(""); + setPasswordMessage(""); + } ++ */ + } + /* + let variant; - if (password_strength === "") - variant = "default"; -@@ -62,6 +66,7 @@ export const PasswordFormFields = ({ + if (passwordStrength === "") +@@ -84,6 +88,7 @@ export const PasswordFormFields = ({ variant = "warning"; else variant = "danger"; @@ -46,10 +63,10 @@ return ( <> -@@ -79,16 +84,7 @@ export const PasswordFormFields = ({ +@@ -101,16 +106,6 @@ export const PasswordFormFields = ({ fieldId={idPrefix + "-pw1"}> <TextInput className="check-passwords" type="password" id={idPrefix + "-pw1"} - value={password} onChange={value => change("password", value)} /> + autocomplete="new-password" value={password} onChange={onPasswordChanged} /> - <div> - <Progress id={idPrefix + "-meter"} - className={"ct-password-strength-meter " + variant} @@ -57,10 +74,9 @@ - size={ProgressSize.sm} - measureLocation={ProgressMeasureLocation.none} - variant={variant} -- value={Number.isInteger(password_strength) ? password_strength : 0} /> -- <div id={idPrefix + "-password-meter-message"} className="pf-c-form__helper-text" aria-live="polite">{password_message}</div> +- value={Number.isInteger(passwordStrength) ? passwordStrength : 0} /> +- <div id={idPrefix + "-password-meter-message"} className="pf-c-form__helper-text" aria-live="polite">{passwordMessage}</div> - </div> -+ <div id={idPrefix + "-password-meter-message"} className="pf-c-form__helper-text" aria-live="polite">{password_message}</div> </FormGroup> {password_confirm_label && <FormGroup label={password_confirm_label}
