Browse Source

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)
master
Tomas Mraz 1 year ago
committed by Benjamin Kaduk
parent
commit
cd0aca5320
4 changed files with 5 additions and 3 deletions
  1. +2
    -0
      .github/workflows/ci.yml
  2. +1
    -1
      krb5
  3. +1
    -1
      test/recipes/95-test_external_krb5.t
  4. +1
    -1
      test/recipes/95-test_external_krb5_data/krb5.sh

+ 2
- 0
.github/workflows/ci.yml View File

@ -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


+ 1
- 1
krb5

@ -1 +1 @@
Subproject commit 890ca2f401924cdcb88f493950b04700bbe52db3
Subproject commit 3195e18f6608890866cf7a60ea538f4649d4fe82

+ 1
- 1
test/recipes/95-test_external_krb5.t View File

@ -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;


+ 1
- 1
test/recipes/95-test_external_krb5_data/krb5.sh View File

@ -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"


Loading…
Cancel
Save