From d883920281dfbd775e6da0d9e7cd89fdb5273c17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B6=9B?= Date: Thu, 19 Oct 2023 15:48:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9C=80=E8=BF=91?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=BF=87=E7=9A=84=E5=AF=86=E7=A0=81=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 0005-fix-user-accounts-passwd-used.patch | 38 ++++++++++++++++++++++++ found-control-center.spec | 7 ++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 0005-fix-user-accounts-passwd-used.patch diff --git a/0005-fix-user-accounts-passwd-used.patch b/0005-fix-user-accounts-passwd-used.patch new file mode 100644 index 0000000..19e0236 --- /dev/null +++ b/0005-fix-user-accounts-passwd-used.patch @@ -0,0 +1,38 @@ +From 82ebe41a137cba13cb1d273c8b711ec3ad905d67 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E5=BC=A0=E6=B6=9B?= +Date: Thu, 19 Oct 2023 14:54:58 +0800 +Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9C=80=E8=BF=91?= + =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=BF=87=E7=9A=84=E5=AF=86=E7=A0=81=E5=88=A4?= + =?UTF-8?q?=E6=96=AD?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + panels/user-accounts/run-passwd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c +index 56eea9f..896a63b 100644 +--- a/panels/user-accounts/run-passwd.c ++++ b/panels/user-accounts/run-passwd.c +@@ -472,6 +472,7 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswdHandler *pass + "wrapped", + "recovered", + "recent", ++ "used", + "unchanged", + "match", + "1 numeric or special", +@@ -514,7 +515,7 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswdHandler *pass + strstr (str->str, "wrapped") != NULL) { + error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_REJECTED, + _("The old and new passwords are too similar")); +- } else if (strstr (str->str, "recent") != NULL) { ++ } else if (strstr (str->str, "recent") != NULL || strstr (str->str, "used") != NULL) { + error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_REJECTED, + _("The new password has already been used recently.")); + } else if (strstr (str->str, "1 numeric or special") != NULL) { +-- +2.30.2 + diff --git a/found-control-center.spec b/found-control-center.spec index 1831e6d..0a8d1b9 100644 --- a/found-control-center.spec +++ b/found-control-center.spec @@ -9,7 +9,7 @@ Name: found-control-center Version: 3.38.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Utilities to configure the GNOME desktop License: GPLv2+ and CC-BY-SA @@ -20,6 +20,7 @@ Patch0: 0001-trun-on-large-text-block-time.patch Patch1: 0002-remove-some-files.patch Patch2: 0003-fix-network-connection-status.patch Patch3: 0004-fix-network-ip4-ip6-page.patch +Patch4: 0005-fix-user-accounts-passwd-used.patch BuildRequires: pkgconfig(accountsservice) BuildRequires: desktop-file-utils @@ -177,6 +178,10 @@ The %{name}-data package contains libraries and header files for developing appl %{_datadir}/pkgconfig/gnome-keybindings.pc %changelog +* Thu Oct 19 2023 张涛 - 3.38.4-7 +- fix: 修改最近使用过的密码判断 +- add patch: 0005-fix-user-accounts-passwd-used.patch + * Thu Oct 19 2023 张涛 - 3.38.4-6 - fix: 网络设置DNS设置的右上角的自动开关选择自动后,下方的配置框就置灰 - add patch: 0004-fix-network-ip4-ip6-page.patch -- Gitee