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

Accepting request 1060941 from systemsmanagement:cockpit

Browse Source 
Add libpwquality-tools as a dependincy for cockpit (forwarded request 1060939 from ldragon)

OBS-URL: https://build.opensuse.org/request/show/1060941
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cockpit?expand=0&rev=27
This commit is contained in:
Dominique Leuenberger 2023-01-26 12:56:57 +00:00 committed by Git OBS Bridge
commit 18608c8cf4
3 changed files with 6 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cockpit.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 25 11:13:36 UTC 2023 - Luna D Dragon <luna.dragon@suse.com>
- restore dependency on /usr/bin/pwscore (bsc#1202277)
- remove remove-pwscore.patch
-------------------------------------------------------------------
Mon Nov 28 13:34:07 UTC 2022 - Zdenek Kubala <zkubala@suse.cz>

4
cockpit.spec
View File

@ -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}

82
remove-pwscore.patch
View File

@ -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"}>
<TextInput className="check-passwords" type="password" id={idPrefix + "-pw1"}
autocomplete="new-password" value={password} onChange={onPasswordChanged} />
- <div>
- <Progress id={idPrefix + "-meter"}
- className={"ct-password-strength-meter " + variant}
- title={_("password quality")}
- size={ProgressSize.sm}
- measureLocation={ProgressMeasureLocation.none}
- variant={variant}
- value={Number.isInteger(passwordStrength) ? passwordStrength : 0} />
- <div id={idPrefix + "-password-meter-message"} className="pf-c-form__helper-text" aria-live="polite">{passwordMessage}</div>
- </div>
</FormGroup>
{password_confirm_label && <FormGroup label={password_confirm_label}