From 85718592c0e3f9a14b16d021a749b0c06ef7799d Mon Sep 17 00:00:00 2001 From: ruebb Date: Mon, 30 Dec 2019 13:16:42 +0800 Subject: [PATCH] bugfix:old password can not check --- bugfix-duplicate-Current-passwd.patch | 12 ++++++++++++ gnome-control-center.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 bugfix-duplicate-Current-passwd.patch diff --git a/bugfix-duplicate-Current-passwd.patch b/bugfix-duplicate-Current-passwd.patch new file mode 100644 index 0000000..6ede9fb --- /dev/null +++ b/bugfix-duplicate-Current-passwd.patch @@ -0,0 +1,12 @@ +diff -urpN gnome-control-center-3.30.1.orig/panels/user-accounts/run-passwd.c gnome-control-center-3.30.1/panels/user-accounts/run-passwd.c +--- gnome-control-center-3.30.1.orig/panels/user-accounts/run-passwd.c 2019-12-28 23:02:47.839960163 +0800 ++++ gnome-control-center-3.30.1/panels/user-accounts/run-passwd.c 2019-12-28 23:03:41.180636928 +0800 +@@ -404,7 +404,7 @@ io_watch_stdout (GIOChannel *source, GIO + + if (is_string_complete (str->str, "assword: ", "failure", "wrong", "error", NULL)) { + +- if (strstr (str->str, "assword: ") != NULL) { ++ if (strstr (str->str, "assword: ") != NULL && strstr (str->str, "Current") == NULL) { + /* Authentication successful */ + + passwd_handler->backend_state = PASSWD_STATE_NEW; diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 401f92a..553c28d 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -1,6 +1,6 @@ Name: gnome-control-center Version: 3.30.1 -Release: 6 +Release: 7 Summary: GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop. License: GPLv2+ and CC-BY-SA @@ -37,6 +37,7 @@ Patch9000: bugfix-gnome-control-center-clickassist-fix.patch Patch9001: bugfix-gnome-control-center-fix-repetitivewallpapers.patch Patch9002: bugfix-fix_used_passwd_error_capture.patch Patch9003: gnome-control-center-change-translation-when-changing-password.patch +Patch9004: bugfix-duplicate-Current-passwd.patch %description Gnome-control-center is a graphical user interface to configure @@ -101,6 +102,12 @@ chrpath --delete %{buildroot}%{_bindir}/gnome-control-center %{_mandir}/man1/*.gz %changelog +* Mon Dec 30 2019 daiqianwen - 3.30.1-7 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix old password can not check + * Sat Dec 28 2019 openEuler Buildteam - 3.30.1-6 - Type:bugfix - ID:NA -- Gitee