From 40d1900731a5d81e7068c7ce7c00af413f07476f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 23 2021 14:37:22 +0000
Subject: import kbd-1.15.5-16.el7_9


---

diff --git a/SOURCES/kbd-1.15.5-vlock-stdin-closed-inf-loop.patch b/SOURCES/kbd-1.15.5-vlock-stdin-closed-inf-loop.patch
new file mode 100644
index 0000000..df73673
--- /dev/null
+++ b/SOURCES/kbd-1.15.5-vlock-stdin-closed-inf-loop.patch
@@ -0,0 +1,19 @@
+diff -up kbd-1.15.5/src/vlock/auth.c.orig kbd-1.15.5/src/vlock/auth.c
+--- kbd-1.15.5/src/vlock/auth.c.orig	2017-08-28 15:05:02.499936226 +0200
++++ kbd-1.15.5/src/vlock/auth.c	2017-09-05 14:56:00.856307724 +0200
+@@ -160,6 +160,15 @@ get_password (pam_handle_t * pamh, const
+ 				break;
+ 
+ 			default:
++				if (!isatty(STDIN_FILENO))
++				{
++					/* Cancel locking. */
++					pam_end (pamh, rc);
++					syslog (LOG_NOTICE,
++						"Cancelled lock of %s on %s for %s by (uid=%u)",
++						locked_name (), tty, username, uid);
++					return EXIT_FAILURE;
++				}
+ 				printf ("%s.\n\n\n", pam_strerror (pamh, rc));
+ 				fflush (stdout);
+ 		}
diff --git a/SPECS/kbd.spec b/SPECS/kbd.spec
index 2425776..f40c628 100644
--- a/SPECS/kbd.spec
+++ b/SPECS/kbd.spec
@@ -1,6 +1,6 @@
 Name:           kbd
 Version:        1.15.5
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 
 Group:          System Environment/Base
@@ -39,6 +39,8 @@ Patch6:         kbd-1.15.5-vlock-more-pam.patch
 Patch7:         kbd-1.15.5-loadkeys-search-path.patch
 # Patch8: improves quality and coverage of kbd man pages and usage messages
 Patch8:         kbd-1.15.5-man-and-usage-consistency.patch
+# Patch9: fixes vlock when console or terminal is closed abruptly, bz 1486233
+Patch9:         kbd-1.15.5-vlock-stdin-closed-inf-loop.patch
 
 BuildRequires:  bison, flex, gettext, pam-devel
 BuildRequires:  console-setup, xkeyboard-config
@@ -84,6 +86,7 @@ cp -fp %{SOURCE10} .
 %patch6 -p1 -b .vlock-more-pam
 %patch7 -p1 -b .loadkeys-search-path
 %patch8 -p1 -b .man-and-usage-consistency
+%patch9 -p1 -b .vlock-stdin-closed-inf-loop
 
 # 7-bit maps are obsolete; so are non-euro maps
 pushd data/keymaps/i386
@@ -206,6 +209,10 @@ gzip $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/us.map
 /lib/kbd/keymaps/legacy
 
 %changelog
+* Tue Oct 26 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.15.5-16
+- Fix vlock when console or terminal is closed abruptly
+  Resolves: #1486233
+
 * Mon Aug 13 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.15.5-15
 - Add man page for kbdinfo, link open man page to openvt man page
   Related: #949015