From b783a5421cf5820f19f2e3aeb999ad24de39747e Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Tue, 24 Nov 2020 12:55:33 -0500
Subject: [PATCH] Document -k option in kvno(1) synopsis

---
 Document-k-option-in-kvno-1-synopsis.patch | 38 ++++++++++++++++++++++
 krb5.spec                                  |  6 +++-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 Document-k-option-in-kvno-1-synopsis.patch

diff --git a/Document-k-option-in-kvno-1-synopsis.patch b/Document-k-option-in-kvno-1-synopsis.patch
new file mode 100644
index 0000000..21f8100
--- /dev/null
+++ b/Document-k-option-in-kvno-1-synopsis.patch
@@ -0,0 +1,38 @@
+From 588d964f59356373353dfd31d4fdcba95e508385 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)
+---
+ 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 6fd8577a5..1e273e26e 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 7c9565bdb..dc9847e99 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/krb5.spec b/krb5.spec
index fbd52c3..2248930 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -18,7 +18,7 @@ Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.18.3
 # for prerelease, should be e.g., 0.% {prerelease}.1% { ?dist } (without spaces)
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # rharwood has trust path to signing key and verifies on check-in
 Source0: https://web.mit.edu/kerberos/dist/krb5/1.18/krb5-%{version}%{prerelease}.tar.gz
@@ -77,6 +77,7 @@ Patch43: Avoid-passing-DB-entry-structures-in-KDC.patch
 Patch44: Minimize-usage-of-tgs_server-in-KDC.patch
 Patch45: Fix-minor-static-analysis-defects.patch
 Patch46: Install-shared-libraries-as-executable.patch
+Patch47: Document-k-option-in-kvno-1-synopsis.patch
 
 License: MIT
 URL: https://web.mit.edu/kerberos/www/
@@ -627,6 +628,9 @@ exit 0
 %{_libdir}/libkadm5srv_mit.so.*
 
 %changelog
+* Tue Nov 24 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.3-4
+- Document -k option in kvno(1) synopsis
+
 * Fri Nov 20 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.3-3
 - Upstream executable shared libraries patch