diff --git a/cockpit.changes b/cockpit.changes index 78b8bf9..dcce8f6 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 25 11:13:36 UTC 2023 - Luna D Dragon + +- restore dependency on /usr/bin/pwscore (bsc#1202277) +- remove remove-pwscore.patch + ------------------------------------------------------------------- Mon Nov 28 13:34:07 UTC 2022 - Zdenek Kubala diff --git a/cockpit.spec b/cockpit.spec index 511eb30..1cfb9e6 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -66,7 +66,6 @@ Patch3: suse-microos-branding.patch Patch4: css-overrides.patch Patch5: storage-btrfs.patch # SLE Micro specific patches -Patch100: remove-pwscore.patch Patch101: hide-pcp.patch Patch102: 0002-selinux-temporary-remove-setroubleshoot-section.patch @@ -190,7 +189,6 @@ Requires: subscription-manager-cockpit # SLE Micro specific patches %if 0%{?is_smo} -%patch100 -p1 %patch101 -p1 %patch102 -p1 %endif @@ -446,9 +444,7 @@ Requires: cockpit-bridge >= %{version}-%{release} 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} diff --git a/remove-pwscore.patch b/remove-pwscore.patch deleted file mode 100644 index 789d086..0000000 --- a/remove-pwscore.patch +++ /dev/null @@ -1,82 +0,0 @@ -Remove dependency on /usr/bin/pwscore that is part of libpwquality-tools -but we don't ship it in SLES -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, { 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'; - - import './cockpit-components-password.scss'; -@@ -27,6 +27,7 @@ const _ = cockpit.gettext; - - export function password_quality(password, force) { - return new Promise((resolve, reject) => { -+ /* - cockpit.spawn('/usr/bin/pwscore', { err: "message" }) - .input(password) - .done(function(content) { -@@ -42,6 +43,8 @@ export function password_quality(passwor - else - resolve({ value: 0 }); - }); -+ */ -+ resolve({ message: _("pwscore not checked") }); - }); - } - -@@ -54,13 +57,12 @@ export const PasswordFormFields = ({ - }) => { - const [password, setPassword] = useState(initial_password); - 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(() => { -@@ -74,7 +76,9 @@ export const PasswordFormFields = ({ - setPasswordStrength(""); - setPasswordMessage(""); - } -+ */ - } -+ /* - - let variant; - if (passwordStrength === "") -@@ -85,6 +89,7 @@ export const PasswordFormFields = ({ - variant = "warning"; - else - variant = "danger"; -+ */ - - return ( - <> -@@ -103,16 +108,6 @@ export const PasswordFormFields = ({ - fieldId={idPrefix + "-pw1"}> - --
-- --
{passwordMessage}
--
- - - {password_confirm_label &&