From fa90f221c10284ac466fe54a71c7f69762782de1 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Wed, 19 May 2021 04:12:21 +0000
Subject: [PATCH] import shadow-utils-4.6-13.el8

---
 ...w-4.6-remove-login-string-references.patch | 19 +++++++++++++++++++
 SPECS/shadow-utils.spec                       |  8 +++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/shadow-4.6-remove-login-string-references.patch

diff --git a/SOURCES/shadow-4.6-remove-login-string-references.patch b/SOURCES/shadow-4.6-remove-login-string-references.patch
new file mode 100644
index 0000000..eccf9c6
--- /dev/null
+++ b/SOURCES/shadow-4.6-remove-login-string-references.patch
@@ -0,0 +1,19 @@
+diff -up shadow-4.6/man/login.defs.5.xml.remove_login_string_references shadow-4.6/man/login.defs.5.xml
+--- shadow-4.6/man/login.defs.5.xml.remove_login_string_references	2021-04-27 13:01:49.428338258 +0200
++++ shadow-4.6/man/login.defs.5.xml	2021-04-27 13:01:49.433338329 +0200
+@@ -58,7 +58,6 @@
+ <!ENTITY LOG_OK_LOGINS         SYSTEM "login.defs.d/LOG_OK_LOGINS.xml">
+ <!ENTITY LOG_UNKFAIL_ENAB      SYSTEM "login.defs.d/LOG_UNKFAIL_ENAB.xml">
+ <!ENTITY LOGIN_RETRIES         SYSTEM "login.defs.d/LOGIN_RETRIES.xml">
+-<!ENTITY LOGIN_STRING          SYSTEM "login.defs.d/LOGIN_STRING.xml">
+ <!ENTITY LOGIN_TIMEOUT         SYSTEM "login.defs.d/LOGIN_TIMEOUT.xml">
+ <!ENTITY MAIL_CHECK_ENAB       SYSTEM "login.defs.d/MAIL_CHECK_ENAB.xml">
+ <!ENTITY MAIL_DIR              SYSTEM "login.defs.d/MAIL_DIR.xml">
+@@ -214,7 +213,6 @@
+       &LOG_OK_LOGINS;
+       &LOG_UNKFAIL_ENAB;
+       &LOGIN_RETRIES;
+-      &LOGIN_STRING;
+       &LOGIN_TIMEOUT;
+       &MAIL_CHECK_ENAB;
+       &MAIL_DIR;
diff --git a/SPECS/shadow-utils.spec b/SPECS/shadow-utils.spec
index a806a39..48140d6 100644
--- a/SPECS/shadow-utils.spec
+++ b/SPECS/shadow-utils.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.6
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 2
 URL: http://pkg-shadow.alioth.debian.org/
 Source0: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz
@@ -45,6 +45,8 @@ Patch43: shadow-4.6-home_mode-directive.patch
 Patch44: shadow-4.6-check-local-groups.patch
 # https://github.com/shadow-maint/shadow/commit/e84df9e163e133eb11a2728024ff3e3440592cf8
 Patch45: shadow-4.6-sssd-redirect-warning.patch
+# Unused option in Fedora/RHEL - non upstreamable
+Patch46: shadow-4.6-remove-login-string-references.patch
 
 License: BSD and GPLv2+
 Group: System Environment/Base
@@ -108,6 +110,7 @@ are used for managing group accounts.
 %patch43 -p1 -b .home_mode-directive
 %patch44 -p1 -b .check-local-groups
 %patch45 -p1 -b .sssd-redirect-warning
+%patch46 -p1 -b .remove-login-string-references
 
 iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
 cp -f doc/HOWTO.utf8 doc/HOWTO
@@ -262,6 +265,9 @@ done
 %{_mandir}/man8/vigr.8*
 
 %changelog
+* Mon May  3 2021 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.6-13
+- man: Remove references to LOGIN_STRING in login.defs (#1884702)
+
 * Fri Oct 23 2020 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.6-12
 - lib/sssd: redirect warning message to file (#1749001)
 - useradd: clarify valid usernames/groupnames (#1869432)