diff --git a/SOURCES/0001-Added-support-displaing-of-GOST-Yescrypt.patch b/SOURCES/0001-Added-support-displaing-of-GOST-Yescrypt.patch new file mode 100644 index 0000000..472d27f --- /dev/null +++ b/SOURCES/0001-Added-support-displaing-of-GOST-Yescrypt.patch @@ -0,0 +1,42 @@ +From e4747f56c843f080373abe876f097849b58201d4 Mon Sep 17 00:00:00 2001 +From: Alexey Berezhok +Date: Thu, 8 Feb 2024 18:12:15 +0300 +Subject: [PATCH] Added support displaing of GOST Yescrypt + +--- + libuser.c | 3 +++ + po/ru.po | 4 ++++ + 2 files changed, 7 insertions(+) + +diff --git a/libuser.c b/libuser.c +index 06c6200..a37ba66 100644 +--- a/libuser.c ++++ b/libuser.c +@@ -300,6 +300,9 @@ pwdb_display_status(const char *username) + } else if (strncmp(current, "$6$", 3) == + 0) { + msg = _("Password set, SHA512 crypt."); ++ } else if (strncmp(current, "$gy$", 4) == ++ 0) { ++ msg = _("Password set, GOST Yescrypt crypt."); + } else { + msg = _("Password set, unknown crypt variant."); + } +diff --git a/po/ru.po b/po/ru.po +index 01c8fae..d65826c 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -67,6 +67,10 @@ msgstr "Пароль задан, шифр SHA256" + msgid "Password set, SHA512 crypt." + msgstr "Пароль задан, шифр SHA512" + ++#: libuser.c:305 ++msgid "Password set, GOST Yescrypt crypt." ++msgstr "Пароль задан, шифр GOST Yescrypt" ++ + #: libuser.c:302 + msgid "Password set, unknown crypt variant." + msgstr "Пароль задан, шифр неизвестен" +-- +2.43.0 + diff --git a/SPECS/passwd.spec b/SPECS/passwd.spec index c78f117..27ee914 100644 --- a/SPECS/passwd.spec +++ b/SPECS/passwd.spec @@ -7,12 +7,13 @@ Summary: An utility for setting or changing passwords using PAM Name: passwd Version: 0.80 -Release: 12%{?dist} +Release: 12%{?dist}.inferit License: BSD or GPL+ URL: https://pagure.io/passwd Source: https://releases.pagure.org/passwd/passwd-%{version}.autotoolized.tar.bz2 Patch0: passwd-0.80-manpage.patch Patch1: passwd-0.80-S-output.patch +Patch2: 0001-Added-support-displaing-of-GOST-Yescrypt.patch Requires: pam >= 1.0.90, /etc/pam.d/system-auth BuildRequires: make %if %{WITH_SELINUX} @@ -37,6 +38,7 @@ Modules) library. %setup -q -n %{name}-%{version} %patch0 -p1 -b .manpage %patch1 -p1 -b .S-output +%patch2 -p1 -b .GOST-Yescrypt %build %configure \ @@ -51,6 +53,7 @@ Modules) library. --without-audit %endif make DEBUG= RPM_OPT_FLAGS="$RPM_OPT_FLAGS" +msgfmt po/ru.po -o po/ru.gmo %install rm -rf $RPM_BUILD_ROOT @@ -75,6 +78,9 @@ done %{_mandir}/man1/passwd.1* %changelog +* Thu Feb 08 2024 Alexey Berezhok - 0.80-12.inferit +- Added support displaing of GOST Yescrypt + * Wed Mar 15 2023 MSVSphere Packaging Team - 0.80-12 - Rebuilt for MSVSphere 9.1.