jzerebecki/cockpit
SHA256
1
0
Fork 0
forked from cockpit/cockpit
Code Pull Requests Activity

- new version 271

Browse Source 
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

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=88
This commit is contained in:
Adam Majer 2022-06-10 11:54:30 +00:00 committed by Git OBS Bridge
parent 581c656f6d
commit e69926e261
15 changed files with 1398 additions and 17422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
0001-selinux-allow-login-to-read-motd-file.patch
View File

@ -4,13 +4,13 @@ Date: Fri Aug 6 15:11:23 2021 +0200
selinux: allow login to read motd file selinux: allow login to read motd file
diff --git a/selinux/cockpit.te b/selinux/cockpit.te Index: cockpit/selinux/cockpit.te
index 73242aaa1..72db3c1dc 100644 ===================================================================
--- a/selinux/cockpit.te --- cockpit.orig/selinux/cockpit.te
+++ b/selinux/cockpit.te +++ cockpit/selinux/cockpit.te
@@ -181,3 +181,11 @@ optional_policy(` @@ -191,3 +191,11 @@ optional_policy(`
optional_policy(` ')
unconfined_domtrans(cockpit_session_t) cockpit_read_pid_files(local_login_t)
') ')
+ +
+# login may read motd file through pam +# login may read motd file through pam

4
README.packaging
View File

@ -38,3 +38,7 @@ Sending fixes upstream:
if you have any changes that should go upstream, create a new, clean if you have any changes that should go upstream, create a new, clean
branch and cherry pick *one* commit into it. Upstream wants pull 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?

2
_service
View File

@ -3,7 +3,7 @@
<param name="versionformat">@PARENT_TAG@</param> <param name="versionformat">@PARENT_TAG@</param>
<param name="url">http://github.com/cockpit-project/cockpit.git</param> <param name="url">http://github.com/cockpit-project/cockpit.git</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="revision">251.3</param> <param name="revision">271</param>
<param name="submodules">disable</param> <param name="submodules">disable</param>
</service> </service>
<service name="node_modules" mode="manual"> <service name="node_modules" mode="manual">

BIN
cockpit-251.3.obscpio (Stored with Git LFS)
View File

Binary file not shown.

BIN
cockpit-271.obscpio (Stored with Git LFS) Normal file
View File

Binary file not shown.

19
cockpit-redhatfont.diff
View File

@ -1,19 +0,0 @@
commit 95906d35cd2096ef97ccf46008f977c741e4708f
Author: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Fri Jan 22 16:32:30 2021 +0100
Rebuildable
diff --git a/package.json b/package.json
index eab8c9542..56f32ce1b 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
"@patternfly/react-core": "4.147.0",
"@patternfly/react-styles": "4.11.8",
"@patternfly/react-table": "4.29.37",
- "@redhat/redhat-font": "git+https://github.com/RedHatOfficial/RedHatFont.git#2.2.0",
+ "@redhat/redhat-font": "2.2.0",
"bootstrap": "3.4.1",
"bootstrap-datepicker": "1.9.0",
"bootstrap-select": "1.13.18",

9
cockpit.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Jun 10 08:22:31 UTC 2022 - Adam Majer <adam.majer@suse.de>
- 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
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 18 14:28:24 UTC 2022 - Jacek Tomasiak <jtomasiak@suse.com> Fri Mar 18 14:28:24 UTC 2022 - Jacek Tomasiak <jtomasiak@suse.com>

7
cockpit.obsinfo
View File

@ -1,5 +1,4 @@
name: cockpit name: cockpit
version: 251.3 version: 271
mtime: 1638884630 mtime: 1654679280
commit: 673b84201719fcb02adb8a0688400b93d58f608a commit: d2d8bc30bc5279b2acc3628616cfb9c4e18c7edd

179
cockpit.spec
View File

@ -24,10 +24,6 @@
# #
# Check first cockpit-devel@lists.fedorahosted.org # Check first cockpit-devel@lists.fedorahosted.org
# #
# Globals that may be defined elsewhere
# * Version 122
# * wip 1
#
# earliest base that the subpackages work on; the instances of this get computed/updated # 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 # by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback
@ -54,7 +50,7 @@ Summary: Web Console for Linux servers
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
URL: https://cockpit-project.org/ URL: https://cockpit-project.org/
Version: 251.3 Version: 271
Release: 0 Release: 0
Source0: cockpit-%{version}.tar Source0: cockpit-%{version}.tar
Source1: cockpit.pam Source1: cockpit.pam
@ -63,7 +59,6 @@ Source99: README.packaging
Source98: package-lock.json Source98: package-lock.json
Source97: node_modules.spec.inc Source97: node_modules.spec.inc
%include %{_sourcedir}/node_modules.spec.inc %include %{_sourcedir}/node_modules.spec.inc
Patch0: cockpit-redhatfont.diff
Patch1: 0001-selinux-allow-login-to-read-motd-file.patch Patch1: 0001-selinux-allow-login-to-read-motd-file.patch
Patch2: hide-docs.patch Patch2: hide-docs.patch
Patch3: suse-microos-branding.patch Patch3: suse-microos-branding.patch
@ -75,7 +70,9 @@ Patch101: hide-pcp.patch
# and cockpit-appstream (building optional packages like cockpit-{pcp}) # and cockpit-appstream (building optional packages like cockpit-{pcp})
# This split does not apply to EPEL/COPR. # 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 # 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" %if "%{name}" == "cockpit"
%define build_basic 1 %define build_basic 1
@ -90,11 +87,12 @@ Patch101: hide-pcp.patch
%define build_optional 1 %define build_optional 1
%endif %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 0%{?rhel} >= 9 || 0%{?fedora} || 0%{?suse_version}
%if "%{name}" == "cockpit"
%define selinuxtype targeted %define selinuxtype targeted
%define with_selinux 1 %define selinux_configure_arg --enable-selinux-policy=%{selinuxtype}
%define selinux_policy_version %(rpm --quiet -q selinux-policy && rpm -q --queryformat "%{V}-%{R}" selinux-policy || echo 1) %endif
%endif %endif
BuildRequires: gcc BuildRequires: gcc
@ -106,7 +104,13 @@ BuildRequires: pam-devel
BuildRequires: autoconf automake BuildRequires: autoconf automake
BuildRequires: make BuildRequires: make
BuildRequires: /usr/bin/python3 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: gettext >= 0.19.7
BuildRequires: libappstream-glib-devel
%else
BuildRequires: gettext >= 0.21
%endif
%if 0%{?build_basic} %if 0%{?build_basic}
BuildRequires: libssh-devel >= 0.8.5 BuildRequires: libssh-devel >= 0.8.5
%endif %endif
@ -143,11 +147,9 @@ BuildRequires: gdb
# For documentation # For documentation
BuildRequires: xmlto BuildRequires: xmlto
%if 0%{?with_selinux}
BuildRequires: selinux-policy BuildRequires: selinux-policy
BuildRequires: selinux-policy-%{selinuxtype} BuildRequires: selinux-policy-%{selinuxtype}
BuildRequires: selinux-policy-devel BuildRequires: selinux-policy-devel
%endif
# for rebuilding nodejs bits # for rebuilding nodejs bits
BuildRequires: npm BuildRequires: npm
@ -163,7 +165,7 @@ Requires: cockpit-system
# Optional components # Optional components
Recommends: (cockpit-storaged if udisks2) Recommends: (cockpit-storaged if udisks2)
Recommends: cockpit-packagekit Recommends: (cockpit-packagekit if dnf)
Suggests: cockpit-pcp Suggests: cockpit-pcp
%if 0%{?rhel} == 0 %if 0%{?rhel} == 0
@ -171,20 +173,11 @@ Recommends: (cockpit-networkmanager if NetworkManager)
Suggests: cockpit-selinux Suggests: cockpit-selinux
%endif %endif
%if 0%{?rhel} && 0%{?centos} == 0 %if 0%{?rhel} && 0%{?centos} == 0
Recommends: subscription-manager-cockpit Requires: subscription-manager-cockpit
%endif %endif
%prep %prep
%setup -q -n cockpit-%{version} %autosetup -p1 -n cockpit-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%if 0%{?sle_version}
%patch100 -p1
%patch101 -p1
%endif
cp %SOURCE1 tools/cockpit.pam cp %SOURCE1 tools/cockpit.pam
# #
@ -196,14 +189,13 @@ touch node_modules/.stamp
exec 2>&1 exec 2>&1
PKG_NAME="Cockpit" PKG_NAME="Cockpit"
echo %version > .tarball echo "m4_define(VERSION_NUMBER, %version)" > version.m4
autoreconf -fvi -I tools autoreconf -fvi -I tools
# #
%configure \ %configure \
--disable-silent-rules \ %{?selinux_configure_arg} \
--with-cockpit-user=cockpit-ws \ --with-cockpit-user=cockpit-ws \
--with-cockpit-ws-instance-user=cockpit-wsinstance \ --with-cockpit-ws-instance-user=cockpit-wsinstance \
--with-selinux-config-type=etc_t \
%if 0%{?suse_version} %if 0%{?suse_version}
--docdir=%_defaultdocdir/%{name} \ --docdir=%_defaultdocdir/%{name} \
%endif %endif
@ -212,27 +204,10 @@ autoreconf -fvi -I tools
--disable-ssh \ --disable-ssh \
%endif %endif
make -j4 %{?extra_flags} all %make_build
%if 0%{?with_selinux}
make -f /usr/share/selinux/devel/Makefile cockpit.pp
bzip2 -9 cockpit.pp
%endif
%check %check
# HACK: Fedora koji builders are very slow, unreliable, and inaccessible for debugging; https://github.com/cockpit-project/cockpit/issues/13909 make -j$(nproc) check
%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}
%install %install
# In obs we get write error: stdout # In obs we get write error: stdout
@ -243,21 +218,22 @@ install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit
rm -f %{buildroot}/%{_libdir}/cockpit/*.so rm -f %{buildroot}/%{_libdir}/cockpit/*.so
install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/ 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 # 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 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 %endif
# Build the package lists for resource packages # 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 echo '%dir %{_datadir}/cockpit/base1/fonts' >> base.list
find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list
echo '%{_sysconfdir}/cockpit/machines.d' >> base.list echo '%{_sysconfdir}/cockpit/machines.d' >> base.list
@ -266,10 +242,10 @@ echo '%dir %{_datadir}/cockpit/ssh' >> base.list
find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
echo '%{_libexecdir}/cockpit-ssh' >> 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 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 find %{buildroot}%{_datadir}/cockpit/tuned -type f >> system.list
echo '%dir %{_datadir}/cockpit/shell' >> system.list echo '%dir %{_datadir}/cockpit/shell' >> system.list
@ -284,7 +260,7 @@ find %{buildroot}%{_datadir}/cockpit/users -type f >> system.list
echo '%dir %{_datadir}/cockpit/metrics' >> system.list echo '%dir %{_datadir}/cockpit/metrics' >> system.list
find %{buildroot}%{_datadir}/cockpit/metrics -type f >> 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 find %{buildroot}%{_datadir}/cockpit/kdump -type f >> kdump.list
echo '%dir %{_datadir}/cockpit/sosreport' > sosreport.list echo '%dir %{_datadir}/cockpit/sosreport' > sosreport.list
@ -296,7 +272,7 @@ find %{buildroot}%{_datadir}/cockpit/storaged -type f >> storaged.list
echo '%dir %{_datadir}/cockpit/networkmanager' > networkmanager.list echo '%dir %{_datadir}/cockpit/networkmanager' > networkmanager.list
find %{buildroot}%{_datadir}/cockpit/networkmanager -type f >> 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 find %{buildroot}%{_datadir}/cockpit/packagekit -type f >> packagekit.list
echo '%dir %{_datadir}/cockpit/apps' >> packagekit.list echo '%dir %{_datadir}/cockpit/apps' >> packagekit.list
@ -318,17 +294,17 @@ for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh
rm -r %{buildroot}/%{_datadir}/cockpit/$pkg rm -r %{buildroot}/%{_datadir}/cockpit/$pkg
rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml
done 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 rm -r %{buildroot}/%{_datadir}/$data
done done
for lib in systemd tmpfiles.d; do for lib in systemd tmpfiles.d; do
rm -r %{buildroot}/%{_prefix}/%{__lib}/$lib rm -r %{buildroot}/%{_prefix}/%{__lib}/$lib
done 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 rm %{buildroot}/%{_libexecdir}/$libexec
done done
rm -r %{buildroot}/%{_libdir}/security %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d 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}%{_libexecdir}/cockpit-ssh
rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml
%endif %endif
@ -385,10 +361,6 @@ rm -f %{buildroot}%{_datadir}/pixmaps/cockpit-sosreport.png
mkdir -p %{buildroot}%{_datadir}/cockpit/devel mkdir -p %{buildroot}%{_datadir}/cockpit/devel
cp -a pkg/lib %{buildroot}%{_datadir}/cockpit/devel cp -a pkg/lib %{buildroot}%{_datadir}/cockpit/devel
%if 0%{?build_basic}
%find_lang cockpit
%endif
# ------------------------------------------------------------------------------- # -------------------------------------------------------------------------------
# Basic Sub-packages # Basic Sub-packages
@ -405,7 +377,6 @@ troubleshooting, interactive command-line sessions, and more.
%{_docdir}/cockpit/AUTHORS %{_docdir}/cockpit/AUTHORS
%{_docdir}/cockpit/COPYING %{_docdir}/cockpit/COPYING
%{_docdir}/cockpit/README.md %{_docdir}/cockpit/README.md
%dir %{_datadir}/cockpit
%{_datadir}/metainfo/cockpit.appdata.xml %{_datadir}/metainfo/cockpit.appdata.xml
%{_datadir}/pixmaps/cockpit.png %{_datadir}/pixmaps/cockpit.png
%doc %{_mandir}/man1/cockpit.1.gz %doc %{_mandir}/man1/cockpit.1.gz
@ -467,26 +438,22 @@ Provides: cockpit-tuned = %{version}-%{release}
Provides: cockpit-users = %{version}-%{release} Provides: cockpit-users = %{version}-%{release}
Obsoletes: cockpit-dashboard < %{version}-%{release} Obsoletes: cockpit-dashboard < %{version}-%{release}
%if 0%{?rhel} %if 0%{?rhel}
Provides: cockpit-networkmanager = %{version}-%{release}
Requires: NetworkManager >= 1.6 Requires: NetworkManager >= 1.6
Provides: cockpit-kdump = %{version}-%{release}
Requires: kexec-tools Requires: kexec-tools
Recommends: (sudo or polkit) Requires: sos
Requires: sudo
Recommends: PackageKit Recommends: PackageKit
Recommends: NetworkManager-team
Recommends: setroubleshoot-server >= 3.3.3 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-selinux = %{version}-%{release}
Provides: cockpit-sosreport = %{version}-%{release} Provides: cockpit-sosreport = %{version}-%{release}
Requires: sos
%endif %endif
%if 0%{?fedora} >= 29 %if 0%{?fedora}
# 0.7.0 (actually) supports task cancellation. Recommends: (reportd if abrt)
# 0.7.1 fixes tasks never announcing completion.
Recommends: (reportd >= 0.7.1 if abrt)
%endif %endif
# NPM modules which are also available as packages # 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 Provides: bundled(xstatic-patternfly-common) = 3.59.5
%description system %description system
@ -500,10 +467,8 @@ Summary: Cockpit Web Service
Requires: glib-networking Requires: glib-networking
Requires: openssl Requires: openssl
Requires: glib2 >= 2.50.0 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}) Requires(post): (policycoreutils if selinux-policy-%{selinuxtype})
%endif
Conflicts: firewalld < 0.6.0-1 Conflicts: firewalld < 0.6.0-1
Recommends: sscg >= 2.3 Recommends: sscg >= 2.3
Recommends: system-logos Recommends: system-logos
@ -513,6 +478,11 @@ Requires(pre): permissions
Requires: distribution-logos Requires: distribution-logos
Requires: wallpaper-branding Requires: wallpaper-branding
%endif %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 %description ws
The Cockpit Web Service listens on the network, and authenticates users. The Cockpit Web Service listens on the network, and authenticates users.
@ -520,12 +490,11 @@ The Cockpit Web Service listens on the network, and authenticates users.
If sssd-dbus is installed, you can enable client certificate/smart card If sssd-dbus is installed, you can enable client certificate/smart card
authentication via sssd/FreeIPA. 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}/man1/cockpit-desktop.1.gz
%doc %{_mandir}/man5/cockpit.conf.5.gz %doc %{_mandir}/man5/cockpit.conf.5.gz
%doc %{_mandir}/man8/cockpit-ws.8.gz %doc %{_mandir}/man8/cockpit-ws.8.gz
%doc %{_mandir}/man8/cockpit-tls.8.gz %doc %{_mandir}/man8/cockpit-tls.8.gz
%doc %{_mandir}/man8/remotectl.8.gz
%doc %{_mandir}/man8/pam_ssh_add.8.gz %doc %{_mandir}/man8/pam_ssh_add.8.gz
%dir %{_sysconfdir}/cockpit %dir %{_sysconfdir}/cockpit
%config(noreplace) %{_sysconfdir}/cockpit/ws-certs.d %config(noreplace) %{_sysconfdir}/cockpit/ws-certs.d
@ -545,32 +514,28 @@ authentication via sssd/FreeIPA.
%{_unitdir}/cockpit.socket %{_unitdir}/cockpit.socket
%{_unitdir}/cockpit-wsinstance-http.socket %{_unitdir}/cockpit-wsinstance-http.socket
%{_unitdir}/cockpit-wsinstance-http.service %{_unitdir}/cockpit-wsinstance-http.service
%{_unitdir}/cockpit-wsinstance-http-redirect.socket
%{_unitdir}/cockpit-wsinstance-http-redirect.service
%{_unitdir}/cockpit-wsinstance-https-factory.socket %{_unitdir}/cockpit-wsinstance-https-factory.socket
%{_unitdir}/cockpit-wsinstance-https-factory@.service %{_unitdir}/cockpit-wsinstance-https-factory@.service
%{_unitdir}/cockpit-wsinstance-https@.socket %{_unitdir}/cockpit-wsinstance-https@.socket
%{_unitdir}/cockpit-wsinstance-https@.service %{_unitdir}/cockpit-wsinstance-https@.service
%{_unitdir}/system-cockpithttps.slice %{_unitdir}/system-cockpithttps.slice
%{_prefix}/%{__lib}/tmpfiles.d/cockpit-tempfiles.conf %{_prefix}/%{__lib}/tmpfiles.d/cockpit-tempfiles.conf
%{_sbindir}/remotectl
%{pamdir}/pam_ssh_add.so %{pamdir}/pam_ssh_add.so
%{pamdir}/pam_cockpit_cert.so %{pamdir}/pam_cockpit_cert.so
%{_libexecdir}/cockpit-ws %{_libexecdir}/cockpit-ws
%{_libexecdir}/cockpit-wsinstance-factory %{_libexecdir}/cockpit-wsinstance-factory
%{_libexecdir}/cockpit-tls %{_libexecdir}/cockpit-tls
%{_libexecdir}/cockpit-client
%{_libexecdir}/cockpit-client.ui
%{_libexecdir}/cockpit-desktop %{_libexecdir}/cockpit-desktop
%{_libexecdir}/cockpit-certificate-ensure %{_libexecdir}/cockpit-certificate-ensure
%{_libexecdir}/cockpit-certificate-helper %{_libexecdir}/cockpit-certificate-helper
%{?suse_version:%verify(not mode) }%attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session %{?suse_version:%verify(not mode) }%attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session
%{_datadir}/cockpit/branding %{_datadir}/cockpit/branding
%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
%if 0%{?with_selinux} %{_mandir}/man8/%{name}_session_selinux.8cockpit.*
%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 %{_mandir}/man8/%{name}_ws_selinux.8cockpit.*
%{_mandir}/man8/%{name}_session_selinux.8cockpit.* %ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
%{_mandir}/man8/%{name}_ws_selinux.8cockpit.*
%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
%endif
%pre ws %pre ws
getent group cockpit-ws >/dev/null || groupadd -r cockpit-ws getent group cockpit-ws >/dev/null || groupadd -r cockpit-ws
@ -578,25 +543,21 @@ getent passwd cockpit-ws >/dev/null || useradd -r -g cockpit-ws -d /nonexisting
getent group cockpit-wsinstance >/dev/null || groupadd -r cockpit-wsinstance 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 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 if %{_sbindir}/selinuxenabled 2>/dev/null; then
%selinux_relabel_pre -s %{selinuxtype} %selinux_relabel_pre -s %{selinuxtype}
fi fi
%endif
%post ws %post ws
%if 0%{?with_selinux} if [ -x %{_sbindir}/selinuxenabled ]; then
if %{_sbindir}/selinuxenabled 2>/dev/null; then
%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 %selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
%selinux_relabel_post -s %{selinuxtype} %selinux_relabel_post -s %{selinuxtype}
fi fi
%endif
# set up dynamic motd/issue symlinks on first-time install; don't bring them back on upgrades if admin removed them # 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 if [ "$1" = 1 ]; then
mkdir -p /etc/motd.d /etc/issue.d mkdir -p /etc/motd.d /etc/issue.d
ln -s /run/cockpit/motd /etc/motd.d/cockpit 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/issue.d/cockpit.issue
fi fi
# switch old self-signed cert group from cockpit-wsintance to cockpit-ws on upgrade # switch old self-signed cert group from cockpit-wsintance to cockpit-ws on upgrade
if [ "$1" = 2 ]; then if [ "$1" = 2 ]; then
@ -624,12 +585,10 @@ fi
%systemd_preun cockpit.socket cockpit.service %systemd_preun cockpit.socket cockpit.service
%postun ws %postun ws
%if 0%{?with_selinux} if [ -x %{_sbindir}/selinuxenabled ]; then
if %{_sbindir}/selinuxenabled 2>/dev/null; then
%selinux_modules_uninstall -s %{selinuxtype} %{name} %selinux_modules_uninstall -s %{selinuxtype} %{name}
%selinux_relabel_post -s %{selinuxtype} %selinux_relabel_post -s %{selinuxtype}
fi fi
%endif
%systemd_postun_with_restart cockpit.socket cockpit.service %systemd_postun_with_restart cockpit.socket cockpit.service
%if 0%{?suse_version} %if 0%{?suse_version}
@ -644,8 +603,8 @@ fi
%package kdump %package kdump
Summary: Cockpit user interface for kernel crash dumping Summary: Cockpit user interface for kernel crash dumping
Requires: cockpit-bridge >= 122 Requires: cockpit-bridge >= 130
Requires: cockpit-shell >= 122 Requires: cockpit-shell >= 130
Requires: kexec-tools Requires: kexec-tools
BuildArch: noarch BuildArch: noarch
@ -723,10 +682,10 @@ Dummy package from building optional packages only; never install or publish me.
%package -n cockpit-storaged %package -n cockpit-storaged
Summary: Cockpit user interface for storage, using udisks Summary: Cockpit user interface for storage, using udisks
Requires: cockpit-shell >= 186 Requires: cockpit-shell >= 266
Requires: udisks2 >= 2.6 Requires: udisks2 >= 2.9
Recommends: udisks2-lvm2 >= 2.6 Recommends: udisks2-lvm2 >= 2.9
Recommends: udisks2-iscsi >= 2.6 Recommends: udisks2-iscsi >= 2.9
Recommends: device-mapper-multipath Recommends: device-mapper-multipath
Recommends: clevis-luks Recommends: clevis-luks
Requires: %{__python3} Requires: %{__python3}

78
hide-docs.patch
View File

@ -13,10 +13,10 @@ Subject: [PATCH] Hide links pointing to RHEL docs (bsc#1197003)
pkg/users/manifest.json | 2 +- pkg/users/manifest.json | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-) 7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pkg/kdump/manifest.json b/pkg/kdump/manifest.json Index: cockpit/pkg/kdump/manifest.json
index 01e5320e83f..116eb96dbdc 100644 ===================================================================
--- a/pkg/kdump/manifest.json --- cockpit.orig/pkg/kdump/manifest.json
+++ b/pkg/kdump/manifest.json +++ cockpit/pkg/kdump/manifest.json
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
"tools": { "tools": {
"index": { "index": {
@ -26,10 +26,10 @@ index 01e5320e83f..116eb96dbdc 100644
{ {
"label": "Configuring kdump", "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" "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: cockpit/pkg/networkmanager/manifest.json
index 3e295e9f186..8c7eef6e3b8 100644 ===================================================================
--- a/pkg/networkmanager/manifest.json --- cockpit.orig/pkg/networkmanager/manifest.json
+++ b/pkg/networkmanager/manifest.json +++ cockpit/pkg/networkmanager/manifest.json
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
"index": { "index": {
"label": "Networking", "label": "Networking",
@ -39,10 +39,10 @@ index 3e295e9f186..8c7eef6e3b8 100644
{ {
"label": "Managing networking bonds", "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" "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: cockpit/pkg/packagekit/manifest.json
index e538b4d7044..2204ae26198 100644 ===================================================================
--- a/pkg/packagekit/manifest.json --- cockpit.orig/pkg/packagekit/manifest.json
+++ b/pkg/packagekit/manifest.json +++ cockpit/pkg/packagekit/manifest.json
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
"tools": { "tools": {
"index": { "index": {
@ -52,23 +52,10 @@ index e538b4d7044..2204ae26198 100644
{ {
"label": "Managing software updates", "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" "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: cockpit/pkg/storaged/manifest.json
index adc3c165533..19d912e9bd2 100644 ===================================================================
--- a/pkg/shell/indexes.js --- cockpit.orig/pkg/storaged/manifest.json
+++ b/pkg/shell/indexes.js +++ cockpit/pkg/storaged/manifest.json
@@ -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
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
"index": { "index": {
"label": "Storage", "label": "Storage",
@ -78,10 +65,10 @@ index a554051798d..ef3c205222a 100644
{ {
"label": "Managing partitions", "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" "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: cockpit/pkg/systemd/manifest.json
index 0c768360e79..a6e8a9cc17f 100644 ===================================================================
--- a/pkg/systemd/manifest.json --- cockpit.orig/pkg/systemd/manifest.json
+++ b/pkg/systemd/manifest.json +++ cockpit/pkg/systemd/manifest.json
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
"index": { "index": {
"label": "Overview", "label": "Overview",
@ -109,10 +96,10 @@ index 0c768360e79..a6e8a9cc17f 100644
{ {
"label": "Reviewing logs", "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" "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: cockpit/pkg/users/manifest.json
index bfb5336770a..ccc408dec19 100644 ===================================================================
--- a/pkg/users/manifest.json --- cockpit.orig/pkg/users/manifest.json
+++ b/pkg/users/manifest.json +++ cockpit/pkg/users/manifest.json
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
"index": { "index": {
"label": "Accounts", "label": "Accounts",
@ -122,3 +109,20 @@ index bfb5336770a..ccc408dec19 100644
{ {
"label": "Managing user accounts", "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" "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" />);

36
hide-pcp.patch
View File

@ -1,35 +1,21 @@
diff --git a/pkg/metrics/metrics.jsx b/pkg/metrics/metrics.jsx Index: cockpit/pkg/metrics/metrics.jsx
index 188aad7..a04b094 100644 ===================================================================
--- a/pkg/metrics/metrics.jsx --- cockpit.orig/pkg/metrics/metrics.jsx
+++ b/pkg/metrics/metrics.jsx +++ cockpit/pkg/metrics/metrics.jsx
@@ -995,6 +995,7 @@ const PCPConfig = ({ buttonVariant, firewalldRequest, needsLogout, setNeedsLogou @@ -1234,6 +1234,7 @@ const PCPConfig = ({ buttonVariant, fire
return ( return (
<>
<Button variant={buttonVariant} icon={<CogIcon />} <Button variant={buttonVariant} icon={<CogIcon />}
+ className="pf-u-display-none" + className="pf-u-display-none"
isDisabled={ invalidService(s_pmlogger) || invalidService(s_pmproxy) || invalidService(s_redis) || invalidService(s_redis_server) } isDisabled={ invalidService(s_pmlogger) || invalidService(s_pmproxy) || invalidService(s_redis) || invalidService(s_redis_server) }
onClick={ () => { onClick={show_dialog}>
setDialogLoggerValue(runningService(s_pmlogger)); { _("Metrics settings") }
@@ -1429,7 +1430,7 @@ export const Application = () => { @@ -1624,7 +1625,7 @@ export const Application = () => {
<PageSection> <PageSection className="ct-pagesection-mobile">
<CurrentMetrics /> <CurrentMetrics />
</PageSection> </PageSection>
- <PageSection> - <PageSection className="ct-pagesection-mobile">
+ <PageSection className="pf-u-display-none"> + <PageSection className="pf-u-display-none">
<MetricsHistory firewalldRequest={setFirewalldRequest} <MetricsHistory firewalldRequest={setFirewalldRequest}
needsLogout={needsLogout} needsLogout={needsLogout}
setNeedsLogout={setNeedsLogout} /> 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";
#app {
section.pf-c-page__main-breadcrumb {

BIN
node_modules.obscpio (Stored with Git LFS)
View File

Binary file not shown.

1565
node_modules.spec.inc
View File

File diff suppressed because it is too large Load Diff

16842
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

33
remove-pwscore.patch
View File

@ -1,13 +1,13 @@
Remove dependency on /usr/bin/pwscore that is part of libpwquality-tools Remove dependency on /usr/bin/pwscore that is part of libpwquality-tools
but we don't ship it in SLES 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: cockpit/pkg/lib/cockpit-components-password.jsx
index b97aab9..2241a75 100644 ===================================================================
--- a/pkg/lib/cockpit-components-password.jsx --- cockpit.orig/pkg/lib/cockpit-components-password.jsx
+++ b/pkg/lib/cockpit-components-password.jsx +++ cockpit/pkg/lib/cockpit-components-password.jsx
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
*/ */
import cockpit from 'cockpit'; 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, Progress, ProgressSize, ProgressMeasureLocation, TextInput } from '@patternfly/react-core';
+import { FormGroup, Popover, TextInput } from '@patternfly/react-core'; +import { FormGroup, Popover, TextInput } from '@patternfly/react-core';
import { HelpIcon } from '@patternfly/react-icons'; import { HelpIcon } from '@patternfly/react-icons';
@ -21,7 +21,7 @@ index b97aab9..2241a75 100644
cockpit.spawn('/usr/bin/pwscore', { err: "message" }) cockpit.spawn('/usr/bin/pwscore', { err: "message" })
.input(password) .input(password)
.done(function(content) { .done(function(content) {
@@ -42,6 +43,8 @@ export function password_quality(password, force) { @@ -42,6 +43,8 @@ export function password_quality(passwor
else else
resolve({ value: 0 }); resolve({ value: 0 });
}); });
@ -30,15 +30,15 @@ index b97aab9..2241a75 100644
}); });
} }
@@ -53,6 +56,7 @@ export const PasswordFormFields = ({ @@ -51,6 +54,7 @@ export const PasswordFormFields = ({
error_password, error_password_confirm, error_password, error_password_confirm,
idPrefix, change idPrefix, change
}) => { }) => {
+ /* +/*
let variant; const [password, setPassword] = useState(undefined);
if (password_strength === "") const [passwordConfirm, setConfirmPassword] = useState(undefined);
variant = "default"; const [passwordStrength, setPasswordStrength] = useState("");
@@ -62,6 +66,7 @@ export const PasswordFormFields = ({ @@ -84,6 +88,7 @@ export const PasswordFormFields = ({
variant = "warning"; variant = "warning";
else else
variant = "danger"; variant = "danger";
@ -46,10 +46,10 @@ index b97aab9..2241a75 100644
return ( return (
<> <>
@@ -79,16 +84,7 @@ export const PasswordFormFields = ({ @@ -101,16 +106,7 @@ export const PasswordFormFields = ({
fieldId={idPrefix + "-pw1"}> fieldId={idPrefix + "-pw1"}>
<TextInput className="check-passwords" type="password" id={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> - <div>
- <Progress id={idPrefix + "-meter"} - <Progress id={idPrefix + "-meter"}
- className={"ct-password-strength-meter " + variant} - className={"ct-password-strength-meter " + variant}
@ -57,10 +57,9 @@ index b97aab9..2241a75 100644
- size={ProgressSize.sm} - size={ProgressSize.sm}
- measureLocation={ProgressMeasureLocation.none} - measureLocation={ProgressMeasureLocation.none}
- variant={variant} - variant={variant}
- value={Number.isInteger(password_strength) ? password_strength : 0} /> - value={Number.isInteger(passwordStrength) ? passwordStrength : 0} />
- <div id={idPrefix + "-password-meter-message"} className="pf-c-form__helper-text" aria-live="polite">{password_message}</div> <div id={idPrefix + "-password-meter-message"} className="pf-c-form__helper-text" aria-live="polite">{passwordMessage}</div>
- </div> - </div>
+ <div id={idPrefix + "-password-meter-message"} className="pf-c-form__helper-text" aria-live="polite">{password_message}</div>
</FormGroup> </FormGroup>
{password_confirm_label && <FormGroup label={password_confirm_label} {password_confirm_label && <FormGroup label={password_confirm_label}