Add missing newlines to deprecation warnings

Switch to upstream's ksu path patch

Add-dns_canonicalize_hostname-fallback-support.patch

@@ -1,4 +1,4 @@
-From 8ec4a9ab41c73e7955ed7929a3d2a19592811596 Mon Sep 17 00:00:00 2001
+From 1723d5cf07693d8fb249956ee73ca9f4436f95da Mon Sep 17 00:00:00 2001
 From: Simo Sorce <simo@redhat.com>
 Date: Tue, 4 Dec 2018 15:22:55 -0500
 Subject: [PATCH] Add dns_canonicalize_hostname=fallback support

Add-function-and-enctype-flag-for-deprecations.patch

@@ -1,4 +1,4 @@
-From 8491894d2bad21026d73b999814baffe8a695fb7 Mon Sep 17 00:00:00 2001
+From 5817cf4b254ab7f266d74ba30ca2a0ffa26e803e Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 15 Jan 2019 16:16:57 -0500
 Subject: [PATCH] Add function and enctype flag for deprecations

Add-missing-newlines-to-deprecation-warnings.patch

@@ -0,0 +1,37 @@
+From d60851da93427e05793d52825ebc49448ae365b2 Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Tue, 21 May 2019 12:52:26 -0400
+Subject: [PATCH] Add missing newlines to deprecation warnings
+
+Commit 8d8e68283b599e680f9fe45eff8af397e827bd6c omitted newlines in
+two warning messages sent to stderr.  Add them now.
+
+ticket: 8773
+(cherry picked from commit 274fee295d1429668b31c6ed898fc5d11a7e3589)
+---
+ src/kdc/main.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/kdc/main.c b/src/kdc/main.c
+index 04393772f..1596c1c5b 100644
+--- a/src/kdc/main.c
++++ b/src/kdc/main.c
+@@ -223,7 +223,8 @@ init_realm(kdc_realm_t * rdp, krb5_pointer aprof, char *realm,
+         if (krb5_enctype_to_name(def_enctype, FALSE, ename, sizeof(ename)))
+             ename[0] = '\0';
+         fprintf(stderr,
+-                _("Requested master password enctype %s in %s is DEPRECATED!"),
++                _("Requested master password enctype %s in %s is "
++                  "DEPRECATED!\n"),
+                 ename, realm);
+     }
+ 
+@@ -385,7 +386,7 @@ init_realm(kdc_realm_t * rdp, krb5_pointer aprof, char *realm,
+         if (krb5_enctype_to_name(rdp->realm_mkey.enctype, FALSE, ename,
+                                  sizeof(ename)))
+             ename[0] = '\0';
+-        fprintf(stderr, _("Stash file %s uses DEPRECATED enctype %s!"),
++        fprintf(stderr, _("Stash file %s uses DEPRECATED enctype %s!\n"),
+                 rdp->realm_stash, ename);
+     }
+ 

Add-tests-for-KCM-ccache-type.patch

@@ -1,4 +1,4 @@
-From 01dcc90e901491196a7ce5da893eec0b699c28b5 Mon Sep 17 00:00:00 2001
+From ae2475679b7b0e9381eac5d134c06cfc559d7d1b Mon Sep 17 00:00:00 2001
 From: Greg Hudson <ghudson@mit.edu>
 Date: Thu, 22 Nov 2018 00:27:35 -0500
 Subject: [PATCH] Add tests for KCM ccache type

Address-some-optimized-out-memset-calls.patch

@@ -1,4 +1,4 @@
-From ef4610f2ca0337bf5522dca3dc6800f795cc6a82 Mon Sep 17 00:00:00 2001
+From b54bce8e7b54c8700467fefcc74623fa50234046 Mon Sep 17 00:00:00 2001
 From: Greg Hudson <ghudson@mit.edu>
 Date: Sun, 30 Dec 2018 16:40:28 -0500
 Subject: [PATCH] Address some optimized-out memset() calls

Avoid-alignment-warnings-in-openssl-rc4.c.patch

@@ -1,4 +1,4 @@
-From cf0981bf39558c6501fe1dd2386231ac5f430918 Mon Sep 17 00:00:00 2001
+From c39a5710d0e4039a4f2bbd53ec284eb89d3b83c4 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Mon, 6 May 2019 15:14:49 -0400
 Subject: [PATCH] Avoid alignment warnings in openssl rc4.c

Avoid-allocating-a-register-in-zap-assembly.patch

@@ -1,4 +1,4 @@
-From f516db322b1469a13e59e1c2847e62cb265ce92c Mon Sep 17 00:00:00 2001
+From 7491d9ed5c358960c6344c2581db9cafaf308f06 Mon Sep 17 00:00:00 2001
 From: Andreas Schneider <asn@samba.org>
 Date: Thu, 3 Jan 2019 17:19:32 +0100
 Subject: [PATCH] Avoid allocating a register in zap() assembly

Check-more-errors-in-OpenSSL-crypto-backend.patch

@@ -1,4 +1,4 @@
-From f001aa86071aabc398b0d7c38033c26b21fe85f2 Mon Sep 17 00:00:00 2001
+From 842524798c7f69edcef3f01cae7a9a6f126ed1dc Mon Sep 17 00:00:00 2001
 From: Greg Hudson <ghudson@mit.edu>
 Date: Mon, 22 Apr 2019 14:26:42 -0400
 Subject: [PATCH] Check more errors in OpenSSL crypto backend

Clarify-header-comment-for-krb5_cc_start_seq_get.patch

@@ -1,4 +1,4 @@
-From 8f22ca7ddc9765e3d7a1de867164d307f8662cb3 Mon Sep 17 00:00:00 2001
+From 2f50c282127bf8d4c570986c212fbc1e910fb8c5 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 2 Apr 2019 14:18:57 -0400
 Subject: [PATCH] Clarify header comment for krb5_cc_start_seq_get()

Clear-forwardable-flag-instead-of-denying-request.patch

@@ -1,4 +1,4 @@
-From ab1435ed0654df9991bddb29971c913ef1f957be Mon Sep 17 00:00:00 2001
+From 6bd9bc03f2ad2aa5415d738c28180def7e17874f Mon Sep 17 00:00:00 2001
 From: Greg Hudson <ghudson@mit.edu>
 Date: Thu, 15 Nov 2018 13:40:43 -0500
 Subject: [PATCH] Clear forwardable flag instead of denying request

Fix-config-realm-change-logic-in-FILE-remove_cred.patch

@@ -1,4 +1,4 @@
-From 2f5531f3cffb497902241e4932db20617f4d30eb Mon Sep 17 00:00:00 2001
+From 7ed0d71eb3eef640e57f3c55f8aeac636cce3110 Mon Sep 17 00:00:00 2001
 From: Greg Hudson <ghudson@mit.edu>
 Date: Tue, 16 Apr 2019 10:47:35 -0400
 Subject: [PATCH] Fix config realm change logic in FILE remove_cred

Fix-memory-leak-in-none-replay-cache-type.patch

@@ -1,4 +1,4 @@
-From 75b39bfb256b639cf6ca491568fd6ef667b19d46 Mon Sep 17 00:00:00 2001
+From e215c213a068d96599a3069339bfb3e4024ef61b Mon Sep 17 00:00:00 2001
 From: Corene Casper <C.Casper@Dell.com>
 Date: Sat, 16 Feb 2019 00:49:26 -0500
 Subject: [PATCH] Fix memory leak in 'none' replay cache type

Fix-potential-close-1-in-cc_file.c.patch

@@ -1,4 +1,4 @@
-From 4faa872c4fc674b791a1c05652833ff40dac7889 Mon Sep 17 00:00:00 2001
+From 013037d7c4f6073d28ea2b0bd53eca04bae170ea Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 18 Apr 2019 13:39:37 -0400
 Subject: [PATCH] Fix potential close(-1) in cc_file.c

Fix-some-return-code-handling-bugs.patch

@@ -1,4 +1,4 @@
-From b7bbc88f5ebc6000a8dec95e7f0ff92bbeb54ad4 Mon Sep 17 00:00:00 2001
+From 6f0b53aea2dfcccf1efe0c1c6142eeeaf998f2bb Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 2 May 2019 14:05:38 -0400
 Subject: [PATCH] Fix some return code handling bugs

Implement-krb5_cc_remove_cred-for-remaining-types.patch

@@ -1,4 +1,4 @@
-From 7d3da40bd7f44f2d6960b5a9245a1d773c4ee1a0 Mon Sep 17 00:00:00 2001
+From ebc913ea73bfc439f293831f19db83ec83622d51 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Mon, 1 Apr 2019 14:28:48 -0400
 Subject: [PATCH] Implement krb5_cc_remove_cred for remaining types

Improve-error-messages-from-kadmin-change_password.patch

@@ -1,4 +1,4 @@
-From ae3053282d879cdbb803c0ff1d6deef8940eeb2a Mon Sep 17 00:00:00 2001
+From f9123277a5b4e27d5fea3dbae0889dcb527115fc Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Mon, 6 May 2019 13:13:16 -0400
 Subject: [PATCH] Improve error messages from kadmin change_password

In-kpropd-debug-log-proper-ticket-enctype-names.patch

@@ -1,4 +1,4 @@
-From 71cbe768d29bbe35cff9c37959f3e5352569af39 Mon Sep 17 00:00:00 2001
+From 0e1c9fa82ea2a5f32a6ce937ffe9b1aef21e133e Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 15 Jan 2019 13:41:16 -0500
 Subject: [PATCH] In kpropd, debug-log proper ticket enctype names

In-rd_req_dec-always-log-non-permitted-enctypes.patch

@@ -1,4 +1,4 @@
-From 4c59f0f53a698c9c4242791e8d620d50a394d5c6 Mon Sep 17 00:00:00 2001
+From 92e46dabccaf7dfecfcb85bb87b773b734724ccb Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Mon, 14 Jan 2019 17:14:42 -0500
 Subject: [PATCH] In rd_req_dec, always log non-permitted enctypes

Initialize-some-data-structure-magic-fields.patch

@@ -1,4 +1,4 @@
-From 37b73dd837a05c14d422379b686b8a10de0083fa Mon Sep 17 00:00:00 2001
+From 0f05d25ddecba6d8dd5de5c1b2e31f45942b9a85 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 2 May 2019 13:36:38 -0400
 Subject: [PATCH] Initialize some data structure magic fields

Make-etype-names-in-KDC-logs-human-readable.patch

@@ -1,4 +1,4 @@
-From e05c448510fc20946fb6d777bd7e3841dd986e75 Mon Sep 17 00:00:00 2001
+From c955111643b4ef9a005a083d8f2aa39ec4af81ec Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 8 Jan 2019 17:42:35 -0500
 Subject: [PATCH] Make etype names in KDC logs human-readable

Mark-deprecated-enctypes-when-used.patch

@@ -1,4 +1,4 @@
-From 7acee539da508c10aabbc8483243da6c6ba37892 Mon Sep 17 00:00:00 2001
+From 945c21ddafbedfe57dfbf9ca3e7b0185cb4b7175 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 10 Jan 2019 16:34:54 -0500
 Subject: [PATCH] Mark deprecated enctypes when used

Mark-the-doc-kadm5-tex-files-as-historic.patch

@@ -1,4 +1,4 @@
-From 28a605c2411c3def3e5eaa19be5326777e959a1a Mon Sep 17 00:00:00 2001
+From 1b138c349fa167f713572c8a37bc6fa39280396c Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 11 Apr 2019 18:33:04 -0400
 Subject: [PATCH] Mark the doc/kadm5 tex files as historic

Modernize-example-enctypes-in-documentation.patch

@@ -1,4 +1,4 @@
-From cef9a57dc094bb2ca57d5b765981fbb2ab93adde Mon Sep 17 00:00:00 2001
+From c60e5d66e2aaa9123a333c4f7d5a44fdc735ec66 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 11 Apr 2019 18:25:41 -0400
 Subject: [PATCH] Modernize example enctypes in documentation

Modernize-exit-path-in-gss_krb5int_copy_ccache.patch

@@ -1,4 +1,4 @@
-From 894bcbfcf27c9bc1117bb624f27123eb25fcd7bf Mon Sep 17 00:00:00 2001
+From b3ccfda0de6a9dd1248d9b15f31819421e36848e Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 2 May 2019 14:32:33 -0400
 Subject: [PATCH] Modernize exit path in gss_krb5int_copy_ccache()

Properly-size-ifdef-in-k5_cccol_lock.patch

@@ -1,4 +1,4 @@
-From 6f9bd0a292f1b84e16cab8c89efee87359b007d2 Mon Sep 17 00:00:00 2001
+From 4b087e84f6c399df56143eca50858c185d31633f Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 14 Feb 2019 11:50:35 -0500
 Subject: [PATCH] Properly size #ifdef in k5_cccol_lock()

Remove-Kerberos-v4-support-vestiges-from-ccapi.patch

@@ -1,4 +1,4 @@
-From ff011e05cfb28b408778f4ace22a745f19c0bdd2 Mon Sep 17 00:00:00 2001
+From 275df1b1b846a66c966a8108ba3b4d148f68ef6f Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 4 Apr 2019 14:37:38 -0400
 Subject: [PATCH] Remove Kerberos v4 support vestiges from ccapi

Remove-ccapi-related-comments-in-configure.ac.patch

@@ -1,4 +1,4 @@
-From 7f015c7ed945d1d51ffd0ba1dd5b89c150eacf83 Mon Sep 17 00:00:00 2001
+From 68fdf968da2ed338340a835a0c942991c7c02986 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Wed, 3 Apr 2019 16:01:22 -0400
 Subject: [PATCH] Remove ccapi-related comments in configure.ac

Remove-checksum-type-profile-variables.patch

@@ -1,4 +1,4 @@
-From a642ac26ca00d4cfaae84398372035b0c1e444ed Mon Sep 17 00:00:00 2001
+From 69bd1ba5a7002856778cf1d46082423ef89a0c0c Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Mon, 13 May 2019 14:19:57 -0400
 Subject: [PATCH] Remove checksum type profile variables

Remove-confvalidator-utility.patch

@@ -1,4 +1,4 @@
-From ecab56bca80824913e98a5b25f34a5ebe483990d Mon Sep 17 00:00:00 2001
+From f7b50b3e40ae43666fb10b0a1502f9cd88b6a2fe Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Wed, 3 Apr 2019 14:58:19 -0400
 Subject: [PATCH] Remove confvalidator utility

Remove-dead-variable-def_kslist-from-two-files.patch

@@ -1,4 +1,4 @@
-From 85416629f6d120bf272d9aaa9c661b8a849c40b3 Mon Sep 17 00:00:00 2001
+From 5a009bddbec41c5811db9f7d0583fa4e4b726ee9 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 2 May 2019 16:57:51 -0400
 Subject: [PATCH] Remove dead variable def_kslist from two files

Remove-doxygen-generated-HTML-output-for-ccapi.patch

@@ -1,4 +1,4 @@
-From cf25d152b2b1f54bbd92e235a30de20e154f3e7a Mon Sep 17 00:00:00 2001
+From 8629596d91d41914a6996b897845f601af7b59fc Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 4 Apr 2019 14:15:58 -0400
 Subject: [PATCH] Remove doxygen-generated HTML output for ccapi

Remove-kadmin-RPC-support-for-setting-v4-key.patch

@@ -1,4 +1,4 @@
-From 12e48c208c042f219d5cb8fb984094c5c958c99b Mon Sep 17 00:00:00 2001
+From 43c7d037b5e6bac3345c069af70f3cd6fd947f3f Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 4 Apr 2019 16:14:46 -0400
 Subject: [PATCH] Remove kadmin RPC support for setting v4 key

Remove-more-dead-code.patch

@@ -1,4 +1,4 @@
-From 98e6b0ada15075ea017fe8086f21b95fc2280fcd Mon Sep 17 00:00:00 2001
+From 740ab812bedd022ec60e7ef63bf4be12dd730d67 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 9 May 2019 14:07:24 -0400
 Subject: [PATCH] Remove more dead code

Remove-ovsec_adm_export-dump-format-support.patch

@@ -1,4 +1,4 @@
-From 6f9222fb372af6d7988c65cc4ec3cb56f6cc747a Mon Sep 17 00:00:00 2001
+From 5125a9bd20b2fa2b0f420dc20780d08af1cc91a6 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 22 Jan 2019 18:34:58 -0500
 Subject: [PATCH] Remove ovsec_adm_export dump format support

Remove-srvtab-support.patch

@@ -1,4 +1,4 @@
-From 0869d133743446612c512ce9aec5832ce10e282b Mon Sep 17 00:00:00 2001
+From c742a3eacc7b2dc92bf8dc83f5e8ea602dded8c2 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Mon, 9 Oct 2017 15:58:33 -0400
 Subject: [PATCH] Remove srvtab support

Set-a-more-modern-default-ksu-CMD_PATH.patch

@@ -1,9 +1,13 @@
-From e62b5022c129229e86f40f97d2e1c71a01d7227b Mon Sep 17 00:00:00 2001
+From 4b11c083e2019ece267cfa5379bd417334e2038e Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 23 Aug 2016 16:32:09 -0400
-Subject: [PATCH] krb5-1.12-ksu-path.patch
+Subject: [PATCH] Set a more modern default ksu CMD_PATH
 
-Set the default PATH to the one set by login.
+ksu uses CMD_PATH to expand command names in .k5users.  Include the /usr
+tree and .../sbin variants.  Drop nonstandard /local.
+
+ticket: 8807 (new)
+(cherry picked from commit 9eb937a6e1f740d323221813e5da096d30bd68de)
 ---
  src/clients/ksu/Makefile.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Simplify-SAM-2-as_key-handling.patch

@@ -1,4 +1,4 @@
-From 48cca5e6134e6137cab7d592dfb31f0a19e4e7ea Mon Sep 17 00:00:00 2001
+From 3b4f517a3a403943877e925ae0eb1745611b996f Mon Sep 17 00:00:00 2001
 From: Greg Hudson <ghudson@mit.edu>
 Date: Sun, 5 May 2019 18:53:27 -0400
 Subject: [PATCH] Simplify SAM-2 as_key handling

Simply-OpenSSL-PKCS7-decryption-code.patch

@@ -1,4 +1,4 @@
-From 0b4433c4ab9653eb298e2b7d959e957d468fd3f9 Mon Sep 17 00:00:00 2001
+From 172390c584726ecd5747b064587acc1db44a98ca Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Mon, 6 May 2019 13:13:06 -0400
 Subject: [PATCH] Simply OpenSSL PKCS7 decryption code

Support-389ds-s-lockout-model.patch

@@ -1,4 +1,4 @@
-From 5673f1c22b602ac4b72e59c84b70ecedf3132c11 Mon Sep 17 00:00:00 2001
+From 49ca1fc11d4e58289b518db7cdd4093b06ca9cf1 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 23 Aug 2016 16:47:44 -0400
 Subject: [PATCH] Support 389ds's lockout model

Update-ASN.1-SAM-tests-to-use-a-modern-enctype.patch

@@ -1,4 +1,4 @@
-From a7db3ad8e75a865c2de8c522f582129051bbe958 Mon Sep 17 00:00:00 2001
+From f179301f52e0e40eee9ac493bae0e82be49b7c28 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 16 Apr 2019 14:16:39 -0400
 Subject: [PATCH] Update ASN.1 SAM tests to use a modern enctype

Update-default-krb5kdc-mkey-manual-entry-enctype.patch

@@ -1,4 +1,4 @@
-From 32d2b3e6dc3ab6aa9bb824701752ccfc23d61c1c Mon Sep 17 00:00:00 2001
+From e2b0a71ca45d6895c9df132560789774993e657d Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Mon, 20 May 2019 16:52:57 -0400
 Subject: [PATCH] Update default krb5kdc mkey manual-entry enctype

Use-secure_getenv-where-appropriate.patch

@@ -1,4 +1,4 @@
-From 4ed88289e0b3c5a6fcda13078abf211fb8e4f84c Mon Sep 17 00:00:00 2001
+From 13cc24f4e631ee54176430eac73be14bcd9052d3 Mon Sep 17 00:00:00 2001
 From: Greg Hudson <ghudson@mit.edu>
 Date: Wed, 24 Apr 2019 16:19:50 -0400
 Subject: [PATCH] Use secure_getenv() where appropriate

krb5-1.11-kpasswdtest.patch

@@ -1,4 +1,4 @@
-From 8e03102127701980c1ace62cbea93e4003a0ef5d Mon Sep 17 00:00:00 2001
+From 37c9242bf19d63c6f35086a931b9a072d5b71caf Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 23 Aug 2016 16:52:01 -0400
 Subject: [PATCH] krb5-1.11-kpasswdtest.patch

krb5-1.11-run_user_0.patch

@@ -1,4 +1,4 @@
-From 44ecf1e570aacff7630334fbf1650e2f33f8675e Mon Sep 17 00:00:00 2001
+From 76a67da3510e761eb01822a6db551fa3092189a3 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 23 Aug 2016 16:49:57 -0400
 Subject: [PATCH] krb5-1.11-run_user_0.patch

krb5-1.15-beta1-buildconf.patch

@@ -1,4 +1,4 @@
-From fd8c1f7e68fd999c07ca47243ef85ac726f775ce Mon Sep 17 00:00:00 2001
+From b7ba0fa6a2f8324c58b57dedde33c1ae5d1ddb41 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 23 Aug 2016 16:45:26 -0400
 Subject: [PATCH] krb5-1.15-beta1-buildconf.patch

krb5-1.17post2-FIPS-with-PRNG-SPAKE-and-RADIUS.patch

@@ -1,4 +1,4 @@
-From 3cd7636a824638f880e7512fa1f547ec379b8499 Mon Sep 17 00:00:00 2001
+From 35dbfaa4a224bbbdd0d75a0383fbe09d7deb389f Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Fri, 9 Nov 2018 15:12:21 -0500
 Subject: [PATCH] krb5-1.17post2 FIPS with PRNG, SPAKE, and RADIUS

krb5-1.3.1-dns.patch

@@ -1,4 +1,4 @@
-From 64c9cb22ec6d7ecdeafaf60bfc8d26780d2cb4ad Mon Sep 17 00:00:00 2001
+From 2cf42007974a9c72e8e6a6cc02295e9c2a89317e Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 23 Aug 2016 16:46:21 -0400
 Subject: [PATCH] krb5-1.3.1-dns.patch

krb5-1.9-debuginfo.patch

@@ -1,4 +1,4 @@
-From 371770fc1d545414838685bcd2542450dfb0e097 Mon Sep 17 00:00:00 2001
+From d205539d89b857f7bd2b09dfc875d5cdd79167b7 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 23 Aug 2016 16:49:25 -0400
 Subject: [PATCH] krb5-1.9-debuginfo.patch

krb5.spec

@@ -18,7 +18,7 @@ Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.17
 # for prerelease, should be e.g., 0.% {prerelease}.1% { ?dist } (without spaces)
-Release: 24%{?dist}
+Release: 25%{?dist}
 
 # lookaside-cached sources; two downloads and a build artifact
 Source0: https://web.mit.edu/kerberos/dist/krb5/1.17/krb5-%{version}%{prerelease}.tar.gz
@@ -51,7 +51,6 @@ Source100: noport.c
 
 Patch26: krb5-1.12.1-pam.patch
 Patch27: krb5-1.17-beta1-selinux-label.patch
-Patch28: krb5-1.12-ksu-path.patch
 Patch30: krb5-1.15-beta1-buildconf.patch
 Patch31: krb5-1.3.1-dns.patch
 Patch34: krb5-1.9-debuginfo.patch
@@ -98,6 +97,8 @@ Patch131: Modernize-example-enctypes-in-documentation.patch
 Patch132: Update-ASN.1-SAM-tests-to-use-a-modern-enctype.patch
 Patch133: Update-default-krb5kdc-mkey-manual-entry-enctype.patch
 Patch134: Support-389ds-s-lockout-model.patch
+Patch135: Add-missing-newlines-to-deprecation-warnings.patch
+Patch136: Set-a-more-modern-default-ksu-CMD_PATH.patch
 
 License: MIT
 URL: https://web.mit.edu/kerberos/www/
@@ -707,6 +708,10 @@ exit 0
 %{_libdir}/libkadm5srv_mit.so.*
 
 %changelog
+* Wed May 22 2019 Robbie Harwood <rharwood@redhat.com> - 1.17-25
+- Add missing newlines to deprecation warnings
+- Switch to upstream's ksu path patch
+
 * Tue May 21 2019 Robbie Harwood <rharwood@redhat.com> - 1.17-24
 - Update default krb5kdc mkey manual-entry enctype
 - Also update account lockout patch to upstream version