Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cockpit for openSUSE:Factory checked in at 2023-06-18 23:07:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cockpit (Old) and /work/SRC/openSUSE:Factory/.cockpit.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cockpit" Sun Jun 18 23:07:28 2023 rev:29 rq:1093123 version:293 Changes: -------- --- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2023-02-11 22:20:09.440062665 +0100 +++ /work/SRC/openSUSE:Factory/.cockpit.new.15902/cockpit.changes 2023-06-18 23:07:30.401304290 +0200 @@ -1,0 +2,22 @@ +Tue Jun 13 12:39:20 UTC 2023 - Adam Majer <adam.ma...@suse.de> + +- Add fake openSUSE branding target when building on non-openSUSE + builds so branding does not need to be removed +- Remove tests package so we don't have to ship a test PAM module + +------------------------------------------------------------------- +Fri Jun 2 13:26:45 UTC 2023 - Adam Majer <adam.ma...@suse.de> + +- new version 293: + - https://cockpit-project.org/blog/cockpit-293.html +- refreshed: css-overrides.patch + +------------------------------------------------------------------- +Tue May 30 15:05:45 UTC 2023 - Adam Majer <adam.ma...@suse.de> + +- new version 292: + - https://cockpit-project.org/blog/cockpit-292.html +- refreshed patches: css-overrides.patch, hide-pcp.patch, + 0001-selinux-allow-login-to-read-motd-file.patch + +------------------------------------------------------------------- Old: ---- cockpit-276.1.obscpio New: ---- cockpit-293.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cockpit.spec ++++++ --- /var/tmp/diff_new_pack.sT1thq/_old 2023-06-18 23:07:33.269321452 +0200 +++ /var/tmp/diff_new_pack.sT1thq/_new 2023-06-18 23:07:33.277321499 +0200 @@ -50,7 +50,7 @@ License: LGPL-2.1-or-later URL: https://cockpit-project.org/ -Version: 276.1 +Version: 293 Release: 0 Source0: cockpit-%{version}.tar Source1: cockpit.pam @@ -69,6 +69,11 @@ Patch101: hide-pcp.patch Patch102: 0002-selinux-temporary-remove-setroubleshoot-section.patch +# Experimental Python support +%if !%{defined cockpit_enable_python} +%define cockpit_enable_python 0 +%endif + # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system}) # and cockpit-appstream (building optional packages like cockpit-{pcp}) # This split does not apply to EPEL/COPR nor packit c8s builds, only to our own @@ -90,6 +95,17 @@ %define build_optional 1 %endif +%if 0%{?build_optional} && 0%{?suse_version} == 0 +%define build_tests 1 +%endif + +# Allow root login in Cockpit on RHEL 8 and lower as it also allows password login over SSH. +%if 0%{?rhel} && 0%{?rhel} <= 8 +%define disallow_root 0 +%else +%define disallow_root 1 +%endif + # Ship custom SELinux policy (but not for cockpit-appstream) %if 0%{?rhel} >= 9 || 0%{?fedora} || 0%{?suse_version} %if "%{name}" == "cockpit" @@ -173,12 +189,28 @@ %if 0%{?rhel} == 0 Recommends: (cockpit-networkmanager if NetworkManager) +# c-ostree is not in RHEL 8/9 +Recommends: (cockpit-ostree if rpm-ostree) Suggests: cockpit-selinux %endif %if 0%{?rhel} && 0%{?centos} == 0 Requires: subscription-manager-cockpit %endif +%if %{cockpit_enable_python} +BuildRequires: python3-devel +BuildRequires: python3-pip +%if 0%{?rhel} == 0 +# All of these are only required for running pytest (which we only do on Fedora) +BuildRequires: procps-ng +BuildRequires: pyproject-rpm-macros +BuildRequires: python3-pytest-asyncio +BuildRequires: python3-pytest-cov +BuildRequires: python3-pytest-timeout +BuildRequires: python3-tox-current-env +%endif +%endif + %prep %setup -q -n cockpit-%{version} -a 3 %patch1 -p1 @@ -214,6 +246,9 @@ --docdir=%_defaultdocdir/%{name} \ %endif --with-pamdir='%{pamdir}' \ +%if %{cockpit_enable_python} + --enable-pybridge \ +%endif %if 0%{?build_basic} == 0 --disable-ssh \ %endif @@ -226,6 +261,10 @@ %check make -j$(nproc) check +%if %{cockpit_enable_python} && 0%{?rhel} == 0 +%tox +%endif + %install # In obs we get write error: stdout %make_install | tee make_install.log @@ -269,9 +308,6 @@ echo '%dir %{_datadir}/cockpit/pcp' > pcp.list find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list -echo '%dir %{_datadir}/cockpit/tuned' > system.list -find %{buildroot}%{_datadir}/cockpit/tuned -type f >> system.list - echo '%dir %{_datadir}/cockpit/shell' >> system.list find %{buildroot}%{_datadir}/cockpit/shell -type f >> system.list @@ -314,28 +350,30 @@ # when not building basic packages, remove their files %if 0%{?build_basic} == 0 -for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd tuned users metrics; do +for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd users metrics; do rm -r %{buildroot}/%{_datadir}/cockpit/$pkg rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml done 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 +rm -r %{buildroot}/%{_prefix}/%{__lib}/tmpfiles.d +find %{buildroot}/%{_unitdir}/ -type f ! -name 'cockpit-session*' -delete 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 + rm -f %{buildroot}/%{_libexecdir}/$libexec done -rm -r %{buildroot}/%{_libdir}/security %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d +rm -r %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d %if 0%{?suse_version} > 1500 rm -r %{buildroot}/%{_pam_vendordir} %else rm -r %{buildroot}/%{_sysconfdir}/pam.d %endif -rm %{buildroot}/usr/bin/cockpit-bridge +rm -f %{buildroot}/%{_libdir}/security/pam_* +rm -f %{buildroot}/usr/bin/cockpit-bridge rm -f %{buildroot}%{_libexecdir}/cockpit-ssh rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml +rm -rf %{buildroot}%{python3_sitelib}/cockpit/ +rm -rf %{buildroot}%{python3_sitelib}/cockpit-%{version}.dist-info/ %endif # when not building optional packages, remove their files @@ -343,14 +381,19 @@ for pkg in apps packagekit pcp playground storaged; do rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg done -# files from -tests -rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets # files from -pcp rm -r %{buildroot}/%{_libexecdir}/cockpit-pcp %{buildroot}/%{_localstatedir}/lib/pcp/ # files from -storaged rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml %endif +%if 0%{?build_tests} == 0 +rm -rf %{buildroot}%{_datadir}/cockpit/playground +rm -f %{buildroot}/%{pamdir}/mock-pam-conv-mod.so +rm -f %{buildroot}/%{_unitdir}/cockpit-session.socket +rm -f %{buildroot}/%{_unitdir}/cockpit-session@.service +%endif + sed -i "s|%{buildroot}||" *.list %if 0%{?suse_version} @@ -361,6 +404,7 @@ popd # need this in SUSE as post build checks dislike stale symlinks install -m 644 -D /dev/null %{buildroot}/run/cockpit/motd +install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/opensuse/default-1920x1200.jpg ||: # remove files of not installable packages rm -r %{buildroot}%{_datadir}/cockpit/sosreport rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml @@ -381,6 +425,7 @@ rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-kdump.metainfo.xml rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml +rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-networkmanager.metainfo.xml rm -f %{buildroot}%{_datadir}/pixmaps/cockpit-sosreport.png %endif @@ -412,8 +457,6 @@ Summary: Cockpit bridge server-side component Requires: glib-networking Provides: cockpit-ssh = %{version}-%{release} -# PR #10430 dropped workaround for ws' inability to understand x-host-key challenge -Conflicts: cockpit-ws < 181.x # 233 dropped jquery.js, pages started to bundle it (commit 049e8b8dce) Conflicts: cockpit-dashboard < 233 Conflicts: cockpit-networkmanager < 233 @@ -430,6 +473,10 @@ %doc %{_mandir}/man1/cockpit-bridge.1.gz %{_bindir}/cockpit-bridge %{_libexecdir}/cockpit-askpass +%if %{cockpit_enable_python} +%{python3_sitelib}/%{name}/ +%{python3_sitelib}/%{name}-%{version}.dist-info/ +%endif %package doc Summary: Cockpit deployment and developer guide @@ -454,7 +501,9 @@ Requires: shadow-utils %endif Requires: grep +%if !0%{?sle_version} Requires: /usr/bin/pwscore +%endif Requires: /usr/bin/date Provides: cockpit-shell = %{version}-%{release} Provides: cockpit-systemd = %{version}-%{release} @@ -478,6 +527,8 @@ Recommends: (reportd if abrt) %endif +#NPM_PROVIDES + %description system This package contains the Cockpit shell and system configuration interfaces. @@ -530,6 +581,7 @@ # created in %post, so that users can rm the files %ghost %{_sysconfdir}/issue.d/cockpit.issue %ghost %{_sysconfdir}/motd.d/cockpit +%ghost %attr(0644, root, root) %{_sysconfdir}/cockpit/disallowed-users %ghost %dir /run/cockpit %ghost /run/cockpit/motd %dir %{_datadir}/cockpit/motd @@ -586,10 +638,16 @@ fi # set up dynamic motd/issue symlinks on first-time install; don't bring them back on upgrades if admin removed them +# disable root login on first-time install; so existing installations aren't changed if [ "$1" = 1 ]; then 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 + printf "# List of users which are not allowed to login to Cockpit\n" > /etc/cockpit/disallowed-users +%if 0%{?disallow_root} + printf "root\n" >> /etc/cockpit/disallowed-users +%endif + chmod 644 /etc/cockpit/disallowed-users fi # switch old self-signed cert group from cockpit-wsintance to cockpit-ws on upgrade if [ "$1" = 2 ]; then @@ -606,7 +664,7 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true # check for deprecated PAM config -if grep --color=auto pam_cockpit_cert %{_sysconfdir}/pam.d/cockpit; then +if test -f %{_sysconfdir}/pam.d/cockpit && grep -q pam_cockpit_cert %{_sysconfdir}/pam.d/cockpit; then echo '**** WARNING:' echo '**** WARNING: pam_cockpit_cert is a no-op and will be removed in a' echo '**** WARNING: future release; remove it from your /etc/pam.d/cockpit.' @@ -685,6 +743,7 @@ The Cockpit component for managing networking. This package uses NetworkManager. %files networkmanager -f networkmanager.list +%{_datadir}/metainfo/org.cockpit-project.cockpit-networkmanager.metainfo.xml %endif @@ -750,10 +809,11 @@ %dir %{_datadir}/cockpit/storaged/images %{_datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml +%if 0%{?build_tests} %package -n cockpit-tests Summary: Tests for Cockpit -Requires: cockpit-bridge >= 138 -Requires: cockpit-system >= 138 +Requires: cockpit-bridge >= %{required_base} +Requires: cockpit-system >= %{required_base} Requires: openssh-clients Provides: cockpit-test-assets = %{version}-%{release} @@ -762,7 +822,12 @@ These files are not required for running Cockpit. %files -n cockpit-tests -f tests.list -%{_prefix}/%{__lib}/cockpit-test-assets +%{pamdir}/mock-pam-conv-mod.so +%{_unitdir}/cockpit-session.socket +%{_unitdir}/cockpit-session@.service + +# /build_tests +%endif %package devel Summary: Development files for for Cockpit ++++++ 0001-selinux-allow-login-to-read-motd-file.patch ++++++ --- /var/tmp/diff_new_pack.sT1thq/_old 2023-06-18 23:07:33.309321691 +0200 +++ /var/tmp/diff_new_pack.sT1thq/_new 2023-06-18 23:07:33.313321715 +0200 @@ -8,9 +8,9 @@ =================================================================== --- cockpit.orig/selinux/cockpit.te +++ cockpit/selinux/cockpit.te -@@ -191,3 +191,11 @@ optional_policy(` - ') - cockpit_read_pid_files(local_login_t) +@@ -202,3 +202,11 @@ optional_policy(` + optional_policy(` + gnome_exec_keyringd(cockpit_session_t) ') + +# login may read motd file through pam ++++++ _service ++++++ --- /var/tmp/diff_new_pack.sT1thq/_old 2023-06-18 23:07:33.369322050 +0200 +++ /var/tmp/diff_new_pack.sT1thq/_new 2023-06-18 23:07:33.373322074 +0200 @@ -13,7 +13,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">276.1</param> + <param name="revision">293</param> <param name="submodules">disable</param> </service> <service name="node_modules" mode="manual"> ++++++ cockpit-276.1.obscpio -> cockpit-293.obscpio ++++++ /work/SRC/openSUSE:Factory/cockpit/cockpit-276.1.obscpio /work/SRC/openSUSE:Factory/.cockpit.new.15902/cockpit-293.obscpio differ: char 19, line 1 ++++++ cockpit.obsinfo ++++++ --- /var/tmp/diff_new_pack.sT1thq/_old 2023-06-18 23:07:33.445322505 +0200 +++ /var/tmp/diff_new_pack.sT1thq/_new 2023-06-18 23:07:33.449322529 +0200 @@ -1,5 +1,5 @@ name: cockpit -version: 276.1 -mtime: 1662983171 -commit: 33f16d10c3505aceeac7541e01553ea44e10678d +version: 293 +mtime: 1685606167 +commit: 06aba4d08e6017abed05a3cc3e3bbb49276bc0d1 ++++++ css-overrides.patch ++++++ --- /var/tmp/diff_new_pack.sT1thq/_old 2023-06-18 23:07:33.469322648 +0200 +++ /var/tmp/diff_new_pack.sT1thq/_new 2023-06-18 23:07:33.473322672 +0200 @@ -48,8 +48,8 @@ +++ cockpit/pkg/apps/index.html @@ -23,6 +23,7 @@ along with Cockpit; If not, see <http:// <title translate="yes">Applications</title> - <meta charset="utf-8"> - <link href="apps.css" type="text/css" rel="stylesheet"> + <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> @@ -59,10 +59,10 @@ --- cockpit.orig/pkg/kdump/index.html +++ cockpit/pkg/kdump/index.html @@ -25,6 +25,7 @@ along with Cockpit; If not, see <http:// - <meta name="viewport" content="width=device-width, initial-scale=1"> + <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"> + <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="../base1/po.js"></script> @@ -71,10 +71,10 @@ --- cockpit.orig/pkg/metrics/index.html +++ cockpit/pkg/metrics/index.html @@ -23,6 +23,7 @@ along with this package; If not, see <ht - <meta name="viewport" content="width=device-width, initial-scale=1"> + <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"> + <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> @@ -83,10 +83,10 @@ --- cockpit.orig/pkg/networkmanager/firewall.html +++ cockpit/pkg/networkmanager/firewall.html @@ -23,6 +23,7 @@ along with Cockpit; If not, see <http:// - <meta charset="utf-8"> + <meta charset="utf-8" /> - <link href="firewall.css" type="text/css" rel="stylesheet"> -+ <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> + <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> @@ -95,10 +95,10 @@ --- cockpit.orig/pkg/networkmanager/index.html +++ cockpit/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"> + <meta charset="utf-8" /> + <meta name="viewport" content="width=device-width, initial-scale=1.0" /> + <link href="networkmanager.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> @@ -107,10 +107,10 @@ --- cockpit.orig/pkg/packagekit/index.html +++ cockpit/pkg/packagekit/index.html @@ -24,6 +24,7 @@ along with Cockpit; If not, see <http:// - <meta charset="utf-8"> + <meta charset="utf-8" /> - <link href="updates.css" rel="stylesheet"> -+ <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> + <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> @@ -120,9 +120,9 @@ +++ cockpit/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"> + <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> @@ -132,9 +132,9 @@ +++ cockpit/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"> + <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> @@ -144,9 +144,9 @@ +++ cockpit/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"> + <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> @@ -156,9 +156,9 @@ +++ cockpit/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"> + <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> @@ -168,9 +168,9 @@ +++ cockpit/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"> + <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> @@ -180,9 +180,9 @@ +++ cockpit/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"> + <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> @@ -192,33 +192,21 @@ +++ cockpit/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"> + <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> -Index: cockpit/pkg/selinux/setroubleshoot.html -=================================================================== ---- cockpit.orig/pkg/selinux/setroubleshoot.html -+++ cockpit/pkg/selinux/setroubleshoot.html -@@ -25,6 +25,7 @@ along with Cockpit; If not, see <http:// - <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> Index: cockpit/pkg/shell/index.html =================================================================== --- cockpit.orig/pkg/shell/index.html +++ cockpit/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"> + <meta name="viewport" content="width=device-width, initial-scale=1.0" /> + <link href="shell.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> @@ -227,12 +215,12 @@ --- cockpit.orig/pkg/shell/shell.html +++ cockpit/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"> + <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"> + <body class="pf-v5-m-tabular-nums"> <div class="curtains-ct"> Index: cockpit/pkg/sosreport/index.html =================================================================== @@ -240,33 +228,21 @@ +++ cockpit/pkg/sosreport/index.html @@ -22,6 +22,7 @@ along with Cockpit; If not, see <http:// <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"> + <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> -Index: cockpit/pkg/storaged/index.html -=================================================================== ---- cockpit.orig/pkg/storaged/index.html -+++ cockpit/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> Index: cockpit/pkg/systemd/hwinfo.html =================================================================== --- cockpit.orig/pkg/systemd/hwinfo.html +++ cockpit/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"> + <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> @@ -274,23 +250,23 @@ =================================================================== --- cockpit.orig/pkg/systemd/index.html +++ cockpit/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"> - +@@ -6,6 +6,7 @@ + <meta name="description" content="" /> + <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> + <script type="text/javascript" src="overview.js"></script> Index: cockpit/pkg/systemd/logs.html =================================================================== --- cockpit.orig/pkg/systemd/logs.html +++ cockpit/pkg/systemd/logs.html @@ -23,6 +23,7 @@ along with Cockpit; If not, see <http:// - <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"> + <title translate="yes">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> @@ -299,10 +275,10 @@ --- cockpit.orig/pkg/systemd/services.html +++ cockpit/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"> + <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> @@ -311,10 +287,10 @@ --- cockpit.orig/pkg/systemd/terminal.html +++ cockpit/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"> + <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> @@ -323,10 +299,10 @@ --- cockpit.orig/pkg/users/index.html +++ cockpit/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"> + <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> ++++++ hide-pcp.patch ++++++ --- /var/tmp/diff_new_pack.sT1thq/_old 2023-06-18 23:07:33.485322744 +0200 +++ /var/tmp/diff_new_pack.sT1thq/_new 2023-06-18 23:07:33.489322768 +0200 @@ -2,7 +2,7 @@ =================================================================== --- cockpit.orig/pkg/metrics/metrics.jsx +++ cockpit/pkg/metrics/metrics.jsx -@@ -1234,6 +1234,7 @@ const PCPConfig = ({ buttonVariant, fire +@@ -1551,6 +1551,7 @@ const PCPConfig = ({ buttonVariant, fire return ( <Button variant={buttonVariant} icon={<CogIcon />} @@ -10,13 +10,4 @@ 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.15902/node_modules.obscpio differ: char 28, line 1 ++++++ node_modules.spec.inc ++++++ ++++ 1191 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cockpit/node_modules.spec.inc ++++ and /work/SRC/openSUSE:Factory/.cockpit.new.15902/node_modules.spec.inc ++++++ package-lock.json ++++++ ++++ 16200 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cockpit/package-lock.json ++++ and /work/SRC/openSUSE:Factory/.cockpit.new.15902/package-lock.json
