Commit d77d6055 authored by Francesco Colista's avatar Francesco Colista
Browse files

main/apache-mod-auth-kerb: fix broken symbols with krb5 1.18

parent d8e39a29
# Contributor: Francesco Colista <francesco.colista@gmail.com> # Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <francesco.colista@gmail.com> # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=apache-mod-auth-kerb pkgname=apache-mod-auth-kerb
_pkgname=mod_auth_kerb _pkgname=mod_auth_kerb
pkgver=5.4 pkgver=5.4
pkgrel=6 pkgrel=7
pkgdesc="A Kerberos authentication module for the Apache Http Server" pkgdesc="A Kerberos authentication module for the Apache Http Server"
url="https://sourceforge.net/projects/modauthkerb/" url="https://sourceforge.net/projects/modauthkerb/"
arch="all" arch="all"
...@@ -14,6 +14,7 @@ makedepends="apache2-dev krb5-dev" ...@@ -14,6 +14,7 @@ makedepends="apache2-dev krb5-dev"
source="https://downloads.sourceforge.net/project/modauthkerb/mod_auth_kerb/mod_auth_kerb-$pkgver/mod_auth_kerb-$pkgver.tar.gz source="https://downloads.sourceforge.net/project/modauthkerb/mod_auth_kerb/mod_auth_kerb-$pkgver/mod_auth_kerb-$pkgver.tar.gz
mod_auth_kerb-5.4-httpd24.patch mod_auth_kerb-5.4-httpd24.patch
mod_auth_kerb_compile.patch mod_auth_kerb_compile.patch
krb5-1.18-fix.patch
mod-auth-kerb.conf mod-auth-kerb.conf
" "
builddir="$srcdir"/$_pkgname-$pkgver builddir="$srcdir"/$_pkgname-$pkgver
...@@ -39,4 +40,5 @@ package() { ...@@ -39,4 +40,5 @@ package() {
sha512sums="93fdf0e43af1c24e8c8204d09240b708747068ef99dd8d21b45cb4d132d31e6d582d49ea5e23b905f55cb0d4a20b1ecb58de1bcbfdad1d016e536fc622b63214 mod_auth_kerb-5.4.tar.gz sha512sums="93fdf0e43af1c24e8c8204d09240b708747068ef99dd8d21b45cb4d132d31e6d582d49ea5e23b905f55cb0d4a20b1ecb58de1bcbfdad1d016e536fc622b63214 mod_auth_kerb-5.4.tar.gz
fb7c8b18adce99c1bd200a8c1dd7794d0ecee49aa6308180b03537be160ea4426150f1421be9e2462f036296fbd220aa823a2689023899c66817baea8416aad9 mod_auth_kerb-5.4-httpd24.patch fb7c8b18adce99c1bd200a8c1dd7794d0ecee49aa6308180b03537be160ea4426150f1421be9e2462f036296fbd220aa823a2689023899c66817baea8416aad9 mod_auth_kerb-5.4-httpd24.patch
f8fd9cce15593592995a53374a7dbbf6171c4f5e9e82d5bf59953fcfa6fa81cf6890ec4c9ddc2e0963060ea34e98b590f037b1f0274c284085350e6bc4792748 mod_auth_kerb_compile.patch f8fd9cce15593592995a53374a7dbbf6171c4f5e9e82d5bf59953fcfa6fa81cf6890ec4c9ddc2e0963060ea34e98b590f037b1f0274c284085350e6bc4792748 mod_auth_kerb_compile.patch
f375dd027eb4b2094a39d321379dade5449a6daac0306eae9bc517344df4e5e65b59ba7b84617df328b00141740da5e515d3f20a448100ee1d95aab9f60e1152 krb5-1.18-fix.patch
b6cfa12dbfd37f98de4d5b23f16462efbfa394d4e9dd6a15772aa18fbec0704c3d9f6e5d242d501a8f1c3091abf893de261115ee54ea31d9d9e0a4d1724473a4 mod-auth-kerb.conf" b6cfa12dbfd37f98de4d5b23f16462efbfa394d4e9dd6a15772aa18fbec0704c3d9f6e5d242d501a8f1c3091abf893de261115ee54ea31d9d9e0a4d1724473a4 mod-auth-kerb.conf"
--- ./src/mod_auth_kerb.c.org 2020-08-10 17:36:11.563228638 +0200
+++ ./src/mod_auth_kerb.c 2020-08-10 17:53:14.641734908 +0200
@@ -2070,12 +2070,11 @@
ret = krb5_init_context(&context);
if (ret)
return 0;
-
- ret = krb5_rc_resolve_full(context, &id, "none:");
+extern krb5_error_code
+ k5_rc_resolve(krb5_context context, const char *name, krb5_rcache *rc_out);
+ ret = k5_rc_resolve(context, "none:", &id);
found = (ret == 0);
- if (ret == 0)
- krb5_rc_destroy(context, id);
krb5_free_context(context);
return found;
diff -ruN mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.4/src/mod_auth_kerb.c
--- mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c 2018-12-12 16:59:43.762013269 +0100
+++ mod_auth_kerb-5.4/src/mod_auth_kerb.c 2018-12-12 16:59:59.151945123 +0100
@@ -799,11 +799,9 @@
"failed to verify krb5 credentials: %s",
krb5_get_err_text(context, ret));
krb5_kt_end_seq_get(context, keytab, &cursor);
- krb5_kt_close(context, keytab);
goto end;
}
krb5_kt_end_seq_get(context, keytab, &cursor);
- krb5_kt_close(context, keytab);
}
else {
if ((ret = verify_krb5_init_creds(r, context, &creds, server, keytab))) {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment