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 <aberezhok@msvsphere-os.ru>
+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
+

SPECS/passwd.spec

@@ -7,14 +7,16 @@
 Summary: An utility for setting or changing passwords using PAM
 Name: passwd
 Version: 0.80
-Release: 12%{?dist}
+Release: 4%{?dist}.inferit
 License: BSD or GPL+
+Group: System Environment/Base
 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
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pam >= 1.0.90, /etc/pam.d/system-auth
-BuildRequires: make
 %if %{WITH_SELINUX}
 Requires: libselinux >= 2.1.6-3
 BuildRequires: libselinux-devel >= 2.1.6-3
@@ -24,8 +26,8 @@ BuildRequires: gcc
 BuildRequires: glib2-devel, libuser-devel, pam-devel, libuser >= 0.53-1
 BuildRequires: gettext, popt-devel
 %if %{WITH_AUDIT}
-BuildRequires: audit-libs-devel >= 2.4.5
+BuildRequires: audit-libs-devel >= 1.0.14
-Requires: audit-libs >= 2.4.5
+Requires: audit-libs >= 1.0.14
 %endif
 
 %description
@@ -37,6 +39,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 +54,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
@@ -67,6 +71,7 @@ done
 
 
 %files -f %{name}.lang
+%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license COPYING
 %doc AUTHORS ChangeLog NEWS
@@ -75,39 +80,17 @@ done
 %{_mandir}/man1/passwd.1*
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.80-12
+* Thu Feb 08 2024 Alexey Berezhok <alexey.berezhok@msvsphere-os.ru> - 0.80-4.inferit
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Added support displaing of GOST Yescrypt
-  Related: rhbz#1991688
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.80-11
+* Mon Feb 07 2022 Jiri Kucera <jkucera@redhat.com> - 0.80-4
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuild due to migrated tests
+  Related: #1841499
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.80-10
+* Fri Dec 13 2019 Jiri Kucera <jkucera@redhat.com> - 0.80-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.80-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.80-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Dec 04 2019 Jiri Kucera <jkucera@redhat.com> - 0.80-7
 - fix inconsistencies in manpage
 - fix incorrect -S output
-  Resolves: #1612221, #1740166
+  Resolves: #1612906, #1740168
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.80-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.80-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.80-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Apr 17 2018 Jiri Kucera <jkucera@redhat.com> - 0.80-3
-- passwd-0.80 relies on AUDIT_ACCT_LOCK and AUDIT_ACCT_UNLOCK that
-  were introduced at audit-2.4.5
 
 * Thu Apr 12 2018 Jiri Kucera <jkucera@redhat.com> - 0.80-2
 - Removed autotools dependencies