From 71803ae00b339787c6798bf15a8a9721da1f6d47 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 26 2020 16:09:54 +0000
Subject: import krb5-1.18.2-7.el8


---

diff --git a/SOURCES/Document-k-option-in-kvno-1-synopsis.patch b/SOURCES/Document-k-option-in-kvno-1-synopsis.patch
new file mode 100644
index 0000000..85fb523
--- /dev/null
+++ b/SOURCES/Document-k-option-in-kvno-1-synopsis.patch
@@ -0,0 +1,39 @@
+From e9200e874f33defec7193c11a093675b70e588b6 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Tue, 24 Nov 2020 12:52:02 -0500
+Subject: [PATCH] Document -k option in kvno(1) synopsis
+
+becd1ad6830b526d08ddaf5b2b6f213154c6446c attempted to unify the
+synopsis, option descriptions, and xusage(), but missed one option.
+
+(cherry picked from commit d81e76d9ddab9e880bcf54eabf07119af91d28c7)
+(cherry picked from commit 588d964f59356373353dfd31d4fdcba95e508385)
+---
+ doc/user/user_commands/kvno.rst | 1 +
+ src/man/kvno.man                | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/doc/user/user_commands/kvno.rst b/doc/user/user_commands/kvno.rst
+index 53e569651..00689ab4c 100644
+--- a/doc/user/user_commands/kvno.rst
++++ b/doc/user/user_commands/kvno.rst
+@@ -9,6 +9,7 @@ SYNOPSIS
+ **kvno**
+ [**-c** *ccache*]
+ [**-e** *etype*]
++[**-k** *keytab*]
+ [**-q**]
+ [**-u** | **-S** *sname*]
+ [**-P**]
+diff --git a/src/man/kvno.man b/src/man/kvno.man
+index e156df723..3eeab41b2 100644
+--- a/src/man/kvno.man
++++ b/src/man/kvno.man
+@@ -35,6 +35,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+ \fBkvno\fP
+ [\fB\-c\fP \fIccache\fP]
+ [\fB\-e\fP \fIetype\fP]
++[\fB\-k\fP \fIkeytab\fP]
+ [\fB\-q\fP]
+ [\fB\-u\fP | \fB\-S\fP \fIsname\fP]
+ [\fB\-P\fP]
diff --git a/SPECS/krb5.spec b/SPECS/krb5.spec
index 564abf7..b654816 100644
--- a/SPECS/krb5.spec
+++ b/SPECS/krb5.spec
@@ -18,7 +18,7 @@ Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.18.2
 # for prerelease, should be e.g., 0.% {prerelease}.1% { ?dist } (without spaces)
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 # lookaside-cached sources; two downloads and a build artifact
 Source0: https://web.mit.edu/kerberos/dist/krb5/1.18/krb5-%{version}%{prerelease}.tar.gz
@@ -74,6 +74,7 @@ Patch128: Add-channel-bindings-tests.patch
 Patch129: Ignore-bad-enctypes-in-krb5_string_to_keysalts.patch
 Patch130: Fix-leak-in-KERB_AP_OPTIONS_CBT-server-support.patch
 Patch131: Unify-kvno-option-documentation.patch
+Patch132: Document-k-option-in-kvno-1-synopsis.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -684,6 +685,10 @@ exit 0
 %{_libdir}/libkadm5srv_mit.so.*
 
 %changelog
+* Tue Nov 24 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-7
+- Document -k option in kvno(1) synopsis
+- Resolves: #1869055
+
 * Wed Oct 21 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-6
 - Enable MD5 override for FIPS RADIUS
 - Resolves: #1872689