diff --git a/.gitignore b/.gitignore index fa22197..7d689a0 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /mod_auth_gssapi-1.6.2.tar.gz /mod_auth_gssapi-1.6.3.tar.gz /mod_auth_gssapi-1.6.4.tar.gz +/mod_auth_gssapi-1.6.5.tar.gz diff --git a/0001-DO-NOT-MERGE-disable-the-mag_verify_config-check.patch b/0001-DO-NOT-MERGE-disable-the-mag_verify_config-check.patch deleted file mode 100644 index e7030eb..0000000 --- a/0001-DO-NOT-MERGE-disable-the-mag_verify_config-check.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5937938ca5122660860000e23c1c1275fb66c59b Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Sat, 27 Aug 2022 11:45:06 -0700 -Subject: [PATCH] DO NOT MERGE: disable the mag_verify_config check - -This is for downstream, a quick fix for -https://bugzilla.redhat.com/show_bug.cgi?id=2121952 . Proper fix -would be to fix the crash. - -Signed-off-by: Adam Williamson ---- - src/mod_auth_gssapi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mod_auth_gssapi.c b/src/mod_auth_gssapi.c -index 99de884..32970b4 100644 ---- a/src/mod_auth_gssapi.c -+++ b/src/mod_auth_gssapi.c -@@ -763,7 +763,7 @@ struct mag_req_cfg *mag_init_cfg(request_rec *req) - req_cfg->req = req; - req_cfg->cfg = ap_get_module_config(req->per_dir_config, - &auth_gssapi_module); -- mag_verify_config(req, req_cfg->cfg); -+// mag_verify_config(req, req_cfg->cfg); - - scfg = ap_get_module_config(req->server->module_config, - &auth_gssapi_module); --- -2.37.2 - diff --git a/mod_auth_gssapi.spec b/mod_auth_gssapi.spec index a2da17d..986f3c5 100644 --- a/mod_auth_gssapi.spec +++ b/mod_auth_gssapi.spec @@ -1,13 +1,11 @@ Name: mod_auth_gssapi -Version: 1.6.4 +Version: 1.6.5 Release: %autorelease Summary: A GSSAPI Authentication module for Apache License: MIT URL: https://github.com/gssapi/mod_auth_gssapi Source0: https://github.com/gssapi/%{name}/releases/download/v%{version}/%name-%{version}.tar.gz -# Disable a check added in 1.6.4 which causes crashes -Patch0: 0001-DO-NOT-MERGE-disable-the-mag_verify_config-check.patch BuildRequires: httpd-devel, krb5-devel, openssl-devel BuildRequires: autoconf, automake, libtool, bison, flex, make diff --git a/sources b/sources index 9721c0d..0c13ccd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mod_auth_gssapi-1.6.4.tar.gz) = 9e608319daf8303112615781cec6ad897586b0c03c264e70f3bfd44083902d0cdbfe19ff063559f4b3680b81d77e8f9d01cd340ca672ca20057dde510712485d +SHA512 (mod_auth_gssapi-1.6.5.tar.gz) = 97eb6dff90e686cd5d25c2925987bf51dbdf627720e74105204ec4625455255548414a03599cfd5a85734f5496f6a7b1f09760771a8278e8348e6ca35b6c48d0