From 981bd7a0930fc16277f0149fe6054a5f49c5bdfe Mon Sep 17 00:00:00 2001
From: Iker Pedrosa <ipedrosa@redhat.com>
Date: Tue, 21 Sep 2021 10:37:43 +0200
Subject: [PATCH] - login.defs: include HMAC_CRYPTO_ALGO key - Clean spec file:
 organize dependencies and move License location

Signed-off-by: Iker Pedrosa <ipedrosa@redhat.com>
---
 shadow-utils.login.defs | 10 ++++++++++
 shadow-utils.spec       | 41 +++++++++++++++++++++++++++++------------
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/shadow-utils.login.defs b/shadow-utils.login.defs
index 486203b..a6c34a1 100644
--- a/shadow-utils.login.defs
+++ b/shadow-utils.login.defs
@@ -293,3 +293,13 @@ CREATE_HOME	yes
 # missing.
 #
 #FORCE_SHADOW    yes
+
+#
+# Select the HMAC cryptography algorithm.
+# Used in pam_timestamp module to calculate the keyed-hash message
+# authentication code.
+#
+# Note: It is recommended to check hmac(3) to see the possible algorithms
+# that are available in your system.
+#
+HMAC_CRYPTO_ALGO SHA512
diff --git a/shadow-utils.spec b/shadow-utils.spec
index f753ae7..051708d 100644
--- a/shadow-utils.spec
+++ b/shadow-utils.spec
@@ -1,8 +1,9 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 2
+License: BSD and GPLv2+
 URL: https://github.com/shadow-maint/shadow
 Source0: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz
 Source1: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz.asc
@@ -53,19 +54,31 @@ Patch16: shadow-4.9-useradd-avoid-generating-empty-subid-range.patch
 # https://github.com/shadow-maint/shadow/commit/234e8fa7b134d1ebabfdad980a3ae5b63c046c62
 Patch17: shadow-4.9-libmisc-fix-default-value-in-SHA_get_salt_rounds.patch
 
-License: BSD and GPLv2+
-BuildRequires: make
-BuildRequires: gcc
-BuildRequires: libselinux-devel >= 1.25.2-1
-BuildRequires: audit-libs-devel >= 1.6.5
-BuildRequires: libsemanage-devel
-BuildRequires: libacl-devel, libattr-devel
-BuildRequires: bison, flex, docbook-style-xsl, docbook-dtds
-BuildRequires: autoconf, automake, libtool, gettext-devel
-BuildRequires: /usr/bin/xsltproc, /usr/bin/itstool
-Requires: libselinux >= 1.25.2-1
+### Dependencies ###
 Requires: audit-libs >= 1.6.5
+Requires: libselinux >= 1.25.2-1
 Requires: setup
+
+### Build Dependencies ###
+BuildRequires: audit-libs-devel >= 1.6.5
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: bison
+BuildRequires: docbook-dtds
+BuildRequires: docbook-style-xsl
+BuildRequires: flex
+BuildRequires: gcc
+BuildRequires: gettext-devel
+BuildRequires: itstool
+BuildRequires: libacl-devel
+BuildRequires: libattr-devel
+BuildRequires: libselinux-devel >= 1.25.2-1
+BuildRequires: libsemanage-devel
+BuildRequires: libtool
+BuildRequires: libxslt
+BuildRequires: make
+
+### Provides ###
 Provides: shadow = %{epoch}:%{version}-%{release}
 
 %description
@@ -287,6 +300,10 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.la
 %{_libdir}/libsubid.so
 
 %changelog
+* Thu Sep 23 2021 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.9-4
+- login.defs: include HMAC_CRYPTO_ALGO key
+- Clean spec file: organize dependencies and move License location
+
 * Tue Aug 17 2021 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.9-3
 - libmisc: fix default value in SHA_get_salt_rounds()