From cd0aca532091de4dfadf2f12b18dd99e9cba7615 Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tomas@openssl.org>
Date: Wed, 14 Apr 2021 15:12:52 +0200
Subject: [PATCH] Update krb5 module to latest release

Fixes #14902

Also add workaround of `sudo hostname localhost` for the
intermittent test failures seen in CI.

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/14872)
---
 .github/workflows/ci.yml                        | 2 ++
 krb5                                            | 2 +-
 test/recipes/95-test_external_krb5.t            | 2 +-
 test/recipes/95-test_external_krb5_data/krb5.sh | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ee4a2c8f2b..ec35e84ff3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -221,6 +221,8 @@ jobs:
       uses: perl-actions/install-with-cpanm@v1
       with:
         install: Test2::V0
+    - name: setup hostname workaround
+      run: sudo hostname localhost
     - name: config
       run: ./config --strict-warnings --debug no-afalgeng enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 enable-external-tests && perl configdata.pm --dump
     - name: make
diff --git a/krb5 b/krb5
index 890ca2f401..3195e18f66 160000
--- a/krb5
+++ b/krb5
@@ -1 +1 @@
-Subproject commit 890ca2f401924cdcb88f493950b04700bbe52db3
+Subproject commit 3195e18f6608890866cf7a60ea538f4649d4fe82
diff --git a/test/recipes/95-test_external_krb5.t b/test/recipes/95-test_external_krb5.t
index dca2c065d3..9b8067d5d1 100644
--- a/test/recipes/95-test_external_krb5.t
+++ b/test/recipes/95-test_external_krb5.t
@@ -17,7 +17,7 @@ setup("test_external_krb5");
 plan skip_all => "No external tests in this configuration"
     if disabled("external-tests");
 plan skip_all => "krb5 not available"
-    if ! -f srctop_file("krb5", "src", "configure.in");
+    if ! -f srctop_file("krb5", "src", "configure.ac");
 
 plan tests => 1;
 
diff --git a/test/recipes/95-test_external_krb5_data/krb5.sh b/test/recipes/95-test_external_krb5_data/krb5.sh
index 6b267242f7..4c901bebf7 100755
--- a/test/recipes/95-test_external_krb5_data/krb5.sh
+++ b/test/recipes/95-test_external_krb5_data/krb5.sh
@@ -13,7 +13,7 @@ CFLAGS="-I`pwd`/$BLDTOP/include -I`pwd`/$SRCTOP/include"
 
 cd $SRCTOP/krb5/src
 autoreconf
-./configure --with-ldap --with-prng-alg=os --enable-pkinit \
+./configure --with-ldap --with-prng-alg=os --disable-pkinit \
             --with-crypto-impl=openssl --with-tls-impl=openssl \
             CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"